[pkgsrc/trunk]: pkgsrc Update www/apache22 to 2.2.4:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Update www/apache22 to 2.2.4:
From: xtraeme <xtraeme%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 04:28:37 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/b2d90a56ebe6
branches:  trunk
changeset: 524237:b2d90a56ebe6
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sun Jan 21 17:11:53 2007 +0000

description:
Update www/apache22 to 2.2.4:

* Bugfixes, please see http://www.apache.org/dist/httpd/CHANGES_2.2

pkgsrc changes:

* Do not use the included pcre source in apache22.
* devel/apr1 now uses the apache22 version (increased to 1.2.8.2.2.4) to
  sync the source with the httpd distfile.
* Remove patches in devel/apr1 which were applied upstream.

diffstat:

 devel/apr1/Makefile          |   6 +-----
 devel/apr1/distinfo          |  10 ++++------
 devel/apr1/patches/patch-aa  |  22 ----------------------
 devel/apr1/patches/patch-ab  |  22 ----------------------
 www/apache22/Makefile        |   6 ++++--
 www/apache22/Makefile.common |   6 +++---
 www/apache22/distinfo        |   8 ++++----
 7 files changed, 16 insertions(+), 64 deletions(-)

diffs (155 lines):

diff -r 9c014bd206fd -r b2d90a56ebe6 devel/apr1/Makefile
--- a/devel/apr1/Makefile       Sun Jan 21 17:05:55 2007 +0000
+++ b/devel/apr1/Makefile       Sun Jan 21 17:11:53 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/12/09 00:52:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2007/01/21 17:11:53 xtraeme Exp $
 
 .include "../../www/apache22/Makefile.common"
 
@@ -11,10 +11,6 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-# Don't bump this when apache upgrades; it is only apache2-2.0.45 and
-# under that includes its own apr.  apr was split out in 2.0.45nb1.
-CONFLICTS=             apache2<=2.0.45
-
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/srclib
diff -r 9c014bd206fd -r b2d90a56ebe6 devel/apr1/distinfo
--- a/devel/apr1/distinfo       Sun Jan 21 17:05:55 2007 +0000
+++ b/devel/apr1/distinfo       Sun Jan 21 17:11:53 2007 +0000
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2007/01/21 17:11:53 xtraeme Exp $
 
-SHA1 (httpd-2.2.3.tar.bz2) = 30d445302e63326d81705687ee734fdfb692dcde
-RMD160 (httpd-2.2.3.tar.bz2) = 291e093f48d980daba482140581a525ecbfae4d2
-Size (httpd-2.2.3.tar.bz2) = 4905728 bytes
-SHA1 (patch-aa) = c84bdb6bcb14bf6bc7ea0d8f13334dd8c3ef2ef9
-SHA1 (patch-ab) = 6627fd125840f3f348b31dd79f69e0eea9cf918f
+SHA1 (httpd-2.2.4.tar.bz2) = 64ceae373434a986dc99b8ed953afa0d4fad85ce
+RMD160 (httpd-2.2.4.tar.bz2) = bb6e8a7447fa8e8f629010f30b548068de518523
+Size (httpd-2.2.4.tar.bz2) = 4930375 bytes
 SHA1 (patch-an) = 76d9ac0cdddec7c0f41535baee63bf0aa26ed596
 SHA1 (patch-ao) = e35630af53a78fce9aa5347a81cb1bcf8fb3058e
 SHA1 (patch-ap) = cefbc6da94d1038be97128689ca413be3e1fd33c
