From c6e7042f02a7f5d4e7633571c801214ba9b6ddf9 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Fri, 13 Mar 2009 21:33:06 +0000
Subject: [PATCH] - security update to 0.11.7, fixes SA34052

from douglas santos (MAINTAINER)
---
 security/opensc/Makefile                      |  4 ++--
 security/opensc/distinfo                      | 10 +++++-----
 security/opensc/patches/patch-configure       | 12 ++++++------
 security/opensc/patches/patch-doc_Makefile_in | 12 ++++++------
 security/opensc/pkg/PLIST                     |  7 ++++---
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index e8c6020768e..4d7fcf49e3a 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2008/12/23 19:10:33 jasper Exp $
+# $OpenBSD: Makefile,v 1.9 2009/03/13 21:33:06 jasper Exp $
 
 COMMENT=	set of libraries and utilities to access smart cards
 
-DISTNAME=	opensc-0.11.6
+DISTNAME=	opensc-0.11.7
 CATEGORIES=	security
 SHARED_LIBS +=  scconf               2.0      # .1.0
 SHARED_LIBS +=  opensc               2.0      # .1.0
diff --git a/security/opensc/distinfo b/security/opensc/distinfo
index bcc56f1f63f..b25af0921c9 100644
--- a/security/opensc/distinfo
+++ b/security/opensc/distinfo
@@ -1,5 +1,5 @@
-MD5 (opensc-0.11.6.tar.gz) = pCZ1nxE1DDKvLxelzU1ZOA==
-RMD160 (opensc-0.11.6.tar.gz) = 3oONgnAw8Yf/pXAo269QE/bILmg=
-SHA1 (opensc-0.11.6.tar.gz) = CqO2pXpzD44G8ThTciDDDucJA38=
-SHA256 (opensc-0.11.6.tar.gz) = gB/bAFgsInbkdjXhcDmn+FRnwMsYTXTM56wxPSSsqgA=
-SIZE (opensc-0.11.6.tar.gz) = 1452763
+MD5 (opensc-0.11.7.tar.gz) = QZ6b43LC+buzzpcEySnV7A==
+RMD160 (opensc-0.11.7.tar.gz) = KbIhvi58+4/6646EgHHhfm8Uz+s=
+SHA1 (opensc-0.11.7.tar.gz) = +R9muzUNlMB/sB5CfJNs5W8cfQ0=
+SHA256 (opensc-0.11.7.tar.gz) = basnPL26jpLFkgdxUZn0j0+eVB5thzVh4wFUvUDEAR0=
+SIZE (opensc-0.11.7.tar.gz) = 1422696
diff --git a/security/opensc/patches/patch-configure b/security/opensc/patches/patch-configure
index 0e68409395b..1a8660c7adf 100644
--- a/security/opensc/patches/patch-configure
+++ b/security/opensc/patches/patch-configure
@@ -1,13 +1,13 @@
-$OpenBSD: patch-configure,v 1.2 2008/12/23 19:10:33 jasper Exp $
---- configure.orig	Wed Aug 27 08:27:00 2008
-+++ configure	Tue Dec 23 19:58:18 2008
-@@ -21306,9 +21306,6 @@ fi
+$OpenBSD: patch-configure,v 1.3 2009/03/13 21:33:06 jasper Exp $
+--- configure.orig	Mon Mar  2 08:52:09 2009
++++ configure	Mon Mar  2 08:52:53 2009
+@@ -8363,9 +8363,6 @@
  # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ LIBTOOL_DEPS="$ltmain"
  
 -# Always use our own libtool.
 -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 -
- # Prevent multiple expansion
+ 
  
  
diff --git a/security/opensc/patches/patch-doc_Makefile_in b/security/opensc/patches/patch-doc_Makefile_in
index 6371ab692cf..993d0adf667 100644
--- a/security/opensc/patches/patch-doc_Makefile_in
+++ b/security/opensc/patches/patch-doc_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.1 2008/12/23 19:10:33 jasper Exp $
---- doc/Makefile.in.orig	Tue Dec 23 20:00:55 2008
-+++ doc/Makefile.in	Tue Dec 23 20:01:07 2008
-@@ -224,7 +224,7 @@ libdir = @libdir@
- libexecdir = @libexecdir@
+$OpenBSD: patch-doc_Makefile_in,v 1.2 2009/03/13 21:33:06 jasper Exp $
+--- doc/Makefile.in.orig	Thu Feb 26 06:01:10 2009
++++ doc/Makefile.in	Mon Mar  2 08:51:01 2009
+@@ -234,7 +234,7 @@
  localedir = @localedir@
  localstatedir = @localstatedir@
+ lt_ECHO = @lt_ECHO@
 -mandir = @mandir@
-+mandir = @prefix@/man/
++mandir = @prefix@/man
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
  openscincludedir = @openscincludedir@
diff --git a/security/opensc/pkg/PLIST b/security/opensc/pkg/PLIST
index 91e602a4360..c616334d7b0 100644
--- a/security/opensc/pkg/PLIST
+++ b/security/opensc/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.2 2008/12/23 19:10:33 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.3 2009/03/13 21:33:06 jasper Exp $
 %%SHARED%%
-@bin bin/cardos-info
+bin/cardos-info
+@bin bin/cardos-tool
 @bin bin/cryptoflex-tool
 @bin bin/eidenv
 @bin bin/netkey-tool
@@ -47,7 +48,7 @@ lib/pkgconfig/
 lib/pkgconfig/libopensc.pc
 lib/pkgconfig/libpkcs15init.pc
 lib/pkgconfig/libscconf.pc
-@man man/man1/cardos-info.1
+@man man/man1/cardos-tool.1
 @man man/man1/cryptoflex-tool.1
 @man man/man1/netkey-tool.1
 @man man/man1/opensc-config.1