IPFire-SCM October 2015

ipfire-scm@lists.ipfire.org

1 participants
51 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4e8949e8177a13dde72946ea9d02d0c12badafe0
by git＠ipfire.org 18 Oct '15

18 Oct '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 4e8949e8177a13dde72946ea9d02d0c12badafe0 (commit) via 6be114f03a12086211234c05a4f7801416488c67 (commit) via 307327a946be2782f1858f30953d6a2fefc847d1 (commit) via 8b7417c50b8d3de46003bd40d779bef222dc4171 (commit) from 924f5d6f1aa07d92f3a946e29f4208593a0fe4d2 (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 4e8949e8177a13dde72946ea9d02d0c12badafe0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 18 19:20:18 2015 +0100 core95: Ship changed routing.cgi file Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6be114f03a12086211234c05a4f7801416488c67 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Sat Oct 17 19:27:03 2015 +0200 BUG10941: fix single ip-addresses when no subnet given Some functions when adding a new route where senseless. Now the ip address is checked and in case of a missing / wrong subnetmask an errormessage is raised. The ip address is preserved. ELSE we convert the subnetmask to cidr notation and calculate the network ip correctly. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 307327a946be2782f1858f30953d6a2fefc847d1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 18 19:19:31 2015 +0100 core95: Ship changed firewall.cgi file Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8b7417c50b8d3de46003bd40d779bef222dc4171 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Sat Oct 17 18:32:10 2015 +0200 BUG10806: fix wrong customhostgroupcheck The function to check for valid hostgroup entries not only checked the target hostgroup but also the source hostgroup if any. This lead to the error. Now the check only affects target hostgroups because it does not matter if a sourcegroup contains mac addresses. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/95/filelists/files | 2 ++ html/cgi-bin/firewall.cgi | 2 +- html/cgi-bin/routing.cgi | 12 ++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/rootfiles/core/95/filelists/files b/config/rootfiles/core/95/filelists/files index 8bdc0eb..7ee6f0a 100644 --- a/config/rootfiles/core/95/filelists/files +++ b/config/rootfiles/core/95/filelists/files @@ -4,8 +4,10 @@ etc/rc.d/init.d/firewall lib/udev/network-hotplug-vlan lib/udev/rules.d/60-net.rules srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat srv/web/ipfire/cgi-bin/pppsetup.cgi +srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/lib/firewall/firewall-lib.pl usr/lib/firewall/ipsec-block diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index c207ec7..682c285 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -597,7 +597,7 @@ sub checktarget &General::readhasharray("$confighost", \%customhost); foreach my $grpkey (sort keys %customgrp){ foreach my $hostkey (sort keys %customhost){ - if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customhost{$hostkey}[1] eq 'mac'){ + if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customgrp{$grpkey}[2] eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $customhost{$hostkey}[1] eq 'mac'){ $hint=$Lang::tr{'fwdfw hint mac'}; return $hint; } diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index c460a74..2c60f67 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -118,12 +118,16 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { } if ($settings{'ACTION'} eq $Lang::tr{'add'}) { - # Convert subnet masks to CIDR notation. - $settings{'IP'} = &General::iporsubtocidr($settings{'IP'}); -# Validate inputs - if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask($settings{'IP'}))){ + # Validate inputs + if (!&General::validipandmask($settings{'IP'}))){ $errormessage = $Lang::tr{'invalid ip'}." / ".$Lang::tr{'invalid netmask'}; + }else{ + #set networkip if not already correctly defined + my($ip,$cidr) = split(/\//,$settings{'IP'}); + $cidr = &General::iporsubtocidr($cidr); + my $netip=&General::getnetworkip($ip,$cidr); + $settings{'IP'} = "$netip/$cidr"; } if ($settings{'IP'} =~ /^0\.0\.0\.0/){ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 747db4fdcf002ee97c155be7a20429ffc13c613c
by git＠ipfire.org 18 Oct '15

