IPFire-SCM October 2013

ipfire-scm@lists.ipfire.org

1 participants
58 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2d685e1d4c4959ef6a85c285e9f952b713527d50
by git＠ipfire.org 03 Oct '13

03 Oct '13

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 2d685e1d4c4959ef6a85c285e9f952b713527d50 (commit) from 03caa87399b5143e85a06d908bedc99d1c6b41d4 (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 2d685e1d4c4959ef6a85c285e9f952b713527d50 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 3 14:22:59 2013 +0200 core73: Add wirelessclient.cgi. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/73/filelists/files | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/core/73/filelists/files b/config/rootfiles/core/73/filelists/files index 4c393d9..6df851e 100644 --- a/config/rootfiles/core/73/filelists/files +++ b/config/rootfiles/core/73/filelists/files @@ -5,6 +5,7 @@ etc/rc.d/init.d/squid srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/routing.cgi +srv/web/ipfire/cgi-bin/wirelessclient.cgi srv/web/ipfire/html/redirect.cgi srv/web/ipfire/html/redirect-templates/ var/ipfire/header.pl hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 03caa87399b5143e85a06d908bedc99d1c6b41d4
by git＠ipfire.org 03 Oct '13

03 Oct '13

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 03caa87399b5143e85a06d908bedc99d1c6b41d4 (commit) via f34844355bf8ce1c5239301fedc98f38ba765d5e (commit) from d48969312e45efcde69c7bbcb5d93710f73f53a6 (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 03caa87399b5143e85a06d908bedc99d1c6b41d4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 3 14:20:32 2013 +0200 Update language issues. commit f34844355bf8ce1c5239301fedc98f38ba765d5e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 3 14:19:38 2013 +0200 wirelessclient.cgi: Add help for priority. Fixes #10428. ----------------------------------------------------------------------- Summary of changes: doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 4 ++++ doc/language_issues.fr | 4 ++++ doc/language_issues.nl | 4 ++++ doc/language_issues.pl | 4 ++++ doc/language_issues.ru | 4 ++++ doc/language_issues.tr | 4 ++++ doc/language_missings | 20 ++++++++++++++++++++ html/cgi-bin/wirelessclient.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ 12 files changed, 52 insertions(+), 2 deletions(-) Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index bbe5e1d..07d7c7c 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -406,6 +406,7 @@ WARNING: translation string unused: to email adr WARNING: translation string unused: to install an update WARNING: translation string unused: to warn email bad WARNING: translation string unused: too long 80 char max +WARNING: translation string unused: tor 0 = disabled WARNING: translation string unused: tor accounting period daily WARNING: translation string unused: tor accounting period monthly WARNING: translation string unused: tor accounting period weekly diff --git a/doc/language_issues.en b/doc/language_issues.en index 1248957..7bdf4ca 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -437,6 +437,7 @@ WARNING: translation string unused: to email adr WARNING: translation string unused: to install an update WARNING: translation string unused: to warn email bad WARNING: translation string unused: too long 80 char max +WARNING: translation string unused: tor 0 = disabled WARNING: translation string unused: tor accounting period daily WARNING: translation string unused: tor accounting period monthly WARNING: translation string unused: tor accounting period weekly diff --git a/doc/language_issues.es b/doc/language_issues.es index 88666b6..afe7ed6 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -574,7 +574,9 @@ WARNING: untranslated string: fireinfo why descr2 WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id +WARNING: untranslated string: least preferred WARNING: untranslated string: minute +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used @@ -643,8 +645,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 6c963ae..b62d16e 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -574,7 +574,9 @@ WARNING: untranslated string: fireinfo why descr2 WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id +WARNING: untranslated string: least preferred WARNING: untranslated string: minute +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp sync @@ -628,8 +630,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 8999404..42fedc5 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -520,6 +520,8 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: least preferred +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: qos enter bandwidths @@ -545,8 +547,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 88666b6..afe7ed6 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -574,7 +574,9 @@ WARNING: untranslated string: fireinfo why descr2 WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id +WARNING: untranslated string: least preferred WARNING: untranslated string: minute +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used @@ -643,8 +645,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 768bc12..cc5dd64 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -558,7 +558,9 @@ WARNING: untranslated string: extrahd to WARNING: untranslated string: extrahd to root WARNING: untranslated string: extrahd you cant mount WARNING: untranslated string: incoming traffic in bytes per second +WARNING: untranslated string: least preferred WARNING: untranslated string: minute +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used @@ -608,8 +610,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name diff --git a/doc/language_issues.tr b/doc/language_issues.tr index af1af7b..27ca634 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -517,6 +517,8 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: least preferred +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: route config changed @@ -541,8 +543,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name diff --git a/doc/language_missings b/doc/language_missings index 1550f47..fca3f3e 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -84,7 +84,9 @@ < fireinfo why enable < fireinfo why read more < fireinfo your profile id +< least preferred < minute +< most preferred < ntp common settings < ntp sync < openvpn default @@ -117,6 +119,7 @@ < static routes < system information < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -137,8 +140,10 @@ < tor connected relays < tor contact info < tor daemon +< tor directory port < tor enabled < tor errmsg invalid accounting limit +< tor errmsg invalid directory port < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name @@ -306,7 +311,9 @@ < fireinfo why enable < fireinfo why read more < fireinfo your profile id +< least preferred < minute +< most preferred < openvpn default < openvpn destination port used < openvpn disabled @@ -355,6 +362,7 @@ < static routes < system information < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -375,8 +383,10 @@ < tor connected relays < tor contact info < tor daemon +< tor directory port < tor enabled < tor errmsg invalid accounting limit +< tor errmsg invalid directory port < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name @@ -512,7 +522,9 @@ < extrahd unable to read < extrahd unable to write < extrahd you cant mount +< least preferred < minute +< most preferred < openvpn default < openvpn destination port used < openvpn disabled @@ -545,6 +557,7 @@ < server restart < static routes < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -565,8 +578,10 @@ < tor connected relays < tor contact info < tor daemon +< tor directory port < tor enabled < tor errmsg invalid accounting limit +< tor errmsg invalid directory port < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name @@ -709,8 +724,10 @@ < frequency < hour-graph < incoming traffic in bytes per second +< least preferred < minute < month-graph +< most preferred < openvpn default < openvpn destination port used < openvpn disabled @@ -740,6 +757,7 @@ < server restart < static routes < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -760,8 +778,10 @@ < tor connected relays < tor contact info < tor daemon +< tor directory port < tor enabled < tor errmsg invalid accounting limit +< tor errmsg invalid directory port < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi index 5ff0e2c..c6e20a0 100644 --- a/html/cgi-bin/wirelessclient.cgi +++ b/html/cgi-bin/wirelessclient.cgi @@ -499,11 +499,11 @@ sub showEditBox() { </td> <td width='40%'> <select name='PRIO'> - <option value="0" $selected{'PRIO'}{'0'}>0</option> + <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'most preferred'})</option> <option value="1" $selected{'PRIO'}{'1'}>1</option> <option value="2" $selected{'PRIO'}{'2'}>2</option> <option value="3" $selected{'PRIO'}{'3'}>3</option> - <option value="4" $selected{'PRIO'}{'4'}>4</option> + <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'least preferred'})</option> </select> </td> <td colspan="2" width='40%'></td> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index f9814d5..58dc88e 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1107,6 +1107,7 @@ 'last activity' => 'Letzte Aktivität', 'lateprompting' => 'Late prompting', 'lease expires' => 'Zuordnung verfällt', +'least preferred' => 'weniger präferiert', 'legend' => 'Legende', 'length' => 'Länge', 'line' => 'Leitung', @@ -1245,6 +1246,7 @@ 'monthly volume start day short' => 'Erste Tag', 'months' => 'Monate', 'more' => 'weitere', +'most preferred' => 'präferiert', 'mount' => 'Einbinden', 'mounted on' => 'Mounted auf', 'mpfire' => 'Media Player für IPFire', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 1c50296..94eb828 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1135,6 +1135,7 @@ 'last activity' => 'Last Activity', 'lateprompting' => 'Lateprompting', 'lease expires' => 'Lease expires', +'least preferred' => 'least preferred', 'legend' => 'Legend', 'length' => 'Length', 'line' => 'Line', @@ -1273,6 +1274,7 @@ 'monthly volume start day short' => 'First day', 'months' => 'months', 'more' => 'more', +'most preferred' => 'most preferred', 'mount' => 'Mount', 'mounted on' => 'Mounted on', 'mpfire' => 'Media Player for IPFire', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d48969312e45efcde69c7bbcb5d93710f73f53a6
by git＠ipfire.org 03 Oct '13

03 Oct '13

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 d48969312e45efcde69c7bbcb5d93710f73f53a6 (commit) via f35740ac44a9423b1bb1320c97987240bd3c7e60 (commit) via a761716f03c7eeb31fe6f53552a4e7b48da76c3c (commit) via 64aac4feb5e50e330da30555a54739cc89d1cd0e (commit) from 55904cd2b463983987f769c8dfd3691ced1d7912 (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 d48969312e45efcde69c7bbcb5d93710f73f53a6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 3 12:39:16 2013 +0200 php: Update to 5.3.27. commit f35740ac44a9423b1bb1320c97987240bd3c7e60 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 3 12:33:08 2013 +0200 core73: Add php to update. commit a761716f03c7eeb31fe6f53552a4e7b48da76c3c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 3 12:27:19 2013 +0200 php: Build sqlite2 support for PDO. commit 64aac4feb5e50e330da30555a54739cc89d1cd0e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 3 12:28:18 2013 +0200 php: Build in zip module. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/47 => core/73}/filelists/php | 0 lfs/php | 9 +++++---- 2 files changed, 5 insertions(+), 4 deletions(-) copy config/rootfiles/{oldcore/47 => core/73}/filelists/php (100%) Difference in files: diff --git a/config/rootfiles/core/73/filelists/php b/config/rootfiles/core/73/filelists/php new file mode 120000 index 0000000..1ae48d7 --- /dev/null +++ b/config/rootfiles/core/73/filelists/php @@ -0,0 +1 @@ +../../../common/php \ No newline at end of file diff --git a/lfs/php b/lfs/php index 58f442c..8139e21 100644 --- a/lfs/php +++ b/lfs/php @@ -24,7 +24,7 @@ include Config -VER = 5.3.16 +VER = 5.3.27 THISAPP = php-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -46,7 +46,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz -$(DL_FILE)_MD5 = 99cfd78531643027f60c900e792d21be +$(DL_FILE)_MD5 = 25ae23a5b9615fe8d33de5b63e1bb788 idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513 @@ -114,11 +114,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-mysql-sock=/var/run/mysql \ --with-ncurses \ --with-pdo-mysql \ - --without-pdo-sqlite \ + --with-pdo-sqlite \ --with-readline \ --enable-sockets \ --with-xsl \ - --with-iconv + --with-iconv \ + --enable-zip cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && install -v -m644 $(DIR_SRC)/config/php/php.ini /etc/php.ini hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 78403883e23271c9a7ab2bdfeeaf64cc20fd11b4
by git＠ipfire.org 02 Oct '13

02 Oct '13

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, fifteen has been updated via 78403883e23271c9a7ab2bdfeeaf64cc20fd11b4 (commit) from 5b6acb88c607b2b9a46365281e611706c0c12109 (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 78403883e23271c9a7ab2bdfeeaf64cc20fd11b4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 2 22:43:07 2013 +0200 vdr: update to 2.0.3. ----------------------------------------------------------------------- Summary of changes: lfs/vdr | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/vdr b/lfs/vdr index b1feb01..161b04e 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -24,8 +24,12 @@ include Config -VER = 2.0.1 +VER = 2.0.3 + +# VDRPLUGVER must match with APIVERSION in config.h +# after change this update also all vdr plugins VDRPLUGVER = 2.0.0 + THISAPP = vdr-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -33,7 +37,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr -PAK_VER = 7 +PAK_VER = 8 DEPS = "vdr_streamdev" @@ -61,7 +65,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e1b7a76c57c96300829dccd39eb20e7d +$(DL_FILE)_MD5 = dd8fb1642bdfa7feb0e9a8ae41e9ef2f install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 5b6acb88c607b2b9a46365281e611706c0c12109
by git＠ipfire.org 02 Oct '13

02 Oct '13

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, fifteen has been updated via 5b6acb88c607b2b9a46365281e611706c0c12109 (commit) from ad5338015f68bca7bb5987c7e44218fe21377dad (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 5b6acb88c607b2b9a46365281e611706c0c12109 Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Wed Oct 2 16:24:24 2013 +0200 Fix empty system-release. ----------------------------------------------------------------------- Summary of changes: tools/make-functions | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/tools/make-functions b/tools/make-functions index 3ff647c..48fc6d4 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -454,6 +454,7 @@ ipfiremake() { CORE=$CORE \ CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ + SYSTEM_RELEASE="$SYSTEM_RELEASE" \ CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \ CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \ CCACHE_COMPILERCHECK="none" \ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. ad5338015f68bca7bb5987c7e44218fe21377dad
by git＠ipfire.org 02 Oct '13

02 Oct '13

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, fifteen has been updated via ad5338015f68bca7bb5987c7e44218fe21377dad (commit) via f93635e375efaae2c8077d467e8811128325142b (commit) from 7f46e14b81e701cf3c37b3dd6c058942ed83b84d (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 ad5338015f68bca7bb5987c7e44218fe21377dad Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Wed Oct 2 14:39:16 2013 +0200 stage2: rootfile update. commit f93635e375efaae2c8077d467e8811128325142b Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Wed Oct 2 14:38:39 2013 +0200 memtest: update to 5.01. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/stage2 | 1 + lfs/memtest | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index da95512..04ef3f2 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -41,6 +41,7 @@ etc/resolv.conf etc/securetty etc/sysctl.conf etc/syslog.conf +etc/system-release #home home/nobody #lib diff --git a/lfs/memtest b/lfs/memtest index 4914bae..9888e53 100644 --- a/lfs/memtest +++ b/lfs/memtest @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 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 = 4.20 +VER = 5.01 THISAPP = memtest86+-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ef62c2f5be616676c8c62066dedc46b3 +$(DL_FILE)_MD5 = 43c5832baa919e1206e251e735cdee2d install : $(TARGET) @@ -71,7 +71,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && sed -i -e "s| -fno-stack-protector||g" Makefile +# cd $(DIR_APP) && sed -i -e "s| -fno-stack-protector||g" Makefile + cd $(DIR_APP) && sed -i -e "s|scp |echo |g" Makefile cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) -mkdir -p /usr/lib/memtest86+ cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 7f46e14b81e701cf3c37b3dd6c058942ed83b84d
by git＠ipfire.org 02 Oct '13

02 Oct '13

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, fifteen has been updated via 7f46e14b81e701cf3c37b3dd6c058942ed83b84d (commit) from ec36876e6ade2e04d29963d8dcfab5d5bf580a99 (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 7f46e14b81e701cf3c37b3dd6c058942ed83b84d Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Wed Oct 2 11:00:56 2013 +0200 kernel: update to 3.10.14. ----------------------------------------------------------------------- Summary of changes: lfs/linux | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index 8740d72..b188a2b 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.10.13 +VER = 3.10.14 RPI_PATCHES = linux-3.10.10-c1af7c6 -GRS_PATCHES = grsecurity-2.9.1-3.10.13-ipfire1.patch.xz +GRS_PATCHES = grsecurity-2.9.1-3.10.14-ipfire1.patch.xz THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -74,9 +74,9 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = 64ffe74249442fd7452d12348955ccfd +$(DL_FILE)_MD5 = 3cd1e4b50fb9decd63754ae80f3b2414 rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = ef9274b3ff5d05daaaa4bdbe86ad00fc -$(GRS_PATCHES)_MD5 = f69811dde866170bd9b4fcdcd0f1538e +$(GRS_PATCHES)_MD5 = 504b12ac9f2a3c12ccfeb1c3768f49e4 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. ec36876e6ade2e04d29963d8dcfab5d5bf580a99
by git＠ipfire.org 01 Oct '13

01 Oct '13

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, fifteen has been updated via ec36876e6ade2e04d29963d8dcfab5d5bf580a99 (commit) via 7603ec4e1620aeaf0f2b102af887b4c3c022677c (commit) from 42e4fa805ec8c3bbc085d2d9d8746afd97062009 (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 ec36876e6ade2e04d29963d8dcfab5d5bf580a99 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Oct 1 17:45:00 2013 +0200 wirelessctrl: Fix evaluation of configuration settings. commit 7603ec4e1620aeaf0f2b102af887b4c3c022677c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Oct 1 17:20:41 2013 +0200 pakfire: Don't remove existing content from /opt/pakfire. ----------------------------------------------------------------------- Summary of changes: lfs/pakfire | 1 - src/misc-progs/wirelessctrl.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) Difference in files: diff --git a/lfs/pakfire b/lfs/pakfire index 11608b3..6f90f89 100644 --- a/lfs/pakfire +++ b/lfs/pakfire @@ -54,7 +54,6 @@ md5 : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) -mkdir -p /opt/pakfire/{db/{meta,lists,rootfiles,installed,core},etc,lib,tmp} \ /var/log/pakfire /var/cache/pakfire cp -fRv $(DIR_SRC)/src/pakfire/* $(DIR_APP) diff --git a/src/misc-progs/wirelessctrl.c b/src/misc-progs/wirelessctrl.c index 1016613..1f1b0f8 100644 --- a/src/misc-progs/wirelessctrl.c +++ b/src/misc-progs/wirelessctrl.c @@ -97,7 +97,7 @@ int main(void) { } /* restrict blue access tp the proxy port */ - if (findkey(kv, "DROPPROXY", buffer) && strcmp(buffer,"off") == 0) { + if (findkey(kv, "DROPPROXY", buffer) && strcmp(buffer, "on") == 0) { /* Read the proxy values */ if (!readkeyvalues(kv, CONFIG_ROOT "/proxy/settings") || !(findkey(kv, "PROXY_PORT", buffer))) { fprintf(stderr, "Cannot read proxy settings\n"); @@ -111,7 +111,7 @@ int main(void) { } /* not allow blue to acces a samba server running on local fire*/ - if(findkey(kv, "DROPSAMBA", buffer) && strcmp(buffer,"off")){ + if (findkey(kv, "DROPSAMBA", buffer) && strcmp(buffer, "on") == 0) { snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -i %s -p tcp -m multiport --ports 135,137,138,139,445,1025 -j DROP -m comment --comment 'DROP_Wirelessforward'", blue_dev); safe_system(command); snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSINPUT -i %s -p tcp -m multiport --ports 135,137,138,139,445,1025 -j DROP -m comment --comment 'DROP_Wirelessinput'", blue_dev); @@ -157,13 +157,13 @@ int main(void) { } /* with this rule you can disable the logging of the dropped wireless input packets*/ - if (!findkey(kv, "DROPWIRELESSINPUT", buffer) || strcmp(buffer,"off") == 0) { + if (findkey(kv, "DROPWIRELESSINPUT", buffer) && strcmp(buffer, "on") == 0) { snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSINPUT -i %s -j LOG --log-prefix 'DROP_Wirelessinput'", blue_dev); safe_system(command); } /* with this rule you can disable the logging of the dropped wireless forward packets*/ - if (!findkey(kv, "DROPWIRELESSFORWARD", buffer) || strcmp(buffer,"off") == 0) { + if (findkey(kv, "DROPWIRELESSFORWARD", buffer) && strcmp(buffer, "on") == 0) { snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -i %s -j LOG --log-prefix 'DROP_Wirelessforward'", blue_dev); safe_system(command); } 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 October 2013