restund: fix CVE-2021-21382

[feed/telephony.git] / net / restund / Makefile

diff --git a/net/restund/Makefile b/net/restund/Makefile
index f639ff4c24d9307741022fb8806f049f18970f28..88b8bd798cd658bfde619d52abb1b84cfb19296e 100644 (file)
--- a/net/restund/Makefile
+++ b/net/restund/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,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=restund
-PKG_VERSION:=0.4.2
-PKG_RELEASE:=3
+PKG_VERSION:=0.4.12
+PKG_RELEASE:=7
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.creytiv.com/pub/
-PKG_MD5SUM:=dd58fc56c29f812fc14988412a3bf14a
+PKG_SOURCE_URL:=http://www.creytiv.com/pub
+PKG_HASH:=3170441dc882352ab0275556b6fc889b38b14203d936071b5fa12f39a5c86d47
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=docs/COPYING
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
+
+PKG_INSTALL:=1
 
-restund-mods:= mysql
+restund-mods:=mysql
 
-PKG_CONFIG_DEPENDS:= $(patsubst %,CONFIG_PACKAGE_restund-mod-%,$(restund-mods))
+PKG_CONFIG_DEPENDS:=$(patsubst %,CONFIG_PACKAGE_restund-mod-%,$(restund-mods))
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,62 +32,73 @@ define Package/restund/Default
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Telephony
-  URL:=http://www.creytiv.com/
+  URL:=http://www.creytiv.com
 endef
 
 define Package/restund
 $(call Package/restund/Default)
   TITLE:=Modular STUN/TURN server
-  DEPENDS:=+libre +libpthread
+  DEPENDS:=+libre
+  USERID:=$(PKG_NAME)=373:$(PKG_NAME)=373
 endef
 
-restund-mod-mysql := USE_MYSQL
+restund-mod-mysql:=USE_MYSQL
 
 RESTUND_MOD_OPTIONS:= \
        $(foreach m,$(restund-mods),$(restund-mod-$(m))=$(if $(CONFIG_PACKAGE_restund-mod-$(m)),1))
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \
-               LIBRE_INC="$(STAGING_DIR)/usr/include/re" \
-               LIBRE_SO="$(STAGING_DIR)/usr/lib" \
-               CC="$(TARGET_CC)" \
-               EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               SYSROOT="$$$$($(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s#/include/pthread.h##p')" \
-               SYSROOT_ALT="$(STAGING_DIR)/usr" \
-               RELEASE=1 \
-               CROSS_COMPILE="$(TARGET_CROSS)" \
-               OS="linux" \
-               $(RESTUND_MOD_OPTIONS) \
-               all install
-endef
+MAKE_FLAGS+= \
+       CROSS_COMPILE="$(TARGET_CROSS)" \
+       EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \
+       LD="$(TARGET_CC)" \
+       LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \
+       LIBRE_INC="$(STAGING_DIR)/usr/include/re" \
+       LIBRE_SO="$(STAGING_DIR)/usr/lib" \
+       OS=linux \
+       RELEASE=1 \
+       SYSROOT="$(shell $(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s|/include/pthread.h||p')" \
+       SYSROOT_ALT="$(STAGING_DIR)/usr" \
+       $(RESTUND_MOD_OPTIONS)
 
 define Package/restund/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/restund $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/restund $(1)/usr/sbin
        $(INSTALL_DIR) $(1)/usr/lib/restund/modules
-       $(CP) \
+       $(INSTALL_DATA) \
                $(PKG_INSTALL_DIR)/usr/lib/restund/modules/auth.so \
                $(PKG_INSTALL_DIR)/usr/lib/restund/modules/binding.so \
+               $(PKG_INSTALL_DIR)/usr/lib/restund/modules/filedb.so \
+               $(PKG_INSTALL_DIR)/usr/lib/restund/modules/restauth.so \
                $(PKG_INSTALL_DIR)/usr/lib/restund/modules/stat.so \
                $(PKG_INSTALL_DIR)/usr/lib/restund/modules/status.so \
                $(PKG_INSTALL_DIR)/usr/lib/restund/modules/syslog.so \
                $(PKG_INSTALL_DIR)/usr/lib/restund/modules/turn.so \
-               $(1)/usr/lib/restund/modules/
+               $(1)/usr/lib/restund/modules
        $(INSTALL_DIR) $(1)/etc
-       $(INSTALL_CONF) $(PKG_BUILD_DIR)/etc/restund.conf $(1)/etc/
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/etc/restund.conf $(1)/etc
        $(SED) \
                's|^\(module_path\)\([ \t]\+\).*$$$$|\1\2/usr/lib/restund/modules|g' \
                $(1)/etc/restund.conf
+       $(INSTALL_DIR) $(1)/etc/default
+       $(INSTALL_CONF) ./files/restund.default $(1)/etc/default/restund
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/restund.init $(1)/etc/init.d/restund
 endef
 
 define Package/restund/conffiles
+/etc/default/restund
+/etc/init.d/restund
 /etc/restund.conf
 endef
 
+define Package/restund/postinst
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+  chown $(PKG_NAME):$(PKG_NAME) /etc/restund.conf
+fi
+exit 0
+endef
+
 #
 # 1. Name
 # 2. Title
@@ -92,16 +109,16 @@ define BuildPlugin
 
   define Package/restund-mod-$(1)
     $$(call Package/restund/Default)
-    TITLE:= restund $(2) module
-    DEPENDS:= restund $(4)
+    TITLE:=restund $(2) module
+    DEPENDS:=restund $(patsubst +%,+PACKAGE_$(PKG_NAME)-mod-$(1):%,$(4))
   endef
 
   define Package/restund-mod-$(1)/install
        [ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/usr/lib/restund/modules
        for f in $(3); do \
-               $(CP) \
+               $(INSTALL_DATA) \
                        $(PKG_INSTALL_DIR)/usr/lib/restund/modules/$$$$$$$${f}.so \
-                       $$(1)/usr/lib/restund/modules/ ; \
+                       $$(1)/usr/lib/restund/modules; \
        done
   endef
 
@@ -110,4 +127,4 @@ endef
 
 $(eval $(call BuildPackage,restund))
 
-$(eval $(call BuildPlugin,mysql,MySQL database backend,mysql_ser,+PACKAGE_restund-mod-mysql:libmysqlclient))
+$(eval $(call BuildPlugin,mysql,MySQL database backend,mysql_ser,+libmysqlclient))