Update:

  * Pakfire!
Fixes:
  * ConnScheduler

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

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index a8a8e4ad07d0e3c98f41a5914017af6b13707c31..a29e8a9698adea92c27c595bd151a56d15ac1a71 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -257,9 +257,9 @@ sub genmenu {
                                 'enabled' => 1,
                                 };
     $subnetwork->{'50.scheduler'} = {
                                 'enabled' => 1,
                                 };
     $subnetwork->{'50.scheduler'} = {

-                                'caption' => $tr{'scheduler'},
+                                'caption' => $tr{'connscheduler'},

                                 'uri' => '/cgi-bin/connscheduler.cgi',
                                 'uri' => '/cgi-bin/connscheduler.cgi',

-                                'title' => "$tr{'scheduler'}",
+                                'title' => "$tr{'connscheduler'}",

                                 'enabled' => 1,
                                 };
     $subnetwork->{'60.hosts'} = {
                                 'enabled' => 1,
                                 };
     $subnetwork->{'60.hosts'} = {


@@ -396,7 +396,7 @@ sub genmenu {
                                'enabled' => 1
                                };
     $sublogs->{'60.urlfilter'} = {
                                'enabled' => 1
                                };
     $sublogs->{'60.urlfilter'} = {

-                               'caption' => $tr{'urlfilter log'},
+                               'caption' => $tr{'urlfilter logs'},

                                'uri' => '/cgi-bin/logs.cgi/urlfilter.dat',
                                'title' => "$tr{'urlfilter log'}",
                                'enabled' => 1,
                                'uri' => '/cgi-bin/logs.cgi/urlfilter.dat',
                                'title' => "$tr{'urlfilter log'}",
                                'enabled' => 1,

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4fd15a020fd8bd288438cdfb595622ed2d7af07e..333c5af45fad47498dd811135a53edf5bdf81ea1 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,15 @@
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------

+r256 | ms | 2006-08-23 23:55:46 +0200 (Wed, 23 Aug 2006) | 8 lines
+
+Hinzugefuegt:
+  * Copyrighthinweise der externen Addons,
+    die verloren gegangen sind.
+  HIERMIT ERFUELLT IPFIRE DIE GPLv2 ZU 100%.
+  GARANTIERT.
+(Diese Schritte waren noetig, da einige Entwickler
+es fuer noetig hielten, dass die Copyrighthinweise
+in jeder Datei zu finden sind.)
+------------------------------------------------------------------------

 r255 | ms | 2006-08-23 21:19:22 +0200 (Wed, 23 Aug 2006) | 4 lines
 
 Update:
 r255 | ms | 2006-08-23 21:19:22 +0200 (Wed, 23 Aug 2006) | 4 lines
 
 Update:

diff --git a/html/cgi-bin/connscheduler.cgi b/html/cgi-bin/connscheduler.cgi
index e99c4fb494a62f71dc4629c85f27b155a5f1fa00..f661b38391f6ede3fb29d02b46f5bef10fe0d759 100644 (file)
--- a/html/cgi-bin/connscheduler.cgi
+++ b/html/cgi-bin/connscheduler.cgi
@@ -23,7 +23,7 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 

-require '/var/ipcop/connscheduler/lib.pl';
+require '/var/ipfire/connscheduler/lib.pl';

 
 my $buttontext = $Lang::tr{'add'};
 my $hiddenvalue = 'add';
 
 my $buttontext = $Lang::tr{'add'};
 my $hiddenvalue = 'add';

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 751cc8ad2fc7be9f862b1751eac794209ce3b504..c527e9bff9e1f394103f758a04eef6fd869d9982 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1474,6 +1474,7 @@
 'urlfilter export error' => 'Kann Exportdatei nicht erstellen',
 'urlfilter update notification' => 'Update-Benachrichtigung!',
 'urlfilter update information' => 'Eine aktualisierte Version steht zum Download bereit. Besuchen Sie <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> für weitere Informationen.',
 'urlfilter export error' => 'Kann Exportdatei nicht erstellen',
 'urlfilter update notification' => 'Update-Benachrichtigung!',
 'urlfilter update information' => 'Eine aktualisierte Version steht zum Download bereit. Besuchen Sie <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> für weitere Informationen.',

+'urlfilter logs' => 'URL-Filter-Logdateien',

 'display webinterface effects' => 'Überblendeffekte einschalten',
 'outgoing firewall' => 'Ausgehende Firewall',
 'mbmon graphs' => 'mbmon-Diagramme',
 'display webinterface effects' => 'Überblendeffekte einschalten',
 'outgoing firewall' => 'Ausgehende Firewall',
 'mbmon graphs' => 'mbmon-Diagramme',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index ea7f88bc15ab687c9b21d8585d6ac0e239ea6192..e6beefcff175ba13c0dc71daf0b92f28f9100d39 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1507,6 +1507,7 @@
 'urlfilter export error' => 'Unable to create export file',
 'urlfilter update notification' => 'Update notification!',
 'urlfilter update information' => 'There is an updated version available for download. Visit <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> for more information.',
 'urlfilter export error' => 'Unable to create export file',
 'urlfilter update notification' => 'Update notification!',
 'urlfilter update information' => 'There is an updated version available for download. Visit <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> for more information.',

+'urlfilter logs' => 'URL filter logs',

 'display webinterface effects' => 'Activate effects',
 'outgoing firewall' => 'Outgoing Firewall',
 'mbmon graphs' => 'mbmon Graphs',
 'display webinterface effects' => 'Activate effects',
 'outgoing firewall' => 'Outgoing Firewall',
 'mbmon graphs' => 'mbmon Graphs',

diff --git a/src/pakfire/lib/check_pak.sh b/src/pakfire/lib/check_pak.sh
index 03f6cc8ef828838d31d0c11cfa119951a427c407..2339d6a20450c7331de90c0c9a9c1f8754ca0697 100644 (file)
--- a/src/pakfire/lib/check_pak.sh
+++ b/src/pakfire/lib/check_pak.sh
@@ -60,7 +60,7 @@ do
 done
 
 # Löschen der Hilfslisten
 done
 
 # Löschen der Hilfslisten

-/bin/rm -f ${ZERL_PATCH}*
+/bin/rm -f ${ZERL_PATCH}* >/dev/null 2>&1

 
 }
 
 
 }
 

