Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index efe51226c62cd36e74af4997111eaa826a7907df..3e2e8f5e98ecada49a1d793be6ca1851b1922bbb 100644 (file)
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -106,6 +106,7 @@ etc/rc.d/init.d/udev_retry
 etc/rc.d/init.d/upnpd
 #etc/rc.d/init.d/vdr
 #etc/rc.d/init.d/vsftpd
+#etc/rc.d/init.d/watchdog
 #etc/rc.d/init.d/winbind
 #etc/rc.d/init.d/xinetd
 #etc/rc.d/rc0.d

diff --git a/config/rootfiles/packages/apcupsd b/config/rootfiles/packages/apcupsd
index 3b3273d345b2c30a2e32ebe453b3e9aa298af76e..7a5df79b3e2d082836a7ff992c1ec0a5f2187626 100644 (file)
--- a/config/rootfiles/packages/apcupsd
+++ b/config/rootfiles/packages/apcupsd
@@ -28,5 +28,3 @@ srv/web/ipfire/cgi-bin/upsstats.cgi
 #usr/share/man/man8/apcupsd.8
 etc/rc.d/init.d/apcupsd
 var/ipfire/menu.d/EX-apcupsd.menu
-var/ipfire/langs/de.pl
-var/ipfire/langs/en.pl

diff --git a/config/rootfiles/packages/watchdog b/config/rootfiles/packages/watchdog
index 0805b73a6de452d35965276e2118ee893dc11a16..d4ee9c8d930998eb964cbc427b285d98d09152ae 100644 (file)
--- a/config/rootfiles/packages/watchdog
+++ b/config/rootfiles/packages/watchdog
@@ -1,5 +1,8 @@
-var/ipfire/backup/addons/includes/watchdog
-etc/rc.d/init.d/watchdog
 etc/watchdog.conf
 usr/sbin/watchdog
-usr/sbin/wd_keepalive
\ No newline at end of file
+usr/sbin/wd_keepalive
+#usr/share/man/man5/watchdog.conf.5
+#usr/share/man/man8/watchdog.8
+#usr/share/man/man8/wd_keepalive.8
+var/ipfire/backup/addons/includes/watchdog
+etc/rc.d/init.d/watchdog

diff --git a/lfs/apcupsd b/lfs/apcupsd
index 4e664fef1a9d1319ed037490b5b1b7e34b6a3e28..5638cabc3d3a7f38f791da84affb512ebd3d40e9 100644 (file)
--- a/lfs/apcupsd
+++ b/lfs/apcupsd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = apcupsd
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = ""
 

diff --git a/src/paks/apcupsd/install.sh b/src/paks/apcupsd/install.sh
new file mode 100644 (file)
index 0000000..682363b
--- /dev/null
+++ b/src/paks/apcupsd/install.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
+extract_files
+restore_backup ${NAME}

diff --git a/src/paks/apcupsd/uninstall.sh b/src/paks/apcupsd/uninstall.sh
new file mode 100644 (file)
index 0000000..4e26837
--- /dev/null
+++ b/src/paks/apcupsd/uninstall.sh
@@ -0,0 +1,34 @@
+#!/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}
+make_backup ${NAME}
+#
+#Remove language files from rootfile to prevent deletion at uninstall
+#
+cat /opt/pakfire/db/rootfiles/apcupsd | \
+    grep -v "var/ipfire/langs" > /opt/pakfire/db/rootfiles/apcupsd.tmp
+mv /opt/pakfire/db/rootfiles/apcupsd.tmp /opt/pakfire/db/rootfiles/apcupsd
+#
+remove_files

diff --git a/src/paks/apcupsd/update.sh b/src/paks/apcupsd/update.sh
new file mode 100644 (file)
index 0000000..89c40d0
--- /dev/null
+++ b/src/paks/apcupsd/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