- rel 4; fix openssl build

diff --git a/openssl.patch b/openssl.patch
new file mode 100644 (file)
index 0000000..a4aced0
--- /dev/null
+++ b/openssl.patch
@@ -0,0 +1,22 @@
+--- sipp-3.5.1/configure.ac~   2016-03-17 09:05:49.000000000 +0100
++++ sipp-3.5.1/configure.ac    2018-09-19 11:05:52.515888932 +0200
+@@ -143,7 +143,7 @@ if test "$openssl" = 'yes'; then
+     AC_CHECK_HEADERS([openssl/rand.h],,[AC_MSG_ERROR([<openssl/rand.h> header missing])])
+     AC_CHECK_HEADERS([openssl/ssl.h],,[AC_MSG_ERROR([<openssl/ssl.h> header missing])])
+     AC_CHECK_HEADERS([openssl/x509v3.h],,[AC_MSG_ERROR([<openssl/x509v3.h> header missing])])
+-    AC_CHECK_LIB([ssl], [SSL_library_init],,[AC_MSG_ERROR([ssl library missing])])
++    AC_CHECK_LIB([ssl], [SSL_accept],,[AC_MSG_ERROR([ssl library missing])])
+     AC_CHECK_LIB([crypto], [CRYPTO_num_locks],,[AC_MSG_ERROR([crypto library missing])])
+ fi
+ # For Makefile.am
+--- sipp-3.5.1/configure.ac~   2018-09-19 11:07:59.000000000 +0200
++++ sipp-3.5.1/configure.ac    2018-09-19 11:10:01.516629476 +0200
+@@ -144,7 +144,7 @@ if test "$openssl" = 'yes'; then
+     AC_CHECK_HEADERS([openssl/ssl.h],,[AC_MSG_ERROR([<openssl/ssl.h> header missing])])
+     AC_CHECK_HEADERS([openssl/x509v3.h],,[AC_MSG_ERROR([<openssl/x509v3.h> header missing])])
+     AC_CHECK_LIB([ssl], [SSL_accept],,[AC_MSG_ERROR([ssl library missing])])
+-    AC_CHECK_LIB([crypto], [CRYPTO_num_locks],,[AC_MSG_ERROR([crypto library missing])])
++    AC_CHECK_LIB([crypto], [CRYPTO_free],,[AC_MSG_ERROR([crypto library missing])])
+ fi
+ # For Makefile.am
+ AM_CONDITIONAL(HAVE_OPENSSL, test "$openssl" = "yes")

diff --git a/sipp.spec b/sipp.spec
index 769142fe55e1c7fd55c32e89bbec06de5579213d..1cdd6ad3b52378fa2508043b4e7a0eccba170738 100644 (file)
--- a/sipp.spec
+++ b/sipp.spec
@@ -8,14 +8,17 @@ Summary:      SIPp - a performance testing tool for the SIP protocol
 Summary(pl.UTF-8):     SIPp - narzędzie do testowania wydajności protokołu SIP
 Name:          sipp
 Version:       3.5.1
-Release:       3
+Release:       4
 License:       GPL v2+ except two files under BSD
 Group:         Applications/Communications
 #Source0Download: https://github.com/SIPp/sipp/releases/
 Source0:       https://github.com/SIPp/sipp/releases/download/v%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: c14e4c84975337ce952f03a38ddba7ec
 Patch0:                %{name}-OPTIONS_is_ping.patch
+Patch1:                openssl.patch
 URL:           http://sipp.sourceforge.net/
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: gsl-devel
 BuildRequires: help2man
 BuildRequires: libpcap-devel
@@ -61,8 +64,12 @@ do systemu SIP.
 %prep
 %setup -q
 %{?with_options_is_ping:%patch0 -p1}
+%patch1 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure \
        --disable-silent-rules \
        --enable-epoll \