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

- Updated to version 0.6.9:
  * Upstream web moved.
  * pkcs11_listcerts: Do not fail on certificate error.
  * Do not fail if card was already unlocked.
  * Other bug fixes.
  * Translation updates.
- Drop upstreamed pam_pkcs11-0.6.8-fix-crypto-cflags.patch.
- Work around incorrect upstream release process not calling
  "make dist".
- Split API documentation into a separate package
  pam_pkcs11-devel-doc.
- Add pam_pkcs11-fsf-address.patch.

OBS-URL: https://build.opensuse.org/request/show/511684
OBS-URL: https://build.opensuse.org/package/show/security:chipcard/pam_pkcs11?expand=0&rev=17
This commit is contained in:
Stanislav Brabec 2017-07-21 12:17:18 +00:00 committed by Git OBS Bridge
parent 786c74ddf5
commit 9fa15c5ff5
7 changed files with 7451 additions and 56 deletions

View File

@ -1,12 +0,0 @@
diff -up ./configure.in.orig ./configure.in
--- ./configure.in.orig 2016-02-08 23:31:17.057761702 +0100
+++ ./configure.in 2016-02-08 23:31:44.917760530 +0100
@@ -157,7 +157,7 @@ fi
AM_CONDITIONAL(HAVE_NSS, test x$with_nss = xyes)
if test "$with_nss" = "yes"
then
- CRYPTO_CFLAGS="${NSS_CFLAGS}-DHAVE_NSS"
+ CRYPTO_CFLAGS="${NSS_CFLAGS} -DHAVE_NSS"
CRYPTO_LIBS=${NSS_LIBS}
else
CRYPTO_CFLAGS=${OPENSSL_CFLAGS}

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9d942e542ef35d0e1f990d9ff5bf9df0af84c828ed081add2eb1b4d84f0efbda
size 1147059

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,13 @@
Index: pam_pkcs11-pam_pkcs11-0.6.9/COPYING
===================================================================
--- pam_pkcs11-pam_pkcs11-0.6.9.orig/COPYING
+++ pam_pkcs11-pam_pkcs11-0.6.9/COPYING
@@ -2,7 +2,7 @@
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e867631b43ec52db934a9f691ea5dbde7514118cda5576e799b669fed9ffd2b4
size 269444

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Jul 20 18:02:57 CEST 2017 - sbrabec@suse.com
- Updated to version 0.6.9:
* Upstream web moved.
* pkcs11_listcerts: Do not fail on certificate error.
* Do not fail if card was already unlocked.
* Other bug fixes.
* Translation updates.
- Drop upstreamed pam_pkcs11-0.6.8-fix-crypto-cflags.patch.
- Work around incorrect upstream release process not calling
"make dist".
- Split API documentation into a separate package
pam_pkcs11-devel-doc.
- Add pam_pkcs11-fsf-address.patch.
-------------------------------------------------------------------
Tue Feb 9 19:02:43 UTC 2016 - antoine.belvire@laposte.net

View File

