Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5d2ea51cb2bcebba31f6e13cff50ff9ffbfd7e40
commit 5d2ea51cb2bcebba31f6e13cff50ff9ffbfd7e40 Author: crazy <[EMAIL PROTECTED]> Date: Wed Mar 26 14:56:08 2008 +0100 Revert "gnupg2-2.0.8-2-i686" * This reverts commit 5aeba79d0ad32c09cb0151ada1060c2b0a374727. diff --git a/source/apps/gnupg2/FrugalBuild b/source/apps/gnupg2/FrugalBuild index 8103a65..4bd5ce2 100644 --- a/source/apps/gnupg2/FrugalBuild +++ b/source/apps/gnupg2/FrugalBuild @@ -4,7 +4,7 @@ pkgname=gnupg2 origname=gnupg pkgver=2.0.8 -pkgrel=2 +pkgrel=1 pkgdesc="GnuPG2 is the new modularized version of GnuPG supporting OpenPGP and S/MIME" url="http://www.gnupg.org/" ## libldap @@ -13,7 +13,7 @@ makedepends=('libassuan>=0.9.3') groups=('apps') archs=('i686' 'x86_64') up2date="lynx -dump http://www.gnupg.org/download/index.html |grep gnupg-2.0.*tar |sed -n -e 's/.*g-\(.*\)\.t.*/\1/;s/-/_/;1 p'" -source=(ftp://ftp.gnupg.org/gcrypt/$origname/$origname-$pkgver.tar.bz2 collapse-uids-2.0.8.patch) +source=(ftp://ftp.gnupg.org/gcrypt/$origname/$origname-$pkgver.tar.bz2) subpkgs=('gpg-agent') subdescs=('gpg-agent is made for handling gpg-keys') @@ -40,6 +40,5 @@ build() -sha1sums=('baeb7962f9d3d4628ada78036d1f5d4480aaa2d9' \ - 'dc31dd5d63fa9997db859fbc30adbdcb268ca995') +sha1sums=('baeb7962f9d3d4628ada78036d1f5d4480aaa2d9') # optimization OK diff --git a/source/apps/gnupg2/collapse-uids-2.0.8.patch b/source/apps/gnupg2/collapse-uids-2.0.8.patch deleted file mode 100644 index 209b579..0000000 --- a/source/apps/gnupg2/collapse-uids-2.0.8.patch +++ /dev/null @@ -1,78 +0,0 @@ -Index: import.c -=================================================================== ---- g10/import.c (revision 4710) -+++ g10/import.c (working copy) -@@ -1661,11 +1661,17 @@ - { - KBNODE uid2; - -+ if(is_deleted_kbnode(uid1)) -+ continue; -+ - if(uid1->pkt->pkttype!=PKT_USER_ID) - continue; - - for(uid2=uid1->next;uid2;uid2=uid2->next) - { -+ if(is_deleted_kbnode(uid2)) -+ continue; -+ - if(uid2->pkt->pkttype!=PKT_USER_ID) - continue; - -@@ -1681,6 +1687,9 @@ - uid1 */ - for(last=uid2;last->next;last=last->next) - { -+ if(is_deleted_kbnode(last)) -+ continue; -+ - if(last->next->pkt->pkttype==PKT_USER_ID - || last->next->pkt->pkttype==PKT_PUBLIC_SUBKEY - || last->next->pkt->pkttype==PKT_SECRET_SUBKEY) -@@ -1693,13 +1702,16 @@ - /* Now put uid2 in place as part of uid1 */ - last->next=uid1->next; - uid1->next=uid2; -- remove_kbnode(keyblock,uid2); -+ delete_kbnode(uid2); - - /* Now dedupe uid1 */ - for(sig1=uid1->next;sig1;sig1=sig1->next) - { - KBNODE sig2; - -+ if(is_deleted_kbnode(sig1)) -+ continue; -+ - if(sig1->pkt->pkttype==PKT_USER_ID - || sig1->pkt->pkttype==PKT_PUBLIC_SUBKEY - || sig1->pkt->pkttype==PKT_SECRET_SUBKEY) -@@ -1710,6 +1722,9 @@ - - for(sig2=sig1->next,last=sig1;sig2;last=sig2,sig2=sig2->next) - { -+ if(is_deleted_kbnode(sig2)) -+ continue; -+ - if(sig2->pkt->pkttype==PKT_USER_ID - || sig2->pkt->pkttype==PKT_PUBLIC_SUBKEY - || sig2->pkt->pkttype==PKT_SECRET_SUBKEY) -@@ -1723,7 +1738,7 @@ - { - /* We have a match, so delete the second - signature */ -- remove_kbnode(&uid1,sig2); -+ delete_kbnode(sig2); - sig2=last; - } - } -@@ -1732,6 +1747,8 @@ - } - } - -+ commit_kbnode(keyblock); -+ - if(any && !opt.quiet) - { - const char *key="???"; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
