rpms/gnupg2/EL-5 .cvsignore, 1.17, 1.18 gnupg2.spec, 1.57, 1.58 gpg-agent-startup.sh, 1.6, 1.7 sources, 1.19, 1.20 gnupg-2.0.1-CVE-2006-6235.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/gnupg2/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18085

Modified Files:
	.cvsignore gnupg2.spec gpg-agent-startup.sh sources 
Removed Files:
	gnupg-2.0.1-CVE-2006-6235.patch 
Log Message:
sync w/devel branch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/EL-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Dec 2006 14:10:42 -0000	1.17
+++ .cvsignore	3 Oct 2007 13:29:20 -0000	1.18
@@ -1,3 +1,7 @@
 clog
-gnupg-2.0.1.tar.bz2
-gnupg-2.0.1.tar.bz2.sig
+gnupg-2.0.5.tar.bz2
+gnupg-2.0.5.tar.bz2.sig
+gnupg-2.0.6.tar.bz2
+gnupg-2.0.6.tar.bz2.sig
+gnupg-2.0.7.tar.bz2
+gnupg-2.0.7.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/EL-5/gnupg2.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gnupg2.spec	6 Dec 2006 19:42:22 -0000	1.57
+++ gnupg2.spec	3 Oct 2007 13:29:20 -0000	1.58
@@ -1,7 +1,7 @@
 
-## Keep an eye on http://bugzilla.redhat.com/175744, 
+## Keep an eye on http://bugzilla.redhat.com/175744
 ## in case these dirs go away or change
-%if "%{?fedora}" > "3" || "%{?rhel}" > "4"
+%if 0%{?fedora} > 3 || 0%{?rhel} > 4
 %define kde_scriptdir %{_sysconfdir}/kde
 %else
 %define kde_scriptdir %{_prefix}
@@ -9,10 +9,10 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.1
+Version: 2.0.7
 Release: 2%{?dist}
 
-License: GPL
+License: GPLv3+
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
@@ -24,34 +24,32 @@
 Source11: gpg-agent-shutdown.sh
 
 Patch1: gnupg-1.9.16-testverbose.patch
-Patch2: gnupg-2.0.1-CVE-2006-6235.patch
 
-Obsoletes: newpg < 0.9.5
-
-Requires(post): /sbin/install-info
-Requires(postun): /sbin/install-info
-
-BuildRequires: libassuan-static >= 1.0.1 
-BuildRequires: libgcrypt-devel => 1.2.0
-BuildRequires: libgpg-error-devel => 1.4
-BuildRequires: libksba-devel >= 1.0.0
-
-BuildRequires: gettext
-BuildRequires: readline-devel ncurses-devel
-BuildRequires: openldap-devel
-BuildRequires: libusb-devel
-BuildRequires: pth-devel
-BuildRequires: zlib-devel
 BuildRequires: bzip2-devel
-Buildrequires: libusb-devel
 BuildRequires: docbook-utils
-%if "%{?fedora}" > "3"
+BuildRequires: gettext
+BuildRequires: libassuan-devel >= 1.0.3
+BuildRequires: libgcrypt-devel => 1.2.2
+BuildRequires: libgpg-error-devel => 1.4
+BuildRequires: libksba-devel >= 1.0.2
+BuildRequires: libusb-devel
+BuildRequires: openldap-devel
+%if 0%{?fedora} > 3 || 0%{?rhel} > 4
 BuildRequires: pcsc-lite-libs
 %endif
+BuildRequires: pth-devel
+BuildRequires: readline-devel ncurses-devel
+BuildRequires: zlib-devel
 
+Requires(post): /sbin/install-info
+Requires(postun): /sbin/install-info
+Requires(hint): dirmngr
 # sed/kill used in gpg-agent-(startup/shutdown).sh
 Requires: fileutils util-linux
-Requires: pinentry >= 0.7.1
+Requires: pinentry
+
+# ancient, deprecated
+#Obsoletes: newpg < 0.9.5
 
 Provides: gpg
 Provides: openpgp
@@ -82,14 +80,11 @@
 %setup -q -n gnupg-%{version}%{?beta}
 
 #patch1 -p1 -b .testverbose
-pushd g10
-%patch2 -p0 -b .CVE-2006-6235
-popd
 
 # 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"
+%if 0%{?fedora} > 3 || 0%{?rhel} > 4
 %global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.? 2>/dev/null ) 2>/dev/null )
 %else
 %define pcsclib libpcsclite.so.0
@@ -97,18 +92,12 @@
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
-# need scratch gpg database for tests
-mkdir -p $HOME/.gnupg 
-
 
 %build
 
 %configure \
   --disable-rpath \
