From owner-freebsd-ports Fri Oct 4 15:34: 0 2002 Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 366F037B401 for ; Fri, 4 Oct 2002 15:33:53 -0700 (PDT) Received: from freebsd.org.ru (sweet.etrust.ru [194.84.67.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C5DF43E42 for ; Fri, 4 Oct 2002 15:33:52 -0700 (PDT) (envelope-from osa@freebsd.org.ru) Received: by freebsd.org.ru (Postfix, from userid 1000) id F0C702ED; Sat, 5 Oct 2002 02:33:50 +0400 (MSD) Date: Sat, 5 Oct 2002 02:33:50 +0400 From: "Sergey A. Osokin" To: Kris Kennaway Cc: ports@FreeBSD.org Subject: Re: patch for www/apache13* ports Message-ID: <20021004223350.GA98900@freebsd.org.ru> Reply-To: osa@FreeBSD.org.ru References: <20021004155750.GA90140@freebsd.org.ru> <20021004162851.GF24842@xor.obsecurity.org> <20021004215552.GA93076@freebsd.org.ru> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="/NkBOFFp2J2Af1nK" Content-Disposition: inline In-Reply-To: <20021004215552.GA93076@freebsd.org.ru> User-Agent: Mutt/1.4i Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org --/NkBOFFp2J2Af1nK Content-Type: multipart/mixed; boundary="qMm9M+Fa2AknHoGS" Content-Disposition: inline --qMm9M+Fa2AknHoGS Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Oct 05, 2002 at 01:55:52AM +0400, Sergey A. Osokin wrote: > On Fri, Oct 04, 2002 at 09:28:51AM -0700, Kris Kennaway wrote: > > On Fri, Oct 04, 2002 at 07:57:50PM +0400, Sergey A. Osokin wrote: > > > Hello, > > > Here is a first attempt for patch ports with apache. > > > Sorry, but i haven't time to test all configurations of ports. > > > Please notify me if something wrong. > >=20 > > Thanks, but could you please re-submit this in diff -u form? You also > > haven't addressed the pkg-plist changes that I know are needed for the > > new version. I need to commit this upgrade today, so please get back > > to me ASAP. >=20 > Ok, here is a second attempt (diff -u) for patch apaches ports. > IPv6/mod_ssl/-fp still not tested. > I think apache13 works well. Pardon me, but second attempt still incorrect for ipv6/mod_ssl/-fp ports. Here is a third (and maybe last) attempt. I mark apache13-ssl b0rken because at this moment=20 still no new (fixed) version avaliable. Just test a new patch. Comments are welcome. Thanks. --=20 Rgdz, /"\ ASCII RIBBON CAMPAIGN Sergey Osokin aka oZZ, \ / AGAINST HTML MAIL http://ozz.pp.ru/ X AND NEWS / \ --qMm9M+Fa2AknHoGS Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-apache13-ports Content-Transfer-Encoding: quoted-printable Index: ports/www/apache13/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/www/apache13/Makefile,v retrieving revision 1.122 diff -u -r1.122 Makefile --- ports/www/apache13/Makefile 2002/06/22 05:47:32 1.122 +++ ports/www/apache13/Makefile 2002/10/04 22:26:13 @@ -6,8 +6,8 @@ # =20 PORTNAME=3D apache -PORTVERSION=3D 1.3.26 -PORTREVISION=3D 3 +PORTVERSION=3D 1.3.27 +#PORTREVISION=3D 3 CATEGORIES=3D www MASTER_SITES=3D http://www.apache.org/dist/httpd/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \ Index: ports/www/apache13/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/www/apache13/distinfo,v retrieving revision 1.49 diff -u -r1.49 distinfo --- ports/www/apache13/distinfo 2002/06/19 02:01:59 1.49 +++ ports/www/apache13/distinfo 2002/10/04 22:26:13 @@ -1 +1 @@ -MD5 (apache_1.3.26.tar.gz) =3D 52e9b875597a208fca9d393e710087b6 +MD5 (apache_1.3.27.tar.gz) =3D 65b89365a65dcad71d4402b4862beeaa Index: ports/www/apache13/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/www/apache13/pkg-plist,v retrieving revision 1.46 diff -u -r1.46 pkg-plist --- ports/www/apache13/pkg-plist 2002/06/21 21:32:06 1.46 +++ ports/www/apache13/pkg-plist 2002/10/04 22:26:14 @@ -175,6 +175,7 @@ share/doc/apache/howto/cgi.html.ja.jis share/doc/apache/howto/footer.html share/doc/apache/howto/header.html +share/doc/apache/howto/htaccess.html share/doc/apache/howto/ssi.html.en share/doc/apache/howto/ssi.html.html share/doc/apache/howto/ssi.html.ja.jis @@ -259,11 +260,13 @@ share/doc/apache/mod/mod_actions.html.en share/doc/apache/mod/mod_actions.html.html share/doc/apache/mod/mod_actions.html.ja.jis -share/doc/apache/mod/mod_alias.html +share/doc/apache/mod/mod_alias.html.en +share/doc/apache/mod/mod_alias.html.ja.jis share/doc/apache/mod/mod_asis.html.en share/doc/apache/mod/mod_asis.html.html share/doc/apache/mod/mod_asis.html.ja.jis -share/doc/apache/mod/mod_auth.html +share/doc/apache/mod/mod_auth.html.en +share/doc/apache/mod/mod_auth.html.ja.jis share/doc/apache/mod/mod_auth_anon.html share/doc/apache/mod/mod_auth_db.html share/doc/apache/mod/mod_auth_dbm.html Index: ports/www/apache13+ipv6/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/www/apache13+ipv6/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- ports/www/apache13+ipv6/Makefile 2002/06/28 09:51:31 1.30 +++ ports/www/apache13+ipv6/Makefile 2002/10/04 22:26:16 @@ -6,8 +6,8 @@ # =20 PORTNAME=3D apache+ipv6 -PORTVERSION=3D 1.3.26 -PORTREVISION=3D 1 +PORTVERSION=3D 1.3.27 +#PORTREVISION=3D 1 CATEGORIES=3D www ipv6 MASTER_SITES=3D http://www.apache.org/dist/httpd/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \ @@ -27,7 +27,7 @@ DISTNAME=3D apache_${PORTVERSION} =20 PATCH_SITES=3D http://motoyuki.bsdclub.org/data/IPv6/ -PATCHFILES=3D apache-1.3.26-v6-20020620.diff.gz +PATCHFILES=3D apache-1.3.27-v6-20021004.diff.gz =20 MAINTAINER=3D sumikawa@FreeBSD.org =20 Index: ports/www/apache13+ipv6/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/www/apache13+ipv6/distinfo,v retrieving revision 1.15 diff -u -r1.15 distinfo --- ports/www/apache13+ipv6/distinfo 2002/06/21 12:06:04 1.15 +++ ports/www/apache13+ipv6/distinfo 2002/10/04 22:26:16 @@ -1,2 +1,2 @@ -MD5 (apache_1.3.26.tar.gz) =3D 52e9b875597a208fca9d393e710087b6 -MD5 (apache-1.3.26-v6-20020620.diff.gz) =3D e4f268a0a58d24827552faefd73d18= 59 +MD5 (apache_1.3.27.tar.gz) =3D 65b89365a65dcad71d4402b4862beeaa +MD5 (apache-1.3.27-v6-20021004.diff.gz) =3D 72753dcc35ee2ba29e1ee1e376c009= 07 Index: ports/www/apache13+ipv6/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/www/apache13+ipv6/pkg-plist,v retrieving revision 1.15 diff -u -r1.15 pkg-plist --- ports/www/apache13+ipv6/pkg-plist 2002/06/28 09:51:31 1.15 +++ ports/www/apache13+ipv6/pkg-plist 2002/10/04 22:26:17 @@ -261,11 +261,13 @@ share/doc/apache/mod/mod_actions.html.en share/doc/apache/mod/mod_actions.html.html share/doc/apache/mod/mod_actions.html.ja.jis -share/doc/apache/mod/mod_alias.html +share/doc/apache/mod/mod_alias.html.en +share/doc/apache/mod/mod_alias.html.ja.jis share/doc/apache/mod/mod_asis.html.en share/doc/apache/mod/mod_asis.html.html share/doc/apache/mod/mod_asis.html.ja.jis -share/doc/apache/mod/mod_auth.html +share/doc/apache/mod/mod_auth.html.en +share/doc/apache/mod/mod_auth.html.ja.jis share/doc/apache/mod/mod_auth_anon.html share/doc/apache/mod/mod_auth_db.html share/doc/apache/mod/mod_auth_dbm.html Index: ports/www/apache13-fp/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/www/apache13-fp/Makefile,v retrieving revision 1.36 diff -u -r1.36 Makefile --- ports/www/apache13-fp/Makefile 2002/09/17 07:41:02 1.36 +++ ports/www/apache13-fp/Makefile 2002/10/04 22:26:20 @@ -7,8 +7,8 @@ =20 PORTNAME=3D apache PKGNAMESUFFIX=3D _fp -PORTVERSION=3D 1.3.26 -PORTREVISION=3D 3 +PORTVERSION=3D 1.3.27 +#PORTREVISION=3D 3 CATEGORIES=3D www MASTER_SITES=3D http://www.apache.org/dist/httpd/ \ http://www.freebsd.org/gifs/ \ Index: ports/www/apache13-modssl/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/www/apache13-modssl/Makefile,v retrieving revision 1.108 diff -u -r1.108 Makefile --- ports/www/apache13-modssl/Makefile 2002/09/29 08:07:47 1.108 +++ ports/www/apache13-modssl/Makefile 2002/10/04 22:26:23 @@ -48,8 +48,8 @@ =20 .include =20 -VERSION_APACHE=3D 1.3.26 -VERSION_MODSSL=3D 2.8.10 +VERSION_APACHE=3D 1.3.27 +VERSION_MODSSL=3D 2.8.11 =20 DATADIR=3D ${PREFIX}/www DOCUMENT_ROOT=3D ${DATADIR}/data Index: ports/www/apache13-modssl/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/www/apache13-modssl/distinfo,v retrieving revision 1.66 diff -u -r1.66 distinfo --- ports/www/apache13-modssl/distinfo 2002/06/26 17:17:32 1.66 +++ ports/www/apache13-modssl/distinfo 2002/10/04 22:26:23 @@ -1,2 +1,2 @@ -MD5 (apache_1.3.26.tar.gz) =3D 52e9b875597a208fca9d393e710087b6 -MD5 (mod_ssl-2.8.10-1.3.26.tar.gz) =3D 11260700ab52fb7ff54a25f14052eed4 +MD5 (apache_1.3.27.tar.gz) =3D 65b89365a65dcad71d4402b4862beeaa +MD5 (mod_ssl-2.8.11-1.3.27.tar.gz) =3D f84bd971aa8db28f31ad6bab2e7acc2c Index: ports/www/apache13-modssl/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/www/apache13-modssl/pkg-plist,v retrieving revision 1.31 diff -u -r1.31 pkg-plist --- ports/www/apache13-modssl/pkg-plist 2002/07/12 00:21:12 1.31 +++ ports/www/apache13-modssl/pkg-plist 2002/10/04 22:26:24 @@ -273,11 +273,13 @@ share/doc/apache/mod/mod_actions.html.en share/doc/apache/mod/mod_actions.html.html share/doc/apache/mod/mod_actions.html.ja.jis -share/doc/apache/mod/mod_alias.html +share/doc/apache/mod/mod_alias.html.en +share/doc/apache/mod/mod_alias.html.ja.jis share/doc/apache/mod/mod_asis.html.en share/doc/apache/mod/mod_asis.html.html share/doc/apache/mod/mod_asis.html.ja.jis -share/doc/apache/mod/mod_auth.html +share/doc/apache/mod/mod_auth.html.en +share/doc/apache/mod/mod_auth.html.ja.jis share/doc/apache/mod/mod_auth_anon.html share/doc/apache/mod/mod_auth_db.html share/doc/apache/mod/mod_auth_dbm.html Index: ports/www/apache13-ssl/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/www/apache13-ssl/Makefile,v retrieving revision 1.79 diff -u -r1.79 Makefile --- ports/www/apache13-ssl/Makefile 2002/09/15 12:34:16 1.79 +++ ports/www/apache13-ssl/Makefile 2002/10/04 22:26:26 @@ -9,7 +9,7 @@ =20 PORTNAME=3D apache+ssl PORTVERSION=3D ${APACHE_VERSION}.${APACHE_SSL_VERSION} -PORTREVISION=3D 1 +#PORTREVISION=3D 1 CATEGORIES=3D www security MASTER_SITES=3D http://www.apache.org/dist/httpd/ \ ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \ @@ -40,7 +40,9 @@ =20 MAINTAINER=3D ports@freebsd.org =20 -APACHE_VERSION=3D 1.3.26 +BROKEN=3D Still no new version + +APACHE_VERSION=3D 1.3.27 APACHE_SSL_VERSION=3D 1.48 =20 USE_OPENSSL=3D YES Index: ports/www/apache13-ssl/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/www/apache13-ssl/distinfo,v retrieving revision 1.12 diff -u -r1.12 distinfo --- ports/www/apache13-ssl/distinfo 2002/09/15 12:34:16 1.12 +++ ports/www/apache13-ssl/distinfo 2002/10/04 22:26:26 @@ -1,2 +1,2 @@ -MD5 (apache_1.3.26.tar.gz) =3D 52e9b875597a208fca9d393e710087b6 -MD5 (apache_1.3.26+ssl_1.48.tar.gz) =3D c0b9574b15dd4668cfc4f27b009ae1dd +MD5 (apache_1.3.27.tar.gz) =3D 65b89365a65dcad71d4402b4862beeaa +MD5 (apache_1.3.27+ssl_1.48.tar.gz) =3D c0b9574b15dd4668cfc4f27b009ae1dd --qMm9M+Fa2AknHoGS-- --/NkBOFFp2J2Af1nK Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.7 (FreeBSD) iQCVAwUBPZ4XTo/Va73vhFLNAQFuvQP+J+uSVLJwgpfIkJUlkwzk00MM3qQV05EA wVsDjhstOwjkW6p+UkEn3ncm+lwg0rvTGbAToj1DEsVTDYNlbcda69lJxwTf48OD rAex6wZ2p8Q3TrXTbzncnBcRG1Cri9lhCZF99th8oxM1iwaQx+Bm7YOD19o+sf7B MZLzm1pFNCw= =QRQk -----END PGP SIGNATURE----- --/NkBOFFp2J2Af1nK-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message