Hello community, here is the log from the commit of package ksh for openSUSE:Factory checked in at 2015-06-30 10:19:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksh (Old) and /work/SRC/openSUSE:Factory/.ksh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksh" Changes: -------- --- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2014-08-03 15:36:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2015-06-30 10:19:23.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 11 10:42:59 UTC 2015 - [email protected] + +- cpp.patch: fix use of cc -E without -P + +------------------------------------------------------------------- New: ---- cpp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksh.spec ++++++ --- /var/tmp/diff_new_pack.FO0P2B/_old 2015-06-30 10:19:24.000000000 +0200 +++ /var/tmp/diff_new_pack.FO0P2B/_new 2015-06-30 10:19:24.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ksh # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -134,6 +134,8 @@ Patch37: ksh93-crashes.dif # PATCH-FIX-SUSE Strings in backticks cannot be longer than 65536 characters bnc#887320 Patch38: ksh93-backticks.dif +# PATCH-FIX-UPSTREAM fix use of cc -E without -P +Patch39: cpp.patch Patch42: ksh-locale.patch %description @@ -219,6 +221,7 @@ %patch36 %patch37 #%patch38 +%patch39 -p1 %patch42 %build ++++++ cpp.patch ++++++ iffe depends on cc -E not inserting newlines between tokens Index: ksh93/src/cmd/INIT/iffe.sh =================================================================== --- ksh93.orig/src/cmd/INIT/iffe.sh +++ ksh93/src/cmd/INIT/iffe.sh @@ -3427,7 +3427,7 @@ $src (eval "$src") <&$nullin || e=1 ;; mac*|nomac*) - if compile $cc -E $tmp.c <&$nullin >$tmp.i + if compile $cc -E -P $tmp.c <&$nullin >$tmp.i then sed -e '/<<[ ]*".*"[ ]*>>/!d' -e 's/<<[ ]*"//g' -e 's/"[ ]*>>//g' $tmp.i else e=1 fi @@ -3718,7 +3718,7 @@ $inc <<\"#define $v\">> $v <<\"/* native $v */\">> <<\"#endif\">> #endif" > $tmp.c - if compile $cc -E $tmp.c <&$nullin >$tmp.i + if compile $cc -E -P $tmp.c <&$nullin >$tmp.i then sed -e '/<<[ ]*".*"[ ]*>>/!d' -e 's/<<[ ]*"//g' -e 's/"[ ]*>>//g' $tmp.i > $tmp.t if test -s $tmp.t then success
