From 0145f271e10034de8af568e38c64061e38ce341e Mon Sep 17 00:00:00 2001 From: delaco Date: Tue, 12 Sep 2006 21:47:37 +0000 Subject: [PATCH] Hinzugefuegt: * Yasuc * Wireless Tools (reanimiert) Updates: * fcron * pulsar * unicorn Fixes: * readline * lfs/Config git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@276 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- doc/ChangeLog | 6 ++ doc/packages-list.txt | 5 +- lfs/Config | 20 ++-- lfs/fcron | 28 ++++-- lfs/makedev | 8 +- lfs/pulsar | 18 +--- lfs/readline | 2 +- lfs/unicorn | 23 ++--- lfs/wireless | 4 +- lfs/yasuc | 83 ++++++++++++++++ make.sh | 4 +- src/ROOTFILES.i386 | 107 ++++++++++++++++++--- src/paks/yasuc/ROOTFILES | 1 + src/paks/yasuc/install.sh | 10 ++ src/paks/yasuc/uninstall.sh | 8 ++ src/patches/readline-5.1-fixes-3.patch | 128 +++++++++++++++++++++++++ 16 files changed, 389 insertions(+), 66 deletions(-) create mode 100644 lfs/yasuc create mode 100644 src/paks/yasuc/ROOTFILES create mode 100644 src/paks/yasuc/install.sh create mode 100644 src/paks/yasuc/uninstall.sh create mode 100644 src/patches/readline-5.1-fixes-3.patch diff --git a/doc/ChangeLog b/doc/ChangeLog index 2293dd867d..e4eb78e55e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,10 @@ ------------------------------------------------------------------------ +r275 | ms | 2006-09-12 22:23:29 +0200 (Tue, 12 Sep 2006) | 3 lines + +Geaendert: + * OpenSSL-Update wegen Sicherheitluecke. + * Mache ROOTFILES passend um weniger zu aendern bei Kernelupdate. +------------------------------------------------------------------------ r274 | ms | 2006-09-12 20:51:47 +0200 (Tue, 12 Sep 2006) | 1 line Neues Bild fuers Bootmenue! diff --git a/doc/packages-list.txt b/doc/packages-list.txt index c493292713..16f37d7d87 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -114,7 +114,8 @@ * inetutils-1.4.2 * ipac-ng-1.31 * ipaddr-1.2 - * ipfire-logs-2006-09-05-09:07.tgz + * ipfire-logs-2006-09-11-21:49.tgz + * ipfire-logs-2006-09-12-17:01.tgz * iproute2-2.4.7-now-ss010824 * iptables-1.3.5 * iptraf-3.0.0 @@ -196,7 +197,7 @@ * pkg-config-0.20 * popt-1.7 * portmap_5beta - * postfix-2.2.10 + * postfix-2.2.11 * postfix-2.2.11 * ppp-2.4.2 * pptp-1.6.0 diff --git a/lfs/Config b/lfs/Config index fe6149aab9..9a81690c79 100644 --- a/lfs/Config +++ b/lfs/Config @@ -86,25 +86,27 @@ ifeq "$(ROOT)" "" define POSTBUILD @echo "Install done; saving file list to $(DIR_INFO)/$(THISAPP) ..." @$(FIND_FILES) > $(DIR_SRC)/lsalrnew - @diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' | sort > $(TARGET)_1 + @diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' | sort > $(TARGET)_diff @cp -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr @rm -f $(DIR_SRC)/lsalrnew - sed -i -e 's+.\/++' $(TARGET)_1 + sed -i -e 's+.\/++' $(TARGET)_diff # compare roofile ( same name as lfs script) with the list of installed files # special cases - # - on a partial rebuild without a new file inside TARGET_1, just touch TARGET - if [ -s "$(TARGET)_1" ]; then \ + # - on a partial rebuild without a new file inside TARGET_diff, just touch TARGET + if [ -s "$(TARGET)_diff" ]; then \ ROOTFILE=$(DIR_SRC)/src/ROOTFILES.$(MACHINE); \ - for line in `cat $(TARGET)_1`; do \ - if grep -qE "^#$$line$$" $$ROOTFILE ; then echo "#$$line" >> $(TARGET); \ - elif grep -qE "^$$line$$" $$ROOTFILE ; then echo "$$line" >> $(TARGET); \ + sed "s/KVER/$(KVER)/g" $$ROOTFILE > $(TARGET)_rootfile; \ + for line in `cat $(TARGET)_diff`; do \ + if grep -qE "^#$$line$$" $(TARGET)_rootfile ; then echo "#$$line" >> $(TARGET); \ + elif grep -qE "^$$line$$" $(TARGET)_rootfile ; then echo "$$line" >> $(TARGET); \ else echo "+$$line" >> $(TARGET); \ fi; \ done; \ + rm -f $(TARGET)_rootfile; \ else \ touch $(TARGET); \ fi - @rm -f $(TARGET)_1 + @rm -f $(TARGET)_diff endef else define POSTBUILD @@ -130,7 +132,7 @@ define MD5 # error mean file signature don't match the one in lfs script [ "$($@_MD5)" = `md5sum $(DIR_DL)/$@ | awk '{ print $$1 }'` ] echo "$@ checksum OK" - echo "$@" >>$(DIR_INFO)/_build.packages-list.log + echo "$@" >>$(DIR_INFO)/_build.othersrc-list.log endef define PAK diff --git a/lfs/fcron b/lfs/fcron index 1db9b9bc68..b829fdb35a 100644 --- a/lfs/fcron +++ b/lfs/fcron @@ -22,7 +22,7 @@ # ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # # - Modified Makefile for IPCop build # # # -# $Id: fcron,v 1.5.2.4 2005/02/05 15:38:14 gespinasse Exp $ +# $Id: fcron,v 1.5.2.5 2006/09/07 00:27:44 franck78 Exp $ # # ############################################################################### @@ -32,7 +32,7 @@ include Config -VER = 2.0.2 +VER = 3.0.1 THISAPP = fcron-$(VER) DL_FILE = $(THISAPP).src.tar.gz @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 416c55d8a484eb6c9907828009fd649c +$(DL_FILE)_MD5 = 8e5dcb3a646c11294294895954ef0a48 install : $(TARGET) @@ -78,12 +78,22 @@ $(subst %,%_MD5,$(objects)) : $(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 --disable-nls \ - --without-sendmail \ - --with-spooldir=/var/spool/cron \ - --with-username=cron --with-groupname=cron - cd $(DIR_APP) && yes 'n' | make - cd $(DIR_APP) && yes 'n' | make install + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-nls \ + --without-sendmail \ + --with-spooldir=/var/spool/cron \ + --with-fifodir=/var/run \ + --with-username=cron \ + --with-groupname=cron \ + --with-run-non-privileged=no \ + --with-fcrondyn=no \ + --with-sysfcrontab=no \ + --with-boot-install=no \ + --with-pam=no \ + --with-selinux=no + cd $(DIR_APP) && make + cd $(DIR_APP) && make install echo "root" > /etc/fcron.allow echo "all" > /etc/fcron.deny chmod u-s /usr/bin/fcrontab /usr/bin/fcronsighup diff --git a/lfs/makedev b/lfs/makedev index 1b8543577a..87defd4075 100644 --- a/lfs/makedev +++ b/lfs/makedev @@ -22,7 +22,7 @@ # ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # # - Modified Makefile for IPCop build # # # -# $Id: makedev,v 1.11.2.3 2005/02/05 15:38:15 gespinasse Exp $ +# $Id: makedev,v 1.11.2.4 2006/09/06 05:33:17 gespinasse Exp $ # # ############################################################################### @@ -117,6 +117,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mknod /dev/usb/ttyACM$$i c 166 $$i; \ done + # Wanpipe + for i in `seq 0 7`; do \ + rm -f /dev/ttyWP$$i; \ + mknod -m 666 /dev/ttyWP$$i c 240 $$i; \ + done + # Add a symlink to the default floppy dev. updfstab will change it to USB if # necessary, but it must be present if it appears in /etc/mtab cd /dev && ln -sf fd0 floppy diff --git a/lfs/pulsar b/lfs/pulsar index 9f6cd85941..fa4b60f1b1 100644 --- a/lfs/pulsar +++ b/lfs/pulsar @@ -22,7 +22,7 @@ # 17-03-2004 Mark Wormgoor < mark@wormgoor.com> # # - Modified Makefile for IPCop build # # # -# $Id: pulsar,v 1.1.2.17 2005/07/05 15:11:12 gespinasse Exp $ +# $Id: pulsar,v 1.1.2.18 2006/08/23 07:03:38 gespinasse Exp $ # # ############################################################################### @@ -32,7 +32,7 @@ include Config -VER = 4.0.19 +VER = 4.0.21 THISAPP = pulsar-$(VER) DL_FILE = $(THISAPP).tgz @@ -52,7 +52,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 224fb4855c34e1982049bd01ba3d2732 +$(DL_FILE)_MD5 = a78649a0d9a0791edab6a43f3083f1fb install : $(TARGET) @@ -84,19 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && mv libpulsar_fw3.a libpulsar_fw.a cd $(DIR_APP) && cp makefile.2.4 makefile -ifeq "$(SMP)" "" - cd $(DIR_APP) && sed -i \ - -e 's/$$(shell uname -m)/$(MACHINE)/' \ - -e 's/$$(shell uname -r)/$(KVER)/' \ - -e 's%^.*DEST_KERNEL_MAIN =.*$$%DEST_KERNEL_MAIN = 2.4%' makefile -else - cd $(DIR_APP) && sed -i \ - -e 's/$$(shell uname -m)/$(MACHINE)/' \ - -e 's/$$(shell uname -r)/$(KVER)-smp/' \ - -e 's%^.*DEST_KERNEL_MAIN =.*$$%DEST_KERNEL_MAIN = 2.4%' makefile -endif cd $(DIR_APP) && sed -i \ - -e 's%^.*CC.*=.*$$%CC = $(KGCC)%' \ -e 's%-falign-loops=2 -falign-jumps=2 -falign-functions=2%-DMODVERSIONS -include /usr/src/linux/include/linux/modversions.h%' makefile cd $(DIR_APP) && make clean cd $(DIR_APP) && make pulsar_atm.o diff --git a/lfs/readline b/lfs/readline index 1e73f84334..fdc38e557f 100644 --- a/lfs/readline +++ b/lfs/readline @@ -72,7 +72,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/readline-5.1-fixes-3.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/patches/readline-5.1-fixes-3.patch cd $(DIR_APP) && sed -i '/MV.*old/d' Makefile.in cd $(DIR_APP) && sed -i '/{OLDSUFF}/c:' support/shlib-install cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/lib diff --git a/lfs/unicorn b/lfs/unicorn index 9c9ea8d9a9..bc16da1fc5 100644 --- a/lfs/unicorn +++ b/lfs/unicorn @@ -22,7 +22,7 @@ # ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # # - Modified Makefile for IPCop build # # # -# $Id: unicorn,v 1.13.2.8 2005/02/05 15:38:16 gespinasse Exp $ +# $Id: unicorn,v 1.13.2.9 2006/08/23 07:03:38 gespinasse Exp $ # # ############################################################################### @@ -32,10 +32,10 @@ include Config -VER = 0.9.0 +VER = 0.9.3 THISAPP = bast-$(VER) -DL_FILE = $(THISAPP).tgz +DL_FILE = A1012-A1006-A904-A888-A983-$(VER).tgz DL_FROM = http://www.bewan.com/bewan/drivers DIR_APP = $(DIR_SRC)/unicorn ifeq "$(SMP)" "" @@ -52,7 +52,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8b4f880e79d9d23029cc8f85e2f6478a +$(DL_FILE)_MD5 = ff9829f03168279a079d05aea780ee99 install : $(TARGET) @@ -82,20 +82,13 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - sed -i -e 's%^CC=gcc.*$$%CC=$(KGCC)%' $(DIR_APP)/unicorn_pci/Makefile - sed -i -e 's%^CC=gcc.*$$%CC=$(KGCC)%' $(DIR_APP)/unicorn_usb/Makefile - sed -i -e 's%^PATCHLEVEL.*$$%PATCHLEVEL=4%' $(DIR_APP)/unicorn_pci/Makefile - sed -i -e 's%^PATCHLEVEL.*$$%PATCHLEVEL=4%' $(DIR_APP)/unicorn_usb/Makefile - sed -i -e 's%^COPTIONS.*$$%CXX=$(KGCC) -x c++%' $(DIR_APP)/unicorn_pci/Makefile ifeq "$(SMP)" "" - sed -i -e 's%^KVERS.*$$%KVERS=$(KVER)%' $(DIR_APP)/unicorn_usb/Makefile - sed -i -e 's%^KVERS.*$$%KVERS=$(KVER)%' $(DIR_APP)/unicorn_pci/Makefile + cd $(DIR_APP) && make PATCHLEVEL=4 KVERS=$(KVER) modules + cd $(DIR_APP) && make KVERS=$(KVER) only_modules_install else - sed -i -e 's%^KVERS.*$$%KVERS=$(KVER)-smp%' $(DIR_APP)/unicorn_usb/Makefile - sed -i -e 's%^KVERS.*$$%KVERS=$(KVER)-smp%' $(DIR_APP)/unicorn_pci/Makefile + cd $(DIR_APP) && make PATCHLEVEL=4 KVERS=$(KVER)-smp modules + cd $(DIR_APP) && make KVERS=$(KVER)-smp only_modules_install endif - cd $(DIR_APP) && make modules - cd $(DIR_APP) && make only_modules_install ifeq "$(SMP)" "" find /lib/modules/$(KVER)/ -name '*.o' -a -type f | xargs gzip -f9 cd $(DIR_APP)/tools && sed -i 's%^prefix=.*$$%prefix=/usr%' Makefile diff --git a/lfs/wireless b/lfs/wireless index 17553adb71..d4a7a1ba7c 100644 --- a/lfs/wireless +++ b/lfs/wireless @@ -26,7 +26,7 @@ include Config -VER = 27 +VER = 28 THISAPP = wireless_tools.$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 29891b66f23565e7e381d28404abb29a +$(DL_FILE)_MD5 = 599c94497f9c9073c7b052d3dcb7cd16 install : $(TARGET) diff --git a/lfs/yasuc b/lfs/yasuc new file mode 100644 index 0000000000..70772bc532 --- /dev/null +++ b/lfs/yasuc @@ -0,0 +1,83 @@ +############################################################################### +# 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 = 0.4.1 + +THISAPP = yasuc-$(VER) +DL_FILE = $(THISAPP)_x86_linux.tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/dist/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = yasuc +PAK_VER = 1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 7cdf8534c6b9acba168c14594082d039 + +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_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && cp -f yasuc /usr/bin/yasuc + chmod 755 /usr/bin/yasuc + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 63ec88e241..b8bd04d30d 100644 --- a/make.sh +++ b/make.sh @@ -682,7 +682,7 @@ buildipcop() { ipcopmake tcpdump ipcopmake traceroute ipcopmake vlan - #ipcopmake wireless + ipcopmake wireless ipcopmake libsafe ipcopmake 3c5x9setup # echo -ne "`date -u '+%b %e %T'`: Building ### IPFire modules ### \n" | tee -a $LOGFILE @@ -770,6 +770,7 @@ buildipcop() { ipcopmake subversion ipcopmake iptraf ipcopmake nagios + ipcopmake yasuc # ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen } @@ -919,6 +920,7 @@ ipfirepackages() { ipfiredist xampp # ipfiredist xinetd ipfiredist xvid + ipfiredist yasuc test -d $BASEDIR/packages || mkdir $BASEDIR/packages mv -f $LFS/install/packages/*.{ipfire,md5} $BASEDIR/packages >> $LOGFILE 2>&1 rm -rf $BASEDIR/build/install/packages/* diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386 index 2f0056817d..743f7a3bcf 100644 --- a/src/ROOTFILES.i386 +++ b/src/ROOTFILES.i386 @@ -22186,7 +22186,7 @@ lib/modules/2.4.33-smp/misc/fcpci.o.gz lib/modules/2.4.33/misc/fcclassic.o.gz lib/modules/2.4.33-smp/misc/fcclassic.o.gz ## -## fcron-2.0.2 +## fcron-3.0.1 ## etc/fcron.allow etc/fcron.conf @@ -22200,21 +22200,83 @@ etc/fcron.weekly usr/bin/fcronsighup usr/bin/fcrontab usr/sbin/fcron -#usr/share/doc/fcron-2.0.1 -#usr/share/doc/fcron-2.0.1/fcron.conf.5.html -#usr/share/doc/fcron-2.0.1/LICENSE -#usr/share/doc/fcron-2.0.1/README -#usr/share/doc/fcron-2.0.1/fcron.8.html -#usr/share/doc/fcron-2.0.1/CHANGES -#usr/share/doc/fcron-2.0.1/fcrontab.1.html -#usr/share/doc/fcron-2.0.1/fcrontab.5.html +#usr/share/doc/fcron-3.0.1 +#usr/share/doc/fcron-3.0.1/en +#usr/share/doc/fcron-3.0.1/en/HTML +#usr/share/doc/fcron-3.0.1/en/HTML/LEGALNOTICE.html +#usr/share/doc/fcron-3.0.1/en/HTML/changes.html +#usr/share/doc/fcron-3.0.1/en/HTML/faq.html +#usr/share/doc/fcron-3.0.1/en/HTML/fcron.8.html +#usr/share/doc/fcron-3.0.1/en/HTML/fcron.conf.5.html +#usr/share/doc/fcron-3.0.1/en/HTML/fcrondyn.1.html +#usr/share/doc/fcron-3.0.1/en/HTML/fcrontab.1.html +#usr/share/doc/fcron-3.0.1/en/HTML/fcrontab.5.html +#usr/share/doc/fcron-3.0.1/en/HTML/fdl.html +#usr/share/doc/fcron-3.0.1/en/HTML/gpl.html +#usr/share/doc/fcron-3.0.1/en/HTML/how-and-why.html +#usr/share/doc/fcron-3.0.1/en/HTML/index.html +#usr/share/doc/fcron-3.0.1/en/HTML/install.html +#usr/share/doc/fcron-3.0.1/en/HTML/manpages.html +#usr/share/doc/fcron-3.0.1/en/HTML/readme.html +#usr/share/doc/fcron-3.0.1/en/HTML/relnotes.html +#usr/share/doc/fcron-3.0.1/en/HTML/thanks.html +#usr/share/doc/fcron-3.0.1/en/HTML/todo.html +#usr/share/doc/fcron-3.0.1/en/HTML/using-fcron.html +#usr/share/doc/fcron-3.0.1/en/txt +#usr/share/doc/fcron-3.0.1/en/txt/changes.txt +#usr/share/doc/fcron-3.0.1/en/txt/faq.txt +#usr/share/doc/fcron-3.0.1/en/txt/gpl.txt +#usr/share/doc/fcron-3.0.1/en/txt/install.txt +#usr/share/doc/fcron-3.0.1/en/txt/readme.txt +#usr/share/doc/fcron-3.0.1/en/txt/relnotes.txt +#usr/share/doc/fcron-3.0.1/en/txt/thanks.txt +#usr/share/doc/fcron-3.0.1/en/txt/todo.txt +#usr/share/doc/fcron-3.0.1/fr +#usr/share/doc/fcron-3.0.1/fr/HTML +#usr/share/doc/fcron-3.0.1/fr/HTML/LEGALNOTICE.html +#usr/share/doc/fcron-3.0.1/fr/HTML/changes.html +#usr/share/doc/fcron-3.0.1/fr/HTML/faq.html +#usr/share/doc/fcron-3.0.1/fr/HTML/fcron.8.html +#usr/share/doc/fcron-3.0.1/fr/HTML/fcron.conf.5.html +#usr/share/doc/fcron-3.0.1/fr/HTML/fcrondyn.1.html +#usr/share/doc/fcron-3.0.1/fr/HTML/fcrontab.1.html +#usr/share/doc/fcron-3.0.1/fr/HTML/fcrontab.5.html +#usr/share/doc/fcron-3.0.1/fr/HTML/fdl.html +#usr/share/doc/fcron-3.0.1/fr/HTML/gpl.html +#usr/share/doc/fcron-3.0.1/fr/HTML/how-and-why.html +#usr/share/doc/fcron-3.0.1/fr/HTML/index.html +#usr/share/doc/fcron-3.0.1/fr/HTML/install.html +#usr/share/doc/fcron-3.0.1/fr/HTML/manpages.html +#usr/share/doc/fcron-3.0.1/fr/HTML/readme.html +#usr/share/doc/fcron-3.0.1/fr/HTML/relnotes.html +#usr/share/doc/fcron-3.0.1/fr/HTML/thanks.html +#usr/share/doc/fcron-3.0.1/fr/HTML/todo.html +#usr/share/doc/fcron-3.0.1/fr/HTML/using-fcron.html +#usr/share/doc/fcron-3.0.1/fr/txt +#usr/share/doc/fcron-3.0.1/fr/txt/changes.txt +#usr/share/doc/fcron-3.0.1/fr/txt/faq.txt +#usr/share/doc/fcron-3.0.1/fr/txt/gpl.txt +#usr/share/doc/fcron-3.0.1/fr/txt/install.txt +#usr/share/doc/fcron-3.0.1/fr/txt/readme.txt +#usr/share/doc/fcron-3.0.1/fr/txt/relnotes.txt +#usr/share/doc/fcron-3.0.1/fr/txt/thanks.txt +#usr/share/doc/fcron-3.0.1/fr/txt/todo.txt +#usr/share/man/fr/man1/fcrondyn.1 +#usr/share/man/fr/man1/fcrontab.1 +#usr/share/man/fr/man3 +#usr/share/man/fr/man3/bitstring.3 +#usr/share/man/fr/man5/fcron.conf.5 +#usr/share/man/fr/man5/fcrontab.5 +#usr/share/man/fr/man8/fcron.8 +#usr/share/man/man1/fcrondyn.1 #usr/share/man/man1/fcrontab.1 #usr/share/man/man3/bitstring.3 -#usr/share/man/man5/fcrontab.5 #usr/share/man/man5/fcron.conf.5 +#usr/share/man/man5/fcrontab.5 #usr/share/man/man8/fcron.8 -var/spool/cron/root.orig +#var/spool/cron var/spool/cron/new.root +var/spool/cron/root.orig ## ## GD-2.12 ## @@ -28205,3 +28267,26 @@ usr/lib/php #usr/share/man/man1/php-config.1 #usr/share/man/man1/php.1 #usr/share/man/man1/phpize.1 +## +## wireless_tools.28 +## +#usr/include/iwlib.h +#usr/include/wireless.h +usr/lib/libiw.so +usr/lib/libiw.so.28 +usr/sbin/ifrename +usr/sbin/iwconfig +usr/sbin/iwevent +usr/sbin/iwgetid +usr/sbin/iwlist +usr/sbin/iwpriv +usr/sbin/iwspy +#usr/share/man/man5/iftab.5 +#usr/share/man/man7/wireless.7 +#usr/share/man/man8/ifrename.8 +#usr/share/man/man8/iwconfig.8 +#usr/share/man/man8/iwevent.8 +#usr/share/man/man8/iwgetid.8 +#usr/share/man/man8/iwlist.8 +#usr/share/man/man8/iwpriv.8 +#usr/share/man/man8/iwspy.8 diff --git a/src/paks/yasuc/ROOTFILES b/src/paks/yasuc/ROOTFILES new file mode 100644 index 0000000000..c81bf322e8 --- /dev/null +++ b/src/paks/yasuc/ROOTFILES @@ -0,0 +1 @@ +usr/bin/yasuc diff --git a/src/paks/yasuc/install.sh b/src/paks/yasuc/install.sh new file mode 100644 index 0000000000..2f78907fa2 --- /dev/null +++ b/src/paks/yasuc/install.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +################################################################# +# # +# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org # +# # +################################################################# +# +# Extract the files +tar xfz files.tgz -C / diff --git a/src/paks/yasuc/uninstall.sh b/src/paks/yasuc/uninstall.sh new file mode 100644 index 0000000000..7ee2885e73 --- /dev/null +++ b/src/paks/yasuc/uninstall.sh @@ -0,0 +1,8 @@ +#!/bin/bash +################################################################# +# # +# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org # +# # +################################################################# +# +# Delete the files diff --git a/src/patches/readline-5.1-fixes-3.patch b/src/patches/readline-5.1-fixes-3.patch new file mode 100644 index 0000000000..e0fb8756a5 --- /dev/null +++ b/src/patches/readline-5.1-fixes-3.patch @@ -0,0 +1,128 @@ +Submitted By: Matthew Burgess (matthew at linuxfromscratch dot org) +Date: 2006-03-17 +Initial Package Version: 5.1 +Origin: http://ftp.gnu.org/gnu/readline/readline-5.1-patches/ +Upstream Status: From Upstream +Description: Contains Patch 001-004 from Upstream + +diff -Naur readline-5.1.orig/display.c readline-5.1/display.c +--- readline-5.1.orig/display.c 2005-11-30 19:05:02.000000000 +0000 ++++ readline-5.1/display.c 2006-03-17 16:03:09.000000000 +0000 +@@ -1983,11 +1983,15 @@ + int pchar; + { + int len; +- char *pmt; ++ char *pmt, *p; + + rl_save_prompt (); + +- if (saved_local_prompt == 0) ++ /* We've saved the prompt, and can do anything with the various prompt ++ strings we need before they're restored. We want the unexpanded ++ portion of the prompt string after any final newline. */ ++ p = rl_prompt ? strrchr (rl_prompt, '\n') : 0; ++ if (p == 0) + { + len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0; + pmt = (char *)xmalloc (len + 2); +@@ -1998,19 +2002,17 @@ + } + else + { +- len = *saved_local_prompt ? strlen (saved_local_prompt) : 0; ++ p++; ++ len = strlen (p); + pmt = (char *)xmalloc (len + 2); + if (len) +- strcpy (pmt, saved_local_prompt); ++ strcpy (pmt, p); + pmt[len] = pchar; + pmt[len+1] = '\0'; +- local_prompt = savestring (pmt); +- prompt_last_invisible = saved_last_invisible; +- prompt_visible_length = saved_visible_length + 1; +- } ++ } + ++ /* will be overwritten by expand_prompt, called from rl_message */ + prompt_physical_chars = saved_physical_chars + 1; +- + return pmt; + } + +diff -Naur readline-5.1.orig/readline.c readline-5.1/readline.c +--- readline-5.1.orig/readline.c 2005-07-05 02:29:35.000000000 +0000 ++++ readline-5.1/readline.c 2006-03-17 16:03:05.000000000 +0000 +@@ -282,6 +282,7 @@ + { + FREE (rl_prompt); + rl_prompt = prompt ? savestring (prompt) : (char *)NULL; ++ rl_display_prompt = rl_prompt ? rl_prompt : ""; + + rl_visible_prompt_length = rl_expand_prompt (rl_prompt); + return 0; +@@ -714,7 +715,7 @@ + + rl_dispatching = 1; + RL_SETSTATE(RL_STATE_DISPATCHING); +- r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key); ++ (*map[key].function)(rl_numeric_arg * rl_arg_sign, key); + RL_UNSETSTATE(RL_STATE_DISPATCHING); + rl_dispatching = 0; + +diff -Naur readline-5.1.orig/terminal.c readline-5.1/terminal.c +--- readline-5.1.orig/terminal.c 2005-11-13 01:46:54.000000000 +0000 ++++ readline-5.1/terminal.c 2006-03-17 16:03:02.000000000 +0000 +@@ -122,7 +122,7 @@ + static char *_rl_visible_bell; + + /* Non-zero means the terminal can auto-wrap lines. */ +-int _rl_term_autowrap; ++int _rl_term_autowrap = -1; + + /* Non-zero means that this terminal has a meta key. */ + static int term_has_meta; +@@ -274,6 +274,9 @@ + _rl_set_screen_size (rows, cols) + int rows, cols; + { ++ if (_rl_term_autowrap == -1) ++ _rl_init_terminal_io (rl_terminal_name); ++ + if (rows > 0) + _rl_screenheight = rows; + if (cols > 0) +diff -Naur readline-5.1.orig/text.c readline-5.1/text.c +--- readline-5.1.orig/text.c 2005-09-24 23:06:07.000000000 +0000 ++++ readline-5.1/text.c 2006-03-17 16:02:58.000000000 +0000 +@@ -1071,8 +1071,6 @@ + rl_delete (count, key) + int count, key; + { +- int r; +- + if (count < 0) + return (_rl_rubout_char (-count, key)); + +@@ -1090,17 +1088,17 @@ + else + rl_forward_byte (count, key); + +- r = rl_kill_text (orig_point, rl_point); ++ rl_kill_text (orig_point, rl_point); + rl_point = orig_point; +- return r; + } + else + { + int new_point; + + new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO); +- return (rl_delete_text (rl_point, new_point)); ++ rl_delete_text (rl_point, new_point); + } ++ return 0; + } + + /* Delete the character under the cursor, unless the insertion -- 2.39.2