rpms
/
tcsh
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tcsh-6.20.00-009-fix-regexp-for-backlash-quoting-tests.patch added 

> fix regexp for backslash quoting tests for newer 'sed'
 > https://github.com/tcsh-org/tcsh/pull/1

 Resolves: #1424082
This commit is contained in:
David Kaspar [Dee'Kej] 2017-02-28 19:44:25 +01:00
parent 0afb3b852f
commit 3959391267
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tcsh-6.20.00-009-fix-regexp-for-backlash-quoting-tests.patch Normal file
View File

@ -0,0 +1,39 @@
From 2ad4fc1705893207598ed5cd21713ddf3f17bba0 Mon Sep 17 00:00:00 2001
From: zoulasc <christos@zoulas.com>
Date: Thu, 23 Feb 2017 11:55:33 -0500
Subject: [PATCH]
https://github.com/tcsh-org/tcsh/pull/1#issuecomment-282035528
---
tests/lexical.at | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/lexical.at b/tests/lexical.at
index 7b7da4e..3dc6024 100644
--- a/tests/lexical.at
+++ b/tests/lexical.at
@@ -567,10 +567,10 @@ run=3
]])
AT_DATA([uniformity_test.csh],
[[
-set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'`
+set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'`
echo -n "$SERVICE_NAME_LOG" > ./output1
-cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2
+cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2
diff -uprN ./output1 ./output2 >& /dev/null
@@ -587,7 +587,7 @@ AT_DATA([quoting_result_test.csh],
echo "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP\)(HOST=db\)(PORT=1521\)\)(CONNECT_DATA=(SERVER=DEDICATED\)(SERVICE_NAME=bns03\)\)\)" > ./expected_result
set string = "jdbc_url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=db)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=bns03)))"
-set SERVICE_NAME_LOG = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'`
+set SERVICE_NAME_LOG = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'`
echo "$SERVICE_NAME_LOG" > ./actual_result
--
2.9.3

2
tcsh.spec
View File

@ -50,6 +50,7 @@ Patch005: tcsh-6.20.00-005-reset-fixes-numbering.patch
Patch006: tcsh-6.20.00-006-cleanup-in-readme-files.patch
Patch007: tcsh-6.20.00-007-look-for-tgetent-in-libtinfo.patch
Patch008: tcsh-6.20.00-008-guard-ascii-only-reversion.patch
Patch009: tcsh-6.20.00-009-fix-regexp-for-backlash-quoting-tests.patch
# Downstream patches -- these should be always included when doing rebase:
@ -183,6 +184,7 @@ fi
tcsh-6.20.00-006-cleanup-in-readme-files.patch
tcsh-6.20.00-007-look-for-tgetent-in-libtinfo.patch
tcsh-6.20.00-008-guard-ascii-only-reversion.patch
tcsh-6.20.00-009-fix-regexp-for-backlash-quoting-tests.patch (bug #1424082)
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.20.00-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild