IPFire-SCM June 2011

ipfire-scm@lists.ipfire.org

1 participants
66 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0f5490855a4259e7a3770edb95c2af4ceeaef427
by git＠ipfire.org 30 Jun '11

30 Jun '11

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, next has been updated via 0f5490855a4259e7a3770edb95c2af4ceeaef427 (commit) from b751ad81814bd71d9ddf32607c992dbbddfd417c (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 0f5490855a4259e7a3770edb95c2af4ceeaef427 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jun 30 22:09:11 2011 +0200 kernel: disabled obsolete prism54 modul. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire | 2 +- config/kernel/kernel.config.i586-ipfire-pae | 2 +- config/kernel/kernel.config.i586-ipfire-xen | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index ae35efb..2c08a1b 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1694,7 +1694,7 @@ CONFIG_PCMCIA_ATMEL=m CONFIG_AT76C50X_USB=m CONFIG_AIRO_CS=m CONFIG_PCMCIA_WL3501=m -CONFIG_PRISM54=m +# CONFIG_PRISM54 is not set CONFIG_USB_ZD1201=m CONFIG_USB_NET_RNDIS_WLAN=m # CONFIG_RTL8180 is not set diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 7eeb130..4b23df3 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1713,7 +1713,7 @@ CONFIG_PCMCIA_ATMEL=m CONFIG_AT76C50X_USB=m CONFIG_AIRO_CS=m CONFIG_PCMCIA_WL3501=m -CONFIG_PRISM54=m +# CONFIG_PRISM54 is not set CONFIG_USB_ZD1201=m CONFIG_USB_NET_RNDIS_WLAN=m # CONFIG_RTL8180 is not set diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index 4051184..72fd490 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -1491,7 +1491,7 @@ CONFIG_PCMCIA_ATMEL=m CONFIG_AT76C50X_USB=m CONFIG_AIRO_CS=m CONFIG_PCMCIA_WL3501=m -CONFIG_PRISM54=m +# CONFIG_PRISM54 is not set CONFIG_USB_ZD1201=m CONFIG_USB_NET_RNDIS_WLAN=m # CONFIG_RTL8180 is not set hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, openvpn-n2n, updated. d4c8b6bec26d2b45112e129f99921558058c4b18
by git＠ipfire.org 29 Jun '11

29 Jun '11

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, openvpn-n2n has been updated via d4c8b6bec26d2b45112e129f99921558058c4b18 (commit) from 80ca8bd0f52b61accecc4d66296ec7d7648ee990 (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 d4c8b6bec26d2b45112e129f99921558058c4b18 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 29 20:02:31 2011 +0200 openvpnctrl: Remove PID file after an openvpn process was killed. ----------------------------------------------------------------------- Summary of changes: src/misc-progs/openvpnctrl.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Difference in files: diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index 1a40c9a..ddda612 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -466,6 +466,10 @@ void killNet2Net(char *name) { fprintf(stderr, "Killing PID %d.\n", pid); kill(pid, SIGTERM); + char command[STRING_SIZE]; + snprintf(command, STRING_SIZE - 1, "/bin/rm -f %s", pidfile); + executeCommand(command); + exit(0); } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, openvpn-n2n, updated. 80ca8bd0f52b61accecc4d66296ec7d7648ee990
by git＠ipfire.org 29 Jun '11

29 Jun '11

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, openvpn-n2n has been updated via 80ca8bd0f52b61accecc4d66296ec7d7648ee990 (commit) via 858d8d9092dae3839e9129448d8a51937aebc909 (commit) from 2bcff894ac444f5b8d5d6ab7d8c243974526d332 (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 80ca8bd0f52b61accecc4d66296ec7d7648ee990 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 29 19:58:01 2011 +0200 openvpnctrl: Fix some compiler warnings. (Hopefully) no functional changes. commit 858d8d9092dae3839e9129448d8a51937aebc909 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 29 19:51:24 2011 +0200 openvpnctrl: Create firewall rules properly if roadwarrior server is disabled. ----------------------------------------------------------------------- Summary of changes: src/misc-progs/openvpnctrl.c | 97 ++++++++++++++++++----------------------- 1 files changed, 43 insertions(+), 54 deletions(-) Difference in files: diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index 68bbe2f..1a40c9a 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -122,6 +122,20 @@ connection *getConnections() { return conn_first; } +int readPidFile(const char *pidfile) { + FILE *fp = fopen(pidfile, "r"); + if (fp == NULL) { + fprintf(stderr, "PID file not found: '%s'\n", pidfile); + exit(1); + } + + int pid = 0; + fscanf(fp, "%d", &pid); + fclose(fp); + + return pid; +} + void ovpnInit(void) { // Read OpenVPN configuration @@ -268,39 +282,34 @@ void createChain(char *chain) { } void createAllChains(void) { - if (!((strcmp(enablered, "on")==0) || (strcmp(enableblue, "on")==0) || (strcmp(enableorange, "on")==0))){ - fprintf(stderr, "OpenVPN is not enabled on any interface\n"); - exit(1); - } else { - // create chain and chain references - if (!strcmp(enableorange, "on")) { - if (strlen(orangeif)) { - createChain(OVPNORANGE); - createChainReference(OVPNORANGE); - } else { - fprintf(stderr, "OpenVPN enabled on orange but no orange interface found\n"); - //exit(1); - } + // create chain and chain references + if (!strcmp(enableorange, "on")) { + if (strlen(orangeif)) { + createChain(OVPNORANGE); + createChainReference(OVPNORANGE); + } else { + fprintf(stderr, "OpenVPN enabled on orange but no orange interface found\n"); + //exit(1); } - - if (!strcmp(enableblue, "on")) { - if (strlen(blueif)) { - createChain(OVPNBLUE); - createChainReference(OVPNBLUE); - } else { - fprintf(stderr, "OpenVPN enabled on blue but no blue interface found\n"); - //exit(1); - } + } + + if (!strcmp(enableblue, "on")) { + if (strlen(blueif)) { + createChain(OVPNBLUE); + createChainReference(OVPNBLUE); + } else { + fprintf(stderr, "OpenVPN enabled on blue but no blue interface found\n"); + //exit(1); } - - if (!strcmp(enablered, "on")) { - if (strlen(redif)) { - createChain(OVPNRED); - createChainReference(OVPNRED); - } else { - fprintf(stderr, "OpenVPN enabled on red but no red interface found\n"); - //exit(1); - } + } + + if (!strcmp(enablered, "on")) { + if (strlen(redif)) { + createChain(OVPNRED); + createChainReference(OVPNRED); + } else { + fprintf(stderr, "OpenVPN enabled on red but no red interface found\n"); + //exit(1); } } } @@ -310,12 +319,6 @@ void setFirewallRules(void) { char dport[STRING_SIZE] = ""; char dovpnip[STRING_SIZE] = ""; - /* check if it makes sence to proceed further */ - if (!((strcmp(enablered, "on")==0) || (strcmp(enableblue, "on")==0) || (strcmp(enableorange, "on")==0))){ - fprintf(stderr, "Config error, at least one device must be enabled\n"); - exit(1); - } - kv = initkeyvalues(); if (!readkeyvalues(kv, CONFIG_ROOT "/ovpn/settings")) { @@ -369,7 +372,7 @@ void stopDaemon(void) { char command[STRING_SIZE]; int pid = readPidFile("/var/run/openvpn.pid"); - if (pid == NULL) { + if (!pid > 0) { exit(1); } @@ -433,20 +436,6 @@ void startNet2Net(char *name) { executeCommand(command); } -int readPidFile(const char *pidfile) { - FILE *fp = fopen(pidfile, "r"); - if (fp == NULL) { - fprintf(stderr, "PID file not found: '%s'\n", pidfile); - exit(1); - } - - int pid = NULL; - fscanf(fp, "%d", &pid); - fclose(fp); - - return pid; -} - void killNet2Net(char *name) { connection *conn = NULL; connection *conn_iter; @@ -467,10 +456,10 @@ void killNet2Net(char *name) { } char pidfile[STRING_SIZE]; - snprintf(&pidfile, STRING_SIZE - 1, "/var/run/%sn2n.pid", conn->name); + snprintf(pidfile, STRING_SIZE - 1, "/var/run/%sn2n.pid", conn->name); int pid = readPidFile(pidfile); - if (pid == NULL) { + if (!pid > 0) { exit(1); } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. b147bdbce609bf254218a1dee0c1ec5b9ec876c6
by git＠ipfire.org 28 Jun '11

28 Jun '11

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 3.x development tree". The branch, master has been updated via b147bdbce609bf254218a1dee0c1ec5b9ec876c6 (commit) via 2eeec35fd35869595aa3528394161db00ede6095 (commit) from 21a2d943b6976a72c117d6be022f326ed3f91963 (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 b147bdbce609bf254218a1dee0c1ec5b9ec876c6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 28 15:01:45 2011 +0200 gcc: Update to 4.6.1. commit 2eeec35fd35869595aa3528394161db00ede6095 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 28 15:01:31 2011 +0200 usbutils: Update to 003. ----------------------------------------------------------------------- Summary of changes: pkgs/gcc/gcc.nm | 4 ++-- pkgs/usbutils/usbutils.nm | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) Difference in files: diff --git a/pkgs/gcc/gcc.nm b/pkgs/gcc/gcc.nm index 22fd0d8..fa9d738 100644 --- a/pkgs/gcc/gcc.nm +++ b/pkgs/gcc/gcc.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = gcc -PKG_VER = 4.6.0 -PKG_REL = 3 +PKG_VER = 4.6.1 +PKG_REL = 1 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUPS = Development/Compilers diff --git a/pkgs/usbutils/usbutils.nm b/pkgs/usbutils/usbutils.nm index 27bf03f..60d0596 100644 --- a/pkgs/usbutils/usbutils.nm +++ b/pkgs/usbutils/usbutils.nm @@ -25,8 +25,9 @@ include $(PKGROOT)/Include PKG_NAME = usbutils -PKG_VER = 0.86 -PKG_REL = 0 +PKG_EPOCH = 1 +PKG_VER = 003 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUPS = System/Tools @@ -34,7 +35,7 @@ PKG_URL = http://www.linux-usb.org/ PKG_LICENSE = GPLv2 PKG_SUMMARY = Tool to provide and enhance USB support in Linux. -PKG_BUILD_DEPS+= libusb-compat-devel pkg-config zlib-devel +PKG_BUILD_DEPS+= libusb-devel pkg-config zlib-devel define PKG_DESCRIPTION A set of tools to configure list USB Devices. @@ -44,4 +45,7 @@ PKG_TARBALL = $(THISAPP).tar.gz define STAGE_INSTALL_CMDS rm -fv $(BUILDROOT)/usr/share/usb.ids.gz + + # Removing lsusb.py. + rm -rfv $(BUILDROOT)/usr/bin/lsusb.py endef hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b751ad81814bd71d9ddf32607c992dbbddfd417c
by git＠ipfire.org 27 Jun '11

27 Jun '11

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, next has been updated via b751ad81814bd71d9ddf32607c992dbbddfd417c (commit) via ad8cad552baa2561f7c8cacc52ae14242a36abfb (commit) via 1abbf741cc7985ccaf9671102af8e80dffa0846f (commit) via 2aa5f6100defbf9db5ea0cb8b4c5ce00d6cf40d8 (commit) from 5532265c3ca1c01cd0a2d3b2a893b5fbac606faa (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 b751ad81814bd71d9ddf32607c992dbbddfd417c Merge: 5532265 ad8cad5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 28 00:49:44 2011 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/cfgroot/graphs.pl | 6 +++--- config/rootfiles/core/50/filelists/files | 1 + .../34 => core/50}/filelists/smartmontools | 0 langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + lfs/smartmontools | 6 +++--- 6 files changed, 9 insertions(+), 6 deletions(-) copy config/rootfiles/{oldcore/34 => core/50}/filelists/smartmontools (100%) Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 1961246..5eb96d8 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -257,11 +257,11 @@ sub updateloadgraph { "DEF:load1=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:shortterm:AVERAGE", "DEF:load5=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:midterm:AVERAGE", "DEF:load15=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:longterm:AVERAGE", - "AREA:load1".$color{"color13"}."A0:1 Minute:", + "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'}.":", "GPRINT:load1:LAST:%5.2lf", - "AREA:load5".$color{"color18"}."A0:5 Minuten:", + "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}.":", "GPRINT:load5:LAST:%5.2lf", - "AREA:load15".$color{"color14"}."A0:15 Minuten:", + "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}.":", "GPRINT:load15:LAST:%5.2lf\\j", "LINE1:load5".$color{"color13"}, "LINE1:load1".$color{"color18"}, diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files index dca50be..400eafa 100644 --- a/config/rootfiles/core/50/filelists/files +++ b/config/rootfiles/core/50/filelists/files @@ -2,3 +2,4 @@ etc/system-release var/ipfire/langs/ etc/rc.d/init.d/console usr/local/sbin/setup +var/ipfire/graphs.pl diff --git a/config/rootfiles/core/50/filelists/smartmontools b/config/rootfiles/core/50/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/core/50/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 2c95922..d97dee0 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1159,6 +1159,7 @@ 'min delay' => 'Minimale Verzögerung', 'min size' => 'Min. Objektgröße (kB):', 'minimal' => 'Minimal', +'minute' => 'Minute', 'minutes' => 'Minuten', 'misc-options' => 'Sonstige Optionen', 'missing dat' => 'Verschlüsseltes Archiv wurde nicht gefunden', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 92d9f8f..67451be 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1186,6 +1186,7 @@ 'min delay' => 'Minimum delay', 'min size' => 'Min object size (KB):', 'minimal' => 'Minimal', +'minute' => 'Minute', 'minutes' => 'Minutes', 'misc-options' => 'Miscellaneous options', 'missing dat' => 'Encrypted archive not found', diff --git a/lfs/smartmontools b/lfs/smartmontools index 5530f21..3f92cb7 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -24,7 +24,7 @@ include Config -VER = 5.40 +VER = 5.41 THISAPP = smartmontools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0f0be0239914ad87830a4fff594bda5b +$(DL_FILE)_MD5 = 4577886bea79d4ff12bd9a7d323ce692 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. ad8cad552baa2561f7c8cacc52ae14242a36abfb
by git＠ipfire.org 27 Jun '11

27 Jun '11

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 ad8cad552baa2561f7c8cacc52ae14242a36abfb (commit) via 1abbf741cc7985ccaf9671102af8e80dffa0846f (commit) from 2aa5f6100defbf9db5ea0cb8b4c5ce00d6cf40d8 (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 ad8cad552baa2561f7c8cacc52ae14242a36abfb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 28 00:48:47 2011 +0200 core50: add graphs.pl. commit 1abbf741cc7985ccaf9671102af8e80dffa0846f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 28 00:46:48 2011 +0200 load graph: fix unlocalized "minutes". ----------------------------------------------------------------------- Summary of changes: config/cfgroot/graphs.pl | 6 +++--- config/rootfiles/core/50/filelists/files | 1 + langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 1961246..5eb96d8 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -257,11 +257,11 @@ sub updateloadgraph { "DEF:load1=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:shortterm:AVERAGE", "DEF:load5=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:midterm:AVERAGE", "DEF:load15=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:longterm:AVERAGE", - "AREA:load1".$color{"color13"}."A0:1 Minute:", + "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'}.":", "GPRINT:load1:LAST:%5.2lf", - "AREA:load5".$color{"color18"}."A0:5 Minuten:", + "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}.":", "GPRINT:load5:LAST:%5.2lf", - "AREA:load15".$color{"color14"}."A0:15 Minuten:", + "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}.":", "GPRINT:load15:LAST:%5.2lf\\j", "LINE1:load5".$color{"color13"}, "LINE1:load1".$color{"color18"}, diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files index dca50be..400eafa 100644 --- a/config/rootfiles/core/50/filelists/files +++ b/config/rootfiles/core/50/filelists/files @@ -2,3 +2,4 @@ etc/system-release var/ipfire/langs/ etc/rc.d/init.d/console usr/local/sbin/setup +var/ipfire/graphs.pl diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 09cd509..e6d451f 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1150,6 +1150,7 @@ 'min delay' => 'Minimale Verzögerung', 'min size' => 'Min. Objektgröße (kB):', 'minimal' => 'Minimal', +'minute' => 'Minute', 'minutes' => 'Minuten', 'misc-options' => 'Sonstige Optionen', 'missing dat' => 'Verschlüsseltes Archiv wurde nicht gefunden', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index fcb9241..2478145 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1177,6 +1177,7 @@ 'min delay' => 'Minimum delay', 'min size' => 'Min object size (KB):', 'minimal' => 'Minimal', +'minute' => 'Minute', 'minutes' => 'Minutes', 'misc-options' => 'Miscellaneous options', 'missing dat' => 'Encrypted archive not found', hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2aa5f6100defbf9db5ea0cb8b4c5ce00d6cf40d8
by git＠ipfire.org 27 Jun '11

27 Jun '11

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 2aa5f6100defbf9db5ea0cb8b4c5ce00d6cf40d8 (commit) from 429cee557b69f58979a81cf6f49f976094a1c8f6 (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 2aa5f6100defbf9db5ea0cb8b4c5ce00d6cf40d8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jun 27 20:52:35 2011 +0200 smartmontools: update to 5.41. ----------------------------------------------------------------------- Summary of changes: .../core/{44 => 50}/filelists/smartmontools | 0 lfs/smartmontools | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) copy config/rootfiles/core/{44 => 50}/filelists/smartmontools (100%) Difference in files: diff --git a/config/rootfiles/core/50/filelists/smartmontools b/config/rootfiles/core/50/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/core/50/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/lfs/smartmontools b/lfs/smartmontools index 5530f21..3f92cb7 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -24,7 +24,7 @@ include Config -VER = 5.40 +VER = 5.41 THISAPP = smartmontools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0f0be0239914ad87830a4fff594bda5b +$(DL_FILE)_MD5 = 4577886bea79d4ff12bd9a7d323ce692 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5532265c3ca1c01cd0a2d3b2a893b5fbac606faa
by git＠ipfire.org 26 Jun '11

26 Jun '11

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, next has been updated via 5532265c3ca1c01cd0a2d3b2a893b5fbac606faa (commit) via 57ba1e9023b0f1f3499cc888f66827a81574bb41 (commit) from a3323b6fde7a475aba2d4491fd0df98a0dcfaf89 (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 5532265c3ca1c01cd0a2d3b2a893b5fbac606faa Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jun 26 23:18:32 2011 +0200 ipsec: add ike version connection table. commit 57ba1e9023b0f1f3499cc888f66827a81574bb41 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jun 26 23:16:41 2011 +0200 ipsec: change check if a ikev2 tunnel is up. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/index.cgi | 2 +- html/cgi-bin/vpnmain.cgi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 32ae7ff..eec3f9b 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -370,7 +370,7 @@ END } else { foreach my $line (@status) { if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || - ($line =~/ $confighash{$key}[1]\[.*ESTABLISHED/ )) + ($line =~/ $confighash{$key}[1]\{.*INSTALLED/ )) { $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; } diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 3d5a360..1fa40a8 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2527,7 +2527,7 @@ END print "<tr bgcolor='$color{'color22'}'>\n"; } print "<td align='center' nowrap='nowrap'>$confighash{$key}[1]</td>"; - print "<td align='center' nowrap='nowrap'>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>"; + print "<td align='center' nowrap='nowrap'>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ") $confighash{$key}[29]</td>"; if ($confighash{$key}[2] eq '%auth-dn') { print "<td align='left' nowrap='nowrap'>$confighash{$key}[9]</td>"; } elsif ($confighash{$key}[4] eq 'cert') { @@ -2540,7 +2540,7 @@ END my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; foreach my $line (@status) { if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || - ($line =~ / $confighash{$key}[1]\[.*ESTABLISHED/)) + ($line =~ / $confighash{$key}[1]\{.*INSTALLED/)) { $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a3323b6fde7a475aba2d4491fd0df98a0dcfaf89
by git＠ipfire.org 26 Jun '11

26 Jun '11

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, next has been updated via a3323b6fde7a475aba2d4491fd0df98a0dcfaf89 (commit) from 117e37e35699860267699b5662516964b59e3eb2 (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 a3323b6fde7a475aba2d4491fd0df98a0dcfaf89 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jun 26 18:56:39 2011 +0200 vpnmain.cgi: fix my typo. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/vpnmain.cgi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index b4bf8c2..3d5a360 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2539,7 +2539,7 @@ END # get real state my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; foreach my $line (@status) { - if ($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || + if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || ($line =~ / $confighash{$key}[1]\[.*ESTABLISHED/)) { $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 117e37e35699860267699b5662516964b59e3eb2
by git＠ipfire.org 26 Jun '11

26 Jun '11

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, next has been updated via 117e37e35699860267699b5662516964b59e3eb2 (commit) via 4b492e272b065ae89b17fbf63d2244b0d1d1660e (commit) via a5e8b4b8943c18b715a166c5acafba9b16e9068b (commit) from ea2b3bf4d5033ff99a89d3a5361663837d88aff8 (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 117e37e35699860267699b5662516964b59e3eb2 Merge: 4b492e2 ea2b3bf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 26 18:09:03 2011 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 4b492e272b065ae89b17fbf63d2244b0d1d1660e Merge: a5e8b4b 54c5f69 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 26 18:08:40 2011 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit a5e8b4b8943c18b715a166c5acafba9b16e9068b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 26 18:07:56 2011 +0200 Cleanup my mess. This change should be applied with IPFire 2.11. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/50/filelists/files | 1 - config/rootfiles/core/next/filelists/files | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files index 0c2ca2c..dca50be 100644 --- a/config/rootfiles/core/50/filelists/files +++ b/config/rootfiles/core/50/filelists/files @@ -1,4 +1,3 @@ -etc/sysctl.conf etc/system-release var/ipfire/langs/ etc/rc.d/init.d/console diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files index 18df107..d645513 100644 --- a/config/rootfiles/core/next/filelists/files +++ b/config/rootfiles/core/next/filelists/files @@ -1,3 +1,4 @@ +etc/sysctl.conf etc/system-release etc/issue srv/web/ipfire/cgi-bin/extrahd.cgi hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM June 2011