rpm/pam_pkcs11
SHA256
1
0
Fork 0
forked from pool/pam_pkcs11
Code Pull Requests Activity

Accepting request 358604 from home:1Antoine1:branches:security:chipcard

Browse Source 
- Fix build for Tumbleweed:
  * Add pam_pkcs11-0.6.8-fix-crypto-cflags.patch
  * Rebuild configure with the bootstrap script (add libtool as
    build dependency)

Simply because "echo $(pkg-config --libs nss)-DHAVE-NSS" used to
return:
"-lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -DHAVE-NSS"
but returns:
"-lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4-DHAVE-NSS"
on Tumbleweed

OBS-URL: https://build.opensuse.org/request/show/358604
OBS-URL: https://build.opensuse.org/package/show/security:chipcard/pam_pkcs11?expand=0&rev=15
This commit is contained in:
Stanislav Brabec 2016-04-04 12:03:04 +00:00 committed by Git OBS Bridge
parent 677a6a89d2
commit 786c74ddf5
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pam_pkcs11-0.6.8-fix-crypto-cflags.patch Normal file
View File

@ -0,0 +1,12 @@
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}

8
pam_pkcs11.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Feb 9 19:02:43 UTC 2016 - antoine.belvire@laposte.net
- Fix build for Tumbleweed:
* Add pam_pkcs11-0.6.8-fix-crypto-cflags.patch
* Rebuild configure with the bootstrap script (add libtool as
build dependency)
-------------------------------------------------------------------
Tue Jul 10 17:24:56 CEST 2012 - sbrabec@suse.cz

7
pam_pkcs11.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package pam_pkcs11
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2016 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
@ -27,9 +27,12 @@ Source: %{name}-%{version}.tar.gz
Source1: pam_pkcs11-common-auth-smartcard.pam
Source2: baselibs.conf
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: flex
BuildRequires: libtool
BuildRequires: libxslt
BuildRequires: mozilla-nss-devel
BuildRequires: openldap2-devel
@ -71,6 +74,7 @@ Authors:
%prep
%setup -q
%patch1 -p1
%patch2
%patch3 -p1
cp -a %{S:1} common-auth-smartcard
mv po/pt_br.po po/pt_BR.po
@ -78,6 +82,7 @@ sed -i s/pt_br/pt_BR/ configure.in configure
sed -i s:/lib/:/%{_lib}/:g etc/pam_pkcs11.conf.example.in etc/pkcs11_eventmgr.conf.example
%build
./bootstrap
%configure\
--docdir=%{_docdir}/%{name}\
--with-nss\