Hello community, here is the log from the commit of package keyutils for openSUSE:Factory checked in at 2017-04-03 11:04:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/keyutils (Old) and /work/SRC/openSUSE:Factory/.keyutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "keyutils" Mon Apr 3 11:04:36 2017 rev:30 rq:483310 version:1.5.9 Changes: -------- --- /work/SRC/openSUSE:Factory/keyutils/keyutils.changes 2015-02-06 10:52:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.keyutils.new/keyutils.changes 2017-04-03 11:04:37.711746740 +0200 @@ -1,0 +2,6 @@ +Tue Mar 21 15:31:03 UTC 2017 - [email protected] + +- move binaries from /bin to /usr/bin (bsc#1029969) +- keyutils-usr-move.patch: also adjust the request-key.conf file + +------------------------------------------------------------------- New: ---- keyutils-usr-move.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ keyutils.spec ++++++ --- /var/tmp/diff_new_pack.i9l7XL/_old 2017-04-03 11:04:38.475638816 +0200 +++ /var/tmp/diff_new_pack.i9l7XL/_new 2017-04-03 11:04:38.479638251 +0200 @@ -1,7 +1,7 @@ # # spec file for package keyutils # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,7 @@ Patch1: request-key-cifs.patch Patch2: request-key-nfs4.patch Patch3: keyutils-nodate.patch +Patch4: keyutils-usr-move.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,12 +61,17 @@ %patch1 -p0 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="%{optflags}" CC="%__cc" %install -make install NO_ARLIB=1 DESTDIR=%{buildroot} LIBDIR=/%{_lib} USRLIBDIR=%{_libdir} +make install NO_ARLIB=1 DESTDIR=%{buildroot} BINDIR=/%{_bindir} SBINDIR=/%{_sbindir} LIBDIR=/%{_libdir} USRLIBDIR=%{_libdir} +mkdir -p %{buildroot}/bin %{buildroot}/sbin +ln -s /%{_bindir}/keyctl %{buildroot}/bin +ln -s /%{_sbindir}/key.dns_resolver %{buildroot}/sbin +ln -s /%{_sbindir}/request-key %{buildroot}/sbin %post -n %lname -p /sbin/ldconfig @@ -76,6 +82,8 @@ %doc README LICENCE.GPL /sbin/* /bin/* +/%{_sbindir}/* +/%{_bindir}/* %{_datadir}/keyutils %{_mandir}/*/* %config(noreplace) %{_sysconfdir}/request-key.conf @@ -84,7 +92,7 @@ %files -n %lname %defattr(-,root,root,-) %doc LICENCE.LGPL -/%{_lib}/libkeyutils.so.* +/%{_libdir}/libkeyutils.so.* %files devel %defattr(-,root,root,-) ++++++ keyutils-usr-move.patch ++++++ Index: keyutils-1.5.9/request-key.conf =================================================================== --- keyutils-1.5.9.orig/request-key.conf +++ keyutils-1.5.9/request-key.conf @@ -31,14 +31,14 @@ #OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... #====== ======= =============== =============== =============================== -create dns_resolver * * /sbin/key.dns_resolver %k -create user debug:* negate /bin/keyctl negate %k 30 %S -create user debug:* rejected /bin/keyctl reject %k 30 %c %S -create user debug:* expired /bin/keyctl reject %k 30 %c %S -create user debug:* revoked /bin/keyctl reject %k 30 %c %S +create dns_resolver * * /usr/sbin/key.dns_resolver %k +create user debug:* negate /usr/bin/keyctl negate %k 30 %S +create user debug:* rejected /usr/bin/keyctl reject %k 30 %c %S +create user debug:* expired /usr/bin/keyctl reject %k 30 %c %S +create user debug:* revoked /usr/bin/keyctl reject %k 30 %c %S create user debug:loop:* * |/bin/cat create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S create cifs.spnego * * /usr/sbin/cifs.upcall %k -negate * * * /bin/keyctl negate %k 30 %S +negate * * * /usr/bin/keyctl negate %k 30 %S create id_resolver * * /usr/sbin/nfsidmap %k %d -t 600
