Merge pull request #196 from wigyori/for-15.05-re

CC: re/rem: fix build on CC and upgrade

16 files changed, 46 insertions, 26 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 15f6e09..fb22f95 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8,6 +8,6 @@
 # alphabetical order when updating the list.
 
 Daniel Golle <daniel@makrotopia.org>
-Jiri Slachta <slachta@cesnet.cz>
+Jiri Slachta <jiri@slachta.eu>
 Luka Perkov <luka@openwrt.org>
 Mazi Lo <openwrt.mazilo@recursor.net>
diff --git a/libs/iksemel/Makefile b/libs/iksemel/Makefile
index 8a33e3e..29606f3 100644
--- a/libs/iksemel/Makefile
+++ b/libs/iksemel/Makefile
@@ -21,7 +21,7 @@ PKG_INSTALL:=1
 
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/libs/libsrtp/Makefile b/libs/libsrtp/Makefile
index 4d7d5a6..eb7d3bc 100644
--- a/libs/libsrtp/Makefile
+++ b/libs/libsrtp/Makefile
@@ -20,7 +20,7 @@ PKG_INSTALL:=1
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/libs/pjproject/Makefile b/libs/pjproject/Makefile
index f02af26..5a959ec 100644
--- a/libs/pjproject/Makefile
+++ b/libs/pjproject/Makefile
@@ -20,7 +20,7 @@ PKG_FIXUP:=autoreconf
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
diff --git a/libs/re/Makefile b/libs/re/Makefile
index befac2a..6a98008 100644
--- a/libs/re/Makefile
+++ b/libs/re/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2010-2015 OpenWrt.org
+#
+# Copyright (C) 2010-2017 OpenWrt.org
 # Copyright (C) 2010 Alfred E. Heggestad
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -9,16 +9,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=re
-PKG_VERSION:=0.4.13
+PKG_VERSION:=0.5.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.creytiv.com/pub
-PKG_MD5SUM:=d5405878ca66c09d5e2e3b4e3d0c4c26
+PKG_MD5SUM:=90b34503ecc4f3a5e0249b6e4f65d8cf
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=docs/COPYING
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,7 +26,7 @@ define Package/libre
   SUBMENU:=Telephony
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libopenssl +libpthread
+  DEPENDS:=+libopenssl +libpthread +zlib
   TITLE:=Generic library for real-time communications with async IO support
   URL:=http://www.creytiv.com/
 endef
diff --git a/libs/re/patches/001-extend-ninit-nclose-check.patch b/libs/re/patches/001-extend-ninit-nclose-check.patch
new file mode 100644
index 0000000..382d3e9
--- /dev/null
+++ b/libs/re/patches/001-extend-ninit-nclose-check.patch
@@ -0,0 +1,20 @@
+--- a/src/dns/res.c
++++ b/src/dns/res.c
+@@ -25,7 +25,7 @@ int get_resolv_dns(char *domain, size_t
+ 	uint32_t i;
+ 	int ret, err;
+ 
+-#ifdef OPENBSD
++#if defined(OPENBSD) || defined(OPENWRT)
+ 	ret = res_init();
+ 	state = _res;
+ #else
+@@ -56,7 +56,7 @@ int get_resolv_dns(char *domain, size_t
+ 	*n = i;
+ 
+  out:
+-#ifdef OPENBSD
++#if defined(OPENBSD) || defined(OPENWRT)
+ #else
+ 	res_nclose(&state);
+ #endif
diff --git a/libs/rem/Makefile b/libs/rem/Makefile
index 5e013b8..fe9280c 100644
--- a/libs/rem/Makefile
+++ b/libs/rem/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2010-2014 OpenWrt.org
+#
+# Copyright (C) 2010-2017 OpenWrt.org
 # Copyright (C) 2010 Alfred E. Heggestad
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -9,16 +9,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rem
-PKG_VERSION:=0.4.6
+PKG_VERSION:=0.5.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.creytiv.com/pub
-PKG_MD5SUM:=888c3000aa002790cc7129fa72d39a58
+PKG_HASH:=fbc54e81ed4fd28a11d525f4384d06bee4c11e10975395668e8260ef0d4a64eb
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=docs/COPYING
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -31,7 +31,7 @@ define Package/librem
   URL:=http://www.creytiv.com/
 endef
 
-TARGET_CFLAGS += $(FPIC)
+TARGET_CFLAGS+=$(FPIC)
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
diff --git a/libs/spandsp/Makefile b/libs/spandsp/Makefile
index 9971774..c373ee1 100644
--- a/libs/spandsp/Makefile
+++ b/libs/spandsp/Makefile
@@ -21,7 +21,7 @@ PKG_FIXUP:=autoreconf
 
 PKG_LICENSE:=LGPL-2.1 GPL-2.0
 PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/asterisk-11.x-chan-dongle/Makefile b/net/asterisk-11.x-chan-dongle/Makefile
index 9fb409d..6b64ece 100644
--- a/net/asterisk-11.x-chan-dongle/Makefile
+++ b/net/asterisk-11.x-chan-dongle/Makefile
@@ -24,7 +24,7 @@ PKG_FIXUP:=autoreconf
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYRIGHT.txt LICENSE.txt
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile
index 3c4a157..a1f2b04 100644
--- a/net/asterisk-11.x/Makefile
+++ b/net/asterisk-11.x/Makefile
@@ -21,7 +21,7 @@ PKG_BUILD_DEPENDS:=libxml2/host
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING LICENSE
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -80,7 +80,7 @@ define Package/asterisk11/Default
   SECTION:=net
   CATEGORY:=Network
   URL:=http://www.asterisk.org/
-  MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+  MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 endef
 
 define Package/asterisk11/Default/description
diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile
index 084eeb8..5ec4d1c 100644
--- a/net/asterisk-13.x/Makefile
+++ b/net/asterisk-13.x/Makefile
@@ -21,7 +21,7 @@ PKG_BUILD_DEPENDS:=libxml2/host
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING LICENSE
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/baresip/Makefile b/net/baresip/Makefile
index ed862f2..f1dcc59 100644
--- a/net/baresip/Makefile
+++ b/net/baresip/Makefile
@@ -18,7 +18,7 @@ PKG_MD5SUM:=06e0aea9ba3dbbbe834285a8c7e7df83
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=docs/COPYING
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 baresip-mods:= \
 	alsa \
diff --git a/net/chan-sccp-b/Makefile b/net/chan-sccp-b/Makefile
index 6bfe201..f8f88d9 100644
--- a/net/chan-sccp-b/Makefile
+++ b/net/chan-sccp-b/Makefile
@@ -23,7 +23,7 @@ PKG_FIXUP:=autoreconf -fi
 
 PKG_LICENSE:=GPL-1.0
 PKG_LICENSE_FILES:=COPYING LICENSE
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/kamailio-4.x/Makefile b/net/kamailio-4.x/Makefile
index f02ec01..cb5bee4 100644
--- a/net/kamailio-4.x/Makefile
+++ b/net/kamailio-4.x/Makefile
@@ -18,7 +18,7 @@ PKG_USE_MIPS16:=0
 
 PKG_LICENSE:=GPL-2.0+
 PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 include $(INCLUDE_DIR)/nls.mk
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/restund/Makefile b/net/restund/Makefile
index ad20e85..c379160 100644
--- a/net/restund/Makefile
+++ b/net/restund/Makefile
@@ -18,7 +18,7 @@ PKG_MD5SUM:=e50e57aa96a19add97193b7765740456
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=docs/COPYING
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 restund-mods:= mysql
 
diff --git a/net/yate/Makefile b/net/yate/Makefile
index 5b50e21..2ab3e8f 100644
--- a/net/yate/Makefile
+++ b/net/yate/Makefile
@@ -22,7 +22,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 PKG_INSTALL:=1