From e405d1372944e27c6a584aa3c00159e1d14e1c6d Mon Sep 17 00:00:00 2001 From: Paul Wassi Date: Tue, 10 Oct 2017 23:06:42 +0200 Subject: [PATCH] utils/smstools3: update to 3.1.21 Update package to 3.1.21, remove parts of patches which were already included upstream, update some OpenWrt specific things. Signed-off-by: Paul Wassi --- utils/smstools3/Makefile | 23 ++++++++++------------ utils/smstools3/files/smstools3.init | 4 ++-- utils/smstools3/patches/001-smsd.patch | 13 ------------ utils/smstools3/patches/002-Makefile.patch | 9 --------- utils/smstools3/patches/003-bash-ash.patch | 8 ++++++++ 5 files changed, 20 insertions(+), 37 deletions(-) delete mode 100644 utils/smstools3/patches/001-smsd.patch create mode 100644 utils/smstools3/patches/003-bash-ash.patch diff --git a/utils/smstools3/Makefile b/utils/smstools3/Makefile index 6d31f01d5..4c60c5857 100644 --- a/utils/smstools3/Makefile +++ b/utils/smstools3/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=smstools3 -PKG_VERSION:=3.1.15 -PKG_RELEASE:=3 +PKG_VERSION:=3.1.21 +PKG_RELEASE:=1 PKG_MAINTAINER:=GĂ©rald Kerma PKG_LICENSE:=GPL-2.0 @@ -19,7 +19,7 @@ PKG_BUILD_PARALLEL:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://smstools3.kekekasvi.com/packages/ -PKG_HASH:=ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59 +PKG_HASH:=a26ba4c02b16f6cf13177bffca6c9230dc5fefaeba8e3030cd4e4905f6a92084 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -47,22 +47,19 @@ TARGET_CFLAGS += -D_FILE_OFFSET_BITS=64 MAKE_VARS += LFLAGS="$(TARGET_LDFLAGS) $(if $(ICONV_FULL),-liconv)" -BINDIR=/usr/local/bin - define Package/smstools3/configure endef define Package/smstools3/install - $(INSTALL_DIR) $(1)/$(BINDIR) - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/smsd $(1)/$(BINDIR)/smsd - $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/sendsms $(1)/$(BINDIR)/sendsms - $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/sms2html $(1)/$(BINDIR)/sms2html - $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/sms2unicode $(1)/$(BINDIR)/sms2unicode - $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/unicode2sms $(1)/$(BINDIR)/unicode2sms + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_BUILD_DIR)/src/smsd \ + $(PKG_BUILD_DIR)/scripts/sendsms \ + $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_DATA) -m 0755 ./files/smstools3.init $(1)/etc/init.d/smstools3 + $(INSTALL_BIN) ./files/smstools3.init $(1)/etc/init.d/smstools3 $(INSTALL_DIR) $(1)/etc - $(INSTALL_DATA) -m 0755 ./files/smstools3.conf $(1)/etc/smsd.conf + $(INSTALL_DATA) ./files/smstools3.conf $(1)/etc/smsd.conf endef $(eval $(call BuildPackage,smstools3)) diff --git a/utils/smstools3/files/smstools3.init b/utils/smstools3/files/smstools3.init index 6598795b1..7c60ceaf8 100644 --- a/utils/smstools3/files/smstools3.init +++ b/utils/smstools3/files/smstools3.init @@ -19,9 +19,9 @@ INFOFILE="/var/run/smsd.working" # Logfile can also be defined in here: LOGFILE="/var/log/smsd.log" -DAEMON=/usr/local/bin/smsd +DAEMON=/usr/bin/smsd # A program which turns power off for couple of seconds: -RESETMODEMS=/usr/local/bin/smsd_resetmodems +RESETMODEMS=/usr/bin/smsd_resetmodems NAME=smsd PSOPT="" diff --git a/utils/smstools3/patches/001-smsd.patch b/utils/smstools3/patches/001-smsd.patch deleted file mode 100644 index 6761661c9..000000000 --- a/utils/smstools3/patches/001-smsd.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/smsd.c 2010-09-21 13:47:48.000000000 +0300 -+++ b/src/smsd.c 2013-03-05 05:26:26.000000000 +0300 -@@ -5200,8 +5200,8 @@ - int result = 1; - char *cmd; - char *p; -- char answer[500]; -- char buffer[600]; -+ char answer[1024]; -+ char buffer[1024]; - int fd; - int log_retry = 3; - int i; diff --git a/utils/smstools3/patches/002-Makefile.patch b/utils/smstools3/patches/002-Makefile.patch index 1e5630f39..a52aee4f9 100644 --- a/utils/smstools3/patches/002-Makefile.patch +++ b/utils/smstools3/patches/002-Makefile.patch @@ -9,12 +9,3 @@ # Uncomment for Solaris # CFLAGS += -D SOLARIS -@@ -43,7 +43,7 @@ smsd: smsd.c extras.o locking.o cfgfile. - - ifneq (,$(findstring SOLARIS,$(CFLAGS))) - ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS))) --override LFLAGS += -lsocket -lnsl -+ override LFLAGS += -lsocket -lnsl - endif - endif - diff --git a/utils/smstools3/patches/003-bash-ash.patch b/utils/smstools3/patches/003-bash-ash.patch new file mode 100644 index 000000000..4ad166364 --- /dev/null +++ b/utils/smstools3/patches/003-bash-ash.patch @@ -0,0 +1,8 @@ +--- a/scripts/sendsms ++++ b/scripts/sendsms +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/ash + # This script send a text sms at the command line by creating + # a sms file in the outgoing queue. +