rpms/gnupg2/FC-3 .cvsignore, 1.6, 1.7 gnupg2.spec, 1.11, 1.12 gpg-agent-shutdown.sh, 1.1, 1.2 gpg-agent-startup.sh, 1.1, 1.2 sources, 1.7, 1.8 gnupg-1.9.18-lvalue.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Jun 22 17:32:51 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/gnupg2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23990
Modified Files:
.cvsignore gnupg2.spec gpg-agent-shutdown.sh
gpg-agent-startup.sh sources
Removed Files:
gnupg-1.9.18-lvalue.patch
Log Message:
* Thu Jun 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.21-3
- fix "gpg-agent not restarted after kde session crash/killed (#196327)
* Thu Jun 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.21-2
- 1.9.21
- omit gpg2 binary to address CVS-2006-3082 (#196190)
* Mon Mar 6 2006 Ville Skyttä <ville.skytta at iki.fi>> 1.9.20-3
- Don't hardcode pcsc-lite lib name (#184123)
* Thu Feb 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.20-2
- fc4+: use /etc/kde/(env|shutdown) for scripts (#175744)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 26 Jan 2006 20:01:37 -0000 1.6
+++ .cvsignore 22 Jun 2006 17:32:51 -0000 1.7
@@ -1,2 +1,2 @@
-gnupg-1.9.20.tar.bz2
-gnupg-1.9.20.tar.bz2.sig
+gnupg-1.9.21.tar.bz2
+gnupg-1.9.21.tar.bz2.sig
Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/gnupg2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnupg2.spec 26 Jan 2006 20:01:37 -0000 1.11
+++ gnupg2.spec 22 Jun 2006 17:32:51 -0000 1.12
@@ -1,13 +1,22 @@
-# pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
-# Note: this is just the name of the default shared lib to load in scdaemon,
-# it can use other implementations too (including non-pcsc ones).
-%define pcsc_lib libpcsclite.so.0
+# Keep an eye on http://bugzilla.redhat.com/bugzilla/175744, in case these dirs go away or change
+%if "%{?fedora}" > "3"
+%define kde_scriptdir %{_sysconfdir}/kde
+%else
+%define kde_scriptdir %{_prefix}
+%endif
+
+# define _enable_gpg to build/include gnupg2 binary, currently disabled because:
+# * currently doesn't build
+# * has security issue (CVE-2006-3082)
+# * upstream devs say "You shall not build the gpg part. There is a reason why it is not
+# enabled by default"
+#define _enable_gpg --enable-gpg
Summary: Utility for secure communication and data storage
Name: gnupg2
-Version: 1.9.20
-Release: 1%{?dist}
+Version: 1.9.21
+Release: 3%{?dist}
License: GPL
Group: Applications/System
@@ -22,7 +31,6 @@
Source10: gpg-agent-startup.sh
Source11: gpg-agent-shutdown.sh
-Patch1: gnupg-1.9.18-lvalue.patch
Patch2: gnupg-1.9.16-testverbose.patch
Obsoletes: newpg < 0.9.5
@@ -33,12 +41,7 @@
BuildRequires: libassuan-devel >= 0.6.10
BuildRequires: libgcrypt-devel => 1.2.0
BuildRequires: libgpg-error-devel => 1.0
-#ifarch x86_64
-# Hard-code libksba-0.9.11 for now (x86_64 'make check' fails)
-#BuildRequires: libksba-devel = 0.9.11
-#else
-BuildRequires: libksba-devel >= 0.9.13
-#endif
+BuildRequires: libksba-devel >= 0.9.15
BuildRequires: gettext
BuildRequires: openldap-devel
@@ -48,11 +51,16 @@
BuildRequires: bzip2-devel
Buildrequires: libusb-devel
BuildRequires: docbook-utils
+%if "%{?fedora}" > "3"
+BuildRequires: pcsc-lite-libs
+%endif
Requires: pinentry >= 0.7.1
+%if "%{?_enable_gpg:1}" == "1"
Provides: gpg
Provides: openpgp
+%endif
%description
GnuPG 1.9 is the future version of GnuPG; it is based on some gnupg-1.3
@@ -72,14 +80,18 @@
%prep
%setup -q -n gnupg-%{version}
-%patch1 -p1 -b .lvalue
%patch2 -p1 -b .testverbose
-#ifarch x86_64
-#sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
-#endif
+# pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
+# Note: this is just the name of the default shared lib to load in scdaemon,
+# it can use other implementations too (including non-pcsc ones).
+%if "%{?fedora}" > "3"
+%global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.? 2>/dev/null ) 2>/dev/null )
+%else
+%define pcsclib libpcsclite.so.0
+%endif
-sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c
+sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c
%build
@@ -87,11 +99,10 @@
%configure \
--disable-rpath \
--disable-dependency-tracking \
- --enable-gpg
+ %{?_enable_gpg}
make %{?_smp_mflags}
-
%check ||:
## Allows for better debugability (doesn't work, fixme)
# echo "debug-allow-core-dumps" >> tests/gpgsm.conf
@@ -105,10 +116,9 @@
make install DESTDIR=$RPM_BUILD_ROOT
# enable auto-startup/shutdown of gpg-agent
-# Keep an eye on http://bugzilla.redhat.com/bugzilla/175744, in case these dirs go away or change
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown}
-install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/env/
-install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{_prefix}/shutdown/
+mkdir -p $RPM_BUILD_ROOT%{kde_scriptdir}/{env,shutdown}
+install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{kde_scriptdir}/env/
+install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{kde_scriptdir}/shutdown/
%find_lang %{name}
@@ -128,10 +138,12 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+%if "%{?_enable_gpg:1}" == "1"
#docs say to install suid root, but we won't, for now.
#attr(4755,root,root) %{_bindir}/gpg2
%{_bindir}/gpg2
%{_bindir}/gpgv2
+%endif
%{_bindir}/gpg-connect-agent
%{_bindir}/gpg-agent
%{_bindir}/gpgconf
@@ -146,9 +158,8 @@
%{_libdir}/gnupg/
%{_libexecdir}/*
%{_infodir}/*
-# Own dirs until someone else does (filesystem,kdebase?)
-%{_prefix}/env/
-%{_prefix}/shutdown/
+%{kde_scriptdir}/env/*.sh
+%{kde_scriptdir}/shutdown/*.sh
%clean
@@ -156,6 +167,22 @@
%changelog
+* Thu Jun 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.21-3
+- fix "gpg-agent not restarted after kde session crash/killed (#196327)
+
+* Thu Jun 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.21-2
+- 1.9.21
+- omit gpg2 binary to address CVS-2006-3082 (#196190)
+
+* Mon Mar 6 2006 Ville Skyttä <ville.skytta at iki.fi>> 1.9.20-3
+- Don't hardcode pcsc-lite lib name (#184123)
+
+* Thu Feb 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.20-2
+- fc4+: use /etc/kde/(env|shutdown) for scripts (#175744)
+
+* Fri Feb 10 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
* Tue Dec 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.20-1
- 1.9.20
Index: gpg-agent-shutdown.sh
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/gpg-agent-shutdown.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpg-agent-shutdown.sh 5 Dec 2005 15:16:53 -0000 1.1
+++ gpg-agent-shutdown.sh 22 Jun 2006 17:32:51 -0000 1.2
@@ -1,5 +1,4 @@
#!/bin/sh
-# $Id$
## The nice way
if test -n "${GPG_AGENT_INFO}"; then
Index: gpg-agent-startup.sh
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/gpg-agent-startup.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpg-agent-startup.sh 5 Dec 2005 15:16:53 -0000 1.1
+++ gpg-agent-startup.sh 22 Jun 2006 17:32:51 -0000 1.2
@@ -1,14 +1,23 @@
#!/bin/sh
-# $Id$
-GPG_AGENT=$(which gpg-agent)
+GPG_AGENT=/usr/bin/gpg-agent
## Run gpg-agent only if not already running, and available
if [ -z "${GPG_AGENT_INFO}" -a -x ${GPG_AGENT} ] ; then
+
+ # check validity of GPG_SOCKET (in case of session crash)
if [ -f ${HOME}/.gpg-agent-info ]; then
- export GPG_AGENT_INFO=$(cat $HOME/.gpg-agent-info)
+ GPG_SOCKET=$(cat .gpg-agent-info |cut -f1 -d:)
+ if ! test -S ${GPG_SOCKET} -o ! test -O ${GPG_SOCKET} ; then
+ rm -f ${HOME}/.gpg-agent-info 2>&1 >/dev/null
+ fi
+ fi
+
+ if [ -f ${HOME}/.gpg-agent-info ]; then
+ export GPG_AGENT_INFO=$(cat ${HOME}/.gpg-agent-info)
export GPG_TTY=$(tty)
else
eval "$(${GPG_AGENT} -s --daemon ${GPG_OPTIONS})"
- echo $GPG_AGENT_INFO > $HOME/.gpg-agent-info
+ echo ${GPG_AGENT_INFO} > ${HOME}/.gpg-agent-info
fi
+
fi
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 26 Jan 2006 20:01:37 -0000 1.7
+++ sources 22 Jun 2006 17:32:51 -0000 1.8
@@ -1,2 +1,2 @@
-93899203fc0530f03e146d49b65c1e28 gnupg-1.9.20.tar.bz2
-76e3a5c1ac153c24a4fd3e0e83b0e9f6 gnupg-1.9.20.tar.bz2.sig
+94f4e2ded63820efa6903543c2e06017 gnupg-1.9.21.tar.bz2
+89d22744e0afe45528184b7b09d4c8a0 gnupg-1.9.21.tar.bz2.sig
--- gnupg-1.9.18-lvalue.patch DELETED ---
More information about the fedora-extras-commits
mailing list