[101024] trunk/dports/www/apache2

[ryandesign at macports.org]

Revision: 101024
          https://trac.macports.org/changeset/101024
Author:   ryandesign at macports.org
Date:     2013-01-03 00:21:22 -0800 (Thu, 03 Jan 2013)
Log Message:
-----------
apache2: update to 2.2.23

Modified Paths:
--------------
    trunk/dports/www/apache2/Portfile
    trunk/dports/www/apache2/files/libtool-tag.diff
    trunk/dports/www/apache2/files/patch-httpd.conf.in-sensitive-files.diff

Removed Paths:
-------------
    trunk/dports/www/apache2/files/patch-server-util_pcre.c.diff

Modified: trunk/dports/www/apache2/Portfile
===================================================================
--- trunk/dports/www/apache2/Portfile	2013-01-03 08:01:20 UTC (rev 101023)
+++ trunk/dports/www/apache2/Portfile	2013-01-03 08:21:22 UTC (rev 101024)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                apache2
-version             2.2.22
-revision            2
+version             2.2.23
 categories          www
 maintainers         ryandesign openmaintainer
 license             Apache-2
@@ -24,8 +23,8 @@
 use_bzip2           yes
 use_parallel_build  yes
 
-checksums           rmd160  237a26a7759e7e1af175900d598e25fb082a4eb9 \
-                    sha256  dcdc9f1dc722f84798caf69d69dca78daa5e09a4269060045aeca7e4f44cb231
+checksums           rmd160  16b15876d8296a2733d4d28a8a78362d0677792d \
+                    sha256  14fe79bd6edd957c02cb41f4175e132c08e6ff74a7d08dc1858dd8224e351c34
 
 depends_lib         port:apr \
                     port:apr-util \
@@ -38,7 +37,6 @@
 conflicts           apache
 
 patchfiles          patch-docs-cgi-examples-printenv.diff \
-                    patch-server-util_pcre.c.diff \
                     libtool-tag.diff
 
 post-patch {

Modified: trunk/dports/www/apache2/files/libtool-tag.diff
===================================================================
--- trunk/dports/www/apache2/files/libtool-tag.diff	2013-01-03 08:01:20 UTC (rev 101023)
+++ trunk/dports/www/apache2/files/libtool-tag.diff	2013-01-03 08:21:22 UTC (rev 101024)
@@ -35,9 +35,9 @@
  
  #
  # Dependencies
---- srclib/apr/configure.orig	2011-09-09 09:29:37.000000000 -0500
-+++ srclib/apr/configure	2011-10-20 23:38:32.000000000 -0500
-@@ -24312,7 +24312,7 @@
+--- srclib/apr/configure.orig	2012-08-21 13:39:18.000000000 -0500
++++ srclib/apr/configure	2013-01-03 02:10:50.000000000 -0600
+@@ -24342,7 +24342,7 @@
  
  
  if test "x$use_libtool" = "xyes"; then

Modified: trunk/dports/www/apache2/files/patch-httpd.conf.in-sensitive-files.diff
===================================================================
--- trunk/dports/www/apache2/files/patch-httpd.conf.in-sensitive-files.diff	2013-01-03 08:01:20 UTC (rev 101023)
+++ trunk/dports/www/apache2/files/patch-httpd.conf.in-sensitive-files.diff	2013-01-03 08:21:22 UTC (rev 101024)
@@ -1,6 +1,6 @@
---- docs/conf/httpd.conf.in	2007-12-21 05:43:00.000000000 -0600
-+++ docs/conf/httpd.conf.in	2008-02-06 14:10:15.000000000 -0600
-@@ -168,14 +168,24 @@
+--- docs/conf/httpd.conf.in.orig	2012-02-06 10:54:24.000000000 -0600
++++ docs/conf/httpd.conf.in	2013-01-03 02:10:50.000000000 -0600
+@@ -169,14 +169,24 @@
  </IfModule>
  
  #

Deleted: trunk/dports/www/apache2/files/patch-server-util_pcre.c.diff
===================================================================
--- trunk/dports/www/apache2/files/patch-server-util_pcre.c.diff	2013-01-03 08:01:20 UTC (rev 101023)
+++ trunk/dports/www/apache2/files/patch-server-util_pcre.c.diff	2013-01-03 08:21:22 UTC (rev 101024)
@@ -1,22 +0,0 @@
-https://issues.apache.org/bugzilla/show_bug.cgi?id=52623
---- server/util_pcre.c.orig	2005-11-10 09:20:05.000000000 -0600
-+++ server/util_pcre.c	2012-05-08 20:23:28.000000000 -0500
-@@ -128,6 +128,7 @@
- const char *errorptr;
- int erroffset;
- int options = 0;
-+int nsub;
- 
- if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS;
- if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
-@@ -137,7 +138,9 @@
- 
- if (preg->re_pcre == NULL) return AP_REG_INVARG;
- 
--preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
-+pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
-+               PCRE_INFO_CAPTURECOUNT, &nsub);
-+preg->re_nsub = nsub;
- return 0;
- }
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130103/4666a6e6/attachment.html>