Hello community,
here is the log from the commit of package openCryptoki for openSUSE:Factory
checked in at 2015-04-23 08:04:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openCryptoki (Old)
and /work/SRC/openSUSE:Factory/.openCryptoki.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openCryptoki"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openCryptoki/openCryptoki.changes
2014-12-21 12:04:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.openCryptoki.new/openCryptoki.changes
2015-04-23 08:04:39.000000000 +0200
@@ -1,0 +2,20 @@
+Tue Apr 7 21:22:57 UTC 2015 - crrodrig...@opensuse.org
+
+- Also create parent directory /run/lock/opencryptoki in
+ tmpfiles snippet if it does not exists.
+
+-------------------------------------------------------------------
+Tue Apr 7 21:19:43 UTC 2015 - crrodrig...@opensuse.org
+
+- spec: do not use -D__USE_BSD, a glibc-internal macro
+ which no longer has any meaning.
+
+-------------------------------------------------------------------
+Tue Apr 7 21:18:21 UTC 2015 - crrodrig...@opensuse.org
+
+- spec: use %{_unitdir} %{_tmpfilesdir)
+- spec: call tmpfiles_create macro, if defined in %post
+- opencryptoki-run-lock.patch, openCryptoki-tmp.conf: use
+ /run/lock instead of /var/lock.
+
+-------------------------------------------------------------------
New:
----
opencryptoki-run-lock.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openCryptoki.spec ++++++
--- /var/tmp/diff_new_pack.IL5FdD/_old 2015-04-23 08:04:40.000000000 +0200
+++ /var/tmp/diff_new_pack.IL5FdD/_new 2015-04-23 08:04:40.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package openCryptoki
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -62,6 +62,7 @@
Patch2: ocki-3.1-fix-init_d-path.patch
Patch3: ocki-3.1-fix-implicit-decl.patch
Patch4: ocki-3.1-fix-libica-link.patch
+Patch5: opencryptoki-run-lock.patch
Url: http://sourceforge.net/projects/opencryptoki/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: /usr/sbin/groupadd /usr/bin/id /usr/sbin/usermod /bin/sed
@@ -143,14 +144,15 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
cp %{SOURCE2} .
%build
autoreconf --force --install
-CFLAGS="%optflags -D__USE_BSD" %configure \
+%configure \
--enable-tpmtok \
%if %{uses_systemd}
- --with-systemd=/usr/lib/systemd/system
+ --with-systemd=%{_unitdir}
%endif
make %{?_smp_mflags}
@@ -208,6 +210,7 @@
fi
/sbin/ldconfig
%if %{uses_systemd}
+%{?tmpfiles_create:%tmpfiles_create %{_tmpfilesdir}/openCryptoki-tmp.conf}
%{service_add_post pkcsslotd.service}
%else
%{fillup_and_insserv -f pkcsslotd}
@@ -266,8 +269,8 @@
%{_sbindir}/pkcsep11_migrate
%endif
%if %{uses_systemd}
-%{_prefix}/lib/systemd/system/pkcsslotd.service
-%{_prefix}/lib/tmpfiles.d/openCryptoki-tmp.conf
+%{_unitdir}/pkcsslotd.service
+%{_tmpfilesdir}/openCryptoki-tmp.conf
%else
%{_sysconfdir}/init.d/pkcsslotd
%ghost %dir %attr(770,root,pkcs11) %{_localstatedir}/lock/opencryptoki
++++++ openCryptoki-tmp.conf ++++++
--- /var/tmp/diff_new_pack.IL5FdD/_old 2015-04-23 08:04:40.000000000 +0200
+++ /var/tmp/diff_new_pack.IL5FdD/_new 2015-04-23 08:04:40.000000000 +0200
@@ -1,7 +1,8 @@
# Lock directories needed by openCryptoki
-D /var/lock/opencryptoki/swtok 0770 root pkcs11
-D /var/lock/opencryptoki/lite 0770 root pkcs11
-D /var/lock/opencryptoki/tpm 0770 root pkcs11
-D /var/lock/opencryptoki/ccatok 0770 root pkcs11
-D /var/lock/opencryptoki/icsf 0770 root pkcs11
-D /var/lock/opencryptoki/ep11tok 0770 root pkcs11
+D /run/lock/opencryptoki 0770 root pkcs11
+D /run/lock/opencryptoki/swtok 0770 root pkcs11
+D /run/lock/opencryptoki/lite 0770 root pkcs11
+D /run/lock/opencryptoki/tpm 0770 root pkcs11
+D /run/lock/opencryptoki/ccatok 0770 root pkcs11
+D /run/lock/opencryptoki/icsf 0770 root pkcs11
+D /run/lock/opencryptoki/ep11tok 0770 root pkcs11
++++++ opencryptoki-run-lock.patch ++++++
--- opencryptoki.orig/configure.in
+++ opencryptoki/configure.in
@@ -40,7 +40,7 @@ AC_PROG_YACC
dnl Define custom variables
-lockdir=$localstatedir/lock/opencryptoki
+lockdir=/run/lock/opencryptoki
AC_SUBST(lockdir)
dnl ---
