Merge pull request #188 from micmac1/master
authorJiri Slachta <jiri.slachta@gmail.com>
Sun, 8 Oct 2017 14:41:32 +0000 (16:41 +0200)
committerGitHub <noreply@github.com>
Sun, 8 Oct 2017 14:41:32 +0000 (16:41 +0200)
New PR: asterisk version bumps plus chan-lantiq changes

26 files changed:
libs/bcg729/Makefile
libs/dahdi-linux/Makefile
libs/dahdi-tools/Makefile
libs/iksemel/Makefile
libs/iksemel/patches/001-missing-macros.patch [deleted file]
libs/iksemel/patches/001-pkgconfig-gnutls.patch [new file with mode: 0644]
libs/iksemel/patches/002-secure_gnutls_options.patch [new file with mode: 0644]
libs/iksemel/patches/002-use-of-newer-gnutls_priority_set_direct-api.patch [deleted file]
libs/libosip2/Makefile
libs/libosip2/patches/001-automake-compat.patch [deleted file]
libs/libpri/Makefile
libs/libsrtp/Makefile
libs/libsrtp2/Makefile
libs/ortp/Makefile
libs/spandsp/Makefile
net/asterisk-11.x/Makefile
net/asterisk-13.x/Makefile
net/asterisk-chan-dongle/Makefile
net/asterisk-chan-lantiq/Makefile
net/chan-sccp-b/Makefile
net/freeswitch-stable-mod-bcg729/Makefile
net/kamailio-5.x/Makefile
net/miax/Makefile
net/pcapsipdump/Makefile
net/restund/Makefile
net/rtpproxy/Makefile

index 9d18b3e55971b0da5bb7e02cb6334fb6ca47805d..699c42ca15da2b7978e419ef103ca859cc12d534 100644 (file)
@@ -12,7 +12,7 @@ PKG_VERSION:=1.0.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/
+PKG_SOURCE_URL:=@SAVANNAH/linphone/plugins/sources
 PKG_HASH:=77c923edc57a53014da5f31788b63efbabfc7277c06deaeada06574628e4b03f
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
index 1c0c7d09d43075cadf0f1b97df063f651aea736e..9d9fb132cf24568fd7f27387858c018c6504281b 100644 (file)
@@ -13,8 +13,8 @@ PKG_VERSION:=2.11.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/
-PKG_MD5SUM:=af96917e15eebc36519948133ec7e36b
+PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases
+PKG_HASH:=f59f382365118205e77d2874f1c0e1546e936247bcc45f07a43bc21778bee9df
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
index e9d991c42fea95952d466c1a0a7791d2bb988c81..05fef5421cef5f0c9b18cb4eb938a365c4c59e00 100644 (file)
@@ -12,8 +12,8 @@ PKG_VERSION:=2.11.1
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/
-PKG_MD5SUM:=8a908640d0ff7f8cbcdccd23f5022ede
+PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/dahdi-tools/releases
+PKG_HASH:=53ffeb333f3e44b0c88e5b17475cdbf87d3f652eb81a6422de76250c061e2909
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
index 29606f3911dade4ff92d0c520362a17d0a054c30..56079ed2468fa15bb5c13dc7a760e6f7814ae281 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014 - 2017 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iksemel
 PKG_VERSION:=1.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://iksemel.googlecode.com/files/
-PKG_MD5SUM:=532e77181694f87ad5eb59435d11c1ca
+PKG_HASH:=458c1b8fb3349076a6cecf26c29db1d561315d84e16bfcfba419f327f502e244
 
 PKG_FIXUP:=autoreconf
 
@@ -30,8 +30,8 @@ define Package/libiksemel
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Iksemel Jabber Library
-  URL:=http://code.google.com/p/iksemel/
-  DEPENDS:= +libgnutls +libtasn1 +libgcrypt +libgpg-error
+  URL:=https://github.com/meduketto/iksemel
+  DEPENDS:=+libgnutls
 endef
 
 define Package/libiksemel/description
@@ -41,21 +41,6 @@ in ANSI C except the network code (which is POSIX compatible), thus
 highly portable.
 endef
 
