From: Arne Fitzenreiter Date: Sun, 20 Sep 2009 10:27:55 +0000 (+0200) Subject: Merge branch 'master' into next X-Git-Tag: v2.9-beta1~723 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=3885fadad52b7f4635d5be5febb87ed8fd4bd768;hp=303ea32bc058ef800fa485b6eea138a269667546 Merge branch 'master' into next --- diff --git a/config/mpfire/mpd.conf b/config/mpfire/mpd.conf index ae2460c223..10da064c30 100644 --- 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/core/32/exclude b/config/rootfiles/core/32/exclude new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/32/filelists/files b/config/rootfiles/core/32/filelists/files new file mode 100644 index 0000000000..4da209c457 --- /dev/null +++ b/config/rootfiles/core/32/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/rc.d/init.d/networking/red diff --git a/config/rootfiles/core/32/meta b/config/rootfiles/core/32/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/core/32/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/32/update.sh b/config/rootfiles/core/32/update.sh new file mode 100644 index 0000000000..ff13809f2c --- /dev/null +++ b/config/rootfiles/core/32/update.sh @@ -0,0 +1,28 @@ +#!/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 3 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) 2009 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 +extract_files +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" diff --git a/config/rootfiles/packages/mpc b/config/rootfiles/packages/mpc index 7df3815118..1e3cac2a25 100644 --- 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 index 0000000000..694d2c3ab4 --- /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 9f3f1c11e7..36bd40c74d 100644 --- 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 6c9c418834..5ae7567e58 100644 --- 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 8ff68971ac..3f1ecc8b5b 100644 --- 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 index 0000000000..e2635050d0 --- /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 . # +# # +############################################################################### + +############################################################################### +# 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 8b6d8ea4de..2312eeb8b8 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.5" -CORE="31" +CORE="32" GIT_BRANCH=master:master # Version number SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -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 fe0f435a1a..f31390de95 100644 --- 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 04acda3cf2..ea840d1a56 100644 --- 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() diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index b2b8444396..f0c89fe398 100644 --- a/src/initscripts/init.d/networking/red +++ b/src/initscripts/init.d/networking/red @@ -74,16 +74,13 @@ if [ "${TYPE}" == "STATIC" ]; then echo_failure exit 1 fi - -elif [ "${TYPE}" == "DHCP" ]; then - - PIDFILE="/var/run/dhcpcd-${DEVICE}.pid" - LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.info" - DHCP_START="-N -R -L /var/ipfire/dhcpc -c /var/ipfire/dhcpc/dhcpcd.exe " - DHCP_STOP="-k -c /var/ipfire/dhcpc/dhcpcd.exe " - fi +PIDFILE="/var/run/dhcpcd-${DEVICE}.pid" +LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.info" +DHCP_START="-N -R -L /var/ipfire/dhcpc -c /var/ipfire/dhcpc/dhcpcd.exe " +DHCP_STOP="-k -c /var/ipfire/dhcpc/dhcpcd.exe " + case "${1}" in start) if [ "${DEVICE}" != "${GREEN_DEV}" ] && [ "${DEVICE}" != "" ]; then @@ -264,8 +261,6 @@ case "${1}" in if [ "${RED_VDSL_IPTV_DISABLE}" == "0" ]; then PIDFILE="/var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid" LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info" - DHCP_START="-N -R -L /var/ipfire/dhcpc -c /var/ipfire/dhcpc/dhcpcd.exe " - DHCP_STOP="-k -c /var/ipfire/dhcpc/dhcpcd.exe " # Test to see if there is a stale pid file if [ -f "$PIDFILE" ]; then @@ -329,7 +324,47 @@ case "${1}" in boot_mesg "Bringing up the $TYPE interface on $PPP_NIC ..." ip addr flush dev $PPP_NIC >/dev/null 2>&1 if [ "$TYPE" == "pptp" ]; then - ip addr add $PPTP_NICCFG dev $PPP_NIC + if [ "$PPTP_NICCFG" == "dhcp" ]; then + + # Test to see if there is a stale pid file + if [ -f "$PIDFILE" ]; then + ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null + if [ $? != 0 ]; then + rm -f /var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid > /dev/null + fi + fi + + if [ ! -f "$PIDFILE" ]; then + boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${RED_VDSL_IPTV_VLAN} interface..." + /sbin/dhcpcd ${DEVICE} ${DHCP_START} >/dev/null 2>&1 + RET="$?" + + if [ "$RET" = "0" ]; then + . /var/ipfire/dhcpc/dhcpcd-${DEVICE}.info + echo "" + echo_ok + boot_mesg " DHCP Assigned Settings for ${DEVICE}:" + boot_mesg_flush + boot_mesg " IP Address: $IPADDR" + boot_mesg_flush + boot_mesg " Hostname: $RED_DHCP_HOSTNAME" + boot_mesg_flush + boot_mesg " Subnet Mask: $NETMASK" + boot_mesg_flush + boot_mesg " Default Gateway: $GATEWAY" + boot_mesg_flush + boot_mesg " DNS Server: $DNS" + boot_mesg_flush + + else + echo "" + $(exit "$RET") + evaluate_retval + fi + fi + else + ip addr add $PPTP_NICCFG dev $PPP_NIC + fi fi ip link set ${PPP_NIC} up else @@ -480,39 +515,6 @@ case "${1}" in fi run_subdir ${rc_base}/init.d/networking/red.down/ - elif [ "$TYPE" == "DHCP" ]; then - boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..." - if [ -e $LEASEINFO ]; then - . $LEASEINFO - if [ "$LEASETIME" = "4294967295" ]; then - # do nothing, just echo ok - echo "" - echo_ok - else - if [ -n "$DHCP_STOP" ]; then - /sbin/dhcpcd ${DEVICE} $DHCP_STOP &> /dev/null - RET="$?" - if [ "$RET" -eq 0 ]; then - echo "" - echo_ok - elif [ "$RET" -eq 1 ]; then - boot_mesg "dhcpcd not running!" ${WARNING} - echo_warning - else - echo "" - echo_failure - fi - else - echo "" - killproc dhcpcd - fi - fi - else - boot_mesg -n "LEASEINFO Test failed! - " ${WARNING} - boot_mesg "dhcpcd is not running!" ${WARNING} - echo_warning - fi - elif [ "$TYPE" == "PPPOE" ]; then boot_mesg "Bringing down the PPP interface ..." ## Disable vnstat collection @@ -525,6 +527,34 @@ case "${1}" in $(date +%s):: > /dev/null 2>&1 fi + if [ -e $LEASEINFO ]; then + boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..." + . $LEASEINFO + if [ "$LEASETIME" = "4294967295" ]; then + # do nothing, just echo ok + echo "" + echo_ok + else + if [ -n "$DHCP_STOP" ]; then + /sbin/dhcpcd ${DEVICE} $DHCP_STOP &> /dev/null + RET="$?" + if [ "$RET" -eq 0 ]; then + echo "" + echo_ok + elif [ "$RET" -eq 1 ]; then + boot_mesg "dhcpcd not running!" ${WARNING} + echo_warning + else + echo "" + echo_failure + fi + else + echo "" + killproc dhcpcd + fi + fi + fi + if [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then link_status=`ip link show $DEVICE.${RED_VDSL_INET_VLAN} 2> /dev/null` if [ -n "${link_status}" ]; then