Geaendert:

  * Pakete haben jetzt die Endung .ipfire
  * Kleiner Logikfehler im ConnScheduler

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

diff --git a/doc/ChangeLog b/doc/ChangeLog
index e1340333d3654da4de758d5254b13de0dce4483d..9064a2c34d203c21941246eae1e2e419ac3676c3 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,8 @@
 ------------------------------------------------------------------------
+r263 | delaco | 2006-08-30 15:10:09 +0200 (Wed, 30 Aug 2006) | 1 line
+
+Typo in der Make.sh, die die LibMAD nicht bauen lies. Sorry :(
+------------------------------------------------------------------------
 r262 | delaco | 2006-08-29 23:23:05 +0200 (Tue, 29 Aug 2006) | 1 line
 
 IPCop-Source 1.4.11 eingefuegt

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index c527e9bff9e1f394103f758a04eef6fd869d9982..4ce37459163bba73e53d9d5aac80ffb629a8b989 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1510,8 +1510,8 @@
 'ConnSched scheduler' => 'Scheduler',
 'ConnSched select profile' => 'Wähle Profil',
 'ConnSched up' => 'Hoch',
-'ConnSched ipsecstart' => 'VPN (re)start',
-'ConnSched ipsecstop' => 'VPN stop',
+'ConnSched ipsecstart' => 'IPSec (neu)starten',
+'ConnSched ipsecstop' => 'IPSec stop',
 
 ); 
 

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index e6beefcff175ba13c0dc71daf0b92f28f9100d39..01c7d147121fb69cb2b91c8616e1bc9fa1c4c49e 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1543,7 +1543,7 @@
 'ConnSched scheduler' => 'Scheduler',
 'ConnSched select profile' => 'Select profile',
 'ConnSched up' => 'Up',
-'ConnSched ipsecstart' => 'VPN (re)start',
-'ConnSched ipsecstop' => 'VPN stop',
+'ConnSched ipsecstart' => 'IPSec (re)start',
+'ConnSched ipsecstop' => 'IPSec stop',
 
 );

diff --git a/make.sh b/make.sh
index cf6817a08fa13fd0add3b68a8dbbab6fe541cf0e..ada672e3d42a661b3b506006313c3679592493eb 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -916,7 +916,7 @@ ipfirepackages() {
 #  ipfiredist xinetd
   ipfiredist xvid
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-  mv -f $LFS/install/packages/*.{tar.gz,md5} $BASEDIR/packages >> $LOGFILE 2>&1
+  mv -f $LFS/install/packages/*.{ipfire,md5} $BASEDIR/packages >> $LOGFILE 2>&1
   rm -rf  $BASEDIR/build/install/packages/*
 }
 

diff --git a/src/pakfire/lib/get_list.sh b/src/pakfire/lib/get_list.sh
index dc2ef8936d0c78e01b3177afe586586a4ca1070a..6277550dc9d689954080418e64eba58d42f97ec0 100644 (file)
--- a/src/pakfire/lib/get_list.sh
+++ b/src/pakfire/lib/get_list.sh
@@ -6,7 +6,7 @@
 
 get_list () {
 
-PURL=`cat $CACHE_DIR/$SERVERS_LIST`
+PURL=`cat ${CACHE_DIR}$SERVERS_LIST`
 
 if [ "$PURL" ]; then
   url=$(. $HOST_TEST "$PURL")

diff --git a/src/pakfire/lib/get_mirror.sh b/src/pakfire/lib/get_mirror.sh
index 731bc995373015da8703bda6230c517f12c74845..0644020ac30efa1bcabdfc743b2bbb55ab8e882f 100644 (file)
--- a/src/pakfire/lib/get_mirror.sh
+++ b/src/pakfire/lib/get_mirror.sh
@@ -7,15 +7,17 @@ get_mirror() {
 
 cd $PAKHOME/cache
 
-if [ -e $PAKHOME/cache/$SERVERS_LIST ]
- then rm -f $PAKHOME/cache/$SERVERS_LIST
-fi
+#if [ -e $PAKHOME/cache/$SERVERS_LIST ]
+# then rm -f $PAKHOME/cache/$SERVERS_LIST
+#fi
 
-if /usr/bin/wget -q $H_MIRROR >/dev/null 2>&1
+if /usr/bin/wget $H_MIRROR >$LOG 2>&1
  then
+  pakfire_logger "Got servers!"
   cd -
   return 0
  else
+  pakfire_logger "Got no servers!"
   cd -
   return 1
 fi

diff --git a/src/pakfire/lib/get_pak.sh b/src/pakfire/lib/get_pak.sh
index ff77e98aa990b0ab703f2f1b82d7a8171f477869..13b49208846b6b96f05531a318b15b4400a05d7a 100644 (file)
--- a/src/pakfire/lib/get_pak.sh
+++ b/src/pakfire/lib/get_pak.sh
@@ -15,7 +15,7 @@ fi
 
 . $DB_DIR/$1
 
-FILE="$1-${VER}_${IPFVER}.tar.gz"
+FILE="$1-${VER}_${IPFVER}.ipfire"
 
 if [ ! -f $CACHE_DIR/$FILE ]; then
   cd /var/tmp
@@ -24,7 +24,7 @@ if [ ! -f $CACHE_DIR/$FILE ]; then
    then
       if [ "`md5sum $FILE`" = "`cat ${FILE}.md5`" ]; then
       mv -f /var/tmp/$FILE{,.md5} $CACHE_DIR
-      pakfire_logger "MD5 sum OK!"
+      pakfire_logger "MD5 sum OK in $FILE!"
     else
       pakfire_logger "Wrong MD5 sum in $FILE."
       rm -f /var/tmp/$FILE{,.md5}

diff --git a/src/scripts/packager b/src/scripts/packager
index 586860d996ae4ab0ff7e05cfd1e837b925332d81..f99d409eaacbb1f746dd1104c02b82a2cd78436b 100644 (file)
--- a/src/scripts/packager
+++ b/src/scripts/packager
@@ -3,6 +3,7 @@
 PROG="$1"
 VER="$2"
 PAK_VER="$3"
+EXT=ipfire
 
 if [ -f /install/packages/$PROG-$VER-$PAK_VER.tar.gz.empty ]; then
 
@@ -25,10 +26,10 @@ else
 
        cd /    && rm -rf /tmp/*
        cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES
-       tar cfz ../$PROG-${VER}_$PAK_VER.tar.gz files.tgz install.sh uninstall.sh ROOTFILES depends.txt
+       tar cvz ../$PROG-${VER}_$PAK_VER.$EXT files.tgz install.sh uninstall.sh ROOTFILES depends.txt
 
-       cd /install/packages && md5sum $PROG*.tar.gz > $PROG-${VER}_$PAK_VER.tar.gz.md5
-       cd /install/packages && md5sum $PROG*.tar.gz >> all-progs.md5
+       cd /install/packages && md5sum $PROG*.$EXT > $PROG-${VER}_$PAK_VER.$EXT.md5
+       cd /install/packages && md5sum $PROG*.$EXT >> all-progs.md5
        rm -rf /install/packages/package
        exit 0
 fi