Skip to contentSkip to conversation

smstools3: remove bash dependency on packaged scripts

PATCH In review Bill Randle 2 participants 2 messages Dec 31, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 smstools3: remove bash dependency on packaged scripts

An earlier patch to update smstools3 to v3.1.21 dropped the RDEPENDS for bash, which caused qc errors during packaging, since the example scripts still used /bin/bash as the command executor. This patch updates the scripts to use /bin/sh instead. No known bash-only syntax is present in the packaged scripts and they run ok under Busybox.

Upstream-Status: Submitted [http://smstools3.kekekasvi.com/topic.php?post=6188#post6188]

---
 .../smstools3/smstools3/scripts_no_bash.patch      | 32 ++++++++++++++++++++++
 .../smstools3/smstools3_3.1.21.bb                  |  3 +-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch
meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch new file +32 -0
new file mode 100644
index 000000000..f7529d8cb
@@ -0,0 +1,32 @@
+--- smstools3.orig/scripts/sendsms	2006-02-04 11:52:06.000000000 -0800
++++ smstools3/scripts/sendsms	2017-12-30 15:40:28.009169106 -0800
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # This script send a text sms at the command line by creating
+ # a sms file in the outgoing queue.
+ 
+--- smstools3.orig/scripts/sms2html	2006-02-04 11:52:06.000000000 -0800
++++ smstools3/scripts/sms2html	2017-12-30 15:39:17.496694390 -0800
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # This script converts a received sms file into a html file. 
+ 
+--- smstools3.orig/scripts/sms2unicode	2006-02-04 11:52:06.000000000 -0800
++++ smstools3/scripts/sms2unicode	2017-12-30 15:33:14.477250179 -0800
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # This script converts a received sms file into a pure unicode text file.
+ 
+--- smstools3/scripts/unicode2sms	2006-02-04 11:52:06.000000000 -0800
++++ smstools3/scripts/unicode2sms.new	2017-12-30 15:33:56.918536044 -0800
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # This script converts a pure unicode text file into an sms file for sending.
+ 
meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb +2 -1
index 86c8ede1d..6e6413b4b 100644
@@ -6,7 +6,8 @@ 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"
+           file://sms_binpath.patch \
+           file://scripts_no_bash.patch"
 
 SRC_URI[md5sum] = "6a9f038fb38a49cc3a4f8f14a88fb8af"
 SRC_URI[sha256sum] = "a26ba4c02b16f6cf13177bffca6c9230dc5fefaeba8e3030cd4e4905f6a92084"
Signature · 1 line
2.13.6
#1 lore raw
Quoted 5 lines · Bill Randle

An earlier patch to update smstools3 to v3.1.21 dropped the RDEPENDS for bash, which caused qc errors during packaging, since the example scripts still used /bin/bash as the command executor. This patch updates the scripts to use /bin/sh instead. No known bash-only syntax is present in the packaged scripts and they run ok under Busybox.

Thanks. Your fix is much better than what I was looking at.

kind regards and Happy New Year.

- Armin

Quoted 61 lines

Upstream-Status: Submitted [http://smstools3.kekekasvi.com/topic.php?post=6188#post6188]

---
 .../smstools3/smstools3/scripts_no_bash.patch      | 32 ++++++++++++++++++++++
 .../smstools3/smstools3_3.1.21.bb                  |  3 +-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch
meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch new file +32 -0
new file mode 100644
index 000000000..f7529d8cb
@@ -0,0 +1,32 @@
+--- smstools3.orig/scripts/sendsms	2006-02-04 11:52:06.000000000 -0800
++++ smstools3/scripts/sendsms	2017-12-30 15:40:28.009169106 -0800
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # This script send a text sms at the command line by creating
+ # a sms file in the outgoing queue.
+ 
+--- smstools3.orig/scripts/sms2html	2006-02-04 11:52:06.000000000 -0800
++++ smstools3/scripts/sms2html	2017-12-30 15:39:17.496694390 -0800
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # This script converts a received sms file into a html file. 
+ 
+--- smstools3.orig/scripts/sms2unicode	2006-02-04 11:52:06.000000000 -0800
++++ smstools3/scripts/sms2unicode	2017-12-30 15:33:14.477250179 -0800
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # This script converts a received sms file into a pure unicode text file.
+ 
+--- smstools3/scripts/unicode2sms	2006-02-04 11:52:06.000000000 -0800
++++ smstools3/scripts/unicode2sms.new	2017-12-30 15:33:56.918536044 -0800
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # This script converts a pure unicode text file into an sms file for sending.
+ 
meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb +2 -1
index 86c8ede1d..6e6413b4b 100644
@@ -6,7 +6,8 @@ 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"
+           file://sms_binpath.patch \
+           file://scripts_no_bash.patch"
 
 SRC_URI[md5sum] = "6a9f038fb38a49cc3a4f8f14a88fb8af"
 SRC_URI[sha256sum] = "a26ba4c02b16f6cf13177bffca6c9230dc5fefaeba8e3030cd4e4905f6a92084"