Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
CC: re/rem: fix build on CC and upgrade
This commit is contained in:
Jiri Slachta 2017-11-12 13:01:33 +02:00 committed by GitHub
commit 088ab9a367
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 46 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MAINTAINERS
View file

@ -8,6 +8,6 @@
# alphabetical order when updating the list. # alphabetical order when updating the list.
Daniel Golle <daniel@makrotopia.org> Daniel Golle <daniel@makrotopia.org>
Jiri Slachta <slachta@cesnet.cz> Jiri Slachta <jiri@slachta.eu>
Luka Perkov <luka@openwrt.org> Luka Perkov <luka@openwrt.org>
Mazi Lo <openwrt.mazilo@recursor.net> Mazi Lo <openwrt.mazilo@recursor.net>

2
libs/iksemel/Makefile
View file

@ -21,7 +21,7 @@ PKG_INSTALL:=1
PKG_LICENSE:=LGPL-2.1 PKG_LICENSE:=LGPL-2.1
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz> PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
libs/libsrtp/Makefile
View file

@ -20,7 +20,7 @@ PKG_INSTALL:=1
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz> PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
libs/pjproject/Makefile
View file

@ -20,7 +20,7 @@ PKG_FIXUP:=autoreconf
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING 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) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

12
libs/re/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2010-2015 OpenWrt.org # Copyright (C) 2010-2017 OpenWrt.org
# Copyright (C) 2010 Alfred E. Heggestad # Copyright (C) 2010 Alfred E. Heggestad
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
@ -9,16 +9,16 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=re PKG_NAME:=re
PKG_VERSION:=0.4.13 PKG_VERSION:=0.5.6
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.creytiv.com/pub PKG_SOURCE_URL:=http://www.creytiv.com/pub
PKG_MD5SUM:=d5405878ca66c09d5e2e3b4e3d0c4c26 PKG_MD5SUM:=90b34503ecc4f3a5e0249b6e4f65d8cf
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=docs/COPYING PKG_LICENSE_FILES:=docs/COPYING
PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz> PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -26,7 +26,7 @@ define Package/libre
SUBMENU:=Telephony SUBMENU:=Telephony
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+libopenssl +libpthread DEPENDS:=+libopenssl +libpthread +zlib
TITLE:=Generic library for real-time communications with async IO support TITLE:=Generic library for real-time communications with async IO support
URL:=http://www.creytiv.com/ URL:=http://www.creytiv.com/
endef endef

20
libs/re/patches/001-extend-ninit-nclose-check.patch Normal file
View file

@ -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

12
libs/rem/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2010-2014 OpenWrt.org # Copyright (C) 2010-2017 OpenWrt.org
# Copyright (C) 2010 Alfred E. Heggestad # Copyright (C) 2010 Alfred E. Heggestad
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
@ -9,16 +9,16 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=rem PKG_NAME:=rem
PKG_VERSION:=0.4.6 PKG_VERSION:=0.5.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.creytiv.com/pub PKG_SOURCE_URL:=http://www.creytiv.com/pub
PKG_MD5SUM:=888c3000aa002790cc7129fa72d39a58 PKG_HASH:=fbc54e81ed4fd28a11d525f4384d06bee4c11e10975395668e8260ef0d4a64eb
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=docs/COPYING PKG_LICENSE_FILES:=docs/COPYING
PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz> PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -31,7 +31,7 @@ define Package/librem
URL:=http://www.creytiv.com/ URL:=http://www.creytiv.com/
endef endef
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS+=$(FPIC)
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \

2
libs/spandsp/Makefile
View file

@ -21,7 +21,7 @@ PKG_FIXUP:=autoreconf
PKG_LICENSE:=LGPL-2.1 GPL-2.0 PKG_LICENSE:=LGPL-2.1 GPL-2.0
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz> PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
net/asterisk-11.x-chan-dongle/Makefile
View file

@ -24,7 +24,7 @@ PKG_FIXUP:=autoreconf
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYRIGHT.txt LICENSE.txt 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 include $(INCLUDE_DIR)/package.mk

4
net/asterisk-11.x/Makefile
View file

@ -21,7 +21,7 @@ PKG_BUILD_DEPENDS:=libxml2/host
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING LICENSE PKG_LICENSE_FILES:=COPYING LICENSE
PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz> PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -80,7 +80,7 @@ define Package/asterisk11/Default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
URL:=http://www.asterisk.org/ URL:=http://www.asterisk.org/
MAINTAINER:=Jiri Slachta <slachta@cesnet.cz> MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
endef endef
define Package/asterisk11/Default/description define Package/asterisk11/Default/description

2
net/asterisk-13.x/Makefile
View file

@ -21,7 +21,7 @@ PKG_BUILD_DEPENDS:=libxml2/host
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING LICENSE PKG_LICENSE_FILES:=COPYING LICENSE
PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz> PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
net/baresip/Makefile
View file

@ -18,7 +18,7 @@ PKG_MD5SUM:=06e0aea9ba3dbbbe834285a8c7e7df83
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=docs/COPYING PKG_LICENSE_FILES:=docs/COPYING
PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz> PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
baresip-mods:= \ baresip-mods:= \
alsa \ alsa \

2
net/chan-sccp-b/Makefile
View file

@ -23,7 +23,7 @@ PKG_FIXUP:=autoreconf -fi
PKG_LICENSE:=GPL-1.0 PKG_LICENSE:=GPL-1.0
PKG_LICENSE_FILES:=COPYING LICENSE PKG_LICENSE_FILES:=COPYING LICENSE
PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz> PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
net/kamailio-4.x/Makefile
View file

@ -18,7 +18,7 @@ PKG_USE_MIPS16:=0
PKG_LICENSE:=GPL-2.0+ PKG_LICENSE:=GPL-2.0+
PKG_LICENSE_FILES:=COPYING 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)/nls.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
net/restund/Makefile
View file

@ -18,7 +18,7 @@ PKG_MD5SUM:=e50e57aa96a19add97193b7765740456
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=docs/COPYING PKG_LICENSE_FILES:=docs/COPYING
PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz> PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
restund-mods:= mysql restund-mods:= mysql

2
net/yate/Makefile
View file

@ -22,7 +22,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz> PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
PKG_INSTALL:=1 PKG_INSTALL:=1