-TARGET_CFLAGS += $(FPIC)
-TARGET_LDFLAGS += \
-       -Wl,-rpath-link,$(STAGING_DIR)/usr/lib \
-       -lgnutls -lgcrypt -lgpg-error
-
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-               --with-libgnutls-prefix="$(STAGING_DIR)/usr" \
-               , \
-               LIBS="$(TARGET_LDFLAGS)" \
-       )
-endef
-
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/iksemel.h $(1)/usr/include/
diff --git a/libs/iksemel/patches/001-missing-macros.patch b/libs/iksemel/patches/001-missing-macros.patch
deleted file mode 100644 (file)
index 4563ac5..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
---- /dev/null
-+++ b/gnutls.m4
-@@ -0,0 +1,160 @@
-+dnl Autoconf macros for libgnutls
-+dnl $id$
-+
-+# Modified for LIBGNUTLS -- nmav
-+# Configure paths for LIBGCRYPT
-+# Shamelessly stolen from the one of XDELTA by Owen Taylor
-+# Werner Koch   99-12-09
-+
-+dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-+dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
-+dnl
-+AC_DEFUN([AM_PATH_LIBGNUTLS],
-+[dnl
-+dnl Get the cflags and libraries from the libgnutls-config script
-+dnl
-+AC_ARG_WITH(libgnutls-prefix,
-+          [  --with-libgnutls-prefix=PFX   Prefix where libgnutls is installed (optional)],
-+          libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
-+
-+  if test x$libgnutls_config_prefix != x ; then
-+     if test x${LIBGNUTLS_CONFIG+set} != xset ; then
-+        LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
-+     fi
-+  fi
-+
-+  AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
-+  min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
-+  AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
-+  no_libgnutls=""
-+  if test "$LIBGNUTLS_CONFIG" = "no" ; then
-+    no_libgnutls=yes
-+  else
-+    LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
-+    LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
-+    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
-+
-+
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-+      LIBS="$LIBS $LIBGNUTLS_LIBS"
-+dnl
-+dnl Now check if the installed libgnutls is sufficiently new. Also sanity
-+dnl checks the results of libgnutls-config to some extent
-+dnl
-+      rm -f conf.libgnutlstest
-+      AC_TRY_RUN([
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <gnutls/gnutls.h>
-+
-+int
-+main ()
-+{
-+    system ("touch conf.libgnutlstest");
-+
-+    if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
-+    {
-+      printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
-+             "$libgnutls_config_version", gnutls_check_version(NULL) );
-+      printf("*** was found! If libgnutls-config was correct, then it is best\n");
-+      printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
-+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+      printf("*** required on your system.\n");
-+      printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
-+      printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
-+      printf("*** before re-running configure\n");
-+    }
-+    else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
-+    {
-+      printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
-+      printf("*** library (version %s)\n", gnutls_check_version(NULL) );
-+    }
-+    else
-+    {
-+      if ( gnutls_check_version( "$min_libgnutls_version" ) )
-+      {
-+        return 0;
-+      }
-+     else
-+      {
-+        printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
-+                gnutls_check_version(NULL) );
-+        printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
-+               "$min_libgnutls_version" );
-+        printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
-+        printf("*** \n");
-+        printf("*** If you have already installed a sufficiently new version, this error\n");
-+        printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
-+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+        printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
-+        printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
-+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+        printf("*** so that the correct libraries are found at run-time))\n");
-+      }
-+    }
-+  return 1;
-+}
-+],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+  fi
-+
-+  if test "x$no_libgnutls" = x ; then
-+     AC_MSG_RESULT(yes)
-+     ifelse([$2], , :, [$2])
-+  else
-+     if test -f conf.libgnutlstest ; then
-+        :
-+     else
-+        AC_MSG_RESULT(no)
-+     fi
-+     if test "$LIBGNUTLS_CONFIG" = "no" ; then
-+       echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
-+       echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
-+       echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
-+       echo "*** full path to libgnutls-config."
-+     else
-+       if test -f conf.libgnutlstest ; then
-+        :
-+       else
-+          echo "*** Could not run libgnutls test program, checking why..."
-+          CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-+          LIBS="$LIBS $LIBGNUTLS_LIBS"
-+          AC_TRY_LINK([
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <gnutls/gnutls.h>
-+],      [ return !!gnutls_check_version(NULL); ],
-+        [ echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
-+          echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system"
-+          echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-+          echo "***" ],
-+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
-+          echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
-+          echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ])
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+       fi
-+     fi
-+     LIBGNUTLS_CFLAGS=""
-+     LIBGNUTLS_LIBS=""
-+     ifelse([$3], , :, [$3])
-+  fi
-+  rm -f conf.libgnutlstest
-+  AC_SUBST(LIBGNUTLS_CFLAGS)
-+  AC_SUBST(LIBGNUTLS_LIBS)
-+])
-+
-+dnl *-*wedit:notab*-*  Please keep this as the last line.
diff --git a/libs/iksemel/patches/001-pkgconfig-gnutls.patch b/libs/iksemel/patches/001-pkgconfig-gnutls.patch
new file mode 100644 (file)
index 0000000..ebc870d
--- /dev/null
@@ -0,0 +1,28 @@
+Last-Update: 2013-07-29
+Forwarded: not-needed
+Origin: upstream, commit:4652af9cf119145af3a90c632f8a6db215946784
+Bug-Iksemel: https://code.google.com/p/iksemel/issues/detail?id=20
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Description: use pkgconfig for checking gnutls
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,9 +44,17 @@
+ AC_SEARCH_LIBS(recv,socket)
+ AC_CHECK_FUNCS(getopt_long)
+ AC_CHECK_FUNCS(getaddrinfo)
+-AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
++dnl Check GNU TLS
++PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.0.0, have_gnutls=yes, have_gnutls=no) 
++if test "x$have_gnutls" = "xyes"; then
++  LIBGNUTLS_CFLAGS="$GNUTLS_CFLAGS"
++  LIBGNUTLS_LIBS="$GNUTLS_LIBS"
++  AC_SUBST(LIBGNUTLS_CFLAGS)
++  AC_SUBST(LIBGNUTLS_LIBS)
++  AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.]) 
++fi
+ dnl Check -Wall flag of GCC
+ if test "x$GCC" = "xyes"; then
+   if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
diff --git a/libs/iksemel/patches/002-secure_gnutls_options.patch b/libs/iksemel/patches/002-secure_gnutls_options.patch
new file mode 100644 (file)
index 0000000..bf09e17
--- /dev/null
@@ -0,0 +1,38 @@
+Last-Update: 2015-10-28
+Bug-Upstream: https://github.com/meduketto/iksemel/issues/48
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803204
+From: Marc Dequènes (duck) <duck@duckcorp.org>
+Description: fix security problem (and compatibility problem with servers rejecting low grade ciphers).
+
+--- a/src/stream.c
++++ b/src/stream.c
+@@ -62,13 +62,9 @@
+ static int
+ handshake (struct stream_data *data)
+ {
+-      const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
+-      const int kx_priority[] = { GNUTLS_KX_RSA, 0 };
+-      const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
+-      const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
+-      const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
++      const char *priority_string = "SECURE256:+SECURE192:-VERS-TLS-ALL:+VERS-TLS1.2";
+       int ret;
+       if (gnutls_global_init () != 0)
+               return IKS_NOMEM;
+@@ -79,13 +75,9 @@
+       if (gnutls_init (&data->sess, GNUTLS_CLIENT) != 0) {
+               gnutls_certificate_free_credentials (data->cred);
+               return IKS_NOMEM;
+       }
+-      gnutls_protocol_set_priority (data->sess, protocol_priority);
+-      gnutls_cipher_set_priority(data->sess, cipher_priority);
+-      gnutls_compression_set_priority(data->sess, comp_priority);
+-      gnutls_kx_set_priority(data->sess, kx_priority);
+-      gnutls_mac_set_priority(data->sess, mac_priority);
++      gnutls_priority_set_direct(data->sess, priority_string, NULL);
+       gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred);
+       gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push);
+       gnutls_transport_set_pull_function (data->sess, (gnutls_pull_func) tls_pull);
diff --git a/libs/iksemel/patches/002-use-of-newer-gnutls_priority_set_direct-api.patch b/libs/iksemel/patches/002-use-of-newer-gnutls_priority_set_direct-api.patch
deleted file mode 100644 (file)
index 8f91d10..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From 6b213b593c5b499679506a8c169ff3f0f4d6a34f Mon Sep 17 00:00:00 2001
-From: John Papandriopoulos <jpap@users.noreply.github.com>
-Date: Thu, 20 Aug 2015 16:55:39 -0700
-Subject: [PATCH] Use of newer gnutls_priority_set_direct API
-
----
- configure.ac |  1 +
- src/stream.c | 13 +++++++++++++
- 2 files changed, 14 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 91e69e3..281a044 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,6 +46,7 @@ AC_CHECK_FUNCS(getopt_long)
- AC_CHECK_FUNCS(getaddrinfo)
- AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
-+AM_PATH_LIBGNUTLS(,AC_CHECK_FUNCS(gnutls_priority_set_direct))
- dnl Check -Wall flag of GCC
- if test "x$GCC" = "xyes"; then
-diff --git a/src/stream.c b/src/stream.c
-index e8a1e8c..7d19a82 100644
---- a/src/stream.c
-+++ b/src/stream.c
-@@ -63,11 +63,20 @@ tls_pull (iksparser *prs, char *buffer, size_t len)
- static int
- handshake (struct stream_data *data)
- {
-+#if HAVE_GNUTLS_PRIORITY_SET_DIRECT
-+      const char *priorities =
-+              "NONE"
-+              ":+VERS-TLS1.0:+VERS-SSL3.0"
-+              ":+RSA"
-+              ":+3DES-CBC:+ARCFOUR-128"
-+              ":+SHA1:+SHA256:+SHA384:+MD5";
-+#else
-       const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
-       const int kx_priority[] = { GNUTLS_KX_RSA, 0 };
-       const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
-       const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
-       const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
-+#endif
-       int ret;
-       if (gnutls_global_init () != 0)
-@@ -80,11 +89,15 @@ handshake (struct stream_data *data)
-               gnutls_certificate_free_credentials (data->cred);
-               return IKS_NOMEM;
-       }
-+#if HAVE_GNUTLS_PRIORITY_SET_DIRECT
-+      gnutls_priority_set_direct (data->sess, priorities, NULL);
-+#else
-       gnutls_protocol_set_priority (data->sess, protocol_priority);
-       gnutls_cipher_set_priority(data->sess, cipher_priority);
-       gnutls_compression_set_priority(data->sess, comp_priority);
-       gnutls_kx_set_priority(data->sess, kx_priority);
-       gnutls_mac_set_priority(data->sess, mac_priority);
-+#endif
-       gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred);
-       gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push);
--- 
-2.1.4
index fe4066b26eea2e773f54f2e5c1659b7e1c6b8b18..e69c6f5a510efdd7c073c915d1753cbfe7d4da2a 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libosip2
-PKG_VERSION:=4.1.0
+PKG_VERSION:=5.0.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/osip
-PKG_MD5SUM:=756423628683c07f817432f046a26516
+PKG_HASH:=18a13c954f7297978e7bf1a0cdadde7c531e519d61a045dae304e054f3b2df03
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
diff --git a/libs/libosip2/patches/001-automake-compat.patch b/libs/libosip2/patches/001-automake-compat.patch
deleted file mode 100644 (file)
index 9c0bc11..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,3 +1,5 @@
-+ACLOCAL_AMFLAGS = -I scripts
-+
- EXTRA_DIST = README BUGS FEATURES HISTORY autogen.sh libosip2.pc.in
- SUBDIRS = include src scripts help platform
index 01fe368f7859cc62c2ed4c4271a9e336a1fef329..c826e2aa98dc56780ff7c5a77d2a97800b9a8cbf 100644 (file)
@@ -12,7 +12,7 @@ PKG_VERSION:=1.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/libpri/releases
+PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/libpri/releases
 PKG_HASH:=7225ea7ec334a115f9dc08e71f55589c38cb4e00b13964cd2f08cc4e6123e3f6
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 
index 3c6f3dc84e37a960a698af4936a7f2f84d10485e..11a54189216e5279579909e0b3bc0be999937dc4 100644 (file)
@@ -13,7 +13,7 @@ PKG_VERSION:=1.5.4
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/cisco/libsrtp.git
+PKG_SOURCE_URL:=https://github.com/cisco/libsrtp.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=078c4a5b2a4380dea025998ceea9e0a1e3164d2d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
index 28dcadeaff8b3950126eb5afa6addc12441f07bc..42e99d3827a213c4ea47e8b307f50fef1f991b57 100644 (file)
@@ -12,7 +12,7 @@ PKG_VERSION:=2.0.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/cisco/libsrtp.git
+PKG_SOURCE_URL:=https://github.com/cisco/libsrtp.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=12ea269db3e4e9af7ce5de524fe07312fa6e035b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
index 29a7f52158bd662473b61875b195940d29d0a816..9b144082f8f67f2336cb2c77084092f6052e9b12 100644 (file)
@@ -13,7 +13,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SAVANNAH/linphone/ortp/sources
-PKG_MD5SUM:=fb833cc7a66ec1a0c1b75016130e7e6d
+PKG_HASH:=91a5ada15f62ce5f08beceef4d0adb65469211e2f208bd96e493a8df9f84fcdb
 
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=COPYING
index a7588a40b7a8b25e3a9149229b286ce413f806c1..9236282848d6721b940f8ee5b8921aff65e55777 100644 (file)
@@ -12,8 +12,8 @@ PKG_VERSION:=0.0.6
 PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.soft-switch.org/downloads/spandsp/
-PKG_MD5SUM:=897d839516a6d4edb20397d4757a7ca3
+PKG_SOURCE_URL:=https://www.soft-switch.org/downloads/spandsp
+PKG_HASH:=cc053ac67e8ac4bb992f258fd94f275a7872df959f6a87763965feabfdcc9465
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
index 36903d7c214f13db0ca2e8e1c519d04916481f88..85bebb1eed10d75e5f274c4253a5e725b85adce2 100644 (file)
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk11
-PKG_VERSION:=11.25.2
+PKG_VERSION:=11.25.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/
-PKG_HASH:=59fd3735546cb56bda15f39caf34636c113e68b79019554a007ad63cb6fc2d33
+PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
+PKG_HASH:=beb63953cb61b9822fc8f1d79842d821c5147f2a2944941d54a02f2e5fd4db20
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=libxml2/host
index b98ab9b5b2adb8ab69924ae851ef4cd5289a8208..e63d83dad3dce4df88f80bb271b169a7a2f65a57 100644 (file)
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk13
-PKG_VERSION:=13.17.1
-PKG_RELEASE:=2
+PKG_VERSION:=13.17.2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/
-PKG_HASH:=aee15699a4100ca0360e8168802c711caf7664d21d9fb84f686873f0e7c5fb34
+PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
+PKG_HASH:=19ae0565687b85bde382b2cc274dd5a27ac33dc57a4eb3b663cb5ad9b238f1ac
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=libxml2/host
@@ -26,6 +26,7 @@ PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/version.mk
 
 define Package/asterisk13/install/module
        $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
@@ -280,10 +281,25 @@ define Build/Compile
        $(call Build/Compile/Default,all install samples)
 endef
 
+# Tar up the headers for chan-lantiq and store them in $(DL_DIR). This is a
+# workaround for a hen and egg problem: chan-lantiq is a nonshared (target
+# specific) package. It depends on both kernel module and asterisk headers. But
+# the build bots will not build shared packages (e.g. asterisk) when building
+# the target specific packages because the shared packages are not selected by
+# CONFIG_ALL_NONSHARED=y.
+
+# The workaround stores the asterisk headers in $(DL_DIR) where chan-lantiq can
+# access them.
+
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/asterisk-13/include/asterisk/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk/*.h $(1)/usr/include/asterisk-13/include/asterisk/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/asterisk-13/include/
+ifeq ($(CONFIG_TARGET_ARCH_PACKAGES),"mips_24kc")
+       $(TAR) --create --xz \
+               --file=$(DL_DIR)/$(PKG_NAME)-$(call qstrip,$(CONFIG_TARGET_ARCH_PACKAGES))-headers-for-chan-lantiq-$(VERSION_NUMBER).tar.xz \
+               --directory=$(PKG_INSTALL_DIR)/usr include
+endif
 endef
 
 $(eval $(call BuildPackage,asterisk13))
index 1e53e9eae55410dbea3a6556fc630ce0bd0a522b..fcb3ab647101be890a3ee8dfb363d909f43c89dd 100644 (file)
@@ -12,7 +12,7 @@ PKG_VERSION:=1.1-20170913
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=git://github.com/wdoekes/asterisk-chan-dongle.git
+PKG_SOURCE_URL:=https://github.com/wdoekes/asterisk-chan-dongle.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=4ef5ad7eea7245a031101875be08b924aa1e151b
 PKG_SOURCE_PROTO:=git
index 9ab35e393fe000c062353ff3a45c27155740dc84..40f202dcfcf241ae02eef89911e4d628facdb6f5 100644 (file)
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chan-lantiq
-PKG_VERSION:=1.0
+PKG_VERSION:=20170304
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0
@@ -18,7 +18,12 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI
 
 PKG_FLAGS:=nonshared
 
+# WARNING: Because this module is target specific ("nonshared") it cannot depend
+# on the shared Asterisk package. Asterisk needs to be built _before_ this
+# package, though, to generate the necessary headers.
+
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/version.mk
 
 define Package/$(PKG_NAME)/Default
   SUBMENU:=Telephony
@@ -29,9 +34,8 @@ define Package/$(PKG_NAME)/Default
   DEPENDS:=@(TARGET_lantiq_falcon||TARGET_lantiq_xway||TARGET_lantiq_xrx200) +kmod-ltq-vmmc
 endef
 
-define Package/asterisk13-$(PKG_NAME)
+define Package/$(PKG_NAME)-asterisk13
 $(call Package/$(PKG_NAME)/Default)
-  DEPENDS+=asterisk13
   VARIANT:=asterisk13
 endef
 
@@ -39,13 +43,13 @@ define Package/description/Default
 An implementation of a Lantiq TAPI channel driver for Asterisk.
 endef
 
-Package/asterisk13-$(PKG_NAME)/description = $(Package/description/Default)
+Package/$(PKG_NAME)-asterisk13/description = $(Package/description/Default)
 
 define Package/conffiles/Default
 /etc/asterisk/lantiq.conf
 endef
 
-Package/asterisk13-$(PKG_NAME)/conffiles = $(Package/conffiles/Default)
+Package/$(PKG_NAME)-asterisk13/conffiles = $(Package/conffiles/Default)
 
 define Package/Install/Default
        $(INSTALL_DIR) $(1)/etc/asterisk
@@ -56,15 +60,14 @@ define Package/Install/Default
                $(1)/usr/lib/asterisk/modules
 endef
 
-Package/asterisk13-$(PKG_NAME)/install = $(Package/Install/Default)
-
-ifeq ($(BUILD_VARIANT),asterisk13)
-CHAN_LANTIQ_AST_INCLUDES:=-I$(STAGING_DIR)/usr/include/asterisk-13/include
-endif
+Package/$(PKG_NAME)-asterisk13/install = $(Package/Install/Default)
 
 define Build/Prepare
        $(CP) $(SOURCE)/files/chan_lantiq-$(BUILD_VARIANT).c $(PKG_BUILD_DIR)/chan_lantiq.c
        $(CP) $(SOURCE)/files/default.exports $(PKG_BUILD_DIR)/chan_lantiq.exports
+       $(TAR) --extract --no-same-owner --no-same-permissions --xz \
+               --file=$(DL_DIR)/$(BUILD_VARIANT)-$(call qstrip,$(CONFIG_TARGET_ARCH_PACKAGES))-headers-for-chan-lantiq-$(VERSION_NUMBER).tar.xz \
+               --directory=$(PKG_BUILD_DIR)
 endef
 
 define Build/Configure
@@ -74,8 +77,8 @@ define Build/Compile
        cd $(PKG_BUILD_DIR) && \
        $(TARGET_CC) -o chan_lantiq.o -c chan_lantiq.c -MD -MT chan_lantiq.o \
                -MF .chan_lantiq.o.d -MP -pthread \
-               $(CHAN_LANTIQ_AST_INCLUDES) \
                $(TARGET_CFLAGS) \
+               -I$(PKG_BUILD_DIR)/include \
                $(TARGET_CPPFLAGS) \
                -Wall -Wstrict-prototypes -Wmissing-prototypes \
                -Wmissing-declarations $(FPIC) -DAST_MODULE=\"chan_lantiq\" && \
@@ -84,4 +87,4 @@ define Build/Compile
                chan_lantiq.o
 endef
 
-$(eval $(call BuildPackage,asterisk13-$(PKG_NAME)))
+$(eval $(call BuildPackage,$(PKG_NAME)-asterisk13))
index fcb04e300ed66d460325783055cfc2242fd15952..027c15cd92066bd0d7a21ead68c054d6006483d2 100644 (file)
@@ -13,7 +13,7 @@ PKG_VERSION:=v4.3.0-20170814
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=git://github.com/chan-sccp/chan-sccp.git
+PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=016fee3a96b09d5404757f7b178af2e349e55bcc
 PKG_SOURCE_PROTO:=git
index 08d4824e9426c7c49917b160af5b9cce45705b38..765f2345c37b4fc7008e4e1f3550c94f88c5a527 100644 (file)
@@ -19,7 +19,7 @@ PKG_LICENSE_FILES:=LICENSE
 PRG_URL:=https://github.com/xadhoom/mod_bcg729
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=git://github.com/xadhoom/mod_bcg729.git
+PKG_SOURCE_URL:=https://github.com/xadhoom/mod_bcg729.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=686eb06d4a395d94c364efff4b63579af76ebec7
index 895b782efb33303e1618aa84964aea7f82574c8a..64dfb00cdeb5a5fe65392618c7dbb03902e3d580 100644 (file)
@@ -12,7 +12,7 @@ PKG_NAME:=kamailio5
 PKG_VERSION:=5.0.2
 PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/
+PKG_SOURCE_URL:=https://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src
 PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
 PKG_HASH:=
 PKG_USE_MIPS16:=0
index 2f99f3245b380addf3e6d6ccf5250681158faa20..d0fa026ab80a672fb0af79c3d17f64f0be7d5221 100644 (file)
@@ -13,7 +13,7 @@ PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/miax
-PKG_MD5SUM:=44f0d2ef46ee2697d890b7b96846adc7
+PKG_HASH:=2be07cdb1929d6b07f04ec3a66edf4fb2febd691c72f5fd4893923f6474b53e9
 PKG_CHECK_FORMAT_SECURITY:=0
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
index 77dd64b84da4036503038299c3894f42e81be9b6..7a903aabf5e05c3d8d23ff0158fff4d2a1fa4d5e 100644 (file)
@@ -13,7 +13,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/pcapsipdump
-PKG_MD5SUM:=2c04c54c3478f7cb94978d54538006d2
+PKG_HASH:=4d4dc2664963c08de40da47ca0dcd1eeae09edc42241bd6daa7ff8c59089dce9
 
 PKG_LICENSE:=GPL-2.0+
 PKG_LICENSE_FILES:=LICENSE
index c4e033aafff81959a348949623add36764669ac9..e347f7bb5fe11255c40ba3ed19b3fa37b771db5f 100644 (file)
@@ -14,7 +14,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.creytiv.com/pub/
-PKG_MD5SUM:=8354dcdb92da406756520b7a2783c52a
+PKG_HASH:=3170441dc882352ab0275556b6fc889b38b14203d936071b5fa12f39a5c86d47
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=docs/COPYING
index 7b4fe90e9dc555e1e23924cb5970b096b680642b..6f1e796b050213a2a930a9512c9a9404a6b9a1f5 100644 (file)
@@ -12,7 +12,7 @@ PKG_VERSION:=2.0.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/sippy/rtpproxy.git
+PKG_SOURCE_URL:=https://github.com/sippy/rtpproxy.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=d5926892630139bcbe55d1f3fa36764c881648bc
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz