From 33ee0bd1dd4504fadad33957336a0c884a8c3973 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 31 Aug 2019 19:23:48 +0200 Subject: [PATCH 1/3] freeswitch-stable: rename some patches Some patches don't carry the extension .patch. This fixes that. Signed-off-by: Sebastian Kemper --- .../patches/{003-modmake-fix.diff => 003-modmake-fix.patch} | 0 .../patches/{120-fix-copts.diff => 120-fix-copts.patch} | 0 .../{130-fix-iksemel-copts.diff => 130-fix-iksemel-copts.patch} | 0 .../patches/{230-mod_radius_cdr.diff => 230-mod_radius_cdr.patch} | 0 ...iff => 260-mod_event_zmq-fix-build-with-fortify-headers.patch} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename net/freeswitch-stable/patches/{003-modmake-fix.diff => 003-modmake-fix.patch} (100%) rename net/freeswitch-stable/patches/{120-fix-copts.diff => 120-fix-copts.patch} (100%) rename net/freeswitch-stable/patches/{130-fix-iksemel-copts.diff => 130-fix-iksemel-copts.patch} (100%) rename net/freeswitch-stable/patches/{230-mod_radius_cdr.diff => 230-mod_radius_cdr.patch} (100%) rename net/freeswitch-stable/patches/{260-mod_event_zmq-fix-build-with-fortify-headers.diff => 260-mod_event_zmq-fix-build-with-fortify-headers.patch} (100%) diff --git a/net/freeswitch-stable/patches/003-modmake-fix.diff b/net/freeswitch-stable/patches/003-modmake-fix.patch similarity index 100% rename from net/freeswitch-stable/patches/003-modmake-fix.diff rename to net/freeswitch-stable/patches/003-modmake-fix.patch diff --git a/net/freeswitch-stable/patches/120-fix-copts.diff b/net/freeswitch-stable/patches/120-fix-copts.patch similarity index 100% rename from net/freeswitch-stable/patches/120-fix-copts.diff rename to net/freeswitch-stable/patches/120-fix-copts.patch diff --git a/net/freeswitch-stable/patches/130-fix-iksemel-copts.diff b/net/freeswitch-stable/patches/130-fix-iksemel-copts.patch similarity index 100% rename from net/freeswitch-stable/patches/130-fix-iksemel-copts.diff rename to net/freeswitch-stable/patches/130-fix-iksemel-copts.patch diff --git a/net/freeswitch-stable/patches/230-mod_radius_cdr.diff b/net/freeswitch-stable/patches/230-mod_radius_cdr.patch similarity index 100% rename from net/freeswitch-stable/patches/230-mod_radius_cdr.diff rename to net/freeswitch-stable/patches/230-mod_radius_cdr.patch diff --git a/net/freeswitch-stable/patches/260-mod_event_zmq-fix-build-with-fortify-headers.diff b/net/freeswitch-stable/patches/260-mod_event_zmq-fix-build-with-fortify-headers.patch similarity index 100% rename from net/freeswitch-stable/patches/260-mod_event_zmq-fix-build-with-fortify-headers.diff rename to net/freeswitch-stable/patches/260-mod_event_zmq-fix-build-with-fortify-headers.patch From 86da9c27870390c59f49cf88af5ee13539d80b69 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 31 Aug 2019 19:24:52 +0200 Subject: [PATCH 2/3] freeswitch-stable: rename configuration file As per convention the configuration file in the files directory should carry the extension .conf. Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/Makefile | 2 +- .../files/{freeswitch.config => freeswitch.conf} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename net/freeswitch-stable/files/{freeswitch.config => freeswitch.conf} (100%) diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index fbc6231..d7cba42 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -420,7 +420,7 @@ $(call Package/$(PKG_NAME)/install/lib,$(1),lib$(PRG_NAME)) $(1)$(FS_STABLE_SYSCONF_DIR)/init.d/$(PRG_NAME) $(INSTALL_BIN) ./files/$(PRG_NAME).hotplug \ $(1)$(FS_STABLE_SYSCONF_DIR)/hotplug.d/iface/90-$(PRG_NAME) - $(INSTALL_CONF) ./files/$(PRG_NAME).config \ + $(INSTALL_CONF) ./files/$(PRG_NAME).conf \ $(1)$(FS_STABLE_SYSCONF_DIR)/config/$(PRG_NAME) endef diff --git a/net/freeswitch-stable/files/freeswitch.config b/net/freeswitch-stable/files/freeswitch.conf similarity index 100% rename from net/freeswitch-stable/files/freeswitch.config rename to net/freeswitch-stable/files/freeswitch.conf From cabf89d917206a2a21d8e51436b8061195943ff1 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 31 Aug 2019 19:26:04 +0200 Subject: [PATCH 3/3] freeswitch-stable: remove gratuitous symlinks No need to copy the libfree{switch,tdm}.so symlinks into the packages. Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index d7cba42..c053f66 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PRG_NAME:=freeswitch PKG_NAME:=$(PRG_NAME)-stable PKG_VERSION:=1.10.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Sebastian Kemper PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).-release.tar.xz @@ -306,7 +306,7 @@ endef define Package/$(PKG_NAME)/install/lib $(INSTALL_DIR) $(1)$(FS_STABLE_LIB_DIR) - $(CP) $(PKG_INSTALL_DIR)$(FS_STABLE_LIB_DIR)/$(2).so* \ + $(CP) $(PKG_INSTALL_DIR)$(FS_STABLE_LIB_DIR)/$(2).so.* \ $(1)$(FS_STABLE_LIB_DIR) endef