[Ipcop-svn] SF.net SVN: ipcop:[6812] ipcop/trunk

owes Wed, 31 Oct 2012 00:44:01 -0700

Revision: 6812
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6812&view=rev
Author:   owes
Date:     2012-10-31 07:43:46 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
Upgrade apache to 2.2.23, includes pcre patch.


Modified Paths:
--------------
    ipcop/trunk/lfs/apache
    ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
    ipcop/trunk/updates/2.1.0/information.xml

Removed Paths:
-------------
    ipcop/trunk/src/patches/httpd_pcre830.patch

Modified: ipcop/trunk/lfs/apache
===================================================================
--- ipcop/trunk/lfs/apache      2012-10-30 21:29:30 UTC (rev 6811)
+++ ipcop/trunk/lfs/apache      2012-10-31 07:43:46 UTC (rev 6812)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = apache
-VER        = 2.2.22
+VER        = 2.2.23
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -46,7 +46,7 @@
 
 # Used to include same timestamp for all
 # This is httpd tar file date
-TIMESTAMP = "30-01-2012 23:06"
+TIMESTAMP = "11-09-2012 16:08"
 
 ###############################################################################
 # Top-level Rules
@@ -56,7 +56,7 @@
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9fe3093194c8a57f085ff7c3fc43715f
+$(DL_FILE)_MD5 = ca133de0e4b4b15316990a97186b9993
 
 install : $(TARGET)
 
@@ -87,8 +87,6 @@
 
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       # Fix with pcre-8.30, from upstream, see 
https://issues.apache.org/bugzilla/show_bug.cgi?id=52623
-       cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/httpd_pcre830.patch
 
        # Use our own TIMESTAMP instead of __DATE__ and __TIME__ so everyone 
that compile has same md5
        cd $(DIR_APP) && sed -i -e 's|server_built\[\] =.*|server_built[] = 
$(TIMESTAMP);|' server/buildmark.c

Deleted: ipcop/trunk/src/patches/httpd_pcre830.patch
===================================================================
--- ipcop/trunk/src/patches/httpd_pcre830.patch 2012-10-30 21:29:30 UTC (rev 
6811)
+++ ipcop/trunk/src/patches/httpd_pcre830.patch 2012-10-31 07:43:46 UTC (rev 
6812)
@@ -1,23 +0,0 @@
-http://svn.apache.org/viewvc?view=revision&revision=r1243176
-
---- httpd-2.2.22/server/util_pcre.c.pcre830
-+++ httpd-2.2.22/server/util_pcre.c
-@@ -128,6 +128,7 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t *p
- 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 @@ preg->re_erroffset = erroffset;
- 
- 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;
- }
- 

Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0      2012-10-30 21:29:30 UTC 
(rev 6811)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0      2012-10-31 07:43:46 UTC 
(rev 6812)
@@ -78,7 +78,7 @@
 ## acpid-2.0.16
 /usr/sbin/acpid
 ##
-# apache httpd-2.2.22 patched for pcre-8.30
+# apache httpd-2.2.23
 /usr/sbin/htpasswd
 /usr/sbin/httpd
 ##

Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml   2012-10-30 21:29:30 UTC (rev 
6811)
+++ ipcop/trunk/updates/2.1.0/information.xml   2012-10-31 07:43:46 UTC (rev 
6812)
@@ -3,7 +3,7 @@
         <version>2.1.0</version>
         <releasedate>2012-11-dd</releasedate>
         <size>0</size>
-        <description>httpd, iputils, gettext, setserial, pcmciautils, ppp, 
openvpn radiusplugin patched&lt;br /&gt;
+        <description>iputils, gettext, setserial, pcmciautils, ppp, openvpn 
radiusplugin patched&lt;br /&gt;
             cairo recompiled with -O3, isdn4k-utils with -Os 
-fno-strict-aliasing&lt;br /&gt;
             Add URL filter, xz-5.0.4&lt;br /&gt;
             Language updates.&lt;br /&gt;
@@ -11,7 +11,7 @@
             conntrack-tools to 1.2.2, coreutils to 8.19, dhcpcd to 5.5.6, 
dnsmasq to 2.63,
             e2fsprogs to 1.42.5, ethtool to 3.2, expat to 2.1.0, freetype to 
2.4.10, fontconfig to 2.9, gawk to 4.0.1, glib to 2.30.3,
             gmp to 5.0.5, gnupg to 1.4.12, grep to 2.14, gzip to 1.5,
-            iproute2 to 3.5.1, iptables to 1.4.15, iptstate to 2.2.5, iw to 
3.6 hdparm to 9.39, krb5 to 1.10.3,
+            iproute2 to 3.5.1, iptables to 1.4.15, iptstate to 2.2.5, iw to 
3.6, hdparm to 9.39, httpd to 2.2.23, krb5 to 1.10.3,
             libffi to 3.0.11, libgd to 2.0.36~rc1, libgcrypt to 1.5.0, libnet 
to 1.1.6,
             libnetfiltercontrack to 1.0.1, libnl to 3.2.11, libpcap to 1.3.0, 
libpng to 1.5.12,
             libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2 
to 2.8.0, logrotate to 3.8.1, lsof to 4.86,

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

[Ipcop-svn] SF.net SVN: ipcop:[6812] ipcop/trunk

Reply via email to