Skip to contentSkip to conversation

package/sslh: fix a patch, drop the other

PATCH New Yann E. MORIN 2 participants 2 messages Feb 23, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/sslh: fix a patch, drop the other

It turned out that the troll character U+c2a0 was added by our own patch.

So fix it amd drop our second patch.

---
 ...ecure-version-while-building-sslh-in-a-larger-git-t.patch |  4 +++-
 package/sslh/0002-replace-U+c2a0.patch                       | 12 ------------
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 package/sslh/0002-replace-U+c2a0.patch
package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch +3 -1
index 5cb8ce2..d23bc9f 100644
@@ -12,6 +12,8 @@ subtree only, this patch adds a check : a .git directory has to exist at
 the root of the project to enable git-extracted version string.
 
 Signed-off-by: David Bachelart <[email protected]>
+[yann.morin.1998 at free.fr: fix troll character U+c2a0]
+Signed-off-by: "Yann E. MORIN" <[email protected]>
 ---
  genver.sh | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
@@ -34,7 +36,7 @@ index 79fd0a0..051e57b 100755
  fi
  
 -if head=`git rev-parse --verify HEAD 2>/dev/null`; then
-+if [ -d .git ]?&& head=`git rev-parse --verify HEAD 2>/dev/null`; then
++if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
  	# generate the version info based on the tag
  	release=`(git describe --tags || git --describe || git describe --all --long) \
  		2>/dev/null | tr -d '\n'`
package/sslh/0002-replace-U+c2a0.patch deleted +0 -12
deleted file mode 100644
index 38093fa..0000000
@@ -1,12 +0,0 @@
-diff -durN sslh-v1.18.orig/genver.sh sslh-v1.18/genver.sh
---- sslh-v1.18.orig/genver.sh	2017-02-21 22:03:40.849161283 +0100
-+++ sslh-v1.18/genver.sh	2017-02-21 22:03:59.173402356 +0100
-@@ -25,7 +25,7 @@
-         fi
- fi
- 
--if [ -d .git ]?&& head=`git rev-parse --verify HEAD 2>/dev/null`; then
-+if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
- 	# generate the version info based on the tag
- 	release=`(git describe --tags || git --describe || git describe --all --long) \
- 		2>/dev/null | tr -d '\n'`
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 package/sslh: fix a patch, drop the other

Hello,

Quoted 11 lines · Yann E. MORIN

It turned out that the troll character U+c2a0 was added by our own patch.

So fix it amd drop our second patch.

---
 ...ecure-version-while-building-sslh-in-a-larger-git-t.patch |  4 +++-
 package/sslh/0002-replace-U+c2a0.patch                       | 12 ------------
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 package/sslh/0002-replace-U+c2a0.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com