@ -1,7 +1,7 @@
#
# spec file for package pam_pkcs11
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 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
@ -16,21 +16,27 @@
#
# It seems to be an upstream naming bug:
%define _name pam_pkcs11-pam_pkcs11
Name: pam_pkcs11
Version: 0.6.8
Version: 0.6.9
Release: 0
Url: http://www.opensc-project.org/pam_pkcs11/
Summary: PKCS #11 PAM Module
License: LGPL-2.1+
Group: Productivity/Security
Source: %{name}-%{version}.tar.gz
Url: https://github.com/OpenSC/pam_pkcs11
Source: %{_name}-%{version}.tar.gz
Source1: pam_pkcs11-common-auth-smartcard.pam
Source2: baselibs.conf
# make dist was not called.
Source3: pam_pkcs11-0.6.9-ChangeLog.git
Patch: %{name}-fsf-address.patch
Patch1: %{name}-0.5.3-nss-conf.patch
# PATCH-FIX-UPSTREAM pam_pkcs11-0.6.8-fix-crypto-cflags.patch -- Fix CFLAGS and build for Tumbleweed
Patch2: %{name}-0.6.8-fix-crypto-cflags.patch
Patch3: %{name}-0.6.0-nss-autoconf.patch
BuildRequires: curl-devel
BuildRequires: docbook-xsl-stylesheets
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: libtool
BuildRequires: libxslt
@ -39,8 +45,7 @@ BuildRequires: openldap2-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: pcsc-lite-devel
BuildRequires: pkg-config
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: pkgconfig
%description
This Linux PAM module allows X.509 a certificate-based user
@ -60,26 +65,43 @@ Additionally, the package includes pam_pkcs11-related tools: *
* make_hash_links: Creates hash link directories for storing CAs and
CRLs
Authors:
--------
Mario Strasser <mast@gmx.net>
Juan Antonio Martinez <jonsito@teleline.es>
Antti Tapaninen <aet@cc.hut.fi>
Timo Sirainen <tss@iki.fi>
Ludovic Rousseau <ludovic.rousseau@free.fr>
Andreas Jellinghaus <aj@dungeon.inka.de>
Dominik Fischer <dom_fischer@web.de>
Ville Skyttä <vskytta@gmail.com>
%package devel-doc
Summary: PKCS #11 API PAM Documentation
# File conflict. devel-doc split was done with 0.6.9 upgrade, after SLE 12 SP3, Leap 42.3.
Group: Documentation/HTML
Conflicts: pam_pkcs11 < 0.6.9
%description devel-doc
API documentation for pam_pkcs11
This Linux PAM module allows X.509 a certificate-based user
authentication. The certificate and its dedicated private key are
thereby accessed by means of an appropriate PKCS #11 module. For the
verification of the users' certificates, locally stored CA certificates
as well as online or locally accessible CRLs are used.
Additionally, the package includes pam_pkcs11-related tools: *
pkcs11_eventmgr: Generates actions on card insert, removal, or
time-out events
* pklogin_finder: Gets the login name that maps to a certificate
* pkcs11_inspect: Inspects the contents of a certificate
* make_hash_links: Creates hash link directories for storing CAs and
CRLs
%prep
%setup -q
%setup -q -n %{_name}-%{version}
%patch -p1
%patch1 -p1
%patch2
%patch3 -p1
cp -a %{S:1} common-auth-smartcard
mv po/pt_br.po po/pt_BR.po
sed -i s/pt_br/pt_BR/ configure.in configure
cp -a %{SOURCE1} common-auth-smartcard
sed -i s:/lib/:/%{_lib}/:g etc/pam_pkcs11.conf.example.in etc/pkcs11_eventmgr.conf.example
# make dist was not called and cannot be called on a non git snapshot.
cp -a %{SOURCE3} ChangeLog.git
sed -i "/git log/d" Makefile.am
sed -i '/^HTML_TIMESTAMP/s/YES/NO/' doc/doxygen.conf.in
%build
./bootstrap
@ -87,41 +109,46 @@ sed -i s:/lib/:/%{_lib}/:g etc/pam_pkcs11.conf.example.in etc/pkcs11_eventmgr.co
--docdir=%{_docdir}/%{name}\
--with-nss\
--with-curl
make %{?jobs:-j%jobs}
make %{?_smp_mflags}
# Generate documentation: This sounds like an upstream bug while making an upstream source tarball.
make %{?_smp_mflags} dist
%install
%makeinstall
mkdir -p $RPM_BUILD_ROOT/%{_lib}
mv $RPM_BUILD_ROOT%{_libdir}/security $RPM_BUILD_ROOT/%{_lib}
rm $RPM_BUILD_ROOT%{_libdir}/pam_pkcs11/*.*a $RPM_BUILD_ROOT/%{_lib}/security/*.*a
%make_install
mkdir -p %{buildroot}/%{_lib}
mv %{buildroot}%{_libdir}/security %{buildroot}/%{_lib}
rm %{buildroot}%{_libdir}/pam_pkcs11/*.*a %{buildroot}/%{_lib}/security/*.*a
# Hardcoded defaults... no sysconfdir
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam_pkcs11/cacerts
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam_pkcs11/crls
install -dm 755 %{buildroot}%{_sysconfdir}/pam_pkcs11/cacerts
install -dm 755 %{buildroot}%{_sysconfdir}/pam_pkcs11/crls
cd etc
for conf in *.conf.example ; do
install -m 644 ${conf} $RPM_BUILD_ROOT%{_sysconfdir}/pam_pkcs11/${conf%.example}
install -m 644 ${conf} %{buildroot}%{_sysconfdir}/pam_pkcs11/${conf%.example}
done
cd ..
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
cp -a AUTHORS COPYING ChangeLog ChangeLog.svn NEWS README TODO doc/pam_pkcs11.html doc/mappers_api.html doc/api doc/README.autologin doc/README.mappers $RPM_BUILD_ROOT%{_docdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
cp common-auth-smartcard $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
mkdir -p %{buildroot}%{_docdir}/%{name}
cp -a AUTHORS COPYING ChangeLog ChangeLog.git NEWS README README.md TODO doc/pam_pkcs11.html doc/mappers_api.html doc/api doc/README.autologin doc/README.mappers %{buildroot}%{_docdir}/%{name}
mkdir -p %{buildroot}%{_sysconfdir}/pam.d
cp common-auth-smartcard %{buildroot}%{_sysconfdir}/pam.d/
%find_lang %{name}
%fdupes -s %{buildroot}%{_docdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr (-, root, root)
%files -f %{name}.lang
%defattr(-,root,root)
%doc %{_docdir}/%{name}
%exclude %{_docdir}/%{name}/api
%{_bindir}/*
%{_libdir}/pam_pkcs11
/%{_lib}/security/*.so
%doc %{_mandir}/man?/*.*
%{_mandir}/man?/*%{ext_man}
%dir %{_sysconfdir}/pam_pkcs11
%dir %{_sysconfdir}/pam_pkcs11/cacerts
%dir %{_sysconfdir}/pam_pkcs11/crls
%config(noreplace) %{_sysconfdir}/pam_pkcs11/*.conf
%config(noreplace) %{_sysconfdir}/pam.d/common-auth-smartcard
%files devel-doc
%defattr(-,root,root)
%doc %{_docdir}/%{name}/api
%changelog