Revision: 6684
http://ipcop.svn.sourceforge.net/ipcop/?rev=6684&view=rev
Author: gespinasse
Date: 2012-07-03 19:24:05 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Upgrade expat to 2.1.0
Slightly reorder the removed lib in update setup, putting /lib before /usr/lib
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/expat
ipcop/trunk/lfs/expat
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
Modified: ipcop/trunk/config/rootfiles/common/expat
===================================================================
--- ipcop/trunk/config/rootfiles/common/expat 2012-07-03 06:32:37 UTC (rev
6683)
+++ ipcop/trunk/config/rootfiles/common/expat 2012-07-03 19:24:05 UTC (rev
6684)
@@ -1,9 +1,8 @@
-## expat-2.0.1
-##
#usr/bin/xmlwf
#usr/include/expat.h
#usr/include/expat_external.h
-usr/lib/libexpat.so
+#usr/lib/libexpat.so
usr/lib/libexpat.so.1
-usr/lib/libexpat.so.1.5.2
+usr/lib/libexpat.so.1.6.0
+#usr/lib/pkgconfig/expat.pc
#usr/share/man/man1/xmlwf.1
Modified: ipcop/trunk/lfs/expat
===================================================================
--- ipcop/trunk/lfs/expat 2012-07-03 06:32:37 UTC (rev 6683)
+++ ipcop/trunk/lfs/expat 2012-07-03 19:24:05 UTC (rev 6684)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = expat
-VER = 2.0.1
+VER = 2.1.0
HOST_ARCH = all
OTHER_SRC = yes
@@ -43,21 +43,15 @@
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-# fix CVE-2009-{2625,3560,3720}
-PATCH1 = $(THISAPP)-fixes-3.patch
-
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE) \
- $(PATCH1)
+objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(PATCH1) = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
-$(DL_FILE)_MD5 = ee8b492592568805593f81f8cdf2a04c
-$(PATCH1)_MD5 = 3b2be2d5469c05cf8d0156cee8373d9c
+$(DL_FILE)_MD5 = dd7dab7a5fea97d2a6a43f511449b7cd
install : $(TARGET)
@@ -87,14 +81,13 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(PATCH1)
cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
cd $(DIR_APP) && make
ifeq "$(RUNNING_TEST)" "yes"
- # fix the numerous warning: deprecated conversion from string constant
to 'char*'
- cd $(DIR_APP) && sed -i.bak -e 's/char \*msg/const char *msg/'
\tests/minicheck.{c,h}
+ # fix a few of the numerous warnings deprecated conversion from string
constant to 'char*'
+ cd $(DIR_APP) && sed -i.bak -e 's/char \*msg/const char *msg/'
tests/runtest.{c,h}
-cd $(DIR_APP) && make check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-07-03 06:32:37 UTC
(rev 6683)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-07-03 19:24:05 UTC
(rev 6684)
@@ -207,6 +207,10 @@
## ethtool-3.2
/usr/sbin/ethtool
##
+## expat-2.1.0
+/usr/lib/libexpat.so.1
+/usr/lib/libexpat.so.1.6.0
+##
## fontconfig-2.9.0
/etc/fonts
/usr/lib/libfontconfig.so.1
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-07-03 06:32:37 UTC (rev
6683)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-07-03 19:24:05 UTC (rev
6684)
@@ -9,7 +9,7 @@
Language updates.<br />
Upgrade acpid to 2.0.16, arping to 2.11, bash to 4.2.29, bind to
9.8.3-P1, conntrack-tools to 1.2.1, coreutils to 8.17,
dhcpcd to 5.5.6, dnsmasq to 2.62,
- e2fsprogs to 1.42.4, ethtool to 3.2, freetype to 2.4.10,
fontconfig to 2.9, gawk to 4.0.1, glib to 2.30.3,
+ e2fsprogs to 1.42.4, 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.12, gzip to 1.5,
iproute2 to 3.4.0, iptables to 1.4.14, iw to 3.4 hdparm to 9.39,
kernel to 3.0.36, krb5 to 1.9.4,
libffi to 3.0.10, libgd to 2.0.36~rc1, libgcrypt to 1.5.0,
libnetfiltercontrack to 1.0.1, libnl to 3.2.11, libpng to 1.5.10,
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2012-07-03 06:32:37 UTC (rev 6683)
+++ ipcop/trunk/updates/2.1.0/setup 2012-07-03 19:24:05 UTC (rev 6684)
@@ -105,12 +105,6 @@
# Remove old libraries (version specific)
# /bin/rm -f .....
-/bin/rm -f /usr/lib/libbind9.so.80.0.{3,4}
-/bin/rm -f /usr/lib/libdns.so.81.{3.1,6.0}
-/bin/rm -f /usr/lib/libisc.so.83.0.1
-/bin/rm -f /usr/lib/libisccc.so.80.0.0
-/bin/rm -f /usr/lib/libisccfg.so.82.0.{0,1}
-/bin/rm -f /usr/lib/liblwres.so.80.0.1
/bin/rm -f /lib/iptables/libipt_addrtype.so
/bin/rm -f /lib/iptables/libipt_ecn.so
/bin/rm -f /lib/libip4tc.so.0.0.0
@@ -119,7 +113,14 @@
/bin/rm -f /lib/libprocps.so.0.0.0
/bin/rm -f /lib/libsysfs.so*
/bin/rm -f /lib/libz.so.1.2.6
+/bin/rm -f /usr/lib/libbind9.so.80.0.{3,4}
+/bin/rm -f /usr/lib/libdns.so.81.{3.1,6.0}
+/bin/rm -f /usr/lib/libisc.so.83.0.1
+/bin/rm -f /usr/lib/libisccc.so.80.0.0
+/bin/rm -f /usr/lib/libisccfg.so.82.0.{0,1}
+/bin/rm -f /usr/lib/liblwres.so.80.0.1
/bin/rm -f /usr/bin/gdlib-config
+/bin/rm -f /usr/lib/libexpat.so.1.5.2
/bin/rm -f /usr/lib/libfontconfig.so.1.4.4
/bin/rm -f /usr/lib/libfreetype.so.6.8.0
/bin/rm -f /usr/lib/libglib-2.0.so.0.2600.1
@@ -149,6 +150,7 @@
/bin/rm -f /usr/lib/libfontconfig.so
/bin/rm -f /usr/lib/libgd.so
/bin/rm -f /usr/lib/libgpg-error.so
+/bin/rm -f /usr/lib/libexpat.so
/bin/rm -f /usr/lib/libpcre.so
/bin/rm -f /usr/lib/libusb-1.0.so
/bin/rm -f /usr/lib/libusb.so
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
