From f7f9e4f930c7900e04ee140c2ff17c8209079bfb Mon Sep 17 00:00:00 2001 From: Bill Randle Date: Sat, 23 Dec 2017 12:04:50 -0800 Subject: smstools3: update to 3.1.21; drop uneeded patches Update smstools3 to latest version and drop some patches that no longer seem to be required. (Builds and runs fine on poky.) Signed-off-by: Bill Randle fixed sha256 hash Signed-off-by: Armin Kuster --- .../smstools3/fix-makefile-override.patch | 24 ----------- .../smstools3/smstools3/sms_binpath.patch | 16 ++++++++ .../smstools3/sms_binpath_and_psops.patch | 19 --------- .../smstools3/smstools3_3.1.15.bb | 48 ---------------------- .../smstools3/smstools3_3.1.21.bb | 46 +++++++++++++++++++++ 5 files changed, 62 insertions(+), 91 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch create mode 100644 meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch delete mode 100644 meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath_and_psops.patch delete mode 100644 meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb create mode 100644 meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb (limited to 'meta-oe/recipes-connectivity') diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch b/meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch deleted file mode 100644 index f0a1d33c96..0000000000 --- a/meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Backport [debian] - ---- a/src/Makefile -+++ b/src/Makefile -@@ -37,16 +37,15 @@ - # Use the following only on GNU/Linux and only if you need ps listing like "smsd: MAINPROCESS" and "smsd: GSM1" - # CFLAGS += -D USE_LINUX_PS_TRICK - --all: smsd -- --smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o -- - ifneq (,$(findstring SOLARIS,$(CFLAGS))) - ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS))) - override LFLAGS += -lsocket -lnsl - endif - endif - -+all: smsd -+ -+smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o - ifneq (,$(findstring NOSTATS,$(CFLAGS))) - $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) - else diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch b/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch new file mode 100644 index 0000000000..6220446327 --- /dev/null +++ b/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch @@ -0,0 +1,16 @@ +Index: smstools3/scripts/sms3 +=================================================================== +--- smstools3.orig/scripts/sms3 2010-05-04 11:21:44.000000000 +0200 ++++ smstools3/scripts/sms3 2015-02-22 20:05:51.615074469 +0100 +@@ -24,11 +24,11 @@ + # 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="-e" + ECHO=echo diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath_and_psops.patch b/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath_and_psops.patch deleted file mode 100644 index ffcaa09716..0000000000 --- a/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath_and_psops.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: smstools3/scripts/sms3 -=================================================================== ---- smstools3.orig/scripts/sms3 2010-05-04 11:21:44.000000000 +0200 -+++ smstools3/scripts/sms3 2015-02-22 20:05:51.615074469 +0100 -@@ -24,11 +24,11 @@ - # 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="-e" -+PSOPT="" - ECHO=echo - case `uname` in - *BSD|Darwin) diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb deleted file mode 100644 index 310a13c22a..0000000000 --- a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "SMS Gateway software" -DESCRIPTION = "The SMS Server Tools 3 is a SMS Gateway software which can send and receive short messages through GSM modems and mobile phones." -SECTION = "console/network" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4d21efa1bb2a186360dde4035f860682" -HOMEPAGE = "http://smstools3.kekekasvi.com" - -SRC_URI = "http://smstools3.kekekasvi.com/packages/${BP}.tar.gz \ - file://sms_binpath_and_psops.patch \ - file://fix-makefile-override.patch" - -SRC_URI[md5sum] = "0241ef60e646fac1a06254a848e61ed7" -SRC_URI[sha256sum] = "ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59" - - -S = "${WORKDIR}/${BPN}" - -EXTRA_OEMAKE += "LFLAGS='${LDFLAGS}'" - -RDEPENDS_${PN} = "bash" -INITSCRIPT_NAME = "sms3" -INITSCRIPT_PARAMS = "defaults" - -inherit update-rc.d - -do_install () { - - install -d ${D}${bindir} - install -m 755 ${S}/src/smsd "${D}${bindir}/smsd" - - install -m 755 ${S}/scripts/sendsms "${D}${bindir}/sendsms" - install -m 755 ${S}/scripts/sms2html "${D}${bindir}/sms2html" - install -m 755 ${S}/scripts/sms2unicode "${D}${bindir}/sms2unicode" - install -m 755 ${S}/scripts/unicode2sms "${D}${bindir}/unicode2sms" - - install -d ${D}${sysconfdir} - install -m 644 ${S}/examples/smsd.conf.easy "${D}${sysconfdir}/smsd.conf" - - install -d "${D}${localstatedir}/spool" - install -d "${D}${localstatedir}/spool/sms" - install -d "${D}${localstatedir}/spool/sms/incoming" - install -d "${D}${localstatedir}/spool/sms/outgoing" - install -d "${D}${localstatedir}/spool/sms/checked" - - install -d ${D}${sysconfdir}/init.d - install -m 755 ${S}/scripts/sms3 "${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}" - -} diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb new file mode 100644 index 0000000000..86c8ede1db --- /dev/null +++ b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb @@ -0,0 +1,46 @@ +SUMMARY = "SMS Gateway software" +DESCRIPTION = "The SMS Server Tools 3 is a SMS Gateway software which can send and receive short messages through GSM modems and mobile phones." +SECTION = "console/network" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4d21efa1bb2a186360dde4035f860682" +HOMEPAGE = "http://smstools3.kekekasvi.com" + +SRC_URI = "http://smstools3.kekekasvi.com/packages/${BP}.tar.gz \ + file://sms_binpath.patch" + +SRC_URI[md5sum] = "6a9f038fb38a49cc3a4f8f14a88fb8af" +SRC_URI[sha256sum] = "a26ba4c02b16f6cf13177bffca6c9230dc5fefaeba8e3030cd4e4905f6a92084" + + +S = "${WORKDIR}/${BPN}" + +EXTRA_OEMAKE += "LFLAGS='${LDFLAGS}'" + +INITSCRIPT_NAME = "sms3" +INITSCRIPT_PARAMS = "defaults" + +inherit update-rc.d + +do_install () { + + install -d ${D}${bindir} + install -m 755 ${S}/src/smsd "${D}${bindir}/smsd" + + install -m 755 ${S}/scripts/sendsms "${D}${bindir}/sendsms" + install -m 755 ${S}/scripts/sms2html "${D}${bindir}/sms2html" + install -m 755 ${S}/scripts/sms2unicode "${D}${bindir}/sms2unicode" + install -m 755 ${S}/scripts/unicode2sms "${D}${bindir}/unicode2sms" + + install -d ${D}${sysconfdir} + install -m 644 ${S}/examples/smsd.conf.easy "${D}${sysconfdir}/smsd.conf" + + install -d "${D}${localstatedir}/spool" + install -d "${D}${localstatedir}/spool/sms" + install -d "${D}${localstatedir}/spool/sms/incoming" + install -d "${D}${localstatedir}/spool/sms/outgoing" + install -d "${D}${localstatedir}/spool/sms/checked" + + install -d ${D}${sysconfdir}/init.d + install -m 755 ${S}/scripts/sms3 "${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}" + +} -- cgit v1.2.3-54-g00ecf