JBoss Native SVN: r2625 - trunk/build/patch.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2010-03-09 09:16:27 -0500 (Tue, 09 Mar 2010)
New Revision: 2625
Modified:
trunk/build/patch/httpd-2.2.15.patch
Log:
Another try.
Modified: trunk/build/patch/httpd-2.2.15.patch
===================================================================
--- trunk/build/patch/httpd-2.2.15.patch 2010-03-09 13:57:19 UTC (rev 2624)
+++ trunk/build/patch/httpd-2.2.15.patch 2010-03-09 14:16:27 UTC (rev 2625)
@@ -17,12 +17,14 @@
--- srclib/apr/file_io/win32/open.c (revision 920862)
+++ srclib/apr/file_io/win32/open.c (working copy)
-@@ -610,7 +610,7 @@
+@@ -610,8 +610,8 @@
#endif
#if APR_HAS_ANSI_FS
ELSE_WIN_OS_IS_ANSI {
- if (!CreateHardLinkA(wto_path, wfrom_path))
-+ if (!CreateHardLinkA(to_path, from_path))
- return apr_get_os_error()
+- return apr_get_os_error()
++ if (!CreateHardLinkA(to_path, from_path, NULL))
++ return apr_get_os_error();
}
#endif
+ return rv;
14 years, 9 months
JBoss Native SVN: r2624 - trunk/build/patch.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2010-03-09 08:57:19 -0500 (Tue, 09 Mar 2010)
New Revision: 2624
Modified:
trunk/build/patch/httpd-2.2.15.patch
Log:
Wrong location...
Modified: trunk/build/patch/httpd-2.2.15.patch
===================================================================
--- trunk/build/patch/httpd-2.2.15.patch 2010-03-09 13:35:50 UTC (rev 2623)
+++ trunk/build/patch/httpd-2.2.15.patch 2010-03-09 13:57:19 UTC (rev 2624)
@@ -15,8 +15,8 @@
fi
])
---- file_io/win32/open.c (revision 920862)
-+++ file_io/win32/open.c (working copy)
+--- srclib/apr/file_io/win32/open.c (revision 920862)
++++ srclib/apr/file_io/win32/open.c (working copy)
@@ -610,7 +610,7 @@
#endif
#if APR_HAS_ANSI_FS
14 years, 9 months
JBoss Native SVN: r2623 - trunk/build/patch.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2010-03-09 08:35:50 -0500 (Tue, 09 Mar 2010)
New Revision: 2623
Modified:
trunk/build/patch/httpd-2.2.15.patch
Log:
Oops that is the right patch....
Modified: trunk/build/patch/httpd-2.2.15.patch
===================================================================
--- trunk/build/patch/httpd-2.2.15.patch 2010-03-09 10:35:53 UTC (rev 2622)
+++ trunk/build/patch/httpd-2.2.15.patch 2010-03-09 13:35:50 UTC (rev 2623)
@@ -15,20 +15,14 @@
fi
])
---- srclib/apr/file_io/win32/open.c (revision 920777)
-+++ srclib/apr/file_io/win32/open.c (working copy)
-@@ -602,13 +602,13 @@
- if (!CreateHardLinkW(wto_path, wfrom_path, NULL))
- return apr_get_os_error();
- }
--#endif
+--- file_io/win32/open.c (revision 920862)
++++ file_io/win32/open.c (working copy)
+@@ -610,7 +610,7 @@
+ #endif
#if APR_HAS_ANSI_FS
ELSE_WIN_OS_IS_ANSI {
- if (!CreateHardLinkA(wto_path, wfrom_path))
+- if (!CreateHardLinkA(wto_path, wfrom_path))
++ if (!CreateHardLinkA(to_path, from_path))
return apr_get_os_error()
}
#endif
-+#endif
- return rv;
- }
-
14 years, 9 months
JBoss Native SVN: r2622 - trunk/build/patch.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2010-03-09 05:35:53 -0500 (Tue, 09 Mar 2010)
New Revision: 2622
Modified:
trunk/build/patch/httpd-2.2.15.patch
Log:
apr 1.4.x looks broken...
Modified: trunk/build/patch/httpd-2.2.15.patch
===================================================================
--- trunk/build/patch/httpd-2.2.15.patch 2010-03-09 10:11:41 UTC (rev 2621)
+++ trunk/build/patch/httpd-2.2.15.patch 2010-03-09 10:35:53 UTC (rev 2622)
@@ -15,3 +15,20 @@
fi
])
+--- srclib/apr/file_io/win32/open.c (revision 920777)
++++ srclib/apr/file_io/win32/open.c (working copy)
+@@ -602,13 +602,13 @@
+ if (!CreateHardLinkW(wto_path, wfrom_path, NULL))
+ return apr_get_os_error();
+ }
+-#endif
+ #if APR_HAS_ANSI_FS
+ ELSE_WIN_OS_IS_ANSI {
+ if (!CreateHardLinkA(wto_path, wfrom_path))
+ return apr_get_os_error()
+ }
+ #endif
++#endif
+ return rv;
+ }
+
14 years, 9 months
JBoss Native SVN: r2621 - trunk/build/patch.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2010-03-09 05:11:41 -0500 (Tue, 09 Mar 2010)
New Revision: 2621
Added:
trunk/build/patch/httpd-2.2.15.patch
Log:
Missing patch for macosx.
Added: trunk/build/patch/httpd-2.2.15.patch
===================================================================
--- trunk/build/patch/httpd-2.2.15.patch (rev 0)
+++ trunk/build/patch/httpd-2.2.15.patch 2010-03-09 10:11:41 UTC (rev 2621)
@@ -0,0 +1,17 @@
+--- modules/ssl/config.m4 (revision 793871)
++++ modules/ssl/config.m4 (working copy)
+@@ -120,7 +120,13 @@
+ if test "x$enable_ssl" = "xshared"; then
+ # The only symbol which needs to be exported is the module
+ # structure, so ask libtool to hide everything else:
+- APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module])
++ case $host in
++ *-apple-darwin*)
++ ;;
++ *)
++ APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module])
++ ;;
++ esac
+ fi
+ ])
+
14 years, 9 months
JBoss Native SVN: r2620 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2010-03-08 06:11:20 -0500 (Mon, 08 Mar 2010)
New Revision: 2620
Modified:
trunk/build/unix/package.list
Log:
Upgrade httpd to 2.2.15
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2010-02-10 15:01:09 UTC (rev 2619)
+++ trunk/build/unix/package.list 2010-03-08 11:11:20 UTC (rev 2620)
@@ -40,4 +40,4 @@
mod_cluster|1.1.0.Beta1|2.2.13|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.1.0.Beta1
mod_cluster|1.0.3.dev|2.2.13|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:branches/1.0.x
mod_cluster|1.0.3.GA|2.2.13|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.0.3.GA
-mod_cluster|1.1.0.dev|2.2.13|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:trunk
+mod_cluster|1.1.0.dev|2.2.15|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:trunk
14 years, 9 months