packages: apache/apache-apxs.patch, apache/apache-layout.patch, apache/apac...
arekm
arekm at pld-linux.org
Tue Feb 21 19:02:47 CET 2012
Author: arekm Date: Tue Feb 21 18:02:47 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- initial 2.4.x fun
---- Files affected:
packages/apache:
apache-apxs.patch (1.10 -> 1.11) , apache-layout.patch (1.6 -> 1.7) , apache-suexec_fcgi.patch (1.3 -> 1.4) , apache-syslibs.patch (1.1 -> 1.2) , apache-v6only-ENOPROTOOPT.patch (1.1 -> 1.2) , apache.spec (1.643 -> 1.644) , httpd-2.0.48-corelimit.patch (1.3 -> 1.4) , httpd-2.0.48-debuglog.patch (1.3 -> 1.4) , apache-paths.patch (1.3 -> NONE) (REMOVED), httpd-2.0.45-encode.patch (1.5 -> NONE) (REMOVED), httpd-2.0.46-sslmutex.patch (1.4 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/apache/apache-apxs.patch
diff -u packages/apache/apache-apxs.patch:1.10 packages/apache/apache-apxs.patch:1.11
--- packages/apache/apache-apxs.patch:1.10 Wed Sep 1 12:53:46 2010
+++ packages/apache/apache-apxs.patch Tue Feb 21 19:02:41 2012
@@ -25,21 +25,6 @@
print STDERR "apxs:Error: no config variable $var\n";
&usage;
}
-@@ -199,11 +201,10 @@
- ($httpd = $0) =~ s:support/apxs$::;
- }
-
--unless (-x "$httpd") {
-- error("$httpd not found or not executable");
-- exit 1;
-+if (not -x "$httpd") {
-+ print STDERR "Note: $httpd not found or not executable.\n";
- }
--
-+else {
- unless (grep /mod_so/, `. $envvars && $httpd -l`) {
- error("Sorry, no shared object support for Apache");
- error("available under your platform. Make sure");
@@ -211,7 +212,7 @@
error("your server binary `$httpd'.");
exit 1;
================================================================
Index: packages/apache/apache-layout.patch
diff -u packages/apache/apache-layout.patch:1.6 packages/apache/apache-layout.patch:1.7
--- packages/apache/apache-layout.patch:1.6 Tue Dec 27 02:00:28 2005
+++ packages/apache/apache-layout.patch Tue Feb 21 19:02:41 2012
@@ -1,11 +1,10 @@
diff -urN httpd-2.0.45.org/config.layout httpd-2.0.45/config.layout
--- httpd-2.0.45.org/config.layout Thu Apr 3 09:27:42 2003
+++ httpd-2.0.45/config.layout Thu Apr 3 09:27:59 2003
-@@ -298,3 +298,28 @@
- installbuilddir: ${prefix}/etc/apache2/build
- errordir: ${datadir}/error
+@@ -347,3 +347,27 @@
+ proxycachedir: ${localstatedir}/proxy
</Layout>
-+
+
+# PLD layout
+<Layout PLD>
+ prefix: /usr
@@ -30,3 +29,4 @@
+ proxycachedir: /var/cache/httpd
+ installbuilddir: ${libexecdir}/build
+</Layout>
+
================================================================
Index: packages/apache/apache-suexec_fcgi.patch
diff -u packages/apache/apache-suexec_fcgi.patch:1.3 packages/apache/apache-suexec_fcgi.patch:1.4
--- packages/apache/apache-suexec_fcgi.patch:1.3 Mon Dec 27 10:45:03 2010
+++ packages/apache/apache-suexec_fcgi.patch Tue Feb 21 19:02:41 2012
@@ -31,14 +31,6 @@
struct stat dir_info; /* directory info holder */
struct stat prg_info; /* program info holder */
-@@ -270,6 +286,7 @@ int main(int argc, char *argv[])
- clean_env();
-
- prog = argv[0];
-+
- /*
- * Check existence/validity of the UID of the user
- * running this program. Error out if invalid.
@@ -382,8 +399,23 @@ int main(int argc, char *argv[])
}
else {
================================================================
Index: packages/apache/apache-syslibs.patch
diff -u packages/apache/apache-syslibs.patch:1.1 packages/apache/apache-syslibs.patch:1.2
--- packages/apache/apache-syslibs.patch:1.1 Sun Dec 18 20:31:27 2005
+++ packages/apache/apache-syslibs.patch Tue Feb 21 19:02:41 2012
@@ -1,17 +1,14 @@
--- httpd-2.2.0/configure.in~ 2005-12-18 02:38:31.000000000 +0200
+++ httpd-2.2.0/configure.in 2005-12-18 02:40:04.000000000 +0200
-@@ -584,9 +584,9 @@
- [Listening sockets are non-blocking when there are more than 1])
+@@ -751,7 +751,7 @@
+ [Allow IPv4 connections on IPv6 listening sockets])
fi
-APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile)
-+APACHE_FAST_OUTPUT(Makefile modules/Makefile)
++APACHE_FAST_OUTPUT(Makefile modules/Makefile)
APACHE_FAST_OUTPUT(os/Makefile server/Makefile)
--APACHE_FAST_OUTPUT(support/Makefile srclib/pcre/Makefile)
-+APACHE_FAST_OUTPUT(support/Makefile)
+ APACHE_FAST_OUTPUT(support/Makefile)
- if test -d ./test; then
- APACHE_FAST_OUTPUT(test/Makefile)
--- httpd-2.2.0/Makefile.in 2005-12-18 02:41:25.000000000 +0200
+++ httpd-2.2.0/Makefile.in 2005-12-18 02:38:31.000000000 +0200
@@ -1,5 +1,5 @@
================================================================
Index: packages/apache/apache-v6only-ENOPROTOOPT.patch
diff -u packages/apache/apache-v6only-ENOPROTOOPT.patch:1.1 packages/apache/apache-v6only-ENOPROTOOPT.patch:1.2
--- packages/apache/apache-v6only-ENOPROTOOPT.patch:1.1 Wed Mar 3 12:33:27 2004
+++ packages/apache/apache-v6only-ENOPROTOOPT.patch Tue Feb 21 19:02:41 2012
@@ -1,11 +1,12 @@
--- httpd-2.0.48/server/listen.c.orig Mon Mar 31 06:30:52 2003
+++ httpd-2.0.48/server/listen.c Wed Mar 3 12:05:09 2004
-@@ -120,7 +120,7 @@
+@@ -76,7 +76,7 @@
#if APR_HAVE_IPV6
if (server->bind_addr->family == APR_INET6) {
stat = apr_socket_opt_set(s, APR_IPV6_V6ONLY, v6only_setting);
- if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
+ if (stat != APR_SUCCESS && stat != APR_ENOTIMPL && stat != ENOPROTOOPT) {
- ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p, APLOGNO(00069)
"make_sock: for address %pI, apr_socket_opt_set: "
"(IPV6_V6ONLY)",
+
================================================================
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.643 packages/apache/apache.spec:1.644
--- packages/apache/apache.spec:1.643 Fri Feb 17 20:21:49 2012
+++ packages/apache/apache.spec Tue Feb 21 19:02:41 2012
@@ -25,7 +25,7 @@
%bcond_with bucketeer # debug one
# this is internal macro, don't change to %%apache_modules_api
-%define _apache_modules_api 20051115
+%define _apache_modules_api 20120211
%if "%{pld_release}" == "ac"
%define openssl_ver 0.9.7d
@@ -44,12 +44,12 @@
Summary(ru.UTF-8): Самый популярный веб-сервер
Summary(tr.UTF-8): Lider WWW tarayıcı
Name: apache
-Version: 2.2.22
-Release: 4
+Version: 2.4.1
+Release: 0.1
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: d77fa5af23df96a8af68ea8114fa6ce1
+# Source0-md5: 4366afbea8149ca125af01fd59a2f8a2
Source1: %{name}.init
Source2: %{name}.logrotate
Source3: %{name}.sysconfig
@@ -86,13 +86,10 @@
Patch2: %{name}-suexec.patch
Patch3: %{name}-branding.patch
Patch4: %{name}-apr.patch
-# what about this? it isn't applied...
-Patch6: httpd-2.0.40-xfsz.patch
+
Patch7: %{name}-syslibs.patch
-Patch8: httpd-2.0.45-encode.patch
-Patch9: %{name}-paths.patch
+
Patch10: httpd-2.0.46-dav401dest.patch
-Patch12: httpd-2.0.46-sslmutex.patch
Patch14: httpd-2.0.48-corelimit.patch
Patch15: httpd-2.0.48-debuglog.patch
Patch18: %{name}-v6only-ENOPROTOOPT.patch
@@ -1781,10 +1778,9 @@
%patch3 -p1
%patch4 -p1
%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+
%patch10 -p1
-%patch12 -p1
+
%patch14 -p1
%patch15 -p1
%patch18 -p1
@@ -1792,14 +1788,14 @@
%patch20 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch28 -p1
+# ?
+#%patch25 -p1
+# ?
+#%patch26 -p1
+# probably drop
+#%patch28 -p1
%patch29 -p1
-# using system apr, apr-util and pcre
-%{__rm} -r srclib/{apr,apr-util,pcre}
-
# sanity check
MODULES_API=`awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' include/ap_mmn.h`
if [ "$MODULES_API" != "%_apache_modules_api" ]; then
@@ -2817,6 +2813,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.644 2012/02/21 18:02:41 arekm
+- initial 2.4.x fun
+
Revision 1.643 2012/02/17 19:21:49 baggins
- rel 4
- typo in macros
================================================================
Index: packages/apache/httpd-2.0.48-corelimit.patch
diff -u packages/apache/httpd-2.0.48-corelimit.patch:1.3 packages/apache/httpd-2.0.48-corelimit.patch:1.4
--- packages/apache/httpd-2.0.48-corelimit.patch:1.3 Wed Sep 1 12:53:46 2010
+++ packages/apache/httpd-2.0.48-corelimit.patch Tue Feb 21 19:02:42 2012
@@ -4,10 +4,10 @@
--- httpd-2.0.48/server/core.c.corelimit
+++ httpd-2.0.48/server/core.c
-@@ -4233,6 +4233,25 @@
-
- ap_set_version(pconf);
+@@ -4424,6 +4424,25 @@
+ set_banner(pconf);
ap_setup_make_content_type(pconf);
+ ap_setup_auth_internal(ptemp);
+
+#ifdef RLIMIT_CORE
+ if (ap_coredumpdir_configured) {
@@ -27,6 +27,7 @@
+ }
+#endif
+
- return OK;
- }
-
+ if (!sys_privileges) {
+ ap_log_error(APLOG_MARK, APLOG_CRIT, 0, NULL, APLOGNO(00136)
+ "Server MUST relinquish startup privileges before "
+
================================================================
Index: packages/apache/httpd-2.0.48-debuglog.patch
diff -u packages/apache/httpd-2.0.48-debuglog.patch:1.3 packages/apache/httpd-2.0.48-debuglog.patch:1.4
--- packages/apache/httpd-2.0.48-debuglog.patch:1.3 Wed Sep 1 12:53:46 2010
+++ packages/apache/httpd-2.0.48-debuglog.patch Tue Feb 21 19:02:42 2012
@@ -11,15 +11,16 @@
--- httpd-2.0.48/include/http_log.h.debuglog
+++ httpd-2.0.48/include/http_log.h
-@@ -130,7 +130,11 @@
-
- extern int AP_DECLARE_DATA ap_default_loglevel;
-
+@@ -280,7 +280,11 @@
+ * @see ap_log_rerror
+ * @see ap_log_cserror
+ */
+#ifdef AP_FNAME
-+#define APLOG_MARK AP_FNAME,__LINE__
++#define APLOG_MARK AP_FNAME,__LINE__,APLOG_MODULE_INDEX
+#else
- #define APLOG_MARK __FILE__,__LINE__
+ #define APLOG_MARK __FILE__,__LINE__,APLOG_MODULE_INDEX
+#endif
/**
* Set up for logging to stderr.
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-apxs.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-layout.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-suexec_fcgi.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-syslibs.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-v6only-ENOPROTOOPT.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.643&r2=1.644&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/httpd-2.0.48-corelimit.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/httpd-2.0.48-debuglog.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list