18 Oct '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 3.x development tree". The branch, master has been updated via 747db4fdcf002ee97c155be7a20429ffc13c613c (commit) via d8966ea942ea2cda9d4b1e731d19390a03243573 (commit) from 61e7253b1ff164dbdb10aac3dda98a0145cfc326 (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 747db4fdcf002ee97c155be7a20429ffc13c613c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Oct 18 12:40:10 2015 +0200 systemd: Create missing system groups The system groups input and utmp where missing which are required by udevd to proper work. Fixes #10942. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d8966ea942ea2cda9d4b1e731d19390a03243573 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Oct 18 01:51:35 2015 +0200 bison: Update to 3.0.4. This is a major update to the latest stable version of bison. A short excerpt of the changelog: Several deprecated features were removed, such as support for YYFAIL, yystype, yyltype, YYLEX_PARAM, and YYPARSE_PARAM. The user epilogue is no longer affected by internal #defines. The recently-introduced dependency on stdio.h when locations are enabled was removed. Caret errors, as introduced in 2.7, are now activated by default. The "-Werror" option was enhanced, and categorization of warnings and errors was modified. Many other changes and various bugfixes were made. I also added flex as a build dependency to prevent from errors when running the testsuite. Fixes #10403. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: bison/bison.nm | 10 ++++++---- systemd/systemd.nm | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) Difference in files: diff --git a/bison/bison.nm b/bison/bison.nm index 8b1a1a9..0a2af3d 100644 --- a/bison/bison.nm +++ b/bison/bison.nm @@ -4,7 +4,7 @@ ############################################################################### name = bison -version = 2.7.1 +version = 3.0.4 release = 1 groups = Development/Tools @@ -13,14 +13,16 @@ license = GPLv2+ summary = GNU Bison is a parser generator. description - Bison is a general-purpose parser generator that converts an annotated \ + Bison is a general-purpose parser generator that converts an annotated context-free grammar into an LALR(1) or GLR parser for that grammar. end source_dl = http://ftp.gnu.org/gnu/bison/ +sources = %{thisapp}.tar.xz build requires + flex >= 2.5.37 m4 >= 1.4.16 perl end @@ -43,8 +45,8 @@ build mkdir -pv %{BUILDROOT}%{libdir} cd lib install -v liby.so.%{version} %{BUILDROOT}%{libdir}/liby.so.%{version} - ln -vsf liby.so.%{version} %{BUILDROOT}%{libdir}/liby.so.2 - ln -vsf liby.so.2 %{BUILDROOT}%{libdir}/liby.so + ln -vsf liby.so.%{version} %{BUILDROOT}%{libdir}/liby.so.3 + ln -vsf liby.so.3 %{BUILDROOT}%{libdir}/liby.so end end diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 7346c09..0b8e604 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@ name = systemd version = 221 -release = 2 +release = 3 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -164,6 +164,8 @@ create_groups getent group tape >/dev/null || groupadd -g 33 tape || : getent group dialout >/dev/null || groupadd -g 18 dialout || : getent group floppy >/dev/null || groupadd -g 19 floppy || : + getent group input >/dev/null || groupadd -r input || : + getent group utmp >/dev/null || groupadd -r -g 22 utmp || : # Create group for journald. getent group systemd-journal >/dev/null || /usr/sbin/groupadd -r systemd-journal hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 924f5d6f1aa07d92f3a946e29f4208593a0fe4d2
by git＠ipfire.org 18 Oct '15

