From 068a8602914683a79c2c5739acacb0f3f04c14d8 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Fri, 15 May 2015 17:45:27 +0000
Subject: [PATCH] upgrading package: libpki 0.8.7 -> 0.8.8

---
 libpki/libpki.patch | 27 ++++++++++++++++++---------
 libpki/libpki.spec  |  7 ++++---
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/libpki/libpki.patch b/libpki/libpki.patch
index f277e73035..79bff71d76 100644
--- a/libpki/libpki.patch
+++ b/libpki/libpki.patch
@@ -1,7 +1,7 @@
 Index: configure
---- configure.orig	2014-08-10 00:00:47.000000000 +0200
-+++ configure	2014-08-30 16:23:21.741316760 +0200
-@@ -2524,23 +2524,19 @@
+--- configure.orig	2015-01-21 18:27:50.000000000 +0100
++++ configure	2015-05-15 19:43:06.865162402 +0200
+@@ -2525,23 +2525,19 @@
    *i386)
      mybits="32"
      ;;
@@ -26,7 +26,7 @@ Index: configure
      is_aix="yes"
      ;;
    *)
-@@ -15256,6 +15252,11 @@
+@@ -15283,6 +15279,11 @@
  		enablemysql=no
  	fi
  
@@ -38,7 +38,7 @@ Index: configure
     if ! [ "${enablemysql}" = "no" ] ; then
  
  
-@@ -15430,6 +15431,11 @@
+@@ -15457,6 +15458,11 @@
  		enablepg=no
  	fi
  
@@ -50,10 +50,19 @@ Index: configure
     if ! [ "${enablepg}" = "no" ] ; then
  
  # Check whether --with-pg-prefix was given.
+@@ -16278,7 +16284,7 @@
+ 
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Searching OpenSSL Version: $library_includes" >&5
+ $as_echo "Searching OpenSSL Version: $library_includes" >&6; };
+-		ver=`grep "#define SHLIB_VERSION_NUMBER" $library_includes | sed 's/[#_a-zA-Z" ]//g' | sed 's|\.|0|g'`;
++		ver=`grep "# define SHLIB_VERSION_NUMBER" $library_includes | sed 's/[#_a-zA-Z" ]//g' | sed 's|\.|0|g'`;
+ 		my_ver=`echo $_version | sed "s|\.|0|g"`;
+ 
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Detected Version: $ver (required > $my_ver )" >&5
 Index: contrib/libpki.spec
 Index: src/libpki/net/sock.h
---- src/libpki/net/sock.h.orig	2014-08-10 00:00:47.000000000 +0200
-+++ src/libpki/net/sock.h	2014-08-30 16:12:11.561341019 +0200
+--- src/libpki/net/sock.h.orig	2015-01-21 18:27:50.000000000 +0100
++++ src/libpki/net/sock.h	2015-05-15 19:39:35.085104462 +0200
 @@ -15,12 +15,9 @@
  #ifndef __OPENCA_SOCK_WRAP_H
  #define __OPENCA_SOCK_WRAP_H
@@ -68,8 +77,8 @@ Index: src/libpki/net/sock.h
  #include <netdb.h>
  
 Index: src/net/dns.c
---- src/net/dns.c.orig	2014-08-10 00:00:47.000000000 +0200
-+++ src/net/dns.c	2014-08-30 16:12:11.561341019 +0200
+--- src/net/dns.c.orig	2015-01-21 18:27:50.000000000 +0100
++++ src/net/dns.c	2015-05-15 19:39:35.085104462 +0200
 @@ -245,6 +245,7 @@
  
  #ifdef HAVE_LIBRESOLV
diff --git a/libpki/libpki.spec b/libpki/libpki.spec
index 7810bea851..86664fff34 100644
--- a/libpki/libpki.spec
+++ b/libpki/libpki.spec
@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Cryptography
 License:      GPL
-Version:      0.8.7
-Release:      20150117
+Version:      0.8.8
+Release:      20150515
 
 #   package options
 %option       with_ldap   no
@@ -40,7 +40,7 @@ Release:      20150117
 %option       with_mysql  no
 
 #   list of sources
-Source0:      http://switch.dl.sourceforge.net/openca/libpki/libpki-%{version}.tar.gz
+Source0:      http://downloads.sourceforge.net/openca/libpki/libpki-%{version}.tar.gz
 Patch0:       libpki.patch
 
 #   build information
@@ -95,6 +95,7 @@ PreReq:       mysql
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags}" \
     LDFLAGS="%{l_ldflags}" \
+    LIBS="-lssl -lcrypto" \
     ./configure \
         --prefix=%{l_prefix} \
         --mandir=%{l_prefix}/man \