root / trunk / data / dpkg / port.diff

lib/Makefile.am

@@ -34 +34 @@
         tarfn.c tarfn.h \
         utils.c \
         varbuf.c \
-        vercmp.c
+        vercmp.c \
+        obstack.c

lib/tarfn.c

@@ -53 +53 @@
         return n;
 }
 
+int strnlen(const char *s, int size) {
+    for (int i = 0; i != size; ++i)
+        if (s[i] == '\0')
+            return i;
+    return size;
+}
+
 /* String block to C null-terminated string */
 char *
 StoC(const char *s, int size)

m4/funcs.m4

@@ -3 +3 @@
 # Define HAVE_VA_COPY if we have va_copy, fail if they can't be assigned
 AC_DEFUN([DPKG_FUNC_VA_COPY],
 [AC_CACHE_CHECK([for va_copy], [dpkg_cv_va_copy],
-[AC_TRY_RUN(
+[AC_TRY_COMPILE(
 [#include <stdarg.h>
 main() {
 va_list v1, v2;

src/help.c

@@ -69 +69 @@
 
 void checkpath(void) {
 /* Verify that some programs can be found in the PATH. */
-  static const char *const checklist[]= { "ldconfig", 
-#ifdef WITH_START_STOP_DAEMON
-    "start-stop-daemon",
-#endif    
-    "install-info", "update-rc.d", 0
+  static const char *const checklist[]= { 
+    "install-info", 0
   };
 
   struct stat stab;

utils/start-stop-daemon.c

@@ -32 +32 @@
 #  define OSOpenBSD
 #elif defined(hpux)
 #  define OShpux
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || 1
 #  define OSFreeBSD
 #elif defined(__NetBSD__)
 #  define OSNetBSD
@@ -928 +928 @@
                 errx(1, "%s", errbuf);
         if ((kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &nentries)) == 0)
                 errx(1, "%s", kvm_geterr(kd));
-        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));
-        else
+        else*/
                 return 0;
         return (proc_uid == (uid_t)uid);
 }