From 402cdf6b800ca78e89748382c8121c1e50b5c3d9 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 13 Nov 2012 16:32:01 +0000 Subject: [PATCH] filter mod_*.so auto-provides (thanks to rcollet) - pull in syslog logging fix from upstream (r1344712) --- ...7344+.patch => httpd-2.4.3-r1337344+.patch | 52 +++++++++++++------ httpd.spec | 14 ++++- 2 files changed, 47 insertions(+), 19 deletions(-) rename httpd-2.4.2-r1337344+.patch => httpd-2.4.3-r1337344+.patch (89%) diff --git a/httpd-2.4.2-r1337344+.patch b/httpd-2.4.3-r1337344+.patch similarity index 89% rename from httpd-2.4.2-r1337344+.patch rename to httpd-2.4.3-r1337344+.patch index 60c77bb..93df0df 100644 --- a/httpd-2.4.2-r1337344+.patch +++ b/httpd-2.4.3-r1337344+.patch @@ -9,12 +9,11 @@ http://svn.apache.org/viewvc?view=revision&revision=1337344 http://svn.apache.org/viewvc?view=revision&revision=1341905 http://svn.apache.org/viewvc?view=revision&revision=1342065 http://svn.apache.org/viewvc?view=revision&revision=1341930 - http://svn.apache.org/viewvc?view=revision&revision=1344712 ---- httpd-2.4.2/configure.in.r1337344+ -+++ httpd-2.4.2/configure.in -@@ -700,7 +700,24 @@ APACHE_HELP_STRING(--with-suexec-gidmin, +--- httpd-2.4.3/configure.in.r1337344+ ++++ httpd-2.4.3/configure.in +@@ -717,7 +717,24 @@ APACHE_HELP_STRING(--with-suexec-gidmin, AC_ARG_WITH(suexec-logfile, APACHE_HELP_STRING(--with-suexec-logfile,Set the logfile),[ @@ -40,7 +39,7 @@ http://svn.apache.org/viewvc?view=revision&revision=1344712 AC_ARG_WITH(suexec-safepath, APACHE_HELP_STRING(--with-suexec-safepath,Set the safepath),[ -@@ -710,6 +727,15 @@ AC_ARG_WITH(suexec-umask, +@@ -727,6 +744,15 @@ AC_ARG_WITH(suexec-umask, APACHE_HELP_STRING(--with-suexec-umask,umask for suexec'd process),[ AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] ) @@ -56,9 +55,9 @@ http://svn.apache.org/viewvc?view=revision&revision=1344712 dnl APR should go after the other libs, so the right symbols can be picked up if test x${apu_found} != xobsolete; then AP_LIBS="$AP_LIBS `$apu_config --avoid-ldap --link-libtool`" ---- httpd-2.4.2/docs/manual/suexec.html.en.r1337344+ -+++ httpd-2.4.2/docs/manual/suexec.html.en -@@ -369,6 +369,21 @@ +--- httpd-2.4.3/docs/manual/suexec.html.en.r1337344+ ++++ httpd-2.4.3/docs/manual/suexec.html.en +@@ -372,6 +372,21 @@ together with the --enable-suexec option to let APACI accept your request for using the suEXEC feature. @@ -80,7 +79,7 @@ http://svn.apache.org/viewvc?view=revision&revision=1344712
--with-suexec-bin=PATH
The path to the suexec binary must be hard-coded -@@ -430,6 +445,12 @@ +@@ -433,6 +448,12 @@ "suexec_log" and located in your standard logfile directory (--logfiledir).
@@ -93,7 +92,7 @@ http://svn.apache.org/viewvc?view=revision&revision=1344712
--with-suexec-safepath=PATH
Define a safe PATH environment to pass to CGI -@@ -546,9 +567,12 @@ +@@ -550,9 +571,12 @@ Group webgroup

The suEXEC wrapper will write log information to the file defined with the --with-suexec-logfile @@ -109,8 +108,15 @@ http://svn.apache.org/viewvc?view=revision&revision=1344712

