diff options
Diffstat (limited to 'security/gnupg')
| -rw-r--r-- | security/gnupg/Makefile | 3 | ||||
| -rw-r--r-- | security/gnupg/distinfo | 4 | ||||
| -rw-r--r-- | security/gnupg/files/patch-configure | 28 | ||||
| -rw-r--r-- | security/gnupg/files/patch-getkey.c | 28 | ||||
| -rw-r--r-- | security/gnupg/files/patch-keygen.c | 33 | ||||
| -rw-r--r-- | security/gnupg/pkg-plist | 6 |
6 files changed, 9 insertions, 93 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 81e30c469d4c..32f366b41668 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnupg -PORTVERSION= 1.2.3 -PORTREVISION= 4 +PORTVERSION= 1.2.4 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gnupg diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index 9a51a43db780..d48886fb65db 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,2 +1,2 @@ -MD5 (gnupg-1.2.3.tar.bz2) = cdca1282d7901f9ddb52f9725b001af2 -MD5 (gnupg-1.2.3.tar.bz2.sig) = 7d0d3b875b73ec65b38b7607420542fc +MD5 (gnupg-1.2.4.tar.bz2) = 16d0b575812060328f8e677b7f0047cc +MD5 (gnupg-1.2.4.tar.bz2.sig) = 903daeb1cf4c787e1f09213b8e4b54a0 diff --git a/security/gnupg/files/patch-configure b/security/gnupg/files/patch-configure deleted file mode 100644 index d0072727983f..000000000000 --- a/security/gnupg/files/patch-configure +++ /dev/null @@ -1,28 +0,0 @@ ---- configure.orig Fri Aug 22 04:50:00 2003 -+++ configure Mon Oct 27 04:14:29 2003 -@@ -9208,7 +9208,7 @@ - echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 - echo "${ECHO_T}$ac_cv_func_dlopen" >&6 - if test $ac_cv_func_dlopen = yes; then -- : -+ found_dlopen=yes - else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 - echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -@@ -9266,6 +9266,7 @@ - echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 - if test $ac_cv_lib_dl_dlopen = yes; then - found_dlopen=yes -+ need_libdl=yes - fi - - fi -@@ -9281,6 +9282,8 @@ - #define HAVE_DL_DLOPEN 1 - _ACEOF - -+ fi -+ if test x"$need_libdl" = "xyes" ; then - DLLIBS="-ldl" - - fi diff --git a/security/gnupg/files/patch-getkey.c b/security/gnupg/files/patch-getkey.c deleted file mode 100644 index fdbb5ec441aa..000000000000 --- a/security/gnupg/files/patch-getkey.c +++ /dev/null @@ -1,28 +0,0 @@ ---- g10/getkey.c.orig Tue Jul 29 03:34:41 2003 -+++ g10/getkey.c Thu Nov 27 18:54:55 2003 -@@ -1655,6 +1655,11 @@ - if ( x ) /* mask it down to the actual allowed usage */ - key_usage &= x; - } -+ -+ /* Type 20 Elgamal keys are not usable. */ -+ if(pk->pubkey_algo==PUBKEY_ALGO_ELGAMAL) -+ key_usage=0; -+ - pk->pubkey_usage = key_usage; - - if ( !key_expire_seen ) { -@@ -1869,6 +1874,13 @@ - if ( x ) /* mask it down to the actual allowed usage */ - key_usage &= x; - } -+ -+ /* Type 20 Elgamal subkeys or any subkey on a type 20 primary are -+ not usable. */ -+ if(mainpk->pubkey_algo==PUBKEY_ALGO_ELGAMAL -+ || subpk->pubkey_algo==PUBKEY_ALGO_ELGAMAL) -+ key_usage=0; -+ - subpk->pubkey_usage = key_usage; - - p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_KEY_EXPIRE, NULL); diff --git a/security/gnupg/files/patch-keygen.c b/security/gnupg/files/patch-keygen.c deleted file mode 100644 index b4051ed22b02..000000000000 --- a/security/gnupg/files/patch-keygen.c +++ /dev/null @@ -1,33 +0,0 @@ ---- g10/keygen.c.orig Tue Jul 29 03:34:41 2003 -+++ g10/keygen.c Thu Nov 27 18:54:55 2003 -@@ -958,8 +958,6 @@ - tty_printf( _(" (%d) DSA (sign only)\n"), 2 ); - if( addmode ) - tty_printf( _(" (%d) ElGamal (encrypt only)\n"), 3 ); -- if (opt.expert) -- tty_printf( _(" (%d) ElGamal (sign and encrypt)\n"), 4 ); - tty_printf( _(" (%d) RSA (sign only)\n"), 5 ); - if (addmode) - tty_printf( _(" (%d) RSA (encrypt only)\n"), 6 ); -@@ -989,21 +987,6 @@ - algo = PUBKEY_ALGO_RSA; - *r_usage = PUBKEY_USAGE_SIG; - break; -- } -- else if( algo == 4 && opt.expert) -- { -- tty_printf(_( --"The use of this algorithm is only supported by GnuPG. You will not be\n" --"able to use this key to communicate with PGP users. This algorithm is also\n" --"very slow, and may not be as secure as the other choices.\n")); -- -- if( cpr_get_answer_is_yes("keygen.algo.elg_se", -- _("Create anyway? "))) -- { -- algo = PUBKEY_ALGO_ELGAMAL; -- *r_usage = PUBKEY_USAGE_ENC | PUBKEY_USAGE_SIG; -- break; -- } - } - else if( algo == 3 && addmode ) { - algo = PUBKEY_ALGO_ELGAMAL_E; diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist index c7e644728aa5..d003fc6e8601 100644 --- a/security/gnupg/pkg-plist +++ b/security/gnupg/pkg-plist @@ -24,6 +24,7 @@ share/gnupg/options.skel %%PORTDOCS%%share/doc/gnupg/THANKS %%PORTDOCS%%share/doc/gnupg/TODO %%PORTDOCS%%share/doc/gnupg/VERSION +share/locale/be/LC_MESSAGES/gnupg.mo share/locale/ca/LC_MESSAGES/gnupg.mo share/locale/cs/LC_MESSAGES/gnupg.mo share/locale/da/LC_MESSAGES/gnupg.mo @@ -44,11 +45,14 @@ share/locale/pl/LC_MESSAGES/gnupg.mo share/locale/pt/LC_MESSAGES/gnupg.mo share/locale/pt_BR/LC_MESSAGES/gnupg.mo share/locale/ro/LC_MESSAGES/gnupg.mo +share/locale/ru/LC_MESSAGES/gnupg.mo share/locale/sk/LC_MESSAGES/gnupg.mo share/locale/sv/LC_MESSAGES/gnupg.mo share/locale/tr/LC_MESSAGES/gnupg.mo share/locale/zh_TW/LC_MESSAGES/gnupg.mo @dirrm share/gnupg +@unexec rmdir %D/share/locale/be/LC_MESSAGES 2>/dev/null || true +@unexec rmdir %D/share/locale/be 2>/dev/null || true @unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/ca 2>/dev/null || true @unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true @@ -89,6 +93,8 @@ share/locale/zh_TW/LC_MESSAGES/gnupg.mo @unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true @unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/ro 2>/dev/null || true +@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true +@unexec rmdir %D/share/locale/ru 2>/dev/null || true @unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/sk 2>/dev/null || true @unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true |