9 files changed, 68 insertions, 90 deletions

diff --git a/archivers/dpkg/files/patch-Makefile.conf.in b/archivers/dpkg/files/patch-Makefile.conf.in
index c5461efe1f36..a524efc5f170 100644
--- a/archivers/dpkg/files/patch-Makefile.conf.in
+++ b/archivers/dpkg/files/patch-Makefile.conf.in
@@ -1,6 +1,6 @@
---- Makefile.conf.in.orig	Thu Mar  6 16:27:30 2003
-+++ Makefile.conf.in	Thu Mar  6 16:27:45 2003
-@@ -59,7 +59,7 @@
+--- Makefile.conf.in.orig	Sat Apr 22 12:31:27 2006
++++ Makefile.conf.in	Sat Apr 22 12:31:41 2006
+@@ -68,7 +68,7 @@
  DEFS			= @DEFS@ -D_GNU_SOURCE
  INCLUDE_CFLAGS		= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) -I../include -I.. -I. -I$(top_srcdir)/optlib
  
diff --git a/archivers/dpkg/files/patch-Makefile.in b/archivers/dpkg/files/patch-Makefile.in
index 064da6b58c50..0996e07617a2 100644
--- a/archivers/dpkg/files/patch-Makefile.in
+++ b/archivers/dpkg/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Fri Apr  4 19:35:23 2003
-+++ Makefile.in	Fri Apr  4 19:35:36 2003
-@@ -9,7 +9,7 @@
+--- Makefile.in.orig	Sat Apr 22 12:32:05 2006
++++ Makefile.in	Sat Apr 22 12:32:15 2006
+@@ -10,7 +10,7 @@
  include Makefile.conf
  
- SUBDIRS		= include optlib lib intl dpkg-deb split scripts utils main \
--		  utils @DSELECTDIR@ po methods doc
-+		  utils @DSELECTDIR@ po methods
+ SUBDIRS		= include optlib lib dpkg-deb split scripts utils main \
+-		  @DSELECTDIR@ po methods man doc
++		  @DSELECTDIR@ po methods man
  
  all: version.h all-recursive
  
