diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 59f55389c56..d2bdbc46f8b 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.35 2002/07/19 19:27:42 fgsch Exp $ +# $OpenBSD: Makefile,v 1.36 2002/11/16 05:02:21 mark Exp $ COMMENT= 'GNU privacy guard - a free PGP replacement' -DISTNAME= gnupg-1.0.7 +DISTNAME= gnupg-1.2.1 PKGNAME= ${DISTNAME} CATEGORIES= security -MASTER_SITES= ftp://ftp.gnupg.org/pub/gcrypt/gnupg/ \ +MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ \ ftp://ftp.progsoc.uts.edu.au/pub/gnupg/gnupg/ \ ftp://openbsd.rug.ac.be/pub/gcrypt/gnupg/ \ ftp://sunsite.auc.dk/pub/security/gcrypt/gnupg/ \ @@ -17,11 +17,6 @@ MASTER_SITES= ftp://ftp.gnupg.org/pub/gcrypt/gnupg/ \ ftp://ftp.net.lut.ac.uk/gcrypt/gnupg/ \ ftp://gd.tuwien.ac.at/privacy/gnupg/gnupg/ -MASTER_SITES0= ftp://ftp.ruhr-uni-bochum.de/mirrors/ftp.gnupg.org/pub/gcrypt/contrib/ \ - ftp://ftp.uni-bielefeld.de/pub/crypto/replay/mirror/ftp.pgp.net/gnupgp/contrib/ \ - ftp://ftp.hacktic.nl/pub/crypto/mirror/ftp.gnupg.org/contrib/ \ - ftp://ftp.fh-schmalkalden.de/pub/dfncert/crypt/gcrypt/contrib/ - DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -43,21 +38,6 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/scripts REGRESS_TARGET= check -FLAVORS= idea -FLAVOR?= - -.if ${FLAVOR:L} == "idea" -PERMIT_PACKAGE_CDROM= "a patented algorithm" -PERMIT_PACKAGE_FTP= "a patented algorithm" -PERMIT_DISTFILES_CDROM= "a patented algorithm" -PERMIT_DISTFILES_FTP= "a patented algorithm" -# NB: idea.c is found in ${MASTER_SITES0} -DISTFILES+= idea.c:0 -PATCH_LIST= idea-* patch-* -pre-patch: - @cp ${DISTDIR}/idea.c ${WRKSRC}/cipher -.endif - GNUPGDOCFILES= README AUTHORS COPYING THANKS TODO BUGS \ doc/DETAILS doc/FAQ doc/OpenPGP doc/HACKING doc/faq.html diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index 20a46fd3fff..c35f3fca5ef 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,6 +1,3 @@ -MD5 (gnupg-1.0.7.tar.gz) = d8b36d4dfd213a1a1027b1877acbc897 -MD5 (idea.c) = 7d0557459e0a41da099ddbd837d4bd40 -RMD160 (gnupg-1.0.7.tar.gz) = cc3083961870a592c8d264c0930533ae2d3f43b3 -RMD160 (idea.c) = 86ac117facd1fe498a6b964bce9ba1ce6e2ab094 -SHA1 (gnupg-1.0.7.tar.gz) = 46da038c60143fa49abae2fae6fcbd0f58f7a46e -SHA1 (idea.c) = 1cbae164674dfb9da624e088fe7d66d7c0d4f17e +MD5 (gnupg-1.2.1.tar.gz) = 83e02b4905dab34c4dc25652936022f9 +RMD160 (gnupg-1.2.1.tar.gz) = bc6c41738c19280d2f80541f07d9b07caa1a872c +SHA1 (gnupg-1.2.1.tar.gz) = 27b94f42fbc5a620a51e124ad4244f708addcb1a diff --git a/security/gnupg/patches/patch-configure b/security/gnupg/patches/patch-configure index 03a1d72bd49..a6ba402ff1e 100644 --- a/security/gnupg/patches/patch-configure +++ b/security/gnupg/patches/patch-configure @@ -1,17 +1,31 @@ -$OpenBSD: patch-configure,v 1.3 2002/09/30 00:31:30 drahn Exp $ ---- configure.orig Mon Apr 29 09:59:16 2002 -+++ configure Sun Sep 29 09:58:53 2002 -@@ -3729,13 +3729,6 @@ echo "${ECHO_T}assume none" >&6 - esac - fi +--- configure~ Wed Oct 30 09:20:14 2002 ++++ configure Wed Oct 30 09:22:59 2002 +@@ -4184,8 +4184,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + fi -- case "$host_cpu" in -- rs6000 | powerpc | powerpcle) -- # Yippee! All RS/6000 and PowerPC code is position-independent. -- CFLAGS_PIC="" -- ;; -- esac -- - if test "$NO_PIC" = yes; then - echo "$as_me:3740: result: not possible" >&5 - echo "${ECHO_T}not possible" >&6 + # Make sure that we snagged all the symbols we need. +- if egrep ' _?nm_test_var$' "$ac_nlist" >/dev/null; then +- if egrep ' _?nm_test_func$' "$ac_nlist" >/dev/null; then ++ if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then ++ if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then + cat < conftest.c + #ifdef __cplusplus + extern "C" { +@@ -4193,7 +4193,7 @@ extern "C" { + + EOF + # Now generate the symbol file. +- sed 's/^.* _\?\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c ++ sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c + + cat <> conftest.c + #if defined (__STDC__) && __STDC__ +@@ -4213,7 +4213,7 @@ struct { + dld_preloaded_symbols[] = + { + EOF +- sed 's/^_\?\(.*\) _\?\(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c ++ sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c + cat <<\EOF >> conftest.c + {0, (__ptr_t) 0} + }; diff --git a/security/gnupg/patches/patch-configure_ac b/security/gnupg/patches/patch-configure_ac index 7d995ce7cbc..3eb3a220bac 100644 --- a/security/gnupg/patches/patch-configure_ac +++ b/security/gnupg/patches/patch-configure_ac @@ -1,18 +1,14 @@ -$OpenBSD: patch-configure_ac,v 1.1 2002/07/05 07:13:01 reinhard Exp $ ---- configure.ac.orig Mon Apr 29 08:56:08 2002 -+++ configure.ac Fri Jun 7 08:33:51 2002 -@@ -325,7 +325,13 @@ AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$ - NAME_OF_DEV_RANDOM="/dev/random" +$OpenBSD: patch-configure_ac,v 1.2 2002/11/16 05:02:21 mark Exp $ +--- configure.ac~ Tue Oct 29 02:52:57 2002 ++++ configure.ac Tue Oct 29 02:55:57 2002 +@@ -469,8 +469,9 @@ NAME_OF_DEV_RANDOM="/dev/random" NAME_OF_DEV_URANDOM="/dev/urandom" case "${target}" in -- *-openbsd* | *-netbsd*) -+ *-openbsd*) + *-openbsd*) +- NAME_OF_DEV_RANDOM="/dev/srandom" + NAME_OF_DEV_RANDOM="/dev/arandom" -+ NAME_OF_DEV_URANDOM="/dev/urandom" -+ DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" -+ ;; -+ -+ *-netbsd*) - NAME_OF_DEV_RANDOM="/dev/srandom" NAME_OF_DEV_URANDOM="/dev/urandom" - DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" ++ DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" + ;; + esac + AC_DEFINE_UNQUOTED(NAME_OF_DEV_RANDOM, "$NAME_OF_DEV_RANDOM", diff --git a/security/gnupg/patches/patch-doc_Makefile.in b/security/gnupg/patches/patch-doc_Makefile.in index bfe0edd8d8f..08ade437b83 100644 --- a/security/gnupg/patches/patch-doc_Makefile.in +++ b/security/gnupg/patches/patch-doc_Makefile.in @@ -1,7 +1,6 @@ -$OpenBSD: patch-doc_Makefile.in,v 1.3 2002/07/05 07:13:01 reinhard Exp $ ---- doc/Makefile.in.orig Mon Apr 29 17:06:11 2002 -+++ doc/Makefile.in Fri May 31 16:50:22 2002 -@@ -143,7 +143,7 @@ info_TEXINFOS = gpg.texi gpgv.texi +--- doc/Makefile.in~ Mon Oct 7 01:17:26 2002 ++++ doc/Makefile.in Mon Oct 7 01:18:54 2002 +@@ -150,7 +150,7 @@ info_TEXINFOS = gpg.texi gpgv.texi # Need this to avoid building of dvis with automake 1.4 DVIS = @@ -10,21 +9,3 @@ $OpenBSD: patch-doc_Makefile.in,v 1.3 2002/07/05 07:13:01 reinhard Exp $ BUILT_SOURCES = FAQ faq.html -@@ -156,7 +156,7 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - DIST_SOURCES = - TEXINFO_TEX = $(top_srcdir)/scripts/texinfo.tex --INFO_DEPS = gpgv.info -+INFO_DEPS = gpg.info gpgv.info - TEXINFOS = gpg.texi gpgv.texi - - NROFF = nroff -@@ -177,7 +177,7 @@ Makefile: @MAINTAINER_MODE_TRUE@ $(srcdi - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status - --: gpg.texi -+gpg.info: gpg.texi - gpg.dvi: gpg.texi - - gpgv.info: gpgv.texi diff --git a/security/gnupg/patches/patch-mpi_config_links b/security/gnupg/patches/patch-mpi_config_links index dd867454a7e..bb37828dc36 100644 --- a/security/gnupg/patches/patch-mpi_config_links +++ b/security/gnupg/patches/patch-mpi_config_links @@ -1,16 +1,15 @@ -$OpenBSD: patch-mpi_config_links,v 1.2 2002/07/05 07:13:01 reinhard Exp $ ---- mpi/config.links.orig Thu Apr 18 03:10:40 2002 -+++ mpi/config.links Fri Jun 7 09:58:54 2002 -@@ -125,6 +125,12 @@ case "${target}" in +--- mpi/config.links Mon Oct 7 01:15:42 2002 ++++ mpi/config.links~ Mon Oct 7 01:13:21 2002 +@@ -132,10 +132,10 @@ case "${target}" in path="sparc32v8 sparc32" mpi_extra_modules="udiv" ;; +- sparc64-*-netbsd) + sparc64*-*-netbsd* | sparc64*-*-openbsd*) + # There are no sparc64 assembler modules that work, so + # just use generic C functions +- echo '/* configured for sparc64-*netbsd */' >>./mpi/asm-syntax.h + echo '/* configured {Open,Net}BSD on sparc64 */' >>./mpi/asm-syntax.h -+ # There are no sparc64 assembler modules that work, so -+ # just use generic C functions -+ path="" -+ ;; + path="" + ;; sparc9*-*-* | \ - sparc64*-*-* | \ - ultrasparc*-*-* ) diff --git a/security/gnupg/pkg/DESCR b/security/gnupg/pkg/DESCR index 4b852aa0d3a..dcec9ed396a 100644 --- a/security/gnupg/pkg/DESCR +++ b/security/gnupg/pkg/DESCR @@ -2,8 +2,4 @@ GnuPG is a complete and free replacement for PGP. Because it does not use IDEA or RSA it can be used without any restrictions. GnuPG is nearly in compliance with RFC2440 (OpenPGP). -Flavors: - idea - build IDEA encryption module - (for backwards compatibility with older PGP versions) - WWW: ${HOMEPAGE} diff --git a/security/gnupg/pkg/MESSAGE b/security/gnupg/pkg/MESSAGE index a3da5b96a35..74c40d1ee6c 100644 --- a/security/gnupg/pkg/MESSAGE +++ b/security/gnupg/pkg/MESSAGE @@ -12,5 +12,5 @@ You can In the latter case you may want to get rid of the misleading 'using insecure memory' warning. Just put 'no-secmem-warning' to your -~/.gnupg/options file or use gpg with the --no-secmem-warning switch. +~/.gnupg/gpg.conf file or use gpg with the --no-secmem-warning switch. diff --git a/security/gnupg/pkg/PFRAG.idea b/security/gnupg/pkg/PFRAG.idea deleted file mode 100644 index adfa43140a7..00000000000 --- a/security/gnupg/pkg/PFRAG.idea +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.idea,v 1.1 2001/05/23 15:28:50 jakob Exp $ -lib/gnupg/idea diff --git a/security/gnupg/pkg/PLIST b/security/gnupg/pkg/PLIST index 011998f8dc1..c8160e5227b 100644 --- a/security/gnupg/pkg/PLIST +++ b/security/gnupg/pkg/PLIST @@ -1,18 +1,15 @@ -@comment $OpenBSD: PLIST,v 1.12 2002/07/05 07:13:01 reinhard Exp $ -%%idea%% +@comment $OpenBSD: PLIST,v 1.13 2002/11/16 05:02:21 mark Exp $ @unexec install-info --delete --info-dir=%D/info %D/info/gpg.info @unexec install-info --delete --info-dir=%D/info %D/info/gpgv.info bin/gpg -bin/gpgkeys_mailto bin/gpgsplit bin/gpgv info/gpg.info info/gpgv.info -lib/gnupg/rndegd -lib/gnupg/rndunix -lib/gnupg/tiger +libexec/gnupg/gpgkeys_mailto man/man1/gpg.1 man/man1/gpgv.1 +man/man7/gnupg.7 share/doc/gnupg/AUTHORS share/doc/gnupg/BUGS share/doc/gnupg/COPYING @@ -25,6 +22,7 @@ share/doc/gnupg/THANKS share/doc/gnupg/TODO share/doc/gnupg/faq.html share/gnupg/options.skel +share/locale/ca/LC_MESSAGES/gnupg.mo share/locale/cs/LC_MESSAGES/gnupg.mo share/locale/da/LC_MESSAGES/gnupg.mo share/locale/de/LC_MESSAGES/gnupg.mo @@ -45,6 +43,6 @@ share/locale/sv/LC_MESSAGES/gnupg.mo share/locale/tr/LC_MESSAGES/gnupg.mo @dirrm share/gnupg @dirrm share/doc/gnupg -@dirrm lib/gnupg +@dirrm libexec/gnupg @exec install-info --info-dir=%D/info --section=Miscellaneous --item="* GnuPG: (gpg). Gnu Privacy Guard" %D/info/gpg.info @exec install-info --info-dir=%D/info --section=Miscellaneous --item="* GnuPGv: (gpgv). GnuPG signature verification tool" %D/info/gpgv.info