Revision: 6297
http://ipcop.svn.sourceforge.net/ipcop/?rev=6297&view=rev
Author: gespinasse
Date: 2012-01-31 21:52:52 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
Revert upgrade from 5.0.3
An issue has been found and announced with this release, another one should
follow but that will be to late for 2.0.3
That may not matter with our usage of gmp, but how know.
Remove libgmp.so.10.0.3 for the brave that already tested 2.0.3.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/gmp
ipcop/trunk/lfs/gcc
ipcop/trunk/lfs/gmp
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
ipcop/trunk/updates/2.0.3/setup
Modified: ipcop/trunk/config/rootfiles/common/gmp
===================================================================
--- ipcop/trunk/config/rootfiles/common/gmp 2012-01-30 18:07:51 UTC (rev
6296)
+++ ipcop/trunk/config/rootfiles/common/gmp 2012-01-31 21:52:52 UTC (rev
6297)
@@ -2,7 +2,7 @@
#usr/lib/libgmp.la
#usr/lib/libgmp.so
usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.0.3
+usr/lib/libgmp.so.10.0.2
#usr/share/info/gmp.info
#usr/share/info/gmp.info-1
#usr/share/info/gmp.info-2
Modified: ipcop/trunk/lfs/gcc
===================================================================
--- ipcop/trunk/lfs/gcc 2012-01-30 18:07:51 UTC (rev 6296)
+++ ipcop/trunk/lfs/gcc 2012-01-31 21:52:52 UTC (rev 6297)
@@ -65,20 +65,20 @@
# Top-level Rules
###############################################################################
objects = $(DL_FILE) \
- $(GMPVERSION).tar.xz \
+ $(GMPVERSION).tar.bz2 \
$(MPFRVERSION).tar.xz \
$(MPFRPATCH) \
$(PATCH1)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(GMPVERSION).tar.xz = $(URL_GNU)/gmp/$(GMPVERSION).tar.xz
+$(GMPVERSION).tar.bz2 = $(URL_GNU)/gmp/$(GMPVERSION).tar.bz2
$(MPFRVERSION).tar.xz = $(URL_GNU)/mpfr/$(MPFRVERSION).tar.xz
$(MPFRPATCH) =
http://www.mpfr.org/$(MPFRVERSION)/allpatches
$(PATCH1) = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
$(DL_FILE)_MD5 = 44b3192c4c584b9be5243d9e8e7e0ed1
# weak : cut -d ' ' -f 3 rely only on ' = ' for gmp and mpfr _MD5
-$(GMPVERSION).tar.xz_MD5 = $(shell sed -ne '/_MD5.*/p' gmp | sed
-e '1!d' | cut -d ' ' -f 3)
+$(GMPVERSION).tar.bz2_MD5 = $(shell sed -ne '/_MD5.*/p' gmp | sed
-e '1!d' | cut -d ' ' -f 3)
$(MPFRVERSION).tar.xz_MD5 = $(shell sed -ne '/_MD5.*/p' mpfr |
sed -e '1!d' | cut -d ' ' -f 3)
$(MPFRPATCH)_MD5 = $(shell sed -ne '/_MD5.*/p' mpfr |
sed -e '2!d' | cut -d ' ' -f 3)
$(PATCH1)_MD5 = 799ef1971350d2e3c794f2123f247cc6
@@ -149,7 +149,7 @@
@mkdir $(DIR_SRC)/gcc-build
ifeq "$(STAGE)" "toolchain"
- cd $(DIR_APP) && xz -dc $(DIR_DL)/$(GMPVERSION).tar.xz | tar xf -
+ cd $(DIR_APP) && tar jxf $(DIR_DL)/$(GMPVERSION).tar.bz2
cd $(DIR_APP) && mv $(GMPVERSION) gmp
cd $(DIR_APP) && xz -dc $(DIR_DL)/$(MPFRVERSION).tar.xz | tar xf -
cd $(DIR_APP) && mv $(MPFRVERSION) mpfr
Modified: ipcop/trunk/lfs/gmp
===================================================================
--- ipcop/trunk/lfs/gmp 2012-01-30 18:07:51 UTC (rev 6296)
+++ ipcop/trunk/lfs/gmp 2012-01-31 21:52:52 UTC (rev 6297)
@@ -33,17 +33,18 @@
include Config
PKG_NAME = gmp
-VER = 5.0.3
+VER = 5.0.2
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP).tar.xz
+DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_GNU)/$(PKG_NAME)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-# gcc hardened spec is not yet in use
+# gcc hardened spec is not yet used during normal build, so script need to set
that
+# In case of rebuild after gcc chap6 is compiled, you would see no change,
tweeeking LDFLAGS
LDFLAGS += -Wl,-z,relro,-z,now
###############################################################################
@@ -54,7 +55,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1e8edebe33bc3ac6de17df3201732825
+$(DL_FILE)_MD5 = 0bbaedc82fb30315b06b1588b9077cd3
install : $(TARGET)
@@ -83,7 +84,7 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && xz -dc $(DIR_DL)/$(DL_FILE) |
tar xf -
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
# we do not build the C++ part (--enable-cxx)
# and Berkeley MP compatibility library (--enable-mpbsd)
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2012-01-30 18:07:51 UTC
(rev 6296)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2012-01-31 21:52:52 UTC
(rev 6297)
@@ -159,9 +159,9 @@
/usr/lib/libfontconfig.so.1
/usr/lib/libfontconfig.so.1.4.4
##
-## gmp-5.0.3
+## gmp-5.0.2
/usr/lib/libgmp.so.10
-/usr/lib/libgmp.so.10.0.3
+/usr/lib/libgmp.so.10.0.2
##
## gnupg hardening
/usr/bin/gpg
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2012-01-30 18:07:51 UTC (rev
6296)
+++ ipcop/trunk/updates/2.0.3/information.xml 2012-01-31 21:52:52 UTC (rev
6297)
@@ -10,7 +10,7 @@
Language updates.<br />
Upgrade acpid to 2.0.14, 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.3, grep to 2.10, iproute2 to 3.2.0,
iptables to 1.4.12.2, iw to 3.3,
+ 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,
libpcap to 1.2.1, lzo to 2.0.6, ntp to 4.2.6p5, openldap to
2.4.28, openssl to 1.0.0g, openvpn to 2.2.2,
pciutils-3.1.9, psmisc to 22.15, rrdtool to 1.4.7, smartmontools
to 5.42, Solos PCI to 1.03,
Modified: ipcop/trunk/updates/2.0.3/setup
===================================================================
--- ipcop/trunk/updates/2.0.3/setup 2012-01-30 18:07:51 UTC (rev 6296)
+++ ipcop/trunk/updates/2.0.3/setup 2012-01-31 21:52:52 UTC (rev 6297)
@@ -75,6 +75,7 @@
# Remove old libraries (version specific)
/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
/bin/rm -f /usr/lib/liblber-2.4.so.2.5.6
/bin/rm -f /usr/lib/liblber.so
/bin/rm -f /usr/lib/libldap-2.4.so.2.5.6
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
