From 0a4dbba6f4b011d1d6a41e267be4e218417b4dac Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Sun, 3 Feb 2008 13:17:06 +0000 Subject: Many fixes for Name, Section, and mDNSResponder. git-svn-id: http://svn.telesphoreo.org/trunk@57 514c082c-b64e-11dc-b46d-3d985efe055d --- data/subversion/_metadata/name | 1 + data/subversion/_metadata/section | 2 +- data/subversion/make.sh | 4 +- data/subversion/mdns.diff | 161 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 data/subversion/_metadata/name create mode 100644 data/subversion/mdns.diff (limited to 'data/subversion') diff --git a/data/subversion/_metadata/name b/data/subversion/_metadata/name new file mode 100644 index 000000000..231afa21d --- /dev/null +++ b/data/subversion/_metadata/name @@ -0,0 +1 @@ +Subversion diff --git a/data/subversion/_metadata/section b/data/subversion/_metadata/section index 7fd8a7f94..161633384 100644 --- a/data/subversion/_metadata/section +++ b/data/subversion/_metadata/section @@ -1 +1 @@ -versioning +Version_Control diff --git a/data/subversion/make.sh b/data/subversion/make.sh index 5a8174953..8ac64fcd3 100644 --- a/data/subversion/make.sh +++ b/data/subversion/make.sh @@ -1,5 +1,5 @@ -tar -jxvf "${PKG_DATA}/subversion-1.4.6.tar.bz2" -cd subversion-1.4.6 +pkg:extract +cd * pkg:patch autoconf CFLAGS="-DSVN_NEON_0_25 -DSVN_NEON_0_26" pkg:configure --enable-maintainer-mode --disable-keychain --with-neon="${PKG_ROOT}/usr" --with-apr="$(PKG_WORK_ apr)/apr-1.2.12" --with-apr-util="$(PKG_WORK_ apr-util)/apr-util-1.2.12" diff --git a/data/subversion/mdns.diff b/data/subversion/mdns.diff new file mode 100644 index 000000000..049aadb36 --- /dev/null +++ b/data/subversion/mdns.diff @@ -0,0 +1,161 @@ +diff -ru subversion-1.4.6/contrib/client-side/mucc.c subversion-1.4.6+iPhone/contrib/client-side/mucc.c +--- subversion-1.4.6/contrib/client-side/mucc.c 2005-12-19 23:24:53.000000000 +0000 ++++ subversion-1.4.6+iPhone/contrib/client-side/mucc.c 2008-01-31 08:02:38.000000000 +0000 +@@ -1,3 +1,5 @@ ++#include ++ + /* Multiple URL Command Client + + Combine a list of mv, cp and rm commands on URLs into a single commit. +@@ -445,6 +447,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; ++ + apr_pool_t *pool = init("mucc"); + apr_array_header_t *actions = apr_array_make(pool, 1, sizeof(struct action*)); + const char *anchor = NULL; +diff -ru subversion-1.4.6/subversion/svn/main.c subversion-1.4.6+iPhone/subversion/svn/main.c +--- subversion-1.4.6/subversion/svn/main.c 2006-08-14 20:47:44.000000000 +0000 ++++ subversion-1.4.6+iPhone/subversion/svn/main.c 2008-01-31 08:03:11.000000000 +0000 +@@ -1,3 +1,5 @@ ++#include ++ + /* + * main.c: Subversion command line client. + * +@@ -815,6 +817,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; ++ + svn_error_t *err; + apr_allocator_t *allocator; + apr_pool_t *pool; +diff -ru subversion-1.4.6/subversion/svnadmin/main.c subversion-1.4.6+iPhone/subversion/svnadmin/main.c +--- subversion-1.4.6/subversion/svnadmin/main.c 2007-12-12 22:45:36.000000000 +0000 ++++ subversion-1.4.6+iPhone/subversion/svnadmin/main.c 2008-01-31 08:03:07.000000000 +0000 +@@ -1,3 +1,5 @@ ++#include ++ + /* + * main.c: Subversion server administration tool. + * +@@ -1148,6 +1150,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; ++ + svn_error_t *err; + apr_status_t apr_err; + apr_allocator_t *allocator; +diff -ru subversion-1.4.6/subversion/svnlook/main.c subversion-1.4.6+iPhone/subversion/svnlook/main.c +--- subversion-1.4.6/subversion/svnlook/main.c 2006-07-12 17:07:21.000000000 +0000 ++++ subversion-1.4.6+iPhone/subversion/svnlook/main.c 2008-01-31 08:03:00.000000000 +0000 +@@ -1,3 +1,5 @@ ++#include ++ + /* + * main.c: Subversion server inspection tool. + * +@@ -1858,6 +1860,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; ++ + svn_error_t *err; + apr_status_t apr_err; + apr_allocator_t *allocator; +diff -ru subversion-1.4.6/subversion/svnserve/main.c subversion-1.4.6+iPhone/subversion/svnserve/main.c +--- subversion-1.4.6/subversion/svnserve/main.c 2006-07-12 17:07:21.000000000 +0000 ++++ subversion-1.4.6+iPhone/subversion/svnserve/main.c 2008-01-31 08:03:05.000000000 +0000 +@@ -1,3 +1,5 @@ ++#include ++ + /* + * main.c : Main control function for svnserve + * +@@ -297,6 +299,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; ++ + enum run_mode run_mode = run_mode_unspecified; + svn_boolean_t foreground = FALSE; + apr_socket_t *sock, *usock; +diff -ru subversion-1.4.6/subversion/svnsync/main.c subversion-1.4.6+iPhone/subversion/svnsync/main.c +--- subversion-1.4.6/subversion/svnsync/main.c 2007-10-30 21:56:56.000000000 +0000 ++++ subversion-1.4.6+iPhone/subversion/svnsync/main.c 2008-01-31 08:03:14.000000000 +0000 +@@ -1,3 +1,5 @@ ++#include ++ + /* + * ==================================================================== + * Copyright (c) 2005-2006 CollabNet. All rights reserved. +@@ -1295,6 +1297,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; ++ + const svn_opt_subcommand_desc_t *subcommand = NULL; + apr_array_header_t *received_opts; + opt_baton_t opt_baton; +diff -ru subversion-1.4.6/subversion/svnversion/main.c subversion-1.4.6+iPhone/subversion/svnversion/main.c +--- subversion-1.4.6/subversion/svnversion/main.c 2006-07-12 17:07:21.000000000 +0000 ++++ subversion-1.4.6+iPhone/subversion/svnversion/main.c 2008-01-31 08:03:09.000000000 +0000 +@@ -1,3 +1,5 @@ ++#include ++ + /* + * ==================================================================== + * Copyright (c) 2003-2004 CollabNet. All rights reserved. +@@ -108,6 +110,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; ++ + const char *wc_path, *trail_url; + apr_allocator_t *allocator; + apr_pool_t *pool; -- cgit v1.2.3