IPFire-SCM April 2015

ipfire-scm@lists.ipfire.org

1 participants
88 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4d9e31ab78dbcf8d6c7cd5720d7cdf410281d778
by git＠ipfire.org 16 Apr '15

16 Apr '15

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 4d9e31ab78dbcf8d6c7cd5720d7cdf410281d778 (commit) from 30986dbf03b2ce231f3a53989d4d81ec7ccb1681 (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 4d9e31ab78dbcf8d6c7cd5720d7cdf410281d778 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 16 20:52:44 2015 +0200 kernel: update to 3.14.38 ----------------------------------------------------------------------- Summary of changes: lfs/linux | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index 7ac13d6..300fd87 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,11 +24,11 @@ include Config -VER = 3.14.37 +VER = 3.14.38 -RPI_PATCHES = 3.14.37-grsec-ipfire1 -A7M_PATCHES = 3.14.37-grsec-ipfire1 -GRS_PATCHES = grsecurity-3.1-3.14.37-201503270048.patch.xz +RPI_PATCHES = 3.14.38-grsec-ipfire1 +A7M_PATCHES = 3.14.38-grsec-ipfire1 +GRS_PATCHES = grsecurity-3.1-3.14.38-201504142259.patch.xz THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -77,10 +77,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES). arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = 43abcb454054c53fb07296e84119edc5 -rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 375dc501711ff3ffeffdfc9848675d26 -arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 8a0a0d6ef78d53b3095691499dac4b71 -$(GRS_PATCHES)_MD5 = d83ca635c83bbd5efc4372992ab58094 +$(DL_FILE)_MD5 = c4d0154627e02dc43c67fa616ff1e569 +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = e423c8b3a408f23b9a26f8f0f4384c50 +arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = a4a4103255e93bfcb02652212b0ae3fc +$(GRS_PATCHES)_MD5 = 6d6ed13c08ae96f6470c30c00e08b130 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 30986dbf03b2ce231f3a53989d4d81ec7ccb1681
by git＠ipfire.org 14 Apr '15

14 Apr '15

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 30986dbf03b2ce231f3a53989d4d81ec7ccb1681 (commit) via c02327515412b1b3ffe147275623b8475fe03b1c (commit) via 6e8f58bf709b2bc7f381a648a88ce44dd4f23eed (commit) from 65f2c9bb3940fab663248f81aae2161a3d1e13a5 (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 30986dbf03b2ce231f3a53989d4d81ec7ccb1681 Merge: 65f2c9b c023275 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 14 20:26:21 2015 +0200 Merge remote-tracking branch 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/menu/20-status.menu | 8 ++++---- doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 3 +++ doc/language_issues.fr | 3 +++ doc/language_issues.nl | 3 +++ doc/language_issues.pl | 3 +++ doc/language_issues.ru | 3 +++ doc/language_issues.tr | 3 +++ doc/language_missings | 8 ++++++++ langs/de/cgi-bin/de.pl | 4 ++-- langs/en/cgi-bin/en.pl | 2 +- 12 files changed, 35 insertions(+), 7 deletions(-) Difference in files: diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu index 802885e..2bcf0d5 100644 --- a/config/menu/20-status.menu +++ b/config/menu/20-status.menu @@ -41,15 +41,15 @@ 'enabled' => 1, }; $substatus->{'53.networkovpn'} = { - 'caption' => "$Lang::tr{'openvpn client'}", + 'caption' => "$Lang::tr{'vpn statistic rw'}", 'uri' => '/cgi-bin/netovpnrw.cgi', - 'title' => "$Lang::tr{'openvpn client'}", + 'title' => "$Lang::tr{'vpn statistic rw'}", 'enabled' => 1, }; $substatus->{'54.networkovpnsrv'} = { - 'caption' => "$Lang::tr{'openvpn server'}", + 'caption' => "$Lang::tr{'vpn statistic n2n'}", 'uri' => '/cgi-bin/netovpnsrv.cgi', - 'title' => "$Lang::tr{'openvpn server'}", + 'title' => "$Lang::tr{'vpn statistics n2n'}", 'enabled' => 1, }; $substatus->{'60.hardwaregraphs'} = { diff --git a/doc/language_issues.de b/doc/language_issues.de index 59bbe96..3a31661 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -641,3 +641,4 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: show tls-auth key +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.en b/doc/language_issues.en index 53e5f96..da14d97 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -671,3 +671,4 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.es b/doc/language_issues.es index 58945ab..f76cd5e 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1032,6 +1032,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 943b197..178ddff 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1043,6 +1043,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 309fbc7..1053474 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -749,3 +749,6 @@ WARNING: untranslated string: source ip country WARNING: untranslated string: ta key WARNING: untranslated string: upload dh key WARNING: untranslated string: vendor +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 58945ab..f76cd5e 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1032,6 +1032,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.ru b/doc/language_issues.ru index de92941..f524498 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1021,6 +1021,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 679bc76..310b636 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -677,3 +677,6 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_missings b/doc/language_missings index 05798b9..0d73d2a 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -509,6 +509,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < wlanap access point < wlanap channel < wlanap country @@ -1079,6 +1081,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < wlanap country < wlan client < wlan client advanced settings @@ -1604,6 +1608,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < wlanap country < wlan client < wlan client advanced settings @@ -2134,6 +2140,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < week-graph < wlanap country < wlan client diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 859c8d3..fe4a200 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2573,9 +2573,9 @@ 'vpn payload compression' => 'Datennutzlast-Kompression aushandeln', 'vpn red name' => 'Öffentliche IP oder FQDN für das rote Interface oder <%defaultroute>', 'vpn remote id' => 'Remote ID', -'vpn subjectaltname' => 'Subjekt Alternativer Name', -'vpn statistic rw' => 'OpenVPN-Roadwarrior-Statistik', 'vpn statistic n2n' => 'OpenVPN-Netz-zu-Netz-Statistik', +'vpn statistic rw' => 'OpenVPN-Roadwarrior-Statistik', +'vpn subjectaltname' => 'Subjekt Alternativer Name', 'vpn vhost' => 'Roadwarrior virtuelle IP (manchmal auch Inner-IP genannt)', 'vpn watch' => 'Netz-zu-Netz VPN neu starten, wenn sich Remote-IP ändert (DynDNS).', 'waiting to synchronize clock' => 'Bitte warten, die Uhr wird synchronisiert', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 6a9a983..174300e 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2615,8 +2615,8 @@ 'vpn payload compression' => 'Negotiate payload compression', 'vpn red name' => 'Public IP or FQDN for RED interface or <%defaultroute>', 'vpn remote id' => 'Remote ID', -'vpn statistic rw' => 'OpenVPN Roadwarrior Statistics', 'vpn statistic n2n' => 'OpenVPN Net-to-Net Statistics', +'vpn statistic rw' => 'OpenVPN Roadwarrior Statistics', 'vpn subjectaltname' => 'Subject Alt Name', 'vpn vhost' => 'Roadwarrior virtual IP (sometimes called Inner-IP)', 'vpn watch' => 'Restart net-to-net vpn when remote peer IP changes (dyndns).', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core89, updated. 04c1f70d0bf9d40b370c83248e5bce1e11947dbe
by git＠ipfire.org 14 Apr '15

14 Apr '15

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, core89 has been updated via 04c1f70d0bf9d40b370c83248e5bce1e11947dbe (commit) via c02327515412b1b3ffe147275623b8475fe03b1c (commit) via 6e8f58bf709b2bc7f381a648a88ce44dd4f23eed (commit) from 4ff690565404a4afe9cc0eec66425303c500d140 (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 04c1f70d0bf9d40b370c83248e5bce1e11947dbe Merge: 4ff6905 c023275 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 14 20:23:40 2015 +0200 Merge remote-tracking branch 'origin/master' into core89 ----------------------------------------------------------------------- Summary of changes: config/menu/20-status.menu | 8 ++++---- doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 3 +++ doc/language_issues.fr | 3 +++ doc/language_issues.nl | 3 +++ doc/language_issues.pl | 3 +++ doc/language_issues.ru | 3 +++ doc/language_issues.tr | 3 +++ doc/language_missings | 8 ++++++++ langs/de/cgi-bin/de.pl | 4 ++-- langs/en/cgi-bin/en.pl | 2 +- 12 files changed, 35 insertions(+), 7 deletions(-) Difference in files: diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu index 802885e..2bcf0d5 100644 --- a/config/menu/20-status.menu +++ b/config/menu/20-status.menu @@ -41,15 +41,15 @@ 'enabled' => 1, }; $substatus->{'53.networkovpn'} = { - 'caption' => "$Lang::tr{'openvpn client'}", + 'caption' => "$Lang::tr{'vpn statistic rw'}", 'uri' => '/cgi-bin/netovpnrw.cgi', - 'title' => "$Lang::tr{'openvpn client'}", + 'title' => "$Lang::tr{'vpn statistic rw'}", 'enabled' => 1, }; $substatus->{'54.networkovpnsrv'} = { - 'caption' => "$Lang::tr{'openvpn server'}", + 'caption' => "$Lang::tr{'vpn statistic n2n'}", 'uri' => '/cgi-bin/netovpnsrv.cgi', - 'title' => "$Lang::tr{'openvpn server'}", + 'title' => "$Lang::tr{'vpn statistics n2n'}", 'enabled' => 1, }; $substatus->{'60.hardwaregraphs'} = { diff --git a/doc/language_issues.de b/doc/language_issues.de index e41f48b..8274818 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -639,3 +639,4 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: show tls-auth key +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.en b/doc/language_issues.en index 290da02..dc03328 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -669,3 +669,4 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.es b/doc/language_issues.es index c93d40c..d44ab4c 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1030,6 +1030,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.fr b/doc/language_issues.fr index c1dedc5..0bf0f86 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1041,6 +1041,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 859cc1f..3d84788 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -747,3 +747,6 @@ WARNING: untranslated string: source ip country WARNING: untranslated string: ta key WARNING: untranslated string: upload dh key WARNING: untranslated string: vendor +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.pl b/doc/language_issues.pl index c93d40c..d44ab4c 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1030,6 +1030,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 17e3199..c9b47c1 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1019,6 +1019,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 0ebd398..5eff2dd 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -675,3 +675,6 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_missings b/doc/language_missings index 05798b9..0d73d2a 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -509,6 +509,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < wlanap access point < wlanap channel < wlanap country @@ -1079,6 +1081,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < wlanap country < wlan client < wlan client advanced settings @@ -1604,6 +1608,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < wlanap country < wlan client < wlan client advanced settings @@ -2134,6 +2140,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < week-graph < wlanap country < wlan client diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 859c8d3..fe4a200 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2573,9 +2573,9 @@ 'vpn payload compression' => 'Datennutzlast-Kompression aushandeln', 'vpn red name' => 'Öffentliche IP oder FQDN für das rote Interface oder <%defaultroute>', 'vpn remote id' => 'Remote ID', -'vpn subjectaltname' => 'Subjekt Alternativer Name', -'vpn statistic rw' => 'OpenVPN-Roadwarrior-Statistik', 'vpn statistic n2n' => 'OpenVPN-Netz-zu-Netz-Statistik', +'vpn statistic rw' => 'OpenVPN-Roadwarrior-Statistik', +'vpn subjectaltname' => 'Subjekt Alternativer Name', 'vpn vhost' => 'Roadwarrior virtuelle IP (manchmal auch Inner-IP genannt)', 'vpn watch' => 'Netz-zu-Netz VPN neu starten, wenn sich Remote-IP ändert (DynDNS).', 'waiting to synchronize clock' => 'Bitte warten, die Uhr wird synchronisiert', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 6a9a983..174300e 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2615,8 +2615,8 @@ 'vpn payload compression' => 'Negotiate payload compression', 'vpn red name' => 'Public IP or FQDN for RED interface or <%defaultroute>', 'vpn remote id' => 'Remote ID', -'vpn statistic rw' => 'OpenVPN Roadwarrior Statistics', 'vpn statistic n2n' => 'OpenVPN Net-to-Net Statistics', +'vpn statistic rw' => 'OpenVPN Roadwarrior Statistics', 'vpn subjectaltname' => 'Subject Alt Name', 'vpn vhost' => 'Roadwarrior virtual IP (sometimes called Inner-IP)', 'vpn watch' => 'Restart net-to-net vpn when remote peer IP changes (dyndns).', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.17-core89, updated. 04c1f70d0bf9d40b370c83248e5bce1e11947dbe
by git＠ipfire.org 14 Apr '15

14 Apr '15

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 tag, v2.17-core89 has been updated to 04c1f70d0bf9d40b370c83248e5bce1e11947dbe (commit) from b9a927998d9832e4060737b31f0d95f5223ccb9a - Log ----------------------------------------------------------------- commit 04c1f70d0bf9d40b370c83248e5bce1e11947dbe Merge: 4ff6905 c023275 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 14 20:23:40 2015 +0200 Merge remote-tracking branch 'origin/master' into core89 ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. c02327515412b1b3ffe147275623b8475fe03b1c
by git＠ipfire.org 14 Apr '15

14 Apr '15

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 c02327515412b1b3ffe147275623b8475fe03b1c (commit) from 6e8f58bf709b2bc7f381a648a88ce44dd4f23eed (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 c02327515412b1b3ffe147275623b8475fe03b1c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 14 20:06:19 2015 +0200 Update translations ----------------------------------------------------------------------- Summary of changes: doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 3 +++ doc/language_issues.fr | 3 +++ doc/language_issues.nl | 3 +++ doc/language_issues.pl | 3 +++ doc/language_issues.ru | 3 +++ doc/language_issues.tr | 3 +++ doc/language_missings | 8 ++++++++ langs/de/cgi-bin/de.pl | 4 ++-- langs/en/cgi-bin/en.pl | 2 +- 11 files changed, 31 insertions(+), 3 deletions(-) Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index e41f48b..8274818 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -639,3 +639,4 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: show tls-auth key +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.en b/doc/language_issues.en index 290da02..dc03328 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -669,3 +669,4 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.es b/doc/language_issues.es index c93d40c..d44ab4c 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1030,6 +1030,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.fr b/doc/language_issues.fr index c1dedc5..0bf0f86 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1041,6 +1041,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 859cc1f..3d84788 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -747,3 +747,6 @@ WARNING: untranslated string: source ip country WARNING: untranslated string: ta key WARNING: untranslated string: upload dh key WARNING: untranslated string: vendor +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.pl b/doc/language_issues.pl index c93d40c..d44ab4c 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1030,6 +1030,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 17e3199..c9b47c1 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1019,6 +1019,9 @@ WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 0ebd398..5eff2dd 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -675,3 +675,6 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: vpn statistic n2n +WARNING: untranslated string: vpn statistic rw +WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_missings b/doc/language_missings index 05798b9..0d73d2a 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -509,6 +509,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < wlanap access point < wlanap channel < wlanap country @@ -1079,6 +1081,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < wlanap country < wlan client < wlan client advanced settings @@ -1604,6 +1608,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < wlanap country < wlan client < wlan client advanced settings @@ -2134,6 +2140,8 @@ < vendor < visit us at < vpn keyexchange +< vpn statistic n2n +< vpn statistic rw < week-graph < wlanap country < wlan client diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 859c8d3..fe4a200 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2573,9 +2573,9 @@ 'vpn payload compression' => 'Datennutzlast-Kompression aushandeln', 'vpn red name' => 'Öffentliche IP oder FQDN für das rote Interface oder <%defaultroute>', 'vpn remote id' => 'Remote ID', -'vpn subjectaltname' => 'Subjekt Alternativer Name', -'vpn statistic rw' => 'OpenVPN-Roadwarrior-Statistik', 'vpn statistic n2n' => 'OpenVPN-Netz-zu-Netz-Statistik', +'vpn statistic rw' => 'OpenVPN-Roadwarrior-Statistik', +'vpn subjectaltname' => 'Subjekt Alternativer Name', 'vpn vhost' => 'Roadwarrior virtuelle IP (manchmal auch Inner-IP genannt)', 'vpn watch' => 'Netz-zu-Netz VPN neu starten, wenn sich Remote-IP ändert (DynDNS).', 'waiting to synchronize clock' => 'Bitte warten, die Uhr wird synchronisiert', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 6a9a983..174300e 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2615,8 +2615,8 @@ 'vpn payload compression' => 'Negotiate payload compression', 'vpn red name' => 'Public IP or FQDN for RED interface or <%defaultroute>', 'vpn remote id' => 'Remote ID', -'vpn statistic rw' => 'OpenVPN Roadwarrior Statistics', 'vpn statistic n2n' => 'OpenVPN Net-to-Net Statistics', +'vpn statistic rw' => 'OpenVPN Roadwarrior Statistics', 'vpn subjectaltname' => 'Subject Alt Name', 'vpn vhost' => 'Roadwarrior virtual IP (sometimes called Inner-IP)', 'vpn watch' => 'Restart net-to-net vpn when remote peer IP changes (dyndns).', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 6e8f58bf709b2bc7f381a648a88ce44dd4f23eed
by git＠ipfire.org 14 Apr '15

14 Apr '15

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 6e8f58bf709b2bc7f381a648a88ce44dd4f23eed (commit) from 2f075ff8cfd3ff9c169a878a769f351b75d84f67 (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 6e8f58bf709b2bc7f381a648a88ce44dd4f23eed Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 14 20:05:32 2015 +0200 vpn-stats: Use more descriptive menu entry names ----------------------------------------------------------------------- Summary of changes: config/menu/20-status.menu | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu index 802885e..2bcf0d5 100644 --- a/config/menu/20-status.menu +++ b/config/menu/20-status.menu @@ -41,15 +41,15 @@ 'enabled' => 1, }; $substatus->{'53.networkovpn'} = { - 'caption' => "$Lang::tr{'openvpn client'}", + 'caption' => "$Lang::tr{'vpn statistic rw'}", 'uri' => '/cgi-bin/netovpnrw.cgi', - 'title' => "$Lang::tr{'openvpn client'}", + 'title' => "$Lang::tr{'vpn statistic rw'}", 'enabled' => 1, }; $substatus->{'54.networkovpnsrv'} = { - 'caption' => "$Lang::tr{'openvpn server'}", + 'caption' => "$Lang::tr{'vpn statistic n2n'}", 'uri' => '/cgi-bin/netovpnsrv.cgi', - 'title' => "$Lang::tr{'openvpn server'}", + 'title' => "$Lang::tr{'vpn statistics n2n'}", 'enabled' => 1, }; $substatus->{'60.hardwaregraphs'} = { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 65f2c9bb3940fab663248f81aae2161a3d1e13a5
by git＠ipfire.org 14 Apr '15

14 Apr '15

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 65f2c9bb3940fab663248f81aae2161a3d1e13a5 (commit) via 0778b991c9e9a12ab4eee66c5846d56a708a5418 (commit) via 2f075ff8cfd3ff9c169a878a769f351b75d84f67 (commit) via 7dfcaef067115be24633f300ef76461ebc2b29c1 (commit) from 758d959652ee8fbc018b04d75624ec61ed64e227 (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 65f2c9bb3940fab663248f81aae2161a3d1e13a5 Merge: 0778b99 2f075ff Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 14 17:59:21 2015 +0200 Merge remote-tracking branch 'origin/master' into next commit 0778b991c9e9a12ab4eee66c5846d56a708a5418 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 14 10:27:17 2015 +0200 start core90. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/87 => core/90}/exclude | 0 .../{oldcore/77 => core/90}/filelists/apache2 | 0 .../90}/filelists/armv5tel/linux-kirkwood | 0 .../87 => core/90}/filelists/armv5tel/linux-multi | 0 .../87 => core/90}/filelists/armv5tel/linux-rpi | 0 .../{oldcore/71 => core/90}/filelists/curl | 0 .../{oldcore/77 => core/90}/filelists/cyrus-sasl | 0 .../{oldcore/66 => core/90}/filelists/dhcp | 0 .../{oldcore/44 => core/90}/filelists/dhcpcd | 0 .../{oldcore/87 => core/90}/filelists/dracut | 0 config/rootfiles/core/90/filelists/expat | 1 + config/rootfiles/core/90/filelists/files | 7 ++++ config/rootfiles/core/90/filelists/groff | 1 + .../{oldcore/66 => core/90}/filelists/i586/acpid | 0 .../{oldcore/87 => core/90}/filelists/i586/linux | 0 .../87 => core/90}/filelists/i586/linux-initrd | 0 .../{oldcore/82 => core/90}/filelists/iputils | 0 .../{oldcore/70 => core/90}/filelists/libjpeg | 0 config/rootfiles/core/90/filelists/logrotate | 1 + .../{oldcore/61 => core/90}/filelists/logwatch | 0 .../{oldcore/87 => core/90}/filelists/openssl | 0 .../{oldcore/87 => core/90}/filelists/strongswan | 0 .../{oldcore/77 => core/90}/filelists/udev | 0 .../87 => core/90}/filelists/wpa_supplicant | 0 config/rootfiles/{oldcore/87 => core/90}/meta | 0 config/rootfiles/{oldcore/87 => core/90}/update.sh | 44 ++-------------------- html/cgi-bin/netovpnrw.cgi | 4 +- html/cgi-bin/ovpnmain.cgi | 8 +++- make.sh | 4 +- 29 files changed, 25 insertions(+), 45 deletions(-) copy config/rootfiles/{oldcore/87 => core/90}/exclude (100%) copy config/rootfiles/{oldcore/77 => core/90}/filelists/apache2 (100%) copy config/rootfiles/{oldcore/87 => core/90}/filelists/armv5tel/linux-kirkwood (100%) copy config/rootfiles/{oldcore/87 => core/90}/filelists/armv5tel/linux-multi (100%) copy config/rootfiles/{oldcore/87 => core/90}/filelists/armv5tel/linux-rpi (100%) copy config/rootfiles/{oldcore/71 => core/90}/filelists/curl (100%) copy config/rootfiles/{oldcore/77 => core/90}/filelists/cyrus-sasl (100%) copy config/rootfiles/{oldcore/66 => core/90}/filelists/dhcp (100%) copy config/rootfiles/{oldcore/44 => core/90}/filelists/dhcpcd (100%) copy config/rootfiles/{oldcore/87 => core/90}/filelists/dracut (100%) create mode 120000 config/rootfiles/core/90/filelists/expat create mode 100644 config/rootfiles/core/90/filelists/files create mode 120000 config/rootfiles/core/90/filelists/groff copy config/rootfiles/{oldcore/66 => core/90}/filelists/i586/acpid (100%) copy config/rootfiles/{oldcore/87 => core/90}/filelists/i586/linux (100%) copy config/rootfiles/{oldcore/87 => core/90}/filelists/i586/linux-initrd (100%) copy config/rootfiles/{oldcore/82 => core/90}/filelists/iputils (100%) copy config/rootfiles/{oldcore/70 => core/90}/filelists/libjpeg (100%) create mode 120000 config/rootfiles/core/90/filelists/logrotate copy config/rootfiles/{oldcore/61 => core/90}/filelists/logwatch (100%) copy config/rootfiles/{oldcore/87 => core/90}/filelists/openssl (100%) copy config/rootfiles/{oldcore/87 => core/90}/filelists/strongswan (100%) copy config/rootfiles/{oldcore/77 => core/90}/filelists/udev (100%) copy config/rootfiles/{oldcore/87 => core/90}/filelists/wpa_supplicant (100%) copy config/rootfiles/{oldcore/87 => core/90}/meta (100%) copy config/rootfiles/{oldcore/87 => core/90}/update.sh (87%) Difference in files: diff --git a/config/rootfiles/core/90/exclude b/config/rootfiles/core/90/exclude new file mode 100644 index 0000000..5be5371 --- /dev/null +++ b/config/rootfiles/core/90/exclude @@ -0,0 +1,26 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/rc.d/rcsysinit.d/S19checkfstab +etc/rc.d/rcsysinit.d/S70console +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/modules +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/time +var/ipfire/ovpn/ccd.conf +var/ipfire/ovpn/ccdroute +var/ipfire/ovpn/ccdroute2 +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/90/filelists/apache2 b/config/rootfiles/core/90/filelists/apache2 new file mode 120000 index 0000000..eef95ef --- /dev/null +++ b/config/rootfiles/core/90/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/90/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/core/90/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/armv5tel/linux-multi b/config/rootfiles/core/90/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/core/90/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/armv5tel/linux-rpi b/config/rootfiles/core/90/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/core/90/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/curl b/config/rootfiles/core/90/filelists/curl new file mode 120000 index 0000000..4b84bef --- /dev/null +++ b/config/rootfiles/core/90/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/cyrus-sasl b/config/rootfiles/core/90/filelists/cyrus-sasl new file mode 120000 index 0000000..bb51b4c --- /dev/null +++ b/config/rootfiles/core/90/filelists/cyrus-sasl @@ -0,0 +1 @@ +../../../common/cyrus-sasl \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/dhcp b/config/rootfiles/core/90/filelists/dhcp new file mode 120000 index 0000000..32d8da4 --- /dev/null +++ b/config/rootfiles/core/90/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/dhcpcd b/config/rootfiles/core/90/filelists/dhcpcd new file mode 120000 index 0000000..1e799da --- /dev/null +++ b/config/rootfiles/core/90/filelists/dhcpcd @@ -0,0 +1 @@ +../../../common/dhcpcd \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/dracut b/config/rootfiles/core/90/filelists/dracut new file mode 120000 index 0000000..1608699 --- /dev/null +++ b/config/rootfiles/core/90/filelists/dracut @@ -0,0 +1 @@ +../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/expat b/config/rootfiles/core/90/filelists/expat new file mode 120000 index 0000000..e1923cf --- /dev/null +++ b/config/rootfiles/core/90/filelists/expat @@ -0,0 +1 @@ +../../../common/expat \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files new file mode 100644 index 0000000..2ef5ded --- /dev/null +++ b/config/rootfiles/core/90/filelists/files @@ -0,0 +1,7 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/network-trigger +etc/rc.d/rcsysinit.d/S90network-trigger +usr/lib/firewall/rules.pl +var/ipfire/backup/include +var/ipfire/langs diff --git a/config/rootfiles/core/90/filelists/groff b/config/rootfiles/core/90/filelists/groff new file mode 120000 index 0000000..232291e --- /dev/null +++ b/config/rootfiles/core/90/filelists/groff @@ -0,0 +1 @@ +../../../common/groff \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/acpid b/config/rootfiles/core/90/filelists/i586/acpid new file mode 120000 index 0000000..21d36ee --- /dev/null +++ b/config/rootfiles/core/90/filelists/i586/acpid @@ -0,0 +1 @@ +../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/linux b/config/rootfiles/core/90/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/core/90/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/linux-initrd b/config/rootfiles/core/90/filelists/i586/linux-initrd new file mode 120000 index 0000000..32a03e6 --- /dev/null +++ b/config/rootfiles/core/90/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/iputils b/config/rootfiles/core/90/filelists/iputils new file mode 120000 index 0000000..361c28f --- /dev/null +++ b/config/rootfiles/core/90/filelists/iputils @@ -0,0 +1 @@ +../../../common/iputils \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/libjpeg b/config/rootfiles/core/90/filelists/libjpeg new file mode 120000 index 0000000..3b1a782 --- /dev/null +++ b/config/rootfiles/core/90/filelists/libjpeg @@ -0,0 +1 @@ +../../../common/libjpeg \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/logrotate b/config/rootfiles/core/90/filelists/logrotate new file mode 120000 index 0000000..bc192c0 --- /dev/null +++ b/config/rootfiles/core/90/filelists/logrotate @@ -0,0 +1 @@ +../../../common/logrotate \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/logwatch b/config/rootfiles/core/90/filelists/logwatch new file mode 120000 index 0000000..f14eabd --- /dev/null +++ b/config/rootfiles/core/90/filelists/logwatch @@ -0,0 +1 @@ +../../../common/logwatch \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/openssl b/config/rootfiles/core/90/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/90/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/strongswan b/config/rootfiles/core/90/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/90/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/udev b/config/rootfiles/core/90/filelists/udev new file mode 120000 index 0000000..e967a1c --- /dev/null +++ b/config/rootfiles/core/90/filelists/udev @@ -0,0 +1 @@ +../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/wpa_supplicant b/config/rootfiles/core/90/filelists/wpa_supplicant new file mode 120000 index 0000000..1d04c03 --- /dev/null +++ b/config/rootfiles/core/90/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/90/meta b/config/rootfiles/core/90/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/90/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh new file mode 100644 index 0000000..6af052c --- /dev/null +++ b/config/rootfiles/core/90/update.sh @@ -0,0 +1,248 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + + +function find_device() { + local mountpoint="${1}" + + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + + # Get the actual device from the partition that holds / + while [ -n "${root}" ]; do + if [ -e "/sys/block/${root}" ]; then + echo "${root}" + return 0 + fi + + # Remove last character + root="${root::-1}" + done + + return 1 +} + + +# +# Remove old core updates from pakfire cache to save space... +core=90 +for (( i=1; i<=${core}; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Do some sanity checks. +case $(uname -r) in + *-ipfire-versatile ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. versatile support is dropped." + # Report no error to pakfire. So it does not try to install it again. + exit 0 + ;; + *-ipfire* ) + # Ok. + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. No IPFire Kernel." + exit 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update because not enough free space on root." + exit 2 +fi + + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules, dtb's ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +case "$(uname -m)" in + armv*) + # Backup uEnv.txt if exist + if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org + fi + + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + mkdir -pv /boot/dtb-$KVER-ipfire-multi + ;; +esac + +# +#Stop services +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop +/etc/init.d/apache stop + +# +#Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." + /etc/init.d/apache start + exit 4 + ;; + esac +fi + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# +# Start services +# +/etc/init.d/apache start +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +case "$(uname -m)" in + i?86) + case "$(find_device "/")" in + xvd* ) + echo Skip remove grub2 files, because pygrub fail. + rm -f /boot/grub/* + echo config will recreated by linux-pae install. + ;; + * ) + # + # Update to GRUB2 config + # + grub-mkconfig > /boot/grub/grub.cfg + ;; + esac +esac + +# Force (re)install pae kernel if pae is supported +rm -rf /opt/pakfire/db/*/meta-linux-pae +if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae + fi +fi + +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# +#Finish +( + /etc/init.d/fireinfo start + sendprofile +) >/dev/null 2>&1 & + +echo +echo Please wait until pakfire has ended... +echo + +# Don't report the exitcode last command +exit 0 + diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi index fed6d4d..cae7770 100755 --- a/html/cgi-bin/netovpnrw.cgi +++ b/html/cgi-bin/netovpnrw.cgi @@ -20,7 +20,7 @@ ############################################################################### use strict; - +use URI::Escape; # enable only the following on debugging purpose #use warnings; #use CGI::Carp 'fatalsToBrowser'; @@ -37,7 +37,7 @@ my %mainsettings = (); my @vpns=(); -my @querry = split(/\?/,$ENV{'QUERY_STRING'}); +my @querry = split(/\?/,uri_unescape($ENV{'QUERY_STRING'})); $querry[0] = '' unless defined $querry[0]; $querry[1] = 'week' unless defined $querry[1]; diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index d36a49e..6bf7b2b 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -3197,7 +3197,6 @@ END @firen2nconf = <FILE>; close (FILE); chomp(@firen2nconf); - } else { $errormessage = "Filecount does not match only 2 files are allowed\n"; @@ -3238,6 +3237,13 @@ END unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";} unless(-d "${General::swroot}/ovpn/n2nconf/$n2nname[0]"){mkdir "${General::swroot}/ovpn/n2nconf/$n2nname[0]", 0770 or die "Unable to create dir $!";} + #Add collectd settings to configfile + open(FILE, ">> $tempdir/$uplconffilename") or die 'Unable to open config file.'; + print FILE "# Logfile\n"; + print FILE "status-version 1\n"; + print FILE "status /var/run/openvpn/$n2nname[0]-n2n 10\n"; + close FILE; + move("$tempdir/$uplconffilename", "${General::swroot}/ovpn/n2nconf/$n2nname[0]/$uplconffilename2"); if ($? ne 0) { diff --git a/make.sh b/make.sh index 0326a90..316917e 100755 --- a/make.sh +++ b/make.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org>. # # # ############################################################################ # @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.17" # Version number -CORE="89" # Core Level (Filename) +CORE="90" # Core Level (Filename) PAKFIRE_CORE="89" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core89, updated. 4ff690565404a4afe9cc0eec66425303c500d140
by git＠ipfire.org 14 Apr '15

14 Apr '15

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, core89 has been updated via 4ff690565404a4afe9cc0eec66425303c500d140 (commit) via 2f075ff8cfd3ff9c169a878a769f351b75d84f67 (commit) via 7dfcaef067115be24633f300ef76461ebc2b29c1 (commit) via daf34294f233a414cd14d08b1269b8192b591096 (commit) via 18bbd71bdcc95b7f335061aa22e61c39df912e8c (commit) via 8d679040b7798330441c470ae361ec67db00b635 (commit) via 5c5b4000b9053d8bf993d5d0a87393f7540786c9 (commit) via 9aeac09636461df05f2423b65f7e0dc476eb0eb9 (commit) via 01c82dbaa325336698b3c826ba0ba451b90eefe0 (commit) from f379cee0b4240df34b842afa22dbcf038ec0e858 (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 4ff690565404a4afe9cc0eec66425303c500d140 Merge: f379cee 2f075ff Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 14 17:52:57 2015 +0200 Merge remote-tracking branch 'origin/master' into core89 ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/89/update.sh | 21 +++++++++ html/cgi-bin/netovpnrw.cgi | 6 +-- html/cgi-bin/netovpnsrv.cgi | 2 +- html/cgi-bin/ovpnmain.cgi | 8 +++- src/patches/collectd/silence-openvpn-errors.patch | 55 ++++++++++++++++++++++- 5 files changed, 85 insertions(+), 7 deletions(-) Difference in files: diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh index c94a1c8..d98fe7e 100644 --- a/config/rootfiles/core/89/update.sh +++ b/config/rootfiles/core/89/update.sh @@ -68,10 +68,31 @@ rm -f \ /opt/pakfire/db/*/meta-sqlite \ /opt/pakfire/db/rootfiles/sqlite +mkdir -p /var/run/openvpn +touch /var/run/ovpnserver.log +chown nobody.nobody \ + /var/run/openvpn \ + /var/run/ovpnserver.log + # Update OpenVPN/collectd configuration +files=`find /var/ipfire/ovpn/n2nconf/ -type d` +for i in $files; +do + if ! grep -q "status-version" $i/${i##*/}.conf; then + echo "# Logfile" >> $i/${i##*/}.conf + echo "status-version 1" >> $i/${i##*/}.conf + fi + if ! grep -q "status " $i/${i##*/}.conf; then + echo "status /var/run/openvpn/${i##*/}-n2n 10" >> $i/${i##*/}.conf + fi +done + /usr/sbin/ovpn-collectd-convert chown nobody.nobody /var/ipfire/ovpn/collectd.vpn +# Fix permissions +chown nobody.nobody /var/ipfire/dns + # Fix #10625 mkdir -p /etc/logrotate.d diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi index e0b1148..cae7770 100755 --- a/html/cgi-bin/netovpnrw.cgi +++ b/html/cgi-bin/netovpnrw.cgi @@ -20,7 +20,7 @@ ############################################################################### use strict; - +use URI::Escape; # enable only the following on debugging purpose #use warnings; #use CGI::Carp 'fatalsToBrowser'; @@ -37,7 +37,7 @@ my %mainsettings = (); my @vpns=(); -my @querry = split(/\?/,$ENV{'QUERY_STRING'}); +my @querry = split(/\?/,uri_unescape($ENV{'QUERY_STRING'})); $querry[0] = '' unless defined $querry[0]; $querry[1] = 'week' unless defined $querry[1]; @@ -59,7 +59,7 @@ if ( $querry[0] ne "" && $querry[0] ne "UNDEF"){ if(@vpns){ foreach (@vpns) { &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}"); - &Graphs::makegraphbox("netovpnrw.cgi",$_,"week"); + &Graphs::makegraphbox("netovpnrw.cgi",$_, "day"); &Header::closebox(); } }else{ diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi index f843462..ddf4177 100755 --- a/html/cgi-bin/netovpnsrv.cgi +++ b/html/cgi-bin/netovpnsrv.cgi @@ -59,7 +59,7 @@ if ( $querry[0] ne ""){ if (@vpns){ foreach (@vpns) { &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}"); - &Graphs::makegraphbox("netovpnsrv.cgi",$_,"week"); + &Graphs::makegraphbox("netovpnsrv.cgi",$_, "day"); &Header::closebox(); } }else{ diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 7ca62de..ece528a 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -3197,7 +3197,6 @@ END @firen2nconf = <FILE>; close (FILE); chomp(@firen2nconf); - } else { $errormessage = "Filecount does not match only 2 files are allowed\n"; @@ -3238,6 +3237,13 @@ END unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";} unless(-d "${General::swroot}/ovpn/n2nconf/$n2nname[0]"){mkdir "${General::swroot}/ovpn/n2nconf/$n2nname[0]", 0770 or die "Unable to create dir $!";} + #Add collectd settings to configfile + open(FILE, ">> $tempdir/$uplconffilename") or die 'Unable to open config file.'; + print FILE "# Logfile\n"; + print FILE "status-version 1\n"; + print FILE "status /var/run/openvpn/$n2nname[0]-n2n 10\n"; + close FILE; + move("$tempdir/$uplconffilename", "${General::swroot}/ovpn/n2nconf/$n2nname[0]/$uplconffilename2"); if ($? ne 0) { diff --git a/src/patches/collectd/silence-openvpn-errors.patch b/src/patches/collectd/silence-openvpn-errors.patch index c909761..c258486 100644 --- a/src/patches/collectd/silence-openvpn-errors.patch +++ b/src/patches/collectd/silence-openvpn-errors.patch @@ -1,8 +1,28 @@ diff --git a/src/openvpn.c b/src/openvpn.c -index d446e9957b68..cc33eed61e25 100644 +index d446e9957b68..ef5bf1078285 100644 --- a/src/openvpn.c +++ b/src/openvpn.c -@@ -567,7 +567,7 @@ static int openvpn_read (void) +@@ -70,6 +70,7 @@ static const char *config_keys[] = + }; + static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); + ++static int version_detect (const char *filename); + + /* Helper function + * copy-n-pasted from common.c - changed delim to "," */ +@@ -540,6 +541,11 @@ static int openvpn_read (void) + continue; + } + ++ // If the version was not detected yet, we try to guess again ++ if (vpn_list[i]->version == 0) { ++ vpn_list[i]->version = version_detect(vpn_list[i]->file); ++ } ++ + switch (vpn_list[i]->version) + { + case SINGLE: +@@ -567,7 +573,7 @@ static int openvpn_read (void) read += vpn_read; } @@ -11,3 +31,34 @@ index d446e9957b68..cc33eed61e25 100644 } /* int openvpn_read */ static int version_detect (const char *filename) +@@ -630,16 +636,6 @@ static int version_detect (const char *filename) + } + } + +- if (version == 0) +- { +- /* This is only reached during configuration, so complaining to +- * the user is in order. */ +- NOTICE ("openvpn plugin: %s: Unknown file format, please " +- "report this as bug. Make sure to include " +- "your status file, so the plugin can " +- "be adapted.", filename); +- } +- + fclose (fh); + + return version; +@@ -656,13 +652,6 @@ static int openvpn_config (const char *key, const char *value) + /* try to detect the status file format */ + status_version = version_detect (value); + +- if (status_version == 0) +- { +- WARNING ("openvpn plugin: unable to detect status version, \ +- discarding status file \"%s\".", value); +- return (1); +- } +- + status_file = sstrdup (value); + if (status_file == NULL) + { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2f075ff8cfd3ff9c169a878a769f351b75d84f67
by git＠ipfire.org 14 Apr '15

14 Apr '15

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 2f075ff8cfd3ff9c169a878a769f351b75d84f67 (commit) via 7dfcaef067115be24633f300ef76461ebc2b29c1 (commit) from daf34294f233a414cd14d08b1269b8192b591096 (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 2f075ff8cfd3ff9c169a878a769f351b75d84f67 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Mon Apr 13 16:26:48 2015 +0200 vpn-statistic: add URI::escape for openvpn names with special chars commit 7dfcaef067115be24633f300ef76461ebc2b29c1 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Apr 14 11:53:28 2015 +0200 vpn-statistic: add collectd parameters to imported n2n packages ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/netovpnrw.cgi | 4 ++-- html/cgi-bin/ovpnmain.cgi | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) Difference in files: diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi index fed6d4d..cae7770 100755 --- a/html/cgi-bin/netovpnrw.cgi +++ b/html/cgi-bin/netovpnrw.cgi @@ -20,7 +20,7 @@ ############################################################################### use strict; - +use URI::Escape; # enable only the following on debugging purpose #use warnings; #use CGI::Carp 'fatalsToBrowser'; @@ -37,7 +37,7 @@ my %mainsettings = (); my @vpns=(); -my @querry = split(/\?/,$ENV{'QUERY_STRING'}); +my @querry = split(/\?/,uri_unescape($ENV{'QUERY_STRING'})); $querry[0] = '' unless defined $querry[0]; $querry[1] = 'week' unless defined $querry[1]; diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 7ca62de..ece528a 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -3197,7 +3197,6 @@ END @firen2nconf = <FILE>; close (FILE); chomp(@firen2nconf); - } else { $errormessage = "Filecount does not match only 2 files are allowed\n"; @@ -3238,6 +3237,13 @@ END unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";} unless(-d "${General::swroot}/ovpn/n2nconf/$n2nname[0]"){mkdir "${General::swroot}/ovpn/n2nconf/$n2nname[0]", 0770 or die "Unable to create dir $!";} + #Add collectd settings to configfile + open(FILE, ">> $tempdir/$uplconffilename") or die 'Unable to open config file.'; + print FILE "# Logfile\n"; + print FILE "status-version 1\n"; + print FILE "status /var/run/openvpn/$n2nname[0]-n2n 10\n"; + close FILE; + move("$tempdir/$uplconffilename", "${General::swroot}/ovpn/n2nconf/$n2nname[0]/$uplconffilename2"); if ($? ne 0) { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 758d959652ee8fbc018b04d75624ec61ed64e227
by git＠ipfire.org 14 Apr '15

14 Apr '15

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 758d959652ee8fbc018b04d75624ec61ed64e227 (commit) via daf34294f233a414cd14d08b1269b8192b591096 (commit) via 18bbd71bdcc95b7f335061aa22e61c39df912e8c (commit) via 8d679040b7798330441c470ae361ec67db00b635 (commit) via 5c5b4000b9053d8bf993d5d0a87393f7540786c9 (commit) via 9aeac09636461df05f2423b65f7e0dc476eb0eb9 (commit) via 01c82dbaa325336698b3c826ba0ba451b90eefe0 (commit) from 96737543858a2d78d61da981dd10c5e9a3b671a4 (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 758d959652ee8fbc018b04d75624ec61ed64e227 Merge: 9673754 daf3429 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Apr 13 17:11:41 2015 +0200 Merge remote-tracking branch 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/89/update.sh | 21 +++++++++ html/cgi-bin/netovpnrw.cgi | 2 +- html/cgi-bin/netovpnsrv.cgi | 2 +- src/patches/collectd/silence-openvpn-errors.patch | 55 ++++++++++++++++++++++- 4 files changed, 76 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh index 832feaa..90a6d77 100644 --- a/config/rootfiles/core/89/update.sh +++ b/config/rootfiles/core/89/update.sh @@ -68,10 +68,31 @@ rm -f \ /opt/pakfire/db/*/meta-sqlite \ /opt/pakfire/db/rootfiles/sqlite +mkdir -p /var/run/openvpn +touch /var/run/ovpnserver.log +chown nobody.nobody \ + /var/run/openvpn \ + /var/run/ovpnserver.log + # Update OpenVPN/collectd configuration +files=`find /var/ipfire/ovpn/n2nconf/ -type d` +for i in $files; +do + if ! grep -q "status-version" $i/${i##*/}.conf; then + echo "# Logfile" >> $i/${i##*/}.conf + echo "status-version 1" >> $i/${i##*/}.conf + fi + if ! grep -q "status " $i/${i##*/}.conf; then + echo "status /var/run/openvpn/${i##*/}-n2n 10" >> $i/${i##*/}.conf + fi +done + /usr/sbin/ovpn-collectd-convert chown nobody.nobody /var/ipfire/ovpn/collectd.vpn +# Fix permissions +chown nobody.nobody /var/ipfire/dns + # Fix #10625 mkdir -p /etc/logrotate.d diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi index e0b1148..fed6d4d 100755 --- a/html/cgi-bin/netovpnrw.cgi +++ b/html/cgi-bin/netovpnrw.cgi @@ -59,7 +59,7 @@ if ( $querry[0] ne "" && $querry[0] ne "UNDEF"){ if(@vpns){ foreach (@vpns) { &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}"); - &Graphs::makegraphbox("netovpnrw.cgi",$_,"week"); + &Graphs::makegraphbox("netovpnrw.cgi",$_, "day"); &Header::closebox(); } }else{ diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi index f843462..ddf4177 100755 --- a/html/cgi-bin/netovpnsrv.cgi +++ b/html/cgi-bin/netovpnsrv.cgi @@ -59,7 +59,7 @@ if ( $querry[0] ne ""){ if (@vpns){ foreach (@vpns) { &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}"); - &Graphs::makegraphbox("netovpnsrv.cgi",$_,"week"); + &Graphs::makegraphbox("netovpnsrv.cgi",$_, "day"); &Header::closebox(); } }else{ diff --git a/src/patches/collectd/silence-openvpn-errors.patch b/src/patches/collectd/silence-openvpn-errors.patch index c909761..c258486 100644 --- a/src/patches/collectd/silence-openvpn-errors.patch +++ b/src/patches/collectd/silence-openvpn-errors.patch @@ -1,8 +1,28 @@ diff --git a/src/openvpn.c b/src/openvpn.c -index d446e9957b68..cc33eed61e25 100644 +index d446e9957b68..ef5bf1078285 100644 --- a/src/openvpn.c +++ b/src/openvpn.c -@@ -567,7 +567,7 @@ static int openvpn_read (void) +@@ -70,6 +70,7 @@ static const char *config_keys[] = + }; + static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); + ++static int version_detect (const char *filename); + + /* Helper function + * copy-n-pasted from common.c - changed delim to "," */ +@@ -540,6 +541,11 @@ static int openvpn_read (void) + continue; + } + ++ // If the version was not detected yet, we try to guess again ++ if (vpn_list[i]->version == 0) { ++ vpn_list[i]->version = version_detect(vpn_list[i]->file); ++ } ++ + switch (vpn_list[i]->version) + { + case SINGLE: +@@ -567,7 +573,7 @@ static int openvpn_read (void) read += vpn_read; } @@ -11,3 +31,34 @@ index d446e9957b68..cc33eed61e25 100644 } /* int openvpn_read */ static int version_detect (const char *filename) +@@ -630,16 +636,6 @@ static int version_detect (const char *filename) + } + } + +- if (version == 0) +- { +- /* This is only reached during configuration, so complaining to +- * the user is in order. */ +- NOTICE ("openvpn plugin: %s: Unknown file format, please " +- "report this as bug. Make sure to include " +- "your status file, so the plugin can " +- "be adapted.", filename); +- } +- + fclose (fh); + + return version; +@@ -656,13 +652,6 @@ static int openvpn_config (const char *key, const char *value) + /* try to detect the status file format */ + status_version = version_detect (value); + +- if (status_version == 0) +- { +- WARNING ("openvpn plugin: unable to detect status version, \ +- discarding status file \"%s\".", value); +- return (1); +- } +- + status_file = sstrdup (value); + if (status_file == NULL) + { hooks/post-receive -- IPFire 2.x development tree

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM April 2015