-  --enable-selinux-support \
-%ifarch x86_64
-  --disable-optimization 
-%endif
+  --enable-selinux-support 
 
 # not smp-safe
 make 
@@ -129,14 +118,15 @@
 # file conflicts with gnupg-1.x 
 rm -f $RPM_BUILD_ROOT%{_bindir}/{gpgsplit,gpg-zip} 
 rm -f $RPM_BUILD_ROOT%{_datadir}/gnupg/{FAQ,faq.html}
-mv $RPM_BUILD_ROOT%{_mandir}/man7/gnupg.7 $RPM_BUILD_ROOT%{_mandir}/man7/gnupg2.7 ||:
 
 # Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 
 %check
-# some gpg2 tests (still) FAIL
+# need scratch gpg database for tests
+mkdir -p $HOME/.gnupg
+# some gpg2 tests (still) FAIL on non i386 platforms
 make -k check ||:
 
 
@@ -181,12 +171,45 @@
 
 
 %changelog
+* Wed Oct 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.7-2
+- Req: dirmngr
+
+* Mon Sep 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.7-1
+- gnupg-2.0.7
+
+* Fri Aug 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.6-2
+- respin (libassuan)
+
+* Thu Aug 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.6-1
+- gnupg-2.0.6
+- License: GPLv3+
+
+* Thu Aug 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.5-4
+- License: GPLv3
+
+* Mon Jul 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.5-3
+- 2.0.5 too many open files fix
+
+* Fri Jul 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.5-2
+- gnupg-2.0.5
+- gpg-agent not restarted after kde session crash/killed (#196327)
+- BR: libassuan-devel > 1.0.2, libksba-devel > 1.0.2
+
+* Fri May 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.4-1
+- gnupg-2.0.4
+
+* Thu Mar 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.3-1
+- gnupg-2.0.3
+
+* Fri Feb 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-1
+- gnupg-2.0.2
+
 * Wed Dec 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.1-2
-- CVE-2006-6235
+- CVE-2006-6235 (#219934)
 
 * Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.1-1
 - gnupg-2.0.1
-- CVE-2006-6169 (bug #217950)
+- CVE-2006-6169 (#217950)
 
 * Sat Nov 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.1-0.3.rc1
 - gnupg-2.0.1rc1 


Index: gpg-agent-startup.sh
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/EL-5/gpg-agent-startup.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gpg-agent-startup.sh	18 Sep 2006 13:18:25 -0000	1.6
+++ gpg-agent-startup.sh	3 Oct 2007 13:29:20 -0000	1.7
@@ -2,15 +2,22 @@
 
 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
+if [ -x "${GPG_AGENT}" ] ; then
 
   # check validity of GPG_SOCKET (in case of session crash)
   GPG_AGENT_INFO_FILE=${HOME}/.gpg-agent-info
   if [ -f "${GPG_AGENT_INFO_FILE}" ]; then
-    GPG_SOCKET=$(cat "${GPG_AGENT_INFO_FILE}" | cut -f1 -d:)
-    if ! test -S "${GPG_SOCKET}" -a -O "${GPG_SOCKET}" ; then
+    GPG_AGENT_PID=`cat ${GPG_AGENT_INFO_FILE} | cut -f2 -d:`
+    GPG_PID_NAME=`ps -p ${GPG_AGENT_PID} -o comm=`
+    if [ ! "x${GPG_PID_NAME}" = "xgpg-agent" ]; then
       rm -f "${GPG_AGENT_INFO_FILE}" 2>&1 >/dev/null
+    else
+       GPG_SOCKET=`cat "${GPG_AGENT_INFO_FILE}" | cut -f1 -d:`
+       if ! test -S "${GPG_SOCKET}" -a -O "${GPG_SOCKET}" ; then
+         rm -f "${GPG_AGENT_INFO_FILE}" 2>&1 >/dev/null
+       fi
     fi
+    unset GPG_AGENT_PID GPG_SOCKET GPG_PID_NAME
   fi
 
   if [ -f "${GPG_AGENT_INFO_FILE}" ]; then


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/EL-5/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	1 Dec 2006 14:10:42 -0000	1.19
+++ sources	3 Oct 2007 13:29:20 -0000	1.20
@@ -1,2 +1,2 @@
-eb24e258db73f4cb53a3ce18375efa21  gnupg-2.0.1.tar.bz2
-58b1bbc2f34c0882ab1a49542a8ffd45  gnupg-2.0.1.tar.bz2.sig
+9c51dfa42cb83102f4d005dc1ed54f0e  gnupg-2.0.7.tar.bz2.sig
+433de7aca1f5d4342121ea09d98a2360  gnupg-2.0.7.tar.bz2


--- gnupg-2.0.1-CVE-2006-6235.patch DELETED ---