diff options
author | Jay Freeman <saurik@saurik.com> | 2008-02-03 13:20:46 +0000 |
---|---|---|
committer | Jay Freeman <saurik@saurik.com> | 2008-02-03 13:20:46 +0000 |
commit | 36c6652e02ce59f1a26cba7d961922f938c4c0bf (patch) | |
tree | f6efe828b78fd99d58b91bdf5cc1431b61ce159f | |
parent | 29b1502c9d7cdcdf4b09e96e29a7c201d1a15f29 (diff) |
Many fixes for Name, Section, and mDNSResponder.
git-svn-id: http://svn.telesphoreo.org/trunk@66 514c082c-b64e-11dc-b46d-3d985efe055d
-rw-r--r-- | data/apt/_metadata/section | 2 | ||||
-rw-r--r-- | data/apt/make.sh | 2 | ||||
-rw-r--r-- | data/apt/mdns.diff | 400 |
3 files changed, 402 insertions, 2 deletions
diff --git a/data/apt/_metadata/section b/data/apt/_metadata/section index 7fbe952b7..a166826b1 100644 --- a/data/apt/_metadata/section +++ b/data/apt/_metadata/section @@ -1 +1 @@ -admin +Package_Management diff --git a/data/apt/make.sh b/data/apt/make.sh index 83831e6ae..8e391d6d6 100644 --- a/data/apt/make.sh +++ b/data/apt/make.sh @@ -2,7 +2,7 @@ tar -zxvf "${PKG_DATA}/apt_0.6.46.4-0.1.tar.gz" cd apt-0.6.46.4.1 pkg:patch autoconf -pkg:configure +pkg:configure --disable-nls make pkg:mkdir /etc/apt/sources.list.d pkg:mkdir /var/cache/apt/archives/partial diff --git a/data/apt/mdns.diff b/data/apt/mdns.diff new file mode 100644 index 000000000..7efb1ac3b --- /dev/null +++ b/data/apt/mdns.diff @@ -0,0 +1,400 @@ +diff -ru apt-0.6.46.4.1/cmdline/apt-cache.cc apt-0.6.46.4.1+iPhone/cmdline/apt-cache.cc +--- apt-0.6.46.4.1/cmdline/apt-cache.cc 2008-01-12 09:13:08.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/cmdline/apt-cache.cc 2008-01-27 10:11:38.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + // -*- mode: cpp; mode: fold -*- + // Description /*{{{*/ + // $Id: apt-cache.cc,v 1.72 2004/04/30 04:34:03 mdz Exp $ +@@ -1706,6 +1710,13 @@ + + int main(int argc,const char *argv[]) + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + CommandLine::Args Args[] = { + {'h',"help","help",0}, + {'v',"version","version",0}, +diff -ru apt-0.6.46.4.1/cmdline/apt-cdrom.cc apt-0.6.46.4.1+iPhone/cmdline/apt-cdrom.cc +--- apt-0.6.46.4.1/cmdline/apt-cdrom.cc 2008-01-12 09:13:08.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/cmdline/apt-cdrom.cc 2008-01-27 10:11:50.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + // -*- mode: cpp; mode: fold -*- + // Description /*{{{*/ + // $Id: apt-cdrom.cc,v 1.45 2003/11/19 23:50:51 mdz Exp $ +@@ -167,6 +171,13 @@ + + int main(int argc,const char *argv[]) + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + CommandLine::Args Args[] = { + {'h',"help","help",0}, + {'v',"version","version",0}, +diff -ru apt-0.6.46.4.1/cmdline/apt-config.cc apt-0.6.46.4.1+iPhone/cmdline/apt-config.cc +--- apt-0.6.46.4.1/cmdline/apt-config.cc 2008-01-12 09:13:08.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/cmdline/apt-config.cc 2008-01-27 10:11:59.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + // -*- mode: cpp; mode: fold -*- + // Description /*{{{*/ + // $Id: apt-config.cc,v 1.11 2003/01/11 07:18:44 jgg Exp $ +@@ -91,6 +95,13 @@ + + int main(int argc,const char *argv[]) + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + CommandLine::Args Args[] = { + {'h',"help","help",0}, + {'v',"version","version",0}, +diff -ru apt-0.6.46.4.1/cmdline/apt-extracttemplates.cc apt-0.6.46.4.1+iPhone/cmdline/apt-extracttemplates.cc +--- apt-0.6.46.4.1/cmdline/apt-extracttemplates.cc 2008-01-12 09:13:08.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/cmdline/apt-extracttemplates.cc 2008-01-27 10:12:06.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + // -*- mode: cpp; mode: fold -*- + // Description /*{{{*/ + // $Id: apt-extracttemplates.cc,v 1.15 2003/07/26 00:00:11 mdz Exp $ +@@ -351,6 +355,13 @@ + + int main(int argc, const char **argv) + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + CommandLine::Args Args[] = { + {'h',"help","help",0}, + {'v',"version","version",0}, +diff -ru apt-0.6.46.4.1/cmdline/apt-get.cc apt-0.6.46.4.1+iPhone/cmdline/apt-get.cc +--- apt-0.6.46.4.1/cmdline/apt-get.cc 2008-01-12 09:13:08.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/cmdline/apt-get.cc 2008-01-27 10:12:11.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + // -*- mode: cpp; mode: fold -*- + // Description /*{{{*/ + // $Id: apt-get.cc,v 1.156 2004/08/28 01:05:16 mdz Exp $ +@@ -2504,6 +2508,13 @@ + + int main(int argc,const char *argv[]) + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + CommandLine::Args Args[] = { + {'h',"help","help",0}, + {'v',"version","version",0}, +diff -ru apt-0.6.46.4.1/cmdline/apt-sortpkgs.cc apt-0.6.46.4.1+iPhone/cmdline/apt-sortpkgs.cc +--- apt-0.6.46.4.1/cmdline/apt-sortpkgs.cc 2008-01-12 09:13:08.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/cmdline/apt-sortpkgs.cc 2008-01-27 10:12:27.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + // -*- mode: cpp; mode: fold -*- + // Description /*{{{*/ + // $Id: apt-sortpkgs.cc,v 1.5 2003/01/11 07:18:44 jgg Exp $ +@@ -164,6 +168,13 @@ + + int main(unsigned int argc,const char *argv[]) + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + CommandLine::Args Args[] = { + {'h',"help","help",0}, + {'v',"version","version",0}, +diff -ru apt-0.6.46.4.1/ftparchive/apt-ftparchive.cc apt-0.6.46.4.1+iPhone/ftparchive/apt-ftparchive.cc +--- apt-0.6.46.4.1/ftparchive/apt-ftparchive.cc 2006-12-04 14:37:36.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/ftparchive/apt-ftparchive.cc 2008-01-27 10:12:31.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + // -*- mode: cpp; mode: fold -*- + // Description /*{{{*/ + // $Id: apt-ftparchive.cc,v 1.8.2.3 2004/01/02 22:01:48 mdz Exp $ +@@ -901,6 +905,13 @@ + + int main(int argc, const char *argv[]) + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + CommandLine::Args Args[] = { + {'h',"help","help",0}, + {0,"md5","APT::FTPArchive::MD5",0}, +diff -ru apt-0.6.46.4.1/methods/cdrom.cc apt-0.6.46.4.1+iPhone/methods/cdrom.cc +--- apt-0.6.46.4.1/methods/cdrom.cc 2006-12-04 14:37:36.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/methods/cdrom.cc 2008-01-27 10:12:45.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + // -*- mode: cpp; mode: fold -*- + // Description /*{{{*/ + // $Id: cdrom.cc,v 1.20.2.1 2004/01/16 18:58:50 mdz Exp $ +@@ -193,6 +197,13 @@ + + int main() + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + setlocale(LC_ALL, ""); + + CDROMMethod Mth; +diff -ru apt-0.6.46.4.1/methods/copy.cc apt-0.6.46.4.1+iPhone/methods/copy.cc +--- apt-0.6.46.4.1/methods/copy.cc 2006-12-04 14:37:36.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/methods/copy.cc 2008-01-27 10:12:50.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + // -*- mode: cpp; mode: fold -*- + // Description /*{{{*/ + // $Id: copy.cc,v 1.7.2.1 2004/01/16 18:58:50 mdz Exp $ +@@ -86,6 +90,13 @@ + + int main() + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + setlocale(LC_ALL, ""); + + CopyMethod Mth; +diff -ru apt-0.6.46.4.1/methods/file.cc apt-0.6.46.4.1+iPhone/methods/file.cc +--- apt-0.6.46.4.1/methods/file.cc 2006-12-04 14:37:36.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/methods/file.cc 2008-01-27 10:12:56.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + // -*- mode: cpp; mode: fold -*- + // Description /*{{{*/ + // $Id: file.cc,v 1.9.2.1 2004/01/16 18:58:50 mdz Exp $ +@@ -89,6 +93,13 @@ + + int main() + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + setlocale(LC_ALL, ""); + + FileMethod Mth; +diff -ru apt-0.6.46.4.1/methods/ftp.cc apt-0.6.46.4.1+iPhone/methods/ftp.cc +--- apt-0.6.46.4.1/methods/ftp.cc 2006-12-04 14:37:36.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/methods/ftp.cc 2008-01-27 10:13:01.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + // -*- mode: cpp; mode: fold -*- + // Description /*{{{*/ + // $Id: ftp.cc,v 1.31.2.1 2004/01/16 18:58:50 mdz Exp $ +@@ -1086,6 +1090,13 @@ + + int main(int argc,const char *argv[]) + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + setlocale(LC_ALL, ""); + + /* See if we should be come the http client - we do this for http +diff -ru apt-0.6.46.4.1/methods/gpgv.cc apt-0.6.46.4.1+iPhone/methods/gpgv.cc +--- apt-0.6.46.4.1/methods/gpgv.cc 2006-12-04 14:37:36.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/methods/gpgv.cc 2008-01-27 10:13:06.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + #include <apt-pkg/error.h> + #include <apt-pkg/acquire-method.h> + #include <apt-pkg/strutl.h> +@@ -302,6 +306,13 @@ + + int main() + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + setlocale(LC_ALL, ""); + + GPGVMethod Mth; +diff -ru apt-0.6.46.4.1/methods/gzip.cc apt-0.6.46.4.1+iPhone/methods/gzip.cc +--- apt-0.6.46.4.1/methods/gzip.cc 2006-12-04 14:37:36.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/methods/gzip.cc 2008-01-27 10:13:10.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + // -*- mode: cpp; mode: fold -*- + // Description /*{{{*/ + // $Id: gzip.cc,v 1.17.2.1 2004/01/16 18:58:50 mdz Exp $ +@@ -162,6 +166,13 @@ + + int main(int argc, char *argv[]) + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + setlocale(LC_ALL, ""); + + GzipMethod Mth; +diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc +--- apt-0.6.46.4.1/methods/http.cc 2006-12-04 14:37:36.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/methods/http.cc 2008-01-27 10:13:27.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + // -*- mode: cpp; mode: fold -*- + // Description /*{{{*/ + // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ +@@ -1224,6 +1228,13 @@ + + int main() + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + setlocale(LC_ALL, ""); + + HttpMethod Mth; +diff -ru apt-0.6.46.4.1/methods/rred.cc apt-0.6.46.4.1+iPhone/methods/rred.cc +--- apt-0.6.46.4.1/methods/rred.cc 2006-12-04 14:37:36.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/methods/rred.cc 2008-01-27 10:13:41.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + #include <apt-pkg/fileutl.h> + #include <apt-pkg/error.h> + #include <apt-pkg/acquire-method.h> +@@ -253,6 +257,13 @@ + + int main(int argc, char *argv[]) + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + RredMethod Mth; + + Prog = strrchr(argv[0],'/'); +diff -ru apt-0.6.46.4.1/methods/rsh.cc apt-0.6.46.4.1+iPhone/methods/rsh.cc +--- apt-0.6.46.4.1/methods/rsh.cc 2006-12-04 14:37:36.000000000 +0000 ++++ apt-0.6.46.4.1+iPhone/methods/rsh.cc 2008-01-27 10:13:45.000000000 +0000 +@@ -1,3 +1,7 @@ ++extern "C" { ++ #include <mach-o/nlist.h> ++} ++ + // -*- mode: cpp; mode: fold -*- + // Description /*{{{*/ + // $Id: rsh.cc,v 1.6.2.1 2004/01/16 18:58:50 mdz Exp $ +@@ -511,6 +515,13 @@ + + int main(int argc, const char *argv[]) + { ++ struct nlist nl[2]; ++ memset(nl, 0, sizeof(nl)); ++ nl[0].n_un.n_name = "_useMDNSResponder"; ++ nlist("/usr/lib/libc.dylib", nl); ++ if (nl[0].n_type != N_UNDF) ++ *(int *) nl[0].n_value = 0; ++ + setlocale(LC_ALL, ""); + + RSHMethod Mth; |