diff --git a/unmaintained/sems/APKBUILD b/testing/sems/APKBUILD similarity index 89% rename from unmaintained/sems/APKBUILD rename to testing/sems/APKBUILD index fc566adb2ec51d0a48ff149b15b9c45bd04ac01c..42c580b361f234ea6f6d8e90d13c2a2b9e9b89f3 100644 --- a/unmaintained/sems/APKBUILD +++ b/testing/sems/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista <francesco.colista@gmail.com> -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Simon Frankenberger <simon-alpine@fraho.eu> pkgname=sems pkgver=1.6.0 -pkgrel=8 +pkgrel=9 pkgdesc="SIP Express Media Server, an extensible SIP media server" url="http://iptel.org/sems/" arch="all" @@ -12,15 +12,15 @@ options="!check" pkgusers="sems" pkggroups="sems" install="$pkgname.pre-install" -makedepends="python2-dev cmake bash libressl-dev linux-headers +makedepends="python2-dev cmake bash openssl-dev linux-headers libsamplerate-dev spandsp-dev flite-dev gsm-dev speex-dev - libevent-dev libev-dev lame-dev" -subpackages="$pkgname-doc $pkgname-conf_auth $pkgname-conference + libevent-dev libev-dev lame-dev tiff-dev" +subpackages="$pkgname-doc $pkgname-conf_auth:conf_auth:noarch $pkgname-conference $pkgname-diameter_client $pkgname-dsm $pkgname-early_announce - $pkgname-g722 $pkgname-gsm $pkgname-ivr $pkgname-mailbox $pkgname-mp3 - $pkgname-pin_collect $pkgname-speex $pkgname-xmlrpc2di + $pkgname-g722 $pkgname-gsm $pkgname-ivr $pkgname-mailbox:mailbox:noarch $pkgname-mp3 + $pkgname-pin_collect:pin_collect:noarch $pkgname-speex $pkgname-xmlrpc2di $pkgname-webconference $pkgname-voicebox $pkgname-voicemail - $pkgname-annrecorder $pkgname-jsonrpc $pkgname-registrar" + $pkgname-annrecorder $pkgname-jsonrpc $pkgname-registrar $pkgname-openrc" source="$pkgname-$pkgver.tar.gz::https://github.com/sems-server/sems/archive/$pkgver.tar.gz sems-0001-Force-to-use-system-wide-GSM-includes.patch @@ -31,6 +31,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/sems-server/sems/archive/$pk sems-0011-Add-SBC-dependencies.patch std-types.patch sems-0013-Fix-for-C-11.patch + Fix-find-openssl.patch + Fix-openssl-1.1.patch sems.initd " @@ -270,4 +272,6 @@ ba6f0d917464729c63628255bee3d864a954af4a510b802f0de1d51f35ff5d7c1c33cbe14db31818 d616448e70d1cdfc7016f7ff3cab3615063a65f551b4b03cd004ced60b7a24681e85a871788ef2bf13d37c6cb3c84a6d76ba44fd9b9d1a921ad4b8469f3c6ed1 sems-0011-Add-SBC-dependencies.patch 79e3ac2b202b3f6c710b3d2bc8ac459e3622f2bf5945eaaa81778f53bcbddc7951266f88c2fd9862fbed44f10a160368af7d19b5e81929a3b1e8ee150111f74b std-types.patch d21eb55ebcbf3d20703dcb3843415b9f7e8d4fa029396738b843d8ece80abf87475e7d06794f86c75e8c3205273c013e99da4772d169bf127d7985522230265a sems-0013-Fix-for-C-11.patch +5d8493a7323af5e48a862e6f54e606a0eb0c778115922822a450e226b6f55051797b645595de068307b3d624c1aa9958fee16c838b49508352b336138783e210 Fix-find-openssl.patch +b9b00accd7b69cf531f22df43e3334ef099d24aa0bb164c860a8a87ec2cc12520a1c83217ec10357d101b5394d00559a669cd6fa12e1d9cbe05c6cde2afc5cc6 Fix-openssl-1.1.patch 5be93b6444a9592daa6c883c78e5906e9e662891e1daa850d872bdaa657eb756f1bc0879732033479b279b75c2fd42ef79aa530ebf3b1692e7fb222d484f804b sems.initd" diff --git a/testing/sems/Fix-find-openssl.patch b/testing/sems/Fix-find-openssl.patch new file mode 100644 index 0000000000000000000000000000000000000000..2dad112c002285f1608696bba9f9df1a6f2c1f18 --- /dev/null +++ b/testing/sems/Fix-find-openssl.patch @@ -0,0 +1,11 @@ +--- old/CMakeLists.txt ++++ new/CMakeLists.txt +@@ -161,7 +161,7 @@ + ENDIF(SPEEX_FOUND) + + IF(SEMS_USE_OPENSSL) +- FIND_PACKAGE(OpenSSL REQUIRED QUIETLY) ++ FIND_PACKAGE(OpenSSL REQUIRED) + MESSAGE(STATUS "Found OpenSSL includes: ${OPENSSL_INCLUDE_DIR}/openssl/ssl.h") + MESSAGE(STATUS "Found OpenSSL library: ${OPENSSL_LIBRARIES}") + MESSAGE(STATUS "Using OpenSSL: YES") diff --git a/testing/sems/Fix-openssl-1.1.patch b/testing/sems/Fix-openssl-1.1.patch new file mode 100644 index 0000000000000000000000000000000000000000..e29e9540c2749ba086da58500fbb6eb6a83ad90c --- /dev/null +++ b/testing/sems/Fix-openssl-1.1.patch @@ -0,0 +1,25 @@ +From 929872513cf14c4c11df1b144b97595301f69475 Mon Sep 17 00:00:00 2001 +From: Guillem Jover <gjover@sipwise.com> +Date: Fri, 25 Aug 2017 14:12:15 +0200 +Subject: [PATCH] apps/diameter_client: Do not access the OpenSSL BIO struct + directly + +Use a proper accessor instead of messing with the struc directly +which has become opaque in latest OpenSSL versions. +--- + apps/diameter_client/lib_dbase/tcp_comm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/apps/diameter_client/lib_dbase/tcp_comm.c b/apps/diameter_client/lib_dbase/tcp_comm.c +index d9fea4591..1290fc3a3 100644 +--- a/apps/diameter_client/lib_dbase/tcp_comm.c ++++ b/apps/diameter_client/lib_dbase/tcp_comm.c +@@ -74,7 +74,7 @@ long tcp_ssl_dbg_cb(BIO *bio, int oper, const char *argp, + switch (oper) { + case BIO_CB_WRITE: { + char buf[256]; +- snprintf(buf, 256, "%s: %s", argp, bio->method->name); ++ snprintf(buf, 256, "%s: %s", argp, BIO_method_name(bio)); + INFO("%s", buf); + } break; + diff --git a/unmaintained/sems/sems-0001-Force-to-use-system-wide-GSM-includes.patch b/testing/sems/sems-0001-Force-to-use-system-wide-GSM-includes.patch similarity index 100% rename from unmaintained/sems/sems-0001-Force-to-use-system-wide-GSM-includes.patch rename to testing/sems/sems-0001-Force-to-use-system-wide-GSM-includes.patch diff --git a/unmaintained/sems/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch b/testing/sems/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch similarity index 100% rename from unmaintained/sems/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch rename to testing/sems/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch diff --git a/unmaintained/sems/sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch b/testing/sems/sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch similarity index 100% rename from unmaintained/sems/sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch rename to testing/sems/sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch diff --git a/unmaintained/sems/sems-0004-musl-fixes.patch b/testing/sems/sems-0004-musl-fixes.patch similarity index 100% rename from unmaintained/sems/sems-0004-musl-fixes.patch rename to testing/sems/sems-0004-musl-fixes.patch diff --git a/unmaintained/sems/sems-0005-stats-needs-version.patch b/testing/sems/sems-0005-stats-needs-version.patch similarity index 100% rename from unmaintained/sems/sems-0005-stats-needs-version.patch rename to testing/sems/sems-0005-stats-needs-version.patch diff --git a/unmaintained/sems/sems-0010-Move-CMake-defines.patch b/testing/sems/sems-0010-Move-CMake-defines.patch similarity index 100% rename from unmaintained/sems/sems-0010-Move-CMake-defines.patch rename to testing/sems/sems-0010-Move-CMake-defines.patch diff --git a/unmaintained/sems/sems-0011-Add-SBC-dependencies.patch b/testing/sems/sems-0011-Add-SBC-dependencies.patch similarity index 100% rename from unmaintained/sems/sems-0011-Add-SBC-dependencies.patch rename to testing/sems/sems-0011-Add-SBC-dependencies.patch diff --git a/unmaintained/sems/sems-0013-Fix-for-C-11.patch b/testing/sems/sems-0013-Fix-for-C-11.patch similarity index 100% rename from unmaintained/sems/sems-0013-Fix-for-C-11.patch rename to testing/sems/sems-0013-Fix-for-C-11.patch diff --git a/unmaintained/sems/sems.initd b/testing/sems/sems.initd similarity index 100% rename from unmaintained/sems/sems.initd rename to testing/sems/sems.initd diff --git a/unmaintained/sems/sems.pre-install b/testing/sems/sems.pre-install similarity index 100% rename from unmaintained/sems/sems.pre-install rename to testing/sems/sems.pre-install diff --git a/unmaintained/sems/std-types.patch b/testing/sems/std-types.patch similarity index 100% rename from unmaintained/sems/std-types.patch rename to testing/sems/std-types.patch