diff --git a/.cvsignore b/.cvsignore index 3d49aae..5bb3dd3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1 @@ -httpd-2.2.2.tar.gz -*.rpm -x86_64 -clog +httpd-2.2.3.tar.gz diff --git a/httpd-2.2.3.tar.gz.asc b/httpd-2.2.3.tar.gz.asc new file mode 100644 index 0000000..5fafd97 --- /dev/null +++ b/httpd-2.2.3.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.4 (GNU/Linux) + +iQEVAwUARMj5dfcTqHkQ/eB1AQIQ9gf9HeZ5UPY4AOWdSZmoj4SK/IPdl92OAchN +nBKsHBN8nNWN3y9U6QmkvFWStf5aWIFcwGNJXednYKhAREZA8wZHURgmzmq3jNZU +lVsfy0nv4s4W8OdvAQ9XpnIkjzhWT0BjjqEfFS16+iPxAVmmQTYUXpfi/QJT7A8/ +yoUuZwg9a8d5XJf5gCfwmLyN1vTWgPI4vcbiOHOCdSmCUTNHu9UasI0yZIVJP2ma +jttvlRDz1iRyPoNP7IUnEmmojvHzlqxvTrXD5t+bvhq4+7UNe0pOK9wGoKdViTFe +O+yy50O4MBSDLKCkRFqONdIyf1+dHIU4NaEUxjH8BgH0bTXXZrTnfA== +=3Amm +-----END PGP SIGNATURE----- diff --git a/httpd.spec b/httpd.spec index 4b91195..bd387a1 100644 --- a/httpd.spec +++ b/httpd.spec @@ -6,8 +6,8 @@ Summary: Apache HTTP Server Name: httpd -Version: 2.2.2 -Release: 8 +Version: 2.2.3 +Release: 2 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -481,6 +481,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/httpd/build/*.sh %changelog +* Fri Jul 28 2006 Joe Orton 2.2.3-2 +- update to 2.2.3 +- trim %%changelog to >=2.0.52 + * Thu Jul 20 2006 Joe Orton 2.2.2-8 - fix segfault on dummy connection failure at graceful restart (#199429) @@ -668,440 +672,3 @@ rm -rf $RPM_BUILD_ROOT * Tue Sep 28 2004 Joe Orton 2.0.52-2 - update to 2.0.52 -* Tue Sep 21 2004 Joe Orton 2.0.51-6 -- fix 2.0.51 regression in Satisfy merging (CAN-2004-0811) - -* Sat Sep 18 2004 Joe Orton 2.0.51-5 -- switch to Jeff Trawick's child reclaim timing logic patch -- migration guide updates - -* Thu Sep 16 2004 Joe Orton 2.0.51-4 -- fix pcre includes - -* Thu Sep 16 2004 Joe Orton 2.0.51-3 -- update to 2.0.51 - -* Tue Sep 14 2004 Joe Orton 2.0.50-8 -- add improved child reclaim timing logic (#119128/#132360) -- add BuildRequire zlib-devel for mod_deflate - -* Wed Sep 8 2004 Joe Orton 2.0.50-7 -- prereq rather than just require httpd from -suexec (#132045) - -* Sun Sep 5 2004 Joe Orton 2.0.50-6 -- include /etc/sysconfig/httpd template (#112085) -- pass $OPTIONS in httpd invocations in apachectl (#115910) -- do not pass $OPTIONS to apachectl from init script -- start httpd in C locale by default from apachectl - -* Wed Sep 1 2004 Joe Orton 2.0.50-5 -- move manual configuration into conf.d/manual.conf (#131208) -- add test_hook from HEAD, -t -DDUMP_CERTS for mod_ssl -- document AddDefaultCharset change since 1.3 in migration.html - -* Tue Aug 17 2004 Joe Orton 2.0.50-4 -- start httpd in the C locale by default (#128002) -- fix CustomLog comments in default httpd.conf (#43223) -- ensure correct mod_suexec vs mod_userdir hook ordering - (Joshua Slive, upstream #18156) - -* Tue Jun 29 2004 Joe Orton 2.0.50-3 -- update -proxy11 patch -- explain where suexec went if SuexecUserGroup is used but - /usr/sbin/suexec is not found - -* Tue Jun 29 2004 Joe Orton 2.0.50-1 -- update to 2.0.50 - -* Mon Jun 21 2004 Joe Orton 2.0.49-8 -- split out suexec into httpd-suexec package (#77972) -- link to system pcreposix.h to fix including httpd.h - -* Wed Jun 16 2004 Joe Orton 2.0.49-7 -- don't install or use bundled pcreposix.h -- bump default MaxClients to 256 -- drop default Timeout to 2 minutes -- merge from upstream: - * add fix for VirtualHost multiple address handling (Jeff Trawick) - -* Tue Jun 15 2004 Elliot Lee 2.0.49-6 -- rebuilt - -* Thu Jun 10 2004 Joe Orton 2.0.49-5 -- remove comments about ScoreBoardFile in httpd.conf -- avoid redundant name lookup in pod code -- mod_headers: add %{...}s feature for using SSL variables -- mod_autoindex: don't truncate output on stat() failure (#117959) -- mod_ssl: fix shmcb corruption with small caches (Geoff Thorpe) -- mod_ssl: security fix for overflow in FakeBasicAuth (CVE CAN-2004-0488) -- mod_deflate: fix memory consumption for large responses -- check that suexec is setuid root (André Malo) -- worker: add ThreadStackSize (Jeff Trawick) and ThreadGuardSize directives - -* Thu May 6 2004 Joe Orton 2.0.49-4 -- make "noindex" page valid XHTML 1.1 (Pascal Volk, #122020) -- fix SEGV with no Listen directives (Michael Corcoran) -- mod_cgi: synch with 2.0 backport proposed upstream - -* Thu Apr 22 2004 Joe Orton 2.0.49-3 -- conflict with older pcre (#121531) -- include mod_ext_filter -- mod_cgi: handle concurrent stderr/stdout from script - -* Fri Mar 26 2004 Joe Orton 2.0.49-2 -- mod_ssl: fix session cache memory leak (Madhu Mathihalli) -- mod_ssl: fix SEGV when trying to shutdown during pool cleanup -- merge the mod_proxy HTTP/1.1-compliance fixes -- apply fix for #118020 - -* Thu Mar 18 2004 Joe Orton 2.0.49-1 -- update to 2.0.49 (#118798, thanks to Robert Scheck) -- only link ab and mod_ssl against SSL_LIBS -- open log files using APR_LARGEFILE where available - -* Wed Mar 17 2004 Joe Orton 2.0.48-18 -- add fix for #118020 -- ssl.conf tweaks: seed SSL PRNG with 256 bytes from /dev/urandom - -* Mon Mar 15 2004 Joe Orton 2.0.48-17 -- use "SSLMutex default" in default ssl.conf -- limit to 128K XML request bodies in default httpd.conf; fix to - give a 413 error not a 400 if the limit is exceeded -- mod_rewrite: add %%{SSL:...} and %%{HTTPS} variable lookups -- mod_dav: propagate executable property across COPY/MOVE -- mod_dav: give 507 on out-of-space errors in more places -- mod_ssl: add ssl_is_https optional function -- mod_ssl: support indexed lookup of DN components -- mod_ssl: optimised variable lookup -- mod_ssl: install only minimal mod_ssl.h -- worker: fix potential hang at restart - -* Tue Mar 2 2004 Elliot Lee 2.0.48-16.1 -- Rebuilt. - -* Mon Feb 23 2004 Joe Orton 2.0.48-16 -- fix apxs -q installbuilddir -- really update to ab from HEAD -- remove check that accept() returns an fd < FD_SETSIZE - -* Fri Feb 13 2004 Elliot Lee 2.0.48-15 -- Rebuilt. - -* Tue Feb 3 2004 Joe Orton 2.0.48-14 -- mod_dav: fix 401 on destination and reject unescaped fragment in URI -- remove redundant ldconfig invocation from mod_ssl %%post -- remove unnecessary -headusage patch - -* Fri Jan 30 2004 Joe Orton 2.0.48-13 -- allow further customisation of init script (Peter Bieringer, #114619) -- worker fixes from upstream -- use basename(filename) in APLOG_MARK to reduce noise levels at - "LogLevel debug" - -* Wed Jan 28 2004 Joe Orton 2.0.48-12 -- mod_ssl: cosmetic tweaks for pass phrase prompting -- simplify rebranding a little - -* Tue Jan 27 2004 Joe Orton 2.0.48-11 -- trim pre-2.0 history from CHANGES to limit size - -* Tue Jan 27 2004 Joe Orton 2.0.48-10 -- update to ab from HEAD -- remove dbmmanage man page (part of #114080) -- mod_ssl: fix streaming nph- CGI scripts over SSL -- mod_autoindex: fixes from 2.0 branch (André Malo) -- add NameVirtualHost vs mod_ssl warning to httpd.conf (#114315) -- mod_proxy: HTTP/1.1-compliance fixes from HEAD - -* Tue Jan 20 2004 Joe Orton 2.0.48-9 -- use a large BSS in the test PIE executable to trigger bugs early -- tighten check on CPP output in MMN check (#113934) - -* Mon Jan 19 2004 Joe Orton 2.0.48-8 -- add man page fixes -- mod_include: use parser rewrite+fixes from 2.0 branch (André Malo et al) -- mod_ssl: add distcache support (Geoff Thorpe) -- mod_ssl: SSL variable handling fixes for non-SSL connections (various) -- allow linking modules against specific libraries found during configure - -* Mon Jan 19 2004 Joe Orton 2.0.48-7 -- hack to ensure that /usr/sbin/suexec gets stripped -- merges from upstream: - * fix for CVE CAN-2003-0020 (André Malo) - * open log files read-only (Jeff Trawick) - * mod_cgi: fix logging of script exec failure messages (Jeff Trawick) - * mod_proxy: fix leak in request body handling (Larry Toppi) -- merges from Taroon: - * move away /var/www/html/index.html before upgrade from 1.3 (#70705) - * allow upgrade from Stronghold 4.0 - * migration guide updates - * mod_log_config: fix logging of timezone (upstream #23642) - * mod_ssl: restore readable error descriptions in error log - -* Mon Jan 19 2004 Joe Orton 2.0.48-6 -- fix httpd.init issues reported by Behdad Esfahbod -- add fix for mod_usertrack (#113269) -- automatically raise RLIMIT_CORE if CoreDumpDirectory is used -- emit warning at end of %%prep if PIE support is not enabled -- add symlink to libtool script from build directory (#113720) -- don't link suexec against the world - -* Sun Jan 04 2004 Joe Orton 2.0.48-5 -- use graceful restart in logrotate -- bump default MaxRequestsPerChild for prefork to 4000 -- move vendor string for Server header into spec file -- include mod_status extension hook and use it in mod_ssl to include - SSL session cache statistics in server-status output - -* Thu Dec 18 2003 Joe Orton 2.0.48-4 -- rebuild - -* Sat Dec 13 2003 Jeff Johnson 2.0.48-3 -- rebuild against db-4.2.52. - -* Tue Oct 28 2003 Joe Orton 2.0.48-2 -- update to 2.0.48 -- includes security fix for CVE CAN-2003-0542 -- include mpm*.h to fix mod_fastcgi build (#108080) -- increase DYNAMIC_MODULE_LIMIT to 128 -- re-enable ap_hack_* export trimming patch -- only use -export-dynamic when linking httpd, not suexec etc -- don't load mod_unique_id by default - -* Thu Oct 23 2003 Joe Orton 2.0.47-10 -- httpd.conf: configure test page in welcome.conf, load suexec, - don't use custom error docs by default, sync with upstream. -- add "Powered by Fedora" icon (Garrett LeSage) -- migration guide updates -- drop mod_cgid -- enable SSL_EXPERIMENTAL_ENGINE (#106858) -- drop minimum suexec gid to 100 (#74753, #107083) -- speed up graceful restarts in prefork (#105725) -- mod_ssl fixes - -* Wed Oct 22 2003 Joe Orton 2.0.47-9 -- updated index.html (Matt Wilson, #107378) -- change server version string comment to "(Fedora)" - -* Mon Oct 13 2003 Jeff Johnson 2.0.47-8.1 -- rebuild against db-4.2.42. - -* Wed Oct 8 2003 Joe Orton 2.0.47-8 -- use -fPIE not -fpie to fix s390x (Florian La Roche) -- include VERSIONING in docdir - -* Mon Oct 6 2003 Joe Orton 2.0.47-7 -- enable PIE support -- include bug fix for #78019 - -* Mon Sep 8 2003 Joe Orton 2.0.47-6 -- update httpd.conf for manual changes (alietss@yahoo.com, #101015) -- use anonymous shm for LDAP auth cache (#103566) - -* Sun Sep 7 2003 Joe Orton 2.0.47-5 -- include unixd.h again -- fix EXTRA_INCLUDES - -* Mon Jul 28 2003 Joe Orton 2.0.47-4 -- add mod_include fixes from upstream -- httpd.conf updates: wording fixes from upstream; load - mod_deflate by default, update AddLanguage section (#98455) -- don't add eNULL cipher in default ssl.conf (#98401) -- only bind to IPv4 addresses in default config (#98916) - -* Thu Jul 24 2003 Joe Orton 2.0.47-3 -- fix for segfaults in php-snmp init (#97207) - -* Wed Jul 23 2003 Joe Orton 2.0.47-2 -- fix apxs -c again - -* Mon Jul 14 2003 Joe Orton 2.0.47-1 -- update to 2.0.47 -- add mod_logio (#100436) -- remove Vendor tag - -* Thu Jul 10 2003 Joe Orton 2.0.45-14 -- use libtool script included in apr -- fix apxs -q LIBTOOL (more #92313) - -* Tue Jul 8 2003 Joe Orton 2.0.45-13 -- use system pcre library - -* Thu Jul 3 2003 Joe Orton 2.0.45-12 -- remove some installed headers -- fix for use of libtool 1.5 - -* Wed Jun 5 2003 Elliot Lee -- Rebuilt. - -* Thu Jun 5 2003 Joe Orton 2.0.45-10 -- fix apxs -g (#92313) - -* Sat May 31 2003 Joe Orton 2.0.45-9 -- trim manual sources properly -- remove ExcludeArch - -* Thu May 29 2003 Joe Orton 2.0.45-8 -- rebuild - -* Mon May 19 2003 Joe Orton 2.0.45-6 -- don't load /usr/sbin/envvars from apxs -- add fix for mod_dav_fs namespace handling -- add fix for mod_dav If header etag comparison -- remove irrelevant warning from mod_proxy -- don't conflict with thttpd (#91422) - -* Sun May 18 2003 Joe Orton 2.0.45-5 -- don't package any XML sources in httpd-manual -- fix examples in default httpd.conf for enabling caching - -* Sun May 18 2003 Joe Orton 2.0.45-4 -- change default charset to UTF-8 (#88964) - -* Thu May 15 2003 Joe Orton 2.0.45-3 -- update httpd.conf for changes from default in 2.0.45 -- include conf.d/*.conf after loading standard modules -- include LDAP and cache modules (#75370, #88277) -- run buildconf in %%build not %%prep - -* Tue May 13 2003 Joe Orton 2.0.45-2 -- have apxs always use /usr/bin/libtool - -* Mon May 5 2003 Joe Orton 2.0.45-1 -- update to 2.0.45 (#82227) -- use separate apr, apr-util packages (#74951) -- mark logrotate file as noreplace (#85654) -- mark all of /var/www/error as %%config-not-noreplace -- remove dates from error pages (#86474) -- don't enable mod_cgid for worker MPM (#88819) - -* Wed Apr 30 2003 Elliot Lee 2.0.40-22 -- headusage patch to fix build on ppc64 etc. - -* Tue Apr 1 2003 Joe Orton 2.0.40-21.1 -- add security fixes for CAN-2003-0020, CAN-2003-0132, CAN-2003-0083 -- add security fix for file descriptor leaks, #82142 -- add bug fix for #82587 - -* Mon Feb 24 2003 Joe Orton 2.0.40-21 -- add security fix for CAN-2003-0020; replace non-printable characters - with '!' when printing to error log. -- disable debuginfo on IA64. - -* Tue Feb 11 2003 Joe Orton 2.0.40-20 -- disable POSIX semaphores to support 2.4.18 kernel (#83324) - -* Wed Jan 29 2003 Joe Orton 2.0.40-19 -- require xmlto 0.0.11 or later -- fix apr_strerror on glibc2.3 - -* Wed Jan 22 2003 Tim Powers 2.0.40-18 -- Rebuilt. - -* Thu Jan 16 2003 Joe Orton 2.0.40-17 -- add mod_cgid and httpd binary built with worker MPM (#75496) -- allow choice of httpd binary in init script -- pick appropriate CGI module based on loaded MPM in httpd.conf -- source /etc/sysconfig/httpd in apachectl to get httpd choice -- make "apachectl status" fail gracefully when links isn't found (#78159) - -* Mon Jan 13 2003 Joe Orton 2.0.40-16 -- rebuild for OpenSSL 0.9.7 - -* Fri Jan 3 2003 Joe Orton 2.0.40-15 -- fix possible infinite recursion in config dir processing (#77206) -- fix memory leaks in request body processing (#79282) - -* Thu Dec 12 2002 Joe Orton 2.0.40-14 -- remove unstable shmht session cache from mod_ssl -- get SSL libs from pkg-config if available (Nalin Dahyabhai) -- stop "apxs -a -i" from inserting AddModule into httpd.conf (#78676) - -* Wed Nov 6 2002 Joe Orton 2.0.40-13 -- fix location of installbuilddir in apxs when libdir!=/usr/lib - -* Wed Nov 6 2002 Joe Orton 2.0.40-12 -- pass libdir to configure; clean up config_vars.mk -- package instdso.sh, fixing apxs -i (#73428) -- prevent build if upstream MMN differs from mmn macro -- remove installed but unpackaged files - -* Wed Oct 9 2002 Joe Orton 2.0.40-11 -- correct SERVER_NAME encoding in i18n error pages (thanks to Andre Malo) - -* Wed Oct 9 2002 Joe Orton 2.0.40-10 -- fix patch for CAN-2002-0840 to also cover i18n error pages - -* Wed Oct 2 2002 Joe Orton 2.0.40-9 -- security fixes for CAN-2002-0840 and CAN-2002-0843 -- fix for possible mod_dav segfault for certain requests - -* Tue Sep 24 2002 Gary Benson -- updates to the migration guide - -* Wed Sep 4 2002 Nalin Dahyabhai 2.0.40-8 -- link httpd with libssl to avoid library loading/unloading weirdness - -* Tue Sep 3 2002 Joe Orton 2.0.40-7 -- add LoadModule lines for proxy modules in httpd.conf (#73349) -- fix permissions of conf/ssl.*/ directories; add Makefiles for - certificate management (#73352) - -* Mon Sep 2 2002 Joe Orton 2.0.40-6 -- provide "httpd-mmn" to manage module ABI compatibility - -* Sun Sep 1 2002 Joe Orton 2.0.40-5 -- fix SSL session cache (#69699) -- revert addition of LDAP support to apr-util - -* Mon Aug 26 2002 Joe Orton 2.0.40-4 -- set SIGXFSZ disposition to "ignored" (#69520) -- make dummy connections to the first listener in config (#72692) - -* Mon Aug 26 2002 Joe Orton 2.0.40-3 -- allow "apachectl configtest" on a 1.3 httpd.conf -- add mod_deflate -- enable LDAP support in apr-util -- don't package everything in /var/www/error as config(noreplace) - -* Wed Aug 21 2002 Bill Nottingham 2.0.40-2 -- add trigger (#68657) - -* Mon Aug 12 2002 Joe Orton 2.0.40-1 -- update to 2.0.40 - -* Wed Jul 24 2002 Joe Orton 2.0.36-8 -- improve comment on use of UserDir in default config (#66886) - -* Wed Jul 10 2002 Joe Orton 2.0.36-7 -- use /sbin/nologin as shell for apache user (#68371) -- add patch from CVS to fix possible infinite loop when processing - internal redirects - -* Wed Jun 26 2002 Gary Benson 2.0.36-6 -- modify init script to detect 1.3.x httpd.conf's and direct users - to the migration guide - -* Tue Jun 25 2002 Gary Benson 2.0.36-5 -- patch apachectl to detect 1.3.x httpd.conf's and direct users - to the migration guide -- ship the migration guide - -* Fri Jun 21 2002 Joe Orton -- move /etc/httpd2 back to /etc/httpd -- add noindex.html page and poweredby logo; tweak default config - to load noindex.html if no default "/" page is present. -- add patch to prevent mutex errors on graceful restart - -* Fri Jun 21 2002 Tim Powers 2.0.36-4 -- automated rebuild - -* Wed Jun 12 2002 Joe Orton 2.0.36-3 -- add patch to fix SSL mutex handling - -* Wed Jun 12 2002 Joe Orton 2.0.36-2 -- improved config directory patch - -* Mon May 20 2002 Joe Orton -- initial build; based heavily on apache.spec and mod_ssl.spec -- fixes: #65214, #58490, #57376, #61265, #65518, #58177, #57245 diff --git a/sources b/sources index 621dc93..8cc0213 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a0d9f7f6f70110a5965340eb7f3a3e66 httpd-2.2.2.tar.gz +f72ffb176e2dc7b322be16508c09f63c httpd-2.2.3.tar.gz diff --git a/upstream b/upstream index 3b08c51..5bb3dd3 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -httpd-2.2.2.tar.gz +httpd-2.2.3.tar.gz