diff --git a/src/pakfire/lib/get_list.sh b/src/pakfire/lib/get_list.sh
index 968474d18b1e23fbff21bd2dea0af08a756cdd8f..dc2ef8936d0c78e01b3177afe586586a4ca1070a 100644 (file)
--- a/src/pakfire/lib/get_list.sh
+++ b/src/pakfire/lib/get_list.sh
@@ -6,27 +6,29 @@
 
 get_list () {
 
 
 get_list () {
 

-# Alle URLs durcharbeiten bis erste per ping erreichbar erreichbar
-url=$(. $HOST_TEST "$PURL")
-if [ -n $url ]
- then URL=${url}
+PURL=`cat $CACHE_DIR/$SERVERS_LIST`
+
+if [ "$PURL" ]; then
+  url=$(. $HOST_TEST "$PURL")
+  if [ -n $url ]
+   then URL=${url}
+  fi
+else
+  echo "No server-address available. Exiting..."
+  exit 1

 fi
 
 fi
 

-# Falls URL nicht gesetzt wurde abbruch des Scripts

 if [ -z $URL ]
 if [ -z $URL ]

- then pakfire_logger "Kann keinen Listenserver finden."
+ then pakfire_logger "Cannot find a working mirror."

   return 1
 fi
 
   return 1
 fi
 

-# Verzeichnis in Zielverzeichnis wechseln für Download

 cd $PAKHOME/cache
 
 cd $PAKHOME/cache
 

-# Pruefen ob bereits ein File vorhanden ist - falls ja, dann wird sie nun gelöscht

 if [ -f $PACKAGE_LIST ]
  then rm $PACKAGE_LIST
 fi
 
 if [ -f $PACKAGE_LIST ]
  then rm $PACKAGE_LIST
 fi
 

-# Download der Liste

 if /usr/bin/wget $URL/$PACKAGE_LIST > /dev/null 2>&1
  then
   cd -
 if /usr/bin/wget $URL/$PACKAGE_LIST > /dev/null 2>&1
  then
   cd -

diff --git a/src/pakfire/lib/get_mirror.sh b/src/pakfire/lib/get_mirror.sh
index dd7608d10f5933ce76d8d350d7b287a0c5500183..731bc995373015da8703bda6230c517f12c74845 100644 (file)
--- a/src/pakfire/lib/get_mirror.sh
+++ b/src/pakfire/lib/get_mirror.sh
@@ -5,27 +5,14 @@
 
 get_mirror() {
 
 
 get_mirror() {
 

-# Testen, ob der Server erreichbar ist
-#if ! $HOST_TEST $($PAKHOME/lib/url_zerl.sh $H_MIRROR get_host) >/dev/null 2>&1
-# then return 1
-#fi
-
-# Ins Cache-Verzeichnis wechseln

 cd $PAKHOME/cache
 
 cd $PAKHOME/cache
 

-# Überprüfen ob File schon vorhanden ist

 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
 

-# File herunterladen

 if /usr/bin/wget -q $H_MIRROR >/dev/null 2>&1
  then
 if /usr/bin/wget -q $H_MIRROR >/dev/null 2>&1
  then

-  COUNT=0
-  for i in `cat $SERVERS_LIST`; do
-    COUNT=$(($COUNT+1))
-  done
-  #. $PAKHOME/lib/test_host.sh `cat $SERVERS_LIST`

   cd -
   return 0
  else
   cd -
   return 0
  else

diff --git a/src/pakfire/lib/get_pak.sh b/src/pakfire/lib/get_pak.sh
index eb9f189cc5875d49f6e1b84a2445f230e96f8c5e..ff77e98aa990b0ab703f2f1b82d7a8171f477869 100644 (file)
--- a/src/pakfire/lib/get_pak.sh
+++ b/src/pakfire/lib/get_pak.sh
@@ -6,31 +6,38 @@
 
 get_pak() {
 
 
 get_pak() {
 

-# Alle URLs durcharbeiten bis erste per ping erreichbar erreichbar

 URL=$(. $HOST_TEST "$PURL")
 
 URL=$(. $HOST_TEST "$PURL")
 

-# Falls URL nicht gesetzt wurde abbruch des Scripts

 if [ -z $URL ]
 if [ -z $URL ]

- then pakfire_logger "Kann keinen Patchserver finden"
+ then pakfire_logger "Cannot find a mirror."

   exit 1
 fi
 
   exit 1
 fi
 

-# Verzeichnis in Zielverzeichnis wechseln für Download
-cd $CACHE_DIR
-

 . $DB_DIR/$1
 
 FILE="$1-${VER}_${IPFVER}.tar.gz"
 
 . $DB_DIR/$1
 
 FILE="$1-${VER}_${IPFVER}.tar.gz"
 

-# Paket Downloaden
-if /usr/bin/wget $URL/packages/$FILE{,.md5} >> $LOG 2>&1
- then
-  cd -
-  exit 0
- else
-  cd -
-  pakfire_logger "Cannot download $URL/packages/$FILE"
-  exit 1
+if [ ! -f $CACHE_DIR/$FILE ]; then
+  cd /var/tmp
+  pakfire_logger "Downloading $FILE from $URL..."
+  if /usr/bin/wget $URL/packages/$FILE{,.md5} >> $LOG 2>&1
+   then
+      if [ "`md5sum $FILE`" = "`cat ${FILE}.md5`" ]; then
+      mv -f /var/tmp/$FILE{,.md5} $CACHE_DIR
+      pakfire_logger "MD5 sum OK!"
+    else
+      pakfire_logger "Wrong MD5 sum in $FILE."
+      rm -f /var/tmp/$FILE{,.md5}
+      exit 1
+    fi
+    cd -
+   else
+    cd -
+    pakfire_logger "Cannot download $URL/packages/$FILE"
+    exit 1
+  fi
+else
+  pakfire_logger "No need to download $FILE."

 fi
 
 }
 fi
 
 }

diff --git a/src/pakfire/lib/install_pak.sh b/src/pakfire/lib/install_pak.sh
new file mode 100644 (file)
index 0000000..d716b33
--- /dev/null
+++ b/src/pakfire/lib/install_pak.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+############################################################################################
+# Version 0.1a, Copyright (C) 2006  by IPFire.org                                                #
+# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen.      #
+############################################################################################
+
+install_pak() {
+
+cd $CACHE_DIR
+
+. $DB_DIR/$1
+FILE="$1-${VER}_${IPFVER}.tar.gz"
+
+pakfire_logger "Unpaking $FILE..."
+mkdir $TMP_DIR/$1
+tar xfz $CACHE_DIR/$FILE -C $TMP_DIR/$1
+
+$PAKHOME/lib/resolv_deps.sh $TMP_DIR/$1/$DEPS
+
+cd $TMP_DIR/$1
+$TMP_DIR/$1/$INSTALL
+
+cp -f ROOTFILES $IP_DIR/$1
+
+}
+
+################################### EOF ####################################################

diff --git a/src/pakfire/lib/resolv_deps.sh b/src/pakfire/lib/resolv_deps.sh
new file mode 100644 (file)
index 0000000..be0417f
--- /dev/null
+++ b/src/pakfire/lib/resolv_deps.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+############################################################################################
+# Version 0.1a, Copyright (C) 2006  by IPFire.org                                                #
+# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen.      #
+############################################################################################
+
+. /etc/pakfire.conf
+
+for i in `cat $1`; do
+       if [ ! -f $IP_DIR/$i ]; then
+               pakfire_logger "Dependency $i is not installed yet. Trying..."
+               $PAKHOME/pakfire install $i
+       else
+               pakfire_logger "Dependency $i is already installed."
+       fi
+done

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index c06bad024ee777d2e722a196fa47858aca5c95a7..f0ef46e2572e980750ad11d5fc8fdfe9be610ace 100644 (file)
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -5,27 +5,31 @@
 ############################################################################################
 
 . /etc/pakfire.conf
 ############################################################################################
 
 . /etc/pakfire.conf

-. $PAKHOME/lib/get_mirror.sh
-. $PAKHOME/lib/get_list.sh
-. $PAKHOME/lib/check_pak.sh
-. $PAKHOME/lib/get_upgrade.sh
-. $PAKHOME/lib/get_base.sh
-. $PAKHOME/lib/get_pak.sh

 
 case "$1" in
        update)
 
 case "$1" in
        update)

+                       . $PAKHOME/lib/get_mirror.sh
+                       . $PAKHOME/lib/get_list.sh
+                       . $PAKHOME/lib/check_pak.sh

                        get_mirror
                        get_list
                        check_pak
        ;;
 
        upgrade)
                        get_mirror
                        get_list
                        check_pak
        ;;
 
        upgrade)

