summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoreolianoe2017-04-24 23:04:25 +0200
committereolianoe2017-04-24 23:04:25 +0200
commit8c08835093abaca92d06ab2ef00ea06209dd6703 (patch)
treef557c8e6029a1dddd9d209d88acd6f584575710e
parent312d0a2db2229a6d9c876db429a6ef14e0722b6a (diff)
downloadaur-8c08835093abaca92d06ab2ef00ea06209dd6703.tar.gz
openssl fix
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD12
-rw-r--r--openssl-1.0.patch57
3 files changed, 70 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 965246ddb83..69c3fd87b43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Apr 19 11:51:02 UTC 2017
+# Mon Apr 24 21:04:21 UTC 2017
pkgbase = ccnet-server
pkgdesc = A framework for writing networked applications in C.
pkgver = 6.0.10
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/haiwen/ccnet-server
arch = i686
arch = x86_64
@@ -18,10 +18,13 @@ pkgbase = ccnet-server
depends = libsearpc
depends = libldap
depends = python2
+ depends = openssl-1.0
source = ccnet-server-v6.0.10-server.tar.gz::https://github.com/haiwen/ccnet-server/archive/v6.0.10-server.tar.gz
source = libccnet.pc.patch
+ source = openssl-1.0.patch
sha256sums = 1a31a917c143c74bbb6fd67c54ee61841c343650b70f3d07dc130c990d8ffc1f
sha256sums = 66c3b02c3981db6a80819e0ae103bedadf8dfdf81405a7f75a9cba714acf973f
+ sha256sums = df166018e220074216b108f8b6969e623bdf51c1fa79f354a3127bae629059e2
pkgname = ccnet-server
diff --git a/PKGBUILD b/PKGBUILD
index 71ccb7ea7f3..9768855ffec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,25 +5,29 @@
pkgname=ccnet-server
pkgver=6.0.10
-pkgrel=1
+pkgrel=2
pkgdesc="A framework for writing networked applications in C."
arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64')
url="https://github.com/haiwen/${pkgname}"
license=('GPL2')
-depends=('libevent' 'libzdb' 'libsearpc' 'libldap' 'python2')
+depends=('libevent' 'libzdb' 'libsearpc' 'libldap' 'python2' 'openssl-1.0')
makedepends=('vala' 'libmariadbclient')
source=("${pkgname}-v${pkgver}-server.tar.gz::${url}/archive/v${pkgver}-server.tar.gz"
- "libccnet.pc.patch")
+ "libccnet.pc.patch"
+ "openssl-1.0.patch")
sha256sums=('1a31a917c143c74bbb6fd67c54ee61841c343650b70f3d07dc130c990d8ffc1f'
- '66c3b02c3981db6a80819e0ae103bedadf8dfdf81405a7f75a9cba714acf973f')
+ '66c3b02c3981db6a80819e0ae103bedadf8dfdf81405a7f75a9cba714acf973f'
+ 'df166018e220074216b108f8b6969e623bdf51c1fa79f354a3127bae629059e2')
prepare () {
cd "${srcdir}/${pkgname}-${pkgver}-server"
patch -p1 -i "${srcdir}"/libccnet.pc.patch
+ patch -p1 -i "${srcdir}"/openssl-1.0.patch
}
build () {
cd "${srcdir}/${pkgname}-${pkgver}-server"
+ export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
./autogen.sh
./configure --enable-ldap --enable-python --enable-console --prefix=/usr PYTHON=/usr/bin/python2
make
diff --git a/openssl-1.0.patch b/openssl-1.0.patch
new file mode 100644
index 00000000000..48b33830acc
--- /dev/null
+++ b/openssl-1.0.patch
@@ -0,0 +1,57 @@
+From 19207efc5cd56b4b8f39e8fa0dcb92afb8d70d43 Mon Sep 17 00:00:00 2001
+From: Pascal Ernster <git@hardfalcon.net>
+Date: Mon, 20 Feb 2017 02:17:08 +0100
+Subject: [PATCH] Add @SSL_CFLAGS@ to Makefiles to support PKG_CONFIG_PATH and
+ PKG_CONFIG_LIBDIR environment variables for libcrypto and libssl
+
+---
+ lib/Makefile.am | 4 +++-
+ net/server/Makefile.am | 1 +
+ tools/Makefile.am | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index f744675..b414b26 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -30,7 +30,7 @@ noinst_HEADERS = buffer.h \
+ ccnetincludedir = $(includedir)/ccnet
+ ccnetinclude_DATA = ccnet-object.h
+
+-libccnet_la_CPPFLAGS = $(AM_CPPFLAGS) -DCCNET_LIB @PTHREAD_CFLAGS@
++libccnet_la_CPPFLAGS = $(AM_CPPFLAGS) -DCCNET_LIB @PTHREAD_CFLAGS@ @SSL_CFLAGS@
+
+ libccnet_la_SOURCES = ccnet-client.c packet-io.c libccnet_utils.c \
+ message.c proc-factory.c \
+@@ -54,6 +54,8 @@ libccnet_la_LIBADD = @PTHREAD_LIBS@ @GLIB2_LIBS@ @GOBJECT_LIBS@ @LIB_GDI32@ \
+
+ noinst_LTLIBRARIES = libccnetd.la
+
++libccnetd_la_CPPFLAGS = $(AM_CPPFLAGS) @SSL_CFLAGS@
++
+ libccnetd_la_SOURCES = utils.c db.c job-mgr.c \
+ rsa.c bloom-filter.c marshal.c net.c timer.c ccnet-session-base.c \
+ ccnetobj.c
+diff --git a/net/server/Makefile.am b/net/server/Makefile.am
+index 7cda288..75abbce 100644
+--- a/net/server/Makefile.am
++++ b/net/server/Makefile.am
+@@ -7,6 +7,7 @@ AM_CPPFLAGS = @GLIB2_CFLAGS@ @GOBJECT_CFLAGS@ \
+ -I$(top_builddir)/include \
+ -I$(top_builddir)/lib \
+ @SEARPC_CFLAGS@ \
++ @SSL_CFLAGS@ \
+ -Wall
+
+ bin_PROGRAMS = ccnet-server
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 61d0482..7d36040 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -1,5 +1,5 @@
+
+-AM_CPPFLAGS = -I$(top_srcdir)/include @GLIB2_CFLAGS@ -I$(top_srcdir)/lib
++AM_CPPFLAGS = -I$(top_srcdir)/include @GLIB2_CFLAGS@ -I$(top_srcdir)/lib @SSL_CFLAGS@
+
+ bin_PROGRAMS = ccnet-init
+