Hinzugefügt:

  * OpenVPN in Statusseite.
  * cftp - FTP-Client grafisch?!

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

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 9dd49afcc7ac2fdaed35762a4748987e8e2a98cc..4e2ef3d72575274bd2e192bbe523de01cf972a3a 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -48,6 +48,7 @@
   * capi4k-utils-2004-10-06
   * ccache-2.3
   * cdrtools-2.01
+  * cftp-0.12
   * clamav-0.88.2
   * coreutils-5.93
   * cups-1.1.23-source

diff --git a/html/cgi-bin/status.cgi b/html/cgi-bin/status.cgi
index c12baa7df40392a4c422bb67e9f7f40fd5ed8e5b..ac560f84eb4cb3ae436ecb9b74f74d3cb59ff2f2 100644 (file)
--- a/html/cgi-bin/status.cgi
+++ b/html/cgi-bin/status.cgi
@@ -40,7 +40,8 @@ my %servicenames =
        $Lang::tr{'ntp server'} => 'ntpd',
        $Lang::tr{'secure shell server'} => 'sshd',
        $Lang::tr{'vpn'} => 'pluto',
-       $Lang::tr{'web proxy'} => 'squid'
+       $Lang::tr{'web proxy'} => 'squid',
+       $Lang::tr{'openvpn'} => 'openvpn'
 );
 
 my $iface = '';

diff --git a/lfs/cftp b/lfs/cftp
new file mode 100644 (file)
index 0000000..dfb4ec7
--- /dev/null
+++ b/lfs/cftp
@@ -0,0 +1,82 @@
+###############################################################################
+# 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.12
+
+THISAPP    = cftp-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+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 = e497c2cf060a6906f48ac99f55bedc8a
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       make-packages.sh cftp $(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 zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 7072e0d945222b8b117fcabff9bafa74972af326..d71418f5e8d43f7a493262ae39e18056e60e1e53 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -720,6 +720,7 @@ buildipcop() {
   ipcopmake htop
   ipcopmake nfs
   ipcopmake ncftp
+  ipcopmake cftp
   ipcopmake ethereal
 #  wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db
 #  ipcopmake hddtemp

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

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

diff --git a/src/paks/cftp/install.sh b/src/paks/cftp/install.sh
new file mode 100644 (file)
index 0000000..3a9ce55
--- /dev/null
+++ b/src/paks/cftp/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/cftp/uninstall.sh b/src/paks/cftp/uninstall.sh
new file mode 100644 (file)
index 0000000..ad61226
--- /dev/null
+++ b/src/paks/cftp/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