From f1880abc10bf67f0b5415a94c9b75cbd44e661c5 Mon Sep 17 00:00:00 2001
From: Ivana Varekova <varekova@fedoraproject.org>
Date: Mon, 17 Jan 2005 13:49:30 +0000
Subject: [PATCH] Fix bug #142237 - problem with "./files" containing archives

---
 zip-2.3-currdir.patch | 11 +++++++++++
 zip.spec              |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 zip-2.3-currdir.patch

diff --git a/zip-2.3-currdir.patch b/zip-2.3-currdir.patch
new file mode 100644
index 0000000..1ff00f6
--- /dev/null
+++ b/zip-2.3-currdir.patch
@@ -0,0 +1,11 @@
+--- zip-2.3/util.c.pom	1999-11-07 11:29:38.000000000 +0100
++++ zip-2.3/util.c	2005-01-17 13:46:26.165396792 +0100
+@@ -190,6 +190,8 @@
+ /* Compare the sh pattern p with the string s and return true if they match,
+    false if they don't or if there is a syntax error in the pattern. */
+ {
++  while (s[0] == '.' && s[1] == '/') 
++     s += 2;                /* strip redundant leading "./" sections */
+   return recmatch((ZCONST uch *) p, (ZCONST uch *) s, cs) == 1;
+ }
+ 
diff --git a/zip.spec b/zip.spec
index b340759..2609b3c 100644
--- a/zip.spec
+++ b/zip.spec
@@ -1,7 +1,7 @@
 Summary: A file compression and packaging utility compatible with PKZIP.
 Name: zip
 Version: 2.3
-Release: 24
+Release: 25
 License: distributable
 Group: Applications/Archiving
 Source: ftp.uu.net:/pub/archiving/zip/src/zip23.tar.gz
@@ -12,6 +12,7 @@ Patch1: exec-shield.patch
 Patch2: zip23-umask.patch
 Patch3: zip-2.3-near-4GB.patch
 Patch4: zip-2.3-configure.patch
+Patch5: zip-2.3-currdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -30,6 +31,7 @@ program.
 %patch2 -p1 -b .umask
 %patch3 -p1 -b .4gb
 %patch4 -p1 -b .cfg
+%patch5 -p1 -b .currdir
 
 %build
 make -f unix/Makefile prefix=/usr "CFLAGS=$RPM_OPT_FLAGS -I. -DUNIX -D_LARGEFILE64_SOURCE" generic_gcc
@@ -62,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/zip.1*
 
 %changelog
+* Mon Jan 17 2005 Ivana Varekova <varekova@redhat.com> 2.3-25
+- Fix bug #142237 - problem with -d and ./files containing archives
+
 * Mon Jun 21 2004 Lon Hohberger <lhh@redhat.com> 2.3-24
 - Extend max file/archive size to 2^32-8193 (4294959103) bytes
 - Include better debugging output for configure script