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

Update to 2.2.13

Browse Source 
SECURITY: CVE-2009-2412, CVE-2009-1891, CVE-2009-1195, CVE-2009-1890,
CVE-2009-1191, CVE-2009-0023, CVE-2009-1955, CVE-2009-1956

Update the Makefile to properly depend on the mt version of apr-util
in ldap flavour. (from bernd@)

ok jasper@, ajacoutot@
This commit is contained in:
fkr 2009-08-30 18:06:07 +00:00
parent 35c5a01afe
commit 8d5431b8ad
4 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/apache-httpd/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.20 2009/05/15 15:46:58 claudio Exp $
# $OpenBSD: Makefile,v 1.21 2009/08/30 18:06:07 fkr Exp $
COMMENT= apache HTTP server
V= 2.2.11
PKGNAME= apache-httpd-${V}p0
V= 2.2.13
PKGNAME= apache-httpd-${V}
DISTNAME= httpd-${V}
CATEGORIES= www net
@ -30,7 +30,7 @@ FLAVOR?=
CONFIGURE_ARGS+= --with-ldap --enable-ldap --enable-authnz-ldap
WANTLIB+= asn1 com_err gssapi krb5 sasl2
LIB_DEPENDS+= ldap,lber::databases/openldap
LIB_DEPENDS+= aprutil-1.>=2:apr-util-mt-*-ldap:devel/apr-util,ldap,mt
LIB_DEPENDS+= aprutil-1-mt.>=2:apr-util-mt-*-ldap:devel/apr-util,ldap,mt
.else
LIB_DEPENDS+= aprutil-1-mt.>=2:apr-util-mt-*-!ldap:devel/apr-util,mt
.endif

10
www/apache-httpd/distinfo
View File

@ -1,5 +1,5 @@
MD5 (httpd-2.2.11.tar.gz) = A+Cpml3g8/VooAh/uZk6+Q==
RMD160 (httpd-2.2.11.tar.gz) = eUX4bVsBIaedaLnX0jKQfDJVXDk=
SHA1 (httpd-2.2.11.tar.gz) = SGLqYtKGdo+vFDwy5JT60jqlmfE=
SHA256 (httpd-2.2.11.tar.gz) = G6dPnYZNj7qkFgTrpn5RKH5+GWs6ToROfz6ntwfdTCc=
SIZE (httpd-2.2.11.tar.gz) = 6806786
MD5 (httpd-2.2.13.tar.gz) = KAPjW+ZlD1tznm6R+qgk3Q==
RMD160 (httpd-2.2.13.tar.gz) = bwK4HOD4za+wp6nU5MXDIff4xIs=
SHA1 (httpd-2.2.13.tar.gz) = 1r7DVzEgC8x5Z52DuMPxQeywMEo=
SHA256 (httpd-2.2.13.tar.gz) = 4n3OoMF1lq5nPDS+DDh6xxccLrCD5/RCuxOgxmzOBxI=
SIZE (httpd-2.2.13.tar.gz) = 6897450

