diff options
author | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2010-05-06 23:10:20 +0000 |
---|---|---|
committer | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2010-05-06 23:10:20 +0000 |
commit | 5ac76d39cea82e53c6f60dc8fa0b8d88de7097a7 (patch) | |
tree | a29de6e71470599c2b3482ac877ec4940a69356c /www/apache20 | |
parent | b3cf2aa19fec49ebbb519c1d28c7740633a29ba5 (diff) | |
download | ports-5ac76d39cea82e53c6f60dc8fa0b8d88de7097a7.tar.gz ports-5ac76d39cea82e53c6f60dc8fa0b8d88de7097a7.zip |
Notes
Diffstat (limited to 'www/apache20')
-rw-r--r-- | www/apache20/files/patch-Makefile.in | 4 | ||||
-rw-r--r-- | www/apache20/files/patch-acinclude.m4 | 21 | ||||
-rw-r--r-- | www/apache20/files/patch-apr-fix-brigade_vprintf_overflow | 18 | ||||
-rw-r--r-- | www/apache20/files/patch-build__library.mk | 8 | ||||
-rw-r--r-- | www/apache20/files/patch-build__rules.mk.in | 11 | ||||
-rw-r--r-- | www/apache20/files/patch-build__special.mk | 11 | ||||
-rw-r--r-- | www/apache20/files/patch-configure.in | 30 | ||||
-rw-r--r-- | www/apache20/files/patch-docs__conf__httpd-std.conf.in (renamed from www/apache20/files/patch-docs:conf:httpd-std.conf.in) | 6 | ||||
-rw-r--r-- | www/apache20/files/patch-docs__conf__ssl-std.conf.in (renamed from www/apache20/files/patch-docs:conf:ssl-std.conf.in) | 10 | ||||
-rw-r--r-- | www/apache20/files/patch-libtool22 | 180 | ||||
-rw-r--r-- | www/apache20/files/patch-modules__ssl__mod_ssl.h (renamed from www/apache20/files/patch-modules:ssl:mod_ssl.h) | 6 | ||||
-rw-r--r-- | www/apache20/files/patch-modules__ssl__ssl_toolkit_compat.h | 8 | ||||
-rw-r--r-- | www/apache20/files/patch-server__main.c (renamed from www/apache20/files/patch-server:main.c) | 8 | ||||
-rw-r--r-- | www/apache20/files/patch-srclib__apr-util__buckets__apr_brigade.c | 12 | ||||
-rw-r--r-- | www/apache20/files/patch-srclib__apr-util__build__dbm.m4 (renamed from www/apache20/files/patch-srclib:apr-util:build:dbm.m4) | 6 | ||||
-rw-r--r-- | www/apache20/files/patch-srclib__apr-util__config.layout (renamed from www/apache20/files/patch-srclib:apr-util:config.layout) | 4 | ||||
-rw-r--r-- | www/apache20/files/patch-srclib__apr-util__strmatch__apr_strmatch.c (renamed from www/apache20/files/patch-apr-fix-strmatch-underflow) | 7 | ||||
-rw-r--r-- | www/apache20/files/patch-srclib__apr-util__xml__apr_xml.c (renamed from www/apache20/files/patch-apr-fix-apr_xml-expat-attack) | 11 | ||||
-rw-r--r-- | www/apache20/files/patch-srclib__apr-util__xml__expat__buildconf.sh (renamed from www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh) | 4 | ||||
-rw-r--r-- | www/apache20/files/patch-srclib__apr__build__buildcheck.sh (renamed from www/apache20/files/patch-srclib:apr:build:buildcheck.sh) | 4 | ||||
-rw-r--r-- | www/apache20/files/patch-srclib__apr__buildconf | 75 | ||||
-rw-r--r-- | www/apache20/files/patch-srclib__apr__config.layout (renamed from www/apache20/files/patch-srclib:apr:config.layout) | 4 | ||||
-rw-r--r-- | www/apache20/files/patch-srclib__apr__configure.in | 43 | ||||
-rw-r--r-- | www/apache20/files/patch-srclib__apr__threadproc__unix__procsup.c (renamed from www/apache20/files/patch-srclib:apr:threadproc:unix:procsup.c) | 12 | ||||
-rw-r--r-- | www/apache20/files/patch-support__Makefile.in (renamed from www/apache20/files/patch-support:Makefile.in) | 4 | ||||
-rw-r--r-- | www/apache20/files/patch-support__apachectl.in (renamed from www/apache20/files/patch-support:apachectl.in) | 6 | ||||
-rw-r--r-- | www/apache20/files/patch-support__apxs.in (renamed from www/apache20/files/patch-support:apxs.in) | 6 | ||||
-rw-r--r-- | www/apache20/files/patch-support__envvars-std.in (renamed from www/apache20/files/patch-support:envvars-std.in) | 6 | ||||
-rw-r--r-- | www/apache20/files/patch-support__log_server_status.in (renamed from www/apache20/files/patch-support:log_server_status.in) | 8 |
29 files changed, 251 insertions, 282 deletions
diff --git a/www/apache20/files/patch-Makefile.in b/www/apache20/files/patch-Makefile.in index e9344df7a041..db6880783569 100644 --- a/www/apache20/files/patch-Makefile.in +++ b/www/apache20/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Wed Nov 24 20:31:09 2004 -+++ Makefile.in Sun Apr 17 10:22:37 2005 +--- ./Makefile.in.orig 2004-11-24 14:31:09.000000000 -0500 ++++ ./Makefile.in 2010-05-06 16:06:03.709834927 -0400 @@ -31,15 +31,21 @@ if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \ diff --git a/www/apache20/files/patch-acinclude.m4 b/www/apache20/files/patch-acinclude.m4 new file mode 100644 index 000000000000..25b723322636 --- /dev/null +++ b/www/apache20/files/patch-acinclude.m4 @@ -0,0 +1,21 @@ +--- ./acinclude.m4.orig 2008-01-07 10:01:56.000000000 -0500 ++++ ./acinclude.m4 2010-05-06 16:06:03.732834004 -0400 +@@ -169,13 +169,17 @@ + + if test -z "$module_standalone"; then + if test -z "$2"; then +- libname="mod_$1.la" ++ # The filename of a convenience library must have a "lib" prefix: ++ libname="libmod_$1.la" + BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" + modpath_static="$modpath_static $libname" + cat >>$modpath_current/modules.mk<<EOF + $libname: $objects + \$(MOD_LINK) $objects $5 + EOF ++ if test ! -z "$5"; then ++ APR_ADDTO(AP_LIBS, [$5]) ++ fi + else + apache_need_shared=yes + libname="mod_$1.la" diff --git a/www/apache20/files/patch-apr-fix-brigade_vprintf_overflow b/www/apache20/files/patch-apr-fix-brigade_vprintf_overflow deleted file mode 100644 index 7ac97674b0c7..000000000000 --- a/www/apache20/files/patch-apr-fix-brigade_vprintf_overflow +++ /dev/null @@ -1,18 +0,0 @@ -Equal to the fix in the apr-util itself: - http://svn.apache.org/viewvc/apr/apr/trunk/buckets/apr_brigade.c?r1=768417&r2=768416&pathrev=768417&view=patch - -See discuission about original vulnerability at - http://www.mail-archive.com/dev@apr.apache.org/msg21592.html - ---- srclib/apr-util/buckets/apr_brigade.c.orig 2009-06-06 12:32:12.000000000 +0400 -+++ srclib/apr-util/buckets/apr_brigade.c 2009-06-06 12:35:30.000000000 +0400 -@@ -689,9 +689,6 @@ - return -1; - } - -- /* tack on null terminator to remaining string */ -- *(vd.vbuff.curpos) = '\0'; -- - /* write out what remains in the buffer */ - return apr_brigade_write(b, flush, ctx, buf, vd.vbuff.curpos - buf); - } diff --git a/www/apache20/files/patch-build__library.mk b/www/apache20/files/patch-build__library.mk new file mode 100644 index 000000000000..e049a9301716 --- /dev/null +++ b/www/apache20/files/patch-build__library.mk @@ -0,0 +1,8 @@ +--- ./build/library.mk.orig 2006-07-12 03:40:55.000000000 -0400 ++++ ./build/library.mk 2010-05-06 16:06:03.733831899 -0400 +@@ -19,4 +19,4 @@ + LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X) + + $(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES) +- $(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD) ++ $(LINK) -static $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD) diff --git a/www/apache20/files/patch-build__rules.mk.in b/www/apache20/files/patch-build__rules.mk.in new file mode 100644 index 000000000000..6af84302564a --- /dev/null +++ b/www/apache20/files/patch-build__rules.mk.in @@ -0,0 +1,11 @@ +--- ./build/rules.mk.in.orig 2006-07-12 03:40:55.000000000 -0400 ++++ ./build/rules.mk.in 2010-05-06 16:06:03.734831750 -0400 +@@ -45,7 +45,7 @@ + + LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ + SH_LINK = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@ +-MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ ++MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ + + # Cross compile commands + diff --git a/www/apache20/files/patch-build__special.mk b/www/apache20/files/patch-build__special.mk new file mode 100644 index 000000000000..5496b05daa85 --- /dev/null +++ b/www/apache20/files/patch-build__special.mk @@ -0,0 +1,11 @@ +--- ./build/special.mk.orig 2006-07-12 03:40:55.000000000 -0400 ++++ ./build/special.mk 2010-05-06 16:06:03.734831750 -0400 +@@ -26,7 +26,7 @@ + install-modules: + @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir); + @builtin='$(BUILTIN_LIBS)'; \ +- has_mod_so=`echo $$builtin|sed 's/^.*mod_so.*$$/has_mod_so/'`; \ ++ has_mod_so=`echo $$builtin|sed 's/^.*libmod_so.*$$/has_mod_so/'`; \ + if [ "x$$has_mod_so" = "xhas_mod_so" ]; then \ + list='$(shared)'; \ + for i in $$list; do \ diff --git a/www/apache20/files/patch-configure.in b/www/apache20/files/patch-configure.in index 6d77c65b7f07..59149994f8c5 100644 --- a/www/apache20/files/patch-configure.in +++ b/www/apache20/files/patch-configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Thu Mar 18 08:36:52 2004 -+++ configure.in Fri Jul 2 11:44:25 2004 +--- ./configure.in.orig 2005-09-12 16:41:34.000000000 -0400 ++++ ./configure.in 2010-05-06 17:30:34.855458994 -0400 @@ -69,7 +69,7 @@ if test "$apr_found" = "reconfig"; then @@ -9,7 +9,7 @@ [--enable-layout=*|\'--enable-layout=*]) dnl We must be the first to build and the last to be cleaned AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS" -@@ -96,7 +96,7 @@ +@@ -106,7 +106,7 @@ if test "$apu_found" = "reconfig"; then APR_SUBDIR_CONFIG(srclib/apr-util, @@ -18,18 +18,12 @@ [--enable-layout=*|\'--enable-layout=*]) dnl We must be the last to build and the first to be cleaned AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util" -@@ -545,8 +545,14 @@ - [Root directory of the Apache install area]) - AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", - [Location of the config file, relative to the Apache root directory]) -+AC_DEFINE_UNQUOTED(DEFAULT_ERRORLOG, "${rel_logfiledir}/httpd-error.log", -+ [Location of error log file]) -+AC_DEFINE_UNQUOTED(DEFAULT_SCOREBOARD, "${rel_runtimedir}/apache_runtime_status", -+ [Location of ScoreBoard file]) - AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", - [Location of the MIME types config file, relative to the Apache root directory]) -+AC_DEFINE_UNQUOTED(DOCUMENT_LOCATION, "${rel_htdocsdir}", -+ [Location of document root]) - AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR", - [Location of the source for the current MPM]) - +@@ -172,7 +172,7 @@ + LIBTOOL="$my_libtool \$(LTFLAGS)" + libtoolversion=`$my_libtool --version` + case $libtoolversion in +- *1.[[45]]*) ++ *1.[[45]]* | *[[2-9]].[[0-9]]*) + SH_LIBTOOL='$(LIBTOOL)' + SHLTCFLAGS="-prefer-pic" + LTCFLAGS="-prefer-non-pic -static" diff --git a/www/apache20/files/patch-docs:conf:httpd-std.conf.in b/www/apache20/files/patch-docs__conf__httpd-std.conf.in index 7a09e89ea821..102a5606575a 100644 --- a/www/apache20/files/patch-docs:conf:httpd-std.conf.in +++ b/www/apache20/files/patch-docs__conf__httpd-std.conf.in @@ -1,5 +1,5 @@ ---- docs/conf/httpd-std.conf.in.orig Mon Aug 16 01:43:56 2004 -+++ docs/conf/httpd-std.conf.in Sun Dec 12 12:34:08 2004 +--- ./docs/conf/httpd-std.conf.in.orig 2005-11-13 12:13:06.000000000 -0500 ++++ ./docs/conf/httpd-std.conf.in 2010-05-06 16:06:03.723831718 -0400 @@ -68,7 +68,7 @@ # <IfModule !mpm_netware.c> @@ -119,7 +119,7 @@ # # ServerTokens -@@ -1043,3 +1049,5 @@ +@@ -1034,3 +1040,5 @@ # ErrorLog @rel_logfiledir@/dummy-host.example.com-error_log # CustomLog @rel_logfiledir@/dummy-host.example.com-access_log common #</VirtualHost> diff --git a/www/apache20/files/patch-docs:conf:ssl-std.conf.in b/www/apache20/files/patch-docs__conf__ssl-std.conf.in index cf0bbeab218d..057e844fa8e5 100644 --- a/www/apache20/files/patch-docs:conf:ssl-std.conf.in +++ b/www/apache20/files/patch-docs__conf__ssl-std.conf.in @@ -1,8 +1,6 @@ -$FreeBSD$ - ---- docs/conf/ssl-std.conf.in.orig Mon Oct 13 16:14:10 2003 -+++ docs/conf/ssl-std.conf.in Mon Oct 13 16:15:17 2003 -@@ -88,8 +88,8 @@ +--- ./docs/conf/ssl-std.conf.in.orig 2005-11-13 12:13:06.000000000 -0500 ++++ ./docs/conf/ssl-std.conf.in 2010-05-06 16:06:03.726831828 -0400 +@@ -86,8 +86,8 @@ DocumentRoot "@exp_htdocsdir@" ServerName www.example.com:443 ServerAdmin you@example.com @@ -13,7 +11,7 @@ $FreeBSD$ # SSL Engine Switch: # Enable/Disable SSL for this virtual host. -@@ -240,7 +240,7 @@ +@@ -238,7 +238,7 @@ # Per-Server Logging: # The home of a custom SSL log file. Use this when you want a # compact non-error SSL logfile on a virtual host basis. diff --git a/www/apache20/files/patch-libtool22 b/www/apache20/files/patch-libtool22 deleted file mode 100644 index 7719aa5b1a3d..000000000000 --- a/www/apache20/files/patch-libtool22 +++ /dev/null @@ -1,180 +0,0 @@ ---- configure.in.orig 2009-07-08 14:58:50.000000000 -0500 -+++ configure.in 2009-07-08 15:03:21.000000000 -0500 -@@ -172,7 +172,7 @@ - LIBTOOL="$my_libtool \$(LTFLAGS)" - libtoolversion=`$my_libtool --version` - case $libtoolversion in -- *1.[[45]]*) -+ *1.[[45]]* | *[[2-9]].[[0-9]]*) - SH_LIBTOOL='$(LIBTOOL)' - SHLTCFLAGS="-prefer-pic" - LTCFLAGS="-prefer-non-pic -static" ---- srclib/apr/buildconf.orig 2009-07-08 15:04:26.000000000 -0500 -+++ srclib/apr/buildconf 2009-07-08 15:10:46.000000000 -0500 -@@ -23,7 +23,7 @@ - # - build/buildcheck.sh || exit 1 - --libtoolize=`build/PrintPath glibtoolize libtoolize` -+libtoolize="${LIBTOOLIZE}" - if [ "x$libtoolize" = "x" ]; then - echo "libtoolize not found in path" - exit 1 -@@ -35,29 +35,48 @@ - # Note: APR supplies its own config.guess and config.sub -- we do not - # rely on libtool's versions - # --echo "Copying libtool helper files ..." -+echo "buildconf: copying libtool helper files using $libtoolize" - - # Remove any libtool files so one can switch between libtool 1.3 - # and libtool 1.4 by simply rerunning the buildconf script. --(cd build ; rm -f ltconfig ltmain.sh libtool.m4) -+(cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4) - --$libtoolize --copy --automake -- --ltpath=`dirname $libtoolize` --ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} -- --if [ ! -f $ltfile ]; then -+lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` -+lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` -+IFS=.; set $lt_version; IFS=' ' -+if test "$1" = "1"; then -+ $libtoolize --copy --automake -+ if [ -f libtool.m4 ]; then -+ ltfile=`pwd`/libtool.m4 -+ else -+ ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ -+ < $libtoolize`" -+ ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} -+ # Expecting the code above to be very portable, but just in case... -+ if [ -z "$ltfile" -o ! -f "$ltfile" ]; then -+ ltpath=`dirname $libtoolize` -+ ltfile=${LIBTOOL_M4} -+ fi -+ fi -+ if [ ! -f $ltfile ]; then - echo "$ltfile not found" - exit 1 -+ fi -+ # Do we need this anymore? -+ echo "buildconf: Using libtool.m4 at ${ltfile}." -+ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 -+fi -+if test "$1" = "2"; then -+ $libtoolize --copy -+ # Wouldn't it just be better to define top_builddir?? -+ mv build/libtool.m4 build/libtool.m4.$$ -+ cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 -+ chmod 664 build/libtool.m4.$$ -+ rm build/libtool.m4.$$ - fi - --echo "buildconf: Using libtool.m4 at ${ltfile}." -- --cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 -- --# This is just temporary until people's workspaces are cleared -- remove --# any old aclocal.m4 left over from prior build so it doesn't cause errors. --rm -f aclocal.m4 -+# Clean up any leftovers -+rm -f aclocal.m4 libtool.m4 - - # - # Generate the autoconf header and ./configure ---- srclib/apr/configure.in.orig 2009-07-08 15:12:05.000000000 -0500 -+++ srclib/apr/configure.in 2009-07-08 15:13:28.000000000 -0500 -@@ -7,6 +7,7 @@ - AC_INIT(build/apr_common.m4) - AC_CONFIG_HEADER(include/arch/unix/apr_private.h) - AC_CONFIG_AUX_DIR(build) -+AC_CONFIG_MACRO_DIR(build) - - dnl - dnl Include our own M4 macros along with those for libtool -@@ -16,6 +17,11 @@ - sinclude(build/apr_threads.m4) - sinclude(build/apr_hints.m4) - sinclude(build/libtool.m4) -+sinclude(build/ltsugar.m4) -+sinclude(build/argz.m4) -+sinclude(build/ltoptions.m4) -+sinclude(build/ltversion.m4) -+sinclude(build/lt~obsolete.m4) - - dnl Save user-defined environment settings for later restoration - dnl -@@ -98,6 +104,8 @@ - dnl preload section from invoking the macro to get compiler info. - AC_PROG_CC - -+AC_PROG_SED -+ - dnl Preload - APR_PRELOAD - -@@ -137,6 +145,11 @@ - AC_ARG_ENABLE(experimental-libtool,[ --experimental-libtool Use experimental custom libtool (not included in source distribution)], - [experimental_libtool=$enableval],[experimental_libtool=no]) - -+dnl Workarounds for busted Libtool 2.x when we don't call AC_PROG_LIBTOOL -+if test "x$Xsed" = "x"; then -+ Xsed="$SED -e 1s/^X//" -+fi -+ - case $host in - *os2*) - # Use a custom-made libtool replacement ---- acinclude.m4.orig 2009-07-10 16:18:04.000000000 -0500 -+++ acinclude.m4 2009-07-10 16:21:02.000000000 -0500 -@@ -169,13 +169,17 @@ - - if test -z "$module_standalone"; then - if test -z "$2"; then -- libname="mod_$1.la" -+ # The filename of a convenience library must have a "lib" prefix: -+ libname="libmod_$1.la" - BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" - modpath_static="$modpath_static $libname" - cat >>$modpath_current/modules.mk<<EOF - $libname: $objects - \$(MOD_LINK) $objects $5 - EOF -+ if test ! -z "$5"; then -+ APR_ADDTO(AP_LIBS, [$5]) -+ fi - else - apache_need_shared=yes - libname="mod_$1.la" ---- build/library.mk.orig 2009-07-10 16:22:02.000000000 -0500 -+++ build/library.mk 2009-07-10 16:22:22.000000000 -0500 -@@ -19,4 +19,4 @@ - LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X) - - $(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES) -- $(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD) -+ $(LINK) -static $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD) ---- build/rules.mk.in.orig 2009-07-10 16:23:23.000000000 -0500 -+++ build/rules.mk.in 2009-07-10 16:23:54.000000000 -0500 -@@ -45,7 +45,7 @@ - - LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ - SH_LINK = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@ --MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ -+MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ - - # Cross compile commands - ---- build/special.mk.orig 2009-07-10 16:25:08.000000000 -0500 -+++ build/special.mk 2009-07-10 16:26:19.000000000 -0500 -@@ -26,7 +26,7 @@ - install-modules: - @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir); - @builtin='$(BUILTIN_LIBS)'; \ -- has_mod_so=`echo $$builtin|sed 's/^.*mod_so.*$$/has_mod_so/'`; \ -+ has_mod_so=`echo $$builtin|sed 's/^.*libmod_so.*$$/has_mod_so/'`; \ - if [ "x$$has_mod_so" = "xhas_mod_so" ]; then \ - list='$(shared)'; \ - for i in $$list; do \ diff --git a/www/apache20/files/patch-modules:ssl:mod_ssl.h b/www/apache20/files/patch-modules__ssl__mod_ssl.h index e916df9d0376..5ab89afb1a3a 100644 --- a/www/apache20/files/patch-modules:ssl:mod_ssl.h +++ b/www/apache20/files/patch-modules__ssl__mod_ssl.h @@ -1,6 +1,6 @@ ---- modules/ssl/mod_ssl.h.orig Tue Sep 16 01:00:06 2003 -+++ modules/ssl/mod_ssl.h Sat Jan 10 22:08:18 2004 -@@ -123,7 +123,7 @@ +--- ./modules/ssl/mod_ssl.h.orig 2007-05-08 19:08:47.000000000 -0400 ++++ ./modules/ssl/mod_ssl.h 2010-05-06 16:06:03.737831861 -0400 +@@ -90,7 +90,7 @@ #else /* !HAVE_SSLC (implicit HAVE_OPENSSL) */ #include <ssl.h> diff --git a/www/apache20/files/patch-modules__ssl__ssl_toolkit_compat.h b/www/apache20/files/patch-modules__ssl__ssl_toolkit_compat.h index 04f018790793..bce46dccdfd1 100644 --- a/www/apache20/files/patch-modules__ssl__ssl_toolkit_compat.h +++ b/www/apache20/files/patch-modules__ssl__ssl_toolkit_compat.h @@ -1,7 +1,7 @@ ---- modules/ssl/ssl_toolkit_compat.h.orig Fri Feb 4 21:21:18 2005 -+++ modules/ssl/ssl_toolkit_compat.h Tue Aug 30 01:42:51 2005 -@@ -99,6 +99,13 @@ - #define HAVE_SSL_X509V3_EXT_d2i +--- ./modules/ssl/ssl_toolkit_compat.h.orig 2006-07-12 03:40:55.000000000 -0400 ++++ ./modules/ssl/ssl_toolkit_compat.h 2010-05-06 16:43:34.888290876 -0400 +@@ -121,6 +121,13 @@ + #endif #endif +#ifndef PEM_F_DEF_CALLBACK diff --git a/www/apache20/files/patch-server:main.c b/www/apache20/files/patch-server__main.c index d297d4425fdb..5a90f78e18ec 100644 --- a/www/apache20/files/patch-server:main.c +++ b/www/apache20/files/patch-server__main.c @@ -1,6 +1,6 @@ ---- server/main.c.orig Thu Jun 13 04:34:56 2002 -+++ server/main.c Sun Jul 21 08:54:09 2002 -@@ -78,6 +78,11 @@ +--- ./server/main.c.orig 2007-08-28 01:23:46.000000000 -0400 ++++ ./server/main.c 2010-05-06 16:06:03.772831938 -0400 +@@ -40,6 +40,11 @@ #include "ap_mpm.h" #include "mpm_common.h" @@ -12,7 +12,7 @@ /* WARNING: Win32 binds http_main.c dynamically to the server. Please place * extern functions and global data in another appropriate module. * -@@ -558,6 +563,21 @@ +@@ -554,6 +559,21 @@ destroy_and_exit_process(process, 1); } diff --git a/www/apache20/files/patch-srclib__apr-util__buckets__apr_brigade.c b/www/apache20/files/patch-srclib__apr-util__buckets__apr_brigade.c new file mode 100644 index 000000000000..252a83e67d66 --- /dev/null +++ b/www/apache20/files/patch-srclib__apr-util__buckets__apr_brigade.c @@ -0,0 +1,12 @@ +--- ./srclib/apr-util/buckets/apr_brigade.c.orig 2005-02-04 15:39:09.000000000 -0500 ++++ ./srclib/apr-util/buckets/apr_brigade.c 2010-05-06 16:06:03.715831795 -0400 +@@ -653,9 +653,6 @@ + return -1; + } + +- /* tack on null terminator to remaining string */ +- *(vd.vbuff.curpos) = '\0'; +- + /* write out what remains in the buffer */ + return apr_brigade_write(b, flush, ctx, buf, vd.vbuff.curpos - buf); + } diff --git a/www/apache20/files/patch-srclib:apr-util:build:dbm.m4 b/www/apache20/files/patch-srclib__apr-util__build__dbm.m4 index cca94b8fdd76..d87f299c4cd9 100644 --- a/www/apache20/files/patch-srclib:apr-util:build:dbm.m4 +++ b/www/apache20/files/patch-srclib__apr-util__build__dbm.m4 @@ -1,5 +1,5 @@ ---- srclib/apr-util/build/dbm.m4.orig Sun Jan 16 18:27:07 2005 -+++ srclib/apr-util/build/dbm.m4 Sat Feb 5 12:14:28 2005 +--- ./srclib/apr-util/build/dbm.m4.orig 2006-11-09 10:50:42.000000000 -0500 ++++ ./srclib/apr-util/build/dbm.m4 2010-05-06 16:06:03.775832049 -0400 @@ -298,8 +298,8 @@ fi APU_CHECK_BERKELEY_DB(1, -1, -1, @@ -70,7 +70,7 @@ ) if test "$apu_have_db" = "1"; then apu_db_version=4 -@@ -524,6 +525,7 @@ +@@ -579,6 +580,7 @@ fi fi fi diff --git a/www/apache20/files/patch-srclib:apr-util:config.layout b/www/apache20/files/patch-srclib__apr-util__config.layout index 222e91d975bc..c0bb5aabd726 100644 --- a/www/apache20/files/patch-srclib:apr-util:config.layout +++ b/www/apache20/files/patch-srclib__apr-util__config.layout @@ -1,5 +1,5 @@ ---- srclib/apr-util/config.layout.orig Tue Jan 7 13:13:09 2003 -+++ srclib/apr-util/config.layout Tue Apr 1 18:36:16 2003 +--- ./srclib/apr-util/config.layout.orig 2004-11-24 18:45:40.000000000 -0500 ++++ ./srclib/apr-util/config.layout 2010-05-06 16:06:03.777832029 -0400 @@ -229,3 +229,7 @@ infodir: ${exec_prefix}/share/info libsuffix -${APRUTIL_MAJOR_VERSION} diff --git a/www/apache20/files/patch-apr-fix-strmatch-underflow b/www/apache20/files/patch-srclib__apr-util__strmatch__apr_strmatch.c index c1e252355927..cc0cb97825f2 100644 --- a/www/apache20/files/patch-apr-fix-strmatch-underflow +++ b/www/apache20/files/patch-srclib__apr-util__strmatch__apr_strmatch.c @@ -1,8 +1,5 @@ -Fix underflow in apr_strmatch_precompile, - http://svn.apache.org/viewvc/apr/apr/trunk/strmatch/apr_strmatch.c?r1=757729&r2=779878&view=patch - ---- srclib/apr-util/strmatch/apr_strmatch.c 2009/03/24 11:12:27 757729 -+++ srclib/apr-util/strmatch/apr_strmatch.c 2009/05/29 07:47:52 779878 +--- ./srclib/apr-util/strmatch/apr_strmatch.c.orig 2005-02-04 15:39:09.000000000 -0500 ++++ ./srclib/apr-util/strmatch/apr_strmatch.c 2010-05-06 16:06:03.717832055 -0400 @@ -103,13 +103,13 @@ if (case_sensitive) { pattern->compare = match_boyer_moore_horspool; diff --git a/www/apache20/files/patch-apr-fix-apr_xml-expat-attack b/www/apache20/files/patch-srclib__apr-util__xml__apr_xml.c index 2040f082ea2d..37059a0da8b1 100644 --- a/www/apache20/files/patch-apr-fix-apr_xml-expat-attack +++ b/www/apache20/files/patch-srclib__apr-util__xml__apr_xml.c @@ -1,9 +1,6 @@ -Taken from - http://svn.apache.org/viewvc/apr/apr/trunk/xml/apr_xml.c?r1=757729&r2=781403&view=patch - ---- srclib/apr-util/xml/apr_xml.c 2009/03/24 11:12:27 757729 -+++ srclib/apr-util/xml/apr_xml.c 2009/06/03 14:26:19 781403 -@@ -347,6 +347,25 @@ +--- ./srclib/apr-util/xml/apr_xml.c.orig 2007-04-02 12:19:29.000000000 -0400 ++++ ./srclib/apr-util/xml/apr_xml.c 2010-05-06 16:06:03.712831964 -0400 +@@ -339,6 +339,25 @@ return APR_SUCCESS; } @@ -29,7 +26,7 @@ Taken from APU_DECLARE(apr_xml_parser *) apr_xml_parser_create(apr_pool_t *pool) { apr_xml_parser *parser = apr_pcalloc(pool, sizeof(*parser)); -@@ -372,6 +391,19 @@ +@@ -364,6 +383,19 @@ XML_SetElementHandler(parser->xp, start_handler, end_handler); XML_SetCharacterDataHandler(parser->xp, cdata_handler); diff --git a/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh b/www/apache20/files/patch-srclib__apr-util__xml__expat__buildconf.sh index aad61705b316..8723e96bbd5a 100644 --- a/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh +++ b/www/apache20/files/patch-srclib__apr-util__xml__expat__buildconf.sh @@ -1,5 +1,5 @@ ---- srclib/apr-util/xml/expat/buildconf.sh.orig Sat Mar 25 21:41:35 2006 -+++ srclib/apr-util/xml/expat/buildconf.sh Mon May 1 12:11:04 2006 +--- ./srclib/apr-util/xml/expat/buildconf.sh.orig 2006-03-25 16:41:35.000000000 -0500 ++++ ./srclib/apr-util/xml/expat/buildconf.sh 2010-05-06 16:06:03.780832140 -0400 @@ -3,7 +3,7 @@ # # Build aclocal.m4 from libtool's libtool.m4 diff --git a/www/apache20/files/patch-srclib:apr:build:buildcheck.sh b/www/apache20/files/patch-srclib__apr__build__buildcheck.sh index a65902a7731d..5aaee2aa15c2 100644 --- a/www/apache20/files/patch-srclib:apr:build:buildcheck.sh +++ b/www/apache20/files/patch-srclib__apr__build__buildcheck.sh @@ -1,5 +1,5 @@ ---- srclib/apr/build/buildcheck.sh Sun Jan 25 16:41:56 2004 -+++ srclib/apr/build/buildcheck.sh Tue Mar 9 07:49:42 2004 +--- ./srclib/apr/build/buildcheck.sh.orig 2004-11-24 18:10:04.000000000 -0500 ++++ ./srclib/apr/build/buildcheck.sh 2010-05-06 16:06:03.782832400 -0400 @@ -26,7 +26,7 @@ # output is multiline from 1.5 onwards diff --git a/www/apache20/files/patch-srclib__apr__buildconf b/www/apache20/files/patch-srclib__apr__buildconf new file mode 100644 index 000000000000..0dfca545ea8e --- /dev/null +++ b/www/apache20/files/patch-srclib__apr__buildconf @@ -0,0 +1,75 @@ +--- ./srclib/apr/buildconf.orig 2006-09-20 12:04:09.000000000 -0400 ++++ ./srclib/apr/buildconf 2010-05-06 16:48:57.802430154 -0400 +@@ -23,7 +23,7 @@ + # + build/buildcheck.sh || exit 1 + +-libtoolize=`build/PrintPath glibtoolize libtoolize` ++libtoolize="${LIBTOOLIZE}" + if [ "x$libtoolize" = "x" ]; then + echo "libtoolize not found in path" + exit 1 +@@ -35,29 +35,48 @@ + # Note: APR supplies its own config.guess and config.sub -- we do not + # rely on libtool's versions + # +-echo "Copying libtool helper files ..." ++echo "buildconf: copying libtool helper files using $libtoolize" + + # Remove any libtool files so one can switch between libtool 1.3 + # and libtool 1.4 by simply rerunning the buildconf script. +-(cd build ; rm -f ltconfig ltmain.sh libtool.m4) +- +-$libtoolize --copy --automake +- +-ltpath=`dirname $libtoolize` +-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} ++(cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4) + +-if [ ! -f $ltfile ]; then ++lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` ++lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` ++IFS=.; set $lt_version; IFS=' ' ++if test "$1" = "1"; then ++ $libtoolize --copy --automake ++ if [ -f libtool.m4 ]; then ++ ltfile=`pwd`/libtool.m4 ++ else ++ ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ ++ < $libtoolize`" ++ ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} ++ # Expecting the code above to be very portable, but just in case... ++ if [ -z "$ltfile" -o ! -f "$ltfile" ]; then ++ ltpath=`dirname $libtoolize` ++ ltfile=${LIBTOOL_M4} ++ fi ++ fi ++ if [ ! -f $ltfile ]; then + echo "$ltfile not found" + exit 1 ++ fi ++ # Do we need this anymore? ++ echo "buildconf: Using libtool.m4 at ${ltfile}." ++ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 ++fi ++if test "$1" = "2"; then ++ $libtoolize --copy ++ # Wouldn't it just be better to define top_builddir?? ++ mv build/libtool.m4 build/libtool.m4.$$ ++ cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 ++ chmod 664 build/libtool.m4.$$ ++ rm build/libtool.m4.$$ + fi + +-echo "buildconf: Using libtool.m4 at ${ltfile}." +- +-cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 +- +-# This is just temporary until people's workspaces are cleared -- remove +-# any old aclocal.m4 left over from prior build so it doesn't cause errors. +-rm -f aclocal.m4 ++# Clean up any leftovers ++rm -f aclocal.m4 libtool.m4 + + # + # Generate the autoconf header and ./configure diff --git a/www/apache20/files/patch-srclib:apr:config.layout b/www/apache20/files/patch-srclib__apr__config.layout index 5c52779635fc..43e11afdd16d 100644 --- a/www/apache20/files/patch-srclib:apr:config.layout +++ b/www/apache20/files/patch-srclib__apr__config.layout @@ -1,5 +1,5 @@ ---- srclib/apr/config.layout.orig Tue Jan 7 13:06:50 2003 -+++ srclib/apr/config.layout Tue Apr 1 18:36:51 2003 +--- ./srclib/apr/config.layout.orig 2004-11-24 18:02:04.000000000 -0500 ++++ ./srclib/apr/config.layout 2010-05-06 16:06:03.785831951 -0400 @@ -229,3 +229,7 @@ infodir: ${exec_prefix}/share/info libsuffix: -${APR_MAJOR_VERSION} diff --git a/www/apache20/files/patch-srclib__apr__configure.in b/www/apache20/files/patch-srclib__apr__configure.in new file mode 100644 index 000000000000..e2ef93ecff03 --- /dev/null +++ b/www/apache20/files/patch-srclib__apr__configure.in @@ -0,0 +1,43 @@ +--- ./srclib/apr/configure.in.orig 2007-11-03 10:18:38.000000000 -0400 ++++ ./srclib/apr/configure.in 2010-05-06 16:06:03.731831919 -0400 +@@ -7,6 +7,7 @@ + AC_INIT(build/apr_common.m4) + AC_CONFIG_HEADER(include/arch/unix/apr_private.h) + AC_CONFIG_AUX_DIR(build) ++AC_CONFIG_MACRO_DIR(build) + + dnl + dnl Include our own M4 macros along with those for libtool +@@ -16,6 +17,11 @@ + sinclude(build/apr_threads.m4) + sinclude(build/apr_hints.m4) + sinclude(build/libtool.m4) ++sinclude(build/ltsugar.m4) ++sinclude(build/argz.m4) ++sinclude(build/ltoptions.m4) ++sinclude(build/ltversion.m4) ++sinclude(build/lt~obsolete.m4) + + dnl Save user-defined environment settings for later restoration + dnl +@@ -98,6 +104,8 @@ + dnl preload section from invoking the macro to get compiler info. + AC_PROG_CC + ++AC_PROG_SED ++ + dnl Preload + APR_PRELOAD + +@@ -137,6 +145,11 @@ + AC_ARG_ENABLE(experimental-libtool,[ --experimental-libtool Use experimental custom libtool (not included in source distribution)], + [experimental_libtool=$enableval],[experimental_libtool=no]) + ++dnl Workarounds for busted Libtool 2.x when we don't call AC_PROG_LIBTOOL ++if test "x$Xsed" = "x"; then ++ Xsed="$SED -e 1s/^X//" ++fi ++ + case $host in + *os2*) + # Use a custom-made libtool replacement diff --git a/www/apache20/files/patch-srclib:apr:threadproc:unix:procsup.c b/www/apache20/files/patch-srclib__apr__threadproc__unix__procsup.c index 13c663af7bd4..2e7198492a39 100644 --- a/www/apache20/files/patch-srclib:apr:threadproc:unix:procsup.c +++ b/www/apache20/files/patch-srclib__apr__threadproc__unix__procsup.c @@ -1,6 +1,6 @@ ---- srclib/apr/threadproc/unix/procsup.c.orig Mon Apr 8 22:08:18 2002 -+++ srclib/apr/threadproc/unix/procsup.c Sun Jul 21 08:45:44 2002 -@@ -59,6 +59,7 @@ +--- ./srclib/apr/threadproc/unix/procsup.c.orig 2006-09-20 12:04:09.000000000 -0400 ++++ ./srclib/apr/threadproc/unix/procsup.c 2010-05-06 16:06:03.788832062 -0400 +@@ -21,6 +21,7 @@ int x; chdir("/"); @@ -8,11 +8,11 @@ #if !defined(MPE) && !defined(OS2) && !defined(TPF) && !defined(BEOS) /* Don't detach for MPE because child processes can't survive the death of * the parent. */ -@@ -89,6 +90,7 @@ - if (setpgid(0, 0) == -1) { +@@ -56,6 +57,7 @@ return errno; } -+#endif #endif ++#endif /* close out the standard file descriptors */ + if (freopen("/dev/null", "r", stdin) == NULL) { diff --git a/www/apache20/files/patch-support:Makefile.in b/www/apache20/files/patch-support__Makefile.in index 66b6420974ec..73a12565c61a 100644 --- a/www/apache20/files/patch-support:Makefile.in +++ b/www/apache20/files/patch-support__Makefile.in @@ -1,5 +1,5 @@ ---- support/Makefile.in.orig Fri Dec 17 17:03:38 2004 -+++ support/Makefile.in Fri Dec 17 17:01:44 2004 +--- ./support/Makefile.in.orig 2007-12-28 10:11:51.000000000 -0500 ++++ ./support/Makefile.in 2010-05-06 16:06:03.790832322 -0400 @@ -23,10 +23,7 @@ fi ; \ done diff --git a/www/apache20/files/patch-support:apachectl.in b/www/apache20/files/patch-support__apachectl.in index 7c5c3238e955..8c09faf38e7c 100644 --- a/www/apache20/files/patch-support:apachectl.in +++ b/www/apache20/files/patch-support__apachectl.in @@ -1,6 +1,6 @@ ---- support/apachectl.in.orig Thu Sep 16 09:28:54 2004 -+++ support/apachectl.in Thu Sep 16 09:29:14 2004 -@@ -63,7 +63,7 @@ +--- ./support/apachectl.in.orig 2006-07-12 03:40:55.000000000 -0400 ++++ ./support/apachectl.in 2010-05-06 16:06:03.793831873 -0400 +@@ -64,7 +64,7 @@ ULIMIT_MAX_FILES="@APACHECTL_ULIMIT@" # -------------------- -------------------- # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| diff --git a/www/apache20/files/patch-support:apxs.in b/www/apache20/files/patch-support__apxs.in index db8081fa4fc5..dc9cffb31f00 100644 --- a/www/apache20/files/patch-support:apxs.in +++ b/www/apache20/files/patch-support__apxs.in @@ -1,6 +1,6 @@ ---- support/apxs.in.orig Mon Nov 29 10:24:23 2004 -+++ support/apxs.in Mon Nov 29 10:25:05 2004 -@@ -629,8 +629,7 @@ +--- ./support/apxs.in.orig 2006-07-12 03:40:55.000000000 -0400 ++++ ./support/apxs.in 2010-05-06 16:06:03.795832133 -0400 +@@ -628,8 +628,7 @@ if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) { print FP $content; close(FP); diff --git a/www/apache20/files/patch-support:envvars-std.in b/www/apache20/files/patch-support__envvars-std.in index 26a094f31394..c5c6bcb5fe70 100644 --- a/www/apache20/files/patch-support:envvars-std.in +++ b/www/apache20/files/patch-support__envvars-std.in @@ -1,6 +1,6 @@ ---- support/envvars-std.in.orig Fri Dec 17 14:39:21 2004 -+++ support/envvars-std.in Fri Dec 17 14:41:06 2004 -@@ -21,3 +21,10 @@ +--- ./support/envvars-std.in.orig 2006-07-12 03:40:55.000000000 -0400 ++++ ./support/envvars-std.in 2010-05-06 16:06:03.798833361 -0400 +@@ -22,3 +22,10 @@ export @SHLIBPATH_VAR@ # @OS_SPECIFIC_VARS@ diff --git a/www/apache20/files/patch-support:log_server_status.in b/www/apache20/files/patch-support__log_server_status.in index 136bafb9ff1a..a378c9ada10f 100644 --- a/www/apache20/files/patch-support:log_server_status.in +++ b/www/apache20/files/patch-support__log_server_status.in @@ -1,6 +1,6 @@ ---- support/log_server_status.in.orig Tue Jun 18 23:21:53 2002 -+++ support/log_server_status.in Tue Jun 18 23:23:08 2002 -@@ -63,7 +63,7 @@ +--- ./support/log_server_status.in.orig 2006-07-12 03:40:55.000000000 -0400 ++++ ./support/log_server_status.in 2010-05-06 16:06:03.800835018 -0400 +@@ -27,7 +27,7 @@ # require 'sys/socket.ph'; @@ -9,7 +9,7 @@ $server = "localhost"; # Name of server, could be "www.foo.com" $port = "80"; # Port on server $request = "/status/?auto"; # Request to send -@@ -96,7 +96,7 @@ +@@ -60,7 +60,7 @@ chomp($date); ($day,$time)=split(/:/,$date); $res=&tcp_connect($server,$port); |