From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.42.224.197 with SMTP id ip5cs142496icb; Sun, 20 Feb 2011 11:45:26 -0800 (PST) Received: by 10.229.214.141 with SMTP id ha13mr445231qcb.60.1298231125926; Sun, 20 Feb 2011 11:45:25 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id e5si9197556qck.84.2011.02.20.11.45.25; Sun, 20 Feb 2011 11:45:25 -0800 (PST) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org; dkim=neutral (body hash did not verify) header.i=@gmail.com Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 6121C3C8040; Sun, 20 Feb 2011 14:45:25 -0500 (EST) Received: from mail-wy0-f178.google.com (mail-wy0-f178.google.com [74.125.82.178]) by rubyforge.org (Postfix) with ESMTP id D40861858346 for ; Sun, 20 Feb 2011 14:19:21 -0500 (EST) Received: by wyb42 with SMTP id 42so5397534wyb.23 for ; Sun, 20 Feb 2011 11:19:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:subject:from:to:date:message-id:user-agent :content-transfer-encoding:mime-version:content-type; bh=ejcKKXn+UN8FodVQ1FyXDvphsdpwtFKRckaUzLqN5qM=; b=Eyq7vzFH3VdqSUIN15pGk45OQHWCEdu1WenNE8E5bsphI1rOXri8tV9/jjN3g2SSgz NUO8XuYCjBcl81j3Dml7cIZ6QXBeoP+b4R7nvTnnhGTmXZIpSZWctkdrVmcmCX4lJMYS MDCBzUC1cURmORIsI2dwGzTzCSZWplvKgl+X4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:date:message-id:user-agent :content-transfer-encoding:mime-version:content-type; b=mhxbuVNVKkKjvLCmx2WLLZhFzj8cC4dikdZwnC1x8mK2iISjy8CPHApphTxgErS5wg 4+ti+cNUgfmq6MEDd7Ec1pUk0RLo+i44JOf4DIPYWrlSnAvKxBc/ws/GPnOI4Z10bpl6 XY1+Pbk3xjXcAR5WCjnC3i8lnlaRIuYL3WTMM= Received: by 10.216.51.208 with SMTP id b58mr1434945wec.8.1298229561012; Sun, 20 Feb 2011 11:19:21 -0800 (PST) Received: from localhost (cpc12-cmbg15-2-0-cust81.5-4.cable.virginmedia.com [86.30.247.82]) by mx.google.com with ESMTPS id n1sm684488weq.31.2011.02.20.11.19.19 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 20 Feb 2011 11:19:20 -0800 (PST) From: Hamish To: sup-devel Date: Sun, 20 Feb 2011 19:19:17 +0000 Message-Id: <1298228733-sup-6115@whisper> User-Agent: Sup/git Content-Transfer-Encoding: 8bit MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-1298229557-625250-7026-2260-1-=" Subject: [sup-devel] Need help applying patches X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org --=-1298229557-625250-7026-2260-1-= Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Gaudenz has submitted a few useful patches which I want to commit to the gpgme branch, but git apply seems to fail. I've forwarded the message text below, and attached the patches. When I apply it gpgme, I get: $ git apply --check --verbose ../patches2merge/0001-Unify-formatting-of-GPGME-error-messages.patch Checking patch lib/sup/crypto.rb... error: while searching for: begin sig = GPGME.detach_sign(format_payload(payload), gpg_opts) rescue GPGME::Error => exc info "Error while running gpg: #{exc.message}" raise Error, "GPG command failed. See log for details." end envelope = RMail::Message.new error: patch failed: lib/sup/crypto.rb:75 error: lib/sup/crypto.rb: patch does not apply But I can't see why it could not find it. The code quoted above has moved down by 31 lines, but is otherwise unchanged, but I thought git could cope with that :/ I tried hand-editing the patch to change the line numbers, but I still get the same error. Am I missing a trick? I've checked the file formats and both have unix-style line endings. I have tried and I can apply these patches by hand, but then they will appear as committed by me, rather than giving Gaudenz his due. Do others have the same problem? You could try by checking out the gpgme branch and trying git apply. I've also tried git am on a directory with these 3 attachments in: $ git am -s ../patches2merge/ Nothing to do. Not very helpful. Any help appreciated. Hamish Downer PS I am using git 1.7.1 on Ubuntu 10.10 x86_64 --- Begin forwarded message from Gaudenz Steinlin --- From: Gaudenz Steinlin To: sup-devel Date: Thu, 17 Feb 2011 14:49:01 +0000 Subject: [sup-devel] GPGME fixes Hi While reimporting all my messages I encountered a few problemes with the GPGME code. Please consider the attached fixes. The second patch depends on the first (error message unification). But if you don't like the first I can easily produce a standalone version. Gaudenz --- End forwarded message --- --=-1298229557-625250-7026-2260-1-= Content-Disposition: attachment; filename="0003-Check-for-valid-signature-before-signature.to_s.patch" Content-Type: application/octet-stream; name="0003-Check-for-valid-signature-before-signature.to_s.patch" Content-Transfer-Encoding: base64 RnJvbSAwYTI0MmM1MGY5MzMxOWE0NzIxN2RkNTc3MDg5NzMyZjRmYmYwNjY0 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBHYXVkZW56IFN0ZWlu bGluIDxnYXVkZW56QHNvemlvbG9naWUuY2g+CkRhdGU6IFRodSwgMTcgRmVi IDIwMTEgMTU6MjY6NDEgKzAxMDAKU3ViamVjdDogW1BBVENIIDMvM10gQ2hl Y2sgZm9yIHZhbGlkIHNpZ25hdHVyZSBiZWZvcmUgc2lnbmF0dXJlLnRvX3MK CkluIHNvbWUgY2lyY3Vtc3RhbmNlcyB3aXRoIGJyb2tlbiBzaWduYXR1cmVz IHNpZ25hdHVyZS50b19zIHJldHVybnMgbmlsLgpDaGVjayBmb3IgYSB2YWxp ZCBzaWduYXR1cmUgYmVmb3JlIHJlbHlpbmcgb24gdGhpcyBzdHJpbmcuIFRo aXMgYXZvaWRzCmFuIHVuY2F1Z2h0IGV4Y2VwdGlvbi4KLS0tCiBsaWIvc3Vw L2NyeXB0by5yYiB8ICAgIDggKysrKysrKy0KIDEgZmlsZXMgY2hhbmdlZCwg NyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2xpYi9zdXAvY3J5cHRvLnJiIGIvbGliL3N1cC9jcnlwdG8ucmIKaW5kZXgg Y2JkMDc1MS4uOWFiODYwNyAxMDA2NDQKLS0tIGEvbGliL3N1cC9jcnlwdG8u cmIKKysrIGIvbGliL3N1cC9jcnlwdG8ucmIKQEAgLTI5Miw3ICsyOTIsMTMg QEAgcHJpdmF0ZQogICAgIGN0eCA9IEdQR01FOjpDdHgubmV3CiAgICAgYmVn aW4KICAgICAgIGZyb21fa2V5ID0gY3R4LmdldF9rZXkoc2lnbmF0dXJlLmZp bmdlcnByaW50KQotICAgICAgZmlyc3Rfc2lnID0gc2lnbmF0dXJlLnRvX3Mu c3ViKC9mcm9tIFswLTlBLUZdezE2fSAvLCAnZnJvbSAiJykgKyAnIicKKyAg ICAgIGlmIEdQR01FOjpncGdtZV9lcnJfY29kZShzaWduYXR1cmUuc3RhdHVz KSA9PSBHUEdNRTo6R1BHX0VSUl9HRU5FUkFMCisgICAgICAgIGZpcnN0X3Np ZyA9ICJHZW5lcmFsIGVycm9yIG9uIHNpZ25hdHVyZSB2ZXJpZmljYXRpb24g Zm9yICN7c2lnbmF0dXJlLmZpbmdlcnByaW50fSIKKyAgICAgIGVsc2lmIHNp Z25hdHVyZS50b19zCisgICAgICAgIGZpcnN0X3NpZyA9IHNpZ25hdHVyZS50 b19zLnN1YigvZnJvbSBbMC05QS1GXXsxNn0gLywgJ2Zyb20gIicpICsgJyIn CisgICAgICBlbHNlCisgICAgICAgIGZpcnN0X3NpZyA9ICJVbmtub3duIGVy cm9yIG9yIGVtcHR5IHNpZ25hdHVyZSIKKyAgICAgIGVuZAogICAgIHJlc2N1 ZSBFT0ZFcnJvcgogICAgICAgZnJvbV9rZXkgPSBuaWwKICAgICAgIGZpcnN0 X3NpZyA9ICJObyBwdWJsaWMga2V5IGF2YWlsYWJsZSBmb3IgI3tzaWduYXR1 cmUuZmluZ2VycHJpbnR9IgotLSAKMS43LjIuMwoK --=-1298229557-625250-7026-2260-1-= Content-Disposition: attachment; filename="0002-Check-for-ArgumentError-on-signature-verification.patch" Content-Type: application/octet-stream; name="0002-Check-for-ArgumentError-on-signature-verification.patch" Content-Transfer-Encoding: base64 RnJvbSBmODZkMGJiNmMyY2M5YTFkOGVmNTQ0YTM0ZjljMTBmNzM4NTA3Njdj IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBHYXVkZW56IFN0ZWlu bGluIDxnYXVkZW56QHNvemlvbG9naWUuY2g+CkRhdGU6IFRodSwgMTcgRmVi IDIwMTEgMTU6MTM6MzEgKzAxMDAKU3ViamVjdDogW1BBVENIIDIvM10gQ2hl Y2sgZm9yIEFyZ3VtZW50RXJyb3Igb24gc2lnbmF0dXJlIHZlcmlmaWNhdGlv bgoKQnJva2VuIHNpZ25hdHVyZXMgY2FuIGNhdXNlIGEgTlVMTCBwb2ludGVy IHdoaWNoIHJlc3VsdHMgaW4gYW4KQXJndWVtZW50RXJyb3Igd2hlbiBjYWxs aW5nIGN0eC52ZXJpZnlfcmVzdWx0IGV2ZW4gaWYgdGhlIHByZXZpb3VzIGNh bGwKdG8gY3R4LnZlcmlmeSBkb2VzIG5vdCByYWlzZSBhbiBleGNlcHRpb24u CgpUaGUgdW5kZXJsaW5nIGNhdXNlIGlzIHByb2JhYmx5IGEgYnVnIGluIEdQ R01FLgotLS0KIGxpYi9zdXAvY3J5cHRvLnJiIHwgICAxMiArKysrKysrKysr LS0KIDEgZmlsZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMiBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWIvc3VwL2NyeXB0by5yYiBiL2xp Yi9zdXAvY3J5cHRvLnJiCmluZGV4IGEzNzcxYmYuLmNiZDA3NTEgMTAwNjQ0 Ci0tLSBhL2xpYi9zdXAvY3J5cHRvLnJiCisrKyBiL2xpYi9zdXAvY3J5cHRv LnJiCkBAIC0xODMsNyArMTgzLDExIEBAIEVPUwogICAgIHJlc2N1ZSBHUEdN RTo6RXJyb3IgPT4gZXhjCiAgICAgICByZXR1cm4gdW5rbm93bl9zdGF0dXMg W2dwZ21lX2V4Y19tc2coZXhjLm1lc3NhZ2UpXQogICAgIGVuZAotICAgIHNl bGYudmVyaWZpZWRfb2s/IGN0eC52ZXJpZnlfcmVzdWx0CisgICAgYmVnaW4K KyAgICAgIHNlbGYudmVyaWZpZWRfb2s/IGN0eC52ZXJpZnlfcmVzdWx0Cisg ICAgcmVzY3VlIEFyZ3VtZW50RXJyb3IgPT4gZXhjCisgICAgICByZXR1cm4g dW5rbm93bl9zdGF0dXMgW2dwZ21lX2V4Y19tc2coZXhjLm1lc3NhZ2UpXQor ICAgIGVuZAogICBlbmQKIAogICAjIyByZXR1cm5zIGRlY3J5cHRlZF9tZXNz YWdlLCBzdGF0dXMsIGRlc2MsIGxpbmVzCkBAIC0yMDEsNyArMjA1LDExIEBA IEVPUwogICAgIHJlc2N1ZSBHUEdNRTo6RXJyb3IgPT4gZXhjCiAgICAgICBy ZXR1cm4gQ2h1bms6OkNyeXB0b05vdGljZS5uZXcoOmludmFsaWQsICJUaGlz IG1lc3NhZ2UgY291bGQgbm90IGJlIGRlY3J5cHRlZCIsIGdwZ21lX2V4Y19t c2coZXhjLm1lc3NhZ2UpKQogICAgIGVuZAotICAgIHNpZyA9IHNlbGYudmVy aWZpZWRfb2s/IGN0eC52ZXJpZnlfcmVzdWx0CisgICAgYmVnaW4KKyAgICAg IHNpZyA9IHNlbGYudmVyaWZpZWRfb2s/IGN0eC52ZXJpZnlfcmVzdWx0Cisg ICAgcmVzY3VlIEFyZ3VtZW50RXJyb3IgPT4gZXhjCisgICAgICBzaWcgPSB1 bmtub3duX3N0YXR1cyBbZ3BnbWVfZXhjX21zZyhleGMubWVzc2FnZSldCisg ICAgZW5kCiAgICAgcGxhaW5fZGF0YS5zZWVrKDAsIElPOjpTRUVLX1NFVCkK ICAgICBvdXRwdXQgPSBwbGFpbl9kYXRhLnJlYWQKICAgICBvdXRwdXQuZm9y Y2VfZW5jb2RpbmcgRW5jb2Rpbmc6OkFTQ0lJXzhCSVQgaWYgb3V0cHV0LnJl c3BvbmRfdG8/IDpmb3JjZV9lbmNvZGluZwotLSAKMS43LjIuMwoK --=-1298229557-625250-7026-2260-1-= Content-Disposition: attachment; filename="0001-Unify-formatting-of-GPGME-error-messages.patch" Content-Type: application/octet-stream; name="0001-Unify-formatting-of-GPGME-error-messages.patch" Content-Transfer-Encoding: base64 RnJvbSBiNTJhMzA2ZWQxMTk3MTVlNWRhYzI2ZjM1YTQwNmVjZGQ0YzVmYjg3 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBHYXVkZW56IFN0ZWlu bGluIDxnYXVkZW56QHNvemlvbG9naWUuY2g+CkRhdGU6IFRodSwgMTcgRmVi IDIwMTEgMTU6MDk6MjMgKzAxMDAKU3ViamVjdDogW1BBVENIIDEvM10gVW5p ZnkgZm9ybWF0dGluZyBvZiBHUEdNRSBlcnJvciBtZXNzYWdlcwoKQ3JlYXRl IGEgcHJpdmF0ZSBmdW5jdGlvbiB0byB0dXJuIGEgYW4gZXhjZXB0aW9uIGlu dG8gYSAiaHVtYW4gZnJpZW5kbHkiCmVycm9yIG1lc3NhZ2UgYW5kIHRvIGFk ZCBhIGVudHJ5IHRvIHRoZSBsb2dmaWxlLiBVc2UgdGhpcyBmdW5jdGlvbiBm b3IKYWxsIGVycm9yIHBhdGhzLgotLS0KIGxpYi9zdXAvY3J5cHRvLnJiIHwg ICAxNyArKysrKysrKysrLS0tLS0tLQogMSBmaWxlcyBjaGFuZ2VkLCAxMCBp bnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xp Yi9zdXAvY3J5cHRvLnJiIGIvbGliL3N1cC9jcnlwdG8ucmIKaW5kZXggMmJm YjQ3NS4uYTM3NzFiZiAxMDA2NDQKLS0tIGEvbGliL3N1cC9jcnlwdG8ucmIK KysrIGIvbGliL3N1cC9jcnlwdG8ucmIKQEAgLTc1LDggKzc1LDcgQEAgRU9T CiAgICAgYmVnaW4KICAgICAgIHNpZyA9IEdQR01FLmRldGFjaF9zaWduKGZv cm1hdF9wYXlsb2FkKHBheWxvYWQpLCBncGdfb3B0cykKICAgICByZXNjdWUg R1BHTUU6OkVycm9yID0+IGV4YwotICAgICAgaW5mbyAiRXJyb3Igd2hpbGUg cnVubmluZyBncGc6ICN7ZXhjLm1lc3NhZ2V9IgotICAgICAgcmFpc2UgRXJy b3IsICJHUEcgY29tbWFuZCBmYWlsZWQuIFNlZSBsb2cgZm9yIGRldGFpbHMu IgorICAgICAgcmFpc2UgRXJyb3IsIGdwZ21lX2V4Y19tc2coZXhjLm1lc3Nh Z2UpCiAgICAgZW5kCiAKICAgICBlbnZlbG9wZSA9IFJNYWlsOjpNZXNzYWdl Lm5ldwpAQCAtMTAzLDggKzEwMiw3IEBAIEVPUwogICAgIGJlZ2luCiAgICAg ICBjaXBoZXIgPSBHUEdNRS5lbmNyeXB0KHJlY2lwaWVudHMsIGZvcm1hdF9w YXlsb2FkKHBheWxvYWQpLCBncGdfb3B0cykKICAgICByZXNjdWUgR1BHTUU6 OkVycm9yID0+IGV4YwotICAgICAgaW5mbyAiRXJyb3Igd2hpbGUgcnVubmlu ZyBncGc6ICN7ZXhjLm1lc3NhZ2V9IgotICAgICAgcmFpc2UgRXJyb3IsICJH UEcgY29tbWFuZCBmYWlsZWQuIFNlZSBsb2cgZm9yIGRldGFpbHMuIgorICAg ICAgcmFpc2UgRXJyb3IsIGdwZ21lX2V4Y19tc2coZXhjLm1lc3NhZ2UpCiAg ICAgZW5kCiAKICAgICBlbmNyeXB0ZWRfcGF5bG9hZCA9IFJNYWlsOjpNZXNz YWdlLm5ldwpAQCAtMTgzLDcgKzE4MSw3IEBAIEVPUwogICAgIGJlZ2luCiAg ICAgICBjdHgudmVyaWZ5KHNpZ19kYXRhLCBzaWduZWRfdGV4dF9kYXRhLCBw bGFpbl9kYXRhKQogICAgIHJlc2N1ZSBHUEdNRTo6RXJyb3IgPT4gZXhjCi0g ICAgICByZXR1cm4gdW5rbm93bl9zdGF0dXMgZXhjLm1lc3NhZ2UKKyAgICAg IHJldHVybiB1bmtub3duX3N0YXR1cyBbZ3BnbWVfZXhjX21zZyhleGMubWVz c2FnZSldCiAgICAgZW5kCiAgICAgc2VsZi52ZXJpZmllZF9vaz8gY3R4LnZl cmlmeV9yZXN1bHQKICAgZW5kCkBAIC0yMDEsOCArMTk5LDcgQEAgRU9TCiAg ICAgYmVnaW4KICAgICAgIGN0eC5kZWNyeXB0X3ZlcmlmeShjaXBoZXJfZGF0 YSwgcGxhaW5fZGF0YSkKICAgICByZXNjdWUgR1BHTUU6OkVycm9yID0+IGV4 YwotICAgICAgaW5mbyAiRXJyb3Igd2hpbGUgcnVubmluZyBncGc6ICN7ZXhj Lm1lc3NhZ2V9IgotICAgICAgcmV0dXJuIENodW5rOjpDcnlwdG9Ob3RpY2Uu bmV3KDppbnZhbGlkLCAiVGhpcyBtZXNzYWdlIGNvdWxkIG5vdCBiZSBkZWNy eXB0ZWQiLCBleGMubWVzc2FnZSkKKyAgICAgIHJldHVybiBDaHVuazo6Q3J5 cHRvTm90aWNlLm5ldyg6aW52YWxpZCwgIlRoaXMgbWVzc2FnZSBjb3VsZCBu b3QgYmUgZGVjcnlwdGVkIiwgZ3BnbWVfZXhjX21zZyhleGMubWVzc2FnZSkp CiAgICAgZW5kCiAgICAgc2lnID0gc2VsZi52ZXJpZmllZF9vaz8gY3R4LnZl cmlmeV9yZXN1bHQKICAgICBwbGFpbl9kYXRhLnNlZWsoMCwgSU86OlNFRUtf U0VUKQpAQCAtMjY0LDYgKzI2MSwxMiBAQCBwcml2YXRlCiAgICAgWyJDYW4n dCBmaW5kIGdwZ21lIGdlbS4iXQogICBlbmQKIAorICBkZWYgZ3BnbWVfZXhj X21zZyBtc2cKKyAgICBlcnJfbXNnID0gIkV4Y2VwdGlvbiBpbiBHUEdNRSBj YWxsOiAje21zZ30iCisgICAgaW5mbyBlcnJfbXNnCisgICAgZXJyX21zZwor ICBlbmQKKwogICAjIyBoZXJlJ3Mgd2hlcmUgd2UgbXVuZ2Ugcm1haWwgb3V0 cHV0IGludG8gdGhlIGZvcm1hdCB0aGF0IHNpZ25lZC9lbmNyeXB0ZWQKICAg IyMgUEdQL0dQRyBtZXNzYWdlcyBzaG91bGQgYmUKICAgZGVmIGZvcm1hdF9w YXlsb2FkIHBheWxvYWQKLS0gCjEuNy4yLjMKCg== --=-1298229557-625250-7026-2260-1-= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel --=-1298229557-625250-7026-2260-1-=--