diff options
| -rw-r--r-- | network/smstools3/fixups2.diff (renamed from network/smstools3/fixups.diff) | 105 | ||||
| -rw-r--r-- | network/smstools3/smstools3.SlackBuild | 4 | ||||
| -rw-r--r-- | network/smstools3/smstools3.info | 6 |
3 files changed, 63 insertions, 52 deletions
diff --git a/network/smstools3/fixups.diff b/network/smstools3/fixups2.diff index b79a8afa35..3f26fcf492 100644 --- a/network/smstools3/fixups.diff +++ b/network/smstools3/fixups2.diff @@ -1,6 +1,6 @@ -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 +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 @@ -10,27 +10,36 @@ diff -Nur smstools3.orig//Makefile smstools3/Makefile VERSION=$(shell grep package_version src/version.h | cut -f2) -@@ -10,7 +10,7 @@ - cd src && $(MAKE) -$(MAKEFLAGS) +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 @@ - 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 @@ + BINDIR=$1 if [ -z "$BINDIR" ]; then - BINDIR=/usr/local/bin +- BINDIR=/usr/local/bin ++ BINDIR=/usr/bin fi -+SBINDIR=$DESTDIR/usr/sbin ++SBINDIR=/usr/sbin ++ makepath() { -@@ -64,7 +65,7 @@ + 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" @@ -39,26 +48,39 @@ diff -Nur smstools3.orig//install.sh smstools3/install.sh fi } -@@ -76,10 +77,11 @@ + 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 -+makepath $SBINDIR - if [ -f src/smsd.exe ]; then - forcecopy src/smsd.exe $BINDIR/smsd.exe - else +-makepath $BINDIR +-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 +-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 @@ -93,29 +115,18 @@ diff -Nur smstools3.orig//install.sh smstools3/install.sh - 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 +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/sbin/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 ---- 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/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="" |