Hello community,
here is the log from the commit of package ksh for openSUSE:Factory
checked in at Fri Jul 8 14:58:28 CEST 2011.
--------
--- ksh/ksh.changes 2011-07-04 17:44:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/ksh/ksh.changes 2011-07-07
15:17:42.000000000 +0200
@@ -1,0 +2,17 @@
+Thu Jul 7 12:48:24 UTC 2011 - wer...@suse.de
+
+- Check for ascii8 troff device, if not available use utf8
+
+-------------------------------------------------------------------
+Wed Jul 6 14:15:44 UTC 2011 - wer...@suse.de
+
+- Extract messages from ksh source code automagic by using msgcc and
+ libpp from upstream ast-base packages (realted to bnc#703854) only
+ missing are the translations for those messages
+
+-------------------------------------------------------------------
+Tue Jul 5 15:17:58 UTC 2011 - wer...@suse.de
+
+- Drop locale support as it is out of sync since year 2000 (bnc#703854)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
ast-ksh-locale.2010-02-02.tar.bz2
New:
----
ast-msgcc.2010-06-21.tar.bz2
ksh-locale.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ksh.spec ++++++
--- /var/tmp/diff_new_pack.3JCv9J/_old 2011-07-08 14:36:40.000000000 +0200
+++ /var/tmp/diff_new_pack.3JCv9J/_new 2011-07-08 14:36:40.000000000 +0200
@@ -37,12 +37,12 @@
%endif
AutoReqProv: on
Version: 93t
-Release: 200
+Release: 202
Summary: Korn Shell
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: INIT.2010-06-21.tar.bz2
Source1: ast-ksh.2010-06-21.tar.bz2
-Source2: ast-ksh-locale.2010-02-02.tar.bz2
+Source2: ast-msgcc.2010-06-21.tar.bz2
Source3: CPL
Source10: leak1.sh
Source11: leak2.sh
@@ -78,8 +78,9 @@
Patch24: ksh93-pipe.dif
Patch25: ksh93-argv.dif
Patch26: ksh93-unset-f.dif
+Patch42: ksh-locale.patch
%global use_suid_exe 0
-%global use_locale 1
+%global use_locale 0
%global debug_memleak 0
%description
@@ -125,6 +126,7 @@
find share/ -type d -a -empty | xargs -r rm -vrf
find share/ -type d -a -empty | xargs -r rm -vrf
%patch
+%patch42
%patch1
%ifarch %arm
%patch2
@@ -157,7 +159,14 @@
%patch26
%build
+ AR="ar"
+ CC=gcc
+ PATH=${PWD}:$PATH
+ LANG=POSIX
TMPDIR=$(mktemp -d /tmp/ksh-build.XXXXXX) || exit 1
+ SUSE_ASNEEDED=0
+ export AR CC PATH LANG TMPDIR SUSE_ASNEEDED
+ #
typeset -i IGNORED=0x$(ps --no-headers -o ignored $$)
typeset -i SIGPIPE=0x1000
if ((IGNORED & SIGPIPE)) ; then
@@ -198,9 +207,7 @@
# This package failed when testing with -Wl,-as-needed being default.
# So we disable it here, if you want to retest, just delete this
# comment and the line below.
- export SUSE_ASNEEDED=0
test -n "${!LC_*}" && unset "${!LC_*}"
- CC=gcc
cflags ()
{
local flag=$1; shift
@@ -226,9 +233,6 @@
esac
}
#
- LANG=POSIX
- export LANG
- #
# If _you_ are knowing how to fix this in the autogenerated
# sources of ksh/ast without breaking them, then let me know.
#
@@ -321,7 +325,8 @@
mam_cc_L=use
mam_cc_OPTIMIZE=-pipe
export mam_cc_L mam_cc_OPTIMIZE HOSTTYPE LDFLAGS RPM_OPT_FLAGS UNIVERSE
- bin/package make CCFLAGS="$RPM_OPT_FLAGS" HOSTTYPE="$HOSTTYPE"
+ printenv
+ bin/package make CCFLAGS="$RPM_OPT_FLAGS" HOSTTYPE="$HOSTTYPE" AR="$AR"
CC="$CC"
root=$(echo ${PWD}/arch/linux*)
test -d $root || exit 1
log=${root}/lib/package/gen/make.out
@@ -388,6 +393,7 @@
${ksh} -Wl,-rpath-link,${root}/lib -Wl,-rpath,/%{_lib}/ast
${shcomp} -Wl,-rpath-link,${root}/lib -Wl,-rpath,/%{_lib}/ast
${suidex} -Wl,-rpath-link,${root}/lib -Wl,-rpath,/%{_lib}/ast
+ popd
OPATH=$PATH
OSHELL=$SHELL
PATH=$PATH:${root}/bin
@@ -407,6 +413,18 @@
fi
killall -q -s 9 ${root}/bin/ksh.test || true
popd
+ mkdir -p share/locale/C/LC_MESSAGES
+ sed -rn "\@mamake -C cmd/ksh93@,\@mamake -C@ {
+ s@^\+ g?cc@$SHELL msgcc -M-set=ast@
+ s@[[:blank:]]-c[[:blank:]]([^[:blank:]\.]+/([^[:blank:]\.\/]+))\.c@ -c
\1\.c -o msgs/\2\.mso@p
+ }" ${root}/lib/package/gen/make.out > src/cmd/ksh93/doit
+ pushd src/cmd/ksh93
+ mkdir msgs
+ $SHELL -x ./doit
+ $SHELL -x msgcc -o libshell.msg msgs/*.mso
+ rm -rf msgs/
+ popd
+ msggen share/locale/C/LC_MESSAGES/libshell src/cmd/ksh93/libshell.msg
pushd ${root}/bin
PATH=$PATH:.
set -- $(shcomp.test --version 2>&1)
@@ -416,7 +434,6 @@
popd
SHELL=$OSHELL
PATH=$OPATH
- popd
%install
root=$(echo ${PWD}/arch/linux*)
@@ -430,9 +447,7 @@
mkdir -p %{buildroot}%{_mandir}
mkdir %{buildroot}%{_mandir}/man1
mkdir %{buildroot}%{_mandir}/man3
-%if %use_locale
mkdir -p %{buildroot}%{_datadir}/locale
-%endif
mkdir -p %{buildroot}%{_datadir}/ksh/fun
mkdir -p %{buildroot}%{_sysconfdir}/permissions.d
install bin/ksh %{buildroot}/%{_lib}/ast/bin/
@@ -459,8 +474,12 @@
ln -sf /%{_lib}/ast/$so %{buildroot}%{_libdir}/ast/${so%%%%.*}.so
done
rm -f %{buildroot}%{_libdir}/ast/*.so.*
- for man in man/man[13]/*.[13] ; do
- sed -i 's/\\f5/\\fB/g;s/^\.H/\.P\n\.H/g' $man
+ sed -rn '/^\.de Af/,/^\.\./p;/^\.de aF/,/^\.\./p' man/man3/int.3 > af.man
+ for man in $(grep -l '\.}S' man/man[138]/*.[138]); do
+ sed -ri '1r af.man' $man
+ done
+ for man in man/man[138]/*.[138] ; do
+ sed -ri
's/\\f5/\\fB/g;s/^\.H/\.P\n\.H/g;s/\.}S/\.aF/;s/^\.LI/\.LR/;s/\\\(le/\\\(<=/'
$man
done
install -m 0644 lib/*.a %{buildroot}%{_libdir}/ast/
%if %suse_version > 1120
@@ -482,6 +501,13 @@
mkdir -p %{buildroot}%{_datadir}/locale/${msg##*/}/LC_MESSAGES
cp -vp ${msg}/LC_MESSAGES/*
%{buildroot}%{_datadir}/locale/${msg##*/}/LC_MESSAGES/
done
+%else
+ for msg in share/locale/* ; do
+ test -d $msg || continue
+ mkdir -p %{buildroot}%{_datadir}/locale/${msg##*/}/LC_MESSAGES
+ cp -vp ${msg}/LC_MESSAGES/*
%{buildroot}%{_datadir}/locale/${msg##*/}/LC_MESSAGES/
+ done
+%endif
echo %%dir %{_datadir}/locale/C > ksh.lang
echo %%dir %{_datadir}/locale/C/LC_MESSAGES >> ksh.lang
find %{buildroot}/ -type f -o -type l | sed -r '
@@ -490,19 +516,21 @@
s:^([^%%].*)::
s:%%lang\(C\) ::
/^ *$/d' >> ksh.lang
-%else
- > ksh.lang
-%endif
if test -s lib/package/LICENSES/ast ; then
cp lib/package/LICENSES/ast LICENSE
else
cp %{S:3} LICENSE
fi
mv src/cmd/ksh93/OBSOLETE src/cmd/ksh93/OBSOLETE.mm
- cat src/cmd/ksh93/builtins.mm | sed 's/\\f5/\\fB/g;s/^\.H/\.P\n\.H/g' |
troff -Tascii8 -t -mm | grotty -bou > Builtins
- cat src/cmd/ksh93/PROMO.mm | sed 's/\\f5/\\fB/g;s/^\.H/\.P\n\.H/g' |
troff -Tascii8 -t -mm | grotty -bou > PROMO
- cat src/cmd/ksh93/OBSOLETE.mm | sed 's/\\f5/\\fB/g;s/^\.H/\.P\n\.H/g' |
troff -Tascii8 -t -mm | grotty -bou > OBSOLETE
- cat src/cmd/ksh93/sh.memo | sed 's/\\f5/\\fB/g;s/^\.H/\.P\n\.H/g' |
troff -Tascii8 -t -mm | grotty -bou > MEMORANDUM
+ echo '.VERBON 22' > grep.mm
+ sed -rn '/function grep/,/^}/p' src/cmd/ksh93/tests/grep.sh >> grep.mm
+ echo '.VERBOFF' >> grep.mm
+ tdevice=ascii8
+ troff -Tascii8 < /dev/null > /dev/null 2>&1 || tdevice=utf8
+ cat src/cmd/ksh93/builtins.mm | sed 's/\\f5/\\fB/g;s/^\.H/\.P\n\.H/g' |
troff -T$tdevice -t -mm | grotty -bou > Builtins
+ cat src/cmd/ksh93/PROMO.mm | sed 's/\\f5/\\fB/g;s/^\.H/\.P\n\.H/g' |
troff -T$tdevice -t -mm | grotty -bou > PROMO
+ cat src/cmd/ksh93/OBSOLETE.mm | sed 's/\\f5/\\fB/g;s/^\.H/\.P\n\.H/g' |
troff -T$tdevice -t -mm | grotty -bou > OBSOLETE
+ cat src/cmd/ksh93/sh.memo | sed 's/\\f5/\\fB/g;s/^\.H/\.P\n\.H/g' |
troff -T$tdevice -t -mm | grotty -bou > MEMORANDUM
cp %{S:21} .
%if %use_suid_exe
set -C
++++++ Agreement ++++++
--- /var/tmp/diff_new_pack.3JCv9J/_old 2011-07-08 14:36:40.000000000 +0200
+++ /var/tmp/diff_new_pack.3JCv9J/_new 2011-07-08 14:36:40.000000000 +0200
@@ -2,3 +2,12 @@
http://www.research.att.com/sw/download/beta/
User: `I accept www.opensource.org/licenses/cpl'
Password: `.'
+
+wget --user='I accept www.opensource.org/licenses/cpl' --password='.' \
+ http://www2.research.att.com/sw/download/beta/ast-ksh.${version}.tgz \
+ http://www2.research.att.com/sw/download/beta/INIT.${version}.tgz \
+ http://www2.research.att.com/sw/download/beta/ast-base.${version}.tgz
+
+tar xfz ast-base.${version}.tgz src/cmd/msgcc/ src/lib/libpp/
+tar cfj ast-msgcc.${version}.tar.bz2 src/
+rm -f ast-base.${version}.tgz
++++++ ksh-locale.patch ++++++
--- lib/package/ast-ksh.pkg
+++ lib/package/ast-ksh.pkg 2011-07-05 16:29:57.891926052 +0000
@@ -1,4 +1,4 @@
-ast-ksh :PACKAGE: ksh93 libast libcmd libsum libdll
+ast-ksh :PACKAGE: msgcc ksh93 libpp libast libcmd libsum libdll
:COVERS: ksh
++++++ ksh93.dif ++++++
--- /var/tmp/diff_new_pack.3JCv9J/_old 2011-07-08 14:36:41.000000000 +0200
+++ /var/tmp/diff_new_pack.3JCv9J/_new 2011-07-08 14:36:41.000000000 +0200
@@ -239,10 +239,10 @@
foo() { return 0; }
trap foo EXIT
- { sleep 2; kill -$exp \$\$; sleep 3; kill -0 \$\$ && kill -KILL
\$\$; } &
-+ { sleep 2; kill -$exp \$\$; sleep 6; kill -0 \$\$ && kill -KILL
\$\$; } &
++ { sleep 2; kill -$exp \$\$; sleep 8; kill -0 \$\$ && kill -KILL
\$\$; } &
$yes | while read yes; do
- (/bin/date; sleep .1)
-+ (/bin/date; sleep .05)
++ (/bin/date; sleep .01)
done > /dev/null
EOF
} 2>> /dev/null
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
