pool/coolkey
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 511836 from home:sbrabec:branches:security:chipcard

Browse Source 
- Add nssdb installation scripts.
- Run spec-cleaner.
- Drop coolkey-1.1.0-evoandooo.patch: The patch does nothing now.
  Evolution and LibreOffice changed over time. They moved its
  directories and they don't use secmod.db any more.

OBS-URL: https://build.opensuse.org/request/show/511836
OBS-URL: https://build.opensuse.org/package/show/security:chipcard/coolkey?expand=0&rev=18
This commit is contained in:
Stanislav Brabec 2017-07-21 12:50:41 +00:00 committed by Git OBS Bridge
parent 7fbf4fb2e0
commit 3042ae222b
3 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
coolkey-1.1.0-evoandooo.patch
View File

@ -1,11 +0,0 @@
--- coolkey-1.1.0/src/install/pk11install.c~ 2007-02-06 14:40:36.000000000 -0500
+++ coolkey-1.1.0/src/install/pk11install.c 2007-09-05 15:01:57.000000000 -0400
@@ -150,6 +150,8 @@ DirList dirList[] = {
{ HomeDir, ".mozilla/*", NULL },
{ HomeDir, ".thunderbird/*", NULL },
{ HomeDir, ".netscape", NULL },
+ { HomeDir, ".evolution", NULL },
+ { HomeDir, ".ooo-2.0/user", NULL },
#endif
#endif
#ifdef MAC

9
coolkey.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Jul 21 14:00:08 CEST 2017 - sbrabec@suse.com
- Add nssdb installation scripts.
- Run spec-cleaner.
- Drop coolkey-1.1.0-evoandooo.patch: The patch does nothing now.
Evolution and LibreOffice changed over time. They moved its
directories and they don't use secmod.db any more.
-------------------------------------------------------------------
Mon Jul 17 20:55:48 CEST 2017 - sbrabec@suse.com

53
coolkey.spec
View File

@ -16,6 +16,8 @@
#
%define coolkey_module "CoolKey PKCS #11 Module"
%define nssdb %{_sysconfdir}/pki/nssdb
Name: coolkey
Version: 1.1.0
Release: 0
@ -53,15 +55,13 @@ Patch24: coolkey-1.1.0-more-keys.patch
Patch25: coolkey-1.1.0-fail-on-bad-mechanisms.patch
Patch26: coolkey-1.1.0-max-cpu-bug.patch
Patch27: coolkey-1.1.0-rhel7-alt-cac.patch
# SUSE specific patches:
# PATCH-FEATURE-SLES coolkey-1.1.0-evoandooo.patch jberkman@novell.com -- Teach pk11install about evolution and openoffice.
Patch53: coolkey-1.1.0-evoandooo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: mozilla-nss-devel
BuildRequires: mozilla-nss-sysinit
BuildRequires: mozilla-nss-tools
BuildRequires: pcsc-lite-devel
BuildRequires: pkg-config
BuildRequires: pkgconfig
BuildRequires: zlib-devel
#Requires: pcsc-lite
# Requires: ifd-egate
@ -131,12 +131,11 @@ card and USB Fob form factors.
%patch25
%patch26
%patch27
%patch53 -p1
%build
autoreconf -f -i
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
%configure\
--with-debug\
--disable-dependency-tracking\
@ -144,15 +143,42 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
make %{?_smp_mflags}
%install
%makeinstall
ln -s pkcs11/libcoolkeypk11.so $RPM_BUILD_ROOT/%{_libdir}
%make_install
ln -s pkcs11/libcoolkeypk11.so %{buildroot}/%{_libdir}
%post -p /sbin/ldconfig
%triggerin -- mozilla-nss-sysinit mozilla-nss-tools
if [ -x %{_bindir}/pk11install -a -x %{_bindir}/modutil -a -f %{_sysconfdir}/pki/nssdb/pkcs11.txt ]; then
isThere=`modutil -rawlist -dbdir dbm:%{nssdb} | grep %{coolkey_module} || echo NO`
if [ "$isThere" == "NO" ]; then
pk11install -l -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
fi
isThere=`modutil -rawlist -dbdir sql:%{nssdb} | grep %{coolkey_module} || echo NO`
if [ "$isThere" == "NO" ]; then
pk11install -s -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
fi
fi
%postun -p /sbin/ldconfig
%post
/sbin/ldconfig
if [ -x %{_bindir}/pk11install -a -x %{_bindir}/modutil -a -f %{_sysconfdir}/pki/nssdb/pkcs11.txt ]; then
isThere=`modutil -rawlist -dbdir dbm:%{nssdb} | grep %{coolkey_module} || echo NO`
if [ "$isThere" == "NO" ]; then
pk11install -l -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
fi
isThere=`modutil -rawlist -dbdir sql:%{nssdb} | grep %{coolkey_module} || echo NO`
if [ "$isThere" == "NO" ]; then
pk11install -s -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
fi
fi
%postun
/sbin/ldconfig
if [ $1 -eq 0 -a -x %{_bindir}/modutil -a -f %{_sysconfdir}/pki/nssdb/pkcs11.txt ]; then
modutil -delete %{coolkey_module} -dbdir dbm:%{nssdb} -force || :
modutil -delete %{coolkey_module} -dbdir sql:%{nssdb} -force || :
fi
%files
%defattr(-,root,root)
%doc ChangeLog LICENSE README
%{_bindir}/pk11install
%{_libdir}/libcoolkeypk11.so
@ -162,7 +188,6 @@ ln -s pkcs11/libcoolkeypk11.so $RPM_BUILD_ROOT/%{_libdir}
%dir %{_libdir}/pkcs11
%files devel
%defattr(-,root,root)
%{_libdir}/libckyapplet.so
%{_libdir}/pkgconfig/*.pc
%{_includedir}/*.h