From b19bdaa76d4c81d3a7d01923dae217bd72a9a053 Mon Sep 17 00:00:00 2001 From: sturm Date: Sat, 8 May 2004 06:41:47 +0000 Subject: [PATCH] update to libgcrypt 1.2.0 take maintainer, ok Jim Geovedi --- security/libgcrypt/Makefile | 22 ++-- security/libgcrypt/distinfo | 6 +- security/libgcrypt/patches/patch-configure | 100 +++--------------- security/libgcrypt/patches/patch-ltmain_sh | 55 ++++++++++ .../libgcrypt/patches/patch-scripts_ltmain_sh | 85 --------------- .../libgcrypt/patches/patch-src_Makefile_in | 12 +++ security/libgcrypt/patches/patch-src_gcrypt_h | 11 ++ .../patches/patch-src_libgcrypt-config_in | 12 --- .../libgcrypt/patches/patch-tests_Makefile_in | 12 +++ security/libgcrypt/pkg/MESSAGE | 7 -- security/libgcrypt/pkg/PFRAG.shared | 4 +- security/libgcrypt/pkg/PLIST | 3 +- 12 files changed, 126 insertions(+), 203 deletions(-) create mode 100644 security/libgcrypt/patches/patch-ltmain_sh delete mode 100644 security/libgcrypt/patches/patch-scripts_ltmain_sh create mode 100644 security/libgcrypt/patches/patch-src_Makefile_in create mode 100644 security/libgcrypt/patches/patch-src_gcrypt_h delete mode 100644 security/libgcrypt/patches/patch-src_libgcrypt-config_in create mode 100644 security/libgcrypt/patches/patch-tests_Makefile_in delete mode 100644 security/libgcrypt/pkg/MESSAGE diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile index c62165abebb..8b5e7f2e8bd 100644 --- a/security/libgcrypt/Makefile +++ b/security/libgcrypt/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.4 2004/02/24 19:48:16 naddy Exp $ +# $OpenBSD: Makefile,v 1.5 2004/05/08 06:41:47 sturm Exp $ COMMENT= "crypto library based on code used in GnuPG" -VERSION= 1.1.12 +VERSION= 1.2.0 DISTNAME= libgcrypt-${VERSION} -PKGNAME= ${DISTNAME}p2 CATEGORIES= security HOMEPAGE= http://www.gnu.org/directory/security/libgcrypt.html -MAINTAINER= Jim Geovedi + +MAINTAINER= Nikolay Sturm # LGPL PERMIT_PACKAGE_CDROM= Yes @@ -16,11 +16,15 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/ \ - ftp://gd.tuwien.ac.at/privacy/gnupg/alpha/libgcrypt/ \ - http://ftp.planetmirror.com/pub/gnupg/alpha/libgcrypt/ \ - http://sunsite.dk/pub/security/gcrypt/alpha/libgcrypt/ \ - http://ftp.linux.it/pub/mirrors/gnupg/alpha/libgcrypt/ +MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgcrypt/ \ + ftp://gd.tuwien.ac.at/privacy/gnupg/libgcrypt/ \ + http://ftp.planetmirror.com/pub/gnupg/libgcrypt/ \ + http://sunsite.dk/pub/security/gcrypt/libgcrypt/ \ + http://ftp.linux.it/pub/mirrors/gnupg/libgcrypt/ + +LIB_DEPENDS= gpg-error::security/libgpg-error + +SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo index c71916c71d8..b71818633ed 100644 --- a/security/libgcrypt/distinfo +++ b/security/libgcrypt/distinfo @@ -1,3 +1,3 @@ -MD5 (libgcrypt-1.1.12.tar.gz) = c245f62bf8da9a83c5dae26d9fa3559d -RMD160 (libgcrypt-1.1.12.tar.gz) = 94031639fe9d5cbf7225e689d5ce241a4aa0d226 -SHA1 (libgcrypt-1.1.12.tar.gz) = 7c52f7b6add1079c8aa773fae55e9668027420a1 +MD5 (libgcrypt-1.2.0.tar.gz) = 5c508072d8387ce17d1ab05075c2be40 +RMD160 (libgcrypt-1.2.0.tar.gz) = bb198eb9dfa4c9e1466b905f1c412bdb3eb493c5 +SHA1 (libgcrypt-1.2.0.tar.gz) = 3785a47abcb1c15079b18c5df47a474dfe647ec2 diff --git a/security/libgcrypt/patches/patch-configure b/security/libgcrypt/patches/patch-configure index 889a34731be..49218b50b5d 100644 --- a/security/libgcrypt/patches/patch-configure +++ b/security/libgcrypt/patches/patch-configure @@ -1,88 +1,22 @@ -$OpenBSD: patch-configure,v 1.2 2003/10/12 02:08:14 brad Exp $ ---- configure.orig 2003-01-20 05:31:25.000000000 -0500 -+++ configure 2003-10-11 18:45:23.000000000 -0400 -@@ -3694,32 +3694,6 @@ fi - done +$OpenBSD: patch-configure,v 1.3 2004/05/08 06:41:47 sturm Exp $ +--- configure.orig 2004-04-15 11:08:35.000000000 +0200 ++++ configure 2004-04-17 16:44:56.000000000 +0200 +@@ -2213,8 +2213,12 @@ esac - working_db2any=no -- if $ac_aux_dir/db2any --systemcheck; then -- working_db2any=yes -- DB2ANY=`cd $ac_aux_dir && pwd`/db2any -- else -- DB2ANY=": " -- { echo "$as_me:$LINENO: WARNING: --*** --*** It seems that the Docbook environment is not installed as required. --*** We will try to build everything, but if you either touch some files --*** or use a bogus make tool, you may run into problems. --*** Docbook is normally only needed to build the documentation. --*** To further investigate the problem you can run the command --*** $ac_aux_dir/db2any --systemcheck --verbose --***" >&5 --echo "$as_me: WARNING: --*** --*** It seems that the Docbook environment is not installed as required. --*** We will try to build everything, but if you either touch some files --*** or use a bogus make tool, you may run into problems. --*** Docbook is normally only needed to build the documentation. --*** To further investigate the problem you can run the command --*** $ac_aux_dir/db2any --systemcheck --verbose --***" >&2;} -- fi -- -- - - if test "$working_db2any" != yes ; then - WORKING_DB2ANY_TRUE= -@@ -6897,6 +6871,8 @@ openbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no -+ sys_lib_search_path_spec="/usr/lib" -+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib" - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case "$host_os" in - openbsd2.[89] | openbsd2.[89].*) -@@ -8826,8 +8802,8 @@ fi case "${target}" in - *-openbsd* | *-netbsd*) -- NAME_OF_DEV_RANDOM="/dev/srandom" -- NAME_OF_DEV_URANDOM="/dev/urandom" +- *-openbsd* | *-netbsd*) +- # FIXME: Are these the best flags for OpenBSD? ++ *-openbsd*) + NAME_OF_DEV_RANDOM="/dev/arandom" + NAME_OF_DEV_URANDOM="/dev/arandom" ++# 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" - ;; - -@@ -13031,13 +13007,13 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF - - fi --echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 --echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5 -+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6 - if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lpthread $LIBS" -+LIBS="-pthread $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ -@@ -13079,9 +13055,9 @@ else - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pthread_pthread_create=no -+LIBS=$ac_check_lib_save_LIBS - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 - echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 -@@ -13948,26 +13924,6 @@ fi +@@ -25679,24 +25683,6 @@ fi @@ -104,8 +38,6 @@ $OpenBSD: patch-configure,v 1.2 2003/10/12 02:08:14 brad Exp $ -*** at all GNU archives. It is always available from ftp.gnu.org:/gnu/make. -***" >&2;} - fi -- -- - if test "$GCC" = yes; then - if test "$MAINTAINER_MODE" = "yes"; then - CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes" + + + # Check whether --enable-gcc-warnings or --disable-gcc-warnings was given. diff --git a/security/libgcrypt/patches/patch-ltmain_sh b/security/libgcrypt/patches/patch-ltmain_sh new file mode 100644 index 00000000000..2fb7574cc76 --- /dev/null +++ b/security/libgcrypt/patches/patch-ltmain_sh @@ -0,0 +1,55 @@ +$OpenBSD: patch-ltmain_sh,v 1.1 2004/05/08 06:41:47 sturm Exp $ +--- ltmain.sh.orig 2004-05-07 19:10:06.000000000 +0200 ++++ ltmain.sh 2004-05-07 19:10:24.000000000 +0200 +@@ -2274,10 +2274,6 @@ EOF + link_static=no # Whether the deplib will be linked statically + if test -n "$library_names" && + { test "$prefer_static_libs" = no || test -z "$old_library"; }; then +- if test "$installed" = no; then +- notinst_deplibs="$notinst_deplibs $lib" +- need_relink=yes +- fi + # This is a shared library + + # Warn about portability, can't link against -module's on +@@ -5827,40 +5823,6 @@ relink_command=\"$relink_command\"" + # Exit here if they wanted silent mode. + test "$show" = : && exit $EXIT_SUCCESS + +- $echo "----------------------------------------------------------------------" +- $echo "Libraries have been installed in:" +- for libdir in $libdirs; do +- $echo " $libdir" +- done +- $echo +- $echo "If you ever happen to want to link against installed libraries" +- $echo "in a given directory, LIBDIR, you must either use libtool, and" +- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" +- $echo "flag during linking and do at least one of the following:" +- if test -n "$shlibpath_var"; then +- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" +- $echo " during execution" +- fi +- if test -n "$runpath_var"; then +- $echo " - add LIBDIR to the \`$runpath_var' environment variable" +- $echo " during linking" +- fi +- if test -n "$hardcode_libdir_flag_spec"; then +- libdir=LIBDIR +- eval flag=\"$hardcode_libdir_flag_spec\" +- +- $echo " - use the \`$flag' linker flag" +- fi +- if test -n "$admincmds"; then +- $echo " - have your system administrator run these commands:$admincmds" +- fi +- if test -f /etc/ld.so.conf; then +- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" +- fi +- $echo +- $echo "See any operating system documentation about shared libraries for" +- $echo "more information, such as the ld(1) and ld.so(8) manual pages." +- $echo "----------------------------------------------------------------------" + exit $EXIT_SUCCESS + ;; + diff --git a/security/libgcrypt/patches/patch-scripts_ltmain_sh b/security/libgcrypt/patches/patch-scripts_ltmain_sh deleted file mode 100644 index 59b72f9c054..00000000000 --- a/security/libgcrypt/patches/patch-scripts_ltmain_sh +++ /dev/null @@ -1,85 +0,0 @@ -$OpenBSD: patch-scripts_ltmain_sh,v 1.1.1.1 2003/05/01 17:12:41 sturm Exp $ ---- scripts/ltmain.sh.orig Sun Dec 15 09:11:07 2002 -+++ scripts/ltmain.sh Wed Apr 30 17:10:36 2003 -@@ -1082,6 +1082,17 @@ compiler." - continue - ;; - -+ -pthread) -+ case $host in -+ *-*-openbsd*) -+ deplibs="$deplibs $arg" -+ ;; -+ *) -+ continue -+ ;; -+ esac -+ ;; -+ - -module) - module=yes - continue -@@ -1522,6 +1533,10 @@ compiler." - fi - continue - ;; -+ -pthread) -+ continue -+ ;; -+ - %DEPLIBS%) - alldeplibs=yes - continue -@@ -1767,11 +1782,6 @@ compiler." - continue - fi - -- if test "$installed" = no; then -- notinst_deplibs="$notinst_deplibs $lib" -- need_relink=yes -- fi -- - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names -@@ -4569,40 +4579,6 @@ relink_command=\"$relink_command\"" - # Exit here if they wanted silent mode. - test "$show" = ":" && exit 0 - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- echo " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -- -- echo " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- echo " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -- echo "See any operating system documentation about shared libraries for" -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "----------------------------------------------------------------------" - exit 0 - ;; - diff --git a/security/libgcrypt/patches/patch-src_Makefile_in b/security/libgcrypt/patches/patch-src_Makefile_in new file mode 100644 index 00000000000..726b20a623b --- /dev/null +++ b/security/libgcrypt/patches/patch-src_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_Makefile_in,v 1.1 2004/05/08 06:41:47 sturm Exp $ +--- src/Makefile.in.orig 2004-04-17 16:48:19.000000000 +0200 ++++ src/Makefile.in 2004-04-17 16:48:49.000000000 +0200 +@@ -207,7 +207,7 @@ libgcrypt_la_DEPENDENCIES = ../cipher/li + $(srcdir)/libgcrypt.vers + + libgcrypt_la_LIBADD = ../cipher/libcipher.la ../mpi/libmpi.la \ +- @LTLIBOBJS@ @GPG_ERROR_LIBS@ ++ @LTLIBOBJS@ + + subdir = src + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/security/libgcrypt/patches/patch-src_gcrypt_h b/security/libgcrypt/patches/patch-src_gcrypt_h new file mode 100644 index 00000000000..529074557e7 --- /dev/null +++ b/security/libgcrypt/patches/patch-src_gcrypt_h @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_gcrypt_h,v 1.1 2004/05/08 06:41:47 sturm Exp $ +--- src/gcrypt.h.orig 2004-04-17 16:54:06.000000000 +0200 ++++ src/gcrypt.h 2004-04-17 16:54:20.000000000 +0200 +@@ -29,6 +29,7 @@ + + #include + #include ++#include + + /* This is required for error code compatibility. */ + #define _GCRY_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_GCRYPT diff --git a/security/libgcrypt/patches/patch-src_libgcrypt-config_in b/security/libgcrypt/patches/patch-src_libgcrypt-config_in deleted file mode 100644 index b6e11d2355e..00000000000 --- a/security/libgcrypt/patches/patch-src_libgcrypt-config_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_libgcrypt-config_in,v 1.1 2003/10/22 05:25:21 jolan Exp $ ---- src/libgcrypt-config.in.orig 2002-08-23 08:10:57.000000000 -0500 -+++ src/libgcrypt-config.in 2003-10-02 13:40:12.000000000 -0500 -@@ -10,7 +10,7 @@ - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - PGM=libgcrypt-config --libs="@LIBGCRYPT_CONFIG_LIBS@" -+libs="@LIBGCRYPT_CONFIG_LIBS@ @LIBS@" - cflags="@LIBGCRYPT_CONFIG_CFLAGS@" - prefix=@prefix@ - exec_prefix=@exec_prefix@ diff --git a/security/libgcrypt/patches/patch-tests_Makefile_in b/security/libgcrypt/patches/patch-tests_Makefile_in new file mode 100644 index 00000000000..35690b5631f --- /dev/null +++ b/security/libgcrypt/patches/patch-tests_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-tests_Makefile_in,v 1.1 2004/05/08 06:41:47 sturm Exp $ +--- tests/Makefile.in.orig 2004-04-17 16:57:29.000000000 +0200 ++++ tests/Makefile.in 2004-04-17 16:58:51.000000000 +0200 +@@ -184,7 +184,7 @@ target_vendor = @target_vendor@ + TESTS = prime register ac basic tsexp keygen pubkey benchmark + + INCLUDES = -I$(top_srcdir)/src +-LDADD = ../src/libgcrypt.la ++LDADD = ../src/libgcrypt.la $(GPG_ERROR_LIBS) + + EXTRA_PROGRAMS = testapi + noinst_PROGRAMS = $(TESTS) diff --git a/security/libgcrypt/pkg/MESSAGE b/security/libgcrypt/pkg/MESSAGE deleted file mode 100644 index 5018ec2e2d2..00000000000 --- a/security/libgcrypt/pkg/MESSAGE +++ /dev/null @@ -1,7 +0,0 @@ - - SECURITY NOTE: - - While there are no known security problems at this time, - please DO NOT use this software in a production environment, - as libgcrypt is still in its beta testing phase. - diff --git a/security/libgcrypt/pkg/PFRAG.shared b/security/libgcrypt/pkg/PFRAG.shared index d2a1003f406..b16839ca726 100644 --- a/security/libgcrypt/pkg/PFRAG.shared +++ b/security/libgcrypt/pkg/PFRAG.shared @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2003/05/01 17:12:41 sturm Exp $ -lib/libgcrypt.so.6.1 +@comment $OpenBSD: PFRAG.shared,v 1.2 2004/05/08 06:41:47 sturm Exp $ +lib/libgcrypt.so.12.1 DYNLIBDIR(%D/lib) diff --git a/security/libgcrypt/pkg/PLIST b/security/libgcrypt/pkg/PLIST index 7d5928e40dd..7ea1c80fdb6 100644 --- a/security/libgcrypt/pkg/PLIST +++ b/security/libgcrypt/pkg/PLIST @@ -1,6 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.2 2003/12/15 18:18:54 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.3 2004/05/08 06:41:47 sturm Exp $ @unexec install-info --delete --info-dir=%D/info %D/info/gcrypt.info bin/libgcrypt-config +include/gcrypt-module.h include/gcrypt.h info/gcrypt.info lib/libgcrypt.a