top
---- httpd-2.4.2/Makefile.in.r1337344+ -+++ httpd-2.4.2/Makefile.in +@@ -640,4 +664,4 @@ if (typeof(prettyPrint) !== 'undefined') + prettyPrint(); + } + //--> +- +\ No newline at end of file ++ +--- httpd-2.4.3/Makefile.in.r1337344+ ++++ httpd-2.4.3/Makefile.in @@ -236,11 +236,22 @@ install-man: cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ fi @@ -132,12 +138,12 @@ http://svn.apache.org/viewvc?view=revision&revision=1344712 + +install-suexec-caps: + @if test -f $(builddir)/support/suexec; then \ -+ echo Skipping setcap for 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec; \ ++ echo Skipping echo Skipping setcap for for 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec; \ fi suexec: ---- httpd-2.4.2/modules/arch/unix/mod_unixd.c.r1337344+ -+++ httpd-2.4.2/modules/arch/unix/mod_unixd.c +--- httpd-2.4.3/modules/arch/unix/mod_unixd.c.r1337344+ ++++ httpd-2.4.3/modules/arch/unix/mod_unixd.c @@ -284,6 +284,13 @@ unixd_set_suexec(cmd_parms *cmd, void *d return NULL; } @@ -161,8 +167,20 @@ http://svn.apache.org/viewvc?view=revision&revision=1344712 && (access(SUEXEC_BIN, R_OK|X_OK) == 0)) { ap_unixd_config.suexec_enabled = 1; ap_unixd_config.suexec_disabled_reason = ""; ---- httpd-2.4.2/support/suexec.c.r1337344+ -+++ httpd-2.4.2/support/suexec.c +--- httpd-2.4.3/server/log.c.r1337344+ ++++ httpd-2.4.3/server/log.c +@@ -1087,7 +1087,8 @@ static void write_logline(char *errstr, + } + #ifdef HAVE_SYSLOG + else { +- syslog(level < LOG_PRIMASK ? level : APLOG_DEBUG, "%s", errstr); ++ syslog(level < LOG_PRIMASK ? level : APLOG_DEBUG, "%.*s", ++ (int)len, errstr); + } + #endif + } +--- httpd-2.4.3/support/suexec.c.r1337344+ ++++ httpd-2.4.3/support/suexec.c @@ -58,6 +58,10 @@ #include #endif diff --git a/httpd.spec b/httpd.spec index 5a0cc0f..80bbda9 100644 --- a/httpd.spec +++ b/httpd.spec @@ -5,10 +5,16 @@ %define mmnisa %{mmn}-%{__isa_name}-%{__isa_bits} %define vstring Fedora +# Drop automatic provides for module DSOs +%{?filter_setup: +%filter_provides_in %{_libdir}/httpd/modules/.*\.so$ +%filter_setup +} + Summary: Apache HTTP Server Name: httpd Version: 2.4.3 -Release: 12%{?dist} +Release: 13%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -46,7 +52,7 @@ Patch6: httpd-2.4.3-apctl-systemd.patch Patch23: httpd-2.4.1-export.patch Patch24: httpd-2.4.1-corelimit.patch Patch25: httpd-2.4.1-selinux.patch -Patch26: httpd-2.4.2-r1337344+.patch +Patch26: httpd-2.4.3-r1337344+.patch Patch27: httpd-2.4.2-icons.patch Patch28: httpd-2.4.2-r1332643+.patch Patch29: httpd-2.4.3-mod_systemd.patch @@ -574,6 +580,10 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/rpm/macros.httpd %changelog +* Tue Nov 13 2012 Joe Orton - 2.4.3-13 +- filter mod_*.so auto-provides (thanks to rcollet) +- pull in syslog logging fix from upstream (r1344712) + * Fri Oct 26 2012 Joe Orton - 2.4.3-12 - rebuild to pick up new apr-util-ldap