OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Feb-2005 20:32:39
Branch: HEAD Handle: 2005022719323900
Modified files:
openpkg-src/gettext gettext.patch gettext.spec
Log:
upgrading package: gettext 0.14.1 -> 0.14.2
Summary:
Revision Changes Path
1.8 +0 -143 openpkg-src/gettext/gettext.patch
1.50 +2 -2 openpkg-src/gettext/gettext.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gettext/gettext.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 gettext.patch
--- openpkg-src/gettext/gettext.patch 17 Dec 2004 17:21:24 -0000 1.7
+++ openpkg-src/gettext/gettext.patch 27 Feb 2005 19:32:39 -0000 1.8
@@ -12,147 +12,4 @@
sigset_t blocked_signals;
posix_spawn_file_actions_t actions;
bool actions_allocated;
-Index: gettext-tools/lib/pipe-bidi.c
-diff -Nau gettext-tools/lib/pipe-bidi.c.orig gettext-tools/lib/pipe-bidi.c
---- gettext-tools/lib/pipe-bidi.c.orig 2004-05-26 16:34:40.000000000
+0200
-+++ gettext-tools/lib/pipe-bidi.c 2004-05-26 16:36:57.000000000 +0200
-@@ -191,6 +191,9 @@
- int ifd[2];
- int ofd[2];
- #if HAVE_POSIX_SPAWN
-+#ifndef HAVE_ENVIRON_DECL
-+ extern char **environ;
-+#endif
- sigset_t blocked_signals;
- posix_spawn_file_actions_t actions;
- bool actions_allocated;
-Index: gettext-tools/lib/pipe-in.c
-diff -Nau gettext-tools/lib/pipe-in.c.orig gettext-tools/lib/pipe-in.c
---- gettext-tools/lib/pipe-in.c.orig 2004-05-26 16:34:46.000000000 +0200
-+++ gettext-tools/lib/pipe-in.c 2004-05-26 16:37:09.000000000 +0200
-@@ -204,6 +204,9 @@
- /* Unix API. */
- int ifd[2];
- #if HAVE_POSIX_SPAWN
-+#ifndef HAVE_ENVIRON_DECL
-+ extern char **environ;
-+#endif
- sigset_t blocked_signals;
- posix_spawn_file_actions_t actions;
- bool actions_allocated;
-Index: gettext-tools/lib/pipe-out.c
-diff -Nau gettext-tools/lib/pipe-out.c.orig gettext-tools/lib/pipe-out.c
---- gettext-tools/lib/pipe-out.c.orig 2004-05-26 16:34:53.000000000
+0200
-+++ gettext-tools/lib/pipe-out.c 2004-05-26 16:37:16.000000000 +0200
-@@ -204,6 +204,9 @@
- /* Unix API. */
- int ofd[2];
- #if HAVE_POSIX_SPAWN
-+#ifndef HAVE_ENVIRON_DECL
-+ extern char **environ;
-+#endif
- sigset_t blocked_signals;
- posix_spawn_file_actions_t actions;
- bool actions_allocated;
-OpenPKG-SA-2004.055-gettext and CAN-2004-0966
-The autopoint and gettextize scripts in GNU gettext 0.14.1
-and older allow local users to overwrite files via a symlink
-attack on temporary files.
-
-Except for the unportable BSD mktemp(1), the following patch blocks
-for autopoint.in and gettextize.in are taken from Red Hat Bug #136323.
- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=136323
-
-Index: gettext-tools/misc/autopoint.in
-diff -Nau gettext-tools/misc/autopoint.in.orig
gettext-tools/misc/autopoint.in
---- gettext-tools/misc/autopoint.in.orig 2004-01-29 20:17:27.000000000
+0100
-+++ gettext-tools/misc/autopoint.in 2004-09-20 10:26:14.000000000 +0200
-@@ -39,14 +39,7 @@
- */* | *\\*) ;;
- *) # Need to look in the PATH.
- if test "${PATH_SEPARATOR+set}" != set; then
-- { echo "#! /bin/sh"; echo "exit 0"; } > /tmp/conf$$.sh
-- chmod +x /tmp/conf$$.sh
-- if (PATH="/nonexistent;/tmp"; conf$$.sh) >/dev/null 2>&1; then
-- PATH_SEPARATOR=';'
-- else
-- PATH_SEPARATOR=:
-- fi
-- rm -f /tmp/conf$$.sh
-+ PATH_SEPARATOR=:
- fi
- save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
- for dir in $PATH; do
-@@ -318,7 +311,15 @@
- cvs_dir=tmpcvs$$
- work_dir=tmpwrk$$
- mkdir "$cvs_dir"
-+if [ $? -ne 0 ]; then
-+ echo "ERROR making $cvs_dir"
-+ exit 1
-+fi
- mkdir "$work_dir"
-+if [ $? -ne 0 ]; then
-+ echo "ERROR making $work_dir"
-+ exit 1
-+fi
- CVSROOT="$srcdir/$cvs_dir"
- export CVSROOT
- unset CVS_CLIENT_LOG
-@@ -384,8 +385,6 @@
- # original - too great risk of version mismatch.
- if test -z "$force"; then
- mismatch=
-- mismatchfile="${TMPDIR-/tmp}"/autopoint$$.diff
-- rm -f "$mismatchfile"
- for file in `find "$work_dir/archive" -type f -print | sed -e
"s,^$work_dir/archive/,," | LC_ALL=C sort`; do
- func_destfile "$file"
- if test -n "$destfile"; then
-@@ -395,14 +394,13 @@
- else
- echo "autopoint: File $destfile has been locally modified." 1>&2
- mismatch=yes
-- diff -c "$work_dir/archive/$file" "$destfile" | sed -e
"1s,$work_dir/archive/,," >> "$mismatchfile"
- fi
- fi
- fi
- done
- if test -n "$mismatch"; then
- rm -rf "$cvs_dir" "$work_dir"
-- func_fatal_error "Some files have been locally modified. Not
overwriting them because --force has not been specified. For your convenience,
you find the local modifications in the file '$mismatchfile'."
-+ func_fatal_error "Some files have been locally modified. Not
overwriting them because --force has not been specified. For a summary of the
local modifications use: 'diff -c $work_dir/archive/$file $destfile'"
- fi
- fi
-
-@@ -417,6 +417,10 @@
- # Recompute base. It was clobbered by the recursive call.
- base=`echo "$1" | sed -e 's,/[^/]*$,,'`
- test -d "$base" || { echo "Creating directory $base"; mkdir "$base"; }
-+ if [ $? -ne 0 ]; then
-+ echo "ERROR making directory $base"
-+ exit 1
-+ fi
- fi
- }
-
-Index: gettext-tools/misc/gettextize.in
-diff -Nau gettext-tools/misc/gettextize.in.orig
gettext-tools/misc/gettextize.in
---- gettext-tools/misc/gettextize.in.orig 2004-01-20 12:30:06.000000000
+0100
-+++ gettext-tools/misc/gettextize.in 2004-09-20 10:22:39.000000000 +0200
-@@ -39,14 +39,7 @@
- */* | *\\*) ;;
- *) # Need to look in the PATH.
- if test "${PATH_SEPARATOR+set}" != set; then
-- { echo "#! /bin/sh"; echo "exit 0"; } > /tmp/conf$$.sh
-- chmod +x /tmp/conf$$.sh
-- if (PATH="/nonexistent;/tmp"; conf$$.sh) >/dev/null 2>&1; then
-- PATH_SEPARATOR=';'
-- else
-- PATH_SEPARATOR=:
-- fi
-- rm -f /tmp/conf$$.sh
-+ PATH_SEPARATOR=:
- fi
- save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
- for dir in $PATH; do
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gettext/gettext.spec
============================================================================
$ cvs diff -u -r1.49 -r1.50 gettext.spec
--- openpkg-src/gettext/gettext.spec 1 Jan 2005 10:49:28 -0000 1.49
+++ openpkg-src/gettext/gettext.spec 27 Feb 2005 19:32:39 -0000 1.50
@@ -33,8 +33,8 @@
Class: BASE
Group: Converter
License: GPL
-Version: 0.14.1
-Release: 20041217
+Version: 0.14.2
+Release: 20050227
# list of sources
Source0: ftp://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
