cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to the Apache HTTP server 2.2.22, the current release on the 2.2 branch.

Browse Source 
Merged from diffs from myself, Rodolfo Gouveia and with an rc script from
giovanni@.

This is a security update, fixing CVE-2011-3348, CVE-2011-3368, CVE-2011-3607,
CVE-2011-4317, CVE-2012-0021, CVE-2012-0031 and CVE-2012-0053.
This commit is contained in:
sthen 2012-07-18 08:45:42 +00:00
parent ffbfde3b63
commit 32268b7d14
7 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/apache-httpd/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.30 2012/04/28 09:54:44 stsp Exp $
# $OpenBSD: Makefile,v 1.31 2012/07/18 08:45:42 sthen Exp $
COMMENT= apache HTTP server
V= 2.2.20
V= 2.2.22
PKGNAME= apache-httpd-${V}
DISTNAME= httpd-${V}
REVISION= 1
CATEGORIES= www net
@ -78,8 +77,8 @@ FAKE_FLAGS+= rel_user=_apache2 rel_group=_apache2 \
A2SBIN= apachectl apxs dbmmanage htdigest htpasswd \
logresolve rotatelogs suexec
A2MAN1= dbmmanage htdigest htpasswd
A2MAN8= apachectl apxs httpd logresolve rotatelogs suexec
A2MAN1= apxs dbmmanage htdigest htpasswd logresolve
A2MAN8= apachectl httpd rotatelogs suexec
pre-configure:
@perl -pi -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/config.layout
@ -96,7 +95,7 @@ post-install:
.for i in ${A2MAN1}
mv ${PREFIX}/man/man1/${i}.1 ${PREFIX}/man/man1/${i}2.1
.endfor
.for i in ${A2MAN8}
mv ${PREFIX}/man/man8/${i}.8 ${PREFIX}/man/man8/${i}2.8
.endfor

7
www/apache-httpd/distinfo
View File

@ -1,5 +1,2 @@
MD5 (httpd-2.2.20.tar.gz) = RQSTRGTF7lEBjbr6bZmBDQ==
RMD160 (httpd-2.2.20.tar.gz) = +65r9C4KENDX8YpOlxtH1Ie8li8=
SHA1 (httpd-2.2.20.tar.gz) = XmcGNuFyhreuWt5bf14h5oZVnlo=
SHA256 (httpd-2.2.20.tar.gz) = CrtZaJZkrk210e4atBQHFbh/iJ6B3itNlYHCNVlOKGg=
SIZE (httpd-2.2.20.tar.gz) = 6834233
SHA256 (httpd-2.2.22.tar.gz) = dMH//+/hpQIzmwBK1kiPvYWOtCWgWWjNZ8BWldvA/nw=
SIZE (httpd-2.2.22.tar.gz) = 7200529

12
www/apache-httpd/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.8 2011/09/01 13:40:09 giovanni Exp $
--- configure.orig Tue Aug 30 02:13:20 2011
+++ configure Wed Aug 31 11:53:52 2011
@@ -3121,7 +3121,7 @@ do
$OpenBSD: patch-configure,v 1.9 2012/07/18 08:45:42 sthen Exp $
--- configure.orig Wed Jan 25 22:26:34 2012
+++ configure Tue Feb 21 23:16:50 2012
@@ -3102,7 +3102,7 @@ do
ap_last="${ap_cur}"
ap_cur=`eval "echo ${ap_cur}"`
done
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.8 2011/09/01 13:40:09 giovanni Exp $
APACHE_VAR_SUBST="$APACHE_VAR_SUBST exp_sysconfdir"
@@ -4112,7 +4112,7 @@ SHLIBPATH_VAR=`$apr_config --shlib-path-var`
@@ -4082,7 +4082,7 @@ SHLIBPATH_VAR=`$apr_config --shlib-path-var`
APR_BINDIR=`$apr_config --bindir`
APR_INCLUDEDIR=`$apr_config --includedir`
APR_VERSION=`$apr_config --version`
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.8 2011/09/01 13:40:09 giovanni Exp $
echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
@@ -4430,7 +4430,7 @@ fi
@@ -4389,7 +4389,7 @@ fi
APU_BINDIR=`$apu_config --bindir`
APU_INCLUDEDIR=`$apu_config --includedir`
APU_VERSION=`$apu_config --version`

10
www/apache-httpd/patches/patch-docs_man_apxs_8 → www/apache-httpd/patches/patch-docs_man_apxs_1
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-docs_man_apxs_8,v 1.2 2007/03/25 17:40:55 deanna Exp $
--- docs/man/apxs.8.orig Sat Nov 20 15:16:24 2004
+++ docs/man/apxs.8 Sun Mar 25 13:21:03 2007
$OpenBSD: patch-docs_man_apxs_1,v 1.1 2012/07/18 08:45:42 sthen Exp $
--- docs/man/apxs.1.orig Tue Jan 10 23:32:02 2012
+++ docs/man/apxs.1 Tue Feb 21 23:13:07 2012
@@ -19,64 +19,64 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "APXS" 8 "2004-10-01" "Apache HTTP Server" "apxs"
+.TH "APXS2" 8 "2004-10-01" "Apache HTTP Server" "apxs2"
-.TH "APXS" 1 "2012-01-10" "Apache HTTP Server" "apxs"
+.TH "APXS2" 1 "2012-01-10" "Apache HTTP Server" "apxs2"
.SH NAME
-apxs \- APache eXtenSion tool

