From c3defe9b3f1d87d87591343cc47db69a4cafd154 Mon Sep 17 00:00:00 2001 From: ms Date: Thu, 20 Apr 2006 14:20:28 +0000 Subject: [PATCH] =?utf8?q?Hinzugef=C3=BCgt:=20=20=20*=20Sane=20-=20Scannin?= =?utf8?q?g=20=20=20*=20LibJPEG=20Ge=C3=A4ndert:=20=20=20*=20pwlib=20=20?= =?utf8?q?=20*=20xinetd?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@105 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- doc/packages-list.txt | 4 ++ lfs/libjpeg | 82 ++++++++++++++++++++++++++++++++ lfs/pwlib | 8 ++-- lfs/sane | 88 +++++++++++++++++++++++++++++++++++ lfs/xinetd | 2 +- make.sh | 6 ++- src/paks/libjpeg/CONFFILES | 0 src/paks/libjpeg/ROOTFILES | 19 ++++++++ src/paks/libjpeg/install.sh | 11 +++++ src/paks/libjpeg/uninstall.sh | 10 ++++ src/paks/sane/CONFFILES | 0 src/paks/sane/ROOTFILES | 0 src/paks/sane/install.sh | 11 +++++ src/paks/sane/uninstall.sh | 10 ++++ 14 files changed, 243 insertions(+), 8 deletions(-) create mode 100644 lfs/libjpeg create mode 100644 lfs/sane create mode 100644 src/paks/libjpeg/CONFFILES create mode 100644 src/paks/libjpeg/ROOTFILES create mode 100644 src/paks/libjpeg/install.sh create mode 100644 src/paks/libjpeg/uninstall.sh create mode 100644 src/paks/sane/CONFFILES create mode 100644 src/paks/sane/ROOTFILES create mode 100644 src/paks/sane/install.sh create mode 100644 src/paks/sane/uninstall.sh diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 9576faf304..de4f590f35 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -87,6 +87,7 @@ * iputils-ss020927 * isapnptools-1.26 * isdn4k-utils.v3.2p1 + * jpegsrc.v6b * kbd-1.12 * kudzu-0.99.50 * less-382 @@ -147,9 +148,12 @@ * psmisc-21.4 * pulsar-4.0.19 * pwlib-ipfire1 + * pwlib-ipfire1 * rp-pppoe-3.5 * rrdtool-1.0.49 * samba-3.0.22 + * sane-backends-1.0.17 + * sane-backends-1.0.17_1st * sed-4.0.9 * setserial-2.17 * shadow-4.0.4.1 diff --git a/lfs/libjpeg b/lfs/libjpeg new file mode 100644 index 0000000000..99763ec003 --- /dev/null +++ b/lfs/libjpeg @@ -0,0 +1,82 @@ +############################################################################### +# 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 + +VER = v6b + +THISAPP = jpegsrc.$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = ftp://ftp.uu.net/graphics/jpeg +DIR_APP = $(DIR_SRC)/jpeg-6b +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = dbd5f3b47ed13132f04c685d608a7547 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + make-packages.sh libjpeg $(THISAPP)-ipfire-beta-1 + +############################################################################### +# 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_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared && \ + make + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/pwlib b/lfs/pwlib index 37207c0037..6390266d5c 100644 --- a/lfs/pwlib +++ b/lfs/pwlib @@ -75,11 +75,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xfz $(DIR_DL)/$(DL_FILE) - ln -sf -v $(DIR_SRC)/pwlib* $(DIR_APP) -# mv -f $(DIR_SRC)/pwlib* $(DIR_SRC)/pwlib -# mv -f /usr/include/ldap.h / + rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xfz $(DIR_DL)/$(DL_FILE) + if [ -f /usr/include/ldap.h ]; then mv -f /usr/include/ldap.h / ; fi cd $(DIR_APP) && ./configure --prefix=/usr -# mv -f /ldap.h /usr/include + if [ -f /ldap.h ]; then mv -f /ldap.h /usr/include/ ; fi cd $(DIR_APP) && make opt && make install @$(POSTBUILD) diff --git a/lfs/sane b/lfs/sane new file mode 100644 index 0000000000..4e02215c7d --- /dev/null +++ b/lfs/sane @@ -0,0 +1,88 @@ +############################################################################### +# 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 # +# # +# Modifications by: # +# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # +# - Modified Makefile for IPCop build # +# # +# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $ +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.17 + +THISAPP = sane-backends-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = ftp://ftp.sane-project.org/pub/sane/$(THISAPP) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = b51c10da8a81a04e1bae88c9e6556df2 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + make-packages.sh sane $(THISAPP)-ipfire-beta-1 + +############################################################################### +# 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_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-translations && \ + make + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/xinetd b/lfs/xinetd index b5c47b006a..d611055246 100644 --- a/lfs/xinetd +++ b/lfs/xinetd @@ -53,7 +53,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) dist: - make-packages.sh xinetd $(THISAPP) + make-packages.sh xinetd $(THISAPP)-ipfire-beta-1 ############################################################################### # Downloading, checking, md5sum diff --git a/make.sh b/make.sh index c527cf1a03..b0cefc36ec 100644 --- a/make.sh +++ b/make.sh @@ -646,6 +646,7 @@ buildipcop() { ## Zuerst die Libs und dann die Programme. Ordnung muss sein! ipcopmake berkeley ipcopmake libtiff + ipcopmake libjpeg ipcopmake libxml2 ipcopmake spandsp ipcopmake lzo @@ -671,6 +672,7 @@ buildipcop() { ipcopmake openvpn ipcopmake asterisk ipcopmake edonkeyclc + ipcopmake sane # wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db # ipcopmake hddtemp # ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen @@ -759,8 +761,8 @@ buildpackages() { # packages-list.txt is ready to be displayed for wiki page # Create ISO for CDRom and USB-superfloppy -# ipcopmake cdrom -# cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1 + ipcopmake cdrom + cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1 # Build IPFire packages ipfiredist asterisk diff --git a/src/paks/libjpeg/CONFFILES b/src/paks/libjpeg/CONFFILES new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/libjpeg/ROOTFILES b/src/paks/libjpeg/ROOTFILES new file mode 100644 index 0000000000..df76fec489 --- /dev/null +++ b/src/paks/libjpeg/ROOTFILES @@ -0,0 +1,19 @@ +usr/bin/cjpeg +usr/bin/djpeg +usr/bin/jpegtran +usr/bin/rdjpgcom +usr/bin/wrjpgcom +#usr/include/jconfig.h +#usr/include/jerror.h +#usr/include/jmorecfg.h +#usr/include/jpeglib.h +usr/lib/libjpeg.a +usr/lib/libjpeg.la +usr/lib/libjpeg.so +usr/lib/libjpeg.so.62 +usr/lib/libjpeg.so.62.0.0 +#usr/share/man/man1/cjpeg.1 +#usr/share/man/man1/djpeg.1 +#usr/share/man/man1/jpegtran.1 +#usr/share/man/man1/rdjpgcom.1 +#usr/share/man/man1/wrjpgcom.1 diff --git a/src/paks/libjpeg/install.sh b/src/paks/libjpeg/install.sh new file mode 100644 index 0000000000..3a9ce551bf --- /dev/null +++ b/src/paks/libjpeg/install.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# +################################################################# +# # +# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org # +# # +################################################################# +# +# Extract the files +tar xfz files.tgz -C / +cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2 diff --git a/src/paks/libjpeg/uninstall.sh b/src/paks/libjpeg/uninstall.sh new file mode 100644 index 0000000000..ad6122665e --- /dev/null +++ b/src/paks/libjpeg/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/bash +################################################################# +# # +# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org # +# # +################################################################# +# +# Delete the files +## Befehl fehlt noch +rm -f /opt/pakfire/installed/ROOTFILES.$2 diff --git a/src/paks/sane/CONFFILES b/src/paks/sane/CONFFILES new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/sane/ROOTFILES b/src/paks/sane/ROOTFILES new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/sane/install.sh b/src/paks/sane/install.sh new file mode 100644 index 0000000000..3a9ce551bf --- /dev/null +++ b/src/paks/sane/install.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# +################################################################# +# # +# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org # +# # +################################################################# +# +# Extract the files +tar xfz files.tgz -C / +cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2 diff --git a/src/paks/sane/uninstall.sh b/src/paks/sane/uninstall.sh new file mode 100644 index 0000000000..ad6122665e --- /dev/null +++ b/src/paks/sane/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/bash +################################################################# +# # +# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org # +# # +################################################################# +# +# Delete the files +## Befehl fehlt noch +rm -f /opt/pakfire/installed/ROOTFILES.$2 -- 2.39.2