jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/sslh: fix a patch, drop the other

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

So fix it amd drop our second patch.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2017-02-23 22:43:08 +01:00 committed by Thomas Petazzoni
parent 06b555b6d5
commit 911ac036e0
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch
View File

@ -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. the root of the project to enable git-extracted version string.
Signed-off-by: David Bachelart <david.bachelart@bbright.com> Signed-off-by: David Bachelart <david.bachelart@bbright.com>
[yann.morin.1998@free.fr: fix troll character U+c2a0]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
--- ---
genver.sh | 4 ++-- genver.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
@ -34,7 +36,7 @@ index 79fd0a0..051e57b 100755
fi fi
-if head=`git rev-parse --verify HEAD 2>/dev/null`; then -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 # generate the version info based on the tag
release=`(git describe --tags || git --describe || git describe --all --long) \ release=`(git describe --tags || git --describe || git describe --all --long) \
2>/dev/null | tr -d '\n'` 2>/dev/null | tr -d '\n'`

12
package/sslh/0002-replace-U+c2a0.patch
View File

@ -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'`