Revision: 6661
http://ipcop.svn.sourceforge.net/ipcop/?rev=6661&view=rev
Author: gespinasse
Date: 2012-06-19 17:59:16 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Upgrade gzip to 1.5
Remove gl_cv_func_printf_directive_n=no woraround as gnulib has been fixed
Remove the Fedora patch that was droped in 2007 ('remove useless patches'
commit)
Use DEFS="NO_ASM" for multiple reasons :
- we were lucky gzip-1.4 configure fail on 'checking for an assembler syntax
supported by this package' or make would have failed later,
- asm cause textrel issue in our gcc configuration,
- Fedora use DEFS="NO_ASM", saying gcc compiled code is faster than asm code
Update the rootfile, as referring to man pages, not installed since
install-exec usage
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/gzip
ipcop/trunk/lfs/gzip
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/gzip-1.3.3-window-size.patch
Modified: ipcop/trunk/config/rootfiles/common/gzip
===================================================================
--- ipcop/trunk/config/rootfiles/common/gzip 2012-06-19 12:29:52 UTC (rev
6660)
+++ ipcop/trunk/config/rootfiles/common/gzip 2012-06-19 17:59:16 UTC (rev
6661)
@@ -12,15 +12,3 @@
#usr/bin/zless
#usr/bin/zmore
#usr/bin/znew
-#usr/share/info/gzip.info
-#usr/share/man/man1/gunzip.1
-#usr/share/man/man1/gzexe.1
-#usr/share/man/man1/gzip.1
-#usr/share/man/man1/zcat.1
-#usr/share/man/man1/zcmp.1
-#usr/share/man/man1/zdiff.1
-#usr/share/man/man1/zforce.1
-#usr/share/man/man1/zgrep.1
-#usr/share/man/man1/zless.1
-#usr/share/man/man1/zmore.1
-#usr/share/man/man1/znew.1
Modified: ipcop/trunk/lfs/gzip
===================================================================
--- ipcop/trunk/lfs/gzip 2012-06-19 12:29:52 UTC (rev 6660)
+++ ipcop/trunk/lfs/gzip 2012-06-19 17:59:16 UTC (rev 6661)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = gzip
-VER = 1.4
+VER = 1.5
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fc7be225884ae5324b44167ced89f50a
+$(DL_FILE)_MD5 = 2a431e169b6f62f7332ef6d47cc53bae
install : $(TARGET)
@@ -83,18 +83,15 @@
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
ifeq "$(STAGE)" "toolchain"
- # avoid '%n in writable segment' with gl_cv_func_printf_directive_n=no
- cd $(DIR_APP) && gl_cv_func_printf_directive_n=no \
- ./configure --prefix=/$(TOOLS_DIR)
+ cd $(DIR_APP) && DEFS="NO_ASM" ./configure --prefix=/$(TOOLS_DIR)
cd $(DIR_APP) && make -j $(PARALLELISM)
cd $(DIR_APP) && make install-exec
endif
ifeq "$(STAGE)" "base"
- cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/gzip-1.3.3-window-size.patch
- cd $(DIR_APP) && gl_cv_func_printf_directive_n=no \
- ./configure --prefix=/usr --bindir=/bin
- cd $(DIR_APP) && make -j $(PARALLELISM)
+ # DEFS="NO_ASM" avoid the gzip textrel issue, is used by Fedora who say
too asm is slower than gcc compiled code
+ cd $(DIR_APP) && DEFS="NO_ASM" ./configure --prefix=/usr --bindir=/bin
+ cd $(DIR_APP) && make -j $(PARALLELISM) V=1
ifeq "$(RUNNING_TEST)" "yes"
# no test should fail
Deleted: ipcop/trunk/src/patches/gzip-1.3.3-window-size.patch
===================================================================
--- ipcop/trunk/src/patches/gzip-1.3.3-window-size.patch 2012-06-19
12:29:52 UTC (rev 6660)
+++ ipcop/trunk/src/patches/gzip-1.3.3-window-size.patch 2012-06-19
17:59:16 UTC (rev 6661)
@@ -1,14 +0,0 @@
-borrowed from fedora
-enlarge window buffer to avoid accessing beyond end-of-buffer
-
---- gzip-1.3.3/gzip.c.orig Thu Jan 30 21:19:36 2003
-+++ gzip-1.3.3/gzip.c Thu Jan 30 21:09:52 2003
-@@ -198,7 +198,7 @@
- DECLARE(uch, inbuf, INBUFSIZ +INBUF_EXTRA);
- DECLARE(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA);
- DECLARE(ush, d_buf, DIST_BUFSIZE);
--DECLARE(uch, window, 2L*WSIZE);
-+DECLARE(uch, window, 2L*WSIZE + 4096);
- #ifndef MAXSEG_64K
- DECLARE(ush, tab_prefix, 1L<<BITS);
- #else
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-06-19 12:29:52 UTC
(rev 6660)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-06-19 17:59:16 UTC
(rev 6661)
@@ -240,6 +240,13 @@
/bin/egrep
/bin/grep
##
+##
+## gzip-1.5
+/bin/gunzip
+/bin/gzip
+/usr/bin/uncompress
+/usr/bin/zcat
+##
## iproute2-3.3.0
/sbin/ip
/sbin/rtmon
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-06-19 12:29:52 UTC (rev
6660)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-06-19 17:59:16 UTC (rev
6661)
@@ -10,7 +10,7 @@
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, 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,
+ gmp to 5.0.5, gnupg to 1.4.12, grep to 2.12, gzip to 1.5,
iproute2 to 3.3.0, iptables to 1.4.14, hdparm to 9.39, kernel to
3.0.34, krb5 to 1.9.3,
libffi to 3.0.10, libgd to 2.0.36~rc1, libgcrypt to 1.5.0,
libnetfiltercontrack to 1.0.1, libpng to 1.5.10,
libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2
to 2.8.0, lsof to 4.86,
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
