IPFire-SCM October 2015

ipfire-scm@lists.ipfire.org

1 participants
51 discussions

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

26 Oct '15

1 0

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

26 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 d4314e5aced9723fc80d683a381b11ad5742cfda (commit) via 63af7a712dffce481c1771e74ccba245a8f50486 (commit) via f8aad48b12ddb9ae88b56d9571bc10014b5658c5 (commit) via 1502d4578799bf994032c7be5003a42280070c05 (commit) from ea7896a5e457dbc633415f9275fd071c42809057 (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 d4314e5aced9723fc80d683a381b11ad5742cfda Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Oct 26 10:48:56 2015 +0100 util-linux: Update to 2.27 This is a major update to the latest stable version of util-linux. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 63af7a712dffce481c1771e74ccba245a8f50486 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Oct 26 10:48:55 2015 +0100 systemd: Enable python bindings Enable the build of systemd python bindings for python3. Requires python-lxml and python development headers to be present. Fixes #10969. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f8aad48b12ddb9ae88b56d9571bc10014b5658c5 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Oct 26 10:48:54 2015 +0100 python-lxml: New package lxml provides a Python binding to the libxslt and libxml2 libraries. It follows the ElementTree API as much as possible in order to provide a more Pythonic interface to libxml2 and libxslt than the default bindings. Build dependency for systemd python bindings. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1502d4578799bf994032c7be5003a42280070c05 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Oct 26 10:48:53 2015 +0100 automake: Update to 1.15 Update to the latest available version of automake. Required to build util-linux 2.27. 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 | 4 +-- python-lxml/python-lxml.nm | 65 ++++++++++++++++++++++++++++++++++++++++++++++ systemd/systemd.nm | 9 ++++++- util-linux/util-linux.nm | 11 ++++---- 4 files changed, 81 insertions(+), 8 deletions(-) create mode 100644 python-lxml/python-lxml.nm Difference in files: diff --git a/automake/automake.nm b/automake/automake.nm index 128ba2c..ca553c1 100644 --- a/automake/automake.nm +++ b/automake/automake.nm @@ -4,8 +4,8 @@ ############################################################################### name = automake -version = 1.13.2 -release = 2 +version = 1.15 +release = 1 arch = noarch groups = Development/Tools diff --git a/python-lxml/python-lxml.nm b/python-lxml/python-lxml.nm new file mode 100644 index 0000000..82c07c5 --- /dev/null +++ b/python-lxml/python-lxml.nm @@ -0,0 +1,65 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = python-lxml +version = 3.4.4 +release = 1 +thisapp = lxml-%{version} + +groups = Development/Languages +url = http://lxml.de +license = BSD +summary = ElementTree-like Python bindings for libxml2 and libxslt. + +description + lxml provides a Python binding to the libxslt and libxml2 libraries. + It follows the ElementTree API as much as possible in order to provide + a more Pythonic interface to libxml2 and libxslt than the default + bindings. +end + +source_dl = http://lxml.de/files/ +sources = %{thisapp}.tgz + +build + requires + libxml2-devel + libxslt-devel + python3-devel + zlib-devel + end + + build + CFLAGS="%{CFLAGS}" %{python3} setup.py build + end + + test + # Setup test environment. + BUILD_LIB_DIR=$(find $(pwd) -name "*.so" | head -n 1 | xargs dirname) + cp $BUILD_LIB_DIR/*.so src/lxml + export LANG=en_US.utf8 + + # Run tests. + %{python3} test.py -p -v + + # Launch more tests. + export PYTHONPATH=src + %{python3} selftest.py + %{python3} selftest2.py + end + + install + %{python3} setup.py install --skip-build -O1 \ + --root=%{BUILDROOT} + end +end + +packages + package python3-lxml + + package python3-lxml-debuginfo + template DEBUGINFO + end +end diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 0b8e604..35d2b0b 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@ name = systemd version = 221 -release = 3 +release = 4 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -49,6 +49,8 @@ build m4 pam-devel pciutils-devel + python3-devel + python3-lxml usbutils vala xz-devel @@ -56,6 +58,7 @@ build end configure_options += \ + PYTHON=%{python3} \ --with-sysvinit-path= \ --with-sysvrcnd-path= \ --enable-introspection \ @@ -429,6 +432,10 @@ packages end end + package python3-%{name} + template PYTHON3 + end + package %{name}-debuginfo template DEBUGINFO end diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 68c0ef9..4d14b85 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -4,10 +4,11 @@ ############################################################################### name = util-linux -major_ver = 2.25 -minor_ver = 2 -version = %{major_ver}.%{minor_ver} -release = 2 +major_ver = 2.27 +minor_ver = +version = %{major_ver} +#version = %{major_ver}.%{minor_ver} +release = 1 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -27,7 +28,7 @@ source_dl = ftp://ftp.kernel.org/pub/linux/utils/util-linux/v%{major_ver}/ build requires audit-devel - automake >= 1.13 + automake >= 1.15 coreutils >= 8.19 gettext libcap-devel hooks/post-receive -- IPFire 3.x development tree

1 0

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

25 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 a14e8d0256919b75612a67f2c6ceaffb979a4428 (commit) via 3a6784c065ca6513444f81d073874ff8118c6380 (commit) via b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c (commit) from 038169b894f1914b3cbd6513fea5f307bcc4ab12 (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 a14e8d0256919b75612a67f2c6ceaffb979a4428 Merge: 038169b 3a6784c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Oct 25 09:21:12 2015 +0100 Merge remote-tracking branch 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/oldcore/94/filelists/files | 1 + config/rootfiles/oldcore/94/update.sh | 7 ++++--- lfs/openssh | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/oldcore/94/filelists/files b/config/rootfiles/oldcore/94/filelists/files index e63a611..9ef227b 100644 --- a/config/rootfiles/oldcore/94/filelists/files +++ b/config/rootfiles/oldcore/94/filelists/files @@ -22,5 +22,6 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/wakeonlan.cgi srv/web/ipfire/cgi-bin/wireless.cgi var/ipfire/langs +var/ipfire/menu.d/10-system.menu var/ipfire/menu.d/40-services.menu var/ipfire/network-functions.pl diff --git a/config/rootfiles/oldcore/94/update.sh b/config/rootfiles/oldcore/94/update.sh index a9c24a5..99aa046 100644 --- a/config/rootfiles/oldcore/94/update.sh +++ b/config/rootfiles/oldcore/94/update.sh @@ -48,9 +48,10 @@ telinit u # Update SSH configuration sed -i /etc/ssh/sshd_config \ -e 's/^#PermitRootLogin yes$/PermitRootLogin yes/' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_rsa_key|' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$|HostKey /etc/ssh/ssh_host_ed25519_key|' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \ # Move away old and unsupported keys mv -f /etc/ssh/ssh_host_dsa_key{,.old} diff --git a/lfs/openssh b/lfs/openssh index 1178d6f..0bba1ec 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -91,9 +91,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \ -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \ -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_rsa_key|' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$|HostKey /etc/ssh/ssh_host_ed25519_key|' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \ /etc/ssh/sshd_config @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core94, updated. 3a6784c065ca6513444f81d073874ff8118c6380
by git＠ipfire.org 24 Oct '15

24 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 3a6784c065ca6513444f81d073874ff8118c6380 (commit) from b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c (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 3a6784c065ca6513444f81d073874ff8118c6380 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Oct 24 12:07:29 2015 +0200 ssh: preferre ecdsa cipher again. Previous we had not configured it so the ssh default order was used. Now we define it to disable dsa so we had to give the correct order but in the example cfg rsa is prefered. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/94/update.sh | 7 ++++--- lfs/openssh | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh index a9c24a5..99aa046 100644 --- a/config/rootfiles/core/94/update.sh +++ b/config/rootfiles/core/94/update.sh @@ -48,9 +48,10 @@ telinit u # Update SSH configuration sed -i /etc/ssh/sshd_config \ -e 's/^#PermitRootLogin yes$/PermitRootLogin yes/' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_rsa_key|' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$|HostKey /etc/ssh/ssh_host_ed25519_key|' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \ # Move away old and unsupported keys mv -f /etc/ssh/ssh_host_dsa_key{,.old} diff --git a/lfs/openssh b/lfs/openssh index 1178d6f..0bba1ec 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -91,9 +91,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \ -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \ -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_rsa_key|' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$|HostKey /etc/ssh/ssh_host_ed25519_key|' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \ /etc/ssh/sshd_config @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

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

24 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, master has been updated via 3a6784c065ca6513444f81d073874ff8118c6380 (commit) from b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c (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 3a6784c065ca6513444f81d073874ff8118c6380 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Oct 24 12:07:29 2015 +0200 ssh: preferre ecdsa cipher again. Previous we had not configured it so the ssh default order was used. Now we define it to disable dsa so we had to give the correct order but in the example cfg rsa is prefered. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/94/update.sh | 7 ++++--- lfs/openssh | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh index a9c24a5..99aa046 100644 --- a/config/rootfiles/core/94/update.sh +++ b/config/rootfiles/core/94/update.sh @@ -48,9 +48,10 @@ telinit u # Update SSH configuration sed -i /etc/ssh/sshd_config \ -e 's/^#PermitRootLogin yes$/PermitRootLogin yes/' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_rsa_key|' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$|HostKey /etc/ssh/ssh_host_ed25519_key|' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \ # Move away old and unsupported keys mv -f /etc/ssh/ssh_host_dsa_key{,.old} diff --git a/lfs/openssh b/lfs/openssh index 1178d6f..0bba1ec 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -91,9 +91,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \ -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \ -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_rsa_key|' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$|HostKey /etc/ssh/ssh_host_ed25519_key|' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \ /etc/ssh/sshd_config @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

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

23 Oct '15

1 0

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

23 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 b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c (commit) from 374e636feeade7827e8bea834ee911d15530650f (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 b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 23 19:49:17 2015 +0200 core94: add system menu to update. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/94/filelists/files | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/core/94/filelists/files b/config/rootfiles/core/94/filelists/files index e63a611..9ef227b 100644 --- a/config/rootfiles/core/94/filelists/files +++ b/config/rootfiles/core/94/filelists/files @@ -22,5 +22,6 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/wakeonlan.cgi srv/web/ipfire/cgi-bin/wireless.cgi var/ipfire/langs +var/ipfire/menu.d/10-system.menu var/ipfire/menu.d/40-services.menu var/ipfire/network-functions.pl hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c
by git＠ipfire.org 23 Oct '15

23 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, master has been updated via b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c (commit) from 374e636feeade7827e8bea834ee911d15530650f (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 b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 23 19:49:17 2015 +0200 core94: add system menu to update. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/94/filelists/files | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/core/94/filelists/files b/config/rootfiles/core/94/filelists/files index e63a611..9ef227b 100644 --- a/config/rootfiles/core/94/filelists/files +++ b/config/rootfiles/core/94/filelists/files @@ -22,5 +22,6 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/wakeonlan.cgi srv/web/ipfire/cgi-bin/wireless.cgi var/ipfire/langs +var/ipfire/menu.d/10-system.menu var/ipfire/menu.d/40-services.menu var/ipfire/network-functions.pl hooks/post-receive -- IPFire 2.x development tree

1 0

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

23 Oct '15

1 0

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

23 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 ca468b64bb442c1556bd5ebbfe60f1ae606ca81d (commit) from bef6465a923f71647b2b0b9a06725035e05a03af (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 ca468b64bb442c1556bd5ebbfe60f1ae606ca81d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 23 16:31:15 2015 +0100 network: Fix build on 32 architectures Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: network/network.nm | 21 ++-- ...tcalc-Allow-build-on-64-bit-architectures.patch | 127 +++++++++++++++++++++ network/systemd/network.service | 13 --- 3 files changed, 141 insertions(+), 20 deletions(-) create mode 100644 network/patches/0001-inetcalc-Allow-build-on-64-bit-architectures.patch delete mode 100644 network/systemd/network.service Difference in files: diff --git a/network/network.nm b/network/network.nm index be3c641..7228a65 100644 --- a/network/network.nm +++ b/network/network.nm @@ -6,7 +6,7 @@ name = network epoch = 1 version = 007 -release = 1 +release = 1.1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Base Networking/Tools @@ -25,8 +25,15 @@ source_dl = http://source.ipfire.org/releases/network/ build requires + autoconf + automake docbook-xsl libxslt + systemd-devel + end + + prepare_cmds + [ -e "configure" ] || ./autogen.sh end install_cmds @@ -63,23 +70,23 @@ packages end configfiles - /etc/firewall /etc/network end - # Enable network service, so it starts at the first boot. script postin systemctl daemon-reload >/dev/null 2>&1 || : - systemctl --no-reload enable network.service >/dev/null 2>&1 || : end - script preun - systemctl --no-reload disable network.service >/dev/null 2>&1 || : - systemctl stop network.service >/dev/null 2>&1 || : + script postun + systemctl daemon-reload >/dev/null 2>&1 || : end script postup systemctl daemon-reload >/dev/null 2>&1 || : end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/network/patches/0001-inetcalc-Allow-build-on-64-bit-architectures.patch b/network/patches/0001-inetcalc-Allow-build-on-64-bit-architectures.patch new file mode 100644 index 0000000..fec5b2c --- /dev/null +++ b/network/patches/0001-inetcalc-Allow-build-on-64-bit-architectures.patch @@ -0,0 +1,127 @@ +From cf3fb03ccc299b1233fa1a3cc4ce66520c324e70 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Wed, 21 Oct 2015 18:42:06 +0200 +Subject: [PATCH] inetcalc: Allow build on 64 bit architectures + +inetcalc previously used a GCC extension that was only +available on 64 bit platforms. This patch changes the +code to use struct in6_addr instead of __uint128_t for +storing IP addresses. + +Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> +--- + src/inetcalc.c | 47 +++++++++++++++++++++++++++++++++-------------- + 1 file changed, 33 insertions(+), 14 deletions(-) + +diff --git a/src/inetcalc.c b/src/inetcalc.c +index f821d6ed41a6..ba692542aba7 100644 +--- a/src/inetcalc.c ++++ b/src/inetcalc.c +@@ -30,17 +30,26 @@ + + typedef struct ip_address { + int family; +- __uint128_t addr; ++ struct in6_addr addr; + int prefix; + } ip_address_t; + +-static __uint128_t prefix_to_bitmask(int prefix) { +- __uint128_t bitmask = ~0; ++static struct in6_addr prefix_to_bitmask(int prefix) { ++ assert(prefix <= 128); + +- for (int i = 0; i < 128 - prefix; i++) +- bitmask >>= 1; ++ struct in6_addr bitmask; + +- return bitmask; ++ for (int i = 0; i < 16; i++) ++ bitmask.s6_addr[i] = 0; ++ ++ for (int i = prefix, j = 0; i > 0; i -= 8, j++) { ++ if (i >= 8) ++ bitmask.s6_addr[j] = 0xff; ++ else ++ bitmask.s6_addr[j] = 0xff << (8 - i); ++ } ++ ++ return bitmask; + } + + static int bitmask_to_prefix(uint32_t bits) { +@@ -171,7 +180,7 @@ static int ip_address_eq(const ip_address_t* a1, const ip_address_t* a2) { + if (a1->family != a2->family) + return 1; + +- if (a1->addr != a2->addr) ++ if (a1->addr.s6_addr != a2->addr.s6_addr) + return 1; + + if (a1->prefix != a2->prefix) +@@ -184,7 +193,7 @@ static int ip_address_gt(const ip_address_t* a1, const ip_address_t* a2) { + if (a1->family != a2->family || a1->prefix != a2->prefix) + return -1; + +- if (a1->addr > a2->addr) ++ if (a1->addr.s6_addr > a2->addr.s6_addr) + return 0; + + return 1; +@@ -193,7 +202,7 @@ static int ip_address_gt(const ip_address_t* a1, const ip_address_t* a2) { + static int ip_address_format_string(char* buffer, size_t size, const ip_address_t* ip) { + assert(ip->family == AF_INET || ip->family == AF_INET6); + +- const char* p = inet_ntop(ip->family, &ip->addr, buffer, size); ++ const char* p = inet_ntop(ip->family, &ip->addr.s6_addr, buffer, size); + if (!p) + return errno; + +@@ -218,21 +227,25 @@ static void ip_address_print(const ip_address_t* ip) { + static void ip_address_make_network(ip_address_t* net, const ip_address_t* ip) { + assert(ip->prefix >= 0); + +- __uint128_t mask = prefix_to_bitmask(ip->prefix); ++ struct in6_addr mask = prefix_to_bitmask(ip->prefix); + + net->family = ip->family; + net->prefix = ip->prefix; +- net->addr = ip->addr & mask; ++ ++ for (int i = 0; i < 16; i++) ++ net->addr.s6_addr[i] = ip->addr.s6_addr[i] & mask.s6_addr[i]; + } + + static void ip_address_make_broadcast(ip_address_t* broadcast, const ip_address_t* ip) { + assert(ip->family == AF_INET && ip->prefix >= 0); + +- __uint128_t mask = prefix_to_bitmask(ip->prefix); ++ struct in6_addr mask = prefix_to_bitmask(ip->prefix); + + broadcast->family = ip->family; + broadcast->prefix = ip->prefix; +- broadcast->addr = ip->addr | ~mask; ++ ++ for (int i = 0; i < 16; i++) ++ broadcast->addr.s6_addr[i] = ip->addr.s6_addr[i] | ~mask.s6_addr[i]; + } + + static int action_check(const int family, const char* address) { +@@ -342,7 +355,13 @@ static int action_prefix(const int family, const char* addr1, const char* addr2) + if (r) + return r; + +- uint32_t mask = ntohl(network.addr ^ broadcast.addr); ++ struct in6_addr netmask; ++ for (int i = 0; i < 16; i++) ++ netmask.s6_addr[i] = network.addr.s6_addr[i] ^ broadcast.addr.s6_addr[i]; ++ ++ uint32_t mask = netmask.s6_addr[0] << 24 | netmask.s6_addr[1] << 16 | ++ netmask.s6_addr[2] << 8 | netmask.s6_addr[3]; ++ + int prefix = bitmask_to_prefix(~mask); + if (prefix < 0) + return 1; +-- +2.4.3 + diff --git a/network/systemd/network.service b/network/systemd/network.service deleted file mode 100644 index 4509a35..0000000 --- a/network/systemd/network.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Network Connectivity -Before=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStartPre=/sbin/network init -ExecStart=/sbin/network start -ExecStop=/sbin/network stop - -[Install] -WantedBy=multi-user.target 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