18 Oct '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 924f5d6f1aa07d92f3a946e29f4208593a0fe4d2 (commit) via 953ff6edb3e4f14b08a5accad9f80a319476fabe (commit) via ea3eac2c509aa4f8acee62095f54949d53f55276 (commit) via 609b862fe7c58c3d61244888c1f7a98cb7da66cb (commit) from 4bb2df502d0f542396891973c68f0ea259f0bd66 (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 924f5d6f1aa07d92f3a946e29f4208593a0fe4d2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 18 18:54:25 2015 +0100 core95: Ship changed firewalllogcountry.dat Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 953ff6edb3e4f14b08a5accad9f80a319476fabe Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Oct 18 13:23:32 2015 +0200 firewalllogcountry.dat: Do not show 'Details' button for unkonw location. The CGI offers the posibility to get more details for a certain locations by clicking on a button. This feature cannot be used for the category "unknown". To prevent users from beeing confused about non show-able details, I added some code to hide this button for this category. Fixes #10726. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ea3eac2c509aa4f8acee62095f54949d53f55276 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 18 18:52:07 2015 +0100 core95: Ship changed pppsetup.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 609b862fe7c58c3d61244888c1f7a98cb7da66cb Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Oct 18 14:25:50 2015 +0200 pppsetup.cgi: Fix site layout when no TYPE is specified There was an issue with false generated HTML code, in case of an empty or unset $pppsettings{'TYPE'} variable which results in a missplaced website footer. This patch moves the code for closeing the table and the call of the closebox() function to the correct place to prevent this display issue. Fixes #10565. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/95/filelists/files | 2 ++ html/cgi-bin/logs.cgi/firewalllogcountry.dat | 12 +++++++++++- html/cgi-bin/pppsetup.cgi | 6 ++++-- 3 files changed, 17 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/core/95/filelists/files b/config/rootfiles/core/95/filelists/files index 91ce289..8bdc0eb 100644 --- a/config/rootfiles/core/95/filelists/files +++ b/config/rootfiles/core/95/filelists/files @@ -4,6 +4,8 @@ etc/rc.d/init.d/firewall lib/udev/network-hotplug-vlan lib/udev/rules.d/60-net.rules srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/lib/firewall/firewall-lib.pl usr/lib/firewall/ipsec-block diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat index 29c0842..f998a62 100644 --- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat +++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat @@ -456,7 +456,17 @@ for($s=0;$s<$lines;$s++) $color++; print "<tr>"; - print "<td align='center' $col><form method='post' action='showrequestfromcountry.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='country' value='$key[$s]'> <input type='submit' value='details'></form></td>"; + print "<td align='center' $col>"; + + # Dont show details button for "unknown" location. + if ($key[$s] ne 'unknown') { + print"<form method='post' action='showrequestfromcountry.dat'>"; + print"<input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'>"; + print"<input type='hidden' name='DAY' value='$cgiparams{'DAY'}'>"; + print"<input type='hidden' name='country' value='$key[$s]'>"; + print"<input type='submit' value='details'></form>"; + } + if($key[$s] eq 'blue0' || $key[$s] eq 'green0' || $key[$s] eq 'orange0') { print "<td align='center' $col>$key[$s]</td>"; } diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index b3e8e6c..36d0ced 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -980,12 +980,14 @@ print <<END <td colspan='2' width='50%'>$Lang::tr{'legend'}:</td> <td colspan='2' width='50%'><img src='/blob.gif' alt='*' /> $Lang::tr{'required field'}</td> </tr> -</table> END ; -&Header::closebox(); } +print "</table>"; + +&Header::closebox(); + print "</form>\n"; &Header::closebigbox(); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4bb2df502d0f542396891973c68f0ea259f0bd66
by git＠ipfire.org 18 Oct '15