diff -r 9c014bd206fd -r b2d90a56ebe6 devel/apr1/patches/patch-aa
--- a/devel/apr1/patches/patch-aa       Sun Jan 21 17:05:55 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
-
---- apr/threadproc/unix/signals.c.orig 2005-02-04 15:36:31.000000000 -0500
-+++ apr/threadproc/unix/signals.c
-@@ -49,7 +49,7 @@ APR_DECLARE(apr_status_t) apr_proc_kill(
- 
- #if APR_HAVE_SIGACTION
- 
--#ifdef DARWIN
-+#if defined(__NetBSD__) || defined(DARWIN)
- static void avoid_zombies(int signo)
- {
-     int exit_status;
-@@ -85,7 +85,7 @@ APR_DECLARE(apr_sigfunc_t *) apr_signal(
-         act.sa_flags |= SA_NOCLDWAIT;
-     }
- #endif
--#ifdef DARWIN
-+#if defined(__NetBSD__) || defined(DARWIN)
-     /* ignoring SIGCHLD or leaving the default disposition doesn't avoid zombies,
-      * and there is no SA_NOCLDWAIT flag, so catch the signal and reap status in 
-      * the handler to avoid zombies
diff -r 9c014bd206fd -r b2d90a56ebe6 devel/apr1/patches/patch-ab
--- a/devel/apr1/patches/patch-ab       Sun Jan 21 17:05:55 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
-
---- apr-util/configure.orig    2006-12-08 18:05:10.000000000 +0100
-+++ apr-util/configure 2006-12-08 18:05:58.000000000 +0100
-@@ -31501,7 +31501,7 @@
- fi
- 
- 
--      if test "$apu_have_pgsql" == "0"; then
-+      if test "$apu_have_pgsql" = "0"; then
-         if test "${ac_cv_header_postgresql_libpq_fe_h+set}" = set; then
-   echo "$as_me:$LINENO: checking for postgresql/libpq-fe.h" >&5
- echo $ECHO_N "checking for postgresql/libpq-fe.h... $ECHO_C" >&6
-@@ -32732,7 +32732,7 @@
- fi
- 
- 
--      if test "$apu_have_mysql" == "0"; then
-+      if test "$apu_have_mysql" = "0"; then
-         if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
-   echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5
- echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6
diff -r 9c014bd206fd -r b2d90a56ebe6 www/apache22/Makefile
--- a/www/apache22/Makefile     Sun Jan 21 17:05:55 2007 +0000
+++ b/www/apache22/Makefile     Sun Jan 21 17:11:53 2007 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/01/04 13:42:39 abs Exp $
+# $NetBSD: Makefile,v 1.5 2007/01/21 17:11:53 xtraeme Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       apache-${APACHE_VERSION}
-PKGREVISION=   1
+#PKGREVISION=  1
 CATEGORIES=    www
 
 HOMEPAGE=      http://httpd.apache.org/
@@ -20,6 +20,7 @@
 CONFIGURE_ARGS+=       --enable-layout=NetBSD
 CONFIGURE_ARGS+=       --with-port=80
 CONFIGURE_ARGS+=       --enable-so
+CONFIGURE_ARGS+=       --with-pcre=${BUILDLINK_PREFIX.pcre}
 CONFIGURE_ENV+=                perlbin=${PERL5:Q}
 
 # Apache Portable Runtime library configure options
@@ -38,6 +39,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../devel/apr1/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 
diff -r 9c014bd206fd -r b2d90a56ebe6 www/apache22/Makefile.common
--- a/www/apache22/Makefile.common      Sun Jan 21 17:05:55 2007 +0000
+++ b/www/apache22/Makefile.common      Sun Jan 21 17:11:53 2007 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.2 2006/12/09 00:47:34 tron Exp $
+# $NetBSD: Makefile.common,v 1.3 2007/01/21 17:11:53 xtraeme Exp $
 
 DISTNAME=              httpd-${APACHE_VERSION}
 EXTRACT_SUFX=          .tar.bz2
 # When updating this version be sure to update the checksum and remove
 # any PKGREVISION for devel/apr also.
-APACHE_VERSION=                2.2.3
-APR_VERSION=           1.2.8
+APACHE_VERSION=                2.2.4
+APR_VERSION=           1.2.8.${APACHE_VERSION}
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/} \
                        ${MASTER_SITE_APACHE:=httpd/old/} \
                        http://www.NetBSD.org/images/logos/
diff -r 9c014bd206fd -r b2d90a56ebe6 www/apache22/distinfo
--- a/www/apache22/distinfo     Sun Jan 21 17:05:55 2007 +0000
+++ b/www/apache22/distinfo     Sun Jan 21 17:11:53 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2007/01/21 17:11:53 xtraeme Exp $
 
-SHA1 (httpd-2.2.3.tar.bz2) = 30d445302e63326d81705687ee734fdfb692dcde
-RMD160 (httpd-2.2.3.tar.bz2) = 291e093f48d980daba482140581a525ecbfae4d2
-Size (httpd-2.2.3.tar.bz2) = 4905728 bytes
+SHA1 (httpd-2.2.4.tar.bz2) = 64ceae373434a986dc99b8ed953afa0d4fad85ce
+RMD160 (httpd-2.2.4.tar.bz2) = bb6e8a7447fa8e8f629010f30b548068de518523
+Size (httpd-2.2.4.tar.bz2) = 4930375 bytes
 SHA1 (patch-aa) = 233dbabda2bd830c6f0664c42e192e4acd2aff4c
 SHA1 (patch-ab) = 387892276efd49fd081a187c1123de26fb6486ba
 SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note pygtk PKGREVISION bump.
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/php Update PHP53_VERSION to 5.3.27.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note pygtk PKGREVISION bump.
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/php Update PHP53_VERSION to 5.3.27.
Indexes:
Home | Main Index | Thread Index | Old Index