* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e5af95135bb9b34e37e11c97abdd64449b7313ce
@ 2017-11-28 17:50 git
0 siblings, 0 replies; only message in thread
From: git @ 2017-11-28 17:50 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 51248 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via e5af95135bb9b34e37e11c97abdd64449b7313ce (commit)
via 2e94e04ec0e3cfaa953eea2032cefd97ac5c6b35 (commit)
via 817af14fd2f4af2b4746ddd0c112ec21577b80fb (commit)
via cbd1f0e7196f3c60ec049d7434e040b767f1d488 (commit)
via e9a57acd12483b8fc8e826fad3e5646a3c82e07b (commit)
via fa8c758efec35de77f9146020660ae19b59b28e6 (commit)
via 405ee2b40088208849df0644c46cf4f412919541 (commit)
via f19f5e2366319d05782cc2574a7cad98e74e5e60 (commit)
via 56720befc7e6beafc5e200c0a777422bdbdccc1a (commit)
via d38edcf8b43459915b45f062a2ceac57a2b3c478 (commit)
via 77b9a869ae25f3facff9f064164cabf99323f829 (commit)
via dc4ae0b78d54bb2db70ef3ddc7c777196b42a10f (commit)
via 401a1edc5688733821e69d885132025703944823 (commit)
from aceb943b237da1ade8efab458662f187925d160b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e5af95135bb9b34e37e11c97abdd64449b7313ce
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Nov 28 17:49:25 2017 +0000
core117: Ship latest updates of syslogging
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2e94e04ec0e3cfaa953eea2032cefd97ac5c6b35
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Mon Nov 20 19:40:32 2017 +0100
add language strings
Add language strings for changed config.dat CGI file.
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 817af14fd2f4af2b4746ddd0c112ec21577b80fb
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Mon Nov 20 19:40:17 2017 +0100
allow changing remote syslog protocol to TCP
Add option to change remote syslog protocol to TCP, which
is more reliable than UDP, but might be unsupported on
older syslog servers.
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit cbd1f0e7196f3c60ec049d7434e040b767f1d488
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Mon Nov 20 19:40:11 2017 +0100
allow remote syslog via TCP in syslogdctrl.c
Make syslogctrl.c use TCP as remote logging file if specified so.
Thanks to Michael for reviewing this.
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e9a57acd12483b8fc8e826fad3e5646a3c82e07b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Nov 28 17:44:49 2017 +0000
make.sh: Simplify maths to determine cursor position
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fa8c758efec35de77f9146020660ae19b59b28e6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Nov 28 17:36:07 2017 +0000
make.sh: Improve formatting of options
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 405ee2b40088208849df0644c46cf4f412919541
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Nov 28 17:34:02 2017 +0000
make.sh: Fix position of SKIP message when building packages
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f19f5e2366319d05782cc2574a7cad98e74e5e60
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Nov 28 17:14:29 2017 +0000
ssl: Drop package which isn't maintained any more
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 56720befc7e6beafc5e200c0a777422bdbdccc1a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Nov 28 13:46:07 2017 +0000
Drop vsftpd which isn't actively maintained any more
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d38edcf8b43459915b45f062a2ceac57a2b3c478
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Nov 28 15:55:19 2017 +0000
pound: Drop package which isn't very actively maintained any more
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 77b9a869ae25f3facff9f064164cabf99323f829
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Nov 28 17:28:09 2017 +0000
make.sh: Drop generating a global rootfile
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dc4ae0b78d54bb2db70ef3ddc7c777196b42a10f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Nov 28 17:27:36 2017 +0000
make.sh: Fix printing a log line
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 401a1edc5688733821e69d885132025703944823
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Nov 28 17:22:23 2017 +0000
make.sh: Continue producing nice output after screen has been resized
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/includes/pound | 1 -
config/backup/includes/vsftpd | 2 -
config/etc/group | 1 -
config/etc/passwd | 1 -
config/rootfiles/core/117/filelists/files | 2 +
config/rootfiles/packages/pound | 7 ---
config/rootfiles/packages/sslscan | 2 -
config/rootfiles/packages/vsftpd | 13 ----
config/vsftpd/vsftpd.conf | 51 ---------------
config/vsftpd/vsftpd.user_list | 0
html/cgi-bin/logs.cgi/config.dat | 14 +++++
langs/de/cgi-bin/de.pl | 6 +-
langs/en/cgi-bin/en.pl | 4 ++
lfs/pound | 95 ----------------------------
lfs/sslscan | 83 -------------------------
lfs/vsftpd | 100 ------------------------------
make.sh | 68 ++++++++------------
src/initscripts/packages/pound | 39 ------------
src/initscripts/packages/vsftpd | 45 --------------
src/misc-progs/syslogdctrl.c | 28 ++++++++-
src/paks/pound/install.sh | 32 ----------
src/paks/pound/uninstall.sh | 29 ---------
src/paks/pound/update.sh | 26 --------
src/paks/vsftpd/install.sh | 29 ---------
src/paks/vsftpd/uninstall.sh | 41 ------------
src/paks/vsftpd/update.sh | 28 ---------
26 files changed, 77 insertions(+), 670 deletions(-)
delete mode 100644 config/backup/includes/pound
delete mode 100644 config/backup/includes/vsftpd
delete mode 100644 config/rootfiles/packages/pound
delete mode 100644 config/rootfiles/packages/sslscan
delete mode 100644 config/rootfiles/packages/vsftpd
delete mode 100644 config/vsftpd/vsftpd.conf
delete mode 100644 config/vsftpd/vsftpd.user_list
delete mode 100644 lfs/pound
delete mode 100644 lfs/sslscan
delete mode 100644 lfs/vsftpd
delete mode 100644 src/initscripts/packages/pound
delete mode 100644 src/initscripts/packages/vsftpd
delete mode 100644 src/paks/pound/install.sh
delete mode 100644 src/paks/pound/uninstall.sh
delete mode 100644 src/paks/pound/update.sh
delete mode 100644 src/paks/vsftpd/install.sh
delete mode 100644 src/paks/vsftpd/uninstall.sh
delete mode 100644 src/paks/vsftpd/update.sh
Difference in files:
diff --git a/config/backup/includes/pound b/config/backup/includes/pound
deleted file mode 100644
index a1ec94b..0000000
--- a/config/backup/includes/pound
+++ /dev/null
@@ -1 +0,0 @@
-/etc/pound.cfg
diff --git a/config/backup/includes/vsftpd b/config/backup/includes/vsftpd
deleted file mode 100644
index 876ea30..0000000
--- a/config/backup/includes/vsftpd
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/vsftpd.conf
-/etc/vsftpd.user_list
diff --git a/config/etc/group b/config/etc/group
index d781745..03f5dce 100644
--- a/config/etc/group
+++ b/config/etc/group
@@ -19,7 +19,6 @@ ntp:x:38:
dip:x:40:
mysql:x:41:
ftp:x:45:
-vsftpd:x:47:
rsyncd:x:48:
stunnel:x:51:
lock:x:54:
diff --git a/config/etc/passwd b/config/etc/passwd
index 93940d6..247faa2 100644
--- a/config/etc/passwd
+++ b/config/etc/passwd
@@ -6,7 +6,6 @@ squid:x:23:23:ftp:/var/spool/squid:/bin/false
ntp:x:38:38::/etc/ntp:/bin/false
mysql:x:41:41:MySQL Server:/dev/null:/bin/false
ftp:x:45:45:anonymous_user:/home/ftp:/bin/false
-vsftpd:x:47:47:vsftpd User:/home/ftp:/bin/false
rsyncd:x:48:48:rsyncd Daemon:/home/rsync:/bin/false
stunnel:x:51:51:stunnel Daemon:/var/lib/stunnel:/bin/false
sshd:x:74:74:sshd:/var/empty:/bin/false
diff --git a/config/rootfiles/core/117/filelists/files b/config/rootfiles/core/117/filelists/files
index 949b3ca..eafb9f1 100644
--- a/config/rootfiles/core/117/filelists/files
+++ b/config/rootfiles/core/117/filelists/files
@@ -6,6 +6,7 @@ etc/ssl/certs/ca-bundle.crt
etc/ssl/certs/ca-bundle.trust.crt
opt/pakfire/lib/functions.pl
srv/web/ipfire/cgi-bin/country.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/config.dat
srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
@@ -17,5 +18,6 @@ srv/web/ipfire/html/themes/ipfire-legacy/include/functions.pl
srv/web/ipfire/html/themes/ipfire/include/functions.pl
srv/web/ipfire/html/themes/maniac/include/functions.pl
usr/local/bin/captivectrl
+usr/local/bin/syslogdctrl
var/ipfire/geoip-functions.pl
var/ipfire/network-functions.pl
diff --git a/config/rootfiles/packages/pound b/config/rootfiles/packages/pound
deleted file mode 100644
index 02f3d41..0000000
--- a/config/rootfiles/packages/pound
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/rc.d/init.d/pound
-#etc/pound.cfg
-usr/sbin/pound
-usr/sbin/poundctl
-#usr/share/man/man8/pound.8
-#usr/share/man/man8/poundctl.8
-var/ipfire/backup/addons/includes/pound
diff --git a/config/rootfiles/packages/sslscan b/config/rootfiles/packages/sslscan
deleted file mode 100644
index 603c36e..0000000
--- a/config/rootfiles/packages/sslscan
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/sslscan
-#usr/share/man/man1/sslscan.1
diff --git a/config/rootfiles/packages/vsftpd b/config/rootfiles/packages/vsftpd
deleted file mode 100644
index e0f59c3..0000000
--- a/config/rootfiles/packages/vsftpd
+++ /dev/null
@@ -1,13 +0,0 @@
-var/ipfire/backup/addons/includes/vsftpd
-etc/rc.d/init.d/vsftpd
-etc/rc.d/rc0.d/K35vsftpd
-etc/rc.d/rc6.d/K35vsftpd
-etc/rc.d/rc3.d/S65vsftpd
-etc/vsftpd.conf
-etc/vsftpd.user_list
-home/ftp
-usr/sbin/vsftpd
-#usr/share/man/man5/vsftpd.conf.5
-#usr/share/man/man8/vsftpd.8
-var/ftp
-var/ftp/empty
diff --git a/config/vsftpd/vsftpd.conf b/config/vsftpd/vsftpd.conf
deleted file mode 100644
index e7206ee..0000000
--- a/config/vsftpd/vsftpd.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-# Default config for vsftpd on ipfire
-background=YES
-listen=YES
-#
-nopriv_user=vsftpd
-#
-local_enable=YES
-write_enable=YES
-#
-local_umask=022
-#
-#anonymous_enable=YES
-#anon_upload_enable=YES
-#anon_mkdir_write_enable=YES
-#
-dirmessage_enable=YES
-#
-xferlog_enable=YES
-xferlog_file=/var/log/vsftpd.log
-xferlog_std_format=YES
-#
-connect_from_port_20=YES
-#
-#chown_uploads=YES
-#chown_username=whoever
-#
-idle_session_timeout=600
-data_connection_timeout=120
-#
-#async_abor_enable=YES
-#ascii_upload_enable=YES
-#ascii_download_enable=YES
-#
-ftpd_banner=Welcome to IPFire FTP service.
-#
-chroot_local_user=YES
-#chroot_list_enable=YES
-secure_chroot_dir=/var/ftp/empty
-#
-ls_recurse_enable=YES
-require_ssl_reuse=NO
-#
-#ssl_enable=YES
-#force_local_data_ssl=NO
-#force_local_logins_ssl=NO
-#rsa_cert_file=/etc/vsftpd.pem
-#
-userlist_deny=NO
-userlist_enable=YES
-userlist_file=/etc/vsftpd.user_list
-#
diff --git a/config/vsftpd/vsftpd.user_list b/config/vsftpd/vsftpd.user_list
deleted file mode 100644
index e69de29..0000000
diff --git a/html/cgi-bin/logs.cgi/config.dat b/html/cgi-bin/logs.cgi/config.dat
index 789341d..aed0db9 100644
--- a/html/cgi-bin/logs.cgi/config.dat
+++ b/html/cgi-bin/logs.cgi/config.dat
@@ -33,6 +33,7 @@ $logsettings{'LOGWATCH_KEEP'} = '56';
my @VS = ('15','50','100','150','250','500');
$logsettings{'ENABLE_REMOTELOG'} = 'off';
$logsettings{'REMOTELOG_ADDR'} = '';
+$logsettings{'REMOTELOG_PROTOCOL'} = 'udp';
$logsettings{'ACTION'} = '';
&Header::getcgihash(\%logsettings);
@@ -45,6 +46,10 @@ if ($logsettings{'ACTION'} eq $Lang::tr{'save'})
{
$errormessage = $Lang::tr{'invalid logserver address'};
}
+ unless ($logsettings{'REMOTELOG_PROTOCOL'} =~ /^udp|tcp$/)
+ {
+ $errormessage = $Lang::tr{'invalid logserver protocol'};
+ }
}
unless ($logsettings{'LOGWATCH_KEEP'} =~ /^\d+$/)
{
@@ -69,6 +74,10 @@ $checked{'ENABLE_REMOTELOG'}{'off'} = '';
$checked{'ENABLE_REMOTELOG'}{'on'} = '';
$checked{'ENABLE_REMOTELOG'}{$logsettings{'ENABLE_REMOTELOG'}} = "checked='checked'";
+$selected{'REMOTELOG_PROTOCOL'}{'udp'} = '';
+$selected{'REMOTELOG_PROTOCOL'}{'tcp'} == '';
+$selected{'REMOTELOG_PROTOCOL'}{$logsettings{'REMOTELOG_PROTOCOL'}} = "selected='selected'";
+
$checked{'LOGVIEW_REVERSE'}{'off'} = '';
$checked{'LOGVIEW_REVERSE'}{'on'} = '';
$checked{'LOGVIEW_REVERSE'}{$logsettings{'LOGVIEW_REVERSE'}} = "checked='checked'";
@@ -139,6 +148,11 @@ print <<END
<tr>
<td class='base'>$Lang::tr{'enabled'}</td><td><input type='checkbox' name='ENABLE_REMOTELOG' $checked{'ENABLE_REMOTELOG'}{'on'} /></td>
<td>$Lang::tr{'log server address'}</td><td><input type='text' name='REMOTELOG_ADDR' value='$logsettings{'REMOTELOG_ADDR'}' /></td>
+ <td>$Lang::tr{'log server protocol'}</td><td>
+ <select name='REMOTELOG_PROTOCOL'>
+ <option value='udp' $selected{'REMOTELOG_PROTOCOL'}{'udp'}>$Lang::tr{'udp less overhead'}</option>
+ <option value='tcp' $selected{'REMOTELOG_PROTOCOL'}{'tcp'}>$Lang::tr{'tcp more reliable'}</option>
+ </select></td>
</tr>
</table>
END
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6dff5d7..672b965 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1403,6 +1403,7 @@
'invalid loaded file' => 'Ungültige geladene Datei',
'invalid local-remote id' => 'Local-Id und Remote-Id dürfen nicht gleich sein, und müssen einem "@"-Zeichen beginnen. Dies sind leftid und rightid in der StrongSwan-Terminologie.',
'invalid logserver address' => 'Ungültige syslogd-Server-Adresse',
+'invalid logserver protocol' => 'Ungültiges syslogd-Server-Übertragungsprotokoll',
'invalid mac address' => 'Ungültige MAC-Adresse',
'invalid max lease time' => 'Ungültige max. Haltezeit.',
'invalid maximum incoming size' => 'Ungültige max. ankommende Größe.',
@@ -1489,7 +1490,8 @@
'log enabled' => 'Protokoll aktiviert',
'log level' => 'Protokollierungslevel',
'log lines per page' => 'Zeilen pro Seite',
-'log server address' => 'Syslog Server',
+'log server address' => 'Syslog Server:',
+'log server protocol' => 'Übertragungsprotokoll:',
'log settings' => 'Protokolldatei-Einstellungen',
'log summaries' => 'Protokollübersicht',
'log summary' => 'Protokollzusammenfassung',
@@ -2196,6 +2198,7 @@
'system logs' => 'Systemprotokolldateien',
'system status information' => 'System-Statusinformationen',
'ta key' => 'TLS-Authentifizierungsschlüssel',
+'tcp more reliable' => 'TCP (zuverlässiger)',
'telephone not set' => 'Telefonnummer nicht angegeben.',
'template' => 'Vorlage',
'template warning' => 'Zur Einrichtung von QoS stehen Ihnen 2 Möglichkeiten zur Auswahl. Entweder Sie wählen speichern und erstellen Klassen und Regeln nach Ihren Wünschen, oder Sie wählen Vorlage, dann werden die Klassen und Regeln durch ein Template generiert.',
@@ -2318,6 +2321,7 @@
'twelve hours' => '12 Stunden',
'two weeks' => 'Zwei Wochen',
'type' => 'Typ',
+'udp less overhead' => 'UDP (geringerer Overhead)',
'umount' => 'Abmelden',
'umount removable media before to unplug' => 'Wechselmedien vor dem Entfernen unbedingt abmelden',
'unable to alter profiles while red is active' => 'Profile können nicht geändert werden, solange ROT aktiv ist.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 4efff6e..b3120dc 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1435,6 +1435,7 @@
'invalid loaded file' => 'Invalid loaded file',
'invalid local-remote id' => 'local & remote id must not be equal and begin with a "@" sign. These are leftid and rightid in strongswan terminology.',
'invalid logserver address' => 'Invalid syslogd server address',
+'invalid logserver protocol' => 'Invalid syslogd server protocol',
'invalid mac address' => 'Invalid MAC address',
'invalid max lease time' => 'Invalid max lease time.',
'invalid maximum incoming size' => 'Invalid maximum incoming size.',
@@ -1522,6 +1523,7 @@
'log level' => 'Log Level',
'log lines per page' => 'Lines per page',
'log server address' => 'Syslog server:',
+'log server protocol' => 'protocol:',
'log settings' => 'Log Settings',
'log summaries' => 'Log summaries',
'log summary' => 'Log Summary',
@@ -2238,6 +2240,7 @@
'system logs' => 'System Logs',
'system status information' => 'System Status Information',
'ta key' => 'TLS-Authentification-Key',
+'tcp more reliable' => 'TCP (more reliable)',
'telephone not set' => 'Telephone not set.',
'template' => 'Preset',
'template warning' => 'You have two options to set up Qos. The First, you press the save button and generate the classes and rules on your own. The second, you press the preset button and classes and rules will be set up by a template.',
@@ -2363,6 +2366,7 @@
'twelve hours' => '12 Hours',
'two weeks' => 'Two Weeks',
'type' => 'Type',
+'udp less overhead' => 'UDP (less overhead)',
'umount' => 'Umount',
'umount removable media before to unplug' => 'Umount removable media before unplugging the device',
'unable to alter profiles while red is active' => 'Unable to alter profiles while RED is active.',
diff --git a/lfs/pound b/lfs/pound
deleted file mode 100644
index b4206d0..0000000
--- a/lfs/pound
+++ /dev/null
@@ -1,95 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
-# #
-# This program 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 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 2.7
-
-THISAPP = Pound-$(VER)
-DL_FILE = $(THISAPP).tgz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = pound
-PAK_VER = 8
-
-DEPS = ""
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = ec8298aa3e4aee3ffbecdc0639d7f14a
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist:
- @$(PAK)
-
-###############################################################################
-# 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 --sysconfdir=/etc \
- --with-dh=1024
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
-
- #install initscripts
- $(call INSTALL_INITSCRIPT,pound)
-
- install -v -m 644 $(DIR_SRC)/config/backup/includes/pound \
- /var/ipfire/backup/addons/includes/pound
-
- # Remove temporary file.
- rm -vf /root/.rnd
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/sslscan b/lfs/sslscan
deleted file mode 100644
index a384db1..0000000
--- a/lfs/sslscan
+++ /dev/null
@@ -1,83 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2014 Michael Tremer & Christian Schmidt #
-# #
-# This program 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 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 1.10.2
-
-THISAPP = sslscan-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = sslscan
-PAK_VER = 1
-
-DEPS = ""
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 41ecff92303cecfd00bf3c7de509af14
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist:
- @$(PAK)
-
-###############################################################################
-# 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 axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && make $(MAKETUNING) CFLAGS="$(CFLAGS)"
- cd $(DIR_APP) && make install PREFIX=/usr
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/vsftpd b/lfs/vsftpd
deleted file mode 100644
index 07dda30..0000000
--- a/lfs/vsftpd
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
-# #
-# This program 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 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 2.3.4
-
-THISAPP = vsftpd-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = vsftpd
-PAK_VER = 8
-
-DEPS = ""
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 2ea5d19978710527bb7444d93b67767a
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist:
- $(PAK)
-
-###############################################################################
-# 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) && echo "#define VSF_BUILD_SSL" >>builddefs.h
- cd $(DIR_APP) && install -v -d -m 0755 /var/ftp/empty
- cd $(DIR_APP) && install -v -d -m 0755 /home/ftp
- chown vsftpd.vsftpd /home/ftp
- cd $(DIR_APP) && make
- cd $(DIR_APP) && install -v -m 755 vsftpd /usr/sbin/vsftpd
- cd $(DIR_APP) && install -v -m 644 vsftpd.8 /usr/share/man/man8
- cd $(DIR_APP) && install -v -m 644 vsftpd.conf.5 /usr/share/man/man5
- cd $(DIR_APP) && install -v -m 644 $(DIR_SRC)/config/vsftpd/vsftpd.conf /etc
- cd $(DIR_APP) && install -v -m 644 $(DIR_SRC)/config/vsftpd/vsftpd.user_list /etc
-
- #install initscripts
- $(call INSTALL_INITSCRIPT,vsftpd)
-
- ln -sf ../init.d/vsftpd /etc/rc.d/rc3.d/S65vsftpd
- ln -sf ../init.d/vsftpd /etc/rc.d/rc0.d/K35vsftpd
- ln -sf ../init.d/vsftpd /etc/rc.d/rc6.d/K35vsftpd
- install -v -m 644 $(DIR_SRC)/config/backup/includes/vsftpd \
- /var/ipfire/backup/addons/includes/vsftpd
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 44516af..5f619d3 100755
--- a/make.sh
+++ b/make.sh
@@ -52,27 +52,33 @@ else
INTERACTIVE=false
fi
-## Screen Dimentions
-# Find current screen size
-if [ -z "${COLUMNS}" ]; then
- COLUMNS=$(stty size)
- COLUMNS=${COLUMNS##* }
-fi
+# Sets or adjusts pretty formatting variables
+resize_terminal() {
+ ## Screen Dimentions
+ # Find current screen size
+ COLUMNS=$(tput cols)
+
+ # When using remote connections, such as a serial port, stty size returns 0
+ if ! ${INTERACTIVE} || [ "${COLUMNS}" = "0" ]; then
+ COLUMNS=80
+ fi
-# When using remote connections, such as a serial port, stty size returns 0
-if ! ${INTERACTIVE} || [ "${COLUMNS}" = "0" ]; then
- COLUMNS=80
-fi
+ # Measurements for positioning result messages
+ OPTIONS_WIDTH=20
+ TIME_WIDTH=12
+ STATUS_WIDTH=8
+ NAME_WIDTH=$(( COLUMNS - OPTIONS_WIDTH - TIME_WIDTH - STATUS_WIDTH ))
+ LINE_WIDTH=$(( COLUMNS - STATUS_WIDTH ))
-## Measurements for positioning result messages
-OPTIONS_WIDTH=20
-TIME_WIDTH=12
-STATUS_WIDTH=8
-NAME_WIDTH=$(( COLUMNS - OPTIONS_WIDTH - TIME_WIDTH - STATUS_WIDTH ))
-LINE_WIDTH=$(( COLUMNS - STATUS_WIDTH ))
+ TIME_COL=$(( NAME_WIDTH + OPTIONS_WIDTH ))
+ STATUS_COL=$(( TIME_COL + TIME_WIDTH ))
+}
-TIME_COL=$(( COLUMNS - TIME_WIDTH - STATUS_WIDTH ))
-STATUS_COL=$(( COLUMNS - STATUS_WIDTH ))
+# Initially setup terminal
+resize_terminal
+
+# Call resize_terminal when terminal is being resized
+trap "resize_terminal" WINCH
# Define color for messages
BOLD="\\033[1;39m"
@@ -316,12 +322,7 @@ print_package() {
fi
printf "%-$(( ${NAME_WIDTH} - 1 ))s " "${string}"
-
- if [ -n "${options}" ]; then
- printf "[ %-$(( ${OPTIONS_WIDTH} - 4 ))s ]" "${options}"
- else
- printf "%${OPTIONS_WIDTH}s" ""
- fi
+ printf "%$(( ${OPTIONS_WIDTH} - 1 ))s " "${options}"
}
print_runtime() {
@@ -567,6 +568,7 @@ lfsmakecommoncheck() {
if grep "^SUP_ARCH" ${BASEDIR}/lfs/${1} >/dev/null; then
# Check if package supports ${BUILD_ARCH} or all architectures.
if ! grep -E "^SUP_ARCH.*${BUILD_ARCH}|^SUP_ARCH.*all" ${BASEDIR}/lfs/${1} >/dev/null; then
+ print_runtime 0
print_status SKIP
return 1
fi
@@ -1336,7 +1338,6 @@ buildipfire() {
lfsmake2 etherwake
lfsmake2 bwm-ng
lfsmake2 sysstat
- lfsmake2 vsftpd
lfsmake2 strongswan
lfsmake2 rng-tools
lfsmake2 lsof
@@ -1430,7 +1431,6 @@ buildipfire() {
lfsmake2 usb_modeswitch
lfsmake2 usb_modeswitch_data
lfsmake2 zerofree
- lfsmake2 pound
lfsmake2 minicom
lfsmake2 ddrescue
lfsmake2 miniupnpd
@@ -1487,7 +1487,6 @@ buildipfire() {
lfsmake2 iptraf-ng
lfsmake2 iotop
lfsmake2 stunnel
- lfsmake2 sslscan
lfsmake2 owncloud
lfsmake2 bacula
lfsmake2 batctl
@@ -1536,7 +1535,7 @@ buildpackages() {
# Generating list of packages used
- echo -n "Generating packages list from logs" | tee -a $LOGFILE
+ print_line "Generating packages list from logs"
rm -f $BASEDIR/doc/packages-list
for i in `ls -1tr $BASEDIR/log/[^_]*`; do
if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then
@@ -1587,19 +1586,6 @@ buildpackages() {
stdumount
rm -rf $BASEDIR/build/tmp/*
- # Generating total list of files
- echo -n "Generating files list from logs" | tee -a $LOGFILE
- rm -f $BASEDIR/log/FILES
- for i in `ls -1tr $BASEDIR/log/[^_]*`; do
- if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then
- echo "##" >>$BASEDIR/log/FILES
- echo "## `basename $i`" >>$BASEDIR/log/FILES
- echo "##" >>$BASEDIR/log/FILES
- cat $i | sed "s%^\./%#%" | sort >> $BASEDIR/log/FILES
- fi
- done
- print_status DONE
-
cd $PWD
}
diff --git a/src/initscripts/packages/pound b/src/initscripts/packages/pound
deleted file mode 100644
index 86a73d8..0000000
--- a/src/initscripts/packages/pound
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/pound
-#
-# Description : pound reverse-proxy
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-case "${1}" in
- start)
- boot_mesg "Starting pound reverse-proxy..."
- loadproc /usr/sbin/pound
- ;;
-
- stop)
- boot_mesg "Stopping pound reverse-proxy..."
- killproc /usr/sbin/pound
- ;;
-
- restart)
- ${0} stop
- sleep 1
- ${0} start
- ;;
-
- status)
- statusproc /usr/sbin/pound
- ;;
-
- *)
- echo "Usage: ${0} {start|stop|restart|status}"
- exit 1
- ;;
-esac
-
-# End $rc_base/init.d/pound
diff --git a/src/initscripts/packages/vsftpd b/src/initscripts/packages/vsftpd
deleted file mode 100644
index 62d838a..0000000
--- a/src/initscripts/packages/vsftpd
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/vsftpd
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org
-
-#$LastChangedBy: bdubbs $
-#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $
-
-. /etc/sysconfig/rc
-. $rc_functions
-
-case "$1" in
- start)
- boot_mesg "Starting vsFTPD Server..."
- loadproc /usr/sbin/vsftpd
- ;;
-
- stop)
- boot_mesg "Stopping vsFTPD Server..."
- killproc /usr/sbin/vsftpd
- ;;
-
- reload)
- boot_mesg "Reloading vsFTPD Server..."
- reloadproc /usr/sbin/vsftpd
- ;;
-
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
-
- status)
- statusproc /usr/sbin/vsftpd
- ;;
-
- *)
- echo "Usage: $0 {start|stop|reload|restart|status}"
- exit 1
- ;;
-esac
-
-# End $rc_base/init.d/vsftpd
diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c
index 5271902..8372716 100644
--- a/src/misc-progs/syslogdctrl.c
+++ b/src/misc-progs/syslogdctrl.c
@@ -27,18 +27,19 @@
#define ERR_ANY 1
#define ERR_SETTINGS 2 /* error in settings file */
#define ERR_ETC 3 /* error with /etc permissions */
-#define ERR_CONFIG 4 /* error updated sshd_config */
+#define ERR_CONFIG 4 /* error updating syslogd config */
#define ERR_SYSLOG 5 /* error restarting syslogd */
int main(void)
{
- char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE];
+ char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE], protocol[STRING_SIZE];
char varmessages[STRING_SIZE], asynclog[STRING_SIZE];
int config_fd,rc,fd,pid;
struct stat st;
struct keyvalue *kv = NULL;
memset(buffer, 0, STRING_SIZE);
memset(hostname, 0, STRING_SIZE);
+ memset(protocol, 0, STRING_SIZE);
memset(varmessages, 0, STRING_SIZE);
memset(asynclog, 0, STRING_SIZE);
@@ -67,6 +68,12 @@ int main(void)
exit(ERR_SETTINGS);
}
+ if (!findkey(kv, "REMOTELOG_PROTOCOL", protocol))
+ {
+ /* fall back to UDP if no protocol was given */
+ protocol = "udp";
+ }
+
if (strspn(hostname, VALID_FQDN) != strlen(hostname))
{
fprintf(stderr, "Bad REMOTELOG_ADDR: %s\n", hostname);
@@ -106,9 +113,24 @@ int main(void)
}
if (!strcmp(buffer,"on"))
- snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd );
+ {
+ /* check which transmission protocol was given */
+ if (strcmp(protocol, "tcp") == 0)
+ {
+ /* write line for TCP */
+ snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd );
+ }
+ else
+ {
+ /* write line for UDP */
+ snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd );
+ }
+ }
else
+ {
+ /* if remote syslog has been disabled */
snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+(a).\\+\\)$/#\\1/' /etc/syslog.conf >&%d", config_fd );
+ }
/* if the return code isn't 0 failsafe */
if ((rc = unpriv_system(buffer,99,99)) != 0)
diff --git a/src/paks/pound/install.sh b/src/paks/pound/install.sh
deleted file mode 100644
index c1748b0..0000000
--- a/src/paks/pound/install.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire 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. #
-# #
-# IPFire 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 IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_files
-restore_backup ${NAME}
-
-ln -svf ../init.d/pound /etc/rc.d/rc0.d/K20pound
-ln -svf ../init.d/pound /etc/rc.d/rc3.d/S40pound
-ln -svf ../init.d/pound /etc/rc.d/rc6.d/K20pound
-
-start_service --background ${NAME}
diff --git a/src/paks/pound/uninstall.sh b/src/paks/pound/uninstall.sh
deleted file mode 100644
index aa2c63b..0000000
--- a/src/paks/pound/uninstall.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire 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. #
-# #
-# IPFire 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 IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-stop_service ${NAME}
-make_backup ${NAME}
-remove_files
-
-rm -rf /etc/rc.d/rc*.d/*pound
diff --git a/src/paks/pound/update.sh b/src/paks/pound/update.sh
deleted file mode 100644
index 89c40d0..0000000
--- a/src/paks/pound/update.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire 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. #
-# #
-# IPFire 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 IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-./uninstall.sh
-./install.sh
diff --git a/src/paks/vsftpd/install.sh b/src/paks/vsftpd/install.sh
deleted file mode 100644
index fb865dd..0000000
--- a/src/paks/vsftpd/install.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire 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. #
-# #
-# IPFire 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 IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_files
-restore_backup ${NAME}
-# Disable vsftpd by default due to lack of configuration file
-mkdir -p /etc/rc.d/rc3.d/off
-mv -f /etc/rc.d/rc3.d/S??${NAME} /etc/rc.d/rc3.d/off
diff --git a/src/paks/vsftpd/uninstall.sh b/src/paks/vsftpd/uninstall.sh
deleted file mode 100644
index 63205f8..0000000
--- a/src/paks/vsftpd/uninstall.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire 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. #
-# #
-# IPFire 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 IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-stop_service ${NAME}
-
-#Create a backupinclude if it not exist
-if [ ! -e "/var/ipfire/backup/addons/includes/vsftpd" ]; then
- echo /etc/vsftpd.conf > /var/ipfire/backup/addons/includes/vsftpd
- echo /etc/vsftpd.user_list >> /var/ipfire/backup/addons/includes/vsftpd
-fi
-#Fix wrong backupinclude
-sed -i 's|^etc|/etc|g' /var/ipfire/backup/addons/includes/vsftpd
-make_backup ${NAME}
-#Remove userdate from rootfile
-cat /opt/pakfire/db/rootfiles/vsftpd | \
- grep -v "home/ftp" | \
- grep -v "var/ftp" > /opt/pakfire/db/rootfiles/vsftpd.tmp
-mv /opt/pakfire/db/rootfiles/vsftpd.tmp /opt/pakfire/db/rootfiles/vsftpd
-
-remove_files
diff --git a/src/paks/vsftpd/update.sh b/src/paks/vsftpd/update.sh
deleted file mode 100644
index e42310f..0000000
--- a/src/paks/vsftpd/update.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire 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. #
-# #
-# IPFire 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 IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-./uninstall.sh
-extract_files
-restore_backup ${NAME}
-start_service --background ${NAME}
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-11-28 17:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-28 17:50 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e5af95135bb9b34e37e11c97abdd64449b7313ce git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox