diff --git a/config/rootfiles/packages/streamripper b/config/rootfiles/packages/streamripper new file mode 100644 index 000000000..f3abba584 --- /dev/null +++ b/config/rootfiles/packages/streamripper @@ -0,0 +1,14 @@ +usr/bin/agrep +usr/bin/streamripper +#usr/include/tre +#usr/include/tre/regex.h +#usr/include/tre/tre-config.h +#usr/lib/libtre.a +#usr/lib/libtre.la +usr/lib/libtre.so +usr/lib/libtre.so.4 +usr/lib/libtre.so.4.2.2 +#usr/lib/pkgconfig/tre.pc +#usr/share/locale/fi/LC_MESSAGES/tre.mo +#usr/share/man/man1/agrep.1 +#usr/share/man/man1/streamripper.1 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index f0640b24c..f9ca8acc0 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -62,7 +62,6 @@ * ccache-2.4 * cdrtools-2.01 * centerim-4.22.1 -* clamav-0.94 * clamav-0.94.1 * cmake-2.4.8 * collectd-4.5.1 @@ -185,7 +184,6 @@ * lynis-1.2.1 * lzo-2.02 * m4-1.4.4 -* mISDNuser-1_1_8 * mISDNuser.git-8e7bf2f11cc108d4b52949c2a26e38df24821b01 * madwifi-hal-2008-08-15-r3862-20080903-kmod-2.6.25.19 * make-3.81 @@ -273,6 +271,7 @@ * squid-2.7.STABLE5 * squidGuard-1.3 * squidclamav-3.7 +* streamripper-1.63.5 * sudo-1.6.8p12 * sysfsutils-1.3.0 * sysklogd-1.4.1 diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi index 29bfd2f26..988a1484c 100644 --- a/html/cgi-bin/time.cgi +++ b/html/cgi-bin/time.cgi @@ -127,10 +127,10 @@ ERROR: system ('/usr/bin/touch', "${General::swroot}/time/enable"); system ('/usr/local/bin/timectrl enable >/dev/null 2>&1'); &General::log($Lang::tr{'ntp syncro enabled'}); - unlink "${General::swroot}/time/counter"; + unlink "/var/lock/time/counter"; if ($timesettings{'UPDATE_METHOD'} eq 'periodically') { - open(FILE, ">/${General::swroot}/time/counter") or die "Unable to write counter file"; + open(FILE, ">/var/lock/time/counter") or die "Unable to write counter file"; flock(FILE, 2); print FILE "$updateperiod\n"; close FILE; @@ -147,7 +147,7 @@ ERROR: else { unlink "${General::swroot}/time/enable"; - unlink "${General::swroot}/time/settimenow"; + unlink "/var/lock/time/settimenow"; unlink "${General::swroot}/time/allowclients"; # DPC added to 1.3.1 system ('/usr/local/bin/timectrl disable >/dev/null 2>&1'); &General::log($Lang::tr{'ntp syncro disabled'}) @@ -162,7 +162,7 @@ ERROR: $timesettings{'ACTION'} = &Header::cleanhtml ($timesettings{'ACTION'}); if ($timesettings{'ACTION'} eq $Lang::tr{'set time now'} && $timesettings{'ENABLENTP'} eq 'on') { - system ('/usr/bin/touch', "${General::swroot}/time/settimenow"); + system ('/usr/bin/touch', "/var/lock/time/settimenow"); } &General::readhash("${General::swroot}/time/settings", \%timesettings); @@ -210,7 +210,7 @@ $selected{'UPDATE_PERIOD'}{$timesettings{'UPDATE_PERIOD'}} = "selected='selected # added to v0.0.4 to refresh screen if syncro event queued my $refresh = ''; -if ( -e "${General::swroot}/time/settimenow") { +if ( -e "/var/lock/time/settimenow") { $refresh = ""; } @@ -240,10 +240,12 @@ print <; + close FILE; print $output; } else @@ -292,7 +294,7 @@ print <\n\n"; print "$Lang::tr{'waiting to synchronize clock'}...\n"; } diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 466eb0c89..c9c73274e 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2362,13 +2362,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $Lang::tr{'esp grouptype'} + $Lang::tr{'esp keylife'} $Lang::tr{'hours'} diff --git a/lfs/streamripper b/lfs/streamripper new file mode 100644 index 000000000..55efd4006 --- /dev/null +++ b/lfs/streamripper @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 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 = 1.63.5 + +THISAPP = streamripper-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = streamripper +PAK_VER = 1 + +DEPS = "libmad libogg libvorbis" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 73a63383dca00615c3328cf51bf2fa56 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +dist: + @$(PAK) + +############################################################################### +# 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 + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index f1e40623f..2c5a11150 100755 --- a/make.sh +++ b/make.sh @@ -583,6 +583,7 @@ buildipfire() { ipfiremake lynis ipfiremake cryptsetup ipfiremake splix + ipfiremake streamripper 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/tmpfs b/src/initscripts/init.d/tmpfs index fc45db231..41d6a1df9 100644 --- a/src/initscripts/init.d/tmpfs +++ b/src/initscripts/init.d/tmpfs @@ -25,6 +25,10 @@ case "$1" in if [ ! -e /var/lock/subsys ]; then mkdir -p /var/lock/subsys fi + if [ ! -e /var/lock/time ]; then + mkdir -p /var/lock/time + chown nobody.root /var/lock/time + fi if [ ! -e /var/run/clamav ]; then mkdir -p /var/run/clamav chown clamav:clamav /var/run/clamav diff --git a/src/scripts/settime b/src/scripts/settime index cede5f8c1..0bfcf3edf 100644 --- a/src/scripts/settime +++ b/src/scripts/settime @@ -44,18 +44,18 @@ if [ -n "$1" ]; then if [ "$ntpdatetest" -eq 0 ]; then case $tlanguage in - en ) date "+%X %Z on %d %B %Y" > /var/ipfire/time/lastset ; + en ) date "+%X %Z on %d %B %Y" > /var/lock/time/lastset ; logger -t ipfire "NTP synchronisation event" ;; - de ) date "+%X Uhr am %d.%m.%Y" > /var/ipfire/time/lastset ; + de ) date "+%X Uhr am %d.%m.%Y" > /var/lock/time/lastset ; logger -t ipfire "NTP Synchronisierung" ;; - * ) date "+%X %Z, %Y-%m-%d" > /var/ipfire/time/lastset ; + * ) date "+%X %Z, %Y-%m-%d" > /var/lock/time/lastset ; logger -t ipfire "NTP synchronisation" ;; esac /sbin/hwclock --systohc - rm -f /var/ipfire/time/settimenow + rm -f /var/lock/time/settimenow # reset counter variable - cp /var/ipfire/time/counter.conf /var/ipfire/time/counter + cp /var/ipfire/time/counter.conf /var/lock/time/counter else case $tlanguage in de ) logger -t ipfire "ntpdate fehlerhaft" ;; diff --git a/src/scripts/timecheck b/src/scripts/timecheck index 9f7535826..9f581985a 100644 --- a/src/scripts/timecheck +++ b/src/scripts/timecheck @@ -11,23 +11,23 @@ # /usr/local/bin/timecheck if [ -e /var/ipfire/time/enable ]; then - if [ $(cat /var/ipfire/time/settings | grep period) ] && [ -e /var/ipfire/time/counter ]; then - if [ $(cat /var/ipfire/time/counter) -gt 0 ]; then - echo $(($(cat /var/ipfire/time/counter)-5)) > /var/ipfire/time/counter + if [ $(cat /var/ipfire/time/settings | grep period) ] && [ -e /var/lock/time/counter ]; then + if [ $(cat /var/lock/time/counter) -gt 0 ]; then + echo $(($(cat /var/lock/time/counter)-5)) > /var/lock/time/counter else - touch /var/ipfire/time/settimenow - rm -f /var/ipfire/time/counter + touch /var/lock/time/settimenow + rm -f /var/lock/time/counter fi else # EAO added 2003-08-14 for v1.3.1 # if settings are restored from a backup - # /var/ipfire/time/counter will not exist + # /var/lock/time/counter will not exist if [ $(cat /var/ipfire/time/settings | grep periodic) ]; then - touch /var/ipfire/time/settimenow + touch /var/lock/time/settimenow fi fi - if [ -e /var/ipfire/time/settimenow ]; then + if [ -e /var/lock/time/settimenow ]; then if [ -e /var/ipfire/time/settime.conf ]; then /usr/local/bin/settime $(cat /var/ipfire/time/settime.conf) fi