From e3bd6b653a44cf8bc5792a9a1e377bbd406768cd Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 15:17:54 +0000 Subject: [PATCH] auto-import changelog data from zip-2.3-18.src.rpm Fri Oct 24 2003 Lon Hohberger 2.3-18 - Incorporate Arjan's exec-shield patch for i386 Wed Jun 04 2003 Elliot Lee - rebuilt --- exec-shield.patch | 19 +++++++++++++++++++ zip.spec | 10 +++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 exec-shield.patch diff --git a/exec-shield.patch b/exec-shield.patch new file mode 100644 index 0000000..3d2a1eb --- /dev/null +++ b/exec-shield.patch @@ -0,0 +1,19 @@ +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 diff --git a/zip.spec b/zip.spec index e7e19e3..12d6c0c 100644 --- a/zip.spec +++ b/zip.spec @@ -1,13 +1,14 @@ Summary: A file compression and packaging utility compatible with PKZIP. Name: zip Version: 2.3 -Release: 16 +Release: 18 License: distributable Group: Applications/Archiving Source: ftp.uu.net:/pub/archiving/zip/src/zip23.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 BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -22,6 +23,7 @@ program. %prep %setup -q -a 1 %patch0 -p1 -b .zip +%patch1 -p1 -b .zip %build make -f unix/Makefile prefix=/usr "CFLAGS=$RPM_OPT_FLAGS -I. -DUNIX" generic_gcc @@ -53,6 +55,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/zip.1* %changelog +* Fri Oct 24 2003 Lon Hohberger 2.3-18 +- Incorporate Arjan's exec-shield patch for i386 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + * Wed Jan 22 2003 Tim Powers - rebuilt