From fccb33717706688a6a1fc6d08de7d92f42ab5201 Mon Sep 17 00:00:00 2001 From: ms Date: Wed, 15 Aug 2007 19:23:14 +0000 Subject: [PATCH] Testversion foomatic... git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@770 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/common/initscripts | 35 ++++++--- doc/packages-list.txt | 5 +- lfs/cups | 6 +- lfs/foomatic | 111 ++++++++++++++++++++++++++++ make.sh | 3 +- 5 files changed, 143 insertions(+), 17 deletions(-) create mode 100644 lfs/foomatic diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index 0a70ce51de..f1c0f8a303 100644 --- a/config/rootfiles/common/initscripts +++ b/config/rootfiles/common/initscripts @@ -15,6 +15,7 @@ etc/rc.d/init.d/console #etc/rc.d/init.d/cups #etc/rc.d/init.d/cyrus-sasl etc/rc.d/init.d/dhcp +etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/fcron etc/rc.d/init.d/firewall etc/rc.d/init.d/functions @@ -27,24 +28,36 @@ etc/rc.d/init.d/modules etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs etc/rc.d/init.d/mysql -etc/rc.d/init.d/net -#etc/rc.d/init.d/net/common -etc/rc.d/init.d/net/common/dhcpcd -etc/rc.d/init.d/net/common/ipv4-static -etc/rc.d/init.d/net/ifdown -etc/rc.d/init.d/net/ifup -#etc/rc.d/init.d/net/red -etc/rc.d/init.d/net/red/isdn -etc/rc.d/init.d/net/red/pppoe -etc/rc.d/init.d/net/red/update etc/rc.d/init.d/network +#etc/rc.d/init.d/networking +etc/rc.d/init.d/networking/any +etc/rc.d/init.d/networking/blue +etc/rc.d/init.d/networking/green +etc/rc.d/init.d/networking/orange +#etc/rc.d/init.d/networking/red +#etc/rc.d/init.d/networking/red.down +etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq +etc/rc.d/init.d/networking/red.down/10-ipsec +etc/rc.d/init.d/networking/red.down/20-RL-firewall +#etc/rc.d/init.d/networking/red.up +etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq +etc/rc.d/init.d/networking/red.up/10-multicast +etc/rc.d/init.d/networking/red.up/20-RL-firewall +etc/rc.d/init.d/networking/red.up/21-setfilters +etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl +etc/rc.d/init.d/networking/red.up/23-RS-snort +etc/rc.d/init.d/networking/red.up/24-RS-qos +etc/rc.d/init.d/networking/red.up/25-portfw +etc/rc.d/init.d/networking/red.up/26-xtaccess +etc/rc.d/init.d/networking/red.up/30-ddns +etc/rc.d/init.d/networking/red.up/40-ipac +etc/rc.d/init.d/networking/red.up/50-ipsec #etc/rc.d/init.d/nfs-server etc/rc.d/init.d/ntp #etc/rc.d/init.d/portmap etc/rc.d/init.d/random etc/rc.d/init.d/rc etc/rc.d/init.d/reboot -etc/rc.d/init.d/red #etc/rc.d/init.d/samba etc/rc.d/init.d/sendsignals etc/rc.d/init.d/setclock diff --git a/doc/packages-list.txt b/doc/packages-list.txt index abeb3313ce..58071f1346 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -59,6 +59,7 @@ * clamav-0.91.1 * coreutils-5.96 * cpio-2.6 +* cups-1.2.12 * cups-1.2.2 * curl-7.15.3 * cyrus-imapd-2.2.12 @@ -87,6 +88,7 @@ * file-4.17 * findutils-4.2.27 * flex-2.5.33 +* foomatic-3.0-20070813 * freetype-2.1.10 * fuse-2.6.3 * fwhits @@ -127,7 +129,6 @@ * iptables-1.3.5 * iptstate-2.1 * iputils-ss020927 -* isdn4k-utils-CVS-2006-07-20 * java-1.5.0_06-for-ipfire * jpegsrc.v6b * kbd-1.12 @@ -156,7 +157,6 @@ * libwww-perl-5.803 * libxml2-2.6.26 * libxslt-1.1.17 -* linux-2.6.16.50 * linux-2.6.16.53 * linux-atm-2.4.1 * linux-libc-headers-2.6.12.0 @@ -183,6 +183,7 @@ * mpfire-ipfire * mpg123-0.59r * mtd-CVS-20070507 +* mtools-3.9.10 * mysql-5.0.24a * nano-1.2.5 * nasm-0.98.39 diff --git a/lfs/cups b/lfs/cups index 6761e89655..ff7f5bb913 100644 --- a/lfs/cups +++ b/lfs/cups @@ -26,7 +26,7 @@ include Config -VER = 1.2.2 +VER = 1.2.12 THISAPP = cups-$(VER) DL_FILE = $(THISAPP)-source.tar.bz2 @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 1 +PAK_VER = 2 DESCDE = "CUPS ist ein Linux-Druck-System." DESCEN = "The Common Unix Printing System." @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 091de9109c9252cb37427859e90190ad +$(DL_FILE)_MD5 = d410658468384b5ba5d04a808f6157fe install : $(TARGET) diff --git a/lfs/foomatic b/lfs/foomatic new file mode 100644 index 0000000000..74958bf367 --- /dev/null +++ b/lfs/foomatic @@ -0,0 +1,111 @@ +############################################################################### +# 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 # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +DATE = 20070813 +VER = 3.0-$(DATE) + +THISAPP = foomatic-$(VER) +DL_FILE = foomatic-filters-$(VER).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/foomatic-filters-$(VER) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = foomatic +PAK_VER = 1 + +DESCDE = "Foomatic beinhaltet Filter und Treiber für CUPS." +DESCEN = "Foomatic is a collection of filters and ppds for cups." +DEPS = "cups ghostscript" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) \ + foomatic-db-$(DATE).tar.gz \ + foomatic-db-engine-$(VER).tar.gz \ + foomatic-db-hpijs-$(DATE).tar.gz + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) +foomatic-db-$(DATE).tar.gz = $(DL_FROM)/foomatic-db-$(DATE).tar.gz +foomatic-db-engine-$(VER).tar.gz = $(DL_FROM)/foomatic-db-engine-$(VER).tar.gz +foomatic-db-hpijs-$(DATE).tar.gz = $(DL_FROM)/foomatic-db-hpijs-$(DATE).tar.gz + +$(DL_FILE)_MD5 = 41de0f45866ab4c19c1d5e3e2cdab42f +foomatic-db-$(DATE).tar.gz_MD5 = a3ab04b7cc5d870b040ffce19e664698 +foomatic-db-engine-$(VER).tar.gz_MD5 = ec9639719a9c1d4095248e534c3f2d0d +foomatic-db-hpijs-$(DATE).tar.gz_MD5 = e59fa189336e96a9d43cfcfb6222a9c2 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + $(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_SRC)/foomatic-* && cd $(DIR_SRC) && \ + tar zxf $(DIR_DL)/$(DL_FILE) && \ + tar zxf $(DIR_DL)/foomatic-db-$(DATE).tar.gz && \ + tar zxf $(DIR_DL)/foomatic-db-engine-$(VER).tar.gz && \ + tar zxf $(DIR_DL)/foomatic-db-hpijs-$(DATE).tar.gz + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + cd $(DIR_SRC)/foomatic-db-$(DATE) && ./configure --prefix=/usr --sysconfdir=/etc + cd $(DIR_SRC)/foomatic-db-$(DATE) && make $(MAKETUNING) + cd $(DIR_SRC)/foomatic-db-$(DATE) && make install + cd $(DIR_SRC)/foomatic-db-engine-$(VER) && ./configure --prefix=/usr --sysconfdir=/etc + cd $(DIR_SRC)/foomatic-db-engine-$(VER) && make $(MAKETUNING) + cd $(DIR_SRC)/foomatic-db-engine-$(VER) && make install + cd $(DIR_SRC)/foomatic-db-hpijs-$(DATE) && ./configure --prefix=/usr --sysconfdir=/etc + cd $(DIR_SRC)/foomatic-db-hpijs-$(DATE) && make $(MAKETUNING) + cd $(DIR_SRC)/foomatic-db-hpijs-$(DATE) && make install + @rm -rf $(DIR_SRC)/foomatic-* + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 69441111f3..8abfb885d7 100755 --- a/make.sh +++ b/make.sh @@ -476,8 +476,9 @@ buildipfire() { ipfiremake lzo ipfiremake openvpn ipfiremake pammysql - ipfiremake ghostscript ipfiremake cups + ipfiremake ghostscript + ipfiremake foomatic ipfiremake samba ipfiremake sudo ipfiremake mc -- 2.39.2