From 2f160430e79798571585c97cbd682c5eafe2779b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 9 May 2010 10:30:22 +0200 Subject: [PATCH] netpgp: update to 20100507. --- srcpkgs/netpgp/libnetpgp.template | 2 -- .../missing-enum-definition-verify.c.patch | 19 ------------------- ...validate-detached-armored-validate.c.patch | 12 ------------ srcpkgs/netpgp/template | 5 +++-- 4 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/netpgp/patches/missing-enum-definition-verify.c.patch delete mode 100644 srcpkgs/netpgp/patches/validate-detached-armored-validate.c.patch diff --git a/srcpkgs/netpgp/libnetpgp.template b/srcpkgs/netpgp/libnetpgp.template index 169c951636..65395bfb44 100644 --- a/srcpkgs/netpgp/libnetpgp.template +++ b/srcpkgs/netpgp/libnetpgp.template @@ -10,8 +10,6 @@ long_desc=" identifier. netpgp can also encrypt files using the public or private keys of users and, in the same manner, decrypt files which were encrypted." -revision=1 - Add_dependency run glibc Add_dependency run zlib Add_dependency run bzip2 diff --git a/srcpkgs/netpgp/patches/missing-enum-definition-verify.c.patch b/srcpkgs/netpgp/patches/missing-enum-definition-verify.c.patch deleted file mode 100644 index 38049db5ed..0000000000 --- a/srcpkgs/netpgp/patches/missing-enum-definition-verify.c.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/netpgpverify/verify.c.orig 2010-05-04 01:00:46.490355473 +0200 -+++ src/netpgpverify/verify.c 2010-03-14 00:30:41.000000000 +0100 -@@ -569,6 +569,7 @@ typedef struct __ops_ptag_t { - * \see RFC4880 9.1 - */ - typedef enum { -+ OPS_PKA_NOTHING = 0, - OPS_PKA_RSA = 1, /* RSA (Encrypt or Sign) */ - OPS_PKA_RSA_ENCRYPT_ONLY = 2, /* RSA Encrypt-Only (deprecated - - * \see RFC4880 13.5) */ -@@ -5551,7 +5550,7 @@ __ops_pubkey_free(__ops_pubkey_t *p) - free_BN(&p->key.elgamal.y); - break; - -+ case OPS_PKA_NOTHING: -- case 0: - /* nothing to free */ - break; - diff --git a/srcpkgs/netpgp/patches/validate-detached-armored-validate.c.patch b/srcpkgs/netpgp/patches/validate-detached-armored-validate.c.patch deleted file mode 100644 index c83a434491..0000000000 --- a/srcpkgs/netpgp/patches/validate-detached-armored-validate.c.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/lib/validate.c.orig 2010-05-04 02:07:27.512355384 +0200 -+++ src/lib/validate.c 2010-05-04 02:08:47.038371812 +0200 -@@ -814,7 +814,8 @@ __ops_validate_file(__ops_io_t *io, - sigsize = st.st_size; - detachname = NULL; - cc = snprintf(origfile, sizeof(origfile), "%s", infile); -- if (strcmp(&origfile[cc - 4], ".sig") == 0) { -+ if ((strcmp(&origfile[cc - 4], ".sig") == 0) || -+ (strcmp(&origfile[cc - 4], ".asc") == 0)) { - origfile[cc - 4] = 0x0; - if (stat(origfile, &st) == 0 && - st.st_size > sigsize - SIG_OVERHEAD) { diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template index c27e8d1ac5..754c083995 100644 --- a/srcpkgs/netpgp/template +++ b/srcpkgs/netpgp/template @@ -1,11 +1,11 @@ # Template file for 'netpgp' pkgname=netpgp -version=20100313 +version=20100507 distfiles="ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="PGP signing, verification, encryption and decryption program" maintainer="Juan RP " -checksum=e358f000962f0bad2b93a9eda0b34271afd8a78daccd6ed51b77ba4ea07ddcca +checksum=fdfb46dba759c9d084b457f62fabf81ecdbf95fdc41888074afc1e1505e973b5 long_desc=" The netpgp library is a BSD-licensed library for managing PGP keys. @@ -27,6 +27,7 @@ long_desc=" The other user's public key can be added to our keyring. The other user will add our public key to their keyring." +CFLAGS="-ggdb" subpackages="libnetpgp libnetpgp-devel" Add_dependency run glibc