18 Oct '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 4bb2df502d0f542396891973c68f0ea259f0bd66 (commit) via 187154380c605e0ba1ffd3ed7d98145e2f57d35a (commit) from f4390974996ba0d416deab9c79446087c9a14750 (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 4bb2df502d0f542396891973c68f0ea259f0bd66 Author: Dirk Wagner <dirk.wagner(a)ipfire.org> Date: Sat Oct 17 20:55:17 2015 +0200 monit addon: Upgrade to 5.14 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 187154380c605e0ba1ffd3ed7d98145e2f57d35a Author: Dirk Wagner <dirk.wagner(a)ipfire.org> Date: Sat Oct 17 20:52:13 2015 +0200 asterisk addon: Update to 11.20.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/asterisk | 6 +++--- lfs/monit | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) Difference in files: diff --git a/lfs/asterisk b/lfs/asterisk index 154fe77..91dc4fd 100755 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -20,7 +20,7 @@ include Config -VER = 11.18.0 +VER = 11.20.0 THISAPP = asterisk-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -28,7 +28,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = asterisk -PAK_VER = 17 +PAK_VER = 18 DEPS = "libsrtp" @@ -46,7 +46,7 @@ asterisk-extra-sounds-en-gsm-1.4.15.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz -$(DL_FILE)_MD5 = 3ddb42b54db200faccd68906df210a40 +$(DL_FILE)_MD5 = d15759b05862250073e2708394ad2f4c asterisk-extra-sounds-en-gsm-1.4.15.tar.gz_MD5 = 5099fc65f49008e33ba7fb043a4ec995 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c diff --git a/lfs/monit b/lfs/monit index 92e0760..453ad03 100644 --- a/lfs/monit +++ b/lfs/monit @@ -24,7 +24,7 @@ include Config -VER = 5.12.1 +VER = 5.14 THISAPP = monit-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = monit -PAK_VER = 6 +PAK_VER = 7 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1ffde79207270925f6f7df787d19100a +$(DL_FILE)_MD5 = 1b3ae1eb08a0914402a8764e5689c1c5 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 61e7253b1ff164dbdb10aac3dda98a0145cfc326
by git＠ipfire.org 17 Oct '15

17 Oct '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 3.x development tree". The branch, master has been updated via 61e7253b1ff164dbdb10aac3dda98a0145cfc326 (commit) via b0ea9322d53e8a29433789c4b472a4aeb49f9656 (commit) from 1bb3a6381becf87907f8ab1cbddec951be4a639d (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 61e7253b1ff164dbdb10aac3dda98a0145cfc326 Merge: b0ea932 1bb3a63 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 18 00:28:28 2015 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit b0ea9322d53e8a29433789c4b472a4aeb49f9656 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Oct 18 00:40:34 2015 +0200 automake: Add non detected dependencies of perl modules automake has non detected dependencies to perl(threads) and perl(Thread::Queue). After updating perl to version 5.20 those modules have been moved into own sub-packages which are not installed because these dependencies are not correctly detected and tracked in the automake package. Manually adding them will solve this problem and provides a working version of automake again. The whole problem also has been filed on the RH bugtracker: https://bugzilla.redhat.com/show_bug.cgi?id=919810 Fixes #10944. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: automake/automake.nm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) Difference in files: diff --git a/automake/automake.nm b/automake/automake.nm index 59bf3b0..128ba2c 100644 --- a/automake/automake.nm +++ b/automake/automake.nm @@ -5,7 +5,7 @@ name = automake version = 1.13.2 -release = 1 +release = 2 arch = noarch groups = Development/Tools @@ -26,12 +26,17 @@ required_autoconf_version = 2.62 build requires autoconf >= %{required_autoconf_version} - perl + perl(threads) + perl(Thread::Queue) end end packages package %{name} - requires = autoconf >= %{required_autoconf_version} + requires + autoconf >= %{required_autoconf_version} + perl(threads) + perl(Thread::Queue) + end end end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1bb3a6381becf87907f8ab1cbddec951be4a639d
by git＠ipfire.org 17 Oct '15

