From f1775178caa7e659814e51ad5d5d094c7adb3b1c Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Fri, 8 May 2009 11:40:36 +0200 Subject: [PATCH 01/26] Fixed postfix init script status --- src/initscripts/init.d/postfix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/initscripts/init.d/postfix b/src/initscripts/init.d/postfix index cc8197543..2620a4eb3 100644 --- a/src/initscripts/init.d/postfix +++ b/src/initscripts/init.d/postfix @@ -47,7 +47,12 @@ case "$1" in $0 start ;; status) - statusproc /usr/lib/postfix/master + PID=`pidof /usr/lib/postfix/master` + MPID=`cat /var/spool/postfix/pid/master.pid` + if [ $MPID = $PID ]; then + echo -e "${INFO}postfix is running with Process"\ + "ID(s) ${MPID}.${NORMAL}" + fi ;; *) From 8d0903b1b9400fccfc6476d0ec4e1deee2655bdb Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Fri, 8 May 2009 11:40:56 +0200 Subject: [PATCH 02/26] Increased postfix packnum --- lfs/postfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/postfix b/lfs/postfix index 626140137..b1557e6b3 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = postfix -PAK_VER = 3 +PAK_VER = 4 DEPS = "amavisd mysql" From 1a63e5d2b1e4f96e376072c903498283c859cf7d Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Fri, 8 May 2009 11:41:17 +0200 Subject: [PATCH 03/26] Fixed perl gettext package version --- lfs/perl-gettext | 1 + 1 file changed, 1 insertion(+) diff --git a/lfs/perl-gettext b/lfs/perl-gettext index 63ec9703e..a72ca8d6a 100644 --- a/lfs/perl-gettext +++ b/lfs/perl-gettext @@ -34,6 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = perl-gettext DEPS = "" +VER = "2" ############################################################################### # Top-level Rules From 2b5b6b9e75f972aaeb480084cd275bfef0fb15aa Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Fri, 8 May 2009 11:48:20 +0200 Subject: [PATCH 04/26] Tried to fix updx cache permissions --- config/updxlrator/download | 7 ++----- src/initscripts/init.d/squid | 3 +++ src/misc-progs/squidctrl.c | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config/updxlrator/download b/config/updxlrator/download index ff86155b5..29548708c 100644 --- a/config/updxlrator/download +++ b/config/updxlrator/download @@ -49,7 +49,6 @@ $vendorid =~ tr/A-Z/a-z/; unless (-d "$repository/download/$vendorid") { system("mkdir -p $repository/download/$vendorid"); - system("chown -R nobody.squid $repository/download/$vendorid"); system("chmod 775 $repository/download/$vendorid"); } @@ -159,15 +158,13 @@ if ($_ == 0) unless (-d "$repository/$vendorid") { - system("mkdir -p $repository/$vendorid"); - system("chown -R nobody.squid $repository/$vendorid"); + system("mkdir -p $repository/$vendorid"); system("chmod 775 $repository/$vendorid"); } unless (-d "$repository/$vendorid/$uuid") { system("mkdir -p $repository/$vendorid/$uuid"); - system("chown -R nobody.squid $repository/$vendorid/$uuid"); system("chmod 775 $repository/$vendorid/$uuid"); } @@ -183,7 +180,7 @@ if ($_ == 0) &UPDXLT::setcachestatus("$repository/$vendorid/$uuid/checkup.log",time); &UPDXLT::setcachestatus("$repository/$vendorid/$uuid/access.log",time); - system("chown -R nobody.squid $repository/$vendorid/$uuid/*"); + system("/usr/local/bin/squidctrl setperms"); system("chmod 775 $repository/$vendorid/$uuid/*"); unlink ("$repository/download/$vendorid/$updatefile.info"); diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid index 85c1a4311..35ad8a87a 100644 --- a/src/initscripts/init.d/squid +++ b/src/initscripts/init.d/squid @@ -106,6 +106,9 @@ case "$1" in sleep 1 $0 start ;; + setperms) + chown -R nobody.squid /var/updatecache/ + ;; *) echo "Usage: $0 {start|stop|restart|status|flush}" diff --git a/src/misc-progs/squidctrl.c b/src/misc-progs/squidctrl.c index 9f3ba5dd9..649330998 100644 --- a/src/misc-progs/squidctrl.c +++ b/src/misc-progs/squidctrl.c @@ -38,8 +38,10 @@ int main(int argc, char *argv[]) { safe_system("ln -fs ../init.d/squid /etc/rc.d/rc6.d/K00squid >/dev/null 2>&1"); } else if (strcmp(argv[1], "disable") == 0) { safe_system("rm -f /etc/rc.d/rc*.d/*squid >/dev/null 2>&1"); + } else if (strcmp(argv[1], "setperms") == 0) { + safe_system("/etc/rc.d/init.d/squid setperms"); } else { - fprintf(stderr, "\nBad argument given.\n\nsquidctrl (start|stop|restart|flush|reconfigure)\n\n"); + fprintf(stderr, "\nBad argument given.\n\nsquidctrl (start|stop|restart|flush|reconfigure|setperms)\n\n"); exit(1); } From f1db34f13df7b3ea70e864f2e103fa1e848bf3f9 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 8 May 2009 18:37:34 +0200 Subject: [PATCH 05/26] Fix streamripper depends on glib --- lfs/streamripper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/streamripper b/lfs/streamripper index 050e8a983..ed8452dcb 100644 --- a/lfs/streamripper +++ b/lfs/streamripper @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = streamripper PAK_VER = 1 -DEPS = "libmad libogg libvorbis" +DEPS = "glib libmad libogg libvorbis" ############################################################################### # Top-level Rules From 060ecb123a838d6734fcdfef28a0eea6520729e5 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Fri, 8 May 2009 20:40:22 +0200 Subject: [PATCH 06/26] Upgrade and fix for samba pack --- doc/packages-list.txt | 4 +--- html/cgi-bin/samba.cgi | 11 +++++------ lfs/samba | 6 +++--- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 48087b049..260b5371d 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -219,7 +219,6 @@ * mtools-3.9.10 * mysql-5.0.24a * nagios-3.0.5 -* nano-1.2.5 * nano-2.0.9 * nasm-0.98.39 * ncftp-3.2.1-src @@ -271,7 +270,7 @@ * rssdler-0.4.0a * rsync-3.0.4 * rtorrent-0.8.4 -* samba-3.3.3 +* samba-3.3.4 * sane-1.0.19 * screen-4.0.3 * sdparm-1.01 @@ -289,7 +288,6 @@ * squashfs3.4 * squid-2.7.STABLE6 * squidGuard-1.4 -* squidclamav-3.9 * squidclamav-4.0 * sshfs-fuse-2.2 * sslh-1.6g diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 8d32b72fc..3ded61140 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -315,7 +315,7 @@ END close FILE; } - if ($sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ) + if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ) { open (FILE, ">${General::swroot}/samba/pdc") or die "Can't save the pdc settings: $!"; flock (FILE, 2); @@ -334,12 +334,12 @@ END if ( -e "/var/ipfire/cups/enable") { - if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");refreshpage();} + if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");refreshpage();} else {system("/usr/local/bin/sambactrl smbsafeconfcups");} } else { - if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");refreshpage();} + if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");refreshpage();} else{system("/usr/local/bin/sambactrl smbsafeconf");} } @@ -1206,18 +1206,17 @@ close FILE; if ( -e "/var/ipfire/cups/enable") { - if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");} + if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");} else {system("/usr/local/bin/sambactrl smbsafeconfcups");} } else { - if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");} + if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");} else{system("/usr/local/bin/sambactrl smbsafeconf");} } system("/usr/local/bin/sambactrl smbreload"); refreshpage(); -} sub isrunning { diff --git a/lfs/samba b/lfs/samba index 00211b1a8..c3608500f 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 3.3.3 +VER = 3.3.4 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 14 +PAK_VER = 15 DEPS = "cups cyrus-sasl" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4d5835817416d1ffa30783af45c5a9ed +$(DL_FILE)_MD5 = 1443165edb7cb3f56f1e77aec1ee3266 install : $(TARGET) From 8b88b91e5d107f1c5a4b7832f2009f4db5061d1a Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Fri, 8 May 2009 20:40:36 +0200 Subject: [PATCH 07/26] Fixed perl gettext --- lfs/perl-gettext | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/perl-gettext b/lfs/perl-gettext index a72ca8d6a..3869b4c9d 100644 --- a/lfs/perl-gettext +++ b/lfs/perl-gettext @@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = perl-gettext DEPS = "" -VER = "2" +PAK_VER = 2 ############################################################################### # Top-level Rules From ee4b622369eb7687cba1ea534590672559c21875 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 9 May 2009 09:41:05 +0200 Subject: [PATCH 08/26] Nano rootfile update. --- config/rootfiles/packages/nano | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/packages/nano b/config/rootfiles/packages/nano index d071d54c6..8a2f61624 100644 --- a/config/rootfiles/packages/nano +++ b/config/rootfiles/packages/nano @@ -2,6 +2,24 @@ etc/nano/nanorc.sample usr/bin/nano usr/bin/pico -#usr/info/nano.info -#usr/man/man1/nano.1 -#usr/man/man5/nanorc.5 +usr/bin/rnano +#usr/share/info/nano.info +#usr/share/man/man1/nano.1 +#usr/share/man/man1/rnano.1 +#usr/share/man/man5/nanorc.5 +#usr/share/nano +usr/share/nano/asm.nanorc +usr/share/nano/c.nanorc +usr/share/nano/groff.nanorc +usr/share/nano/html.nanorc +usr/share/nano/java.nanorc +usr/share/nano/man.nanorc +usr/share/nano/mutt.nanorc +usr/share/nano/nanorc.nanorc +usr/share/nano/patch.nanorc +usr/share/nano/perl.nanorc +usr/share/nano/pov.nanorc +usr/share/nano/python.nanorc +usr/share/nano/ruby.nanorc +usr/share/nano/sh.nanorc +usr/share/nano/tex.nanorc From ea4d2584fba3b1fe6948916f6dc8d8acfac72513 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Sat, 9 May 2009 10:34:32 +0200 Subject: [PATCH 09/26] Fixed fetchmail startup problems with non root accounts --- lfs/fetchmail | 2 +- src/initscripts/init.d/fetchmail | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/fetchmail b/lfs/fetchmail index dbab16f36..e60c30bea 100644 --- a/lfs/fetchmail +++ b/lfs/fetchmail @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = fetchmail -PAK_VER = 2 +PAK_VER = 3 DEPS = "" diff --git a/src/initscripts/init.d/fetchmail b/src/initscripts/init.d/fetchmail index 6084934dc..be0d1263a 100644 --- a/src/initscripts/init.d/fetchmail +++ b/src/initscripts/init.d/fetchmail @@ -18,7 +18,7 @@ case "${1}" in start) boot_mesg "Starting fetchmail daemon..." - /usr/bin/fetchmail --daemon 300 >/dev/null 2>&1 + /usr/bin/fetchmail --daemon 300 -f '/root/.fetchmailrc' >/dev/null 2>&1 evaluate_retval ;; From fa3ab5370d7ff6de8275b04fd2f467e7d00a6db7 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Sat, 9 May 2009 10:35:21 +0200 Subject: [PATCH 10/26] Upgraded postfix to latest stable --- doc/packages-list.txt | 2 +- lfs/postfix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 260b5371d..d7bb447d1 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -256,7 +256,7 @@ * pkg-config-0.20 * popt-1.10.4 * portmap_6.0 -* postfix-2.5.5 +* postfix-2.5.6 * ppp-2.4.4 * pptp-1.7.2 * procps-3.2.6 diff --git a/lfs/postfix b/lfs/postfix index b1557e6b3..c9f58b438 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -24,7 +24,7 @@ include Config -VER = 2.5.5 +VER = 2.5.6 THISAPP = postfix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -46,7 +46,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) postfix-2.5.5.patch = $(DL_FROM)/postfix-2.5.5.patch -$(DL_FILE)_MD5 = 6b4b848bdd2239dddfc9d385e57e19ef +$(DL_FILE)_MD5 = ec2cb63b53f5f36c3ca91da8f3bc9407 postfix-2.5.5.patch_MD5 = 36cb54665d95016af4ce0cd5f85c20a8 install : $(TARGET) From 1ae037db2fb2d4debf18dd8c566435e236886166 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Sat, 9 May 2009 11:04:18 +0200 Subject: [PATCH 11/26] Fixed postfix rootfile --- config/rootfiles/packages/postfix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/rootfiles/packages/postfix b/config/rootfiles/packages/postfix index 0b40fbad6..e8f489028 100644 --- a/config/rootfiles/packages/postfix +++ b/config/rootfiles/packages/postfix @@ -2,8 +2,11 @@ etc/aliases #etc/postfix #etc/postfix/LICENSE #etc/postfix/TLS_LICENSE +etc/postfix/access etc/postfix/body_checks #etc/postfix/bounce.cf.default +etc/postfix/canonical +etc/postfix/generic etc/postfix/header_checks etc/postfix/main.cf #etc/postfix/makedefs.out @@ -15,6 +18,9 @@ etc/postfix/post-install etc/postfix/postfix-files etc/postfix/postfix-script etc/rc.d/init.d/postfix +etc/postfix/relocated +etc/postfix/transport +etc/postfix/virtual usr/bin/mailq usr/bin/newaliases #usr/lib/postfix From a4a3e35c0f7bc0295c9574421263b9490c65cf06 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Sat, 9 May 2009 22:38:36 +0200 Subject: [PATCH 12/26] Fixed samba website --- html/cgi-bin/samba.cgi | 1 + 1 file changed, 1 insertion(+) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 3ded61140..331032b83 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -1217,6 +1217,7 @@ else system("/usr/local/bin/sambactrl smbreload"); refreshpage(); +} sub isrunning { From 321ad5b838fb33403858575bc616da8f64634f8b Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Sat, 9 May 2009 22:39:03 +0200 Subject: [PATCH 13/26] fixed postfix --- src/initscripts/init.d/postfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/initscripts/init.d/postfix b/src/initscripts/init.d/postfix index 2620a4eb3..f7fc2dd73 100644 --- a/src/initscripts/init.d/postfix +++ b/src/initscripts/init.d/postfix @@ -49,7 +49,7 @@ case "$1" in status) PID=`pidof /usr/lib/postfix/master` MPID=`cat /var/spool/postfix/pid/master.pid` - if [ $MPID = $PID ]; then + if [ ${MPID} = ${PID} ]; then echo -e "${INFO}postfix is running with Process"\ "ID(s) ${MPID}.${NORMAL}" fi From 5168026cc22366682ce4ce41778a01318145f6b6 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 10 May 2009 13:49:52 +0200 Subject: [PATCH 14/26] Updated elinks to 0.11.6 --- config/rootfiles/packages/elinks | 9 ++++----- lfs/elinks | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/packages/elinks b/config/rootfiles/packages/elinks index 5b3cea463..3e71dc9a5 100644 --- a/config/rootfiles/packages/elinks +++ b/config/rootfiles/packages/elinks @@ -1,11 +1,7 @@ +usr/local/bin/elinks #usr/local/etc #usr/local/etc/elinks usr/local/etc/elinks/elinks.conf -usr/local/bin/elinks -#usr/local/man/man1/elinks.1 -#usr/local/man/man5 -#usr/local/man/man5/elinks.conf.5 -#usr/local/man/man5/elinkskeys.5 #usr/local/share/locale/be #usr/local/share/locale/be/LC_MESSAGES #usr/local/share/locale/be/LC_MESSAGES/elinks.mo @@ -97,3 +93,6 @@ usr/local/share/locale/de/LC_MESSAGES/elinks.mo #usr/local/share/locale/uk #usr/local/share/locale/uk/LC_MESSAGES #usr/local/share/locale/uk/LC_MESSAGES/elinks.mo +#usr/local/share/man/man1/elinks.1 +#usr/local/share/man/man5/elinks.conf.5 +#usr/local/share/man/man5/elinkskeys.5 diff --git a/lfs/elinks b/lfs/elinks index a6e2d6eaa..4fc4d9d81 100644 --- a/lfs/elinks +++ b/lfs/elinks @@ -24,7 +24,7 @@ include Config -VER = 0.11.4rc0 +VER = 0.11.6 THISAPP = elinks-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = elinks -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 718137aa45ddb2e7137edb8fb4f646a6 +$(DL_FILE)_MD5 = 463ec007b013822a82d197580117ea16 install : $(TARGET) From 86c8565eb29dd7012b82bf736b52b1cdc90a9359 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 10 May 2009 13:50:35 +0200 Subject: [PATCH 15/26] Updated clamav to 0.95.1 --- config/rootfiles/packages/clamav | 16 +++++++++------- doc/packages-list.txt | 4 ++-- lfs/clamav | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index d4ed7d0f8..96f0ac802 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -1,6 +1,7 @@ #usr/bin/clamav-config #usr/bin/clamconf usr/bin/clamdscan +usr/bin/clamdtop usr/bin/clamscan usr/bin/freshclam usr/bin/sigtool @@ -8,23 +9,24 @@ usr/bin/sigtool #usr/lib/libclamav.a #usr/lib/libclamav.la usr/lib/libclamav.so -usr/lib/libclamav.so.5 -usr/lib/libclamav.so.5.0.4 +usr/lib/libclamav.so.6 +usr/lib/libclamav.so.6.0.3 #usr/lib/libclamunrar.a #usr/lib/libclamunrar.la usr/lib/libclamunrar.so -usr/lib/libclamunrar.so.5 -usr/lib/libclamunrar.so.5.0.4 +usr/lib/libclamunrar.so.6 +usr/lib/libclamunrar.so.6.0.3 #usr/lib/libclamunrar_iface.a #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so -usr/lib/libclamunrar_iface.so.5 -usr/lib/libclamunrar_iface.so.5.0.4 +usr/lib/libclamunrar_iface.so.6 +usr/lib/libclamunrar_iface.so.6.0.3 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav #usr/share/man/man1/clamconf.1 #usr/share/man/man1/clamdscan.1 +#usr/share/man/man1/clamdtop.1 #usr/share/man/man1/clamscan.1 #usr/share/man/man1/freshclam.1 #usr/share/man/man1/sigtool.1 @@ -35,6 +37,6 @@ usr/share/clamav #var/ipfire/clamav var/ipfire/clamav/clamd.conf var/ipfire/clamav/freshclam.conf +var/run/clamav etc/rc.d/init.d/clamav usr/local/bin/clamavctrl -var/run/clamav diff --git a/doc/packages-list.txt b/doc/packages-list.txt index d7bb447d1..3482e4af9 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -65,7 +65,7 @@ * ccache-2.4 * cdrtools-2.01.01 * centerim-4.22.1 -* clamav-0.94.2 +* clamav-0.95.1 * cmake-2.4.8 * collectd-4.5.3 * compat-wireless-2009-03-30-kmod-2.6.27.21-ipfire @@ -88,7 +88,7 @@ * e2fsprogs-1.39 * ebtables-v2.0.8-2 * ed-0.2 -* elinks-0.11.4rc0 +* elinks-0.11.6 * esniper-2-19-0 * espgs-8.15.1 * etherwake-1.09 diff --git a/lfs/clamav b/lfs/clamav index d82acf388..ab38a24df 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.94.2 +VER = 0.95.1 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1181e6d62341b84708f126cc353f7ebf +$(DL_FILE)_MD5 = c802d4b372e455849cfcb0d776fc72d8 install : $(TARGET) From 2f3973e49571cb4d159cf83d5455e7dd64acac43 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 10 May 2009 14:57:59 +0200 Subject: [PATCH 16/26] Changes for serial console support --- config/etc/inittab | 2 ++ config/grub/grub.conf | 5 +++++ config/rootfiles/core/28/filelists/files | 2 ++ src/initscripts/init.d/beep | 2 +- src/initscripts/init.d/console | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/config/etc/inittab b/config/etc/inittab index 7697daa61..527a3f4de 100644 --- a/config/etc/inittab +++ b/config/etc/inittab @@ -25,5 +25,7 @@ su:S016:once:/sbin/sulogin 4:2345:respawn:/sbin/agetty tty4 9600 5:2345:respawn:/sbin/agetty tty5 9600 6:2345:respawn:/sbin/agetty tty6 9600 +# *** Uncomment for serial console +#7:2345:respawn:/sbin/agetty ttyS0 38400 # End /etc/inittab diff --git a/config/grub/grub.conf b/config/grub/grub.conf index ccb4a09ec..b4e279669 100644 --- a/config/grub/grub.conf +++ b/config/grub/grub.conf @@ -3,7 +3,12 @@ default saved foreground = 6d6963 background = ffffff #hiddenmenu +# *** If you want use serial console comment next line splashimage (hd0,0)/grub/ipfire.xpm.gz +# *** add "console=ttyS0,38400n8" to kernel cmdline, +# *** uncomment following lines and check also inittab +#serial --unit=0 --speed=38400 +#terminal --timeout=1 serial console title IPFire root (hd0,0) kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT diff --git a/config/rootfiles/core/28/filelists/files b/config/rootfiles/core/28/filelists/files index 9b8ea8f27..c62f6e230 100644 --- a/config/rootfiles/core/28/filelists/files +++ b/config/rootfiles/core/28/filelists/files @@ -1,5 +1,7 @@ bin/probenic.sh etc/ntp +etc/rc.d/init.d/beep +etc/rc.d/init.d/console etc/rc.d/init.d/snort etc/rc.d/init.d/networking/red etc/ssh/moduli diff --git a/src/initscripts/init.d/beep b/src/initscripts/init.d/beep index de6666edf..6498e293a 100644 --- a/src/initscripts/init.d/beep +++ b/src/initscripts/init.d/beep @@ -19,7 +19,7 @@ LENGTH=40 play () { - beep -l $LENGTH -f $1 + beep -l $LENGTH -f $1 2> /dev/null } diff --git a/src/initscripts/init.d/console b/src/initscripts/init.d/console index cb61a405f..8d2e49dfb 100644 --- a/src/initscripts/init.d/console +++ b/src/initscripts/init.d/console @@ -71,7 +71,7 @@ case "${1}" in grep -o '\btty[[:digit:]]*\b'` do openvt -f -w -c ${TTY#tty} -- \ - /bin/sh -c "${MODE_COMMAND}" + /bin/sh -c "${MODE_COMMAND}" 2>/dev/null done # Set the font (if not already set above) and the keymap From ca530b2d9b2ee572531a831ee2bf6345190e4677 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 11 May 2009 20:07:58 +0200 Subject: [PATCH 17/26] Revert "Fixed conn scheduler restart collectd when morning reconnect (graphs)" This reverts commit 67c532f594506464aed9fa95b63091bda5b723a9. Syntax error and i think networking/red is a better place for restart because a unwanted reconnect also make such problems --- src/scripts/connscheduler | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/scripts/connscheduler b/src/scripts/connscheduler index 824af248a..bc4d4eb65 100644 --- a/src/scripts/connscheduler +++ b/src/scripts/connscheduler @@ -79,11 +79,11 @@ sub hangup return; } - # now wait for active triggerfile and ppp daemon to disappear + # now wait for active triggerfile and ppp daemon to disappear # wait maximum 60 seconds my $counter = 60; sleep 1; - while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 ) + while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 ) { sleep 1; $counter--; @@ -123,14 +123,12 @@ sub reconnect # wait maximum 60 seconds my $counter = 60; sleep 1; - while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 ) + while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 ) { sleep 1; $counter--; } - /etc/init.d/collectd stop &dial(); - /etc/init.d/collectd start } @@ -170,7 +168,7 @@ sub profile ## FIXME: do we need to do this ? sleep($sleep_after_profile); &dial(); - } + } } @@ -202,7 +200,7 @@ sub timer } - if ( $CONNSCHED::config[$i]{'ACTION'} eq 'reconnect' ) + if ( $CONNSCHED::config[$i]{'ACTION'} eq 'reconnect' ) { &reconnect() } From f950f2584c68983d8f9f5517fe046248358de220 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 11 May 2009 20:14:40 +0200 Subject: [PATCH 18/26] Add collectd restart to networking/red Change collectd to run modules load only at first start --- src/initscripts/init.d/collectd | 33 ++++++++++++++++++--------- src/initscripts/init.d/networking/red | 10 +++++++- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd index 801db9a43..eeaa3860b 100644 --- a/src/initscripts/init.d/collectd +++ b/src/initscripts/init.d/collectd @@ -13,6 +13,13 @@ fi case "$1" in start) + # If run from init and collectd already started then exit silent + if [ "$(basename $0)" != "collectd" ]; then + if [ "$(ps -A | grep " collectd$")" != "" ]; then + exit 0 + fi + fi + # At first run search for sensors with sensors-detect if [ ! -e /etc/sysconfig/lm_sensors ]; then boot_mesg "Searching for Sensors..." @@ -35,17 +42,21 @@ case "$1" in fi fi - boot_mesg -n "Loading Sensor Modules: " - for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do - modprobe $modul > /dev/null 2>&1; - if [ ${?} = 0 ]; then - boot_mesg -n "$SUCCESS$modul$NORMAL "; - else - boot_mesg -n "$WARNING$modul$NORMAL "; - fi - done - boot_mesg; - echo_ok; + # Load sensor modules only first start + if [ ! -e /var/lock/sensor_modules ]; then + touch /var/lock/sensor_modules + boot_mesg -n "Loading Sensor Modules: " + for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do + modprobe $modul > /dev/null 2>&1; + if [ ${?} = 0 ]; then + boot_mesg -n "$SUCCESS$modul$NORMAL "; + else + boot_mesg -n "$WARNING$modul$NORMAL "; + fi + done + boot_mesg; + echo_ok; + fi # Enable sensors plugin if sensors found if [ $( sensors 2>&1 | grep "No sensors found!" | wc -l ) == "1" ]; then diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index 5843903eb..6f9fcd064 100644 --- a/src/initscripts/init.d/networking/red +++ b/src/initscripts/init.d/networking/red @@ -73,6 +73,10 @@ fi case "${1}" in start) + # Stop collectd if running + if [ "$(ps -A | grep " collectd$")" != "" ]; then + /etc/rc.d/init.d/collectd stop + fi if [ "${DEVICE}" != "${GREEN_DEV}" ] && [ "${DEVICE}" != "" ]; then boot_mesg "Bringing up the ${DEVICE} interface..." boot_mesg_flush @@ -87,6 +91,7 @@ case "${1}" in else boot_mesg "Interface ${DEVICE} doesn't exist." ${FAILURE} echo_failure + /etc/rc.d/init.d/collectd start exit 1 fi fi @@ -132,6 +137,7 @@ case "${1}" in else boot_mesg "dhcpcd already running!" ${WARNING} echo_warning + /etc/rc.d/init.d/collectd start exit 2 fi fi @@ -185,6 +191,7 @@ case "${1}" in if ( ps ax | grep -q [p]ppd ); then boot_mesg "pppd is still running." ${FAILURE} echo_failure + /etc/init.d/collectd start exit 1 fi @@ -220,6 +227,7 @@ case "${1}" in if [ "$PPP_NIC" == "" ]; then boot_mesg "No device for red interface given. Check netsetup or dialprofile!" ${FAILURE} echo_failure + /etc/rc.d/init.d/collectd start exit 0 fi boot_mesg "Bringing up the $TYPE interface on $PPP_NIC ..." @@ -357,7 +365,7 @@ case "${1}" in ## Create & Enable vnstat /usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1 /etc/rc.d/init.d/connectd start - + /etc/rc.d/init.d/collectd start fi ;; From cc9299ee448e342190feba4452d53b291038e70d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 12 May 2009 17:31:52 +0200 Subject: [PATCH 19/26] Updated git to 1.6.3. --- lfs/git | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/git b/lfs/git index 0dc8b4de7..dedac7b75 100644 --- a/lfs/git +++ b/lfs/git @@ -24,7 +24,7 @@ include Config -VER = 1.6.1.2 +VER = 1.6.3 THISAPP = git-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 5 +PAK_VER = 6 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 72a9d88932190ff3523678eec88844ae +$(DL_FILE)_MD5 = a5e6165506cddd94954277cf81f44b14 install : $(TARGET) From 366aa0cb2475c39acd4ad90a4492563a01a4dd0b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 12 May 2009 19:29:23 +0200 Subject: [PATCH 20/26] Fix collectd thermal-zone disabling --- config/collectd/collectd.conf | 13 +------------ config/collectd/collectd.thermal | 13 +++++++++++++ config/rootfiles/common/collectd | 1 + config/rootfiles/core/28/filelists/files | 3 +++ lfs/collectd | 2 +- src/initscripts/init.d/collectd | 10 +++++----- 6 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 config/collectd/collectd.thermal diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index 2ac99f6a6..3785346ba 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -25,7 +25,6 @@ LoadPlugin processes LoadPlugin rrdtool LoadPlugin sensors LoadPlugin swap -LoadPlugin thermal LoadPlugin syslog #LoadPlugin wireless @@ -82,14 +81,4 @@ LoadPlugin syslog LogLevel info - - Device "cooling_device0" - Device "cooling_device1" - Device "cooling_device2" - Device "cooling_device3" - Device "cooling_device4" - Device "cooling_device5" - Device "cooling_device6" - Device "cooling_device7" - IgnoreSelected true - +#include "/etc/collectd.thermal" diff --git a/config/collectd/collectd.thermal b/config/collectd/collectd.thermal new file mode 100644 index 000000000..97403fbb6 --- /dev/null +++ b/config/collectd/collectd.thermal @@ -0,0 +1,13 @@ +LoadPlugin thermal + + + Device "cooling_device0" + Device "cooling_device1" + Device "cooling_device2" + Device "cooling_device3" + Device "cooling_device4" + Device "cooling_device5" + Device "cooling_device6" + Device "cooling_device7" + IgnoreSelected true + diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd index 6a7d9e33e..29160941d 100644 --- a/config/rootfiles/common/collectd +++ b/config/rootfiles/common/collectd @@ -1,4 +1,5 @@ etc/collectd.conf +etc/collectd.thermal etc/rc.d/init.d/collectd etc/rc.d/rc0.d/K50collectd etc/rc.d/rc3.d/S21collectd diff --git a/config/rootfiles/core/28/filelists/files b/config/rootfiles/core/28/filelists/files index c62f6e230..6eeb9c8ab 100644 --- a/config/rootfiles/core/28/filelists/files +++ b/config/rootfiles/core/28/filelists/files @@ -1,7 +1,10 @@ bin/probenic.sh +etc/collectd.conf +etc/collectd.thermal etc/ntp etc/rc.d/init.d/beep etc/rc.d/init.d/console +etc/rc.d/init.d/collectd etc/rc.d/init.d/snort etc/rc.d/init.d/networking/red etc/ssh/moduli diff --git a/lfs/collectd b/lfs/collectd index 7154b1cd5..07dc4d96e 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -89,7 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-{tcpconns,unixsock,users,wireless} \ --with-rrdtool=/usr/share/rrdtool-1.2.15 cd $(DIR_APP) && make install - cp -vf $(DIR_SRC)/config/collectd/collectd.conf /etc/ + cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/ ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S21collectd ln -f -s ../init.d/collectd /etc/rc.d/rc6.d/K50collectd diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd index eeaa3860b..cf02acbe3 100644 --- a/src/initscripts/init.d/collectd +++ b/src/initscripts/init.d/collectd @@ -13,7 +13,7 @@ fi case "$1" in start) - # If run from init and collectd already started then exit silent + # If run from init and collectd alrady started then exit silent if [ "$(basename $0)" != "collectd" ]; then if [ "$(ps -A | grep " collectd$")" != "" ]; then exit 0 @@ -43,8 +43,8 @@ case "$1" in fi # Load sensor modules only first start - if [ ! -e /var/lock/sensor_modules ]; then - touch /var/lock/sensor_modules + if [ ! -e /var/lock/sensors_modules ]; then + touch /var/lock/sensors_modules boot_mesg -n "Loading Sensor Modules: " for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do modprobe $modul > /dev/null 2>&1; @@ -67,9 +67,9 @@ case "$1" in # Enable thermal plugin if thermal_zone found if [ ! -e /sys/class/thermal/thermal_zone0 ]; then - sed -i -e "s|^LoadPlugin thermal|#LoadPlugin thermal|g" /etc/collectd.conf + sed -i -e 's|^include "/etc/collectd.thermal"$|#include "/etc/collectd.thermal"|g' /etc/collectd.conf else - sed -i -e "s|^#LoadPlugin thermal|LoadPlugin thermal|g" /etc/collectd.conf + sed -i -e 's|^#include "/etc/collectd.thermal"$|include "/etc/collectd.thermal"|g' /etc/collectd.conf fi # Enable swap plugin if swap found From 4c89f6d457b3db609a4834cfd7354667e69d063e Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 12 May 2009 19:30:33 +0200 Subject: [PATCH 21/26] First shutdown collectd and then save ramdisk at collectd stop --- src/initscripts/init.d/collectd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd index cf02acbe3..a63aea05c 100644 --- a/src/initscripts/init.d/collectd +++ b/src/initscripts/init.d/collectd @@ -84,13 +84,13 @@ case "$1" in evaluate_retval ;; stop) + boot_mesg "Stopping Collection daemon..." + killproc /usr/sbin/collectd + evaluate_retval # Save the ramdisk at manual stop but not at shutdown if [ "$(basename $0)" == "collectd" ]; then /etc/init.d/tmpfs backup fi - boot_mesg "Stopping Collection daemon..." - killproc /usr/sbin/collectd - evaluate_retval ;; restart) ${0} stop From 95aaf24437902b811dce5ba85515b06f68ac60ff Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 13 May 2009 00:22:32 +0200 Subject: [PATCH 22/26] Updated git rootfile. --- config/rootfiles/packages/git | 29 +++++++++++++++++------------ doc/packages-list.txt | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index f31604038..3c4c5129e 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -1,5 +1,7 @@ usr/bin/git +usr/bin/git-cvsserver usr/bin/git-receive-pack +usr/bin/git-shell usr/bin/git-upload-archive usr/bin/git-upload-pack #usr/bin/gitk @@ -16,6 +18,7 @@ usr/libexec/git-core/git-apply usr/libexec/git-core/git-archimport usr/libexec/git-core/git-archive usr/libexec/git-core/git-bisect +usr/libexec/git-core/git-bisect--helper usr/libexec/git-core/git-blame usr/libexec/git-core/git-branch usr/libexec/git-core/git-bundle @@ -42,6 +45,8 @@ usr/libexec/git-core/git-diff usr/libexec/git-core/git-diff-files usr/libexec/git-core/git-diff-index usr/libexec/git-core/git-diff-tree +usr/libexec/git-core/git-difftool +usr/libexec/git-core/git-difftool--helper usr/libexec/git-core/git-fast-export usr/libexec/git-core/git-fast-import usr/libexec/git-core/git-fetch @@ -57,7 +62,9 @@ usr/libexec/git-core/git-gc usr/libexec/git-core/git-get-tar-commit-id usr/libexec/git-core/git-grep usr/libexec/git-core/git-gui +usr/libexec/git-core/git-gui--askpass usr/libexec/git-core/git-hash-object +usr/libexec/git-core/git-help usr/libexec/git-core/git-http-fetch usr/libexec/git-core/git-http-push usr/libexec/git-core/git-imap-send @@ -84,6 +91,7 @@ usr/libexec/git-core/git-merge-resolve usr/libexec/git-core/git-merge-subtree usr/libexec/git-core/git-merge-tree usr/libexec/git-core/git-mergetool +usr/libexec/git-core/git-mergetool--lib usr/libexec/git-core/git-mktag usr/libexec/git-core/git-mktree usr/libexec/git-core/git-mv @@ -124,6 +132,7 @@ usr/libexec/git-core/git-show usr/libexec/git-core/git-show-branch usr/libexec/git-core/git-show-index usr/libexec/git-core/git-show-ref +usr/libexec/git-core/git-stage usr/libexec/git-core/git-stash usr/libexec/git-core/git-status usr/libexec/git-core/git-stripspace @@ -188,22 +197,29 @@ usr/share/git-core/templates/info/exclude #usr/share/git-gui/lib/index.tcl #usr/share/git-gui/lib/logo.tcl #usr/share/git-gui/lib/merge.tcl +#usr/share/git-gui/lib/mergetool.tcl #usr/share/git-gui/lib/msgs #usr/share/git-gui/lib/msgs/de.msg #usr/share/git-gui/lib/msgs/fr.msg #usr/share/git-gui/lib/msgs/hu.msg #usr/share/git-gui/lib/msgs/it.msg #usr/share/git-gui/lib/msgs/ja.msg +#usr/share/git-gui/lib/msgs/nb.msg #usr/share/git-gui/lib/msgs/ru.msg #usr/share/git-gui/lib/msgs/sv.msg #usr/share/git-gui/lib/msgs/zh_cn.msg #usr/share/git-gui/lib/option.tcl #usr/share/git-gui/lib/remote.tcl +#usr/share/git-gui/lib/remote_add.tcl #usr/share/git-gui/lib/remote_branch_delete.tcl +#usr/share/git-gui/lib/search.tcl #usr/share/git-gui/lib/shortcut.tcl #usr/share/git-gui/lib/spellcheck.tcl +#usr/share/git-gui/lib/sshkey.tcl #usr/share/git-gui/lib/status_bar.tcl #usr/share/git-gui/lib/tclIndex +#usr/share/git-gui/lib/tools.tcl +#usr/share/git-gui/lib/tools_dlg.tcl #usr/share/git-gui/lib/transport.tcl #usr/share/git-gui/lib/win32.tcl #usr/share/git-gui/lib/win32_shortcut.js @@ -213,18 +229,7 @@ usr/share/git-core/templates/info/exclude #usr/share/gitk/lib/msgs/de.msg #usr/share/gitk/lib/msgs/es.msg #usr/share/gitk/lib/msgs/it.msg +#usr/share/gitk/lib/msgs/ru.msg #usr/share/gitk/lib/msgs/sv.msg #usr/share/man/man3/Git.3 #usr/share/man/man3/private-Error.3 -usr/bin/git-cvsserver -usr/bin/git-shell -usr/libexec/git-core/git-gui--askpass -usr/libexec/git-core/git-help -usr/libexec/git-core/git-stage -#usr/share/git-gui/lib/mergetool.tcl -#usr/share/git-gui/lib/msgs/nb.msg -#usr/share/git-gui/lib/remote_add.tcl -#usr/share/git-gui/lib/search.tcl -#usr/share/git-gui/lib/sshkey.tcl -#usr/share/git-gui/lib/tools.tcl -#usr/share/git-gui/lib/tools_dlg.tcl diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 3482e4af9..f5018cd90 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -114,7 +114,7 @@ * gd-2.0.33 * gdbm-1.8.3 * gettext-0.14.5 -* git-1.6.1.2 +* git-1.6.3 * glib-2.16.5 * glibc-2.3.6 * gmp-4.2 From 28ec28bcbe78d60e62796a0a9b064800db8e4171 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 13 May 2009 18:41:01 +0200 Subject: [PATCH 23/26] Work around for Bad DNS Servers at UMTS-Connections Change gateway ip to currect ip Remove Error (3min wait) at startup if the first connection try fail... --- src/initscripts/init.d/collectd | 2 +- src/initscripts/init.d/networking/red | 1 + src/ppp/ip-up | 13 +++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd index a63aea05c..74ff3fdc8 100644 --- a/src/initscripts/init.d/collectd +++ b/src/initscripts/init.d/collectd @@ -59,7 +59,7 @@ case "$1" in fi # Enable sensors plugin if sensors found - if [ $( sensors 2>&1 | grep "No sensors found!" | wc -l ) == "1" ]; then + if [ "$( sensors 2>&1 | grep 'No sensors found!' | wc -l )" == "1" ]; then sed -i -e "s|^LoadPlugin sensors|#LoadPlugin sensors|g" /etc/collectd.conf else sed -i -e "s|^#LoadPlugin sensors|LoadPlugin sensors|g" /etc/collectd.conf diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index 6f9fcd064..1a7958306 100644 --- a/src/initscripts/init.d/networking/red +++ b/src/initscripts/init.d/networking/red @@ -366,6 +366,7 @@ case "${1}" in /usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1 /etc/rc.d/init.d/connectd start /etc/rc.d/init.d/collectd start + exit 0 fi ;; diff --git a/src/ppp/ip-up b/src/ppp/ip-up index 9168eef40..5c4569921 100644 --- a/src/ppp/ip-up +++ b/src/ppp/ip-up @@ -32,14 +32,19 @@ if [ "$DNS" == "Automatic" ]; then echo -n "$MS_DNS1" > /var/ipfire/red/dns1 echo -n "$MS_DNS2" > /var/ipfire/red/dns2 else - echo -n "$PRIMARY_DNS" > /var/ipfire/red/dns1 - echo -n "$SECONDARY_DNS" > /var/ipfire/red/dns2 + if [ "$PRIMARY_DNS" != "10.11.12.13" || "$SECONDARY_DNS" != "10.11.12.14" ]; then + echo -n "$PRIMARY_DNS" > /var/ipfire/red/dns1 + echo -n "$SECONDARY_DNS" > /var/ipfire/red/dns2 + else + echo -n "$DNS1" > /var/ipfire/red/dns1 + echo -n "$DNS2" > /var/ipfire/red/dns2 + fi fi else echo -n "$DNS1" > /var/ipfire/red/dns1 echo -n "$DNS2" > /var/ipfire/red/dns2 fi - +7 echo -n "$1" > /var/ipfire/red/iface echo -n "$4" > /var/ipfire/red/local-ipaddress echo -n "$5" > /var/ipfire/red/remote-ipaddress @@ -65,7 +70,7 @@ else echo "$FIRE gateway" >> /tmp/hosts else #DNS lookup failed use direct ip - echo "85.88.28.124 gateway" >> /tmp/hosts + echo "85.88.28.125 gateway" >> /tmp/hosts fi fi mv /tmp/hosts /etc/hosts From 629ea848cc03e0b0cee9463f8166a5e1b33fce42 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 13 May 2009 18:44:30 +0200 Subject: [PATCH 24/26] Add ip-up to core28 --- config/rootfiles/core/28/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/28/filelists/files b/config/rootfiles/core/28/filelists/files index 6eeb9c8ab..b8ecd2010 100644 --- a/config/rootfiles/core/28/filelists/files +++ b/config/rootfiles/core/28/filelists/files @@ -7,6 +7,7 @@ etc/rc.d/init.d/console etc/rc.d/init.d/collectd etc/rc.d/init.d/snort etc/rc.d/init.d/networking/red +etc/ppp/ip-up etc/ssh/moduli etc/ssh/ssh_config etc/ssh/sshd_config From 9284fcc5c9936bd81594c98193e42f0cea5a8121 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 14 May 2009 07:38:50 +0200 Subject: [PATCH 25/26] Updated Kernel to 2.6.27.23 --- doc/packages-list.txt | 34 +++++++++++++++++----------------- lfs/linux | 6 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index f5018cd90..b87953da5 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -36,15 +36,15 @@ * Unix-Syslog-0.100 * XML-Parser-2.34 * alsa-lib-1.0.19 -* alsa-lib-1.0.19-kmod-2.6.27.21-ipfire +* alsa-lib-1.0.19-kmod-2.6.27.23-ipfire * amavisd-new-2.5.2 * apcupsd-3.14.4 * applejuice-0.31 * arping-2.05 * as86-0.16.17 * asterisk-1.4.18 -* atl2-2.0.5-kmod-2.6.27.21-ipfire -* atl2-2.0.5-kmod-2.6.27.21-ipfire-xen +* atl2-2.0.5-kmod-2.6.27.23-ipfire +* atl2-2.0.5-kmod-2.6.27.23-ipfire-xen * autoconf-2.59 * automake-1.9.6 * backup-ipfire @@ -68,8 +68,8 @@ * clamav-0.95.1 * cmake-2.4.8 * collectd-4.5.3 -* compat-wireless-2009-03-30-kmod-2.6.27.21-ipfire -* compat-wireless-2009-03-30-kmod-2.6.27.21-ipfire-xen +* compat-wireless-2009-03-30-kmod-2.6.27.23-ipfire +* compat-wireless-2009-03-30-kmod-2.6.27.23-ipfire-xen * coreutils-5.96 * cpio-2.6 * cpufrequtils-005 @@ -150,8 +150,8 @@ * jpegsrc.v6b * kbd-1.12 * klibc-1.5.14 -* kqemu-1.4.0pre1-kmod-2.6.27.21-ipfire -* kqemu-1.4.0pre1-kmod-2.6.27.21-ipfire-xen +* kqemu-1.4.0pre1-kmod-2.6.27.23-ipfire +* kqemu-1.4.0pre1-kmod-2.6.27.23-ipfire-xen * kudzu-1.2.64 * l7-protocols-2008-12-18 * lame-3.97 @@ -182,8 +182,8 @@ * libwww-perl-5.803 * libxml2-2.6.26 * libxslt-1.1.17 -* linux-2.6.27.21-ipfire -* linux-2.6.27.21-ipfire-xen +* linux-2.6.27.23-ipfire +* linux-2.6.27.23-ipfire-xen * linux-atm-2.4.1 * linux-libc-headers-2.6.12.0 * lm_sensors-3.0.3 @@ -193,11 +193,11 @@ * lynis-1.2.3 * lzo-2.02 * m4-1.4.4 -* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.21-ipfire -* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.21-ipfire-xen +* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.23-ipfire +* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.23-ipfire-xen * mISDNuser.git-54928dec57bc846f2c2186f3640e69a053cd3641 -* madwifi-hal-testing-r4003-20090416-kmod-2.6.27.21-ipfire -* madwifi-hal-testing-r4003-20090416-kmod-2.6.27.21-ipfire-xen +* madwifi-hal-testing-r4003-20090416-kmod-2.6.27.23-ipfire +* madwifi-hal-testing-r4003-20090416-kmod-2.6.27.23-ipfire-xen * make-3.81 * man-db-2.4.3 * man-pages-2.34 @@ -240,8 +240,8 @@ * openssh-5.2p1 * openssl-0.9.8k * openswan-2.6.21 -* openswan-2.6.21-kmod-2.6.27.21-ipfire -* openswan-2.6.21-kmod-2.6.27.21-ipfire-xen +* openswan-2.6.21-kmod-2.6.27.23-ipfire +* openswan-2.6.21-kmod-2.6.27.23-ipfire-xen * openvpn-2.0.9 * p7zip_4.65 * pam_mysql-0.7RC1 @@ -316,8 +316,8 @@ * urlgrabber-3.1.0 * usbutils-0.72 * util-linux-2.12r -* v4l-dvb-4cd17f5a20cc-kmod-2.6.27.21-ipfire -* v4l-dvb-4cd17f5a20cc-kmod-2.6.27.21-ipfire-xen +* v4l-dvb-4cd17f5a20cc-kmod-2.6.27.23-ipfire +* v4l-dvb-4cd17f5a20cc-kmod-2.6.27.23-ipfire-xen * vdr-1.6.0 * vdradmin-am-3.6.4 * vim-7.0 diff --git a/lfs/linux b/lfs/linux index 12275354b..b45997daf 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .21 -VER = 2.6.27.21 +PATCHLEVEL = .23 +VER = 2.6.27.23 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -62,7 +62,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 squashfs3.4.tar.gz = $(URL_IPFIRE)/squashfs3.4.tar.gz reiser4-for-2.6.27.19.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2 -$(DL_FILE)_MD5 = 2912af7938fae1a3f2a9a6bcf8c0009f +$(DL_FILE)_MD5 = 42db72b93641da2fe9fb0eb2ae6388d6 netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5 patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6 From 5c237109bd8608b68f41956cfc0e103671571bc4 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 14 May 2009 21:59:34 +0200 Subject: [PATCH 26/26] Add short delay to dialer and fix umts/gprs dns work arround --- src/ppp/dialer | 3 ++- src/ppp/ip-up | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/ppp/dialer b/src/ppp/dialer index 208e3b967..c8aad46e7 100644 --- a/src/ppp/dialer +++ b/src/ppp/dialer @@ -88,8 +88,9 @@ my $com = "/usr/sbin/chat -v -r /var/log/connect.log \ OK '$speaker' \ OK '$add_at2' \ '' '$add_at3' \ + '' 'sleep 5' \ TIMEOUT '$modemsettings{'TIMEOUT'}' \ - OK '${dial}${telephone}' \ + OK '\d${dial}${telephone}' \ CONNECT '${btfudge}' "; if ($loginscript) diff --git a/src/ppp/ip-up b/src/ppp/ip-up index 5c4569921..ab01ad38b 100644 --- a/src/ppp/ip-up +++ b/src/ppp/ip-up @@ -32,12 +32,15 @@ if [ "$DNS" == "Automatic" ]; then echo -n "$MS_DNS1" > /var/ipfire/red/dns1 echo -n "$MS_DNS2" > /var/ipfire/red/dns2 else - if [ "$PRIMARY_DNS" != "10.11.12.13" || "$SECONDARY_DNS" != "10.11.12.14" ]; then - echo -n "$PRIMARY_DNS" > /var/ipfire/red/dns1 - echo -n "$SECONDARY_DNS" > /var/ipfire/red/dns2 - else + if [ "$PRIMARY_DNS" == "10.11.12.13" ]; then echo -n "$DNS1" > /var/ipfire/red/dns1 + else + echo -n "$PRIMARY_DNS" > /var/ipfire/red/dns1 + fi + if [ "$SECONDARY_DNS" == "10.11.12.14" ]; then echo -n "$DNS2" > /var/ipfire/red/dns2 + else + echo -n "$SECONDARY_DNS" > /var/ipfire/red/dns2 fi fi else