Revision: 6507
http://ipcop.svn.sourceforge.net/ipcop/?rev=6507&view=rev
Author: gespinasse
Date: 2012-03-23 21:32:25 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
Upgrade pcre from 8.11 to 8.30
httpd need a small patch to build from upstream
Remove /usr/lib/libpcre.so on installed machine
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/pcre
ipcop/trunk/lfs/apache
ipcop/trunk/lfs/pcre
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
ipcop/trunk/updates/2.1.0/setup
Added Paths:
-----------
ipcop/trunk/src/patches/httpd_pcre830.patch
Modified: ipcop/trunk/config/rootfiles/common/pcre
===================================================================
--- ipcop/trunk/config/rootfiles/common/pcre 2012-03-23 18:35:40 UTC (rev
6506)
+++ ipcop/trunk/config/rootfiles/common/pcre 2012-03-23 21:32:25 UTC (rev
6507)
@@ -1,5 +1,3 @@
-## pcre-8.00
-##
#usr/bin/pcre-config
#usr/bin/pcregrep
#usr/bin/pcretest
@@ -10,9 +8,9 @@
#usr/include/pcrecpparg.h
#usr/include/pcreposix.h
#usr/lib/libpcre.la
-usr/lib/libpcre.so
-usr/lib/libpcre.so.0
-usr/lib/libpcre.so.0.0.1
+#usr/lib/libpcre.so
+usr/lib/libpcre.so.1
+usr/lib/libpcre.so.1.0.0
#usr/lib/libpcrecpp.la
#usr/lib/libpcrecpp.so
#usr/lib/libpcrecpp.so.0
@@ -35,6 +33,8 @@
#usr/share/doc/pcre/html/index.html
#usr/share/doc/pcre/html/pcre-config.html
#usr/share/doc/pcre/html/pcre.html
+#usr/share/doc/pcre/html/pcre16.html
+#usr/share/doc/pcre/html/pcre_assign_jit_stack.html
#usr/share/doc/pcre/html/pcre_compile.html
#usr/share/doc/pcre/html/pcre_compile2.html
#usr/share/doc/pcre/html/pcre_config.html
@@ -42,6 +42,7 @@
#usr/share/doc/pcre/html/pcre_copy_substring.html
#usr/share/doc/pcre/html/pcre_dfa_exec.html
#usr/share/doc/pcre/html/pcre_exec.html
+#usr/share/doc/pcre/html/pcre_free_study.html
#usr/share/doc/pcre/html/pcre_free_substring.html
#usr/share/doc/pcre/html/pcre_free_substring_list.html
#usr/share/doc/pcre/html/pcre_fullinfo.html
@@ -50,10 +51,13 @@
#usr/share/doc/pcre/html/pcre_get_stringtable_entries.html
#usr/share/doc/pcre/html/pcre_get_substring.html
#usr/share/doc/pcre/html/pcre_get_substring_list.html
-#usr/share/doc/pcre/html/pcre_info.html
+#usr/share/doc/pcre/html/pcre_jit_stack_alloc.html
+#usr/share/doc/pcre/html/pcre_jit_stack_free.html
#usr/share/doc/pcre/html/pcre_maketables.html
+#usr/share/doc/pcre/html/pcre_pattern_to_host_byte_order.html
#usr/share/doc/pcre/html/pcre_refcount.html
#usr/share/doc/pcre/html/pcre_study.html
+#usr/share/doc/pcre/html/pcre_utf16_to_host_byte_order.html
#usr/share/doc/pcre/html/pcre_version.html
#usr/share/doc/pcre/html/pcreapi.html
#usr/share/doc/pcre/html/pcrebuild.html
@@ -62,6 +66,8 @@
#usr/share/doc/pcre/html/pcrecpp.html
#usr/share/doc/pcre/html/pcredemo.html
#usr/share/doc/pcre/html/pcregrep.html
+#usr/share/doc/pcre/html/pcrejit.html
+#usr/share/doc/pcre/html/pcrelimits.html
#usr/share/doc/pcre/html/pcrematching.html
#usr/share/doc/pcre/html/pcrepartial.html
#usr/share/doc/pcre/html/pcrepattern.html
@@ -72,6 +78,7 @@
#usr/share/doc/pcre/html/pcrestack.html
#usr/share/doc/pcre/html/pcresyntax.html
#usr/share/doc/pcre/html/pcretest.html
+#usr/share/doc/pcre/html/pcreunicode.html
#usr/share/doc/pcre/pcre-config.txt
#usr/share/doc/pcre/pcre.txt
#usr/share/doc/pcre/pcregrep.txt
@@ -80,6 +87,33 @@
#usr/share/man/man1/pcregrep.1
#usr/share/man/man1/pcretest.1
#usr/share/man/man3/pcre.3
+#usr/share/man/man3/pcre16.3
+#usr/share/man/man3/pcre16_assign_jit_stack.3
+#usr/share/man/man3/pcre16_compile.3
+#usr/share/man/man3/pcre16_compile2.3
+#usr/share/man/man3/pcre16_config.3
+#usr/share/man/man3/pcre16_copy_named_substring.3
+#usr/share/man/man3/pcre16_copy_substring.3
+#usr/share/man/man3/pcre16_dfa_exec.3
+#usr/share/man/man3/pcre16_exec.3
+#usr/share/man/man3/pcre16_free_study.3
+#usr/share/man/man3/pcre16_free_substring.3
+#usr/share/man/man3/pcre16_free_substring_list.3
+#usr/share/man/man3/pcre16_fullinfo.3
+#usr/share/man/man3/pcre16_get_named_substring.3
+#usr/share/man/man3/pcre16_get_stringnumber.3
+#usr/share/man/man3/pcre16_get_stringtable_entries.3
+#usr/share/man/man3/pcre16_get_substring.3
+#usr/share/man/man3/pcre16_get_substring_list.3
+#usr/share/man/man3/pcre16_jit_stack_alloc.3
+#usr/share/man/man3/pcre16_jit_stack_free.3
+#usr/share/man/man3/pcre16_maketables.3
+#usr/share/man/man3/pcre16_pattern_to_host_byte_order.3
+#usr/share/man/man3/pcre16_refcount.3
+#usr/share/man/man3/pcre16_study.3
+#usr/share/man/man3/pcre16_utf16_to_host_byte_order.3
+#usr/share/man/man3/pcre16_version.3
+#usr/share/man/man3/pcre_assign_jit_stack.3
#usr/share/man/man3/pcre_compile.3
#usr/share/man/man3/pcre_compile2.3
#usr/share/man/man3/pcre_config.3
@@ -87,6 +121,7 @@
#usr/share/man/man3/pcre_copy_substring.3
#usr/share/man/man3/pcre_dfa_exec.3
#usr/share/man/man3/pcre_exec.3
+#usr/share/man/man3/pcre_free_study.3
#usr/share/man/man3/pcre_free_substring.3
#usr/share/man/man3/pcre_free_substring_list.3
#usr/share/man/man3/pcre_fullinfo.3
@@ -95,16 +130,21 @@
#usr/share/man/man3/pcre_get_stringtable_entries.3
#usr/share/man/man3/pcre_get_substring.3
#usr/share/man/man3/pcre_get_substring_list.3
-#usr/share/man/man3/pcre_info.3
+#usr/share/man/man3/pcre_jit_stack_alloc.3
+#usr/share/man/man3/pcre_jit_stack_free.3
#usr/share/man/man3/pcre_maketables.3
+#usr/share/man/man3/pcre_pattern_to_host_byte_order.3
#usr/share/man/man3/pcre_refcount.3
#usr/share/man/man3/pcre_study.3
+#usr/share/man/man3/pcre_utf16_to_host_byte_order.3
#usr/share/man/man3/pcre_version.3
#usr/share/man/man3/pcreapi.3
#usr/share/man/man3/pcrebuild.3
#usr/share/man/man3/pcrecallout.3
#usr/share/man/man3/pcrecompat.3
#usr/share/man/man3/pcrecpp.3
+#usr/share/man/man3/pcrejit.3
+#usr/share/man/man3/pcrelimits.3
#usr/share/man/man3/pcrematching.3
#usr/share/man/man3/pcrepartial.3
#usr/share/man/man3/pcrepattern.3
@@ -114,3 +154,4 @@
#usr/share/man/man3/pcresample.3
#usr/share/man/man3/pcrestack.3
#usr/share/man/man3/pcresyntax.3
+#usr/share/man/man3/pcreunicode.3
Modified: ipcop/trunk/lfs/apache
===================================================================
--- ipcop/trunk/lfs/apache 2012-03-23 18:35:40 UTC (rev 6506)
+++ ipcop/trunk/lfs/apache 2012-03-23 21:32:25 UTC (rev 6507)
@@ -87,6 +87,8 @@
@$(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
Modified: ipcop/trunk/lfs/pcre
===================================================================
--- ipcop/trunk/lfs/pcre 2012-03-23 18:35:40 UTC (rev 6506)
+++ ipcop/trunk/lfs/pcre 2012-03-23 21:32:25 UTC (rev 6507)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = pcre
-VER = 8.11
+VER = 8.30
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ef907b8792ec7f90f0dcd773848f0b3b
+$(DL_FILE)_MD5 = 98e8928cccc945d04279581e778fbdff
install : $(TARGET)
Added: ipcop/trunk/src/patches/httpd_pcre830.patch
===================================================================
--- ipcop/trunk/src/patches/httpd_pcre830.patch (rev 0)
+++ ipcop/trunk/src/patches/httpd_pcre830.patch 2012-03-23 21:32:25 UTC (rev
6507)
@@ -0,0 +1,23 @@
+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-03-23 18:35:40 UTC
(rev 6506)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-03-23 21:32:25 UTC
(rev 6507)
@@ -67,6 +67,10 @@
## acpid-2.0.15
/usr/sbin/acpid
##
+# apache httpd-2.2.22 patched for pcre-8.30
+/usr/sbin/htpasswd
+/usr/sbin/httpd
+##
## arping-2.11
/usr/sbin/arping
##
@@ -172,6 +176,10 @@
/usr/lib/libcrypto.so.1.0.0
/usr/lib/libssl.so.1.0.0
##
+## pcre-8.30
+/usr/lib/libpcre.so.1
+/usr/lib/libpcre.so.1.0.0
+##
## perl patched squeeze3
/usr/bin/perl
/usr/bin/perl5.10.1
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-03-23 18:35:40 UTC (rev
6506)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-03-23 21:32:25 UTC (rev
6507)
@@ -3,7 +3,7 @@
<version>2.1.0</version>
<releasedate>2012-04-dd</releasedate>
<size>0</size>
- <description>libxml2 and gettext patch<br />
+ <description>httpd, libxml2 and gettext patched<br />
Add URL filter.<br />
Language updates.<br />
Upgrade acpid to 2.0.15, arping to 2.11, bash to 4.2.24, dhcpcd to
5.5.4, dnsmasq to 2.60,
@@ -11,7 +11,7 @@
gmp to 5.0.4, grep to 2.11, gnupg to 1.4.12,
iproute2 to 3.3.0, hdparm to 9.39, kernel to 3.0.25, krb5 to 1.9.3,
libgcrypt to 1.5.0, libtool to 2.4.2, lsof to 4.85,
- openldap to 2.4.30, openssl to 1.0.0h, pixman to 0.24.4, procps to
3.3.2, psmisc to 22.16
+ openldap to 2.4.30, openssl to 1.0.0h, pcre to 8.30, pixman to
0.24.4, procps to 3.3.2, psmisc to 22.16
rsyslog to 5.8.9, shadow to 4.1.5, tzdata to 2012b, util-linux to
2.21, several Perl CPAN modules.
<br />
<b>Mandatory reboot after upgrade.</b>
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2012-03-23 18:35:40 UTC (rev 6506)
+++ ipcop/trunk/updates/2.1.0/setup 2012-03-23 21:32:25 UTC (rev 6507)
@@ -116,6 +116,7 @@
/bin/rm -f /usr/lib/libpixman-1.so.0.22.2
# Remove devel lib that should not be needed
+/bin/rm -f /usr/lib/libpcre.so
/bin/rm -f /usr/lib/libxml2.so
# For new shared libs. May not always be required, but makes sure we do not
forget
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
