rpms/httpd/devel httpd-2.2.11-corelimit.patch, NONE, 1.1 httpd-2.2.11-selinux.patch, NONE, 1.1 httpd-2.2.11-xfsz.patch, NONE, 1.1 httpd-2.2.11.tar.gz.asc, NONE, 1.1 .cvsignore, 1.23, 1.24 httpd.init, 1.13, 1.14 httpd.spec, 1.127, 1.128 sources, 1.19, 1.20 upstream, 1.12, 1.13 httpd-2.0.40-xfsz.patch, 1.5, NONE httpd-2.0.48-corelimit.patch, 1.2, NONE httpd-2.0.54-selinux.patch, 1.3, NONE
Joe Orton
jorton at fedoraproject.org
Thu Dec 18 16:30:55 UTC 2008
Author: jorton
Update of /cvs/extras/rpms/httpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8439
Modified Files:
.cvsignore httpd.init httpd.spec sources upstream
Added Files:
httpd-2.2.11-corelimit.patch httpd-2.2.11-selinux.patch
httpd-2.2.11-xfsz.patch httpd-2.2.11.tar.gz.asc
Removed Files:
httpd-2.0.40-xfsz.patch httpd-2.0.48-corelimit.patch
httpd-2.0.54-selinux.patch
Log Message:
* Thu Dec 18 2008 Joe Orton <jorton at redhat.com> 2.2.11-3
- update to 2.2.11
- package new /var/run/httpd directory, and move default pidfile
location inside there
httpd-2.2.11-corelimit.patch:
--- NEW FILE httpd-2.2.11-corelimit.patch ---
--- httpd-2.2.11/server/core.c.corelimit
+++ httpd-2.2.11/server/core.c
@@ -3777,6 +3779,25 @@ static int core_post_config(apr_pool_t *
set_banner(pconf);
ap_setup_make_content_type(pconf);
+
+#ifdef RLIMIT_CORE
+ if (ap_coredumpdir_configured) {
+ struct rlimit lim;
+
+ if (getrlimit(RLIMIT_CORE, &lim) == 0 && lim.rlim_cur == 0) {
+ lim.rlim_cur = lim.rlim_max;
+ if (setrlimit(RLIMIT_CORE, &lim) == 0) {
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
+ "core dump file size limit raised to %lu bytes",
+ lim.rlim_cur);
+ } else {
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, errno, NULL,
+ "core dump file size is zero, setrlimit failed");
+ }
+ }
+ }
+#endif
+
return OK;
}
httpd-2.2.11-selinux.patch:
--- NEW FILE httpd-2.2.11-selinux.patch ---
--- httpd-2.2.11/configure.in.selinux
+++ httpd-2.2.11/configure.in
@@ -412,6 +412,10 @@ getpgid
dnl confirm that a void pointer is large enough to store a long integer
APACHE_CHECK_VOID_PTR_LEN
+AC_CHECK_LIB(selinux, is_selinux_enabled, [
+ APR_ADDTO(AP_LIBS, [-lselinux])
+])
+
dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs
AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
[AC_TRY_COMPILE([#include <sys/types.h>
--- httpd-2.2.11/server/core.c.selinux
+++ httpd-2.2.11/server/core.c
@@ -51,6 +51,8 @@
#include "mod_so.h" /* for ap_find_loaded_module_symbol */
+#include <selinux/selinux.h>
+
/* LimitRequestBody handling */
#define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1)
#define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 0)
@@ -3796,6 +3798,26 @@ static int core_post_config(apr_pool_t *
}
#endif
+ {
+ static int already_warned = 0;
+ int is_enabled = is_selinux_enabled() > 0;
+
+ if (is_enabled && !already_warned) {
+ security_context_t con;
+
+ if (getcon(&con) == 0) {
+
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
+ "SELinux policy enabled; "
+ "httpd running as context %s", con);
+
+ already_warned = 1;
+
+ freecon(con);
+ }
+ }
+ }
+
return OK;
}
httpd-2.2.11-xfsz.patch:
--- NEW FILE httpd-2.2.11-xfsz.patch ---
--- httpd-2.2.11/server/mpm/prefork/prefork.c.xfsz
+++ httpd-2.2.11/server/mpm/prefork/prefork.c
@@ -399,7 +399,7 @@ static void set_signals(void)
ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGXCPU)");
#endif
#ifdef SIGXFSZ
- sa.sa_handler = SIG_DFL;
+ sa.sa_handler = SIG_IGN;
if (sigaction(SIGXFSZ, &sa, NULL) < 0)
ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGXFSZ)");
#endif
--- NEW FILE httpd-2.2.11.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
iD8DBQBJOpfNTAQoGDEaPeURAu0TAJwNWk5BZu8hoatVKD4Bt5ytd9SYlgCgnYLX
qEUhu8VkhKrnhvDyIoN4G7I=
=mnQ8
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 21 Oct 2008 11:47:47 -0000 1.23
+++ .cvsignore 18 Dec 2008 16:30:23 -0000 1.24
@@ -1 +1 @@
-httpd-2.2.10.tar.gz
+httpd-2.2.11.tar.gz
Index: httpd.init
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- httpd.init 25 Jul 2007 17:16:39 -0000 1.13
+++ httpd.init 18 Dec 2008 16:30:24 -0000 1.14
@@ -8,7 +8,7 @@
# processname: httpd
# config: /etc/httpd/conf/httpd.conf
# config: /etc/sysconfig/httpd
-# pidfile: /var/run/httpd.pid
+# pidfile: /var/run/httpd/httpd.pid
#
### BEGIN INIT INFO
# Provides: httpd
@@ -42,7 +42,7 @@
apachectl=/usr/sbin/apachectl
httpd=${HTTPD-/usr/sbin/httpd}
prog=httpd
-pidfile=${PIDFILE-/var/run/httpd.pid}
+pidfile=${PIDFILE-/var/run/httpd/httpd.pid}
lockfile=${LOCKFILE-/var/lock/subsys/httpd}
RETVAL=0
Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- httpd.spec 21 Oct 2008 11:47:47 -0000 1.127
+++ httpd.spec 18 Dec 2008 16:30:24 -0000 1.128
@@ -4,12 +4,10 @@
%define vstring Fedora
%define mpms worker event
-%define _default_patch_fuzz 2
-
Summary: Apache HTTP Server
Name: httpd
-Version: 2.2.10
-Release: 2
+Version: 2.2.11
+Release: 3
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html
@@ -31,11 +29,11 @@
Patch5: httpd-2.1.10-layout.patch
# Features/functional changes
Patch20: httpd-2.0.48-release.patch
-Patch21: httpd-2.0.40-xfsz.patch
+Patch21: httpd-2.2.11-xfsz.patch
Patch22: httpd-2.1.10-pod.patch
Patch23: httpd-2.0.45-export.patch
-Patch24: httpd-2.0.48-corelimit.patch
-Patch25: httpd-2.0.54-selinux.patch
+Patch24: httpd-2.2.11-corelimit.patch
+Patch25: httpd-2.2.11-selinux.patch
Patch26: httpd-2.2.9-suenable.patch
# Bug fixes
Patch54: httpd-2.2.0-authnoprov.patch
@@ -43,8 +41,8 @@
License: ASL 2.0
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: autoconf, perl, pkgconfig, findutils, ed
-BuildRequires: db4-devel, expat-devel, zlib-devel, libselinux-devel
+BuildRequires: autoconf, perl, pkgconfig, findutils
+BuildRequires: zlib-devel, libselinux-devel
BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
Requires: initscripts >= 8.36, /etc/mime.types, system-logos >= 7.92.1-1
Obsoletes: httpd-suexec
@@ -119,7 +117,7 @@
%patch4 -p1 -b .disablemods
%patch5 -p1 -b .layout
-%patch21 -p0 -b .xfsz
+%patch21 -p1 -b .xfsz
%patch22 -p1 -b .pod
%patch23 -p1 -b .export
%patch24 -p1 -b .corelimit
@@ -283,9 +281,10 @@
ln -s ../../..%{_datadir}/pixmaps/poweredby.png \
$RPM_BUILD_ROOT%{contentdir}/icons/poweredby.png
-# logs
+# Set up /var directories
rmdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/logs
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/httpd
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/httpd
# symlinks for /etc/httpd
ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs
@@ -308,7 +307,7 @@
-e "s|/usr/local/apache2/conf/magic|/etc/httpd/conf/magic|" \
-e "s|/usr/local/apache2/logs/error_log|/var/log/httpd/error_log|" \
-e "s|/usr/local/apache2/logs/access_log|/var/log/httpd/access_log|" \
- -e "s|/usr/local/apache2/logs/httpd.pid|/var/run/httpd.pid|" \
+ -e "s|/usr/local/apache2/logs/httpd.pid|/var/run/httpd/httpd.pid|" \
-e "s|/usr/local/apache2|/etc/httpd|" < docs/man/httpd.8 \
> $RPM_BUILD_ROOT%{_mandir}/man8/httpd.8
@@ -445,6 +444,7 @@
%config %{contentdir}/error/*.var
%config %{contentdir}/error/include/*.html
+%attr(0700,root,root) %dir %{_localstatedir}/run/httpd
%attr(0700,root,root) %dir %{_localstatedir}/log/httpd
%attr(0700,apache,apache) %dir %{_localstatedir}/lib/dav
%attr(0700,apache,apache) %dir %{_localstatedir}/cache/mod_proxy
@@ -482,6 +482,11 @@
%{_libdir}/httpd/build/*.sh
%changelog
+* Thu Dec 18 2008 Joe Orton <jorton at redhat.com> 2.2.11-3
+- update to 2.2.11
+- package new /var/run/httpd directory, and move default pidfile
+ location inside there
+
* Tue Oct 21 2008 Joe Orton <jorton at redhat.com> 2.2.10-2
- update to 2.2.10
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 21 Oct 2008 11:47:47 -0000 1.19
+++ sources 18 Dec 2008 16:30:24 -0000 1.20
@@ -1 +1 @@
-f611aff3ddba114499e623a5259faa5c httpd-2.2.10.tar.gz
+03e0a99a5de0f3f568a0087fb9993af9 httpd-2.2.11.tar.gz
Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/upstream,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- upstream 21 Oct 2008 11:47:47 -0000 1.12
+++ upstream 18 Dec 2008 16:30:24 -0000 1.13
@@ -1 +1 @@
-httpd-2.2.10.tar.gz
+httpd-2.2.11.tar.gz
--- httpd-2.0.40-xfsz.patch DELETED ---
--- httpd-2.0.48-corelimit.patch DELETED ---
--- httpd-2.0.54-selinux.patch DELETED ---
More information about the fedora-extras-commits
mailing list