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: 06-Jul-2007 12:51:44
Branch: HEAD Handle: 2007070611514301
Added files:
openpkg-src/gnupg gnupg.patch
Modified files:
openpkg-src/gnupg gnupg.spec
openpkg-src/libassuan libassuan.spec
openpkg-src/libksba libksba.spec
Log:
move gnupg2 to gnupg
Summary:
Revision Changes Path
1.10 +36 -0 openpkg-src/gnupg/gnupg.patch
1.74 +73 -29 openpkg-src/gnupg/gnupg.spec
1.8 +1 -1 openpkg-src/libassuan/libassuan.spec
1.8 +2 -2 openpkg-src/libksba/libksba.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gnupg/gnupg.patch
============================================================================
$ cvs diff -u -r0 -r1.10 gnupg.patch
--- /dev/null 2007-07-06 12:50:29 +0200
+++ gnupg.patch 2007-07-06 12:51:44 +0200
@@ -0,0 +1,36 @@
+Index: agent/genkey.c
+--- agent/genkey.c.orig 2007-01-25 10:43:10 +0100
++++ agent/genkey.c 2007-02-01 09:23:19 +0100
+@@ -87,12 +87,9 @@
+ if (utf8_charcount (pw) < minlen )
+ {
+ char *desc = xtryasprintf
+- ( ngettext ("Warning: You have entered a passphrase that%%0A"
++ ( "Warning: You have entered a passphrase that%%0A"
+ "is obviously not secure. A passphrase should%%0A"
+- "be at least %u character long.",
+- "Warning: You have entered a passphrase that%%0A"
+- "is obviously not secure. A passphrase should%%0A"
+- "be at least %u characters long.", minlen), minlen );
++ "be at least %u characters long.", minlen );
+ if (!desc)
+ return gpg_error_from_syserror ();
+
+Index: configure
+--- configure.orig 2007-01-31 15:09:31 +0100
++++ configure 2007-02-01 09:17:47 +0100
+@@ -6916,13 +6916,13 @@
+ # Check wether it is necessary to link against libdl.
+ #
+ gnupg_dlopen_save_libs="$LIBS"
+-LIBS=""
+ { 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=""
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gnupg/gnupg.spec
============================================================================
$ cvs diff -u -r1.73 -r1.74 gnupg.spec
--- openpkg-src/gnupg/gnupg.spec 5 Mar 2007 18:03:19 -0000 1.73
+++ openpkg-src/gnupg/gnupg.spec 6 Jul 2007 10:51:43 -0000 1.74
@@ -29,28 +29,31 @@
Vendor: Werner Koch
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
-Class: BASE
+Class: PLUS
Group: PGP
License: GPL
-Version: 1.4.7
-Release: 20070305
+Version: 2.0.5
+Release: 20070706
# package options
-%option with_curl no
+%option with_curl yes
%option with_idea no
%option with_ldap no
# list of sources
-Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.gz
+Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
Source1: ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz
+Patch0: gnupg.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make
-PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: zlib, bzip2, readline
-PreReq: zlib, bzip2, readline
+PreReq: OpenPKG, openpkg >= 20040130, pinentry
+BuildPreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 1.0.2,
gpg-error >= 1.4
+PreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 1.0.2,
gpg-error >= 1.4
+BuildPreReq: zlib, bzip2, readline, pth, libiconv
+PreReq: zlib, bzip2, readline, pth, libiconv
%if "%{with_curl}" == "yes"
BuildPreReq: curl, openssl
PreReq: curl, openssl
@@ -74,72 +77,113 @@
prog gnupg = {
version = %{version}
url = ftp://ftp.gnupg.org/gcrypt/gnupg/
- regex = gnupg-(1\.__VER__)\.tar\.(gz|bz2)
+ regex = gnupg-(2\.__VER__)\.tar\.(gz|bz2)
}
%prep
- %setup -q
+ %setup -q -n gnupg-%{version}
%if "%{with_idea}" == "yes"
%{l_gzip} -d -c %{SOURCE idea.c.gz} >cipher/idea.c
%endif
+ %patch -p0
%build
- LIBS=""
+ # configure program
+ export LIBS=""
echo "int main(int argc, char *argv[]) { return 0; }" >dummy.c
for lib in termcap termlib curses ncurses; do
rc=0; %{l_cc} -o dummy dummy.c -l$lib >/dev/null 2>&1 || rc=1
if [ $rc -eq 0 ]; then LIBS="$LIBS -l$lib"; break; fi
done
-%if "%{with_ldap}" == "yes" || "%{with_curl}" == "yes"
+%if "%{with_curl}" == "yes" || "%{with_ldap}" == "yes"
LIBS="$LIBS -lssl -lcrypto"
%endif
%if "%{with_curl}" == "yes"
LIBS="$LIBS -lz"
%endif
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags}" \
- LIBS="$LIBS" \
- GREP="grep" \
+ LIBS="$LIBS -liconv"
+ export CC="%{l_cc}"
+ export CFLAGS="%{l_cflags -O}"
+ export CPPFLAGS="%{l_cppflags}"
+ export LDFLAGS="%{l_ldflags}"
./configure \
--prefix=%{l_prefix} \
+ --libexecdir=%{l_prefix}/libexec/gnupg \
--mandir=%{l_prefix}/man \
--infodir=%{l_prefix}/info \
--with-zlib=%{l_prefix} \
--with-bzip2=%{l_prefix} \
--with-readline=%{l_prefix} \
+ --with-libiconv-prefix=%{l_prefix} \
+ --with-gpg-error-prefix=%{l_prefix} \
+ --with-libgcrypt-prefix=%{l_prefix} \
+ --with-libassuan-prefix=%{l_prefix} \
+ --with-ksba-prefix=%{l_prefix} \
+ --with-pth-prefix=%{l_prefix} \
+ --with-agent-pgm=%{l_prefix}/bin/gpg-agent \
+ --with-pinentry-pgm=%{l_prefix}/bin/pinentry \
+ --with-dirmngr-pgm=%{l_prefix}/bin/dirmngr \
+ --with-included-regex \
%if "%{with_curl}" == "yes"
--with-libcurl=%{l_prefix} \
%else
--without-libcurl \
%endif
- --enable-exec \
- --enable-keyserver-helpers \
- --with-mailprog="%{l_prefix}/sbin/sendmail" \
+ --without-included-gettext \
+ --without-libintl-prefix \
+ --disable-nls \
+ --disable-scdaemon \
+ --enable-generic \
+ --enable-finger \
+ --enable-hkp \
%if "%{with_ldap}" == "yes"
--enable-ldap \
%else
--disable-ldap \
%endif
- --enable-finger \
- --enable-http \
- --enable-hkp \
- --disable-mailto \
- --disable-gnupg-iconv \
- --without-included-gettext \
- --disable-nls
+%if "%{with_curl}" == "yes"
+ --with-libcurl=%{l_prefix} \
+%else
+ --without-libcurl \
+%endif
+ --enable-exec \
+ --enable-keyserver-helpers \
+ --with-mailprog="%{l_prefix}/sbin/sendmail" \
+ --disable-mailto
+
+ # build program
%{l_make} %{l_mflags}
%install
+ # install program
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+
+ # provide unversioned names
+ ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpg2 \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/gpg
+ ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv2 \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv
+ ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg2.1 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg.1
+ ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv2.1 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv.1
+
+ # strip down and post-adjust installation files
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
strip $RPM_BUILD_ROOT%{l_prefix}/libexec/gnupg/* 2>/dev/null || true
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/scdaemon.1
+ mv $RPM_BUILD_ROOT%{l_prefix}/bin/gpgsm-gencert.sh \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/gpgsm-gencert
+ mv $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgsm-gencert.sh.1 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgsm-gencert.1
+
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg'
+ '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg' \
+ '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libassuan/libassuan.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 libassuan.spec
--- openpkg-src/libassuan/libassuan.spec 6 Jul 2007 07:17:49 -0000
1.7
+++ openpkg-src/libassuan/libassuan.spec 6 Jul 2007 10:51:44 -0000
1.8
@@ -29,7 +29,7 @@
Vendor: Werner Koch et al.
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
-Class: EVAL
+Class: PLUS
Group: Libraries
License: GPL/LGPL
Version: 1.0.2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libksba/libksba.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 libksba.spec
--- openpkg-src/libksba/libksba.spec 4 Jul 2007 20:10:45 -0000 1.7
+++ openpkg-src/libksba/libksba.spec 6 Jul 2007 10:51:44 -0000 1.8
@@ -29,11 +29,11 @@
Vendor: Werner Koch et al.
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
-Class: EVAL
+Class: PLUS
Group: Cryptography
License: GPL/LGPL
Version: 1.0.2
-Release: 20070704
+Release: 20070706
# list of sources
Source0: ftp://ftp.gnupg.org/gcrypt/libksba/libksba-%{version}.tar.bz2
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
