diff mbox

openssl: fix c_rehash dumbness

Message ID 1422394423-27700-1-git-send-email-gustavo@zacarias.com.ar
State Accepted
Commit 4c7e93a6ea30743162aeb634f1c6afa8cabca275
Headers show

Commit Message

Gustavo Zacarias Jan. 27, 2015, 9:33 p.m. UTC
The new c_rehash from openssl 1.0.2 can't take a minus in the directory
string since the regex for matching commands checks for - in any
position instead of just the beginning to trigger the command parser. Fixes:
http://autobuild.buildroot.net/results/ee6/ee683569350d5deaf0ccc603ed7066bffb83cbe3/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 ...-match-commands-starting-with-minus-inste.patch | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/openssl/005-Make-c_rehash-match-commands-starting-with-minus-inste.patch

Comments

Peter Korsgaard Jan. 27, 2015, 10:13 p.m. UTC | #1
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 > The new c_rehash from openssl 1.0.2 can't take a minus in the directory
 > string since the regex for matching commands checks for - in any
 > position instead of just the beginning to trigger the command parser. Fixes:
 > http://autobuild.buildroot.net/results/ee6/ee683569350d5deaf0ccc603ed7066bffb83cbe3/

 > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Committed, thanks.
diff mbox

Patch

diff --git a/package/openssl/005-Make-c_rehash-match-commands-starting-with-minus-inste.patch b/package/openssl/005-Make-c_rehash-match-commands-starting-with-minus-inste.patch
new file mode 100644
index 0000000..5db95d6
--- /dev/null
+++ b/package/openssl/005-Make-c_rehash-match-commands-starting-with-minus-inste.patch
@@ -0,0 +1,27 @@ 
+From 079cae9d7628f16b9efdf5723d2bfae5bdc2ba4e Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 27 Jan 2015 18:27:32 -0300
+Subject: [PATCH] Make c_rehash match commands starting with - (minus) instead
+ of minus in any starting position, otherwise a directory named a-b breaks it
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ tools/c_rehash.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/c_rehash.in b/tools/c_rehash.in
+index 887e927..1df2fab 100644
+--- a/tools/c_rehash.in
++++ b/tools/c_rehash.in
+@@ -15,7 +15,7 @@ my $symlink_exists=eval {symlink("",""); 1};
+ my $removelinks = 1;
+ 
+ ##  Parse flags.
+-while ( $ARGV[0] =~ '-.*' ) {
++while ( $ARGV[0] =~ '^-.*' ) {
+     my $flag = shift @ARGV;
+     last if ( $flag eq '--');
+     if ( $flag =~ /-old/) {
+-- 
+2.0.5
+