diff options
| author | Joe Orton <jorton@redhat.com> | 2012-11-13 16:49:42 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@redhat.com> | 2012-11-13 16:49:42 +0000 |
| commit | ce68488a8e6563a917757a44ff81f026310d935c (patch) | |
| tree | 4296db3d98fb3b0983e364fbe675b8ca676cad97 | |
| parent | 402cdf6b800ca78e89748382c8121c1e50b5c3d9 (diff) | |
| download | httpd-ce68488a8e6563a917757a44ff81f026310d935c.tar.gz httpd-ce68488a8e6563a917757a44ff81f026310d935c.tar.xz httpd-ce68488a8e6563a917757a44ff81f026310d935c.zip | |
drop patch for r1344712
| -rw-r--r-- | httpd-2.4.3-r1337344+.patch | 17 | ||||
| -rw-r--r-- | httpd.spec | 5 |
2 files changed, 6 insertions, 16 deletions
diff --git a/httpd-2.4.3-r1337344+.patch b/httpd-2.4.3-r1337344+.patch index 93df0df..2aa982e 100644 --- a/httpd-2.4.3-r1337344+.patch +++ b/httpd-2.4.3-r1337344+.patch @@ -1,4 +1,4 @@ -# ./pullrev.sh 1337344 1341905 1342065 1341930 1344712 +# ./pullrev.sh 1337344 1341905 1342065 1341930 suexec enhancements: @@ -9,7 +9,6 @@ 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.3/configure.in.r1337344+ +++ httpd-2.4.3/configure.in @@ -138,7 +137,7 @@ http://svn.apache.org/viewvc?view=revision&revision=1344712 + +install-suexec-caps: + @if test -f $(builddir)/support/suexec; then \ -+ echo Skipping echo Skipping setcap for for 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec; \ ++ echo Skipping setcap for 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec; \ fi suexec: @@ -167,18 +166,6 @@ 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.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 @@ @@ -14,7 +14,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.3 -Release: 13%{?dist} +Release: 14%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -580,6 +580,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/rpm/macros.httpd %changelog +* Tue Nov 13 2012 Joe Orton <jorton@redhat.com> - 2.4.3-14 +- drop patch for r1344712 + * Tue Nov 13 2012 Joe Orton <jorton@redhat.com> - 2.4.3-13 - filter mod_*.so auto-provides (thanks to rcollet) - pull in syslog logging fix from upstream (r1344712) |