diff options
| author |   Ferry Meyndert <m0rpheus@gentoo.org> | 2002-02-17 23:15:38 +0000 |
|---|---|---|
| committer | Ferry Meyndert <m0rpheus@gentoo.org> | 2002-02-17 23:15:38 +0000 |
| commit | 7e72cf1af859f8210de221f57e684cc472fcc483 (patch) | |
| tree | 0e5da2fc54a07468b06faae0c86d597b676c66d9 /app-arch | |
| parent | JDK 1.4.0 (diff) | |
| download | gentoo-2-7e72cf1af859f8210de221f57e684cc472fcc483.tar.gz gentoo-2-7e72cf1af859f8210de221f57e684cc472fcc483.tar.bz2 gentoo-2-7e72cf1af859f8210de221f57e684cc472fcc483.zip | |
Removed 5.42 patch it broke more things then it fixes
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/unzip/ChangeLog | 9 | ||||
| -rw-r--r-- | app-arch/unzip/files/unzip-5.42.patch | 31 | ||||
| -rw-r--r-- | app-arch/unzip/unzip-5.42.ebuild | 8 |
3 files changed, 9 insertions, 39 deletions
diff --git a/app-arch/unzip/ChangeLog b/app-arch/unzip/ChangeLog index 8167ecb65ed9..4e84229ad4bf 100644 --- a/app-arch/unzip/ChangeLog +++ b/app-arch/unzip/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-arch/unzip # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.1 2002/02/01 21:53:00 gbevin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.2 2002/02/17 23:15:38 m0rpheus Exp $ + +*unzip-5.42 (18 Feb 2002) + + 18 Feb 2002; F.Meyndert <m0rpheus@gentoo.org> unzip-5.42.ebuild : + + Removed patch. Patch broke more things then it fixes. Waiting for new + vendor patch. This is also the fix for bug #650 *unzip-5.42 (1 Feb 2002) diff --git a/app-arch/unzip/files/unzip-5.42.patch b/app-arch/unzip/files/unzip-5.42.patch deleted file mode 100644 index a39d3c7d137e..000000000000 --- a/app-arch/unzip/files/unzip-5.42.patch +++ /dev/null @@ -1,31 +0,0 @@ -*** extract.orig Sun Jan 14 00:40:20 2001 ---- extract.c Mon Jul 9 14:45:42 2001 -*************** -*** 154,159 **** ---- 154,161 ---- - #ifndef WINDLL - static ZCONST char Far ReplaceQuery[] = - "replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: "; -+ static ZCONST char Far TraversalWarning[] = -+ "%s skipped because of directory traversal\n"; - static ZCONST char Far AssumeNone[] = " NULL\n(assuming [N]one)\n"; - static ZCONST char Far NewNameQuery[] = "new name: "; - static ZCONST char Far InvalidResponse[] = "error: invalid response [%c]\n"; -*************** -*** 877,882 **** ---- 879,893 ---- - } /* end switch (*answerbuf) */ - #endif /* ?WINDLL */ - } /* end if (query) */ -+ if(*__G__ G.filename=='/' || !strncmp(__G__ G.filename, "../", 3) -+ || strstr(__G__ G.filename,"/../")){ -+ skip_entry = SKIP_Y_EXISTING; -+ #ifndef WINDLL -+ Info(slide, 0x81, ((char *)slide, -+ LoadFarString(TraversalWarning), -+ FnFilter1(G.filename))); -+ #endif -+ } - if (skip_entry != SKIP_NO) { - #ifdef WINDLL - if (skip_entry == SKIP_Y_EXISTING) { diff --git a/app-arch/unzip/unzip-5.42.ebuild b/app-arch/unzip/unzip-5.42.ebuild index c7de843344a2..c0122731fac6 100644 --- a/app-arch/unzip/unzip-5.42.ebuild +++ b/app-arch/unzip/unzip-5.42.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.42.ebuild,v 1.4 2001/11/10 02:33:03 hallski Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.42.ebuild,v 1.5 2002/02/17 23:15:38 m0rpheus Exp $ S=${WORKDIR}/${P} DESCRIPTION="Unzipper for pkzip-compressed files" @@ -11,12 +11,6 @@ HOMEPAGE="ftp://ftp.info-zip.org/pub/infozip/UnZip.html" DEPEND="virtual/glibc" -src_unpack() { - unpack ${A} - cd ${S} - patch -p0 < ${FILESDIR}/unzip-5.42.patch -} - src_compile() { |