Hello community, here is the log from the commit of package rpcbind for openSUSE:Factory checked in at 2013-05-07 15:42:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpcbind (Old) and /work/SRC/openSUSE:Factory/.rpcbind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpcbind" Changes: -------- --- /work/SRC/openSUSE:Factory/rpcbind/rpcbind.changes 2012-11-30 12:30:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/rpcbind.changes 2013-05-07 15:42:08.000000000 +0200 @@ -1,0 +2,14 @@ +Mon May 6 12:20:44 UTC 2013 - [email protected] + +- license update: BSD-4-Clause + Look at src/util.c + +------------------------------------------------------------------- +Thu Apr 4 00:32:00 UTC 2013 - [email protected] + +- remove sysvinit support (read opensuse-packaging for details) +- remove "portmap" migration, according to the time machine + it went away in openSUSE 11.2 and the oldest supported version + is now 12.1 + +------------------------------------------------------------------- Old: ---- rpcbind.init ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpcbind.spec ++++++ --- /var/tmp/diff_new_pack.31CbzM/_old 2013-05-07 15:42:09.000000000 +0200 +++ /var/tmp/diff_new_pack.31CbzM/_new 2013-05-07 15:42:09.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rpcbind # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -20,11 +20,10 @@ Version: 0.2.0_git201103171419 Release: 0 Summary: Transport independent RPC portmapper -License: BSD-3-Clause +License: BSD-4-Clause Group: Productivity/Networking/System Url: http://git.infradead.org/users/steved/rpcbind.git Source: %{name}-%{version}.tar.bz2 -Source1: rpcbind.init Source2: sysconfig.rpcbind Source3: rpcbind.xml Source4: pmap_set.c @@ -33,23 +32,15 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: tcpd-devel -Provides: portmap = 6.0+git20070716 -Obsoletes: portmap <= 6.0+git20070716 -# hopefully soon we will have this autogenerated from rpm -Provides: sysvinit(portmap) -Provides: sysvinit(rpcbind) -PreReq: %insserv_prereq %fillup_prereq /sbin/checkproc sysvinit(network) +PreReq: %fillup_prereq Patch0: 0001-systemd-add-support-for-system-bus-activation.patch Patch1: socket-activation-don-t-unlink-socket-we-didn-t-create Patch2: socket-activation-fix-rpcbind-service-to-use-separate-sockets Patch3: rpcbind-journal.patch Patch4: move-lock-file-to-run-fs.patch %define statefile /var/lib/portmap.state -%if 0%{?suse_version} > 1140 -BuildRequires: systemd-devel +BuildRequires: pkgconfig(systemd) %{?systemd_requires} -%define has_systemd 1 -%endif %description Rpcbind is a replacement for portmap. Whereas portmap supports only UDP @@ -85,13 +76,10 @@ --with-statedir=%{_localstatedir}/lib/rpcbind %{__make} %{?jobs:-j%jobs} -%{__cc} -fwhole-program -Wl,-z,relro,-z,now %{optflags} pmap_set.c -o pmap_set +%{__cc} -pie -fpie -fwhole-program -Wl,-z,relro,-z,now %{optflags} pmap_set.c -o pmap_set %install make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/etc/init.d/ -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/rpcbind -ln -s /etc/init.d/rpcbind $RPM_BUILD_ROOT/sbin/rcrpcbind mkdir -p $RPM_BUILD_ROOT%_localstatedir/lib/rpcbind # fillup template mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates @@ -105,46 +93,17 @@ rm -rf $RPM_BUILD_ROOT %pre -# upgrade case from portmap -# 1. if portmap is running, dump portmap tables -if test -x /sbin/portmap && /sbin/checkproc /sbin/portmap; then - rm -f %statefile - test -x /sbin/pmap_dump && /sbin/pmap_dump > %statefile -fi -# 2. disable portmap service to be able to enable rpcbind -if test -x /sbin/portmap && /sbin/chkconfig -c portmap 3; then - /sbin/insserv -f -r portmap -fi -%if 0%{?has_systemd} %service_add_pre %{name}.service %{name}.socket -%endif %preun -%stop_on_removal rpcbind -%if 0%{?has_systemd} %service_del_preun %{name}.service %{name}.socket -%endif %post -%fillup_and_insserv rpcbind -# if portmap is running, we need to stop portmap *now*, -# start rpcbind and restore the old tables -if test -r %statefile; then - /etc/init.d/portmap stop > /dev/null || : - /etc/init.d/rpcbind start > /dev/null || : - /sbin/pmap_set2 < %statefile - rm -f %statefile -fi -%if 0%{?has_systemd} +%{fillup_only -n rpcbind} %service_add_post %{name}.service %{name}.socket -%endif %postun -%restart_on_update rpcbind -%insserv_cleanup -%if 0%{?has_systemd} %service_del_postun %{name}.service %{name}.socket -%endif %files %defattr(-,root,root) @@ -153,14 +112,10 @@ /sbin/rpcbind /sbin/rpcinfo %{_mandir}/*/* -%config /etc/init.d/rpcbind -/sbin/rcrpcbind %{_localstatedir}/lib/rpcbind /var/adm/fillup-templates/sysconfig.rpcbind %{_datadir}/omc/svcinfo.d/rpcbind.xml -%if 0%{?has_systemd} %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket -%endif %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
