From 81c33bf60b976bb7a830a8fe92a09f660b94cded Mon Sep 17 00:00:00 2001 From: David Woodfall Date: Sun, 13 Aug 2017 10:24:20 +0700 Subject: network/smstools3: Updated for version 3.1.21. Signed-off-by: Willy Sudiarto Raharjo --- network/smstools3/fixups.diff | 121 ------------------------------ network/smstools3/fixups2.diff | 132 +++++++++++++++++++++++++++++++++ network/smstools3/smstools3.SlackBuild | 4 +- network/smstools3/smstools3.info | 6 +- 4 files changed, 137 insertions(+), 126 deletions(-) delete mode 100644 network/smstools3/fixups.diff create mode 100644 network/smstools3/fixups2.diff (limited to 'network') diff --git a/network/smstools3/fixups.diff b/network/smstools3/fixups.diff deleted file mode 100644 index b79a8afa35..0000000000 --- a/network/smstools3/fixups.diff +++ /dev/null @@ -1,121 +0,0 @@ -diff -Nur smstools3.orig//Makefile smstools3/Makefile ---- smstools3.orig//Makefile 2007-04-22 06:42:22.000000000 -0500 -+++ smstools3/Makefile 2010-10-15 22:34:14.971037552 -0500 -@@ -2,7 +2,7 @@ - - # If you change destination of executables, remember to change - # startup script (init.d/sms3) too. --BINDIR=/usr/local/bin -+BINDIR=/usr/bin - - VERSION=$(shell grep package_version src/version.h | cut -f2) - -@@ -10,7 +10,7 @@ - cd src && $(MAKE) -$(MAKEFLAGS) - - install: compile -- ./install.sh $(BINDIR) -+ ./install.sh $(DESTDIR)$(BINDIR) - - uninstall: - ./uninstall.sh $(BINDIR) -diff -Nur smstools3.orig//install.sh smstools3/install.sh ---- smstools3.orig//install.sh 2007-04-22 06:43:17.000000000 -0500 -+++ smstools3/install.sh 2010-10-15 22:34:14.971037552 -0500 -@@ -5,6 +5,7 @@ - if [ -z "$BINDIR" ]; then - BINDIR=/usr/local/bin - fi -+SBINDIR=$DESTDIR/usr/sbin - - makepath() - { -@@ -64,7 +65,7 @@ - echo " Skipped $1, directory already exists" - else - echo " Creating directory $1" -- mkdir $1 -+ mkdir -p $1 - fi - } - -@@ -76,10 +77,11 @@ - - echo "Installing binary program files" - makepath $BINDIR -+makepath $SBINDIR - if [ -f src/smsd.exe ]; then - forcecopy src/smsd.exe $BINDIR/smsd.exe - else -- forcecopy src/smsd $BINDIR/smsd -+ forcecopy src/smsd $SBINDIR/smsd - fi - delete $BINDIR/getsms - delete $BINDIR/putsms -@@ -90,32 +92,18 @@ - copy scripts/sms2unicode $BINDIR/sms2unicode - copy scripts/unicode2sms $BINDIR/unicode2sms - --echo "Installing config file" --copy examples/smsd.conf.easy /etc/smsd.conf -- - echo "Creating minimum spool directories" --makedir /var/spool --makedir /var/spool/sms --makedir /var/spool/sms/incoming --makedir /var/spool/sms/outgoing --makedir /var/spool/sms/checked -+makedir $DESTDIR/var/spool -+makedir $DESTDIR/var/spool/sms -+makedir $DESTDIR/var/spool/sms/incoming -+makedir $DESTDIR/var/spool/sms/outgoing -+makedir $DESTDIR/var/spool/sms/checked - - echo "Installing start-script" --SMS3SCRIPT=scripts/sms3 --if [ -d /etc/init.d ]; then -- copy scripts/sms3 /etc/init.d/sms3 -- SMS3SCRIPT=/etc/init.d/sms3 --elif [ -d /sbin/init.d ]; then -- copy scripts/sms3 /sbin/init.d/sms3 -- SMS3SCRIPT=/sbin/init.d/sms3 --else -- echo " I do not know where to copy scripts/sms3. Please find out yourself." --fi -+makedir $DESTDIR/etc/rc.d -+copy scripts/sms3 $DESTDIR/etc/rc.d/rc.sms3.new -+SMS3SCRIPT=/etc/rc.d/rc.sms3 - - echo "" - echo "Example script files are not installed automatically." - echo 'Please dont forget to edit /etc/smsd.conf.' --if [ "$BINDIR" != "/usr/local/bin" ]; then -- echo "You have installed executables to $BINDIR," -- echo "you should manually edit $SMS3SCRIPT script." --fi -diff -Nur smstools3.orig//scripts/sms3 smstools3/scripts/sms3 ---- smstools3.orig//scripts/sms3 2010-05-04 04:21:44.000000000 -0500 -+++ smstools3/scripts/sms3 2010-10-15 22:34:14.971037552 -0500 -@@ -24,9 +24,9 @@ - # Logfile can also be defined in here: - LOGFILE="/var/log/smsd.log" - --DAEMON=/usr/local/bin/smsd -+DAEMON=/usr/sbin/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 ---- smstools3/src/Makefile.old 2016-01-05 11:42:44.419397198 +0700 -+++ smstools3/src/Makefile 2016-01-05 11:42:54.920396958 +0700 -@@ -43,7 +43,7 @@ - - ifneq (,$(findstring SOLARIS,$(CFLAGS))) - ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS))) --override LFLAGS += -lsocket -lnsl -+ override LFLAGS += -lsocket -lnsl - endif - endif - diff --git a/network/smstools3/fixups2.diff b/network/smstools3/fixups2.diff new file mode 100644 index 0000000000..3f26fcf492 --- /dev/null +++ b/network/smstools3/fixups2.diff @@ -0,0 +1,132 @@ +diff -Naur a/Makefile b/Makefile +--- a/Makefile 2007-04-22 11:42:22.000000000 +0000 ++++ b/Makefile 2017-08-10 22:14:15.011099622 +0000 +@@ -2,7 +2,7 @@ + + # If you change destination of executables, remember to change + # startup script (init.d/sms3) too. +-BINDIR=/usr/local/bin ++BINDIR=/usr/bin + + VERSION=$(shell grep package_version src/version.h | cut -f2) + +diff -Naur a/install.sh b/install.sh +--- a/install.sh 2007-04-22 11:43:17.000000000 +0000 ++++ b/install.sh 2017-08-10 22:18:11.561100240 +0000 +@@ -3,9 +3,11 @@ + + BINDIR=$1 + if [ -z "$BINDIR" ]; then +- BINDIR=/usr/local/bin ++ BINDIR=/usr/bin + fi + ++SBINDIR=/usr/sbin ++ + makepath() + { + p="$1" +@@ -33,10 +35,10 @@ + { + if [ -f $2 ]; then + echo " Skipped $2, file already exists" +- else ++ else + echo " $2" + cp $1 $2 +- fi ++ fi + } + + forcecopy() +@@ -64,58 +66,39 @@ + echo " Skipped $1, directory already exists" + else + echo " Creating directory $1" +- mkdir $1 ++ mkdir -p $1 + fi + } + + echo "" +-if [ ! -f src/smsd ] && [ ! -f src/smsd.exe ]; then ++if [ ! -f src/smsd ] && [ ! -f src/smsd.exe ]; then + echo 'Please run "make -s install" instead.' + exit 1 + fi + + echo "Installing binary program files" +-makepath $BINDIR +-if [ -f src/smsd.exe ]; then +- forcecopy src/smsd.exe $BINDIR/smsd.exe +-else +- forcecopy src/smsd $BINDIR/smsd +-fi +-delete $BINDIR/getsms +-delete $BINDIR/putsms ++mkdir -p $DESTDIR/$BINDIR ++mkdir -p $DESTDIR/$SBINDIR ++forcecopy src/smsd $DESTDIR/$SBINDIR/smsd + + echo "Installing some scripts" +-copy scripts/sendsms $BINDIR/sendsms +-copy scripts/sms2html $BINDIR/sms2html +-copy scripts/sms2unicode $BINDIR/sms2unicode +-copy scripts/unicode2sms $BINDIR/unicode2sms +- +-echo "Installing config file" +-copy examples/smsd.conf.easy /etc/smsd.conf ++copy scripts/sendsms $DESTDIR/$BINDIR/sendsms ++copy scripts/sms2html $DESTDIR/$BINDIR/sms2html ++copy scripts/sms2unicode $DESTDIR/$BINDIR/sms2unicode ++copy scripts/unicode2sms $DESTDIR/$BINDIR/unicode2sms + + echo "Creating minimum spool directories" +-makedir /var/spool +-makedir /var/spool/sms +-makedir /var/spool/sms/incoming +-makedir /var/spool/sms/outgoing +-makedir /var/spool/sms/checked ++makedir $DESTDIR/var/spool ++makedir $DESTDIR/var/spool/sms ++makedir $DESTDIR/var/spool/sms/incoming ++makedir $DESTDIR/var/spool/sms/outgoing ++makedir $DESTDIR/var/spool/sms/checked + + echo "Installing start-script" +-SMS3SCRIPT=scripts/sms3 +-if [ -d /etc/init.d ]; then +- copy scripts/sms3 /etc/init.d/sms3 +- SMS3SCRIPT=/etc/init.d/sms3 +-elif [ -d /sbin/init.d ]; then +- copy scripts/sms3 /sbin/init.d/sms3 +- SMS3SCRIPT=/sbin/init.d/sms3 +-else +- echo " I do not know where to copy scripts/sms3. Please find out yourself." +-fi ++makedir $DESTDIR/etc/rc.d ++copy scripts/sms3 $DESTDIR/etc/rc.d/rc.sms3.new ++SMS3SCRIPT=/etc/rc.d/rc.sms3 + + echo "" + echo "Example script files are not installed automatically." + echo 'Please dont forget to edit /etc/smsd.conf.' +-if [ "$BINDIR" != "/usr/local/bin" ]; then +- echo "You have installed executables to $BINDIR," +- echo "you should manually edit $SMS3SCRIPT script." +-fi +diff -Naur a/scripts/sms3 b/scripts/sms3 +--- a/scripts/sms3 2010-05-04 09:21:44.000000000 +0000 ++++ b/scripts/sms3 2017-08-10 21:58:41.968097184 +0000 +@@ -24,9 +24,9 @@ + # 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/network/smstools3/smstools3.SlackBuild b/network/smstools3/smstools3.SlackBuild index a5fbba9b89..b28085d3a4 100644 --- a/network/smstools3/smstools3.SlackBuild +++ b/network/smstools3/smstools3.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=smstools3 -VERSION=${VERSION:-3.1.15} +VERSION=${VERSION:-3.1.21} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,7 +71,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch --verbose -p1 < $CWD/fixups.diff +patch --verbose -p1 < $CWD/fixups2.diff DESTDIR=$PKG make install diff --git a/network/smstools3/smstools3.info b/network/smstools3/smstools3.info index bb44cdc1bd..2b93193511 100644 --- a/network/smstools3/smstools3.info +++ b/network/smstools3/smstools3.info @@ -1,8 +1,8 @@ PRGNAM="smstools3" -VERSION="3.1.15" +VERSION="3.1.21" HOMEPAGE="http://smstools3.kekekasvi.com" -DOWNLOAD="http://smstools3.kekekasvi.com/packages/smstools3-3.1.15.tar.gz" -MD5SUM="0241ef60e646fac1a06254a848e61ed7" +DOWNLOAD="http://smstools3.kekekasvi.com/packages/smstools3-3.1.21.tar.gz" +MD5SUM="6a9f038fb38a49cc3a4f8f14a88fb8af" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -- cgit v1.2.3