From 3f6bbd6610dc3c53173894f002a110431df1af98 Mon Sep 17 00:00:00 2001 From: sthen Date: Tue, 2 Jun 2009 15:57:48 +0000 Subject: [PATCH] - update to 3.1.5; adds smart logging (loglevel 7 output can be buffered and written in full only when a voicecall/SMS transmission has an error), additional modem settings, default modem configs, etc. - enable stats support (using devel/mm) --- comms/smstools/Makefile | 12 +++++++----- comms/smstools/distinfo | 10 +++++----- .../patches/patch-scripts_eventhandler_report | 9 +++++++++ .../patches/patch-scripts_load_balancing_sh | 9 +++++++++ comms/smstools/patches/patch-scripts_sendsms | 12 ++++++++++++ comms/smstools/patches/patch-src_Makefile | 15 --------------- comms/smstools/pkg/PLIST | 11 +---------- 7 files changed, 43 insertions(+), 35 deletions(-) create mode 100644 comms/smstools/patches/patch-scripts_eventhandler_report create mode 100644 comms/smstools/patches/patch-scripts_load_balancing_sh create mode 100644 comms/smstools/patches/patch-scripts_sendsms delete mode 100644 comms/smstools/patches/patch-src_Makefile diff --git a/comms/smstools/Makefile b/comms/smstools/Makefile index 19eb5529420..5e6139e37a9 100644 --- a/comms/smstools/Makefile +++ b/comms/smstools/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.7 2009/03/17 10:47:44 sthen Exp $ +# $OpenBSD: Makefile,v 1.8 2009/06/02 15:57:48 sthen Exp $ COMMENT = gateway to send and receive SMS through GSM mobile phones -DISTNAME = smstools3-3.1.3 -PKGNAME = ${DISTNAME}p0 +DISTNAME = smstools3-3.1.5 CATEGORIES = comms @@ -23,6 +22,7 @@ MASTER_SITES = ${HOMEPAGE}/packages/ # some scripts use formail RUN_DEPENDS = ::mail/procmail +LIB_DEPENDS = mm::devel/mm USE_GMAKE = Yes NO_REGRESS = Yes @@ -31,10 +31,12 @@ WRKSRC = ${WRKDIST}/src # gcc 3.3.5 internal compiler error .if ${MACHINE_ARCH} == "mips64" -EXTRA_CFLAGS = -O0 +CFLAGS += -O0 .endif -MAKE_FLAGS += EXTRA_CFLAGS=${EXTRA_CFLAGS} +EXTRA_CFLAGS += -I${LOCALBASE}/include -L${LOCALBASE}/lib + +MAKE_FLAGS += CFLAGS="${CFLAGS} -D NUMBER_OF_MODEMS=64 `mm-config --cflags`" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/smsd ${PREFIX}/bin diff --git a/comms/smstools/distinfo b/comms/smstools/distinfo index a1b1741a193..b20f0d273cf 100644 --- a/comms/smstools/distinfo +++ b/comms/smstools/distinfo @@ -1,5 +1,5 @@ -MD5 (smstools3-3.1.3.tar.gz) = v+ydwfiuN/1bGJZ29gxlfA== -RMD160 (smstools3-3.1.3.tar.gz) = hWVwwHnK70q2SVZ6d5zOOjZyXNg= -SHA1 (smstools3-3.1.3.tar.gz) = FIm4p4PLCCXIiyCyxahSdp4D5RU= -SHA256 (smstools3-3.1.3.tar.gz) = hEmtkNs28NM/+wxA5Pd4AZkniyfeNLfEuiirOJxChZo= -SIZE (smstools3-3.1.3.tar.gz) = 234065 +MD5 (smstools3-3.1.5.tar.gz) = 29shuj9Y697Mnh01agGnLA== +RMD160 (smstools3-3.1.5.tar.gz) = gopdcJRS9I9yWdVaeUjMxcq4pNY= +SHA1 (smstools3-3.1.5.tar.gz) = Re911fsCLstWkMgD/vukzUyJDI0= +SHA256 (smstools3-3.1.5.tar.gz) = jEA+nORtN+MwGaxOvoxEbfVKOpVMM08lJiGxxo9twFY= +SIZE (smstools3-3.1.5.tar.gz) = 251255 diff --git a/comms/smstools/patches/patch-scripts_eventhandler_report b/comms/smstools/patches/patch-scripts_eventhandler_report new file mode 100644 index 00000000000..5b599c69499 --- /dev/null +++ b/comms/smstools/patches/patch-scripts_eventhandler_report @@ -0,0 +1,9 @@ +$OpenBSD: patch-scripts_eventhandler_report,v 1.1 2009/06/02 15:57:48 sthen Exp $ +--- scripts/eventhandler_report.orig Tue Jun 2 03:59:02 2009 ++++ scripts/eventhandler_report Tue Jun 2 03:59:05 2009 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # SMS Server Tools 3. + # Sample eventhandler script for storing delivery timestamps. + diff --git a/comms/smstools/patches/patch-scripts_load_balancing_sh b/comms/smstools/patches/patch-scripts_load_balancing_sh new file mode 100644 index 00000000000..810dcbadf7b --- /dev/null +++ b/comms/smstools/patches/patch-scripts_load_balancing_sh @@ -0,0 +1,9 @@ +$OpenBSD: patch-scripts_load_balancing_sh,v 1.1 2009/06/02 15:57:48 sthen Exp $ +--- scripts/load_balancing.sh.orig Tue Jun 2 03:59:09 2009 ++++ scripts/load_balancing.sh Tue Jun 2 03:59:12 2009 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # --------------------------------------------------------------------------------------- + # This example is for three modems, named GSM1, GSM2 and GSM3 using queues Q1, Q2 and Q3. + # In the global part of smsd.conf, enable message counters: diff --git a/comms/smstools/patches/patch-scripts_sendsms b/comms/smstools/patches/patch-scripts_sendsms new file mode 100644 index 00000000000..544bd2b55cf --- /dev/null +++ b/comms/smstools/patches/patch-scripts_sendsms @@ -0,0 +1,12 @@ +$OpenBSD: patch-scripts_sendsms,v 1.1 2009/06/02 15:57:48 sthen Exp $ +--- scripts/sendsms.orig Tue Jun 2 15:07:51 2009 ++++ scripts/sendsms Tue Jun 2 15:07:52 2009 +@@ -10,7 +10,7 @@ + # If a destination is asked, you can type multiple numbers + # delimited with spaces. + +-smsd_user="smsd" ++smsd_user="_smsd" + + # Will need echo which accepts -n argument: + ECHO=echo diff --git a/comms/smstools/patches/patch-src_Makefile b/comms/smstools/patches/patch-src_Makefile deleted file mode 100644 index af3e4c290c2..00000000000 --- a/comms/smstools/patches/patch-src_Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_Makefile,v 1.2 2008/10/30 13:45:19 sthen Exp $ ---- src/Makefile.orig Sun May 11 17:11:54 2008 -+++ src/Makefile Mon May 12 10:15:57 2008 -@@ -22,9 +22,9 @@ 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 $@ $^ -+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ $^ - else -- $(CC) `mm-config --cflags` $(CFLAGS) -o $@ $^ `mm-config --ldflags --libs` -+ $(CC) `mm-config --cflags` $(CFLAGS) $(EXTRA_CFLAGS) -o $@ $^ `mm-config --ldflags --libs` - @echo "(Please ignore warning about tempnam -- it is used in a safe way)" - endif - diff --git a/comms/smstools/pkg/PLIST b/comms/smstools/pkg/PLIST index b0b95cc40dc..fa341f05a2e 100644 --- a/comms/smstools/pkg/PLIST +++ b/comms/smstools/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2008/10/30 13:45:19 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.4 2009/06/02 15:57:48 sthen Exp $ @conflict gnokii-* @newgroup _smsd:590 @newuser _smsd:590:_smsd:daemon:smsd user:/nonexistent:/sbin/nologin @@ -8,25 +8,20 @@ bin/sms2unicode @bin bin/smsd bin/unicode2sms share/doc/smstools/ -share/doc/smstools/alarmhandler.html share/doc/smstools/blacklist.html share/doc/smstools/book.html share/doc/smstools/compiling.html share/doc/smstools/configure.html share/doc/smstools/configure2.html -share/doc/smstools/costs.html share/doc/smstools/eventhandler.html share/doc/smstools/faq.html share/doc/smstools/fileformat.html share/doc/smstools/gpl.html -share/doc/smstools/gpl_de.html share/doc/smstools/hardwarecomp.html share/doc/smstools/history3.html share/doc/smstools/index.html share/doc/smstools/license.html -share/doc/smstools/links.html share/doc/smstools/localizing.html -share/doc/smstools/references.html share/doc/smstools/run.html share/doc/smstools/slideshow/ share/doc/smstools/slideshow/blacklist.gif @@ -50,11 +45,7 @@ share/doc/smstools/slideshow/sms.gif share/doc/smstools/slideshow/smstools3-small.jpg share/doc/smstools/slideshow/statistic.gif share/doc/smstools/slideshow/status.gif -share/doc/smstools/slideshow/support.gif -share/doc/smstools/softwarecomp.html -share/doc/smstools/statformat.html share/doc/smstools/statusmonitor.html -share/doc/smstools/support.html share/doc/smstools/udh.html share/doc/smstools/windows.html share/examples/smstools/