summaryrefslogtreecommitdiff
path: root/data/dpkg/port.diff
diff options
context:
space:
mode:
Diffstat (limited to 'data/dpkg/port.diff')
-rw-r--r--data/dpkg/port.diff66
1 files changed, 18 insertions, 48 deletions
diff --git a/data/dpkg/port.diff b/data/dpkg/port.diff
index c53516c99..ad0809621 100644
--- a/data/dpkg/port.diff
+++ b/data/dpkg/port.diff
@@ -1,17 +1,17 @@
-diff -ru dpkg-1.13.25/lib/Makefile.am dpkg-1.13.25+iPhone/lib/Makefile.am
---- dpkg-1.13.25/lib/Makefile.am 2006-06-21 13:41:12.000000000 +0000
-+++ dpkg-1.13.25+iPhone/lib/Makefile.am 2007-12-29 10:00:00.000000000 +0000
-@@ -34,4 +34,5 @@
- tarfn.c tarfn.h \
+diff -ru dpkg-1.14.25/lib/Makefile.am dpkg-1.14.25+iPhone/lib/Makefile.am
+--- dpkg-1.14.25/lib/Makefile.am 2009-02-01 06:18:58.000000000 +0000
++++ dpkg-1.14.25+iPhone/lib/Makefile.am 2009-04-11 01:11:30.000000000 +0000
+@@ -41,4 +41,5 @@
+ trigdeferred.l \
utils.c \
varbuf.c \
- vercmp.c
+ vercmp.c \
+ obstack.c
-diff -ru dpkg-1.13.25/lib/tarfn.c dpkg-1.13.25+iPhone/lib/tarfn.c
---- dpkg-1.13.25/lib/tarfn.c 2006-06-21 13:41:12.000000000 +0000
-+++ dpkg-1.13.25+iPhone/lib/tarfn.c 2007-12-29 09:51:34.000000000 +0000
-@@ -53,6 +53,13 @@
+diff -ru dpkg-1.14.25/lib/tarfn.c dpkg-1.14.25+iPhone/lib/tarfn.c
+--- dpkg-1.14.25/lib/tarfn.c 2009-02-01 06:18:59.000000000 +0000
++++ dpkg-1.14.25+iPhone/lib/tarfn.c 2009-04-11 01:11:30.000000000 +0000
+@@ -55,6 +55,13 @@
return n;
}
@@ -23,12 +23,12 @@ diff -ru dpkg-1.13.25/lib/tarfn.c dpkg-1.13.25+iPhone/lib/tarfn.c
+}
+
/* String block to C null-terminated string */
- char *
+ static char *
StoC(const char *s, int size)
-diff -ru dpkg-1.13.25/m4/funcs.m4 dpkg-1.13.25+iPhone/m4/funcs.m4
---- dpkg-1.13.25/m4/funcs.m4 2006-06-04 15:45:45.000000000 +0000
-+++ dpkg-1.13.25+iPhone/m4/funcs.m4 2007-12-29 09:51:34.000000000 +0000
-@@ -3,7 +3,7 @@
+diff -ru dpkg-1.14.25/m4/funcs.m4 dpkg-1.14.25+iPhone/m4/funcs.m4
+--- dpkg-1.14.25/m4/funcs.m4 2009-01-25 01:19:12.000000000 +0000
++++ dpkg-1.14.25+iPhone/m4/funcs.m4 2009-04-11 01:11:30.000000000 +0000
+@@ -5,7 +5,7 @@
# 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],
@@ -37,27 +37,10 @@ diff -ru dpkg-1.13.25/m4/funcs.m4 dpkg-1.13.25+iPhone/m4/funcs.m4
[#include <stdarg.h>
main() {
va_list v1, v2;
-diff -ru dpkg-1.13.25/src/help.c dpkg-1.13.25+iPhone/src/help.c
---- dpkg-1.13.25/src/help.c 2006-06-19 01:22:03.000000000 +0000
-+++ dpkg-1.13.25+iPhone/src/help.c 2007-12-29 09:51:34.000000000 +0000
-@@ -69,11 +69,8 @@
-
- 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;
-diff -ru dpkg-1.13.25/utils/start-stop-daemon.c dpkg-1.13.25+iPhone/utils/start-stop-daemon.c
---- dpkg-1.13.25/utils/start-stop-daemon.c 2006-06-21 14:59:36.000000000 +0000
-+++ dpkg-1.13.25+iPhone/utils/start-stop-daemon.c 2007-12-29 09:51:34.000000000 +0000
-@@ -32,7 +32,7 @@
+diff -ru dpkg-1.14.25/utils/start-stop-daemon.c dpkg-1.14.25+iPhone/utils/start-stop-daemon.c
+--- dpkg-1.14.25/utils/start-stop-daemon.c 2009-02-01 06:19:02.000000000 +0000
++++ dpkg-1.14.25+iPhone/utils/start-stop-daemon.c 2009-04-11 01:13:30.000000000 +0000
+@@ -34,7 +34,7 @@
# define OSOpenBSD
#elif defined(hpux)
# define OShpux
@@ -66,16 +49,3 @@ diff -ru dpkg-1.13.25/utils/start-stop-daemon.c dpkg-1.13.25+iPhone/utils/start-
# define OSFreeBSD
#elif defined(__NetBSD__)
# define OSNetBSD
-@@ -928,10 +928,10 @@
- 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);
- }