rpms/httpd
6
0
Fork 0
Code Issues Pull Requests Releases Activity

add BR on APR >= 1.4.0

Browse Source
This commit is contained in:
Joe Orton 2012-05-01 13:34:06 +01:00
parent f7210bd855
commit e0188e30ee
2 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
httpd-2.4.1-apr14.patch
View File

@ -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);

9
httpd.spec
View File

@ -8,7 +8,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.2 Version: 2.4.2
Release: 5%{?dist} Release: 6%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -38,7 +38,6 @@ Patch1: httpd-2.4.1-apctl.patch
Patch2: httpd-2.4.1-apxs.patch Patch2: httpd-2.4.1-apxs.patch
Patch3: httpd-2.4.1-deplibs.patch Patch3: httpd-2.4.1-deplibs.patch
Patch5: httpd-2.4.1-layout.patch Patch5: httpd-2.4.1-layout.patch
Patch6: httpd-2.4.1-apr14.patch
# Features/functional changes # Features/functional changes
Patch20: httpd-2.0.48-release.patch Patch20: httpd-2.0.48-release.patch
Patch23: httpd-2.4.1-export.patch Patch23: httpd-2.4.1-export.patch
@ -54,7 +53,7 @@ Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: autoconf, perl, pkgconfig, findutils, xmlto BuildRequires: autoconf, perl, pkgconfig, findutils, xmlto
BuildRequires: zlib-devel, libselinux-devel, lua-devel 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 Requires: /etc/mime.types, system-logos >= 7.92.1-1
Obsoletes: httpd-suexec Obsoletes: httpd-suexec
Provides: webserver Provides: webserver
@ -149,7 +148,6 @@ authentication to the Apache HTTP Server.
%patch2 -p1 -b .apxs %patch2 -p1 -b .apxs
%patch3 -p1 -b .deplibs %patch3 -p1 -b .deplibs
%patch5 -p1 -b .layout %patch5 -p1 -b .layout
%patch6 -p1 -b .apr14
%patch23 -p1 -b .export %patch23 -p1 -b .export
%patch24 -p1 -b .corelimit %patch24 -p1 -b .corelimit
@ -562,6 +560,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd %{_sysconfdir}/rpm/macros.httpd
%changelog %changelog
* Tue May 1 2012 Joe Orton <jorton@redhat.com> - 2.4.2-6
- add BR on APR >= 1.4.0
* Fri Apr 27 2012 Joe Orton <jorton@redhat.com> - 2.4.2-5 * Fri Apr 27 2012 Joe Orton <jorton@redhat.com> - 2.4.2-5
- use systemctl from logrotate (#221073) - use systemctl from logrotate (#221073)