OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 29-Nov-2006 09:22:29 Branch: HEAD Handle: 2006112908222801 Modified files: openpkg-src/gnupg2 gnupg2.patch gnupg2.spec Log: upgrading package: gnupg2 2.0.0 -> 2.0.1 Summary: Revision Changes Path 1.3 +6 -25 openpkg-src/gnupg2/gnupg2.patch 1.5 +5 -3 openpkg-src/gnupg2/gnupg2.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/gnupg2/gnupg2.patch ============================================================================ $ cvs diff -u -r1.2 -r1.3 gnupg2.patch --- openpkg-src/gnupg2/gnupg2.patch 28 Nov 2006 07:11:10 -0000 1.2 +++ openpkg-src/gnupg2/gnupg2.patch 29 Nov 2006 08:22:28 -0000 1.3 @@ -1,37 +1,18 @@ Index: configure ---- configure.orig 2006-11-11 14:37:23 +0100 -+++ configure 2006-11-15 20:58:27 +0100 -@@ -5929,13 +5929,13 @@ +--- configure.orig 2006-11-28 17:05:22 +0100 ++++ configure 2006-11-29 09:11:52 +0100 +@@ -6915,13 +6915,13 @@ # # Check wether it is necessary to link against libdl. # -LIBS="" - echo "$as_me:$LINENO: checking for library containing dlopen" >&5 - echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for library containing dlopen" >&5 + echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; } if test "${ac_cv_search_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS + LIBS="" - ac_cv_search_dlopen=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ - ------------------------------------------------------------------------------ - -Security Fix -http://lists.gnupg.org/pipermail/gnupg-announce/2006q4/000241.html - -Index: g10/openfile.c ---- g10/openfile.c.orig 2006-07-31 16:00:19 +0200 -+++ g10/openfile.c 2006-11-28 08:04:21 +0100 -@@ -144,8 +144,8 @@ - - s = _("Enter new filename"); - -- n = strlen(s) + namelen + 10; - defname = name && namelen? make_printable_string( name, namelen, 0): NULL; -+ n = strlen(s) + (defname ? strlen(defname) : 0) + 10; - prompt = xmalloc(n); - if( defname ) - sprintf(prompt, "%s [%s]: ", s, defname ); + _ACEOF @@ . patch -p0 <<'@@ .' Index: openpkg-src/gnupg2/gnupg2.spec ============================================================================ $ cvs diff -u -r1.4 -r1.5 gnupg2.spec --- openpkg-src/gnupg2/gnupg2.spec 28 Nov 2006 07:11:10 -0000 1.4 +++ openpkg-src/gnupg2/gnupg2.spec 29 Nov 2006 08:22:29 -0000 1.5 @@ -32,8 +32,8 @@ Class: EVAL Group: PGP License: GPL -Version: 2.0.0 -Release: 20061128 +Version: 2.0.1 +Release: 20061129 # package options %option with_curl yes @@ -75,7 +75,7 @@ prog gnupg2 = { version = %{version} url = ftp://ftp.gnupg.org/gcrypt/gnupg/ - regex = gnupg-(__VER__)\.tar\.gz + regex = gnupg-(2\.__VER__)\.tar\.(gz|bz2) } %prep @@ -107,6 +107,8 @@ ./configure \ --prefix=%{l_prefix} \ --datadir=%{l_prefix}/share/gnupg2 \ + --mandir=%{l_prefix}/man \ + --infodir=%{l_prefix}/info \ --with-zlib=%{l_prefix} \ --with-bzip2=%{l_prefix} \ --with-readline=%{l_prefix} \ @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org