Hinzugefügt:

  * ethereal
  * mailx
Geändert:
  * /var/ipcop --> /var/ipfire

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

diff --git a/config/cron/crontab b/config/cron/crontab
index 2fe0eb5ec5f4b5d30242c94d8ea9ec168db2e58b..435328befe63f449aa3deb039c9200ebae9ec5a2 100644 (file)
--- a/config/cron/crontab
+++ b/config/cron/crontab
@@ -26,11 +26,11 @@ HOME=/
 # Force update the dynamic dns registration once a week
 # Force update even if IP has not changed once a month if 'minimize update' selected in GUI
 # to avoid account declared as dead
-*/5 * * * *    [ -f "/var/ipcop/red/active" ] && /usr/local/bin/setddns.pl
-9 2 * * 0      [ -f "/var/ipcop/red/active" ] && /usr/local/bin/setddns.pl -f
-3 2 1 * *      [ -f "/var/ipcop/red/active" ] && /usr/local/bin/setddns.pl -f -m
+*/5 * * * *    [ -f "/var/ipfire/red/active" ] && /usr/local/bin/setddns.pl
+9 2 * * 0      [ -f "/var/ipfire/red/active" ] && /usr/local/bin/setddns.pl -f
+3 2 1 * *      [ -f "/var/ipfire/red/active" ] && /usr/local/bin/setddns.pl -f -m
 
 # Logwatch
 01 0 * * *     /usr/local/bin/logwatch > /var/log/logwatch/`date -I -d yesterday`; \
-               LOGWATCH_KEEP=$(sed -ne 's/^LOGWATCH_KEEP=\([0-9]\+\)$/\1/p' /var/ipcop/logging/settings); \
+               LOGWATCH_KEEP=$(sed -ne 's/^LOGWATCH_KEEP=\([0-9]\+\)$/\1/p' /var/ipfire/logging/settings); \
                find /var/log/logwatch/ -ctime +${LOGWATCH_KEEP=56} -exec rm -f '{}' ';'

diff --git a/config/ssl/openssl.cnf b/config/ssl/openssl.cnf
index 2bca6c08eeddd55937bfeb94f63b7f07f1a4d65f..092923fca5a9d433dc269e4d5e5db60ed1b9cfcc 100644 (file)
--- a/config/ssl/openssl.cnf
+++ b/config/ssl/openssl.cnf
@@ -5,10 +5,10 @@ oid_section   = new_oids
 [ new_oids ]
 
 [ ca ]
-default_ca     = IPCop
+default_ca     = IPFire
 
 [ IPCop ]
-dir            = /var/ipcop
+dir            = /var/ipfire
 certs          = $dir/certs
 crl_dir                = $dir/crls
 database       = $dir/certs/index.txt

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 3f0d7a0d2dcc735795261c4388a9b2f687d56e14..a80415bd237b4d2a88eea57a9f5acbfb5e50fb2f 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -65,6 +65,7 @@
   * ed-0.2
   * edonkeyclc_1.3.0_i386
   * espgs-8.15.1-source
+  * ethereal-0.99.0
   * ethtool-3
   * expat-1.95.7
   * ez-ipupdate-3.0.11b8
@@ -125,6 +126,7 @@
   * logwatch-6.1.2
   * lzo-2.02
   * m4-1.4
+  * mailx-12.0
   * make-3.80
   * make_devices-1.2
   * man-1.5p

