summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-03-13 10:32:51 +0000
committerMike Frysinger <vapier@gentoo.org>2005-03-13 10:32:51 +0000
commit46d8420e3f0d0f4f554764599309b2913f323b16 (patch)
tree6b27ac1c7271879a2e1178069f6222682e39d6b5 /net-misc/openssh/files
parentRevision bump; updated list of files ignored in /etc/cron.d (diff)
downloadgentoo-2-46d8420e3f0d0f4f554764599309b2913f323b16.tar.gz
gentoo-2-46d8420e3f0d0f4f554764599309b2913f323b16.tar.bz2
gentoo-2-46d8420e3f0d0f4f554764599309b2913f323b16.zip
Fix USE=-opensc logic with patch by Stian Skjelstad #78730.
(Portage version: 2.0.51.19)
Diffstat (limited to 'net-misc/openssh/files')
-rw-r--r--net-misc/openssh/files/openssh-3.9_p1-configure-openct.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-3.9_p1-configure-openct.patch b/net-misc/openssh/files/openssh-3.9_p1-configure-openct.patch
new file mode 100644
index 000000000000..f6a3bab23cc1
--- /dev/null
+++ b/net-misc/openssh/files/openssh-3.9_p1-configure-openct.patch
@@ -0,0 +1,34 @@
+The --without-opensc logic is broken, so let's fix it.
+
+patch by Stian Skjelstad.
+
+http://bugs.gentoo.org/show_bug.cgi?id=78730
+
+--- openssh-3.9p1/configure.ac
++++ openssh-3.9p1/configure.ac
+@@ -2171,9 +2171,9 @@
+ AC_ARG_WITH(opensc,
+ AC_HELP_STRING([--with-opensc=PFX],
+ [Enable smartcard support using OpenSC]),
+- opensc_config_prefix="$withval", opensc_config_prefix="")
+-if test x$opensc_config_prefix != x ; then
+- OPENSC_CONFIG=$opensc_config_prefix/bin/opensc-config
++ [
++if test "x$withval" != xno ; then
++ OPENSC_CONFIG="$withval/bin/opensc-config"
+ AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no)
+ if test "$OPENSC_CONFIG" != "no"; then
+ LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags`
+@@ -2183,8 +2183,12 @@
+ AC_DEFINE(SMARTCARD)
+ AC_DEFINE(USE_OPENSC)
+ SCARD_MSG="yes, using OpenSC"
++ else
++ AC_MSG_ERROR([opensc-config not found])
+ fi
+ fi
++ ]
++)
+
+ # Check libraries needed by DNS fingerprint support
+ AC_SEARCH_LIBS(getrrsetbyname, resolv,