[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1544a62869c0c597b0ff18f3227a37551a376f2a
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 1544a62869c0c597b0ff18f3227a37551a376f2a (commit) via 5d951df37e52807304a027c55762e1ef500adbe2 (commit) via 643d637c1c155ecfd509918e244d366b60435272 (commit) via 253d3a95ca171b74e761523760f35d610e5785e3 (commit) via 1e1ddde29356eaeed71411459682585f7d7eabed (commit) via 198756ea972532b8dace5dd39f8e6254ca7c7220 (commit) via 5772fe7f3098cdd731c7327d78f20c5f40960feb (commit) from aaa616e7d52510873d87917acb54efd1af556992 (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 1544a62869c0c597b0ff18f3227a37551a376f2a Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 13 13:35:49 2018 +0000
setup: Drop quagga user
Since we no longer have quagga, we don't need this any more
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5d951df37e52807304a027c55762e1ef500adbe2 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 13 13:34:53 2018 +0000
Drop frr & quagga
These are replaced by bird. There is such chaos now with all these routing daemons...
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 643d637c1c155ecfd509918e244d366b60435272 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 13 13:34:32 2018 +0000
network: Depend on bird instead of frr
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 253d3a95ca171b74e761523760f35d610e5785e3 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 13 13:33:01 2018 +0000
bird: Update to 2.0.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1e1ddde29356eaeed71411459682585f7d7eabed Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 13 13:30:46 2018 +0000
Revert "bird: Drop package"
This reverts commit 09c3106fb13fde1c815c9513fd89b402e344c05b.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 198756ea972532b8dace5dd39f8e6254ca7c7220 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Dec 1 19:19:41 2018 +0000
strongswan: Update to 5.7.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5772fe7f3098cdd731c7327d78f20c5f40960feb Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Dec 1 18:34:40 2018 +0000
nano: Update to 3.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: rng-tools/rng-tools.nm => bird/bird.nm | 30 +++++---- bird/systemd/bird.service | 13 ++++ bird/systemd/bird6.service | 13 ++++ frr/frr.nm | 107 --------------------------------- frr/frr.tmpfiles | 1 - frr/systemd/bgpd.service | 12 ---- frr/systemd/ospf6d.service | 12 ---- frr/systemd/ospfd.service | 12 ---- frr/systemd/zebra.service | 12 ---- nano/nano.nm | 6 +- network/network.nm | 4 +- quagga/quagga.nm | 105 -------------------------------- quagga/quagga.tmpfiles | 1 - quagga/systemd/bgpd.service | 12 ---- quagga/systemd/ospf6d.service | 12 ---- quagga/systemd/ospfd.service | 12 ---- quagga/systemd/zebra.service | 12 ---- setup/setup.nm | 2 +- setup/uidgid | 1 - strongswan/strongswan.nm | 4 +- 20 files changed, 51 insertions(+), 332 deletions(-) copy rng-tools/rng-tools.nm => bird/bird.nm (56%) create mode 100644 bird/systemd/bird.service create mode 100644 bird/systemd/bird6.service delete mode 100644 frr/frr.nm delete mode 100644 frr/frr.tmpfiles delete mode 100644 frr/systemd/bgpd.service delete mode 100644 frr/systemd/ospf6d.service delete mode 100644 frr/systemd/ospfd.service delete mode 100644 frr/systemd/zebra.service delete mode 100644 quagga/quagga.nm delete mode 100644 quagga/quagga.tmpfiles delete mode 100644 quagga/systemd/bgpd.service delete mode 100644 quagga/systemd/ospf6d.service delete mode 100644 quagga/systemd/ospfd.service delete mode 100644 quagga/systemd/zebra.service
Difference in files: diff --git a/bird/bird.nm b/bird/bird.nm new file mode 100644 index 000000000..c288bcefc --- /dev/null +++ b/bird/bird.nm @@ -0,0 +1,58 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = bird +version = 2.0.2 +release = 1 + +groups = Networking/Routing +url = http://bird.network.cz/ +license = GPLv2+ +summary = BIRD Internet Routing Daemon. + +description + BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of routing + protocols BGP, RIP and OSPF. +end + +source_dl = ftp://bird.network.cz/pub/bird/ + +build + requires + bison + flex + ncurses-devel + readline-devel + end +end + +packages + package %{name} + prerequires = systemd-units + + script postin + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + /bin/systemctl --no-reload disable bird.service > /dev/null 2>&1 || : + /bin/systemctl stop bird.service > /dev/null 2>&1 || : + + end + + script postun + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + /bin/systemctl daemon-reload 2>&1 || : + /bin/systemctl reload-or-try-restart bird.service >/dev/null 2>&1 || : + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/bird/systemd/bird.service b/bird/systemd/bird.service new file mode 100644 index 000000000..438d6afef --- /dev/null +++ b/bird/systemd/bird.service @@ -0,0 +1,13 @@ +[Unit] +Description=BIRD Internet Routing Daemon +Requires=network.target +After=network.target +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/sbin/bird +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/bird/systemd/bird6.service b/bird/systemd/bird6.service new file mode 100644 index 000000000..0d8e9b58a --- /dev/null +++ b/bird/systemd/bird6.service @@ -0,0 +1,13 @@ +[Unit] +Description=BIRD Internet Routing Daemon +Requires=network.target +After=network.target +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/sbin/bird6 +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/frr/frr.nm b/frr/frr.nm deleted file mode 100644 index cafa62677..000000000 --- a/frr/frr.nm +++ /dev/null @@ -1,107 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@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-%%7Bversion%7D/ - -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 deleted file mode 100644 index ec703564f..000000000 --- a/frr/frr.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/run/frr 0755 frr frr diff --git a/frr/systemd/bgpd.service b/frr/systemd/bgpd.service deleted file mode 100644 index a52ebea2d..000000000 --- a/frr/systemd/bgpd.service +++ /dev/null @@ -1,12 +0,0 @@ -[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 deleted file mode 100644 index 14f2f0337..000000000 --- a/frr/systemd/ospf6d.service +++ /dev/null @@ -1,12 +0,0 @@ -[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 deleted file mode 100644 index 90b7dbbec..000000000 --- a/frr/systemd/ospfd.service +++ /dev/null @@ -1,12 +0,0 @@ -[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 deleted file mode 100644 index 81ac73224..000000000 --- a/frr/systemd/zebra.service +++ /dev/null @@ -1,12 +0,0 @@ -[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/nano/nano.nm b/nano/nano.nm index c7a65dfe6..d8edbee40 100644 --- a/nano/nano.nm +++ b/nano/nano.nm @@ -4,9 +4,7 @@ ###############################################################################
name = nano -mainversion = 2.9 -subversion = 2 -version = %{mainversion}.%{subversion} +version = 3.2 release = 1
groups = Application/Editors @@ -18,7 +16,7 @@ description GNU nano is a small and friendly text editor. end
-source_dl = http://www.nano-editor.org/dist/v%%7Bmainversion%7D/ +source_dl = http://www.nano-editor.org/dist/v3/
build requires diff --git a/network/network.nm b/network/network.nm index 7db2dba63..c6a789447 100644 --- a/network/network.nm +++ b/network/network.nm @@ -6,7 +6,7 @@ name = network epoch = 1 version = 010 -release = 1 +release = 2
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Base Networking/Tools @@ -70,7 +70,7 @@ packages end
recommends - frr + bird end
configfiles diff --git a/quagga/quagga.nm b/quagga/quagga.nm deleted file mode 100644 index ad28175b5..000000000 --- a/quagga/quagga.nm +++ /dev/null @@ -1,105 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = quagga -version = 1.2.0 -release = 1 - -groups = Networking/Routing -url = http://www.quagga.net/ -license = GPLv2+ -summary = Quagga is a rounting daemon. - -description - Quagga is a free software that manages TCP/IP based routing - protocol. It takes multi-server and multi-thread approach to resolve - the current complexity of the Internet. - - Quagga supports BGP4, BGP4+, OSPFv2 and OSPFv3. -end - -source_dl = http://download.savannah.gnu.org/releases/quagga/ - -build - requires - c-ares-devel - ncurses-devel - net-snmp-devel - readline-devel - systemd-units - texinfo - end - - prepare_cmds - %{create_user} - end - - configure_options += \ - --sysconfdir=/etc/quagga \ - --localstatedir=%{localstatedir}/run/quagga \ - --disable-static \ - --disable-watchquagga \ - --enable-multipath=64 \ - --disable-isisd \ - --disable-pimd \ - --disable-ripd \ - --disable-ripngd - - install_cmds - mkdir -pv %{localstatedir}/run/quagga - chown -v quagga.quagga %{localstatedir}/run/quagga - end -end - -create_user - getent group quagga >/dev/null || /usr/sbin/groupadd -r quagga - getent passwd quagga >/dev/null || /usr/sbin/useradd -r -g quagga \ - -d %{sysconfdir}/%{name} -s /sbin/nologin quagga -end - -packages - package %{name} - services = bgpd ospf6d ospfd zebra - - 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/quagga/quagga.tmpfiles b/quagga/quagga.tmpfiles deleted file mode 100644 index 8974b64f8..000000000 --- a/quagga/quagga.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/run/quagga 0755 quagga quagga diff --git a/quagga/systemd/bgpd.service b/quagga/systemd/bgpd.service deleted file mode 100644 index 2874432df..000000000 --- a/quagga/systemd/bgpd.service +++ /dev/null @@ -1,12 +0,0 @@ -[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/quagga/bgpd.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/quagga/systemd/ospf6d.service b/quagga/systemd/ospf6d.service deleted file mode 100644 index 93b9dfa61..000000000 --- a/quagga/systemd/ospf6d.service +++ /dev/null @@ -1,12 +0,0 @@ -[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/quagga/ospf6d.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/quagga/systemd/ospfd.service b/quagga/systemd/ospfd.service deleted file mode 100644 index e276649bc..000000000 --- a/quagga/systemd/ospfd.service +++ /dev/null @@ -1,12 +0,0 @@ -[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/quagga/ospfd.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/quagga/systemd/zebra.service b/quagga/systemd/zebra.service deleted file mode 100644 index 977c2dc27..000000000 --- a/quagga/systemd/zebra.service +++ /dev/null @@ -1,12 +0,0 @@ -[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/quagga/zebra.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/setup/setup.nm b/setup/setup.nm index dad72ae0b..78d1a5df3 100644 --- a/setup/setup.nm +++ b/setup/setup.nm @@ -5,7 +5,7 @@
name = setup version = 3.0 -release = 9 +release = 10 arch = noarch
groups = Base Build System/Base diff --git a/setup/uidgid b/setup/uidgid index 2486675fb..7bdb249a8 100644 --- a/setup/uidgid +++ b/setup/uidgid @@ -93,7 +93,6 @@ dbus 81 81 / /sbin/nologin dbus jonas 82 82 /var/lib/jonas /sbin/nologin jonas clamav 83 83 /tmp /sbin/nologin clamav screen - 84 - - screen -quaggavt - 85 - - quagga sabayon 86 86 - /sbin/nologin sabayon polkituser 87 87 / /sbin/nologin PolicyKit wbpriv - 88 - - samba-common diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm index 12505baf0..e3121e08f 100644 --- a/strongswan/strongswan.nm +++ b/strongswan/strongswan.nm @@ -4,8 +4,8 @@ ###############################################################################
name = strongswan -version = 5.6.3 -release = 2 +version = 5.7.1 +release = 1
groups = Networking/VPN url = http://www.strongswan.org/
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer