Fix vsftps package uninstall/update erase user files

diff --git a/config/backup/includes/vsftpd b/config/backup/includes/vsftpd
new file mode 100644 (file)
index 0000000..9631c1b
--- /dev/null
+++ b/config/backup/includes/vsftpd
@@ -0,0 +1,2 @@
+etc/vsftpd.conf
+etc/vsftpd.user_list

diff --git a/config/rootfiles/packages/vsftpd b/config/rootfiles/packages/vsftpd
index e9886dc4cce895a140890a22fef664e1e05472e5..815405ff20712482888cdea3c1960219fd53d542 100644 (file)
--- a/config/rootfiles/packages/vsftpd
+++ b/config/rootfiles/packages/vsftpd
@@ -1,3 +1,4 @@
+var/ipfire/backup/addons/includes/vsftpd
 etc/rc.d/init.d/vsftpd
 etc/vsftpd.conf
 etc/vsftpd.user_list

diff --git a/lfs/vsftpd b/lfs/vsftpd
index 814143bf85c02133bc838b236cea2f5c5e9bfbef..d78380a89edd7d355e7f79c37e31a113626b8cff 100644 (file)
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -87,5 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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 -v -m 644 $(DIR_SRC)/config/backup/includes/vsftpd \
+                       /var/ipfire/backup/addons/includes/vsftpd
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/paks/vsftpd/install.sh b/src/paks/vsftpd/install.sh
new file mode 100644 (file)
index 0000000..2df1ecd
--- /dev/null
+++ b/src/paks/vsftpd/install.sh
@@ -0,0 +1,25 @@
+#!/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@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files

diff --git a/src/paks/vsftpd/uninstall.sh b/src/paks/vsftpd/uninstall.sh
new file mode 100644 (file)
index 0000000..bc38736
--- /dev/null
+++ b/src/paks/vsftpd/uninstall.sh
@@ -0,0 +1,39 @@
+#!/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@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
+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
new file mode 100644 (file)
index 0000000..89c40d0
--- /dev/null
+++ b/src/paks/vsftpd/update.sh
@@ -0,0 +1,26 @@
+#!/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@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh