libraries/ring-daemon: Updated for version 20181026_114c664.

Signed-off-by: Mario Preksavec <mario@slackware.hr>

3 files changed, 73 insertions, 9 deletions

diff --git a/libraries/ring-daemon/patches/libressl-rules.mak.diff b/libraries/ring-daemon/patches/libressl-rules.mak.diff
new file mode 100644
index 0000000000..e58c921eaf
--- /dev/null
+++ b/libraries/ring-daemon/patches/libressl-rules.mak.diff
@@ -0,0 +1,15 @@
+--- ring-daemon-20181026_114c66440/contrib/src/libressl/rules.mak.orig	2018-10-26 17:20:13.000000000 +0200
++++ ring-daemon-20181026_114c66440/contrib/src/libressl/rules.mak	2018-10-27 22:36:00.608283629 +0200
+@@ -25,9 +25,9 @@
+ OPENBSD_URL := https://github.com/libressl-portable/openbsd/archive/$(OPENBSD_VERSION).tar.gz
+ 
+ # Check if openssl or libressl is already present on the system
+-ifeq ($(call need_pkg,"openssl >= 1.0.0" || call need_pkg,"libressl >= 1.0.0"),)
+-PKGS_FOUND += libressl
+-endif
++#ifeq ($(call need_pkg,"openssl >= 1.0.0" || call need_pkg,"libressl >= 1.0.0"),)
++#PKGS_FOUND += libressl
++#endif
+ 
+ # Pure dependency of restbed: do not add to PKGS.
+ 
diff --git a/libraries/ring-daemon/ring-daemon.SlackBuild b/libraries/ring-daemon/ring-daemon.SlackBuild
index 77cd7a01d0..2b27ca3e1b 100644
--- a/libraries/ring-daemon/ring-daemon.SlackBuild
+++ b/libraries/ring-daemon/ring-daemon.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ring-daemon
 
-# Copyright 2017  Mario Preksavec, Zagreb, Croatia
+# Copyright 2017, 2018  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ring-daemon
-VERSION=${VERSION:-4.0.0}
+VERSION=${VERSION:-20181026_114c664}
+COMMIT=${COMMIT:-114c6644004ab8667a5403a0f2578b249a57ee46}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +60,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
+cd $PRGNAM-$COMMIT
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,6 +72,21 @@ find -L . \
 
 patch -p1 <$CWD/patches/namedirectory.cpp.diff
 patch -p1 <$CWD/patches/use_libexecdir.diff
+patch -p1 <$CWD/patches/libressl-rules.mak.diff
+
+# Copy already present source tarballs
+for src in libdbus jsoncpp msgpack libnatpmp argon2 asio portable \
+           openbsd restbed opendht pjproject secp256k1 gmp pupnp yaml-cpp; do
+  cp $CWD/$src-*.tar.gz contrib/tarballs \
+  || cp $CWD/$src-*.tar.bz2 contrib/tarballs
+done
+
+# Compile the dependencies
+( mkdir contrib/build
+  cd contrib/build
+  ../bootstrap
+  make
+)
 
 ./autogen.sh
 
@@ -86,6 +102,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-ipv6 \
   --build=$ARCH-slackware-linux
 
+# This is where dependencies ended up
+export PATH=$PATH:$TMP/$PRGNAM-$COMMIT/contrib/$ARCH-slackware-linux/bin
+
 make
 make install DESTDIR=$PKG
 
diff --git a/libraries/ring-daemon/ring-daemon.info b/libraries/ring-daemon/ring-daemon.info
index e324341cd3..0ebbf4b1f3 100644
--- a/libraries/ring-daemon/ring-daemon.info
+++ b/libraries/ring-daemon/ring-daemon.info
@@ -1,10 +1,40 @@
 PRGNAM="ring-daemon"
-VERSION="4.0.0"
+VERSION="20181026_114c66440"
 HOMEPAGE="https://ring.cx/"
-DOWNLOAD="https://github.com/savoirfairelinux/ring-daemon/archive/4.0.0/ring-daemon-4.0.0.tar.gz"
-MD5SUM="6bab7f9c1939c422916a69eb36b77f2a"
+DOWNLOAD="https://github.com/savoirfairelinux/ring-daemon/archive/114c66440/ring-daemon-114c6644004ab8667a5403a0f2578b249a57ee46.tar.gz \
+          https://kent.dl.sourceforge.net/project/dbus-cplusplus/dbus-c++/0.9.0/libdbus-c++-0.9.0.tar.gz \
+          https://github.com/open-source-parsers/jsoncpp/archive/1.7.2/jsoncpp-1.7.2.tar.gz \
+          https://github.com/msgpack/msgpack-c/archive/cpp-2.1.5/msgpack-c-cpp-2.1.5.tar.gz \
+          http://miniupnp.free.fr/files/libnatpmp-20150609.tar.gz \
+          https://github.com/P-H-C/phc-winner-argon2/archive/1eea010/argon2-1eea0104e7cb2a38c617cf90ffa46ce5db6aceda.tar.gz \
+          https://github.com/hlysunnaram/asio/archive/b0926b6/asio-b0926b61b057ce563241d609cae5768ed3a4e1b1.tar.gz \
+          https://github.com/libressl-portable/portable/archive/0974145/portable-0974145a9e62d844b5b159cddbce36552bca30df.tar.gz \
+          https://github.com/libressl-portable/openbsd/archive/OPENBSD_6_3/openbsd-OPENBSD_6_3.tar.gz
+          https://github.com/aberaud/restbed/archive/c3e28ad/restbed-c3e28adaf8b15b34162da6c1ed5514606288f91b.tar.gz \
+          https://github.com/savoirfairelinux/opendht/archive/1.7.5rc3/opendht-1.7.5rc3.tar.gz \
+          https://github.com/pjsip/pjproject/archive/2.8/pjproject-2.8.tar.gz \
+          https://github.com/bitcoin-core/secp256k1/archive/0b70241/secp256k1-0b7024185045a49a1a6a4c5615bf31c94f63d9c4.tar.gz \
+          https://ftpmirror.gnu.org/gmp/gmp-6.1.2.tar.bz2 \
+          https://github.com/mrjimenez/pupnp/archive/release-1.6.25/pupnp-release-1.6.25.tar.gz \
+          https://github.com/jbeder/yaml-cpp/archive/24fa1b3/yaml-cpp-24fa1b33805c9a91df0f32c46c28e314dd7ad96f.tar.gz"
+MD5SUM="2df7e66cabca695c147f0ca891b6ec2e \
+        e752116f523fa88ef041e63d3dee4de2 \
+        3989402269147d1f853b57c542037536 \
+        6536e2072a1006e2004e2963081692a2 \
+        7bd1af6710271e1743df5422be350bd8 \
+        c65e2070180a65c34db7190a6a932f3c \
+        54d7426e25ee9067b054e20b0e6a5ef8 \
+        f2709fc74fd79304fba779cf5dce6d87 \
+        d13111290b28c276ab72988bf92ac9bc \
+        b88fe85299811b3232fd2b66a7aa887e \
+        ff2cb351e51ee868b6a062283adec2e1 \
+        84ba9ecb5ceed1fde03bbeb5f5fc455b \
+        379b867ce2491314219a606bd7ac112f \
+        8ddbb26dc3bd4e2302984debba1406a5 \
+        1b07074b282af509c8d384f8b3751233 \
+        3aa5de709713385ca2e49037e4a12b6e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pjproject-ring yaml-cpp jsoncpp libdbus-c++ restbed gsm speex opendht cryptopp libupnp libnatpmp ffmpeg"
+REQUIRES=""
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"