diff options
author | Pavel Raiskup <praiskup@redhat.com> | 2014-07-28 15:51:13 +0200 |
---|---|---|
committer | Pavel Raiskup <praiskup@redhat.com> | 2014-07-28 16:00:39 +0200 |
commit | de6fcbdb464b70b4b826bf9716e550e5c4a08c0d (patch) | |
tree | d1af2b87ca1ee88fb898e8d6953db5d83815b139 /tcsh-6.18.02-fixgencat.patch | |
parent | b6eaa4ebf20e0314f16514a1d36e2e7ade46718c (diff) | |
download | tcsh-rebase-6.19.00-de6fcbdb464b70b4b826bf9716e550e5c4a08c0d.tar.gz tcsh-rebase-6.19.00-de6fcbdb464b70b4b826bf9716e550e5c4a08c0d.tar.xz tcsh-rebase-6.19.00-de6fcbdb464b70b4b826bf9716e550e5c4a08c0d.zip |
rebase: to beta version (testing purposes only)
Some changes in packaging:
- %patch ~> %autosetup (git format-patch diff format)
- using upstream version of history file locking
- upstream testsuite enabled
Version: 6.18.02-1
Diffstat (limited to 'tcsh-6.18.02-fixgencat.patch')
-rw-r--r-- | tcsh-6.18.02-fixgencat.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/tcsh-6.18.02-fixgencat.patch b/tcsh-6.18.02-fixgencat.patch new file mode 100644 index 0000000..0fa4bfb --- /dev/null +++ b/tcsh-6.18.02-fixgencat.patch @@ -0,0 +1,42 @@ +From 8823bf92219d04aa0934abab530fdcf6f18b06bb Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup <praiskup@redhat.com> +Date: Fri, 25 Jul 2014 15:10:50 +0200 +Subject: [PATCH] fix gencat wrapper for LANG=C + +Sorting sets including 'charset' file caused that the file was on +concatenated as the last one which causes build fail when current +locale charset is non-utf8. + +Also avoid generating temporary files for security reasons. +--- + nls/catgen | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/nls/catgen b/nls/catgen +index 40e652f..f5f0313 100755 +--- a/nls/catgen ++++ b/nls/catgen +@@ -1,7 +1,5 @@ + #!/bin/sh + # Wrapper for gencat +-TMP=/tmp/catgen.$$ +-trap "rm -f $TMP" 0 1 2 3 15 + + sortit() { + awk '/^\$set/ {print $2, FILENAME}' "$@" | sort -n | cut -d ' ' -f 2 +@@ -11,7 +9,9 @@ GENCAT="$1" + shift + OUT="$1" + shift +-cat $(sortit "$@") > "$TMP" ++CHARSET="$1" ++shift + +-echo "$(basename "$OUT" .cat)" +-"${GENCAT}" "$OUT" "$TMP" ++echo " gencat $OUT" ++cat $CHARSET $(sortit "$@") | "${GENCAT}" "$OUT" - ++exit 0 +-- +1.9.3 + |