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:
commit
18d1fc05d0
@ -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
|
||||
|
||||
|
@ -60,10 +60,10 @@ This package provides headers and libraries for building key utilities.
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS" CC="%__cc"
|
||||
make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="%{optflags}" CC="%__cc"
|
||||
|
||||
%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
|
||||
|
||||
@ -74,10 +74,10 @@ make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_l
|
||||
%doc README LICENCE.GPL
|
||||
/sbin/*
|
||||
/bin/*
|
||||
/usr/share/keyutils
|
||||
%{_datadir}/keyutils
|
||||
%{_mandir}/*/*
|
||||
%config(noreplace) /etc/*
|
||||
%dir /etc/request-key.d/
|
||||
%config(noreplace) %{_sysconfdir}/request-key.conf
|
||||
%dir %{_sysconfdir}/request-key.d/
|
||||
|
||||
%files -n %lname
|
||||
%defattr(-,root,root,-)
|
||||
@ -86,7 +86,7 @@ make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_l
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
/usr/%{_lib}/libkeyutils.so
|
||||
%{_libdir}/libkeyutils.so
|
||||
%{_includedir}/*
|
||||
|
||||
%changelog
|
||||
|
@ -6,5 +6,5 @@ Index: request-key.conf
|
||||
create user debug:* revoked /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 -c %k
|
||||
+create cifs.spnego * * /usr/sbin/cifs.upcall %k
|
||||
negate * * * /bin/keyctl negate %k 30 %S
|
||||
|
@ -6,7 +6,7 @@
|
||||
+++ b/request-key.conf
|
||||
@@ -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 cifs.spnego * * /usr/sbin/cifs.upcall -c %k
|
||||
create cifs.spnego * * /usr/sbin/cifs.upcall %k
|
||||
negate * * * /bin/keyctl negate %k 30 %S
|
||||
+create id_resolver * * /usr/sbin/nfsidmap %k %d -t 600
|
||||
+
|
||||
|
Loading…
Reference in New Issue
Block a user