10
www/apache-httpd/patches/patch-docs_man_logresolve_8 → www/apache-httpd/patches/patch-docs_man_logresolve_1
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-docs_man_logresolve_8,v 1.2 2007/03/25 17:40:55 deanna Exp $
--- docs/man/logresolve.8.orig Wed Jun 29 18:19:59 2005
+++ docs/man/logresolve.8 Sun Mar 25 13:21:04 2007
$OpenBSD: patch-docs_man_logresolve_1,v 1.1 2012/07/18 08:45:42 sthen Exp $
--- docs/man/logresolve.1.orig Tue Jan 10 23:32:02 2012
+++ docs/man/logresolve.1 Tue Feb 21 23:13:49 2012
@@ -19,21 +19,21 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "LOGRESOLVE" 8 "2005-06-29" "Apache HTTP Server" "logresolve"
+.TH "LOGRESOLVE2" 8 "2005-06-29" "Apache HTTP Server" "logresolve2"
-.TH "LOGRESOLVE" 1 "2012-01-10" "Apache HTTP Server" "logresolve"
+.TH "LOGRESOLVE2" 1 "2012-01-10" "Apache HTTP Server" "logresolve2"
.SH NAME
-logresolve \- Resolve IP-addresses to hostnames in Apache log files

17
www/apache-httpd/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.19 2011/09/01 13:40:09 giovanni Exp $
@comment $OpenBSD: PLIST,v 1.20 2012/07/18 08:45:42 sthen Exp $
@newgroup _apache2:576
@newuser _apache2:576:576:daemon:Apache HTTP Server:/var/empty:/sbin/nologin
include/apache2/
@ -112,16 +112,17 @@ lib/apache2/mod_userdir.so
lib/apache2/mod_usertrack.so
lib/apache2/mod_version.so
lib/apache2/mod_vhost_alias.so
@man man/man1/ab.1
@man man/man1/apxs2.1
@man man/man1/dbmmanage2.1
@man man/man1/htdbm.1
@man man/man1/htdigest2.1
@man man/man1/htpasswd2.1
@man man/man8/ab.8
@man man/man1/httxt2dbm.1
@man man/man1/logresolve2.1
@man man/man8/apachectl2.8
@man man/man8/apxs2.8
@man man/man8/htcacheclean.8
@man man/man8/httpd2.8
@man man/man8/logresolve2.8
@man man/man8/rotatelogs2.8
@man man/man8/suexec2.8
@bin sbin/ab
@ -350,6 +351,7 @@ share/doc/apache2/license.html
share/doc/apache2/license.html.en
share/doc/apache2/logs.html
share/doc/apache2/logs.html.en
share/doc/apache2/logs.html.fr
share/doc/apache2/logs.html.ja.utf8
share/doc/apache2/logs.html.ko.euc-kr
share/doc/apache2/logs.html.tr.utf8
@ -626,11 +628,14 @@ share/doc/apache2/mod/mod_proxy_connect.html.en
share/doc/apache2/mod/mod_proxy_connect.html.ja.utf8
share/doc/apache2/mod/mod_proxy_ftp.html
share/doc/apache2/mod/mod_proxy_ftp.html.en
share/doc/apache2/mod/mod_proxy_ftp.html.ja.utf8
share/doc/apache2/mod/mod_proxy_http.html
share/doc/apache2/mod/mod_proxy_http.html.en
share/doc/apache2/mod/mod_proxy_http.html.fr
share/doc/apache2/mod/mod_proxy_http.html.ja.utf8
share/doc/apache2/mod/mod_proxy_scgi.html
share/doc/apache2/mod/mod_proxy_scgi.html.en
share/doc/apache2/mod/mod_proxy_scgi.html.ja.utf8
share/doc/apache2/mod/mod_reqtimeout.html
share/doc/apache2/mod/mod_reqtimeout.html.en
share/doc/apache2/mod/mod_rewrite.html
@ -741,6 +746,7 @@ share/doc/apache2/new_features_2_0.html.tr.utf8
share/doc/apache2/new_features_2_2.html
share/doc/apache2/new_features_2_2.html.en
share/doc/apache2/new_features_2_2.html.fr
share/doc/apache2/new_features_2_2.html.ja.utf8
share/doc/apache2/new_features_2_2.html.ko.euc-kr
share/doc/apache2/new_features_2_2.html.pt-br
share/doc/apache2/new_features_2_2.html.tr.utf8
@ -810,6 +816,7 @@ share/doc/apache2/programs/httxt2dbm.html.tr.utf8
share/doc/apache2/programs/index.html
share/doc/apache2/programs/index.html.en
share/doc/apache2/programs/index.html.es
share/doc/apache2/programs/index.html.ja.utf8
share/doc/apache2/programs/index.html.ko.euc-kr
share/doc/apache2/programs/index.html.ru.koi8-r
share/doc/apache2/programs/index.html.tr.utf8
@ -934,6 +941,7 @@ share/doc/apache2/upgrading.html
share/doc/apache2/upgrading.html.de
share/doc/apache2/upgrading.html.en
share/doc/apache2/upgrading.html.fr
share/doc/apache2/upgrading.html.ja.utf8
share/doc/apache2/urlmapping.html
share/doc/apache2/urlmapping.html.en
share/doc/apache2/urlmapping.html.ja.utf8
@ -1538,3 +1546,4 @@ share/examples/apache2/icons/world2.png
share/examples/apache2/logs/
@sample /var/apache2/logs/
%%ldap%%
@rcscript ${RCDIR}/httpd2

13
www/apache-httpd/pkg/httpd2.rc Normal file
View File

@ -0,0 +1,13 @@
#!/bin/sh
#
# $OpenBSD: httpd2.rc,v 1.1 2012/07/18 08:45:42 sthen Exp $
daemon="${TRUEPREFIX}/sbin/httpd2"
. /etc/rc.d/rc.subr
rc_pre() {
rm -f /var/apache2/logs/{ssl_mutex,httpd.lock,accept.lock}.*
}
rc_cmd $1