summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-04-07 12:43:55 -0700
committerArmin Kuster <akuster808@gmail.com>2018-04-13 12:43:37 -0700
commitd3286daf334d2678198d110e25eafb9717d14781 (patch)
tree96e1b6d9b14839fdff29db9f21c927aa736d11bc
parent8b3e126484d6790a3cbb6ece87554ed74b2860e0 (diff)
downloadmeta-openembedded-d3286daf334d2678198d110e25eafb9717d14781.tar.gz
smstools3: refresh patches
WARNING: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: checking file scripts/sms3 Hunk #1 succeeded at 24 with fuzz 2. plus more Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch35
-rw-r--r--meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch18
2 files changed, 40 insertions, 13 deletions
diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch b/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch
index f7529d8cb..49b4d1dda 100644
--- a/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch
+++ b/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch
@@ -1,29 +1,48 @@
1--- smstools3.orig/scripts/sendsms 2006-02-04 11:52:06.000000000 -0800 1From 85602c3e531d39e89dc8cee0c4a592f85006a064 Mon Sep 17 00:00:00 2001
2+++ smstools3/scripts/sendsms 2017-12-30 15:40:28.009169106 -0800 2From: Bill Randle <bill.randle@gmail.com>
3Date: Sun, 31 Dec 2017 09:08:23 -0800
4
5---
6 scripts/sendsms | 2 +-
7 scripts/sms2html | 2 +-
8 scripts/sms2unicode | 2 +-
9 scripts/unicode2sms | 2 +-
10 4 files changed, 4 insertions(+), 4 deletions(-)
11
12diff --git a/scripts/sendsms b/scripts/sendsms
13index 512026d..bb56856 100755
14--- a/scripts/sendsms
15+++ b/scripts/sendsms
3@@ -1,4 +1,4 @@ 16@@ -1,4 +1,4 @@
4-#!/bin/bash 17-#!/bin/bash
5+#!/bin/sh 18+#!/bin/sh
6 # This script send a text sms at the command line by creating 19 # This script send a text sms at the command line by creating
7 # a sms file in the outgoing queue. 20 # a sms file in the outgoing queue.
8 21
9--- smstools3.orig/scripts/sms2html 2006-02-04 11:52:06.000000000 -0800 22diff --git a/scripts/sms2html b/scripts/sms2html
10+++ smstools3/scripts/sms2html 2017-12-30 15:39:17.496694390 -0800 23index ff253e3..946185e 100755
24--- a/scripts/sms2html
25+++ b/scripts/sms2html
11@@ -1,4 +1,4 @@ 26@@ -1,4 +1,4 @@
12-#!/bin/bash 27-#!/bin/bash
13+#!/bin/sh 28+#!/bin/sh
14 29
15 # This script converts a received sms file into a html file. 30 # This script converts a received sms file into a html file.
16 31
17--- smstools3.orig/scripts/sms2unicode 2006-02-04 11:52:06.000000000 -0800 32diff --git a/scripts/sms2unicode b/scripts/sms2unicode
18+++ smstools3/scripts/sms2unicode 2017-12-30 15:33:14.477250179 -0800 33index 46e2756..2826dc1 100755
34--- a/scripts/sms2unicode
35+++ b/scripts/sms2unicode
19@@ -1,4 +1,4 @@ 36@@ -1,4 +1,4 @@
20-#!/bin/bash 37-#!/bin/bash
21+#!/bin/sh 38+#!/bin/sh
22 39
23 # This script converts a received sms file into a pure unicode text file. 40 # This script converts a received sms file into a pure unicode text file.
24 41
25--- smstools3/scripts/unicode2sms 2006-02-04 11:52:06.000000000 -0800 42diff --git a/scripts/unicode2sms b/scripts/unicode2sms
26+++ smstools3/scripts/unicode2sms.new 2017-12-30 15:33:56.918536044 -0800 43index 2ae86dc..3fccf0d 100755
44--- a/scripts/unicode2sms
45+++ b/scripts/unicode2sms
27@@ -1,4 +1,4 @@ 46@@ -1,4 +1,4 @@
28-#!/bin/bash 47-#!/bin/bash
29+#!/bin/sh 48+#!/bin/sh
diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch b/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch
index 622044632..e1d79d332 100644
--- a/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch
+++ b/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch
@@ -1,8 +1,16 @@
1Index: smstools3/scripts/sms3 1From 9a4a872dca78ca9cb6bdc228be61f5a4c2d68b1f Mon Sep 17 00:00:00 2001
2=================================================================== 2From: Kai Ulrich <kaiu@gmx.de>
3--- smstools3.orig/scripts/sms3 2010-05-04 11:21:44.000000000 +0200 3Date: Wed, 18 Mar 2015 11:20:53 +0100
4+++ smstools3/scripts/sms3 2015-02-22 20:05:51.615074469 +0100 4
5@@ -24,11 +24,11 @@ 5---
6 scripts/sms3 | 4 ++--
7 1 file changed, 2 insertions(+), 2 deletions(-)
8
9diff --git a/scripts/sms3 b/scripts/sms3
10index 6b990bf..09c063b 100755
11--- a/scripts/sms3
12+++ b/scripts/sms3
13@@ -24,9 +24,9 @@ INFOFILE="/var/run/smsd.working"
6 # Logfile can also be defined in here: 14 # Logfile can also be defined in here:
7 LOGFILE="/var/log/smsd.log" 15 LOGFILE="/var/log/smsd.log"
8 16