diff --git a/lfs/ethereal b/lfs/ethereal
new file mode 100644 (file)
index 0000000..21623ba
--- /dev/null
+++ b/lfs/ethereal
@@ -0,0 +1,87 @@
+###############################################################################
+# 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 <rod@sunsetsystems.com>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.99.0
+
+THISAPP    = ethereal-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = f9905b9d347acdc05af664a7553f7f76
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       make-packages.sh ethereal $(THISAPP)-ipfire-beta-1
+
+###############################################################################
+# 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) && ./configure --prefix=/usr --sysconfdir=/etc --enable-threads
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make install
+       # install -v -m644 FAQ README{,.linux} doc/README.* doc/*.{pod,txt} /usr/share/ethereal
+       # install -v -m644 -D ethereal.desktop /usr/share/applications/ethereal.desktop
+       # install -v -m644 -D image/elogo3d48x48.png /usr/share/pixmaps/ethereal.png 
+       # install -v -m755 -d /usr/share/pixmaps/ethereal 
+       # install -v -m644 image/*.{png,ico,xpm,bmp} /usr/share/pixmaps/ethereal
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/mailx b/lfs/mailx
new file mode 100644 (file)
index 0000000..ca3cf1b
--- /dev/null
+++ b/lfs/mailx
@@ -0,0 +1,85 @@
+###############################################################################
+# 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 <rod@sunsetsystems.com>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 12.0
+
+THISAPP    = mailx-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 67e8236a73f8a2d85c45cf8a2bdf7af1
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       make-packages.sh mailx $(THISAPP)-ipfire-beta-1
+
+###############################################################################
+# 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) && make SENDMAIL=/usr/sbin/sendmail
+       cd $(DIR_APP) && make PREFIX=/usr UCBINSTALL=/usr/bin/install install
+       cd $(DIR_APP) && ln -v -sf mailx /usr/bin/mail
+       cd $(DIR_APP) && ln -v -sf mailx /usr/bin/nail
+       # cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/mailx-12.0
+       # cd $(DIR_APP) && install -v -m644 README mailx.1.html /usr/share/doc/mailx-12.0
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 56eaecabd79f17afc2c89c97466bd21b069717fa..af4f650f6eb7960409324dbf98a336e838ed07fb 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -686,6 +686,7 @@ buildipcop() {
   ipcopmake fetchmail
   ipcopmake cyrusimap
   ipcopmake procmail
+  ipcopmake mailx
   ipcopmake clamav
   ipcopmake razor
   ipcopmake spamassassin
@@ -705,6 +706,7 @@ buildipcop() {
   ipcopmake nmap
   ipcopmake nfs
   ipcopmake ncftp
+  ipcopmake ethereal
 #  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

diff --git a/src/install+setup/install/upgrade-v12-v13.c b/src/install+setup/install/upgrade-v12-v13.c
index 7ba750148ae0581adb1cf4221b8f2eaafd7dd2fb..2cbedb84678658642c05735d53ff36fb030567b4 100644 (file)
--- a/src/install+setup/install/upgrade-v12-v13.c
+++ b/src/install+setup/install/upgrade-v12-v13.c
@@ -28,11 +28,11 @@ void _convert_ppp_settings() {
        struct dirent *dp;
        char filename[STRING_SIZE];
        
-       dirp = opendir( "/harddisk/var/ipcop/ppp" );
+       dirp = opendir( "/harddisk/var/ipfire/ppp" );
        while ( (dp = readdir( dirp )) != NULL ) {
                if ( strstr( dp->d_name, "settings" ) == dp->d_name ) {
                        snprintf (filename, STRING_SIZE-1, "%s/%s", 
-                               "/harddisk/var/ipcop/ppp", dp->d_name);
+                               "/harddisk/var/ipfire/ppp", dp->d_name);
 
                        /* reduce furthur replacements from commands below */
                        replace (filename, "TYPE=modem", "");
@@ -65,8 +65,8 @@ int _convert_xtaccess() {
        char xtsrctemp[STRING_SIZE], xtdsttemp[STRING_SIZE];
        char *xtproto, *xtsrcip, *xtdstip, *xtdstport, *xtenabled;
         
-       if (!(portfw1 = fopen ("/harddisk/var/ipcop/portfw/config", "r"))) return 1;
-       if (!(portfw2 = fopen ("/harddisk/var/ipcop/portfw/config.new", "w"))) 
+       if (!(portfw1 = fopen ("/harddisk/var/ipfire/portfw/config", "r"))) return 1;
+       if (!(portfw2 = fopen ("/harddisk/var/ipfire/portfw/config.new", "w"))) 
        {
                fclose(portfw1);
                return 1;
@@ -82,13 +82,13 @@ int _convert_xtaccess() {
                portremip   = NULL;
                portenabled = NULL;
                
-               if (!(xtaccess1 = fopen ("/harddisk/var/ipcop/xtaccess/config", "r"))) 
+               if (!(xtaccess1 = fopen ("/harddisk/var/ipfire/xtaccess/config", "r"))) 
                {
                        fclose(portfw1);
                        fclose(portfw2);
                        return 1;
                }
-               if (!(xtaccess2 = fopen ("/harddisk/var/ipcop/xtaccess/config.new", "w"))) 
+               if (!(xtaccess2 = fopen ("/harddisk/var/ipfire/xtaccess/config.new", "w"))) 
                {
                        fclose(portfw1);
                        fclose(portfw2);
@@ -170,8 +170,8 @@ int _convert_xtaccess() {
                fclose (xtaccess2);
 
                /* Move the new xtaccess file */
-               rename ("/harddisk/var/ipcop/xtaccess/config.new",
-                       "/harddisk/var/ipcop/xtaccess/config");
+               rename ("/harddisk/var/ipfire/xtaccess/config.new",
+                       "/harddisk/var/ipfire/xtaccess/config");
 
                /* If no external access line existed, add a no access line */
                if (count2 == 0) {
@@ -191,10 +191,10 @@ int _convert_xtaccess() {
        fclose (portfw2);
 
        /* Move the new portfw file */
-       rename ("/harddisk/var/ipcop/portfw/config.new",
-               "/harddisk/var/ipcop/portfw/config");
-       chown  ("/harddisk/var/ipcop/xtaccess/config", 99, 99);
-       chown  ("/harddisk/var/ipcop/portfw/config", 99, 99);
+       rename ("/harddisk/var/ipfire/portfw/config.new",
+               "/harddisk/var/ipfire/portfw/config");
+       chown  ("/harddisk/var/ipfire/xtaccess/config", 99, 99);
+       chown  ("/harddisk/var/ipfire/portfw/config", 99, 99);
 
        return 0;
 }
@@ -206,13 +206,13 @@ int _convert_pulsardsl() {
        FILE *settings, *pulsardsl;
        char line[STRING_SIZE];
        
-       if (!(pulsardsl = fopen ("/harddisk/var/ipcop/pciadsl/settings", "r"))) return 1;
+       if (!(pulsardsl = fopen ("/harddisk/var/ipfire/pciadsl/settings", "r"))) return 1;
        
-       dirp = opendir( "/harddisk/var/ipcop/ppp" );
+       dirp = opendir( "/harddisk/var/ipfire/ppp" );
        while ( (dp = readdir( dirp )) != NULL ) {
                if ( strstr( dp->d_name, "settings" ) == dp->d_name ) {
                        snprintf (filename, STRING_SIZE-1, "%s/%s", 
-                               "/harddisk/var/ipcop/ppp", dp->d_name);
+                               "/harddisk/var/ipfire/ppp", dp->d_name);
                        if (!(settings = fopen (filename, "r+"))) {
                                closedir(dirp);
                                fclose(pulsardsl);
@@ -247,7 +247,7 @@ int _convert_pulsardsl_ethernet() {
        char ip[STRING_SIZE];
        char filename[STRING_SIZE];
        
-       if (!(ethernet = fopen ("/harddisk/var/ipcop/ethernet/settings", "r"))) return 1;
+       if (!(ethernet = fopen ("/harddisk/var/ipfire/ethernet/settings", "r"))) return 1;
 
        while (fgets (line, STRING_SIZE, ethernet) != NULL) {
                if (strstr (line, "RED_DRIVER=pciadsl") == line) {
@@ -265,17 +265,17 @@ int _convert_pulsardsl_ethernet() {
                                }
                                fclose (ethernet);
 
-                               replace ("/harddisk/var/ipcop/ethernet/settings", "RED_DEV=eth1", "RED_DEV=");
-                               replace ("/harddisk/var/ipcop/ethernet/settings", "CONFIG_TYPE=2", "CONFIG_TYPE=0");
-                               replace ("/harddisk/var/ipcop/ethernet/settings", "CONFIG_TYPE=3", "CONFIG_TYPE=1");
-                               replace ("/harddisk/var/ipcop/ethernet/settings", "RED_DEV=eth2", "RED_DEV=");
-                               chown ("/harddisk/var/ipcop/ethernet/settings", 99, 99);
+                               replace ("/harddisk/var/ipfire/ethernet/settings", "RED_DEV=eth1", "RED_DEV=");
+                               replace ("/harddisk/var/ipfire/ethernet/settings", "CONFIG_TYPE=2", "CONFIG_TYPE=0");
+                               replace ("/harddisk/var/ipfire/ethernet/settings", "CONFIG_TYPE=3", "CONFIG_TYPE=1");
+                               replace ("/harddisk/var/ipfire/ethernet/settings", "RED_DEV=eth2", "RED_DEV=");
+                               chown ("/harddisk/var/ipfire/ethernet/settings", 99, 99);
                                
-                               dirp = opendir( "/harddisk/var/ipcop/ppp" );
+                               dirp = opendir( "/harddisk/var/ipfire/ppp" );
                                while ( (dp = readdir( dirp )) != NULL ) {
                                        if ( strstr( dp->d_name, "settings-" ) == dp->d_name ) {
                                                snprintf (filename, STRING_SIZE-1, "%s/%s", 
-                                                       "/harddisk/var/ipcop/ppp", dp->d_name);
+                                                       "/harddisk/var/ipfire/ppp", dp->d_name);
                                                if (!(settings = fopen (filename, "r+"))) 
                                                {
                                                        closedir(dirp);
@@ -302,36 +302,36 @@ int _convert_pulsardsl_ethernet() {
 
 int upgrade_v12_v13() {
        struct stat s;
-       replace ("/harddisk/var/ipcop/ethernet/settings", "rtl8139", "8139too");
-       replace ("/harddisk/var/ipcop/vpn/ipsec.conf", "auto=add", "auto=start");
-       chown ("/harddisk/var/ipcop/vpn/ipsec.conf", 99, 99);
-       chown ("/harddisk/var/ipcop/ethernet/settings", 99, 99);
-       chown ("/harddisk/var/ipcop/main/settings", 99, 99);
+       replace ("/harddisk/var/ipfire/ethernet/settings", "rtl8139", "8139too");
+       replace ("/harddisk/var/ipfire/vpn/ipsec.conf", "auto=add", "auto=start");
+       chown ("/harddisk/var/ipfire/vpn/ipsec.conf", 99, 99);
+       chown ("/harddisk/var/ipfire/ethernet/settings", 99, 99);
+       chown ("/harddisk/var/ipfire/main/settings", 99, 99);
        _convert_ppp_settings();
        _convert_xtaccess();
        _convert_pulsardsl();
        _convert_pulsardsl_ethernet();
 
        /* Rename usbadsl directory */
-       stat ("/harddisk/var/ipcop/usbadsl", &s);
+       stat ("/harddisk/var/ipfire/usbadsl", &s);
        if (S_ISDIR(s.st_mode)) {
-               remove ("/harddisk/var/ipcop/usbadsl/settings");
-               if (! system("/bin/chroot /harddisk /bin/rm -rf /var/ipcop/alcatelusb"))
-                       rename ("/harddisk/var/ipcop/usbadsl", "/harddisk/var/ipcop/alcatelusb");
+               remove ("/harddisk/var/ipfire/usbadsl/settings");
+               if (! system("/bin/chroot /harddisk /bin/rm -rf /var/ipfire/alcatelusb"))
+                       rename ("/harddisk/var/ipfire/usbadsl", "/harddisk/var/ipfire/alcatelusb");
        }
        
        /* Rename pciadsl module and directory */
-       remove ("/harddisk/var/ipcop/pulsar/settings");
-       rename ("/harddisk/var/ipcop/pciadsl/pciadsl.o", "/harddisk/var/ipcop/pciadsl/pulsar.o");
-       stat ("/harddisk/var/ipcop/pciadsl", &s);
+       remove ("/harddisk/var/ipfire/pulsar/settings");
+       rename ("/harddisk/var/ipfire/pciadsl/pciadsl.o", "/harddisk/var/ipfire/pciadsl/pulsar.o");
+       stat ("/harddisk/var/ipfire/pciadsl", &s);
        if (S_ISDIR(s.st_mode)) {
-               if (! system("/bin/chroot /harddisk /bin/rm -rf /var/ipcop/pulsardsl"))
-                       rename ("/harddisk/var/ipcop/pciadsl", "/harddisk/var/ipcop/pulsardsl");
+               if (! system("/bin/chroot /harddisk /bin/rm -rf /var/ipfire/pulsardsl"))
+                       rename ("/harddisk/var/ipfire/pciadsl", "/harddisk/var/ipfire/pulsardsl");
        }
 
        /* Change squid cache directory */
-       replace ("/harddisk/var/ipcop/proxy/squid.conf", "/var/spool/squid", "/var/log/cache");
-       chown ("/harddisk/var/ipcop/proxy/squid.conf", 99, 99);
+       replace ("/harddisk/var/ipfire/proxy/squid.conf", "/var/spool/squid", "/var/log/cache");
+       chown ("/harddisk/var/ipfire/proxy/squid.conf", 99, 99);
        
        /* Change setup user shell */
        replace ("/harddisk/etc/passwd", ":/usr/local/sbin/setup", ":/bin/bash -c /usr/local/sbin/setup");

diff --git a/src/paks/ethereal/CONFFILES b/src/paks/ethereal/CONFFILES
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/paks/ethereal/ROOTFILES b/src/paks/ethereal/ROOTFILES
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/paks/ethereal/install.sh b/src/paks/ethereal/install.sh
new file mode 100644 (file)
index 0000000..3a9ce55
--- /dev/null
+++ b/src/paks/ethereal/install.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+#################################################################
+#                                                               #
+# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #
+#                                                               #
+#################################################################
+#
+# Extract the files
+tar xfz files.tgz -C /
+cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2

diff --git a/src/paks/ethereal/uninstall.sh b/src/paks/ethereal/uninstall.sh
new file mode 100644 (file)
index 0000000..ad61226
--- /dev/null
+++ b/src/paks/ethereal/uninstall.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#################################################################
+#                                                               #
+# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #
+#                                                               #
+#################################################################
+#
+# Delete the files
+## Befehl fehlt noch
+rm -f /opt/pakfire/installed/ROOTFILES.$2

diff --git a/src/paks/mailx/CONFFILES b/src/paks/mailx/CONFFILES
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/paks/mailx/ROOTFILES b/src/paks/mailx/ROOTFILES
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/paks/mailx/install.sh b/src/paks/mailx/install.sh
new file mode 100644 (file)
index 0000000..3a9ce55
--- /dev/null
+++ b/src/paks/mailx/install.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+#################################################################
+#                                                               #
+# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #
+#                                                               #
+#################################################################
+#
+# Extract the files
+tar xfz files.tgz -C /
+cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2

diff --git a/src/paks/mailx/uninstall.sh b/src/paks/mailx/uninstall.sh
new file mode 100644 (file)
index 0000000..ad61226
--- /dev/null
+++ b/src/paks/mailx/uninstall.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#################################################################
+#                                                               #
+# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #
+#                                                               #
+#################################################################
+#
+# Delete the files
+## Befehl fehlt noch
+rm -f /opt/pakfire/installed/ROOTFILES.$2

diff --git a/src/rc.d/rc.alcatelusb b/src/rc.d/rc.alcatelusb
index b19e049d3521c4c7be83ee62fcaee53622d825fb..73a820f988da6411afcd514e1f0cd65b2033a20d 100644 (file)
--- a/src/rc.d/rc.alcatelusb
+++ b/src/rc.d/rc.alcatelusb
@@ -3,7 +3,7 @@
 # $Id: rc.alcatelusb,v 1.7.2.12 2005/07/07 20:11:57 franck78 Exp $
 #
 
-eval $(/usr/local/bin/readhash /var/ipcop/ppp/settings)
+eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
 
 # Debugging. Comment it out to stop logging
 DEBUG="yes"
@@ -63,13 +63,13 @@ case "$1" in
        if ( ! /bin/ps -ef | /bin/grep -q [m]odem_run ); then
                rm -f /var/run/pppoa3-modem*.pid
                msg "Uploading firmware to modem"
-               /usr/sbin/modem_run -v 1 -t 90 -n 4 -f /var/ipcop/alcatelusb/firmware.$modem.bin
+               /usr/sbin/modem_run -v 1 -t 90 -n 4 -f /var/ipfire/alcatelusb/firmware.$modem.bin
 
                # Check if Firmware uploaded ok. Reset USB if Failed
                if [ $? -ne 0 ]; then
                        msg "Firmware upload failed: Retrying"
                        /usr/local/bin/resetusb
-                       /usr/sbin/modem_run -v 1 -t 90 -n 4 -f /var/ipcop/alcatelusb/firmware.$modem.bin
+                       /usr/sbin/modem_run -v 1 -t 90 -n 4 -f /var/ipfire/alcatelusb/firmware.$modem.bin
                        if [ $? -ne 0 ]; then
                                msg "Firmware upload failed: Exiting"
                                exit 1

diff --git a/src/rc.d/rc.eciadsl b/src/rc.d/rc.eciadsl
index c6eca4c8a8a69876f1e360900a78b849ae20efa7..4cc3e14907416d44a2cca8bb5932f167760d827a 100644 (file)
--- a/src/rc.d/rc.eciadsl
+++ b/src/rc.d/rc.eciadsl
@@ -66,7 +66,7 @@ case "$1" in
        # Firmware
        if [ "$CHIP" = 'GS7070' ]; then
                if ( /bin/grep -q "^P:  Vendor=$VID1 ProdID=$PID1" /proc/bus/usb/devices ); then
-                       /bin/rm -f /var/ipcop/red/eciadsl-synch-done
+                       /bin/rm -f /var/ipfire/red/eciadsl-synch-done
                        /bin/sleep 2
                        msg "Loading Firmware for $MODEM"
                        /usr/sbin/eciadsl-firmware 0x$VID1 0x$PID1 0x$VID2 0x$PID2 /etc/eciadsl/firmware00.bin

diff --git a/src/scripts/make-packages.sh b/src/scripts/make-packages.sh
index 3a3dcc536366a578945ae7ab10a04bde3225f3af..943eb0cc6958b77f5768a53374f696be7b5d347b 100755 (executable)
--- a/src/scripts/make-packages.sh
+++ b/src/scripts/make-packages.sh
@@ -21,6 +21,6 @@ tar cvfz /paks/$1/conf.tgz  --files=/usr/src/src/paks/$1/CONFFILES --exclude='#*
 cd /paks/$1 && tar cvfz ../$2.tar.gz files.tgz conf.tgz install.sh uninstall.sh
 cd .. && md5sum $2.tar.gz >> $2.tar.gz.md5
 
-rm -r /paks/$1
+rm -fr /paks/$1
 
 exit 0
\ No newline at end of file