Revision: 6302
http://ipcop.svn.sourceforge.net/ipcop/?rev=6302&view=rev
Author: owes
Date: 2012-02-01 11:30:27 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Update apache to 2.2.22
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/apache
ipcop/trunk/lfs/apache
ipcop/trunk/updates/2.0.3/information.xml
ipcop/trunk/updates/2.0.3/setup
Modified: ipcop/trunk/config/rootfiles/common/apache
===================================================================
--- ipcop/trunk/config/rootfiles/common/apache 2012-02-01 11:25:05 UTC (rev
6301)
+++ ipcop/trunk/config/rootfiles/common/apache 2012-02-01 11:30:27 UTC (rev
6302)
@@ -46,6 +46,7 @@
#usr/include/apache/apr_atomic.h
#usr/include/apache/apr_base64.h
#usr/include/apache/apr_buckets.h
+#usr/include/apache/apr_crypto.h
#usr/include/apache/apr_date.h
#usr/include/apache/apr_dbd.h
#usr/include/apache/apr_dbm.h
@@ -105,6 +106,7 @@
#usr/include/apache/apr_xlate.h
#usr/include/apache/apr_xml.h
#usr/include/apache/apu.h
+#usr/include/apache/apu_errno.h
#usr/include/apache/apu_version.h
#usr/include/apache/apu_want.h
#usr/include/apache/http_config.h
@@ -145,16 +147,15 @@
#usr/lib/apr.exp
#usr/lib/aprutil.exp
#usr/lib/libapr-1.la
-usr/lib/libapr-1.so
+#usr/lib/libapr-1.so
usr/lib/libapr-1.so.0
usr/lib/libapr-1.so.0.4.5
#usr/lib/libaprutil-1.la
-usr/lib/libaprutil-1.so
+#usr/lib/libaprutil-1.so
usr/lib/libaprutil-1.so.0
-usr/lib/libaprutil-1.so.0.3.12
+usr/lib/libaprutil-1.so.0.4.1
#usr/lib/pkgconfig/apr-1.pc
#usr/lib/pkgconfig/apr-util-1.pc
-#usr/libexec
#usr/libexec/httpd.exp
#usr/sbin/ab
#usr/sbin/apachectl
@@ -171,16 +172,17 @@
#usr/sbin/httxt2dbm
#usr/sbin/logresolve
#usr/sbin/rotatelogs
+#usr/share/man/man1/ab.1
+#usr/share/man/man1/apxs.1
#usr/share/man/man1/dbmmanage.1
#usr/share/man/man1/htdbm.1
#usr/share/man/man1/htdigest.1
#usr/share/man/man1/htpasswd.1
-#usr/share/man/man8/ab.8
+#usr/share/man/man1/httxt2dbm.1
+#usr/share/man/man1/logresolve.1
#usr/share/man/man8/apachectl.8
-#usr/share/man/man8/apxs.8
#usr/share/man/man8/htcacheclean.8
#usr/share/man/man8/httpd.8
-#usr/share/man/man8/logresolve.8
#usr/share/man/man8/rotatelogs.8
#usr/share/man/man8/suexec.8
var/ipcop/main/hostname.conf
Modified: ipcop/trunk/lfs/apache
===================================================================
--- ipcop/trunk/lfs/apache 2012-02-01 11:25:05 UTC (rev 6301)
+++ ipcop/trunk/lfs/apache 2012-02-01 11:30:27 UTC (rev 6302)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = apache
-VER = 2.2.21
+VER = 2.2.22
HOST_ARCH = all
OTHER_SRC = yes
@@ -46,7 +46,7 @@
# Used to include same timestamp for all
# This is httpd tar file date
-TIMESTAMP = "12-09-2011 19:02"
+TIMESTAMP = "30-01-2012 23:06"
###############################################################################
# Top-level Rules
@@ -54,9 +54,9 @@
objects = $(DL_FILE)
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1696ae62cd879ab1d4dd9ff021a470f2
+$(DL_FILE)_MD5 = 9fe3093194c8a57f085ff7c3fc43715f
install : $(TARGET)
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2012-02-01 11:25:05 UTC (rev
6301)
+++ ipcop/trunk/updates/2.0.3/information.xml 2012-02-01 11:30:27 UTC (rev
6302)
@@ -8,7 +8,7 @@
Patch krb5-1.9.2 against MITKRB5-SA-2011-007.<br />
More gnupg-1.4.11 hardening. Patched ulogd-1.24.<br />
Language updates.<br />
- Upgrade acpid to 2.0.14, bash to 4.2.20, coreutils to 8.15,
+ Upgrade acpid to 2.0.14, apache httpd to 2.2.22, bash to 4.2.20,
coreutils to 8.15,
conntrack-tools to 1.0.1, DBD-SQLite to 1.35, diffutils to 3.2,
freetype to 2.4.8, gmp to 5.0.2, grep to 2.10, iproute2 to 3.2.0,
iptables to 1.4.12.2, iw to 3.3,
kbd to 1.15.3, kernel to 2.6.32.55, libnetfilter_conntrack to
1.0.0, libnl to 3.2.7,
Modified: ipcop/trunk/updates/2.0.3/setup
===================================================================
--- ipcop/trunk/updates/2.0.3/setup 2012-02-01 11:25:05 UTC (rev 6301)
+++ ipcop/trunk/updates/2.0.3/setup 2012-02-01 11:30:27 UTC (rev 6302)
@@ -74,6 +74,7 @@
# Remove old libraries (version specific)
/bin/rm -f /lib/libz.so.1.2.5
+/bin/rm -f /usr/lib/libaprutil-1.so.0.3.12
/bin/rm -f /usr/lib/libfreetype.so.6.7.2
/bin/rm -f /usr/lib/libgmp.so.10.0.1
/bin/rm -f /usr/lib/libgmp.so.10.0.3
@@ -96,6 +97,8 @@
/bin/rm -f /lib/libip4tc.so
/bin/rm -f /lib/libip6tc.so
/bin/rm -f /lib/libiptc.so
+/bin/rm -f /usr/lib/libapr-1.so
+/bin/rm -f /usr/lib/libaprutil-1.so
/bin/rm -f /usr/lib/libfreetype.so
/bin/rm -f /usr/lib/libgmp.so
/bin/rm -f /usr/lib/liblzo2.so
@@ -132,6 +135,9 @@
/usr/local/bin/restartntpd
fi
+# Use new apache (restart pauses for 10 seconds, should be enough to complete
upgrade)
+/usr/local/bin/restarthttpd restart &
+
# restart squid (helper checks whether squid is enabled)
/usr/local/bin/restartsquid
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
