Hinzugefügt:

  * Erste Version von CONFIRE.
  * ./make.sh sync lädt nun alle neuen Dateien auf den FTP-Server.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@135 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/lfs/pakfire b/lfs/pakfire
index c554869184e89b0eccc0ef06cb506e41e0772cd9..d292335840cb72445bfa88b46ba3fe69869e0a0a 100644 (file)
--- 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 e8972eb66ddc4efcdb1614dfc00f1ca8b7f0f35f..4680c4fac980a4a4f36765ae4667f0403b3d0ad9 100644 (file)
--- 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 826dfa5c2509dab6af882bd68e49a023d9591989..16a3fc0d0fac56da53cd2bf1ca9a68ee1f214ec1 100644 (file)
--- 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 (file)
index 0000000..fceda9f
--- /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