From 0eab8e84898744ed06427c167b9167ee63956721 Mon Sep 17 00:00:00 2001 From: ms Date: Wed, 24 May 2006 17:42:02 +0000 Subject: [PATCH] =?utf8?q?Hinzugef=C3=BCgt:=20=20=20*=20Erste=20Version=20?= =?utf8?q?von=20CONFIRE.=20=20=20*=20./make.sh=20sync=20l=C3=A4dt=20nun=20?= =?utf8?q?alle=20neuen=20Dateien=20auf=20den=20FTP-Server.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@135 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- lfs/pakfire | 4 ++++ make.sh | 23 ++++++++++++++++++++--- src/ROOTFILES.i386 | 1 + src/confire/confire | 17 +++++++++++++++++ 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 src/confire/confire diff --git a/lfs/pakfire b/lfs/pakfire index c554869184..d292335840 100644 --- a/lfs/pakfire +++ b/lfs/pakfire @@ -51,6 +51,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && cp -fRv src/pakfire $(DIR_APP) cd $(DIR_APP) && mv -vf pakfire.conf /etc cd $(DIR_APP) && chown root.root $(DIR_APP) -R && chmod 755 pakfire lib/* + cd /opt && mkdir -p /opt/confire/paks + cd /opt/confire && cp -fRv $(DIR_SRC)/src/confire/* . + cd /opt/confire && chown root.root /opt/confire -R && chmod 755 confire paks/* # cd $(DIR_APP) && find $(DIR_APP) -name .svn -exec rm -rf {} \; + # cd $(DIR_APP) && find /opt/confire -name .svn -exec rm -rf {} \; @$(POSTBUILD) diff --git a/make.sh b/make.sh index e8972eb66d..4680c4fac9 100644 --- a/make.sh +++ b/make.sh @@ -29,7 +29,7 @@ SLOGAN="We secure your network" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 - MAX_RETRIES=3 # prefetch/check loop + MAX_RETRIES=3 # prefetch/check loop KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` @@ -706,7 +706,7 @@ buildipcop() { ipcopmake nfs # 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 +# ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen } buildinstaller() { @@ -1083,8 +1083,25 @@ diff) echo "Finished!" echo "Diff was successfully saved to ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff" ;; +sync) + echo -e "Syncing Cache to FTP:" + echo -ne "Password for mirror.ipfire.org: "; read PASS + ncftpls -u web3 -p $PASS ftp://mirror.ipfire.org/html/source-packages/source/ > ftplist + for i in `ls -w1 cache/`; do + grep $i ftplist + if [ "$?" -ne "0" ]; then + ncftpput -u web3 -p $PASS mirror.ipfire.org /html/source-packages/source cache/$i + if [ "$?" -eq "0" ]; then + echo -e "$i was successfully uploaded to the ftp server." + else + echo -e "There was an error while uploading $i to the ftp server." + fi + fi + done + rm -f ftplist + ;; *) - echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|shell|toolchain|update}" + echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|shell|sync|toolchain|update}" cat doc/make.sh-usage exit 1 ;; diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386 index 826dfa5c25..16a3fc0d0f 100644 --- a/src/ROOTFILES.i386 +++ b/src/ROOTFILES.i386 @@ -26422,4 +26422,5 @@ usr/sbin/visudo ## pakfire ## opt/pakfire +opt/confire etc/pakfire.conf diff --git a/src/confire/confire b/src/confire/confire new file mode 100644 index 0000000000..fceda9f2c4 --- /dev/null +++ b/src/confire/confire @@ -0,0 +1,17 @@ +#!/bin/bash +############################################################################################ +# Copyright (C) 2006 by IPFire.org # +# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen. # +############################################################################################ + +if [ -f "/opt/confire/paks/$1" ]; then + + echo -e "Configuring $1." + . /opt/confire/paks/$1 + exit 0 +else + echo -e "There is no package with name $1. Exiting." + exit 1 +fi + +################################### EOF #################################################### \ No newline at end of file -- 2.39.2