10
www/apache-httpd/patches/patch-docs_man_htdbm_1
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-docs_man_htdbm_1,v 1.2 2007/03/25 17:40:55 deanna Exp $
--- docs/man/htdbm.1.orig Sat Mar 26 10:22:17 2005
+++ docs/man/htdbm.1 Sun Mar 25 13:21:03 2007
$OpenBSD: patch-docs_man_htdbm_1,v 1.3 2009/08/30 18:06:07 fkr Exp $
--- docs/man/htdbm.1.orig Thu Feb 12 15:09:23 2009
+++ docs/man/htdbm.1 Mon Aug 24 21:12:10 2009
@@ -54,7 +54,7 @@ htdbm \- Manipulate DBM password databases
.SH "SUMMARY"
.PP
-htdbm is used to manipulate the DBM format files used to store usernames and password for basic authentication of HTTP users via mod_auth_dbm\&. See the dbmmanage documentation for more information about these DBM files\&.
+htdbm is used to manipulate the DBM format files used to store usernames and password for basic authentication of HTTP users via mod_auth_dbm\&. See the dbmmanage2 documentation for more information about these DBM files\&.
-htdbm is used to manipulate the DBM format files used to store usernames and password for basic authentication of HTTP users via mod_authn_dbm\&. See the dbmmanage documentation for more information about these DBM files\&.
+htdbm is used to manipulate the DBM format files used to store usernames and password for basic authentication of HTTP users via mod_authn_dbm\&. See the dbmmanage2 documentation for more information about these DBM files\&.
.SH "OPTIONS"

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.15 2009/05/15 15:46:58 claudio Exp $
@comment $OpenBSD: PLIST,v 1.16 2009/08/30 18:06:07 fkr Exp $
@newgroup _apache2:576
@newuser _apache2:576:576:daemon:Apache HTTP Server:/var/empty:/sbin/nologin
include/apache2/
@ -268,6 +268,7 @@ share/doc/apache2/howto/public_html.html
share/doc/apache2/howto/public_html.html.en
share/doc/apache2/howto/public_html.html.ja.utf8
share/doc/apache2/howto/public_html.html.ko.euc-kr
share/doc/apache2/howto/public_html.html.tr.utf8
share/doc/apache2/howto/ssi.html
share/doc/apache2/howto/ssi.html.en
share/doc/apache2/howto/ssi.html.ja.utf8
@ -348,6 +349,7 @@ share/doc/apache2/misc/password_encryptions.html.en
share/doc/apache2/misc/perf-tuning.html
share/doc/apache2/misc/perf-tuning.html.en
share/doc/apache2/misc/perf-tuning.html.ko.euc-kr
share/doc/apache2/misc/perf-tuning.html.tr.utf8
share/doc/apache2/misc/relevant_standards.html
share/doc/apache2/misc/relevant_standards.html.en
share/doc/apache2/misc/relevant_standards.html.ko.euc-kr
@ -739,6 +741,7 @@ share/doc/apache2/programs/apachectl.html.tr.utf8
share/doc/apache2/programs/apxs.html
share/doc/apache2/programs/apxs.html.en
share/doc/apache2/programs/apxs.html.ko.euc-kr
share/doc/apache2/programs/apxs.html.tr.utf8
share/doc/apache2/programs/configure.html
share/doc/apache2/programs/configure.html.en
share/doc/apache2/programs/configure.html.ko.euc-kr
@ -746,23 +749,29 @@ share/doc/apache2/programs/configure.html.tr.utf8
share/doc/apache2/programs/dbmmanage.html
share/doc/apache2/programs/dbmmanage.html.en
share/doc/apache2/programs/dbmmanage.html.ko.euc-kr
share/doc/apache2/programs/dbmmanage.html.tr.utf8
share/doc/apache2/programs/htcacheclean.html
share/doc/apache2/programs/htcacheclean.html.en
share/doc/apache2/programs/htcacheclean.html.ko.euc-kr
share/doc/apache2/programs/htcacheclean.html.tr.utf8
share/doc/apache2/programs/htdbm.html
share/doc/apache2/programs/htdbm.html.en
share/doc/apache2/programs/htdbm.html.tr.utf8
share/doc/apache2/programs/htdigest.html
share/doc/apache2/programs/htdigest.html.en
share/doc/apache2/programs/htdigest.html.ko.euc-kr
share/doc/apache2/programs/htdigest.html.tr.utf8
share/doc/apache2/programs/htpasswd.html
share/doc/apache2/programs/htpasswd.html.en
share/doc/apache2/programs/htpasswd.html.ko.euc-kr
share/doc/apache2/programs/htpasswd.html.tr.utf8
share/doc/apache2/programs/httpd.html
share/doc/apache2/programs/httpd.html.en
share/doc/apache2/programs/httpd.html.ko.euc-kr
share/doc/apache2/programs/httpd.html.tr.utf8
share/doc/apache2/programs/httxt2dbm.html
share/doc/apache2/programs/httxt2dbm.html.en
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
@ -772,15 +781,19 @@ share/doc/apache2/programs/index.html.tr.utf8
share/doc/apache2/programs/logresolve.html
share/doc/apache2/programs/logresolve.html.en
share/doc/apache2/programs/logresolve.html.ko.euc-kr
share/doc/apache2/programs/logresolve.html.tr.utf8
share/doc/apache2/programs/other.html
share/doc/apache2/programs/other.html.en
share/doc/apache2/programs/other.html.ko.euc-kr
share/doc/apache2/programs/other.html.tr.utf8
share/doc/apache2/programs/rotatelogs.html
share/doc/apache2/programs/rotatelogs.html.en
share/doc/apache2/programs/rotatelogs.html.ko.euc-kr
share/doc/apache2/programs/rotatelogs.html.tr.utf8
share/doc/apache2/programs/suexec.html
share/doc/apache2/programs/suexec.html.en
share/doc/apache2/programs/suexec.html.ko.euc-kr
share/doc/apache2/programs/suexec.html.tr.utf8
share/doc/apache2/rewrite/
share/doc/apache2/rewrite/index.html
share/doc/apache2/rewrite/index.html.en