OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 14-Oct-2005 08:15:33 Branch: OPENPKG_2_5_SOLID Handle: 2005101407153300 Modified files: (Branch: OPENPKG_2_5_SOLID) openpkg-src/apache2 apache2.patch apache2.spec Log: MFC: latest version (including security fix) Summary: Revision Changes Path 1.7.2.1 +0 -12 openpkg-src/apache2/apache2.patch 1.65.2.2 +2 -3 openpkg-src/apache2/apache2.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/apache2/apache2.patch ============================================================================ $ cvs diff -u -r1.7 -r1.7.2.1 apache2.patch --- openpkg-src/apache2/apache2.patch 28 Jul 2005 20:29:24 -0000 1.7 +++ openpkg-src/apache2/apache2.patch 14 Oct 2005 06:15:33 -0000 1.7.2.1 @@ -11,15 +11,3 @@ done; \ sort -u $$tmp > $@; \ rm -f $$tmp -Index: modules/ssl/ssl_engine_kernel.c ---- modules/ssl/ssl_engine_kernel.c.orig 2005-03-29 10:44:31 +0200 -+++ modules/ssl/ssl_engine_kernel.c 2005-07-28 22:25:38 +0200 -@@ -1398,7 +1398,7 @@ - BIO_printf(bio, ", nextUpdate: "); - ASN1_UTCTIME_print(bio, X509_CRL_get_nextUpdate(crl)); - -- n = BIO_read(bio, buff, sizeof(buff)); -+ n = BIO_read(bio, buff, sizeof(buff) - 1); - buff[n] = '\0'; - - BIO_free(bio); @@ . patch -p0 <<'@@ .' Index: openpkg-src/apache2/apache2.spec ============================================================================ $ cvs diff -u -r1.65.2.1 -r1.65.2.2 apache2.spec --- openpkg-src/apache2/apache2.spec 11 Oct 2005 12:49:19 -0000 1.65.2.1 +++ openpkg-src/apache2/apache2.spec 14 Oct 2005 06:15:33 -0000 1.65.2.2 @@ -25,7 +25,7 @@ # FIXME: with_mod_perl broken # package version -%define V_apache 2.0.54 +%define V_apache 2.0.55 %define V_mod_perl 2.0.1 # package information @@ -61,7 +61,6 @@ Source1: http://perl.apache.org/dist/mod_perl-%{V_mod_perl}.tar.gz Source2: rc.apache2 Patch0: apache2.patch -Patch1: http://people.apache.org/~jorton/ap_byterange.diff # build information Prefix: %{l_prefix} @@ -120,7 +119,7 @@ %prep %setup -q -c - %patch -p0 -d httpd-%{V_apache} -P 0 1 + %patch -p0 -d httpd-%{V_apache} %if "%{with_mod_perl}" == "yes" %setup -q -T -D -a 1 %endif @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org