diff options
author | Daniel Black <dragonheart@gentoo.org> | 2007-02-18 12:31:49 +0000 |
---|---|---|
committer | Daniel Black <dragonheart@gentoo.org> | 2007-02-18 12:31:49 +0000 |
commit | e00331b1f1ebb9d3a7fd7a4f26842bbd7b0fffcb (patch) | |
tree | 9b6533a5d0b0fb5cc8743014a585fdfcf0e4cdcd /app-crypt/gnupg/files | |
parent | Stable on ppc wrt bug 160141 (diff) | |
download | gentoo-2-e00331b1f1ebb9d3a7fd7a4f26842bbd7b0fffcb.tar.gz gentoo-2-e00331b1f1ebb9d3a7fd7a4f26842bbd7b0fffcb.tar.bz2 gentoo-2-e00331b1f1ebb9d3a7fd7a4f26842bbd7b0fffcb.zip |
old patch cleanout
(Portage version: 2.1.2-r9)
Diffstat (limited to 'app-crypt/gnupg/files')
-rw-r--r-- | app-crypt/gnupg/files/gnupg-1.4-emptytrustpackets.patch | 17 | ||||
-rw-r--r-- | app-crypt/gnupg/files/gnupg-1.4.2-jari.patch | 11 | ||||
-rw-r--r-- | app-crypt/gnupg/files/gnupg-1.4.2-keyserver.patch | 13 | ||||
-rw-r--r-- | app-crypt/gnupg/files/gnupg-1.4.2-mpicoder.patch | 37 | ||||
-rw-r--r-- | app-crypt/gnupg/files/gnupg-1.4.2.2-badruman.patch | 12 | ||||
-rw-r--r-- | app-crypt/gnupg/files/gnupg-1.4.2.2-selftest.patch | 30 | ||||
-rw-r--r-- | app-crypt/gnupg/files/gnupg-1.4.2.2-test.patch | 14 | ||||
-rw-r--r-- | app-crypt/gnupg/files/gnupg-1.4.3-badruman.patch | 12 | ||||
-rw-r--r-- | app-crypt/gnupg/files/gnupg-1.4.3-jari.patch | 12 | ||||
-rw-r--r-- | app-crypt/gnupg/files/gnupg-1.4.5-ecc-helper.patch | 13 |
10 files changed, 0 insertions, 171 deletions
diff --git a/app-crypt/gnupg/files/gnupg-1.4-emptytrustpackets.patch b/app-crypt/gnupg/files/gnupg-1.4-emptytrustpackets.patch deleted file mode 100644 index ff8d43ce2d39..000000000000 --- a/app-crypt/gnupg/files/gnupg-1.4-emptytrustpackets.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- trunk/g10/mainproc.c 2006/03/22 14:37:53 4077 -+++ trunk/g10/mainproc.c 2006/04/08 01:23:23 4096 -@@ -937,10 +937,12 @@ - putchar('\n'); - if( opt.fingerprint && !any ) - print_fingerprint( pk, NULL, 0 ); -- if( node->next -+ if( opt.with_colons -+ && node->next - && node->next->pkt->pkttype == PKT_RING_TRUST ) { - printf("rtv:2:%u:\n", -- node->next->pkt->pkt.ring_trust->trustval ); -+ node->next->pkt->pkt.ring_trust? -+ node->next->pkt->pkt.ring_trust->trustval : 0); - } - any=1; - } diff --git a/app-crypt/gnupg/files/gnupg-1.4.2-jari.patch b/app-crypt/gnupg/files/gnupg-1.4.2-jari.patch deleted file mode 100644 index 70720d2c5292..000000000000 --- a/app-crypt/gnupg/files/gnupg-1.4.2-jari.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnupg-1.4.1/g10/passphrase.c.old Tue Feb 15 13:02:31 2005 -+++ gnupg-1.4.1/g10/passphrase.c Wed Mar 16 17:35:20 2005 -@@ -1331,7 +1331,7 @@ - if( create && !pass ) { - randomize_buffer(s2k->salt, 8, 1); - if( s2k->mode == 3 ) -- s2k->count = 96; /* 65536 iterations */ -+ s2k->count = 208; /* 8388608 byte count */ - } - - if( s2k->mode == 3 ) { diff --git a/app-crypt/gnupg/files/gnupg-1.4.2-keyserver.patch b/app-crypt/gnupg/files/gnupg-1.4.2-keyserver.patch deleted file mode 100644 index 8590f401bfa8..000000000000 --- a/app-crypt/gnupg/files/gnupg-1.4.2-keyserver.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- g10/keyserver.c.orig 2005-08-31 13:17:20.000000000 +1000 -+++ g10/keyserver.c 2005-08-31 13:18:19.000000000 +1000 -@@ -860,7 +860,9 @@ - static const char * - keyserver_typemap(const char *type) - { -- if(strcmp(type,"ldaps")==0) -+ if(strcmp(type,"ldap")==0) -+ return "ldap"; -+ else if(strcmp(type,"ldaps")==0) - return "ldap"; - else if(curl_can_handle(type)) - return "curl"; diff --git a/app-crypt/gnupg/files/gnupg-1.4.2-mpicoder.patch b/app-crypt/gnupg/files/gnupg-1.4.2-mpicoder.patch deleted file mode 100644 index f328371b6e57..000000000000 --- a/app-crypt/gnupg/files/gnupg-1.4.2-mpicoder.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -urNad gnupg-1.4.2~/mpi/mpicoder.c gnupg-1.4.2/mpi/mpicoder.c ---- gnupg-1.4.2~/mpi/mpicoder.c 2005-05-31 06:30:05.000000000 +0000 -+++ gnupg-1.4.2/mpi/mpicoder.c 2005-09-29 00:52:19.000000000 +0000 -@@ -80,16 +80,20 @@ - mpi_limb_t a; - MPI val = MPI_NULL; - -+ if (nread == nmax) -+ goto overflow; - if( (c = iobuf_get(inp)) == -1 ) - goto leave; -- if (++nread >= nmax) -- goto overflow; -+ nread++; - nbits = c << 8; -+ -+ if (nread == nmax) -+ goto overflow; - if( (c = iobuf_get(inp)) == -1 ) - goto leave; -- if (++nread >= nmax) -- goto overflow; -+ nread++; - nbits |= c; -+ - if( nbits > MAX_EXTERN_MPI_BITS ) { - log_error("mpi too large for this implementation (%u bits)\n", nbits); - goto leave; -@@ -112,7 +116,7 @@ - for( ; j > 0; j-- ) { - a = 0; - for(; i < BYTES_PER_MPI_LIMB; i++ ) { -- if (nread >= nmax) { -+ if (nread == nmax) { - #ifdef M_DEBUG - mpi_debug_free (val); - #else
\ No newline at end of file diff --git a/app-crypt/gnupg/files/gnupg-1.4.2.2-badruman.patch b/app-crypt/gnupg/files/gnupg-1.4.2.2-badruman.patch deleted file mode 100644 index 4584cd15f0d1..000000000000 --- a/app-crypt/gnupg/files/gnupg-1.4.2.2-badruman.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --exclude='*~' -Naur gnupg-1.4.2.2.orig/doc/Makefile.in gnupg-1.4.2.2/doc/Makefile.in ---- gnupg-1.4.2.2.orig/doc/Makefile.in 2006-03-08 15:20:05.000000000 -0300 -+++ gnupg-1.4.2.2/doc/Makefile.in 2006-03-08 15:20:39.000000000 -0300 -@@ -280,7 +280,7 @@ - HACKING OpenPGP README.W32 samplekeys.asc gnupg.7 \ - TRANSLATE gpg.ru.sgml gpg.ru.1 highlights-1.4.txt - --man_MANS = gpg.1 gpgv.1 gnupg.7 gpg.ru.1 -+man_MANS = gpg.1 gpgv.1 gnupg.7 - info_TEXINFOS = gpg.texi gpgv.texi - - # Need this to avoid building of dvis with automake 1.4 diff --git a/app-crypt/gnupg/files/gnupg-1.4.2.2-selftest.patch b/app-crypt/gnupg/files/gnupg-1.4.2.2-selftest.patch deleted file mode 100644 index 87f4e887ad8e..000000000000 --- a/app-crypt/gnupg/files/gnupg-1.4.2.2-selftest.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --exclude='*~' -Naur gnupg-1.4.2.2.orig/checks/Makefile.in gnupg-1.4.2.2/checks/Makefile.in ---- gnupg-1.4.2.2.orig/checks/Makefile.in 2006-03-08 15:14:42.000000000 -0300 -+++ gnupg-1.4.2.2/checks/Makefile.in 2006-03-08 15:16:53.000000000 -0300 -@@ -517,9 +517,11 @@ - - ./gpg_dearmor: - echo '#!/bin/sh' >./gpg_dearmor -- echo "../g10/gpg --no-options --no-greeting \ -+ echo "../g10/gpg --no-options --no-greeting --homedir . \ - --no-secmem-warning --batch --dearmor" >>./gpg_dearmor - chmod 755 ./gpg_dearmor -+ if test ! -f ./pubring.gpg; then touch -t 197001020000 ./pubring.gpg; fi -+ if test ! -f ./secring.gpg; then touch -t 197001020000 ./secring.gpg; fi - - ./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc ./gpg_dearmor - ./gpg_dearmor > ./pubring.gpg < $(srcdir)/pubring.asc -diff --exclude='*~' -Naur gnupg-1.4.2.2.orig/g10/openfile.c gnupg-1.4.2.2/g10/openfile.c ---- gnupg-1.4.2.2.orig/g10/openfile.c 2006-03-08 15:14:42.000000000 -0300 -+++ gnupg-1.4.2.2/g10/openfile.c 2006-03-08 15:17:31.000000000 -0300 -@@ -399,8 +399,10 @@ - * To cope with HOME, we do compare only the suffix if we see that - * the default homedir does start with a tilde. - */ -+#ifndef ENABLE_SELINUX_HACKS - if( opt.dry_run || opt.no_homedir_creation ) - return; -+#endif - - if ( ( *defhome == '~' - && ( strlen(fname) >= strlen (defhome+1) diff --git a/app-crypt/gnupg/files/gnupg-1.4.2.2-test.patch b/app-crypt/gnupg/files/gnupg-1.4.2.2-test.patch deleted file mode 100644 index 134ffcdb46b1..000000000000 --- a/app-crypt/gnupg/files/gnupg-1.4.2.2-test.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gnupg-1.4.2.2/checks/defs.inc -+++ gnupg-1.4.2.2/checks/defs.inc -@@ -156,9 +156,9 @@ - - GPG="../g10/gpg --no-permission-warning --homedir . " - --[ -n "${BASH_VERSION+set}" ] && exec 5>/dev/stderr -- - exec 2> ${pgmname}.log - -+[ -n "${BASH_VERSION+set}" ] && exec 5>&2 -+ - : - # end diff --git a/app-crypt/gnupg/files/gnupg-1.4.3-badruman.patch b/app-crypt/gnupg/files/gnupg-1.4.3-badruman.patch deleted file mode 100644 index 1a46db63ee15..000000000000 --- a/app-crypt/gnupg/files/gnupg-1.4.3-badruman.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur gnupg-1.4.3.orig/doc/Makefile.in gnupg-1.4.3/doc/Makefile.in ---- gnupg-1.4.3.orig/doc/Makefile.in 2006-04-03 11:45:06.000000000 +0200 -+++ gnupg-1.4.3/doc/Makefile.in 2006-04-09 14:10:13.000000000 +0200 -@@ -303,7 +303,7 @@ - HACKING OpenPGP README.W32 samplekeys.asc gnupg.7 \ - TRANSLATE gpg.ru.sgml gpg.ru.1 highlights-1.4.txt - --man_MANS = gpg.1 gpgv.1 gnupg.7 gpg.ru.1 -+man_MANS = gpg.1 gpgv.1 gnupg.7 - info_TEXINFOS = gpg.texi gpgv.texi - - # Need this to avoid building of dvis with automake 1.4 diff --git a/app-crypt/gnupg/files/gnupg-1.4.3-jari.patch b/app-crypt/gnupg/files/gnupg-1.4.3-jari.patch deleted file mode 100644 index e7681fe84b78..000000000000 --- a/app-crypt/gnupg/files/gnupg-1.4.3-jari.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur gnupg-1.4.3.orig/g10/passphrase.c gnupg-1.4.3/g10/passphrase.c ---- gnupg-1.4.3.orig/g10/passphrase.c 2006-01-26 16:31:03.000000000 +0100 -+++ gnupg-1.4.3/g10/passphrase.c 2006-04-09 14:18:20.000000000 +0200 -@@ -1036,7 +1036,7 @@ - if( create && !pass ) { - randomize_buffer(s2k->salt, 8, 1); - if( s2k->mode == 3 ) -- s2k->count = 96; /* 65536 iterations */ -+ s2k->count = 208; /* 8388608 iterations */ - } - - if( s2k->mode == 3 ) { diff --git a/app-crypt/gnupg/files/gnupg-1.4.5-ecc-helper.patch b/app-crypt/gnupg/files/gnupg-1.4.5-ecc-helper.patch deleted file mode 100644 index 23450832bcc1..000000000000 --- a/app-crypt/gnupg/files/gnupg-1.4.5-ecc-helper.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- gnupg-1.4.4-ecc0.1.6.diff.orig 2006-08-01 10:22:39.000000000 +1000 -+++ gnupg-1.4.4-ecc0.1.6.diff 2006-08-01 10:24:34.000000000 +1000 -@@ -1961,8 +1961,8 @@ - - # Define the identity of the package. - PACKAGE='gnupg' --- VERSION='1.4.4' --+ VERSION='1.4.4-ecc0.1.6' -+- VERSION='1.4.5' -++ VERSION='1.4.5-ecc0.1.6' - - - cat >>confdefs.h <<_ACEOF |