diff options
| author | Remi Collet <fedora@famillecollet.com> | 2012-05-01 14:49:38 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2012-05-01 14:49:38 +0200 |
| commit | 811ddf657e592063f973cfd06a58cf0bd4eba73e (patch) | |
| tree | bffb10f5a40c88f105ade1a1763d143f7dbe7514 | |
| parent | d5bbe8b882e6a0c7d1154cf784fda0e479b865f8 (diff) | |
httpd: sync with rawhide
| -rw-r--r-- | httpd-2.4.1-apr14.patch | 22 | ||||
| -rw-r--r-- | httpd.spec | 9 |
2 files changed, 5 insertions, 26 deletions
diff --git a/httpd-2.4.1-apr14.patch b/httpd-2.4.1-apr14.patch deleted file mode 100644 index 4f685f3..0000000 --- a/httpd-2.4.1-apr14.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- httpd-2.4.1/support/rotatelogs.c.apr14 -+++ httpd-2.4.1/support/rotatelogs.c -@@ -52,6 +52,7 @@ - #if APR_FILES_AS_SOCKETS - #include "apr_poll.h" - #endif -+#include "apr_version.h" - - #if APR_HAVE_STDLIB_H - #include <stdlib.h> -@@ -295,7 +296,11 @@ static void post_rotate(apr_pool_t *pool - if (config->verbose) { - fprintf(stderr,"Linking %s to %s\n", newlog->name, config->linkfile); - } -+#if APR_VERSION_AT_LEAST(1,4,0) - rv = apr_file_link(newlog->name, config->linkfile); -+#else -+ rv = APR_ENOTIMPL; -+#endif - if (rv != APR_SUCCESS) { - char error[120]; - apr_strerror(rv, error, sizeof error); @@ -8,7 +8,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.2 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -38,7 +38,6 @@ Patch1: httpd-2.4.1-apctl.patch Patch2: httpd-2.4.1-apxs.patch Patch3: httpd-2.4.1-deplibs.patch Patch5: httpd-2.4.1-layout.patch -Patch6: httpd-2.4.1-apr14.patch # Features/functional changes Patch20: httpd-2.0.48-release.patch Patch23: httpd-2.4.1-export.patch @@ -54,7 +53,7 @@ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: autoconf, perl, pkgconfig, findutils, xmlto BuildRequires: zlib-devel, libselinux-devel, lua-devel -BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0 +BuildRequires: apr-devel >= 1.4.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0 Requires: /etc/mime.types, system-logos >= 7.92.1-1 Obsoletes: httpd-suexec Provides: webserver @@ -149,7 +148,6 @@ authentication to the Apache HTTP Server. %patch2 -p1 -b .apxs %patch3 -p1 -b .deplibs %patch5 -p1 -b .layout -%patch6 -p1 -b .apr14 %patch23 -p1 -b .export %patch24 -p1 -b .corelimit @@ -562,6 +560,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/rpm/macros.httpd %changelog +* Tue May 1 2012 Joe Orton <jorton@redhat.com> - 2.4.2-6 +- add BR on APR >= 1.4.0 + * Mon Apr 30 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.4.2-5 - sync with rawhide, rebuild for remi repo |