Accepting request 184579 from security

- Use macros bit more and fix noreplace on folder, which is not
  good.

- Remove deprecated -c arg while calling cifs.upcall from request-key.conf.

OBS-URL: https://build.opensuse.org/request/show/184579
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/keyutils?expand=0&rev=24
This commit is contained in:
Stephan Kulow 2013-07-29 19:06:35 +00:00 committed by Git OBS Bridge
commit 18d1fc05d0
4 changed files with 19 additions and 8 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Jul 29 08:37:36 UTC 2013 - tchvatal@suse.com
- Use macros bit more and fix noreplace on folder, which is not
good.
-------------------------------------------------------------------
Sun Jun 16 16:59:30 UTC 2013 - lmuelle@suse.com
- Remove deprecated -c arg while calling cifs.upcall from request-key.conf.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 1 18:53:40 UTC 2013 - coolo@suse.com Fri Feb 1 18:53:40 UTC 2013 - coolo@suse.com

View File

@ -60,10 +60,10 @@ This package provides headers and libraries for building key utilities.
%patch3 -p1 %patch3 -p1
%build %build
make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS" CC="%__cc" make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="%{optflags}" CC="%__cc"
%install %install
make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_lib make install NO_ARLIB=1 DESTDIR=%{buildroot} LIBDIR=/%{_lib} USRLIBDIR=%{_libdir}
%post -n %lname -p /sbin/ldconfig %post -n %lname -p /sbin/ldconfig
@ -74,10 +74,10 @@ make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_l
%doc README LICENCE.GPL %doc README LICENCE.GPL
/sbin/* /sbin/*
/bin/* /bin/*
/usr/share/keyutils %{_datadir}/keyutils
%{_mandir}/*/* %{_mandir}/*/*
%config(noreplace) /etc/* %config(noreplace) %{_sysconfdir}/request-key.conf
%dir /etc/request-key.d/ %dir %{_sysconfdir}/request-key.d/
%files -n %lname %files -n %lname
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -86,7 +86,7 @@ make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_l
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
/usr/%{_lib}/libkeyutils.so %{_libdir}/libkeyutils.so
%{_includedir}/* %{_includedir}/*
%changelog %changelog

View File

@ -6,5 +6,5 @@ Index: request-key.conf
create user debug:* revoked /bin/keyctl reject %k 30 %c %S create user debug:* revoked /bin/keyctl reject %k 30 %c %S
create user debug:loop:* * |/bin/cat create user debug:loop:* * |/bin/cat
create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S
+create cifs.spnego * * /usr/sbin/cifs.upcall -c %k +create cifs.spnego * * /usr/sbin/cifs.upcall %k
negate * * * /bin/keyctl negate %k 30 %S negate * * * /bin/keyctl negate %k 30 %S

View File

@ -6,7 +6,7 @@
+++ b/request-key.conf +++ b/request-key.conf
@@ -40,3 +40,5 @@ create user debug:loop:* * |/bin/cat @@ -40,3 +40,5 @@ create user debug:loop:* * |/bin/cat
create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S
create cifs.spnego * * /usr/sbin/cifs.upcall -c %k create cifs.spnego * * /usr/sbin/cifs.upcall %k
negate * * * /bin/keyctl negate %k 30 %S negate * * * /bin/keyctl negate %k 30 %S
+create id_resolver * * /usr/sbin/nfsidmap %k %d -t 600 +create id_resolver * * /usr/sbin/nfsidmap %k %d -t 600
+ +