changeset
Update to new versions of vendor software and generally modernize,
Fri, 03 Aug 2012 16:34:12 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 03 Aug 2012 16:34:12 +0200
- changeset 462
- 63f79f03cb7f
- parent 461
- 09d8a3107646
- child 463
- 4006c74cc96c
Update to new versions of vendor software and generally modernize,
breaking with the tradition of supporting parallel GnuPG v1 and v2.
| gnupg/gnupg.patch | file | annotate | diff | comparison | revisions | |
| gnupg/gnupg.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/gnupg/gnupg.patch Fri Aug 03 16:29:17 2012 +0200 1.2 +++ b/gnupg/gnupg.patch Fri Aug 03 16:34:12 2012 +0200 1.3 @@ -1,31 +1,47 @@ 1.4 Index: agent/genkey.c 1.5 ---- agent/genkey.c.orig 2009-06-29 08:20:15 +0200 1.6 -+++ agent/genkey.c 2009-09-06 22:59:18 +0200 1.7 +--- agent/genkey.c.orig 2011-08-04 11:59:33.000000000 +0200 1.8 ++++ agent/genkey.c 2011-12-11 12:25:38.000000000 +0100 1.9 @@ -190,11 +190,9 @@ 1.10 return gpg_error (GPG_ERR_INV_PASSPHRASE); 1.11 1.12 - desc = xtryasprintf 1.13 + desc = xtryasprintf 1.14 - ( ngettext ("Warning: You have entered an insecure passphrase.%%0A" 1.15 + ( "Warning: You have entered an insecure passphrase.%%0A" 1.16 - "A passphrase should be at least %u character long.", 1.17 + "A passphrase should be at least %u character long.", 1.18 - "Warning: You have entered an insecure passphrase.%%0A" 1.19 -- "A passphrase should be at least %u characters long.", 1.20 +- "A passphrase should be at least %u characters long.", 1.21 - minlen), minlen ); 1.22 + minlen); 1.23 if (!desc) 1.24 return gpg_error_from_syserror (); 1.25 err = take_this_one_anyway (ctrl, desc); 1.26 +@@ -211,13 +209,10 @@ 1.27 + return gpg_error (GPG_ERR_INV_PASSPHRASE); 1.28 + 1.29 + desc = xtryasprintf 1.30 +- ( ngettext ("Warning: You have entered an insecure passphrase.%%0A" 1.31 ++ ( "Warning: You have entered an insecure passphrase.%%0A" 1.32 + "A passphrase should contain at least %u digit or%%0A" 1.33 + "special character.", 1.34 +- "Warning: You have entered an insecure passphrase.%%0A" 1.35 +- "A passphrase should contain at least %u digits or%%0A" 1.36 +- "special characters.", 1.37 +- minnonalpha), minnonalpha ); 1.38 ++ minnonalpha); 1.39 + if (!desc) 1.40 + return gpg_error_from_syserror (); 1.41 + err = take_this_one_anyway (ctrl, desc); 1.42 Index: configure 1.43 ---- configure.orig 2009-09-04 18:09:14 +0200 1.44 -+++ configure 2009-09-06 23:05:29 +0200 1.45 -@@ -7782,13 +7782,13 @@ 1.46 +--- configure.orig 2011-08-04 16:27:00.000000000 +0200 1.47 ++++ configure 2011-12-11 12:26:25.000000000 +0100 1.48 +@@ -7908,13 +7908,13 @@ 1.49 # Check wether it is necessary to link against libdl. 1.50 # 1.51 gnupg_dlopen_save_libs="$LIBS" 1.52 -LIBS="" 1.53 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 1.54 $as_echo_n "checking for library containing dlopen... " >&6; } 1.55 - if test "${ac_cv_search_dlopen+set}" = set; then : 1.56 + if ${ac_cv_search_dlopen+:} false; then : 1.57 $as_echo_n "(cached) " >&6 1.58 else 1.59 ac_func_search_save_LIBS=$LIBS
2.1 --- a/gnupg/gnupg.spec Fri Aug 03 16:29:17 2012 +0200 2.2 +++ b/gnupg/gnupg.spec Fri Aug 03 16:34:12 2012 +0200 2.3 @@ -31,24 +31,22 @@ 2.4 Class: PLUS 2.5 Group: PGP 2.6 License: GPL 2.7 -Version: 2.0.17 2.8 -Release: 20110914 2.9 +Version: 2.0.19 2.10 +Release: 20120800 2.11 2.12 # package options 2.13 -%option with_curl yes 2.14 -%option with_ldap no 2.15 -%option with_idea no 2.16 -%option with_setuid no 2.17 +%option with_setuid yes 2.18 +%option with_curl yes 2.19 +%option with_ldap no 2.20 +%option with_idea no 2.21 2.22 # list of sources 2.23 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2 2.24 Patch0: gnupg.patch 2.25 2.26 # build information 2.27 -Prefix: %{l_prefix} 2.28 -BuildRoot: %{l_buildroot} 2.29 -BuildPreReq: OpenPKG, openpkg >= 20060823, make 2.30 -PreReq: OpenPKG, openpkg >= 20060823, pinentry 2.31 +BuildPreReq: OpenPKG, openpkg >= 20100101, make 2.32 +PreReq: OpenPKG, openpkg >= 20100101, pinentry 2.33 BuildPreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4 2.34 PreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4 2.35 BuildPreReq: zlib, bzip2, readline, pth, libiconv 2.36 @@ -65,8 +63,6 @@ 2.37 BuildPreReq: gcrypt::with_idea 2.38 PreReq: gcrypt::with_idea 2.39 %endif 2.40 -AutoReq: no 2.41 -AutoReqProv: no 2.42 2.43 %description 2.44 GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and 2.45 @@ -160,24 +156,21 @@ 2.46 --disable-mailto 2.47 2.48 # build program 2.49 - %{l_make} %{l_mflags} 2.50 + %{l_make} %{l_mflags -O} 2.51 2.52 %install 2.53 # install program 2.54 - rm -rf $RPM_BUILD_ROOT 2.55 - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 2.56 + %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT" 2.57 2.58 - # MSvB: facilitate PATH order of independent 2.59 - # MSvB: GnuPG v1 and GnuPG v2 installations. 2.60 -# # provide unversioned names 2.61 -# ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpg2 \ 2.62 -# $RPM_BUILD_ROOT%{l_prefix}/bin/gpg 2.63 -# ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv2 \ 2.64 -# $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv 2.65 -# ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg2.1 \ 2.66 -# $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg.1 2.67 -# ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv2.1 \ 2.68 -# $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv.1 2.69 + # provide unversioned names 2.70 + ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpg2 \ 2.71 + $RPM_BUILD_ROOT%{l_prefix}/bin/gpg 2.72 + ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv2 \ 2.73 + $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv 2.74 + ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg2.1 \ 2.75 + $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg.1 2.76 + ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv2.1 \ 2.77 + $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv.1 2.78 2.79 # strip down and post-adjust installation files 2.80 strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true 2.81 @@ -193,17 +186,14 @@ 2.82 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ 2.83 %{l_files_std} \ 2.84 %if "%{with_setuid}" == "yes" 2.85 + '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg' \ 2.86 '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2' 2.87 -# '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2' \ 2.88 -# '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg' 2.89 %else 2.90 + '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg' \ 2.91 '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2' 2.92 -# '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg' \ 2.93 -# '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2' 2.94 %endif 2.95 2.96 %files -f files 2.97 2.98 %clean 2.99 - rm -rf $RPM_BUILD_ROOT 2.100
