From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. ce09972dd5ba085d7c96bb582bd1042c85017559 Date: Mon, 17 Jul 2017 21:19:12 +0100 Message-ID: <20170717201912.BCDE61081DE1@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2045644690218693006==" List-Id: --===============2045644690218693006== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 ce09972dd5ba085d7c96bb582bd1042c85017559 (commit) via 81b63e1613bd71d5df82d0cdd3218868453781e4 (commit) via 1705fdbfa013dad0c66200c35120ef6000856dbe (commit) from 6e9e97276c260c8872768a5ab028263ea97ad4b2 (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 ce09972dd5ba085d7c96bb582bd1042c85017559 Author: Michael Tremer Date: Mon Jul 17 16:14:11 2017 -0400 strongswan: Disable obviously broken crypto =20 Blowfish and RC2 are very broken and nowhere in use at all. To avoid that these get used by accident, we just delete the internal modules that implement it. =20 Signed-off-by: Michael Tremer commit 81b63e1613bd71d5df82d0cdd3218868453781e4 Author: Michael Tremer Date: Mon Jul 17 14:06:03 2017 -0400 frr: New package =20 This package is FRRouting which is a fork of quagga =20 Signed-off-by: Michael Tremer commit 1705fdbfa013dad0c66200c35120ef6000856dbe Author: Michael Tremer Date: Mon Jul 17 14:04:24 2017 -0400 unbound: Update to 1.6.3 =20 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: quagga/quagga.nm =3D> frr/frr.nm | 42 ++++++++++++++++++------------= ---- frr/frr.tmpfiles | 1 + {quagga =3D> frr}/systemd/bgpd.service | 2 +- {quagga =3D> frr}/systemd/ospf6d.service | 2 +- {quagga =3D> frr}/systemd/ospfd.service | 2 +- {quagga =3D> frr}/systemd/zebra.service | 2 +- strongswan/strongswan.nm | 4 +++- unbound/unbound.nm | 2 +- 8 files changed, 31 insertions(+), 26 deletions(-) copy quagga/quagga.nm =3D> frr/frr.nm (62%) create mode 100644 frr/frr.tmpfiles copy {quagga =3D> frr}/systemd/bgpd.service (77%) copy {quagga =3D> frr}/systemd/ospf6d.service (77%) copy {quagga =3D> frr}/systemd/ospfd.service (77%) copy {quagga =3D> frr}/systemd/zebra.service (78%) Difference in files: diff --git a/frr/frr.nm b/frr/frr.nm new file mode 100644 index 0000000..cafa626 --- /dev/null +++ b/frr/frr.nm @@ -0,0 +1,107 @@ +############################################################################= ### +# IPFire.org - An Open Source Firewall Solution = # +# Copyright (C) - IPFire Development Team = # +############################################################################= ### + +name =3D frr +version =3D 2.0 +release =3D 1 + +groups =3D Networking/Routing +url =3D https://frrouting.org +license =3D GPLv2+ +summary =3D FRRouting is an IP routing protocol suite + +description + FRRouting (FRR) is an IP routing protocol suite for Linux and Unix + platforms which includes protocol daemons for BGP, IS-IS, LDP, OSPF, + PIM, and RIP. +end + +source_dl =3D https://github.com/FRRouting/frr/releases/download/frr-%{vers= ion}/ + +build + requires + json-c-devel + ncurses-devel + readline-devel + systemd-units + texinfo + end + + prepare_cmds + %{create_user} + end + + configure_options +=3D \ + --sysconfdir=3D/etc/frr \ + --localstatedir=3D%{localstatedir}/run/frr \ + --disable-static \ + --disable-watchfrr \ + --enable-multipath=3D64 \ + --disable-isisd \ + --disable-pimd \ + --disable-ripd \ + --disable-ripngd + + install_cmds + mkdir -pv %{localstatedir}/run/frr + chown -v frr.frr %{localstatedir}/run/frr + end +end + +create_user + getent group frr >/dev/null || /usr/sbin/groupadd -r frr + getent passwd frr >/dev/null || /usr/sbin/useradd -r -g frr \ + -d %{sysconfdir}/%{name} -s /sbin/nologin frr +end + +packages + package %{name} + services =3D bgpd ospf6d ospfd zebra + + # This is a fork of quagga and installs binaries + # with the same name. Hence we cannot install both + # at the same time. + conflicts =3D quagga + + script prein + %{create_user} + end + + script postin + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + for i in %{services}; do + systemctl --no-reload disable ${i}.service >/dev/null 2>&1 || : + systemctl stop ${i}.service >/dev/null 2>&1 || : + done + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + + for i in %{services}; do + systemctl try-restart ${i}.service >/dev/null 2>&1 || : + done + end + end + + package %{name}-libs + template LIBS + end + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/frr/frr.tmpfiles b/frr/frr.tmpfiles new file mode 100644 index 0000000..ec70356 --- /dev/null +++ b/frr/frr.tmpfiles @@ -0,0 +1 @@ +d /var/run/frr 0755 frr frr diff --git a/frr/systemd/bgpd.service b/frr/systemd/bgpd.service new file mode 100644 index 0000000..a52ebea --- /dev/null +++ b/frr/systemd/bgpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=3DBGP routing daemon +BindTo=3Dzebra.service +After=3Dsyslog.target network.target zebra.service + +[Service] +Type=3Dforking +ExecStart=3D/usr/sbin/bgpd -d -f /etc/frr/bgpd.conf +Restart=3Don-abort + +[Install] +WantedBy=3Dmulti-user.target diff --git a/frr/systemd/ospf6d.service b/frr/systemd/ospf6d.service new file mode 100644 index 0000000..14f2f03 --- /dev/null +++ b/frr/systemd/ospf6d.service @@ -0,0 +1,12 @@ +[Unit] +Description=3DOSPF routing daemon for IPv6 +BindTo=3Dzebra.service +After=3Dsyslog.target network.target zebra.service + +[Service] +Type=3Dforking +ExecStart=3D/usr/sbin/ospf6d -d -f /etc/frr/ospf6d.conf +Restart=3Don-abort + +[Install] +WantedBy=3Dmulti-user.target diff --git a/frr/systemd/ospfd.service b/frr/systemd/ospfd.service new file mode 100644 index 0000000..90b7dbb --- /dev/null +++ b/frr/systemd/ospfd.service @@ -0,0 +1,12 @@ +[Unit] +Description=3DOSPF routing daemon +BindTo=3Dzebra.service +After=3Dsyslog.target network.target zebra.service + +[Service] +Type=3Dforking +ExecStart=3D/usr/sbin/ospfd -d -f /etc/frr/ospfd.conf +Restart=3Don-abort + +[Install] +WantedBy=3Dmulti-user.target diff --git a/frr/systemd/zebra.service b/frr/systemd/zebra.service new file mode 100644 index 0000000..81ac732 --- /dev/null +++ b/frr/systemd/zebra.service @@ -0,0 +1,12 @@ +[Unit] +Description=3DGNU Zebra routing manager +After=3Dsyslog.target network.target + +[Service] +Type=3Dforking +ExecStartPre=3D/sbin/ip route flush proto zebra +ExecStart=3D/usr/sbin/zebra -d -f /etc/frr/zebra.conf +Restart=3Don-abort + +[Install] +WantedBy=3Dmulti-user.target diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm index 40aa074..a2a48eb 100644 --- a/strongswan/strongswan.nm +++ b/strongswan/strongswan.nm @@ -5,7 +5,7 @@ =20 name =3D strongswan version =3D 5.5.3 -release =3D 1 +release =3D 2 =20 groups =3D Networking/VPN url =3D http://www.strongswan.org/ @@ -63,6 +63,8 @@ build --enable-eap-peap \ --enable-eap-mschapv2 \ --enable-eap-identity \ + --disable-blowfish \ + --disable-rc2 \ --with-capabilities=3Dlibcap \ --enable-unbound \ --enable-systemd diff --git a/unbound/unbound.nm b/unbound/unbound.nm index dff6465..2419568 100644 --- a/unbound/unbound.nm +++ b/unbound/unbound.nm @@ -4,7 +4,7 @@ ############################################################################= ### =20 name =3D unbound -version =3D 1.5.9 +version =3D 1.6.3 release =3D 1 =20 groups =3D System/Daemons hooks/post-receive -- IPFire 3.x development tree --===============2045644690218693006==--