diff --git a/httpd-2.2.0-authnoprov.patch b/httpd-2.2.0-authnoprov.patch
deleted file mode 100644
index c9cfe8b..0000000
--- a/httpd-2.2.0-authnoprov.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- httpd-2.2.0/modules/aaa/mod_authn_file.c.authnoprov
-+++ httpd-2.2.0/modules/aaa/mod_authn_file.c
-@@ -70,6 +70,10 @@
- apr_status_t status;
- char *file_password = NULL;
-
-+ if (!conf->pwfile) {
-+ return AUTH_GENERAL_ERROR;
-+ }
-+
- status = ap_pcfg_openfile(&f, r->pool, conf->pwfile);
-
- if (status != APR_SUCCESS) {
---- httpd-2.2.0/modules/aaa/mod_auth_basic.c.authnoprov
-+++ httpd-2.2.0/modules/aaa/mod_auth_basic.c
-@@ -252,6 +252,14 @@
- return DECLINED;
- }
-
-+ /* If no providers were configured, and the default file
-+ * provider gave a general error (which will happen only if
-+ * has not been configured), presume that a non-provider-based
-+ * authn module is configured, and get out of the way. */
-+ if (!conf->providers && auth_result == AUTH_GENERAL_ERROR) {
-+ return DECLINED;
-+ }
-+
- switch (auth_result) {
- case AUTH_DENIED:
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
diff --git a/httpd-2.2.11-corelimit.patch b/httpd-2.2.11-corelimit.patch
index ea9f857..0c8d72a 100644
--- a/httpd-2.2.11-corelimit.patch
+++ b/httpd-2.2.11-corelimit.patch
@@ -1,3 +1,10 @@
+
+Bump up the core size limit if CoreDumpDirectory is
+configured.
+
+Upstream-Status: Was discussed but there are competing desires;
+ there are portability oddities here too.
+
--- 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 *
diff --git a/httpd-2.2.11-selinux.patch b/httpd-2.2.11-selinux.patch
index 7b1b3cb..09da889 100644
--- a/httpd-2.2.11-selinux.patch
+++ b/httpd-2.2.11-selinux.patch
@@ -1,3 +1,8 @@
+
+Log the SELinux context at startup.
+
+Upstream-Status: unlikely to be any interest in this upstream
+
--- httpd-2.2.11/configure.in.selinux
+++ httpd-2.2.11/configure.in
@@ -412,6 +412,10 @@ getpgid
diff --git a/httpd-2.2.11-xfsz.patch b/httpd-2.2.11-xfsz.patch
deleted file mode 100644
index 7f9e16a..0000000
--- a/httpd-2.2.11-xfsz.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
diff --git a/httpd-2.2.9-deplibs.patch b/httpd-2.2.9-deplibs.patch
index def61ed..b137e89 100644
--- a/httpd-2.2.9-deplibs.patch
+++ b/httpd-2.2.9-deplibs.patch
@@ -1,3 +1,9 @@
+
+Link only against the libtool libraries to avoid pulling in
+all dependencies if libapr/libaprutil.
+
+Upstream-Status: probably breaks static builds, not desired
+
--- httpd-2.2.9/configure.in.deplibs
+++ httpd-2.2.9/configure.in
@@ -588,9 +588,8 @@ APACHE_HELP_STRING(--with-suexec-umask,u
diff --git a/httpd-2.2.9-suenable.patch b/httpd-2.2.9-suenable.patch
index 2227632..a449237 100644
--- a/httpd-2.2.9-suenable.patch
+++ b/httpd-2.2.9-suenable.patch
@@ -1,3 +1,6 @@
+
+Upstream-Status: in trunk, differently
+
--- httpd-2.2.9/os/unix/unixd.c.suenable
+++ httpd-2.2.9/os/unix/unixd.c
@@ -215,7 +215,7 @@ AP_DECLARE(void) unixd_pre_config(apr_po
diff --git a/httpd.conf b/httpd.conf
index 78cdc37..d56c2dc 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -1,12 +1,11 @@
#
-# This is the main Apache server configuration file. It contains the
+# This is the main Apache HTTP server configuration file. It contains the
# configuration directives that give the server its instructions.
-# See for detailed information.
-# In particular, see
+# See for detailed information.
+# In particular, see
#
# for a discussion of each configuration directive.
#
-#
# Do NOT simply read the instructions in here without understanding
# what they do. They're here only as hints or reminders. If you are unsure
# consult the online docs. You have been warned.
@@ -126,11 +125,11 @@ MaxRequestsPerChild 0
#
# Listen: Allows you to bind Apache to specific IP addresses and/or
-# ports, in addition to the default. See also the
+# ports, instead of the default. See also the
# directive.
#
# Change this to Listen on specific IP addresses as shown below to
-# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
+# prevent Apache from glomming onto all bound IP addresses.
#
#Listen 12.34.56.78:80
Listen 80
@@ -316,30 +315,30 @@ DocumentRoot "/var/www/html"
#
-#
-# Possible values for the Options directive are "None", "All",
-# or any combination of:
-# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
-#
-# Note that "MultiViews" must be named *explicitly* --- "Options All"
-# doesn't give it to you.
-#
-# The Options directive is both complicated and important. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#options
-# for more information.
-#
+ #
+ # Possible values for the Options directive are "None", "All",
+ # or any combination of:
+ # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+ #
+ # Note that "MultiViews" must be named *explicitly* --- "Options All"
+ # doesn't give it to you.
+ #
+ # The Options directive is both complicated and important. Please see
+ # http://httpd.apache.org/docs/2.2/mod/core.html#options
+ # for more information.
+ #
Options Indexes FollowSymLinks
-#
-# AllowOverride controls what directives may be placed in .htaccess files.
-# It can be "All", "None", or any combination of the keywords:
-# Options FileInfo AuthConfig Limit
-#
+ #
+ # AllowOverride controls what directives may be placed in .htaccess files.
+ # It can be "All", "None", or any combination of the keywords:
+ # Options FileInfo AuthConfig Limit
+ #
AllowOverride None
-#
-# Controls who can get stuff from this server.
-#
+ #
+ # Controls who can get stuff from this server.
+ #
Order allow,deny
Allow from all
@@ -412,11 +411,11 @@ AccessFileName .htaccess
# The following lines prevent .htaccess and .htpasswd files from being
# viewed by Web clients.
#
-
+
Order allow,deny
Deny from all
Satisfy All
-
+
#
# TypesConfig describes where the mime.types file (or equivalent) is
diff --git a/httpd.spec b/httpd.spec
index a8b79dd..50c88f9 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -8,7 +8,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.2.17
-Release: 10%{?dist}.1
+Release: 11%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -31,14 +31,11 @@ Patch4: httpd-2.1.10-disablemods.patch
Patch5: httpd-2.1.10-layout.patch
# Features/functional changes
Patch20: httpd-2.0.48-release.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.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
License: ASL 2.0
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -117,15 +114,12 @@ Security (TLS) protocols.
%patch4 -p1 -b .disablemods
%patch5 -p1 -b .layout
-%patch21 -p1 -b .xfsz
%patch22 -p1 -b .pod
%patch23 -p1 -b .export
%patch24 -p1 -b .corelimit
%patch25 -p1 -b .selinux
%patch26 -p1 -b .suenable
-%patch54 -p1 -b .authnoprov
-
# Patch in vendor/release string
sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -497,6 +491,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/*.sh
%changelog
+* Wed Mar 23 2011 Joe Orton - 2.2.17-11
+- minor updates to httpd.conf
+- drop old patches
+
* Mon Mar 7 2011 Joe Orton - 2.2.17-10.1
- rebuild for new APR (#681305)