Revision: 7463
http://sourceforge.net/p/ipcop/svn/7463
Author: owes
Date: 2014-04-11 16:25:51 +0000 (Fri, 11 Apr 2014)
Log Message:
-----------
Drop squid-graph. Replaced now and broken by recent squid.
Modified Paths:
--------------
ipcop/trunk/make.sh
Removed Paths:
-------------
ipcop/trunk/config/rootfiles/common/GD
ipcop/trunk/config/rootfiles/common/libgd
ipcop/trunk/config/rootfiles/common/squid-graph
ipcop/trunk/lfs/GD
ipcop/trunk/lfs/libgd
ipcop/trunk/lfs/squid-graph
Deleted: ipcop/trunk/config/rootfiles/common/GD
===================================================================
--- ipcop/trunk/config/rootfiles/common/GD 2014-04-11 16:21:41 UTC (rev
7462)
+++ ipcop/trunk/config/rootfiles/common/GD 2014-04-11 16:25:51 UTC (rev
7463)
@@ -1,20 +0,0 @@
-#usr/bin/bdf2gdfont.pl
-#usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/GD
-usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/GD.pm
-#usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/GD/Group.pm
-usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/GD/Image.pm
-usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/GD/Polygon.pm
-usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/GD/Polyline.pm
-#usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/GD/Simple.pm
-#usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/auto/GD
-#usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/auto/GD/.packlist
-#usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/auto/GD/GD.bs
-usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/auto/GD/GD.so
-#usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/auto/GD/autosplit.ix
-#usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/qd.pl
-#usr/share/man/man1/bdf2gdfont.pl.1
-#usr/share/man/man3/GD.3
-#usr/share/man/man3/GD::Image.3
-#usr/share/man/man3/GD::Polygon.3
-#usr/share/man/man3/GD::Polyline.3
-#usr/share/man/man3/GD::Simple.3
Deleted: ipcop/trunk/config/rootfiles/common/libgd
===================================================================
--- ipcop/trunk/config/rootfiles/common/libgd 2014-04-11 16:21:41 UTC (rev
7462)
+++ ipcop/trunk/config/rootfiles/common/libgd 2014-04-11 16:25:51 UTC (rev
7463)
@@ -1,30 +0,0 @@
-#usr/bin/annotate
-#usr/bin/bdftogd
-#usr/bin/gd2copypal
-#usr/bin/gd2togif
-#usr/bin/gd2topng
-#usr/bin/gdcmpgif
-#usr/bin/gdlib-config
-#usr/bin/gdparttopng
-#usr/bin/gdtopng
-#usr/bin/giftogd2
-#usr/bin/pngtogd
-#usr/bin/pngtogd2
-#usr/bin/webpng
-#usr/include/entities.h
-#usr/include/gd.h
-#usr/include/gd_color_map.h
-#usr/include/gd_errors.h
-#usr/include/gd_io.h
-#usr/include/gdcache.h
-#usr/include/gdfontg.h
-#usr/include/gdfontl.h
-#usr/include/gdfontmb.h
-#usr/include/gdfonts.h
-#usr/include/gdfontt.h
-#usr/include/gdfx.h
-#usr/include/gdpp.h
-#usr/lib/libgd.so
-usr/lib/libgd.so.3
-usr/lib/libgd.so.3.0.0
-#usr/lib/pkgconfig/gdlib.pc
Deleted: ipcop/trunk/config/rootfiles/common/squid-graph
===================================================================
--- ipcop/trunk/config/rootfiles/common/squid-graph 2014-04-11 16:21:41 UTC
(rev 7462)
+++ ipcop/trunk/config/rootfiles/common/squid-graph 2014-04-11 16:25:51 UTC
(rev 7463)
@@ -1 +0,0 @@
-usr/bin/squid-graph
Deleted: ipcop/trunk/lfs/GD
===================================================================
--- ipcop/trunk/lfs/GD 2014-04-11 16:21:41 UTC (rev 7462)
+++ ipcop/trunk/lfs/GD 2014-04-11 16:25:51 UTC (rev 7463)
@@ -1,94 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall. #
-# #
-# IPCop is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPCop is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPCop; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Makefiles are based on LFSMake, which is #
-# Copyright (C) 2002 Rod Roard <[email protected]>
#
-# #
-# Modifications by: #
-# ??-12-2003 Mark Wormgoor < [email protected]> #
-# - Modified Makefile for IPCop build #
-# #
-# $Id$
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-PKG_NAME = GD
-VER = 2.50
-HOST_ARCH = all
-OTHER_SRC = yes
-
-THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_CPAN)/L/LD/LDS
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = b2f1e47dfc1c4e4fdda3277f165d36e5
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
- @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-
- # Pass no option and trust gdlib-config --features to report gd
configuration
- cd $(DIR_APP) && perl Makefile.PL
- cd $(DIR_APP) && make
-ifeq "$(RUNNING_TEST)" "yes"
- -cd $(DIR_APP) && make test TEST_VERBOSE=1 &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
-endif
- cd $(DIR_APP) && make install
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
Deleted: ipcop/trunk/lfs/libgd
===================================================================
--- ipcop/trunk/lfs/libgd 2014-04-11 16:21:41 UTC (rev 7462)
+++ ipcop/trunk/lfs/libgd 2014-04-11 16:25:51 UTC (rev 7463)
@@ -1,114 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall. #
-# #
-# IPCop is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPCop is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPCop; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Makefiles are based on LFSMake, which is #
-# Copyright (C) 2002 Rod Roard <[email protected]>
#
-# #
-# Modifications by: #
-# ??-12-2003 Mark Wormgoor < [email protected]> #
-# - Modified Makefile for IPCop build #
-# #
-# $Id$
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-PKG_NAME = libgd
-VER = 2.1.0
-PATCHLEVEL = 3
-HOST_ARCH = all
-OTHER_SRC = yes
-
-THISAPP = libgd-$(VER)
-DL_FILE = $(PKG_NAME)2_$(VER).orig.tar.xz
-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)-$(PATCHLEVEL)
-
-PATCH1 = $(PKG_NAME)2_$(VER)-$(PATCHLEVEL).debian.tar.gz
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE) $(PATCH1)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(PATCH1) = $(DL_FROM)/$(PATCH1)
-
-$(DL_FILE)_MD5 = 03588159bf4faab9079849c8d709acc6
-$(PATCH1)_MD5 = eb6ba21a1b948f16a5461c940eae7faa
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
- @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(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) && 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)
Deleted: ipcop/trunk/lfs/squid-graph
===================================================================
--- ipcop/trunk/lfs/squid-graph 2014-04-11 16:21:41 UTC (rev 7462)
+++ ipcop/trunk/lfs/squid-graph 2014-04-11 16:25:51 UTC (rev 7463)
@@ -1,96 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall. #
-# #
-# IPCop is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPCop is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPCop; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Makefiles are based on LFSMake, which is #
-# Copyright (C) 2002 Rod Roard <[email protected]>
#
-# #
-# Modifications by: #
-# ??-12-2003 Mark Wormgoor < [email protected]> #
-# - Modified Makefile for IPCop build #
-# #
-# $Id$
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-PKG_NAME = squid-graph
-VER = 3.2
-HOST_ARCH = all
-OTHER_SRC = yes
-
-THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_SFNET)/$(PKG_NAME)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 7ed7d187f87bde1ec9dabe05f07053b5
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
- @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- # 3.2 unpacks into squid-graph directory, not in squid-graph-3.2
- @rm -rf $(DIR_SRC)/$(PKG_NAME) $(DIR_APP) && cd $(DIR_SRC) && tar zxf
$(DIR_DL)/$(DL_FILE)
- mv $(DIR_SRC)/$(PKG_NAME) $(DIR_APP)
-
- cd $(DIR_APP) && sed \
- -e "s/\$$color{'gr'} .*$$/\$$color{'gr'} =
['33','33','99']; # graph total line color/" \
- -e "s/\$$color{'hit'} .*$$/\$$color{'hit'} =
['99','33','33']; # graph hit line color/" \
- -e "s/\$$color{'miss'} .*$$/\$$color{'miss'} =
['33','99','33']; # graph miss line color/" \
- -e "s/\$$color{'ims'} .*$$/\$$color{'ims'} =
['99','33','99']; # graph ims hit line color/" \
- squid-graph > /usr/bin/squid-graph
- chmod 755 /usr/bin/squid-graph
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2014-04-11 16:21:41 UTC (rev 7462)
+++ ipcop/trunk/make.sh 2014-04-11 16:25:51 UTC (rev 7463)
@@ -1861,7 +1861,6 @@
chroot_make dejavu
chroot_make freetype
chroot_make harfbuzz
- chroot_make libgd
chroot_make fontconfig
chroot_make pixman
chroot_make cairo
@@ -1918,7 +1917,6 @@
chroot_make DBD-SQLite
chroot_make Digest-SHA1
chroot_make Digest-HMAC
- chroot_make GD
chroot_make libwww-perl
chroot_make Locale-Maketext-Gettext
chroot_make NetAddr-IP
@@ -1942,7 +1940,6 @@
chroot_make smartmontools
chroot_make cppunit # for squid tests
chroot_make squid
- chroot_make squid-graph
chroot_make squid-langpack
chroot_make squidGuard
chroot_make tcpdump
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Put Bad Developers to Shame
Dominate Development with Jenkins Continuous Integration
Continuously Automate Build, Test & Deployment
Start a new project now. Try Jenkins in the cloud.
http://p.sf.net/sfu/13600_Cloudbees
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
