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 [thread overview]
Message-ID: <20170717201912.BCDE61081DE1@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 8235 bytes --]
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 <michael.tremer(a)ipfire.org>
Date: Mon Jul 17 16:14:11 2017 -0400
strongswan: Disable obviously broken crypto
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.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 81b63e1613bd71d5df82d0cdd3218868453781e4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Jul 17 14:06:03 2017 -0400
frr: New package
This package is FRRouting which is a fork of quagga
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1705fdbfa013dad0c66200c35120ef6000856dbe
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Jul 17 14:04:24 2017 -0400
unbound: Update to 1.6.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
quagga/quagga.nm => frr/frr.nm | 42 ++++++++++++++++++----------------
frr/frr.tmpfiles | 1 +
{quagga => frr}/systemd/bgpd.service | 2 +-
{quagga => frr}/systemd/ospf6d.service | 2 +-
{quagga => frr}/systemd/ospfd.service | 2 +-
{quagga => frr}/systemd/zebra.service | 2 +-
strongswan/strongswan.nm | 4 +++-
unbound/unbound.nm | 2 +-
8 files changed, 31 insertions(+), 26 deletions(-)
copy quagga/quagga.nm => frr/frr.nm (62%)
create mode 100644 frr/frr.tmpfiles
copy {quagga => frr}/systemd/bgpd.service (77%)
copy {quagga => frr}/systemd/ospf6d.service (77%)
copy {quagga => frr}/systemd/ospfd.service (77%)
copy {quagga => 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 <info(a)ipfire.org> #
+###############################################################################
+
+name = frr
+version = 2.0
+release = 1
+
+groups = Networking/Routing
+url = https://frrouting.org
+license = GPLv2+
+summary = 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 = https://github.com/FRRouting/frr/releases/download/frr-%{version}/
+
+build
+ requires
+ json-c-devel
+ ncurses-devel
+ readline-devel
+ systemd-units
+ texinfo
+ end
+
+ prepare_cmds
+ %{create_user}
+ end
+
+ configure_options += \
+ --sysconfdir=/etc/frr \
+ --localstatedir=%{localstatedir}/run/frr \
+ --disable-static \
+ --disable-watchfrr \
+ --enable-multipath=64 \
+ --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 = 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 = 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=BGP routing daemon
+BindTo=zebra.service
+After=syslog.target network.target zebra.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/bgpd -d -f /etc/frr/bgpd.conf
+Restart=on-abort
+
+[Install]
+WantedBy=multi-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=OSPF routing daemon for IPv6
+BindTo=zebra.service
+After=syslog.target network.target zebra.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/ospf6d -d -f /etc/frr/ospf6d.conf
+Restart=on-abort
+
+[Install]
+WantedBy=multi-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=OSPF routing daemon
+BindTo=zebra.service
+After=syslog.target network.target zebra.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/ospfd -d -f /etc/frr/ospfd.conf
+Restart=on-abort
+
+[Install]
+WantedBy=multi-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=GNU Zebra routing manager
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStartPre=/sbin/ip route flush proto zebra
+ExecStart=/usr/sbin/zebra -d -f /etc/frr/zebra.conf
+Restart=on-abort
+
+[Install]
+WantedBy=multi-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 @@
name = strongswan
version = 5.5.3
-release = 1
+release = 2
groups = Networking/VPN
url = http://www.strongswan.org/
@@ -63,6 +63,8 @@ build
--enable-eap-peap \
--enable-eap-mschapv2 \
--enable-eap-identity \
+ --disable-blowfish \
+ --disable-rc2 \
--with-capabilities=libcap \
--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 @@
###############################################################################
name = unbound
-version = 1.5.9
+version = 1.6.3
release = 1
groups = System/Daemons
hooks/post-receive
--
IPFire 3.x development tree
reply other threads:[~2017-07-17 20:19 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170717201912.BCDE61081DE1@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox