From 910026267ec9fc3d6623ebb4378f7b1f3583a049 Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Tue, 21 Apr 2009 09:23:41 +0000 Subject: Cornerstone of the new effort. git-svn-id: http://svn.telesphoreo.org/trunk@596 514c082c-b64e-11dc-b46d-3d985efe055d --- data/dpkg/_metadata/coreutils-bin.dep | 1 + data/dpkg/_metadata/coreutils.dep | 1 - data/dpkg/_metadata/homepage | 1 + data/dpkg/_metadata/lzma.dep | 1 + data/dpkg/_metadata/version | 2 +- data/dpkg/_metadata/zlib | 1 + data/dpkg/checkpath.diff | 18 ++++++++++ data/dpkg/dpkg_1.13.25.tar.gz | Bin 3384618 -> 0 bytes data/dpkg/dpkg_1.14.25.tar.gz | Bin 0 -> 6823861 bytes data/dpkg/extrainst.diff | 28 +++++++-------- data/dpkg/make.sh | 10 ++++-- data/dpkg/port.diff | 66 ++++++++++------------------------ data/dpkg/telesphoreo.diff | 20 +++++------ 13 files changed, 72 insertions(+), 77 deletions(-) create mode 120000 data/dpkg/_metadata/coreutils-bin.dep delete mode 120000 data/dpkg/_metadata/coreutils.dep create mode 100644 data/dpkg/_metadata/homepage create mode 120000 data/dpkg/_metadata/lzma.dep create mode 100644 data/dpkg/_metadata/zlib create mode 100644 data/dpkg/checkpath.diff delete mode 100644 data/dpkg/dpkg_1.13.25.tar.gz create mode 100644 data/dpkg/dpkg_1.14.25.tar.gz (limited to 'data/dpkg') diff --git a/data/dpkg/_metadata/coreutils-bin.dep b/data/dpkg/_metadata/coreutils-bin.dep new file mode 120000 index 000000000..c8195236d --- /dev/null +++ b/data/dpkg/_metadata/coreutils-bin.dep @@ -0,0 +1 @@ +../../coreutils-bin \ No newline at end of file diff --git a/data/dpkg/_metadata/coreutils.dep b/data/dpkg/_metadata/coreutils.dep deleted file mode 120000 index 5bd43c1eb..000000000 --- a/data/dpkg/_metadata/coreutils.dep +++ /dev/null @@ -1 +0,0 @@ -../../coreutils \ No newline at end of file diff --git a/data/dpkg/_metadata/homepage b/data/dpkg/_metadata/homepage new file mode 100644 index 000000000..c5221e589 --- /dev/null +++ b/data/dpkg/_metadata/homepage @@ -0,0 +1 @@ +http://wiki.debian.org/Teams/Dpkg diff --git a/data/dpkg/_metadata/lzma.dep b/data/dpkg/_metadata/lzma.dep new file mode 120000 index 000000000..f84114cb9 --- /dev/null +++ b/data/dpkg/_metadata/lzma.dep @@ -0,0 +1 @@ +../../lzma \ No newline at end of file diff --git a/data/dpkg/_metadata/version b/data/dpkg/_metadata/version index e67bd845b..15977dc74 100644 --- a/data/dpkg/_metadata/version +++ b/data/dpkg/_metadata/version @@ -1 +1 @@ -1.13.25 +1.14.25 diff --git a/data/dpkg/_metadata/zlib b/data/dpkg/_metadata/zlib new file mode 100644 index 000000000..7a4571271 --- /dev/null +++ b/data/dpkg/_metadata/zlib @@ -0,0 +1 @@ +bzip2 diff --git a/data/dpkg/checkpath.diff b/data/dpkg/checkpath.diff new file mode 100644 index 000000000..2670bbe20 --- /dev/null +++ b/data/dpkg/checkpath.diff @@ -0,0 +1,18 @@ +diff -ru dpkg-1.14.25/src/help.c dpkg-1.14.25+iPhone/src/help.c +--- dpkg-1.14.25/src/help.c 2009-02-01 06:19:02.000000000 +0000 ++++ dpkg-1.14.25+iPhone/src/help.c 2009-04-11 01:34:20.000000000 +0000 +@@ -77,12 +77,11 @@ + + void checkpath(void) { + /* Verify that some programs can be found in the PATH. */ +- static const char *const checklist[]= { "ldconfig", ++ static const char *const checklist[]= { + #if WITH_START_STOP_DAEMON + "start-stop-daemon", + #endif +- "install-info", +- "update-rc.d", ++ "launchctl", + NULL + }; + diff --git a/data/dpkg/dpkg_1.13.25.tar.gz b/data/dpkg/dpkg_1.13.25.tar.gz deleted file mode 100644 index 535e9fdbd..000000000 Binary files a/data/dpkg/dpkg_1.13.25.tar.gz and /dev/null differ diff --git a/data/dpkg/dpkg_1.14.25.tar.gz b/data/dpkg/dpkg_1.14.25.tar.gz new file mode 100644 index 000000000..4f8f877ce Binary files /dev/null and b/data/dpkg/dpkg_1.14.25.tar.gz differ diff --git a/data/dpkg/extrainst.diff b/data/dpkg/extrainst.diff index 369d79a3a..59c508084 100644 --- a/data/dpkg/extrainst.diff +++ b/data/dpkg/extrainst.diff @@ -1,19 +1,19 @@ -diff -ru dpkg-1.13.25/lib/dpkg.h dpkg-1.13.25+iPhone/lib/dpkg.h ---- dpkg-1.13.25/lib/dpkg.h 2006-11-24 04:08:31.000000000 +0000 -+++ dpkg-1.13.25+iPhone/lib/dpkg.h 2008-09-03 07:28:26.000000000 +0000 -@@ -82,6 +82,7 @@ +diff -ru dpkg-1.14.25/lib/dpkg.h dpkg-1.14.25+iPhone/lib/dpkg.h +--- dpkg-1.14.25/lib/dpkg.h 2009-02-01 06:18:59.000000000 +0000 ++++ dpkg-1.14.25+iPhone/lib/dpkg.h 2009-04-11 01:20:50.000000000 +0000 +@@ -80,6 +80,7 @@ + #define CONTROLFILE "control" + #define CONFFILESFILE "conffiles" + #define PREINSTFILE "preinst" ++#define EXTRAINSTFILE "extrainst_" + #define POSTINSTFILE "postinst" #define PRERMFILE "prerm" #define POSTRMFILE "postrm" - #define LISTFILE "list" -+#define EXTRAINSTFILE "extrainst_" - - #define STATUSFILE "status" - #define AVAILFILE "available" -diff -ru dpkg-1.13.25/src/processarc.c dpkg-1.13.25+iPhone/src/processarc.c ---- dpkg-1.13.25/src/processarc.c 2006-06-29 00:25:08.000000000 +0000 -+++ dpkg-1.13.25+iPhone/src/processarc.c 2008-09-03 07:28:33.000000000 +0000 -@@ -569,6 +569,16 @@ - close(tc.backendpipe); +diff -ru dpkg-1.14.25/src/processarc.c dpkg-1.14.25+iPhone/src/processarc.c +--- dpkg-1.14.25/src/processarc.c 2009-02-01 06:19:02.000000000 +0000 ++++ dpkg-1.14.25+iPhone/src/processarc.c 2009-04-11 01:19:29.000000000 +0000 +@@ -596,6 +596,16 @@ + p1[0] = -1; waitsubproc(c1,BACKEND " --fsys-tarfile",PROCPIPE); + if (oldversionstatus == stat_notinstalled || oldversionstatus == stat_configfiles) { diff --git a/data/dpkg/make.sh b/data/dpkg/make.sh index 3e834b2f7..9e82f91f0 100644 --- a/data/dpkg/make.sh +++ b/data/dpkg/make.sh @@ -1,6 +1,12 @@ pkg:setup autoconf -cp -a getopt/obstack.[ch] lib +cp -a libcompat/obstack.[ch] lib pkg:configure --with-admindir=/var/lib/dpkg --without-start-stop-daemon --disable-nls --sysconfdir=/etc --disable-linker-optimisations dpkg_cv_va_copy=yes -make +pkg:make pkg:install +pkg: rm -rf /usr/share/perl5 +pkg: grep -Erl '#! ?/usr/bin/perl' / | while read -r line; do + rm -f "${line}" +done +pkg: rm -rf /{usr,var}/lib/dpkg/methods +pkg: rm -rf /usr/lib/dpkg/parsechangelog 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 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); - } diff --git a/data/dpkg/telesphoreo.diff b/data/dpkg/telesphoreo.diff index a3b84c389..5471e331b 100644 --- a/data/dpkg/telesphoreo.diff +++ b/data/dpkg/telesphoreo.diff @@ -1,11 +1,9 @@ -diff -ru dpkg-1.13.25/ostable dpkg-1.13.25+iPhone/ostable ---- dpkg-1.13.25/ostable 2006-06-21 13:33:54.000000000 +0000 -+++ dpkg-1.13.25+iPhone/ostable 2008-04-11 16:12:36.000000000 +0000 -@@ -14,6 +14,7 @@ - # - # - linux linux-gnu linux[^-]*(-gnu.*)? -+iphoneos darwin9 darwin9 - darwin darwin darwin[^-]* - freebsd freebsd freebsd[^-]* - kfreebsd kfreebsd-gnu kfreebsd[^-]*(-gnu.*)? +diff -ru dpkg-1.14.25/triplettable dpkg-1.14.25+iPhone/triplettable +--- dpkg-1.14.25/triplettable 2009-01-25 01:19:14.000000000 +0000 ++++ dpkg-1.14.25+iPhone/triplettable 2009-04-11 01:51:00.000000000 +0000 +@@ -13,4 +13,5 @@ + bsd-openbsd- openbsd- + bsd-netbsd- netbsd- + bsd-darwin- darwin- ++bsd-darwin-arm iphoneos-arm + sysv-solaris- solaris- -- cgit v1.2.3