Accepting request 481825 from home:msmeissn:branches:security
- move binaries from /bin to /usr/bin (bsc#1029969) - keyutils-usr-move.patch: also adjust the request-key.conf file OBS-URL: https://build.opensuse.org/request/show/481825 OBS-URL: https://build.opensuse.org/package/show/security/keyutils?expand=0&rev=33
This commit is contained in:
Git OBS Bridge
parent
5b7b051e87
commit
deb3eb6667
25
keyutils-usr-move.patch
Normal file
25
keyutils-usr-move.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 21 15:33:52 UTC 2017 - meissner@suse.com
|
||||||
|
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 21 15:31:03 UTC 2017 - meissner@suse.com
|
||||||
|
|
||||||
|
- move binaries from /bin to /usr/bin (bsc#1029969)
|
||||||
|
- keyutils-usr-move.patch: also adjust the request-key.conf file
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Feb 4 13:11:19 UTC 2015 - meissner@suse.com
|
Wed Feb 4 13:11:19 UTC 2015 - meissner@suse.com
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package keyutils
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -29,6 +29,7 @@ Source1: baselibs.conf
|
|||||||
Patch1: request-key-cifs.patch
|
Patch1: request-key-cifs.patch
|
||||||
Patch2: request-key-nfs4.patch
|
Patch2: request-key-nfs4.patch
|
||||||
Patch3: keyutils-nodate.patch
|
Patch3: keyutils-nodate.patch
|
||||||
|
Patch4: keyutils-usr-move.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -60,12 +61,17 @@ This package provides headers and libraries for building key utilities.
|
|||||||
%patch1 -p0
|
%patch1 -p0
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="%{optflags}" CC="%__cc"
|
make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="%{optflags}" CC="%__cc"
|
||||||
|
|
||||||
%install
|
%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
|
%post -n %lname -p /sbin/ldconfig
|
||||||
|
|
||||||
@ -76,6 +82,8 @@ make install NO_ARLIB=1 DESTDIR=%{buildroot} LIBDIR=/%{_lib} USRLIBDIR=%{_libdir
|
|||||||
%doc README LICENCE.GPL
|
%doc README LICENCE.GPL
|
||||||
/sbin/*
|
/sbin/*
|
||||||
/bin/*
|
/bin/*
|
||||||
|
/%{_sbindir}/*
|
||||||
|
/%{_bindir}/*
|
||||||
%{_datadir}/keyutils
|
%{_datadir}/keyutils
|
||||||
%{_mandir}/*/*
|
%{_mandir}/*/*
|
||||||
%config(noreplace) %{_sysconfdir}/request-key.conf
|
%config(noreplace) %{_sysconfdir}/request-key.conf
|
||||||
@ -84,7 +92,7 @@ make install NO_ARLIB=1 DESTDIR=%{buildroot} LIBDIR=/%{_lib} USRLIBDIR=%{_libdir
|
|||||||
%files -n %lname
|
%files -n %lname
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc LICENCE.LGPL
|
%doc LICENCE.LGPL
|
||||||
/%{_lib}/libkeyutils.so.*
|
/%{_libdir}/libkeyutils.so.*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user