Merge branch 'master' into next

diff --git a/config/mpfire/mpd.conf b/config/mpfire/mpd.conf
index ae2460c223f4fdf84b31fa2781531614a47a701c..10da064c30a7f447f5b8715737be4fae394ffb1f 100644 (file)
--- a/config/mpfire/mpd.conf
+++ b/config/mpfire/mpd.conf
@@ -32,26 +32,6 @@ state_file "/var/ipfire/mpfire/mpd_state"
 #
 ##########################################################
 
-
-################### VOLUME MIXER #########################
-#
-# Examples:
-# ALSA Mixer 
-mixer_type             "alsa"
-mixer_device           "default"
-mixer_control          "PCM"
-#
-# OSS Mixer
-#mixer_type            "oss"
-#mixer_device          "/dev/mixer"
-#mixer_control         "PCM"
-#
-# Software Mixer
-#mixer_type            "software"
-#
-##########################################################
-
-
 ################## AUDIO OUTPUT ##########################
 #
 audio_output {

diff --git a/config/rootfiles/packages/mpc b/config/rootfiles/packages/mpc
index 7df38151182a7e903f6c9e3e5bd64c5550c18434..1e3cac2a25199ed2ebc67cc70d79407d3073bc73 100644 (file)
--- a/config/rootfiles/packages/mpc
+++ b/config/rootfiles/packages/mpc
@@ -1,10 +1,11 @@
 usr/bin/mpc
 #usr/share/doc/mpc
 #usr/share/doc/mpc/AUTHORS
+#usr/share/doc/mpc/COPYING
+#usr/share/doc/mpc/NEWS
 #usr/share/doc/mpc/README
-#usr/share/doc/mpc/m3u-handler.sh
 #usr/share/doc/mpc/mpc-bashrc
+#usr/share/doc/mpc/mpd-m3u-handler.sh
+#usr/share/doc/mpc/mpd-pls-handler.sh
 #usr/share/doc/mpc/mppledit
-#usr/share/doc/mpc/pls-handler.sh
 #usr/share/man/man1/mpc.1
-usr/share/mpc

diff --git a/config/rootfiles/packages/nut b/config/rootfiles/packages/nut
new file mode 100644 (file)
index 0000000..694d2c3
--- /dev/null
+++ b/config/rootfiles/packages/nut
@@ -0,0 +1,120 @@
+etc/nut.conf.sample
+etc/ups.conf.sample
+etc/upsd.conf.sample
+etc/upsd.users.sample
+etc/upsmon.conf.sample
+etc/upssched.conf.sample
+#lib/udev/rules.d
+lib/udev/rules.d/52-nut-usbups.rules
+usr/bin/apcsmart
+usr/bin/bcmxcp
+usr/bin/bcmxcp_usb
+usr/bin/belkin
+usr/bin/belkinunv
+usr/bin/bestfcom
+usr/bin/bestuferrups
+usr/bin/bestups
+usr/bin/blazer_ser
+usr/bin/blazer_usb
+usr/bin/cyberpower
+usr/bin/dummy-ups
+usr/bin/etapro
+usr/bin/everups
+usr/bin/gamatronic
+usr/bin/genericups
+usr/bin/isbmex
+usr/bin/liebert
+usr/bin/masterguard
+usr/bin/megatec
+usr/bin/megatec_usb
+usr/bin/metasys
+usr/bin/mge-shut
+usr/bin/mge-utalk
+usr/bin/microdowell
+usr/bin/newmge-shut
+usr/bin/oneac
+usr/bin/optiups
+usr/bin/powercom
+usr/bin/powerpanel
+usr/bin/rhino
+usr/bin/richcomm_usb
+usr/bin/safenet
+usr/bin/skel
+usr/bin/snmp-ups
+usr/bin/solis
+usr/bin/tripplite
+usr/bin/tripplite_usb
+usr/bin/tripplitesu
+usr/bin/upsc
+usr/bin/upscmd
+usr/bin/upscode2
+usr/bin/upsdrvctl
+usr/bin/upslog
+usr/bin/upsrw
+usr/bin/upssched-cmd
+usr/bin/usbhid-ups
+usr/bin/victronups
+#usr/cgi-bin
+#usr/html
+#usr/lib/libupsclient.la
+#usr/lib/libupsclient.so
+usr/lib/libupsclient.so.1
+usr/lib/libupsclient.so.1.0.0
+usr/sbin/upsd
+usr/sbin/upsmon
+usr/sbin/upssched
+usr/share/cmdvartab
+usr/share/driver.list
+#usr/share/man/man5/ups.conf.5
+#usr/share/man/man5/upsd.conf.5
+#usr/share/man/man5/upsd.users.5
+#usr/share/man/man5/upsmon.conf.5
+#usr/share/man/man5/upssched.conf.5
+#usr/share/man/man8/apcsmart.8
+#usr/share/man/man8/bcmxcp.8
+#usr/share/man/man8/bcmxcp_usb.8
+#usr/share/man/man8/belkin.8
+#usr/share/man/man8/belkinunv.8
+#usr/share/man/man8/bestfcom.8
+#usr/share/man/man8/bestuferrups.8
+#usr/share/man/man8/bestups.8
+#usr/share/man/man8/blazer.8
+#usr/share/man/man8/cyberpower.8
+#usr/share/man/man8/dummy-ups.8
+#usr/share/man/man8/etapro.8
+#usr/share/man/man8/everups.8
+#usr/share/man/man8/gamatronic.8
+#usr/share/man/man8/genericups.8
+#usr/share/man/man8/isbmex.8
+#usr/share/man/man8/liebert.8
+#usr/share/man/man8/masterguard.8
+#usr/share/man/man8/megatec.8
+#usr/share/man/man8/megatec_usb.8
+#usr/share/man/man8/metasys.8
+#usr/share/man/man8/mge-shut.8
+#usr/share/man/man8/mge-utalk.8
+#usr/share/man/man8/microdowell.8
+#usr/share/man/man8/nutupsdrv.8
+#usr/share/man/man8/oneac.8
+#usr/share/man/man8/optiups.8
+#usr/share/man/man8/powercom.8
+#usr/share/man/man8/powerpanel.8
+#usr/share/man/man8/rhino.8
+#usr/share/man/man8/richcomm_usb.8
+#usr/share/man/man8/safenet.8
+#usr/share/man/man8/snmp-ups.8
+#usr/share/man/man8/solis.8
+#usr/share/man/man8/tripplite.8
+#usr/share/man/man8/tripplite_usb.8
+#usr/share/man/man8/tripplitesu.8
+#usr/share/man/man8/upsc.8
+#usr/share/man/man8/upscmd.8
+#usr/share/man/man8/upscode2.8
+#usr/share/man/man8/upsd.8
+#usr/share/man/man8/upsdrvctl.8
+#usr/share/man/man8/upslog.8
+#usr/share/man/man8/upsmon.8
+#usr/share/man/man8/upsrw.8
+#usr/share/man/man8/upssched.8
+#usr/share/man/man8/usbhid-ups.8
+#usr/share/man/man8/victronups.8

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 9f3f1c11e7b4d4a12b0dffe317891617449f26e2..36bd40c74da6100c4c2ad369245320f9f5c5c4da 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -220,8 +220,8 @@
 * mldonkey-3.0.0
 * module-init-tools-3.5
 * motion-3.2.11
-* mpc-0.14
-* mpd-0.14.2
+* mpc-0.17
+* mpd-0.15.3
 * mpeg2dec-0.4.0b
 * mpfire-ipfire
 * mtd-CVS-20070507
@@ -243,6 +243,7 @@
 * noip_updater_v1.6
 * ntfs-3g-2009.2.1
 * ntp-4.2.4p7
+* nut-2.4.1
 * ocaml-3.09.2
 * oinkmaster-2.0
 * open-vm-tools-2009.05.22-167859

diff --git a/lfs/mpc b/lfs/mpc
index 6c9c418834b6c3ad6e4e0b86e80c25c1a39fd832..5ae7567e58f180c5a623c0a740dc3d37bd8955b0 100644 (file)
--- a/lfs/mpc
+++ b/lfs/mpc
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.14
+VER        = 0.17
 
 THISAPP    = mpc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpc
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "mpd"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f4218602342cf322872a41dfe0cc72e1
+$(DL_FILE)_MD5 = 3f642c2c2ad7a57a9be7a03351c8c558
 
 install : $(TARGET)
 

diff --git a/lfs/mpd b/lfs/mpd
index 8ff68971ac3b69645a9701ada30a152817790e6c..3f1ecc8b5bdc79a5e8e7a477a5962e5007cf6830 100644 (file)
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.14.2
+VER        = 0.15.3
 
 THISAPP    = mpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/${THISAPP}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       = "alsa ffmpeg glib libshout libogg libmad libid3tag libvorbis"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 66817a4b4c05454e6488f6b821f2a6a3
+$(DL_FILE)_MD5 = 40f01c53333885f86aace5a37ae55bd1
 
 install : $(TARGET)
 

diff --git a/lfs/nut b/lfs/nut
new file mode 100644 (file)
index 0000000..e263505
--- /dev/null
+++ b/lfs/nut
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# 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.4.1
+
+THISAPP    = nut-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = nut
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 609ebaf2123fc7171d25a6c742dd7d66
+
+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
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 8b6d8ea4de12cadf9bdd656b2ce05c7824ef518a..d56ee48ef5e46f79c0dbcb94cfe6b614e98d962d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -623,6 +623,7 @@ buildipfire() {
   ipfiremake iftop
   ipfiremake motion
   ipfiremake joe
+  ipfiremake nut
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild

diff --git a/src/initscripts/init.d/checkfs b/src/initscripts/init.d/checkfs
index fe0f435a1af65f42214bc93f7a7c78d939bb39d1..f31390de952df5cc0a5eabbd2ecc27e420d94955 100644 (file)
--- a/src/initscripts/init.d/checkfs
+++ b/src/initscripts/init.d/checkfs
@@ -48,9 +48,9 @@ case "${1}" in
                        boot_mesg -n " in read-only mode.\n\nAfter you"
                        boot_mesg -n " press Enter, this system will be"
                        boot_mesg -n " halted and powered off."
-                       boot_mesg -n "\n\nPress enter to continue..." ${INFO}
+                       boot_mesg -n "\n\nPress enter to continue or wait a minute..." ${INFO}
                        boot_mesg "" ${NORMAL}
-                       read ENTER
+                       read -t 60 ENTER
                        ${rc_base}/init.d/halt stop
                fi
 
@@ -90,9 +90,9 @@ case "${1}" in
                        boot_mesg -n " errors require this system to be"
                        boot_mesg -n " rebooted.\n\nAfter you press enter,"
                        boot_mesg -n " this system will be rebooted"
-                       boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
+                       boot_mesg -n "\n\nPress Enter to continue or wait a minute..." ${INFO}
                        boot_mesg "" ${NORMAL}
-                       read ENTER
+                       read -t 60 ENTER
                        reboot -f
                fi
 
@@ -107,9 +107,9 @@ case "${1}" in
                        boot_mesg -n " System Administrator.\n\nAfter you"
                        boot_mesg -n " press Enter, this system will be"
                        boot_mesg -n " halted and powered off."
-                       boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
+                       boot_mesg -n "\n\nPress Enter to continue or wait a minute..." ${INFO}
                        boot_mesg "" ${NORMAL}
-                       read ENTER
+                       read -t 60 ENTER
                  ${rc_base}/init.d/halt stop
                fi
 

diff --git a/src/initscripts/init.d/functions b/src/initscripts/init.d/functions
index 04acda3cf258b14d5df943b1d41a5398ecedd9ab..ea840d1a56d1decc4c945e1baadb72d3639fed41 100644 (file)
--- a/src/initscripts/init.d/functions
+++ b/src/initscripts/init.d/functions
@@ -155,9 +155,9 @@ print_error_msg()
        boot_mesg -n " ipfire, please be so kind to inform us at"
        boot_mesg " info@ipfire.org.\n"
        boot_mesg_flush
-       boot_mesg -n "Press Enter to continue or wait 3 minutes..." ${INFO}
+       boot_mesg -n "Press Enter to continue or wait a minute..." ${INFO}
        boot_mesg "" ${NORMAL}
-       read -t 180 ENTER
+       read -t 60 ENTER
 }
 
 check_script_status()