Hello community, here is the log from the commit of package bash for openSUSE:Factory checked in at 2012-10-18 15:40:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bash (Old) and /work/SRC/openSUSE:Factory/.bash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bash", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/bash/bash.changes 2012-08-26 11:30:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bash.new/bash.changes 2012-10-18 15:40:09.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 17 13:10:22 UTC 2012 - [email protected] + +- Do not mix xmalloc/xfree of libreadline and bash by making the + libreadline version weak symbols instead of private symbols + +------------------------------------------------------------------- New: ---- readline-6.2-xmalloc.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.n5hKL8/_old 2012-10-18 15:40:11.000000000 +0200 +++ /var/tmp/diff_new_pack.n5hKL8/_new 2012-10-18 15:40:11.000000000 +0200 @@ -82,6 +82,7 @@ Patch24: readline-6.2-metamode.patch Patch25: readline-6.2-endpw.dif Patch26: readline-6.2-msgdynamic.patch +Patch27: readline-6.2-xmalloc.dif Patch30: readline-6.2-destdir.patch Patch40: bash-4.1-bash.bashrc.dif Patch42: audit-patch @@ -307,6 +308,7 @@ %patch24 -p2 -b .metamode #%patch25 -p2 -b .endpw %patch26 -p2 -b .msgdy +%patch27 -p0 -b .xm %patch30 -p0 -b .destdir %patch20 -p0 -b .0 @@ -353,15 +355,6 @@ LARGEFILE="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" fi rm -f ./test64 - (cat > rl.map)<<-'EOF' - { - local: - /* _rl*; */ - xfree; - xmalloc; - xrealloc; - }; - EOF (cat > dyn.map)<<-'EOF' { *; @@ -383,7 +376,6 @@ cflags -Wl,-O2 LDFLAGS cflags -Wl,--hash-size=8599 LDFLAGS cflags -Wl,-rpath,%{_ldldir}/%{bash_vers} LDFLAGS - cflags -Wl,--version-script=${PWD}/rl.map LDFLAGS cflags -Wl,--dynamic-list=${PWD}/dyn.map LDFLAGS CC=gcc CC_FOR_BUILD="$CC" ++++++ readline-6.2-xmalloc.dif ++++++ --- xfree.c +++ xfree.c 2012-10-17 12:48:37.862344784 +0000 @@ -48,3 +48,6 @@ xfree (string) if (string) free (string); } + +#undef xfree +extern void xfree PARAMS((void *)) __attribute__ ((weak, alias ("_rl_xfree"))); --- xmalloc.c +++ xmalloc.c 2012-10-17 12:48:28.430844890 +0000 @@ -77,3 +77,8 @@ xrealloc (pointer, bytes) memory_error_and_abort ("xrealloc"); return (temp); } + +#undef xmalloc +#undef xrealloc +extern PTR_T xmalloc PARAMS((size_t)) __attribute__ ((weak, alias ("_rl_xmalloc"))); +extern PTR_T xrealloc PARAMS((void *, size_t)) __attribute__ ((weak, alias ("_rl_xrealloc"))); --- xmalloc.h +++ xmalloc.h 2012-10-17 12:27:20.325156790 +0000 @@ -38,6 +38,14 @@ #endif /* !PTR_T */ +#undef xmalloc +#undef xrealloc +#undef xfree + +#define xmalloc _rl_xmalloc +#define xrealloc _rl_xrealloc +#define xfree _rl_xfree + extern PTR_T xmalloc PARAMS((size_t)); extern PTR_T xrealloc PARAMS((void *, size_t)); extern void xfree PARAMS((void *)); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
