On Wed, Jan 30, 2002 at 10:55:44AM -0700, Joel Baker wrote:
> Therefore, I think it's about time we were. I'm willing to talk to the
> maintainer about it, but before I start down that road, I need to know
> what, if any, patches were done to dpkg to get it to work in the tarball...
Patch attached.
--
Matthew Garrett | [EMAIL PROTECTED]
diff -u -N -r ./archtable /source/stage2/done/dpkg-1.9.18.work/archtable
--- ./archtable Sun May 13 21:50:59 2001
+++ /source/stage2/done/dpkg-1.9.18.work/archtable Mon Jan 7 16:16:54 2002
@@ -51,3 +51,5 @@
s390-ibm-linux-gnu s390 s390
s390-unknown-linux-gnu s390 s390
i386-openbsd2.8 openbsd-i386 i386
+i386-unknown-netbsdelf1.5 netbsd-i386 i386
+i386-netbsdelf1.5 netbsd-i386 i386
diff -u -N -r ./scripts/dpkg-architecture.pl
/source/stage2/done/dpkg-1.9.18.work/scripts/dpkg-architecture.pl
--- ./scripts/dpkg-architecture.pl Wed Jun 20 00:39:27 2001
+++ /source/stage2/done/dpkg-1.9.18.work/scripts/dpkg-architecture.pl Mon Jan
7 16:26:34 2002
@@ -63,8 +63,8 @@
's390', 's390-linux',
'ia64', 'ia64-linux',
'openbsd-i386', 'i386-openbsd',
- 'freebsd-i386', 'i386-freebsd');
-
+ 'freebsd-i386', 'i386-freebsd',
+ 'netbsd-i386', 'i386-unknown-netbsdelf1.5');
sub usageversion {
print STDERR
"Debian $0 $version. Copyright (C) 1999,2000,2001 Marcus Brinkmann.
diff -u -N -r ./utils/start-stop-daemon.c
/source/stage2/done/dpkg-1.9.18.work/utils/start-stop-daemon.c
--- ./utils/start-stop-daemon.c Sun May 13 22:01:28 2001
+++ /source/stage2/done/dpkg-1.9.18.work/utils/start-stop-daemon.c Mon Jan
7 15:42:10 2002
@@ -30,6 +30,8 @@
# define OSsunos
#elif defined(OPENBSD)
# define OSOpenBSD
+#elif defined(__NetBSD__)
+# define OSNetBSD
#else
# error Unknown architecture - cannot build start-stop-daemon
#endif
@@ -41,7 +43,7 @@
# include <ps.h>
#endif
-#if defined(OSOpenBSD)
+#if defined(OSOpenBSD) || defined(OSNetBSD)
#include <sys/param.h>
#include <sys/user.h>
#include <sys/proc.h>
@@ -744,7 +746,7 @@
#endif /* OSHURD */
-#if defined(OSOpenBSD)
+#if defined(OSOpenBSD) || defined(OSNetBSD)
int
pid_is_cmd(pid_t pid, const char *name)
{
@@ -787,7 +789,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 */
