This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via 8f451574ddb9611213fc0544ba2864d69cb3bcd2 (commit) via 3675d563b88726644bc56edcf4e0982ef766dfdc (commit) via 309c6f7a26407be960398a9a6b94bd485b6f77fd (commit) via aff78c9698833dd020f732339206935df5c3e3b8 (commit) via 51459d2580754811b5ec22ddd379287f837c0ae3 (commit) via d3bbb24a0f75d29595f6ef05eef613ccc528248f (commit) via 4ad546e0c793b7b3202f447b6118f91302adcbca (commit) from 62cc286871f1fc6b0789237a85529fee1c6166bc (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 8f451574ddb9611213fc0544ba2864d69cb3bcd2 Author: root root@ikarus.homeip.net Date: Fri Feb 5 13:27:11 2010 +0100
Fixed the urlfilter bug #0000552
The config recently contained all filter destinations thats why the squidGuard exhausts the memory for each filter process even when the filter destination was not used by any rule.
The destinations were added because time constraints were not able to add needed destinations, so all destination were added by the config parser.
Now the config parser checks if the destination is enabled by generel, if not it checks if the destination is needed by a time constraint.
commit 3675d563b88726644bc56edcf4e0982ef766dfdc Author: root root@ikarus.homeip.net Date: Fri Feb 5 13:25:54 2010 +0100
Updated madwifi to lastest stable.
commit 309c6f7a26407be960398a9a6b94bd485b6f77fd Author: root root@ikarus.homeip.net Date: Fri Feb 5 13:25:29 2010 +0100
Added mdadm lfs file
commit aff78c9698833dd020f732339206935df5c3e3b8 Author: root root@ikarus.homeip.net Date: Fri Feb 5 13:24:43 2010 +0100
Added mdadm packages.
commit 51459d2580754811b5ec22ddd379287f837c0ae3 Author: root root@ikarus.homeip.net Date: Fri Feb 5 13:23:59 2010 +0100
Updated qemu to current stable.
commit d3bbb24a0f75d29595f6ef05eef613ccc528248f Author: root root@ikarus.homeip.net Date: Fri Feb 5 13:23:22 2010 +0100
Updated cpufrequtils to current stable.
commit 4ad546e0c793b7b3202f447b6118f91302adcbca Author: root root@ikarus.homeip.net Date: Fri Feb 5 13:21:09 2010 +0100
Updated lm_sensors to current stable.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/initscripts | 1 + config/rootfiles/common/lm_sensors | 4 ++- config/rootfiles/packages/cpufrequtils | 1 + config/rootfiles/packages/mdadm | 9 +++++ config/rootfiles/packages/qemu | 3 ++ doc/packages-list.txt | 13 ++++--- html/cgi-bin/urlfilter.cgi | 21 ++++++++++- lfs/cpufrequtils | 6 ++-- lfs/lm_sensors | 4 +- lfs/madwifi | 4 +- lfs/{sysstat => mdadm} | 14 +++++-- lfs/qemu | 6 ++-- make.sh | 1 + src/initscripts/init.d/mdadm | 60 ++++++++++++++++++++++++++++++++ 14 files changed, 124 insertions(+), 23 deletions(-) create mode 100644 config/rootfiles/packages/mdadm copy lfs/{sysstat => mdadm} (95%) create mode 100644 src/initscripts/init.d/mdadm
Difference in files: diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index 3e2e8f5..1ea3c7a 100644 --- a/config/rootfiles/common/initscripts +++ b/config/rootfiles/common/initscripts @@ -195,3 +195,4 @@ etc/rc.d/rc6.d/K85tmpfs #etc/rc.d/rc3.d/S99miau #etc/rc.d/rc6.d/K01miau #etc/rc.d/init.d/netsnmpd +etc/rc.d/init.d/mdadm \ No newline at end of file diff --git a/config/rootfiles/common/lm_sensors b/config/rootfiles/common/lm_sensors index 99fc39b..76e796e 100644 --- a/config/rootfiles/common/lm_sensors +++ b/config/rootfiles/common/lm_sensors @@ -1,3 +1,4 @@ +etc/sensors.d etc/sensors3.conf usr/bin/sensors usr/bin/sensors-conf-convert @@ -7,11 +8,12 @@ usr/bin/sensors-conf-convert #usr/lib/libsensors.a usr/lib/libsensors.so usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.0.2 +usr/lib/libsensors.so.4.2.1 #usr/man/man1/sensors.1 #usr/man/man3 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 +#usr/man/man5/sensors3.conf.5 #usr/man/man8/fancontrol.8 #usr/man/man8/isadump.8 #usr/man/man8/isaset.8 diff --git a/config/rootfiles/packages/cpufrequtils b/config/rootfiles/packages/cpufrequtils index de10206..d85e028 100644 --- a/config/rootfiles/packages/cpufrequtils +++ b/config/rootfiles/packages/cpufrequtils @@ -1,3 +1,4 @@ +usr/bin/cpufreq-aperf usr/bin/cpufreq-info usr/bin/cpufreq-set #usr/include/cpufreq.h diff --git a/config/rootfiles/packages/mdadm b/config/rootfiles/packages/mdadm new file mode 100644 index 0000000..680a3f1 --- /dev/null +++ b/config/rootfiles/packages/mdadm @@ -0,0 +1,9 @@ +lib/udev/rules.d +lib/udev/rules.d/64-md-raid.rules +sbin/mdadm +sbin/mdmon +#usr/share/man/man4/md.4 +#usr/share/man/man5/mdadm.conf.5 +#usr/share/man/man8/mdadm.8 +#usr/share/man/man8/mdmon.8 +etc/rc.d/init.d/mdadm \ No newline at end of file diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index 21da316..27d82a3 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -42,6 +42,7 @@ usr/share/qemu/keymaps/sl usr/share/qemu/keymaps/sv usr/share/qemu/keymaps/th usr/share/qemu/keymaps/tr +usr/share/qemu/linuxboot.bin usr/share/qemu/multiboot.bin usr/share/qemu/openbios-ppc usr/share/qemu/openbios-sparc32 @@ -49,9 +50,11 @@ usr/share/qemu/openbios-sparc64 usr/share/qemu/petalogix-s3adsp1800.dtb usr/share/qemu/ppc_rom.bin usr/share/qemu/pxe-e1000.bin +usr/share/qemu/pxe-i82559er.bin usr/share/qemu/pxe-ne2k_pci.bin usr/share/qemu/pxe-pcnet.bin usr/share/qemu/pxe-rtl8139.bin +usr/share/qemu/pxe-virtio.bin usr/share/qemu/vgabios-cirrus.bin usr/share/qemu/vgabios.bin usr/share/qemu/video.x diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 7546068..03a2a6a 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -75,7 +75,7 @@ * compat-wireless-2.6.32.2-kmod-2.6.27.42-ipfire-xen * coreutils-5.96 * cpio-2.6 -* cpufrequtils-005 +* cpufrequtils-007 * cups-1.4.2 * curl-7.19.5 * cyrus-imapd-2.2.12 @@ -135,7 +135,7 @@ * gzip-1.3.5 * hddtemp-0.3-beta14 * hdparm-8.9 -* hostapd-0.6.9 +* hostapd-0.7.1 * hplip-2.7.10 * hso-1.9-kmod-2.6.27.42-ipfire * hso-1.9-kmod-2.6.27.42-ipfire-xen @@ -200,7 +200,7 @@ * linux-2.6.27.42-ipfire-xen * linux-atm-2.4.1 * linux-libc-headers-2.6.12.0 -* lm_sensors-3.0.3 +* lm_sensors-3.1.2 * logrotate-3.7.1 * logwatch-7.3.6 * lsof-4.78 @@ -210,13 +210,14 @@ * mISDN_20090906-kmod-2.6.27.42-ipfire * mISDN_20090906-kmod-2.6.27.42-ipfire-xen * mISDNuser_20090906 -* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.42-ipfire -* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.42-ipfire-xen +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.27.42-ipfire +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.27.42-ipfire-xen * make-3.81 * man-db-2.4.3 * man-pages-2.34 * mbr-1.1.8 * mc-4.7.0 +* mdadm-3.1.1 * mechanize-0.1.8 * mediatomb-svn2020 * memtest86+-4.00 @@ -280,7 +281,7 @@ * pptp-1.7.2 * procps-3.2.6 * psmisc-22.2 -* qemu-0.11.0 +* qemu-0.12.2 * r8101-kmod-2.6.27.42-ipfire * r8101-kmod-2.6.27.42-ipfire-xen * r8168-8.014.00-kmod-2.6.27.42-ipfire diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi index f1862f1..2d180e2 100644 --- a/html/cgi-bin/urlfilter.cgi +++ b/html/cgi-bin/urlfilter.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 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 # @@ -2973,7 +2973,24 @@ sub writeconfigfile foreach $category (@categories) { $blacklist = $category; $category =~ s///_/g; - #if ( $filtersettings{"FILTER_".uc($category)} ne "on" ){next;} + + if ( $filtersettings{"FILTER_".uc($category)} ne "on" ){ + my $constraintrule = "false"; + + foreach (@tclist){ + chomp; + @tc = split(/,/); + $tc[13] =~ s///_/g; + if ($tc[15] eq 'on' && $tc[13] =~ $category){ + $constraintrule = "true"; + } + } + + if ( $constraintrule eq "false"){ + next; + } + } + print FILE "dest $category {\n"; if (-e "$dbdir/$blacklist/domains") { print FILE " domainlist $blacklist/domains\n"; diff --git a/lfs/cpufrequtils b/lfs/cpufrequtils index 5a99949..fa5d1f6 100644 --- a/lfs/cpufrequtils +++ b/lfs/cpufrequtils @@ -24,7 +24,7 @@
include Config
-VER = 005 +VER = 007
THISAPP = cpufrequtils-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cpufrequtils -PAK_VER = 3 +PAK_VER = 4
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 73a41589fe74b73fc530f4179f2c6142 +$(DL_FILE)_MD5 = fdd833ce70a9ae40ae8bce5b18f2becf
install : $(TARGET)
diff --git a/lfs/lm_sensors b/lfs/lm_sensors index cab054e..475c05b 100644 --- a/lfs/lm_sensors +++ b/lfs/lm_sensors @@ -24,7 +24,7 @@
include Config
-VER = 3.0.3 +VER = 3.1.2
THISAPP = lm_sensors-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e88b236228ac2a50821217015b8fd0fa +$(DL_FILE)_MD5 = 58a9a225808ac4587c4c8cbd12b40b5c
install : $(TARGET)
diff --git a/lfs/madwifi b/lfs/madwifi index 838a9c5..0777372 100644 --- a/lfs/madwifi +++ b/lfs/madwifi @@ -30,7 +30,7 @@ else VERSUFIX=ipfire endif
-VER = hal-0.10.5.6-r4031-20090529 +VER = hal-0.10.5.6-r4119-20100201
THISAPP = madwifi-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = af13564a45bb6fbb1d8834ed528a0a59 +$(DL_FILE)_MD5 = 937cf8f185ddd39b95e7ce026f9fba63
install : $(TARGET)
diff --git a/lfs/mdadm b/lfs/mdadm new file mode 100644 index 0000000..7d898bb --- /dev/null +++ b/lfs/mdadm @@ -0,0 +1,83 @@ +############################################################################### +# # +# 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 http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 3.1.1 + +THISAPP = mdadm-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = mdadm +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 4fd8e375a2ee314becd3196c1a250d98 + +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 jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/qemu b/lfs/qemu index 0fa5b93..97d3af3 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -24,7 +24,7 @@
include Config
-VER = 0.11.0 +VER = 0.12.2
THISAPP = qemu-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu -PAK_VER = 8 +PAK_VER = 9
DEPS = "sdl"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4da6a3e926a0260902f0dee342a59c23 +$(DL_FILE)_MD5 = 1d7c2d95acb6d0789de86508c608e26d
install : $(TARGET)
diff --git a/make.sh b/make.sh index 9e7293a..99ab986 100755 --- a/make.sh +++ b/make.sh @@ -643,6 +643,7 @@ buildipfire() { ipfiremake lcr ipfiremake usb_modeswitch ipfiremake zerofree + ipfiremake mdadm 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/mdadm b/src/initscripts/init.d/mdadm new file mode 100644 index 0000000..4b79ca8 --- /dev/null +++ b/src/initscripts/init.d/mdadm @@ -0,0 +1,60 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/mdadmraid +# +# Description : This script controls software Raid +# +# Authors : Dirk Hoefle dhoefle@gmx.net +# +# Version : 01.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +case "${1}" in + start) + + if [ -f /etc/mdadm.conf ] + then + boot_mesg "Starting Raid devices..." + + modprobe md + modprobe raid0 + modprobe raid1 + modprobe raid5 + + sleep 1 + + mdadm --assemble --scan + else + boot_mesg "Skipping raid devices, no config found..." + exit 1 + fi + ;; + + stop) + boot_mesg "Stopping Raid devices..." + mdadm --stop --scan + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + cat /proc/mdstat + ;; + + *) + echo "Usage: ${0} {start|stop|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/mdadmraid \ No newline at end of file
hooks/post-receive -- IPFire 2.x development tree