summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradrianp <adrianp@pkgsrc.org>2006-07-19 19:34:37 +0000
committeradrianp <adrianp@pkgsrc.org>2006-07-19 19:34:37 +0000
commite95ce3ba6a8c918e4b625f54332eac769e915c76 (patch)
treea2d08f1097b695c4b2fe2246d253322e0dd30e5b
parent7af716330d8569f194a076367d59488d1f4e2a66 (diff)
downloadpkgsrc-e95ce3ba6a8c918e4b625f54332eac769e915c76.tar.gz
Add a patch for CVE-2006-0855 via Gentoo/Fedora
Bump to nb2
-rw-r--r--archivers/zoo/Makefile4
-rw-r--r--archivers/zoo/distinfo3
-rw-r--r--archivers/zoo/patches/patch-ak23
3 files changed, 27 insertions, 3 deletions
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index 19434ad07e8..0bd7491c834 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2006/06/18 07:04:16 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2006/07/19 19:34:37 adrianp Exp $
DISTNAME= zoo-2.10pl1
PKGNAME= zoo-2.10.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
diff --git a/archivers/zoo/distinfo b/archivers/zoo/distinfo
index a013457dc4a..0c028328140 100644
--- a/archivers/zoo/distinfo
+++ b/archivers/zoo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/06/10 17:18:48 adrianp Exp $
+$NetBSD: distinfo,v 1.8 2006/07/19 19:34:37 adrianp Exp $
SHA1 (zoo-2.10pl1.tar.gz) = c02d96148ee57df01596d0c8d07a3e327b821600
RMD160 (zoo-2.10pl1.tar.gz) = 971d388b8cb29def1e4e31011463563e91c3d700
@@ -13,3 +13,4 @@ SHA1 (patch-ag) = 05b0a774e7aea3137917b2c714b46012fd401f6d
SHA1 (patch-ah) = af3d79f9dd42f080863c6b672d9ca504c2bf79df
SHA1 (patch-ai) = 87b3f07ec542b554a3ba1744f435e9be2200ed54
SHA1 (patch-aj) = a210f34c8d0ea713d3a92d187c395b7b6ef2c128
+SHA1 (patch-ak) = 40f83eccc77d54af5130d78bcd2d9af1d7cc54a9
diff --git a/archivers/zoo/patches/patch-ak b/archivers/zoo/patches/patch-ak
new file mode 100644
index 00000000000..f9a71d359dd
--- /dev/null
+++ b/archivers/zoo/patches/patch-ak
@@ -0,0 +1,23 @@
+$NetBSD: patch-ak,v 1.1 2006/07/19 19:34:37 adrianp Exp $
+
+--- misc.c.orig 1991-07-16 16:52:54.000000000 +0100
++++ misc.c
+@@ -135,11 +135,17 @@ if available, else the short filename is
+ char *fullpath (direntry)
+ struct direntry *direntry;
+ {
+- static char result[PATHSIZE];
++ static char result[PATHSIZE+LFNAMESIZE+12]; /* Room for enough space.*/
+ combine (result,
+ direntry->dirlen != 0 ? direntry->dirname : "",
+ (direntry->namlen != 0) ? direntry->lfname : direntry->fname
+ );
++
++ if (strlen (result) >= PATHSIZE) {
++ prterror ('f', "Combined dirname and filename too long!\n");
++ *result = '\0';
++ }
++
+ return (result);
+ }
+