rpms/zip/F-12 zip-2.31-exec-shield.patch, NONE, 1.1 sources, 1.3, 1.4 zip.spec, 1.31, 1.32 exec-shield.patch, 1.1, NONE

[Karel Klíč]

Author: kklic

Update of /cvs/extras/rpms/zip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3186

Modified Files:
	sources zip.spec 
Added Files:
	zip-2.31-exec-shield.patch 
Removed Files:
	exec-shield.patch 
Log Message:
Renamed exec-shield patch, removed zcrypt

zip-2.31-exec-shield.patch:
 crc_i386.S |    3 +++
 match.S    |    2 ++
 2 files changed, 5 insertions(+)

--- NEW FILE zip-2.31-exec-shield.patch ---
diff -ur zip-2.3/crc_i386.S zip-2.3-lhh/crc_i386.S
--- zip-2.3/crc_i386.S	1999-10-09 16:10:26.000000000 -0400
+++ zip-2.3-lhh/crc_i386.S	2003-10-24 16:15:52.000000000 -0400
@@ -230,3 +230,6 @@
 #endif /* i386 || _i386 || _I386 || __i386 */
 
 #endif /* !USE_ZLIB */
+
+.section .note.GNU-stack, "", @progbits
+.previous
diff -ur zip-2.3/match.S zip-2.3-lhh/match.S
--- zip-2.3/match.S	1999-07-27 17:18:14.000000000 -0400
+++ zip-2.3-lhh/match.S	2003-10-24 16:15:38.000000000 -0400
@@ -405,3 +405,5 @@
 #endif /* i386 || _I386 || _i386 || __i386  */
 
 #endif /* !USE_ZLIB */
+.section .note.GNU-stack, "", @progbits
+.previous


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zip/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Nov 2005 13:08:08 -0000	1.3
+++ sources	3 Dec 2009 07:20:37 -0000	1.4
@@ -1,2 +1 @@
-922f7f38f8e50ec353fd5b3102e4d4d6  zcrypt29.tar.gz
 6bfc076664416251d7624ab3538d1cb9  zip231.tar.gz


Index: zip.spec
===================================================================
RCS file: /cvs/extras/rpms/zip/F-12/zip.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- zip.spec	27 Jul 2009 09:03:18 -0000	1.31
+++ zip.spec	3 Dec 2009 07:20:37 -0000	1.32
@@ -1,14 +1,13 @@
 Summary: A file compression and packaging utility compatible with PKZIP
 Name: zip
 Version: 2.31
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: Applications/Archiving
 Source: http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz
-Source1: ftp://ftp.freesoftware.com/pub/infozip/src/zcrypt29.tar.gz
 URL: http://www.info-zip.org/pub/infozip/Zip.html
 Patch0: zip23.patch
-Patch1: exec-shield.patch
+Patch1: zip-2.31-exec-shield.patch
 Patch2: zip23-umask.patch
 Patch5: zip-2.3-currdir.patch
 Patch6: zip-2.31-install.patch
@@ -29,9 +28,9 @@ Install the zip package if you need to c
 program.
 
 %prep
-%setup -q -a 1
+%setup -q
 %patch0 -p1 -b .zip
-%patch1 -p1 -b .zip
+%patch1 -p1 -b .exec-shield
 %patch2 -p1 -b .umask
 %patch5 -p1 -b .currdir
 %patch6 -p1 -b .install
@@ -72,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/zip.1*
 
 %changelog
+* Thu Dec  3 2009 Karel Klic <kklic at redhat.com> - 2.31-9
+- Renamed exec-shield.patch to zip-2.31-exec-shield.patch
+- Removed zcrypt29.tar.gz as it is no longer necessary
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.31-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- exec-shield.patch DELETED ---