1*8460358cSPatrick WilliamsFrom e96df0c82e086bf348753d2d0fa37fa6191b4b14 Mon Sep 17 00:00:00 2001
2*8460358cSPatrick WilliamsFrom: "simit.ghane" <simit.ghane@lge.com>
3*8460358cSPatrick WilliamsDate: Tue, 11 Jun 2024 07:22:28 +0530
4*8460358cSPatrick WilliamsSubject: [PATCH] random:cipher: handle substitution in sed command
5eb8dc403SDave Cobbley
6*8460358cSPatrick WilliamsUpstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=e96df0c82e086bf348753d2d0fa37fa6191b4b14]
7eb8dc403SDave Cobbley
8*8460358cSPatrick Williams* cipher/Makefile.am (o_flag_munging): Add 'g' flag for first sed
9*8460358cSPatrick Williamsexpression.
10*8460358cSPatrick Williams* random/Makefile.am (o_flag_munging): Likewise.
11*8460358cSPatrick Williams--
12eb8dc403SDave Cobbley
13*8460358cSPatrick WilliamsIt was there earlier and accidentally removed from
14*8460358cSPatrick WilliamsMakefile.am of cipher and random
15eb8dc403SDave Cobbley
16*8460358cSPatrick WilliamsSigned-off-by: simit.ghane <simit.ghane@lge.com>
17*8460358cSPatrick Williams[jk: add changelog to commit message]
18*8460358cSPatrick WilliamsSigned-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
19eb8dc403SDave Cobbley---
20eb8dc403SDave Cobbley cipher/Makefile.am | 2 +-
21*8460358cSPatrick Williams random/Makefile.am | 2 +-
22*8460358cSPatrick Williams 2 files changed, 2 insertions(+), 2 deletions(-)
23eb8dc403SDave Cobbley
24eb8dc403SDave Cobbleydiff --git a/cipher/Makefile.am b/cipher/Makefile.am
25*8460358cSPatrick Williamsindex ea9014cc98..149c9f2101 100644
26eb8dc403SDave Cobbley--- a/cipher/Makefile.am
27eb8dc403SDave Cobbley+++ b/cipher/Makefile.am
28*8460358cSPatrick Williams@@ -169,7 +169,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c
29eb8dc403SDave Cobbley
30eb8dc403SDave Cobbley
31eb8dc403SDave Cobbley if ENABLE_O_FLAG_MUNGING
32*8460358cSPatrick Williams-o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g'
33*8460358cSPatrick Williams+o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g'
34*8460358cSPatrick Williams else
35*8460358cSPatrick Williams o_flag_munging = cat
36*8460358cSPatrick Williams endif
37*8460358cSPatrick Williamsdiff --git a/random/Makefile.am b/random/Makefile.am
38*8460358cSPatrick Williamsindex c7100ef8b8..a42e430649 100644
39*8460358cSPatrick Williams--- a/random/Makefile.am
40*8460358cSPatrick Williams+++ b/random/Makefile.am
41*8460358cSPatrick Williams@@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h
42*8460358cSPatrick Williams
43*8460358cSPatrick Williams # The rndjent module needs to be compiled without optimization.  */
44*8460358cSPatrick Williams if ENABLE_O_FLAG_MUNGING
45*8460358cSPatrick Williams-o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /' -e 's/[[:blank:]]-Ofast/ -O0 /g'
46*8460358cSPatrick Williams+o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g'
47eb8dc403SDave Cobbley else
48eb8dc403SDave Cobbley o_flag_munging = cat
49eb8dc403SDave Cobbley endif
50