Revision: 6569
http://ipcop.svn.sourceforge.net/ipcop/?rev=6569&view=rev
Author: gespinasse
Date: 2012-04-25 09:03:43 +0000 (Wed, 25 Apr 2012)
Log Message:
-----------
Upgrade libgd to 2.0.36~rc1 with debian patches
This version is used since a long time by debian (even in lenny) and compile
cleanly.
Remove usr/bin/gdlib-config from the list of files include.
That should have been a mistake since the origin as no other -config is include
and I find nothing tree-wide that match to that name.
Remove the .so symlink.
Add an (commented) beginning of tests, but this is not usable actually.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/libgd
ipcop/trunk/lfs/libgd
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/libgd
===================================================================
--- ipcop/trunk/config/rootfiles/common/libgd 2012-04-25 08:33:42 UTC (rev
6568)
+++ ipcop/trunk/config/rootfiles/common/libgd 2012-04-25 09:03:43 UTC (rev
6569)
@@ -1,14 +1,11 @@
-## libgd-2.0.35
-##
#usr/bin/annotate
#usr/bin/bdftogd
#usr/bin/gd2copypal
#usr/bin/gd2togif
#usr/bin/gd2topng
#usr/bin/gdcmpgif
-usr/bin/gdlib-config
+#usr/bin/gdlib-config
#usr/bin/gdparttopng
-#usr/bin/gdtojpeg
#usr/bin/gdtopng
#usr/bin/giftogd2
#usr/bin/pngtogd
@@ -16,7 +13,6 @@
#usr/bin/webpng
#usr/include/entities.h
#usr/include/gd.h
-#usr/include/gdfx.h
#usr/include/gd_io.h
#usr/include/gdcache.h
#usr/include/gdfontg.h
@@ -24,7 +20,8 @@
#usr/include/gdfontmb.h
#usr/include/gdfonts.h
#usr/include/gdfontt.h
+#usr/include/gdfx.h
#usr/lib/libgd.la
-usr/lib/libgd.so
+#usr/lib/libgd.so
usr/lib/libgd.so.2
usr/lib/libgd.so.2.0.0
Modified: ipcop/trunk/lfs/libgd
===================================================================
--- ipcop/trunk/lfs/libgd 2012-04-25 08:33:42 UTC (rev 6568)
+++ ipcop/trunk/lfs/libgd 2012-04-25 09:03:43 UTC (rev 6569)
@@ -33,27 +33,31 @@
include Config
PKG_NAME = libgd
-VER = 2.0.35
+VER = 2.0.36~rc1
+PATCHLEVEL = 5
HOST_ARCH = all
OTHER_SRC = yes
-THISAPP = gd-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
-# replace with tempory mirror and bz2 file until libgd goes up again
-DL_FROM = http://ftp.free.fr/mirrors/ftp.gentoo.org/distfiles
+THISAPP = libgd-$(VER)
+DL_FILE = $(PKG_NAME)2_$(VER)~dfsg.orig.tar.gz
+DL_FROM = $(URL_DEBIAN)/libg/$(PKG_NAME)2
#DL_FROM = http://www.libgd.org/releases
DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)-$(PATCHLEVEL)
+PATCH1 = $(PKG_NAME)2_$(VER)~dfsg-$(PATCHLEVEL).debian.tar.gz
+
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE)
+objects = $(DL_FILE) $(PATCH1)
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(PATCH1) = $(DL_FROM)/$(PATCH1)
-$(DL_FILE)_MD5 = 6c6c3dbb7bf079e0bb5fbbfd3bb8a71c
+$(DL_FILE)_MD5 = 0f4d2fa45627af0e87fcb74f653b66dd
+$(PATCH1)_MD5 = 0c3077d621949a44e249dd4e52742418
install : $(TARGET)
@@ -83,11 +87,29 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(THISAPP)_png-signature-check.patch
+ cd $(DIR_SRC) && mv $(PKG_NAME)2_$(VER)~dfsg.orig $(DIR_APP)
+ cd $(DIR_APP) && tar xf $(DIR_DL)/$(PATCH1)
+ # here patch names starting with 2 are specific to debian (see README)
(none actually)
+ cd $(DIR_APP) && for patch in `cat debian/patches/series | grep -v
'^2'` ; do \
+ patch -Np1 -i debian/patches/$$patch; \
+ done
+ # GD_GIF GD_GIFANIM GD_OPENPOLYGON are not used by squid-graph.
+ # May try to disable them if that translate to a size win (actually
some code changes are required to win size).
+ # cd $(DIR_APP) && sed -i -e 's/GD_GIF GD_GIFANIM GD_OPENPOLYGON//'
configure
+ # Disable fontconfig in case of libgd rebuild
cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
--without-fontconfig
cd $(DIR_APP) && make -j $(PARALLELISM)
+
+ifeq "$(RUNNING_TEST)" "yes"
+ # Better tests are required before to try to use them
+ # fontconfigtest slightly modified could work if compiled
+ #cd $(DIR_APP) && (./gddemo; ./gdtest demoin.png) &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+endif
+
cd $(DIR_APP) && make install
+ rm /usr/lib/libgd.la
+ rm -f $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/GD-*
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-04-25 08:33:42 UTC
(rev 6568)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-04-25 09:03:43 UTC
(rev 6569)
@@ -307,6 +307,10 @@
/usr/lib/libk5crypto.so.3.1
/usr/lib/libkrb5.so.3.3
##
+## libgd-2.0.36~rc1
+/usr/lib/libgd.so.2
+/usr/lib/libgd.so.2.0.0
+##
## libgcrypt-1.5.0
/usr/lib/libgcrypt.so.11
/usr/lib/libgcrypt.so.11.7.0
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-04-25 08:33:42 UTC (rev
6568)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-04-25 09:03:43 UTC (rev
6569)
@@ -11,7 +11,7 @@
e2fsprogs to 1.42.2, ethtool to 3.2, fontconfig to 2.9, gawk to
4.0.1, glib to 2.30.3,
gmp to 5.0.4, gnupg to 1.4.12, grep to 2.12,
iproute2 to 3.3.0, iptables to 1.4.13, hdparm to 9.39, kernel to
3.0.29, krb5 to 1.9.3,
- libgcrypt to 1.5.0, libpng to 1.5.10, libusb to 1.0.9,
libusb-compat to 0.1.4,
+ libgd to 2.0.36~rc1, libgcrypt to 1.5.0, libpng to 1.5.10, libusb
to 1.0.9, libusb-compat to 0.1.4,
libtool to 2.4.2, lsof to 4.85,
openldap to 2.4.30, openssh to 6.0, openssl to 1.0.1a, openswan to
2.6.38,
pcre to 8.30, pixman to 0.24.4, procps to 3.3.2, psmisc to 22.16,
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2012-04-25 08:33:42 UTC (rev 6568)
+++ ipcop/trunk/updates/2.1.0/setup 2012-04-25 09:03:43 UTC (rev 6569)
@@ -110,6 +110,7 @@
/bin/rm -f /lib/libip4tc.so.0.0.0
/bin/rm -f /lib/libip6tc.so.0.0.0
/bin/rm -f /lib/libproc-3.2.8.so
+/bin/rm -f /usr/bin/gdlib-config
/bin/rm -f /usr/lib/libfontconfig.so.1.4.4
/bin/rm -f /usr/lib/libglib-2.0.so.0.2600.1
/bin/rm -f /usr/lib/libgmodule-2.0.so.0.2600.1
@@ -129,6 +130,7 @@
# Remove devel lib that should not be needed
/bin/rm -f /usr/lib/libfontconfig.so
+/bin/rm -f /usr/lib/libgd.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
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
