Import dpkg-1.20.24 from pkgsrc-wip.

Package maintenance system for Debian
Works with .deb files.

4 files changed, 55 insertions, 0 deletions

diff --git a/misc/dpkg/patches/patch-aa b/misc/dpkg/patches/patch-aa
new file mode 100644
index 00000000000..1677263113b
--- /dev/null
+++ b/misc/dpkg/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/10/29 17:26:18 erh Exp $
+
+--- lib/Makefile.in.orig	2004-10-27 09:06:43.000000000 +0000
++++ lib/Makefile.in	2004-10-29 16:42:38.000000000 +0000
+@@ -20,7 +20,7 @@
+ all:: libdpkg.a
+ 
+ libdpkg.a: $(OBJECTS) 
+-	$(AR) r $@ $^
++	$(AR) r $@ $(OBJECTS) ../optlib/getopt.o ../optlib/getopt1.o ../optlib/long-options.o ../optlib/closeout.o ../optlib/obstack.o
+	$(RANLIB) $@
+ 
+ .PHONY: install
diff --git a/misc/dpkg/patches/patch-ab b/misc/dpkg/patches/patch-ab
new file mode 100644
index 00000000000..d5da260b03a
--- /dev/null
+++ b/misc/dpkg/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/10/29 17:26:18 erh Exp $
+
+--- Makefile.in.orig	2004-10-29 16:47:00.000000000 +0000
++++ Makefile.in	2004-10-29 16:46:46.000000000 +0000
+@@ -9,8 +9,8 @@
+ default: all
+ include Makefile.conf
+ 
+-SUBDIRS		= include optlib lib dpkg-deb split scripts utils main \
+-		  @DSELECTDIR@ po methods man doc
++SUBDIRS		= include optlib lib dpkg-deb split scripts main \
++ 		  @DSELECTDIR@ po methods
+ 
+ all: version.h all-recursive
+ 
diff --git a/misc/dpkg/patches/patch-ac b/misc/dpkg/patches/patch-ac
new file mode 100644
index 00000000000..ccf795eee35
--- /dev/null
+++ b/misc/dpkg/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/10/29 17:26:18 erh Exp $
+
+--- dpkg-deb/build.c.orig	2003-06-29 12:59:36.000000000 +0200
++++ dpkg-deb/build.c	2003-06-29 13:01:34.000000000 +0200
+@@ -445,7 +445,7 @@
+     m_dup2(p1[0],0); close(p1[0]); close(p1[1]);
+     m_dup2(p2[1],1); close(p2[0]); close(p2[1]);
+     if (chdir(directory)) ohshite(_("failed to chdir to `%.255s'"),directory);
+-    execlp(TAR,"tar","-cf", "-", "-T", "-", "--null", "--no-recursion", (char*)0);
++    execlp(TAR,"tar","-cf", "-", "-T", "-", (char*)0);
+     ohshite(_("failed to exec tar -cf"));
+   }
+   close(p1[0]);
diff --git a/misc/dpkg/patches/patch-ad b/misc/dpkg/patches/patch-ad
new file mode 100644
index 00000000000..5f7053e99c7
--- /dev/null
+++ b/misc/dpkg/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/10/29 17:26:18 erh Exp $
+
+--- lib/tarfn.c.orig	2004-10-29 16:55:01.000000000 +0000
++++ lib/tarfn.c	2004-10-29 16:56:37.000000000 +0000
+@@ -58,7 +58,8 @@
+ 	int	len;
+ 	char *	str;
+ 
+-	len = strnlen(s, size);
++	char *nul = memchr(s, 0, size);
++	len = nul ? (nul - s) : size;
+ 	str = malloc(len + 1);
+ 	memcpy(str, s, len);
+ 	str[len] = 0;