+                       . $PAKHOME/lib/get_upgrade.sh
+                       . $PAKHOME/lib/get_base.sh

                        get_upgrade
                        get_base
        ;;
 
        install)
                        get_upgrade
                        get_base
        ;;
 
        install)

+               . $PAKHOME/lib/get_pak.sh
+               . $PAKHOME/lib/install_pak.sh

                case "$2" in
                case "$2" in

+                       "")
+                               pakfire_logger "No package name given. Exiting..."
+                       ;;

                        BASE-*)
                                echo $2
                        ;;
                        BASE-*)
                                echo $2
                        ;;


@@ -35,6 +39,8 @@ case "$1" in
                                                pakfire_logger "$2 is already installed on this system."
                                        else
                                                get_pak $2
                                                pakfire_logger "$2 is already installed on this system."
                                        else
                                                get_pak $2

+                                               install_pak $2
+                                               rm -rf $TMP_DIR/*

                                        fi
                                else
                                        pakfire_logger "There is no paket with this name: $2"
                                        fi
                                else
                                        pakfire_logger "There is no paket with this name: $2"


@@ -43,6 +49,9 @@ case "$1" in
                esac
        ;;
 
                esac
        ;;
 

+       clean)
+               rm -rf $CACHE_DIR/* $TMP_DIR/* $DB_DIR/*
+       ;;

        *)
                echo -e "IPFire - Pakfire $PAKVER:"
                echo -e "===\t===\t===\t===\t===\t===\t===\t==="
        *)
                echo -e "IPFire - Pakfire $PAKVER:"
                echo -e "===\t===\t===\t===\t===\t===\t===\t==="

diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf
index 7c59ae79828ae7fd0bbfa37bbd12a29fdabda94d..2cb9c5dcbf6f7e56b1643bbf980aafa70457264b 100644 (file)
--- a/src/pakfire/pakfire.conf
+++ b/src/pakfire/pakfire.conf
@@ -15,7 +15,7 @@ PACKAGE_LIST=packages_list.txt
 H_MIRROR=http://download.ipfire.eu/servers/$SERVERS_LIST
 
 # URL Mirrorfile
 H_MIRROR=http://download.ipfire.eu/servers/$SERVERS_LIST
 
 # URL Mirrorfile

-PURL=`cat /opt/pakfire/cache/$SERVERS_LIST`
+PURL=`cat /opt/pakfire/cache/$SERVERS_LIST 2>/dev/null`

 
 # LOG_file
 LOG=/var/log/pakfire.log
 
 # LOG_file
 LOG=/var/log/pakfire.log


@@ -43,19 +43,19 @@ HOST_TEST=$PAKHOME/lib/test_host.sh
 
 # Paket Filenamen festlegen
 # Das eigentliche Paket
 
 # Paket Filenamen festlegen
 # Das eigentliche Paket

-PAK_PROG=prog.tar.gz
+PAK_FILES=files.tgz

 # Abhängigkeits Liste
 # Abhängigkeits Liste

-PAK_ABH=abh.txt
+DEPS=depends.txt

 # Installer Script
 # Installer Script

-PAK_INST=install.sh
+INSTALL=install.sh

 # Uninstaller Script
 # Uninstaller Script

-PAK_UNINST=uninstall.sh
+UNINSTALL=uninstall.sh

 
 # Cacheverzeichnis
 CACHE_DIR=/opt/pakfire/cache/
 
 
 # Cacheverzeichnis
 CACHE_DIR=/opt/pakfire/cache/
 

-pakfire_logger() {
-
-echo "`date -u '+%b %e %T'` $*" | tee -a $LOG
+### DO NOT CHANGE ANYTHING AFTER THIS LINE!!! ###

 
 

+pakfire_logger() {
+       echo "`date -u '+%b %e %T'` $*" | tee -a $LOG

 }
\ No newline at end of file
 }
\ No newline at end of file