861ac185a6
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
19 lines
1,013 B
Diff
19 lines
1,013 B
Diff
Description: fixes test suite to not expect the year to be between 2000 and 2009.
|
|
Origin: upstream, http://svn.apache.org/viewvc?view=rev&rev=954335
|
|
Bug: https://issues.apache.org/jira/browse/LOGCXX-365
|
|
Forwarded: not-needed
|
|
Applied-Upstream: commit 954335
|
|
Last-Update: 2014-03-14
|
|
---
|
|
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
|
--- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334
|
|
+++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335
|
|
@@ -31,7 +31,7 @@
|
|
#define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)"
|
|
#define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
|
|
#define ABSOLUTE_DATE_AND_TIME_PAT \
|
|
- "[0-9]\\{1,2\\} .* 200[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
|
|
+ "[0-9]\\{1,2\\} .* 2[0-9][0-9][0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
|
|
#define ABSOLUTE_TIME_PAT "[0-2][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9]"
|
|
#define RELATIVE_TIME_PAT "^[0-9]+"
|
|
|