Hello community, here is the log from the commit of package quagga for openSUSE:Factory checked in at 2015-03-27 09:40:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quagga (Old) and /work/SRC/openSUSE:Factory/.quagga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quagga" Changes: -------- --- /work/SRC/openSUSE:Factory/quagga/quagga.changes 2014-07-31 21:50:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.quagga.new/quagga.changes 2015-03-27 09:40:36.000000000 +0100 @@ -1,0 +2,17 @@ +Sat Mar 21 12:11:13 UTC 2015 - [email protected] + +- Fix build for openSUSE 13.1/SLE12 + +------------------------------------------------------------------- +Sat Mar 14 01:07:11 UTC 2015 - [email protected] + +- Update to version 0.99.24.1 + * zebra: don't print uninitialized string (3b02fe8) + This crept in as part of the MRIB improvements and I missed the compiler + warning between other noise. Unfortunately, printing an uninitialised + variable can in fact make zebra crash, so this is not trivial. +- Use systemd for openSUSE > 12.3 +- Add patch from Fedora + * 0001-systemd-change-the-WantedBy-target.patch + +------------------------------------------------------------------- Old: ---- quagga-0.99.23.tar.asc quagga-0.99.23.tar.xz New: ---- 0001-systemd-change-the-WantedBy-target.patch quagga-0.99.24.1.tar.asc quagga-0.99.24.1.tar.xz quagga-tmpfs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quagga.spec ++++++ --- /var/tmp/diff_new_pack.NtfGbT/_old 2015-03-27 09:40:36.000000000 +0100 +++ /var/tmp/diff_new_pack.NtfGbT/_new 2015-03-27 09:40:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package quagga # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%if 0%{?suse_version} > 1230 +%bcond_without systemd +%else +%bcond_with systemd +%endif %bcond_without tcp_zebra %bcond_without irdp @@ -23,7 +28,7 @@ %bcond_without pcre Name: quagga -Version: 0.99.23 +Version: 0.99.24.1 Release: 0 Summary: Free Routing Software (for BGP, OSPF and RIP, for example) License: LGPL-2.1+ @@ -35,8 +40,10 @@ Source4: quagga.keyring Source1: %{name}-SUSE.tar.bz2 Source2: %{name}.pam +Source5: %{name}-tmpfs.conf Patch1: %{name}-add-ospf6_main-return-value.patch Patch2: %{name}-add-table_test-return-value.patch +Patch3: 0001-systemd-change-the-WantedBy-target.patch BuildRequires: libtool BuildRequires: net-snmp-devel BuildRequires: pam-devel @@ -47,8 +54,13 @@ %if 0%{suse_version} > 1220 BuildRequires: makeinfo %endif -PreReq: %fillup_prereq +%if %{with systemd} +%{?systemd_requires} +BuildRequires: systemd-rpm-macros +%else PreReq: %insserv_prereq +%endif +PreReq: %fillup_prereq PreReq: %install_info_prereq # pwdutils for useradd and groupadd PreReq: pwdutils @@ -82,6 +94,7 @@ %setup -q -a 1 %patch1 -p 1 %patch2 -p 1 +%patch3 -p1 %build if ! ls /proc/net/{dev,route,snmp} >/dev/null; then @@ -121,19 +134,41 @@ %install rm -r doc/quagga.info make DESTDIR=%{buildroot} install -rm -rf %{buildroot}%{_libdir}/lib{ospf,zebra}.la +rm -rf %{buildroot}%{_libdir}/*.la install -d %{buildroot}%{_sysconfdir}/{init.d,quagga,pam.d,logrotate.d} +%if %{with systemd} +install -d %{buildroot}%{_unitdir} +install -p -m 644 redhat/zebra.service %{buildroot}%{_unitdir}/zebra.service +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rczebra +install -p -m 644 redhat/isisd.service %{buildroot}%{_unitdir}/isisd.service +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcisisd +install -p -m 644 redhat/ripd.service %{buildroot}%{_unitdir}/ripd.service +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcripd +install -p -m 644 redhat/ospfd.service %{buildroot}%{_unitdir}/ospfd.service +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcospfd +install -p -m 644 redhat/bgpd.service %{buildroot}%{_unitdir}/bgpd.service +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcbgpd +install -p -m 644 redhat/babeld.service %{buildroot}%{_unitdir}/babeld.service +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcbabeld +install -p -m 644 redhat/ospf6d.service %{buildroot}%{_unitdir}/ospf6d.service +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcospf6d +install -p -m 644 redhat/ripngd.service %{buildroot}%{_unitdir}/ripngd.service +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcripngd +install -d -m 755 %{buildroot}/%{_tmpfilesdir} +install -p -m 644 %{SOURCE5} %{buildroot}/%{_tmpfilesdir}/quagga.conf +%else install -m 755 SUSE/* %{buildroot}%{_sysconfdir}/init.d/ -install -m 644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/quagga -install -d -m 750 %{buildroot}%{_localstatedir}/log/quagga -install -d -m 751 %{buildroot}/run/quagga -install -m 644 redhat/quagga.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/quagga ln -sf %{_sysconfdir}/init.d/zebra %{buildroot}%{_sbindir}/rczebra ln -sf %{_sysconfdir}/init.d/bgpd %{buildroot}%{_sbindir}/rcbgpd ln -sf %{_sysconfdir}/init.d/ospf6d %{buildroot}%{_sbindir}/rcospf6d ln -sf %{_sysconfdir}/init.d/ospfd %{buildroot}%{_sbindir}/rcospfd ln -sf %{_sysconfdir}/init.d/ripngd %{buildroot}%{_sbindir}/rcripngd ln -sf %{_sysconfdir}/init.d/ripd %{buildroot}%{_sbindir}/rcripd +%endif +install -m 644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/quagga +install -d -m 750 %{buildroot}%{_localstatedir}/log/quagga +install -d -m 751 %{buildroot}/run/quagga +install -m 644 redhat/quagga.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/quagga rm -f %{buildroot}%{_sysconfdir}/quagga/*.sample* cat > %{buildroot}%{_sysconfdir}/quagga/zebra.conf << __EOF__ hostname quagga @@ -148,31 +183,50 @@ %{_sbindir}/useradd -r -g quagga -s %{_bindir}/false \ -c "Quagga routing daemon" \ -d /run/quagga quagga 2> /dev/null || : +%if %{with systemd} +%service_add_pre zebra.service isisd.service ripd.service ospfd.service bgpd.service babeld.service ospf6d.service ripngd.service +%endif %post /sbin/ldconfig +%if %{with systemd} +%service_add_post zebra.service isisd.service ripd.service ospfd.service bgpd.service babeld.service ospf6d.service ripngd.service +%{fillup_only} +%else %fillup_and_insserv +%endif %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %preun +%if %{with systemd} +%service_del_preun zebra.service isisd.service ripd.service ospfd.service bgpd.service babeld.service ospf6d.service ripngd.service +%else %stop_on_removal zebra bgpd ospf6d ospfd ripd ripngd +%endif %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%if %{with systemd} +%service_del_postun zebra.service isisd.service ripd.service ospfd.service bgpd.service babeld.service ospf6d.service ripngd.service +%else %restart_on_update zebra bgpd ospf6d ospfd ripd ripngd %insserv_cleanup +%endif /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %doc */*.sample* AUTHORS COPYING* ChangeLog NEWS README REPORTING-BUGS SERVICES TODO %{_sbindir}/* %config %{_sysconfdir}/quagga/ %config(noreplace) %{_sysconfdir}/logrotate.d/* +%if %{with systemd} +%{_unitdir}/*.service +%dir %{_tmpfilesdir} +%{_tmpfilesdir}/quagga.conf +%else %config %{_sysconfdir}/init.d/* +%endif %config (noreplace)%{_sysconfdir}/pam.d/* %{_bindir}/* %dir %attr(-,quagga,quagga) %{_localstatedir}/log/quagga @@ -184,7 +238,6 @@ %files devel %defattr(644,root,root,755) %{_libdir}/*.so -%{_libdir}/*.la %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %dir %{_includedir}/%{name}/ospfd ++++++ 0001-systemd-change-the-WantedBy-target.patch ++++++ diff --git a/redhat/babeld.service b/redhat/babeld.service index b1ea943..a7ea7fe 100644 --- a/redhat/babeld.service +++ b/redhat/babeld.service @@ -1,14 +1,15 @@ [Unit] Description=Babel routing daemon -BindTo=zebra.service -After=syslog.target network.target zebra.service +BindsTo=zebra.service +After=zebra.service ConditionPathExists=/etc/quagga/babeld.conf [Service] Type=forking +PIDFile=/run/quagga/babeld.pid EnvironmentFile=/etc/sysconfig/quagga ExecStart=/usr/sbin/babeld -d $BABELD_OPTS -f /etc/quagga/babeld.conf Restart=on-abort [Install] -WantedBy=network.target +WantedBy=multi-user.target diff --git a/redhat/bgpd.service b/redhat/bgpd.service index 5040284..af923df 100644 --- a/redhat/bgpd.service +++ b/redhat/bgpd.service @@ -1,14 +1,15 @@ [Unit] Description=BGP routing daemon -BindTo=zebra.service -After=syslog.target network.target zebra.service +BindsTo=zebra.service +After=zebra.service ConditionPathExists=/etc/quagga/bgpd.conf [Service] Type=forking +PIDFile=/run/quagga/bgpd.pid EnvironmentFile=/etc/sysconfig/quagga ExecStart=/usr/sbin/bgpd -d $BGPD_OPTS -f /etc/quagga/bgpd.conf Restart=on-abort [Install] -WantedBy=network.target +WantedBy=multi-user.target diff --git a/redhat/isisd.service b/redhat/isisd.service index 4cdf67d..8687601 100644 --- a/redhat/isisd.service +++ b/redhat/isisd.service @@ -1,14 +1,15 @@ [Unit] Description=IS-IS routing daemon -BindTo=zebra.service -After=syslog.target network.target zebra.service +BindsTo=zebra.service +After=zebra.service ConditionPathExists=/etc/quagga/isisd.conf [Service] Type=forking +PIDFile=/run/quagga/isisd.pid EnvironmentFile=/etc/sysconfig/quagga ExecStart=/usr/sbin/isisd -d $ISISD_OPTS -f /etc/quagga/isisd.conf Restart=on-abort [Install] -WantedBy=network.target +WantedBy=multi-user.target diff --git a/redhat/ospf6d.service b/redhat/ospf6d.service index 3c9c466..d13e970 100644 --- a/redhat/ospf6d.service +++ b/redhat/ospf6d.service @@ -1,14 +1,15 @@ [Unit] Description=OSPF routing daemon for IPv6 -BindTo=zebra.service -After=syslog.target network.target zebra.service +BindsTo=zebra.service +After=zebra.service ConditionPathExists=/etc/quagga/ospf6d.conf [Service] Type=forking +PIDFile=/run/quagga/ospf6d.pid EnvironmentFile=/etc/sysconfig/quagga ExecStart=/usr/sbin/ospf6d -d $OSPF6D_OPTS -f /etc/quagga/ospf6d.conf Restart=on-abort [Install] -WantedBy=network.target +WantedBy=multi-user.target diff --git a/redhat/ospfd.service b/redhat/ospfd.service index 5e3de23..959e649 100644 --- a/redhat/ospfd.service +++ b/redhat/ospfd.service @@ -1,14 +1,15 @@ [Unit] Description=OSPF routing daemon -BindTo=zebra.service -After=syslog.target network.target zebra.service +BindsTo=zebra.service +After=zebra.service ConditionPathExists=/etc/quagga/ospfd.conf [Service] Type=forking +PIDFile=/run/quagga/ospfd.pid EnvironmentFile=/etc/sysconfig/quagga ExecStart=/usr/sbin/ospfd -d $OSPFD_OPTS -f /etc/quagga/ospfd.conf Restart=on-abort [Install] -WantedBy=network.target +WantedBy=multi-user.target diff --git a/redhat/ripd.service b/redhat/ripd.service index d35dc47..8e7290e 100644 --- a/redhat/ripd.service +++ b/redhat/ripd.service @@ -1,14 +1,15 @@ [Unit] Description=RIP routing daemon -BindTo=zebra.service -After=syslog.target network.target zebra.service +BindsTo=zebra.service +After=zebra.service ConditionPathExists=/etc/quagga/ripd.conf [Service] Type=forking +PIDFile=/run/quagga/ripd.pid EnvironmentFile=/etc/sysconfig/quagga ExecStart=/usr/sbin/ripd -d $RIPD_OPTS -f /etc/quagga/ripd.conf Restart=on-abort [Install] -WantedBy=network.target +WantedBy=multi-user.target diff --git a/redhat/ripngd.service b/redhat/ripngd.service index 567e888..1ba6dcf 100644 --- a/redhat/ripngd.service +++ b/redhat/ripngd.service @@ -1,14 +1,15 @@ [Unit] Description=RIP routing daemon for IPv6 -BindTo=zebra.service -After=syslog.target network.target zebra.service +BindsTo=zebra.service +After=zebra.service ConditionPathExists=/etc/quagga/ripngd.conf [Service] Type=forking +PIDFile=/run/quagga/ripngd.pid EnvironmentFile=/etc/sysconfig/quagga ExecStart=/usr/sbin/ripngd -d $RIPNGD_OPTS -f /etc/quagga/ripngd.conf Restart=on-abort [Install] -WantedBy=network.target +WantedBy=multi-user.target diff --git a/redhat/zebra.service b/redhat/zebra.service index 27c3a52..259fc20 100644 --- a/redhat/zebra.service +++ b/redhat/zebra.service @@ -1,14 +1,16 @@ [Unit] Description=GNU Zebra routing manager -After=syslog.target network.target +Wants=network.target +Before=network.target ConditionPathExists=/etc/quagga/zebra.conf [Service] Type=forking +PIDFile=/run/quagga/zebra.pid EnvironmentFile=-/etc/sysconfig/quagga ExecStartPre=/sbin/ip route flush proto zebra ExecStart=/usr/sbin/zebra -d $ZEBRA_OPTS -f /etc/quagga/zebra.conf Restart=on-abort [Install] -WantedBy=network.target +WantedBy=multi-user.target ++++++ quagga-0.99.23.tar.xz -> quagga-0.99.24.1.tar.xz ++++++ ++++ 103889 lines of diff (skipped) ++++++ quagga-tmpfs.conf ++++++ d /var/run/quagga 0755 quagga quagga -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