diff --git a/archivers/dpkg/files/patch-archtable b/archivers/dpkg/files/patch-archtable
index 7cdc91daab26..90bd211c2a45 100644
--- a/archivers/dpkg/files/patch-archtable
+++ b/archivers/dpkg/files/patch-archtable
@@ -1,14 +1,15 @@
---- archtable.orig	Fri Apr  4 20:47:59 2003
-+++ archtable	Fri Apr  4 20:49:16 2003
-@@ -46,7 +46,11 @@
- hppa1.1-linux-gnu	hppa		hppa
- hppa2.0-linux-gnu	hppa		hppa
- hppa64-linux-gnu	hppa		hppa
-+alpha-freebsd		freebsd-alpha	freebsd-alpha
- i386-freebsd		freebsd-i386	freebsd-i386
-+ia64-freebsd		freebsd-ia64	freebsd-ia64
-+powerpc-freebsd		freebsd-powerpc	freebsd-powerpc
-+sparc64-freebsd		freebsd-sparc64	freebsd-sparc64
- s390-linux-gnu		s390		s390
- s390-ibm-linux-gnu	s390		s390
- s390-unknown-linux-gnu	s390		s390
+--- archtable.orig	Thu Nov 11 12:16:32 2004
++++ archtable	Sat Apr 22 12:51:25 2006
+@@ -50,7 +50,12 @@
+ hppa1.1-linux-gnu		hppa		hppa
+ hppa2.0-linux-gnu		hppa		hppa
+ hppa64-linux-gnu		hppa		hppa
++alpha-freebsd			freebsd-alpha	freebsd-alpha
++amd64-freebsd			freebsd-amd64	freebsd-amd64
+ i386-freebsd			freebsd-i386	freebsd-i386
++ia64-freebsd			freebsd-ia64	freebsd-ia64
++powerpc-freebsd			freebsd-powerpc	freebsd-powerpc
++sparc64-freebsd			freebsd-sparc64	freebsd-sparc64
+ i386-kfreebsd-gnu		kfreebsd-i386	kfreebsd-i386
+ i386-netbsdelf-gnu		netbsd-i386	netbsd-i386
+ i386-knetbsd-gnu		knetbsd-i386	knetbsd-i386
diff --git a/archivers/dpkg/files/patch-configure.in b/archivers/dpkg/files/patch-configure.in
deleted file mode 100644
index baf791e3bbf6..000000000000
--- a/archivers/dpkg/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Fri Apr  4 17:55:33 2003
-+++ configure.in	Fri Apr  4 17:55:41 2003
-@@ -158,7 +158,7 @@
- } inline int foo (int x) {], AC_DEFINE(HAVE_INLINE))
- 
- AC_MSG_CHECKING([for __va_copy])
--AC_TRY_COMPILE([
-+AC_TRY_LINK([
- #include <stdarg.h>
- ],[
- va_list v1,v2;
diff --git a/archivers/dpkg/files/patch-lib_Makefile.in b/archivers/dpkg/files/patch-lib_Makefile.in
deleted file mode 100644
index 8624f257a2a1..000000000000
--- a/archivers/dpkg/files/patch-lib_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Makefile.in.orig	Thu Mar  6 16:56:04 2003
-+++ lib/Makefile.in	Thu Mar  6 16:57:21 2003
-@@ -21,7 +21,7 @@
- 	set -e ; cd ../optlib ; $(MAKE) libopt.a
- 
- libdpkg.a: $(OBJECTS) ../optlib/libopt.a
--	$(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/archivers/dpkg/files/patch-lib_utils.c b/archivers/dpkg/files/patch-lib_utils.c
new file mode 100644
index 000000000000..1bef888fb0fb
--- /dev/null
+++ b/archivers/dpkg/files/patch-lib_utils.c
@@ -0,0 +1,15 @@
+--- lib/utils.c.orig	Sat Apr 22 12:28:47 2006
++++ lib/utils.c	Sat Apr 22 12:29:37 2006
+@@ -32,3 +32,12 @@
+ int cisalpha(int c) {
+ 	return ((c>='a') && (c<='z')) || ((c>='A') && (c<='Z'));
+ }
++
++#ifdef __FreeBSD__
++size_t
++strnlen (const char *string, size_t maxlen)
++{
++	const char *end = memchr (string, '\0', maxlen);
++	return end ? (size_t) (end - string) : maxlen;
++}
++#endif
diff --git a/archivers/dpkg/files/patch-man_Makefile.in b/archivers/dpkg/files/patch-man_Makefile.in
new file mode 100644
index 000000000000..9f635b400b5b
--- /dev/null
+++ b/archivers/dpkg/files/patch-man_Makefile.in
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig	Sat Apr 22 12:38:00 2006
++++ man/Makefile.in	Sat Apr 22 12:38:35 2006
+@@ -2,7 +2,7 @@
+ srcdir		= @srcdir@
+ top_srcdir	= @top_srcdir@
+ 
+-SUBDIRS		= de en es fr ja pt_BR ru sv
++SUBDIRS		= en
+ 
+ default: all
+ include ../Makefile.conf
diff --git a/archivers/dpkg/files/patch-utils_Makefile.in b/archivers/dpkg/files/patch-utils_Makefile.in
new file mode 100644
index 000000000000..00bf0891f046
--- /dev/null
+++ b/archivers/dpkg/files/patch-utils_Makefile.in
@@ -0,0 +1,11 @@
+--- utils/Makefile.in.orig	Sat Apr 22 12:20:54 2006
++++ utils/Makefile.in	Sat Apr 22 12:22:12 2006
+@@ -72,7 +72,7 @@
+ 	$(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir)
+ 
+ start-stop-daemon: $(SSD_OBJECTS) ../lib/libdpkg.a
+-	$(CC) $(LDFLAGS) -o $@ $(SSD_OBJECTS) $(LIBS) $(SSD_LIBS)
++	$(CC) $(LDFLAGS) -o $@ $(SSD_OBJECTS) $(LIBS) $(SSD_LIBS) $(NLS_LIBS)
+ 
+ md5sum-static: LDFLAGS += -static
+ md5sum-static: ZLIB_LIBS = $(ZLIBS_LIBS_ALSO_STATIC)
diff --git a/archivers/dpkg/files/patch-utils_start-stop-daemon.c b/archivers/dpkg/files/patch-utils_start-stop-daemon.c
index 42b4c848b134..a3b777082fce 100644
--- a/archivers/dpkg/files/patch-utils_start-stop-daemon.c
+++ b/archivers/dpkg/files/patch-utils_start-stop-daemon.c
@@ -1,48 +1,19 @@
---- utils/start-stop-daemon.c.orig	Mon May 14 07:01:28 2001
-+++ utils/start-stop-daemon.c	Fri Apr  4 21:02:53 2003
-@@ -30,6 +30,8 @@
- #  define OSsunos
- #elif defined(OPENBSD)
- #  define OSOpenBSD
-+#elif defined(__FreeBSD__)
-+#  define OSFreeBSD
- #else
- #  error Unknown architecture - cannot build start-stop-daemon
- #endif
-@@ -41,7 +43,8 @@
- #  include <ps.h>
+--- utils/start-stop-daemon.c.orig	Thu Nov 11 12:16:35 2004
++++ utils/start-stop-daemon.c	Sat Apr 22 12:25:16 2006
+@@ -48,6 +48,7 @@
  #endif
  
--#if defined(OSOpenBSD)
-+#if defined(OSOpenBSD) || defined(OSFreeBSD)
+ #if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
 +#define _WANT_UCRED
  #include <sys/param.h>
  #include <sys/user.h>
  #include <sys/proc.h>
-@@ -744,7 +747,7 @@
- #endif /* OSHURD */
- 
- 
--#if defined(OSOpenBSD)
-+#if defined(OSOpenBSD) || defined(OSFreeBSD)
- int
- pid_is_cmd(pid_t pid, const char *name)
- {
-@@ -787,7 +790,7 @@
- }
-  
- int
--pid_is_user(pid_t pid, int uid)
-+pid_is_user(pid_t pid, uid_t uid)
- {
- 	kvm_t *kd;
- 	int nentries;   /* Value not used */
-@@ -801,9 +804,15 @@
+@@ -859,9 +860,15 @@
  		errx(1, "%s", errbuf);
  	if ((kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &nentries)) == 0)
  		errx(1, "%s", kvm_geterr(kd));
 +#if defined(OSOpenBSD) || (defined(OSFreeBSD) && __FreeBSD_version < 500014)
- 	if ( kp->kp_proc.p_cred )
+ 	if (kp->kp_proc.p_cred )
  		kvm_read(kd, (u_long)&(kp->kp_proc.p_cred->p_ruid),
  			&proc_uid, sizeof(uid_t));
 +#elif defined(OSFreeBSD)
@@ -53,7 +24,7 @@
  	else
  		return 0;
  	return (proc_uid == (uid_t)uid);
-@@ -822,7 +831,11 @@
+@@ -880,7 +887,11 @@
  		errx(1, "%s", errbuf);
  	if ((kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &nentries)) == 0)
  		errx(1, "%s", kvm_geterr(kd));
@@ -65,12 +36,3 @@
  	if (strlen(name) != strlen(pidexec))
  		return 0;
  	return (strcmp(name, pidexec) == 0) ? 1 : 0;
-@@ -835,7 +848,7 @@
- 	/* Nothing to do */
- }
- 
--#endif /* OSOpenBSD */
-+#endif /* OSOpenBSD || OSFreeBSD */
- 
- 
- static void