17 Oct '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 3.x development tree". The branch, master has been updated via 1bb3a6381becf87907f8ab1cbddec951be4a639d (commit) via d0873e09f08dfc3c33a3f5d2c28a54c83027a936 (commit) via 33619ff612376d4ba5a1f9d8b1fcb4191ffae40d (commit) via c06e7bf480f0410ea5eb68b444e41e5b257c92d0 (commit) via f0389604a0acbbfe4961e256679483ef33b9e000 (commit) from b5563ff993c041c5fc6f93cc7a4fa08188abea7e (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 1bb3a6381becf87907f8ab1cbddec951be4a639d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 17 21:25:15 2015 +0200 pygobject3: Update to version 3.18.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d0873e09f08dfc3c33a3f5d2c28a54c83027a936 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 17 21:22:42 2015 +0200 python3-cairo: Rebuild against Python 3.4 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 33619ff612376d4ba5a1f9d8b1fcb4191ffae40d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 17 20:53:29 2015 +0200 python-dbus: Rebuild against Python 3.4 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c06e7bf480f0410ea5eb68b444e41e5b257c92d0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 17 20:51:45 2015 +0200 python-tornado: Update to version 4.2.1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f0389604a0acbbfe4961e256679483ef33b9e000 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 17 20:51:10 2015 +0200 python-rrdtool: Rebuild against Python 3.4 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: pygobject3/pygobject3.nm | 11 ++++------- python-dbus/python-dbus.nm | 4 ++-- python-rrdtool/python-rrdtool.nm | 4 ++-- python-tornado/python-tornado.nm | 5 ++--- .../cairo-waf-use-python-config-as-shell-script.patch0 | 11 +++++++++++ .../patches/pycairo-1.10.0-test-python3.patch | 12 ++++++++++++ python3-cairo/python3-cairo.nm | 18 ++++++++++++++++-- 7 files changed, 49 insertions(+), 16 deletions(-) create mode 100644 python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0 create mode 100644 python3-cairo/patches/pycairo-1.10.0-test-python3.patch Difference in files: diff --git a/pygobject3/pygobject3.nm b/pygobject3/pygobject3.nm index c72a874..bc92035 100644 --- a/pygobject3/pygobject3.nm +++ b/pygobject3/pygobject3.nm @@ -5,9 +5,9 @@ name = pygobject3 version = %{ver_major}.%{ver_minor} -ver_major = 3.7 -ver_minor = 4 -release = 2 +ver_major = 3.18 +ver_minor = 0 +release = 1 groups = Development/Tools url = http://www.pygtk.org/ @@ -27,14 +27,13 @@ sources = %{thisapp}.tar.xz build requires cairo-gobject-devel >= 1.12.12 - chrpath glib2-devel >= 2.34.2 gobject-introspection-devel >= 1.34.2 pkg-config python-cairo-devel python3-cairo-devel python-devel - python3-devel + python3-devel >= 3.4 end DIR_APP3 = %{DIR_APP}-python3 @@ -65,12 +64,10 @@ build pushd %{DIR_APP3} export PYTHON=%{python3} make install DESTDIR=%{BUILDROOT} - chrpath --delete %{BUILDROOT}%{python3_sitearch}/gi/{*.so,*/*.so} popd export PYTHON=%{python} make install DESTDIR=%{BUILDROOT} - chrpath --delete %{BUILDROOT}%{python_sitearch}/gi/{*.so,*/*.so} end end diff --git a/python-dbus/python-dbus.nm b/python-dbus/python-dbus.nm index c5e31fc..ba57719 100644 --- a/python-dbus/python-dbus.nm +++ b/python-dbus/python-dbus.nm @@ -5,7 +5,7 @@ name = python-dbus version = 1.1.1 -release = 1 +release = 2 groups = System/Libraries url = http://www.freedesktop.org/software/dbus/ @@ -26,7 +26,7 @@ build dbus-glib-devel pkg-config python-devel - python3-devel + python3-devel >= 3.4 end configure_options += \ diff --git a/python-rrdtool/python-rrdtool.nm b/python-rrdtool/python-rrdtool.nm index 9b43172..6d3d49a 100644 --- a/python-rrdtool/python-rrdtool.nm +++ b/python-rrdtool/python-rrdtool.nm @@ -5,7 +5,7 @@ name = python-rrdtool version = 0.1.1 -release = 1 +release = 2 thisapp = rrdtool-%{version} groups = System/Libraries @@ -22,7 +22,7 @@ source_dl = https://pypi.python.org/packages/source/r/rrdtool/ build requires - python3-devel + python3-devel >= 3.4 rrdtool-devel end diff --git a/python-tornado/python-tornado.nm b/python-tornado/python-tornado.nm index 0610edb..2f83bac 100644 --- a/python-tornado/python-tornado.nm +++ b/python-tornado/python-tornado.nm @@ -4,9 +4,8 @@ ############################################################################### name = python-tornado -version = 3.0 +version = 4.2.1 release = 1 -arch = noarch thisapp = tornado-%{version} maintainer = Michael Tremer <michael.tremer(a)ipfire.org> @@ -28,7 +27,7 @@ build requires pakfire-builder >= 0.9.23-2 python-devel - python3-devel + python3-devel >= 3.4 end DIR_APP3 = %{DIR_APP}-python3 diff --git a/python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0 b/python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0 new file mode 100644 index 0000000..b8cd856 --- /dev/null +++ b/python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0 @@ -0,0 +1,11 @@ +--- .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py.orig 2014-05-12 12:36:46.776004776 +0200 ++++ .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py 2014-05-12 12:36:53.994995779 +0200 +@@ -169,7 +169,7 @@ + conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False) + includes=[] + if conf.env.PYTHON_CONFIG: +- for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split(): ++ for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split(): + if(incstr.startswith('-I')or incstr.startswith('/I')): + incstr=incstr[2:] + if incstr not in includes: diff --git a/python3-cairo/patches/pycairo-1.10.0-test-python3.patch b/python3-cairo/patches/pycairo-1.10.0-test-python3.patch new file mode 100644 index 0000000..32e398f --- /dev/null +++ b/python3-cairo/patches/pycairo-1.10.0-test-python3.patch @@ -0,0 +1,12 @@ +diff -up pycairo-1.10.0/test/examples_test.py~ pycairo-1.10.0/test/examples_test.py +--- pycairo-1.10.0/test/examples_test.py~ 2010-05-29 08:28:35.000000000 +0300 ++++ pycairo-1.10.0/test/examples_test.py 2013-12-20 22:53:07.806217741 +0200 +@@ -14,7 +14,7 @@ def test_snippets(): + examples/cairo_snippets/snippets/ + ''' + def doSnippets(name): +- retcode = subprocess.call('python %s -s' % name, shell=True) ++ retcode = subprocess.call('python3 %s -s' % name, shell=True) + assert retcode == 0, 'Error: retcode == {0}'.format(retcode) + + os.chdir(os.path.join(os.path.dirname(__file__), '..', 'examples', diff --git a/python3-cairo/python3-cairo.nm b/python3-cairo/python3-cairo.nm index c8f04b1..a360e7a 100644 --- a/python3-cairo/python3-cairo.nm +++ b/python3-cairo/python3-cairo.nm @@ -5,7 +5,7 @@ name = python3-cairo version = 1.10.0 -release = 1 +release = 2 groups = Development/Tools url = http://cairographics.org/pycairo @@ -25,7 +25,21 @@ build requires cairo-devel pkg-config - python3-devel + python3-devel >= 3.4 + end + + prepare + # Extract source tarball. + %{MACRO_EXTRACT_TARBALL} + + # Ensure that ./waf has created the cached unpacked version + # of the wafadmin source tree. + # This will be created to a subdirectory like + # .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752 + python3 ./waf --version + + # Apply all patches. + %{MACRO_PATCHES} end build hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core94, updated. 38b7997ffdb0b0257a6502e9e531874acd711539
by git＠ipfire.org 17 Oct '15

17 Oct '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, core94 has been updated via 38b7997ffdb0b0257a6502e9e531874acd711539 (commit) via ee97ade8e40ece29913a2bd5af59cf94fe4941b1 (commit) via 13adb7aea82dca7002419517fea038d70f3defc0 (commit) from c5a5e4abb043abe1c5cecbdf15b28b03f74f4734 (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 38b7997ffdb0b0257a6502e9e531874acd711539 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 15 12:02:38 2015 +0100 core94: Adjust update.sh script if run multiple times Some changes cannot be executed again after the update was already installed. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ee97ade8e40ece29913a2bd5af59cf94fe4941b1 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Oct 15 12:18:28 2015 +0200 Core94: fix for dma when postfix is installed Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 13adb7aea82dca7002419517fea038d70f3defc0 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Oct 15 12:18:27 2015 +0200 Core94: fix update.sh for dma Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/94/update.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) Difference in files: diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh index 6560662..e6f9cf1 100644 --- a/config/rootfiles/core/94/update.sh +++ b/config/rootfiles/core/94/update.sh @@ -70,6 +70,17 @@ EOF fcrontab -z &>/dev/null +# DMA - reconfigure Postfix if exists +if [ -e /etc/postfix/main.cf ] && [ ! -e "/usr/sbin/sendmail.postfix" ]; then + mv /usr/sbin/sendmail /usr/sbin/sendmail.postfix + /usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.postfix 15 + sed -i 's/usr\/sbin\/sendmail/usr/sbin/sendmail.postfix/' /opt/pakfire/db/rootfiles/postfix +fi +# DMA - configure dma as default mta +mkdir -p /etc/alternatives +mkdir -p /var/lib/alternatives +/usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.dma 20 + # Start services /etc/init.d/dnsmasq start /etc/init.d/sshd start hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. b5563ff993c041c5fc6f93cc7a4fa08188abea7e
by git＠ipfire.org 17 Oct '15

17 Oct '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 3.x development tree". The branch, master has been updated via b5563ff993c041c5fc6f93cc7a4fa08188abea7e (commit) from b82aaa6ef858e9dbd7ac1fcb943278a403a9f53b (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 b5563ff993c041c5fc6f93cc7a4fa08188abea7e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 17 16:38:31 2015 +0200 strongswan: Disable kernel-libipsec plugin, enable unity The kernel-libipsec plugin implements IPsec in userspace and uses TAP devices which is not recommended for being used in production. The unity plugin increases compatibility with Cisco Unity endpoints. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: strongswan/strongswan.nm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm index 3eb1462..e861c25 100644 --- a/strongswan/strongswan.nm +++ b/strongswan/strongswan.nm @@ -5,7 +5,7 @@ name = strongswan version = 5.3.3 -release = 1 +release = 2 groups = Networking/VPN url = http://www.strongswan.org/ @@ -52,6 +52,7 @@ build --enable-ccm \ --enable-ctr \ --enable-gcm \ + --enable-unity \ --enable-xauth-eap \ --enable-xauth-noauth \ --enable-eap-radius \ @@ -62,8 +63,7 @@ build --enable-eap-identity \ --with-capabilities=libcap \ --enable-swanctl \ - --enable-systemd \ - --enable-kernel-libipsec + --enable-systemd if "%{DISTRO_ARCH}" == "i686" configure_options += --enable-padlock hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f4390974996ba0d416deab9c79446087c9a14750
by git＠ipfire.org 17 Oct '15

17 Oct '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 f4390974996ba0d416deab9c79446087c9a14750 (commit) via a9929e324f6dc121cca45f1959b7b8d2a47570fe (commit) from 075b6e10db482dd77ec2634f707634e895610941 (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 f4390974996ba0d416deab9c79446087c9a14750 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 17 01:27:07 2015 +0100 core95: Ship ddns update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a9929e324f6dc121cca45f1959b7b8d2a47570fe Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Oct 17 01:27:04 2015 +0200 ddns: Update to 009 This update contains the latest upstream changes which are a better SSL error handling and support for desec.io. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/93 => core/95}/filelists/ddns | 0 lfs/ddns | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) copy config/rootfiles/{oldcore/93 => core/95}/filelists/ddns (100%) Difference in files: diff --git a/config/rootfiles/core/95/filelists/ddns b/config/rootfiles/core/95/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/core/95/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/lfs/ddns b/lfs/ddns index b692d9a..750c728 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -24,7 +24,7 @@ include Config -VER = 008 +VER = 009 THISAPP = ddns-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f8b9441f18c2667d440d5416ec2e0011 +$(DL_FILE)_MD5 = 31f949d9f417ee7f801cf8aac849a92e install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. b82aaa6ef858e9dbd7ac1fcb943278a403a9f53b
by git＠ipfire.org 17 Oct '15

17 Oct '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 3.x development tree". The branch, master has been updated via b82aaa6ef858e9dbd7ac1fcb943278a403a9f53b (commit) from 4cdcf12702ac05a3ba368f0667fe7daf2e5dbd78 (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 b82aaa6ef858e9dbd7ac1fcb943278a403a9f53b Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Oct 17 00:32:40 2015 +0200 plymouth: Update to 0.9.2. Update to the latest minor version of the plymouth 0.9 series. Also enable support for systemd. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../plymouth-0.9.0-everything-is-better-in-red.patch | 16 ---------------- .../plymouth-0.9.2-everything-is-better-in-red.patch | 16 ++++++++++++++++ plymouth/plymouth.nm | 3 ++- 3 files changed, 18 insertions(+), 17 deletions(-) delete mode 100644 plymouth/patches/plymouth-0.9.0-everything-is-better-in-red.patch create mode 100644 plymouth/patches/plymouth-0.9.2-everything-is-better-in-red.patch Difference in files: diff --git a/plymouth/patches/plymouth-0.9.0-everything-is-better-in-red.patch b/plymouth/patches/plymouth-0.9.0-everything-is-better-in-red.patch deleted file mode 100644 index f2981ca..0000000 --- a/plymouth/patches/plymouth-0.9.0-everything-is-better-in-red.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur plymouth-0.9.0_orig/src/plugins/splash/text/plugin.c plymouth-0.9.0/src/plugins/splash/text/plugin.c ---- plymouth-0.9.0_orig/src/plugins/splash/text/plugin.c 2014-04-21 17:18:19.000000000 +0200 -+++ plymouth-0.9.0/src/plugins/splash/text/plugin.c 2014-12-07 14:57:09.344789424 +0100 -@@ -177,10 +177,10 @@ - 0xffffff); - ply_terminal_set_color_hex_value (terminal, - PLY_TERMINAL_COLOR_BLUE, -- 0x3465a4); -+ 0xCC0A00); - ply_terminal_set_color_hex_value (terminal, - PLY_TERMINAL_COLOR_BROWN, -- 0x979a9b); -+ 0x880400); - - ply_text_display_set_background_color (view->display, - PLY_TERMINAL_COLOR_BLACK); diff --git a/plymouth/patches/plymouth-0.9.2-everything-is-better-in-red.patch b/plymouth/patches/plymouth-0.9.2-everything-is-better-in-red.patch new file mode 100644 index 0000000..255f3c3 --- /dev/null +++ b/plymouth/patches/plymouth-0.9.2-everything-is-better-in-red.patch @@ -0,0 +1,16 @@ +diff -Nur a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c +--- a/src/plugins/splash/text/plugin.c 2015-02-26 19:32:41.000000000 +0100 ++++ b/src/plugins/splash/text/plugin.c 2015-09-10 22:03:27.266902240 +0200 +@@ -174,10 +174,10 @@ + 0x2e3436); + ply_terminal_set_color_hex_value (terminal, + PLY_TERMINAL_COLOR_WHITE, +- 0xffffff); ++ 0xCC0A00); + ply_terminal_set_color_hex_value (terminal, + PLY_TERMINAL_COLOR_BROWN, +- 0x979a9b); ++ 0x880400); + + ply_text_display_set_background_color (view->display, + PLY_TERMINAL_COLOR_BLACK); diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm index 257aef6..2666928 100644 --- a/plymouth/plymouth.nm +++ b/plymouth/plymouth.nm @@ -4,7 +4,7 @@ ############################################################################### name = plymouth -version = 0.9.0 +version = 0.9.2 release = 1 groups = System/Base @@ -33,6 +33,7 @@ build libpng-devel libudev-devel pango-devel + systemd-devel end configure_options += \ hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM October 2015