Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 47351 Details for
Bug 74694
app-text/vilistextum-2.6.2: get_attr overflows temp buffer
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
enables use of glibc iconv and --disable-multibyte
vilistextum-2.6.7-gentoo.diff (text/plain), 10.22 KB, created by
Patric Mueller
on 2005-01-02 00:31:17 UTC
(
hide
)
Description:
enables use of glibc iconv and --disable-multibyte
Filename:
MIME Type:
Creator:
Patric Mueller
Created:
2005-01-02 00:31:17 UTC
Size:
10.22 KB
patch
obsolete
>diff -uw vilistextum-2.6.7/CHANGES vilistextum-2.6.7-gentoo/CHANGES >--- vilistextum-2.6.7/CHANGES 2004-12-20 00:05:47.000000000 +0100 >+++ vilistextum-2.6.7-gentoo/CHANGES 2005-01-02 09:14:58.000000000 +0100 >@@ -1,9 +1,15 @@ >+2.6.7-gentoo: (02.01.2005) >+ >+ - configure fixed to correctly process --disable-multibyte >+ - configure falls back to standard iconv() if no libiconv is found >+ - BUGFIX: three off-by-one error in get_attr found by Ewald Dieterich >+ > 2.6.7: (19.12.2004) > >- - BUGFIX: buffer overflow in get_attr found by Ariel Berkman >+ - BUGFIX: buffer overflow in get_attr() found by Ariel Berkman > - BUGFIX: compilation fix for Solaris by Fredrik Roubert > - more robust behaviour when encountering invalid byte sequences >- - added RPM-spec file by Joshua Jensen. >+ - added RPM-spec file by Joshua Jensen > > 2.6.6: (24.08.2004) > >diff -uw vilistextum-2.6.7/INSTALL vilistextum-2.6.7-gentoo/INSTALL >--- vilistextum-2.6.7/INSTALL 2004-04-20 12:10:18.000000000 +0200 >+++ vilistextum-2.6.7-gentoo/INSTALL 2004-12-22 21:49:20.000000000 +0100 >@@ -11,7 +11,7 @@ > Multibyte/Unicode version > ========================= > >-./configure --enable && make && make install >+./configure --enable-multibyte && make && make install > > The multibyte version needs libiconv. > http://www.gnu.org/software/libiconv >diff -uw vilistextum-2.6.7/config.h.in vilistextum-2.6.7-gentoo/config.h.in >--- vilistextum-2.6.7/config.h.in 2004-12-20 00:05:48.000000000 +0100 >+++ vilistextum-2.6.7-gentoo/config.h.in 2005-01-02 09:14:59.000000000 +0100 >@@ -3,6 +3,9 @@ > /* Define to 1 if you have the <getopt.h> header file. */ > #undef HAVE_GETOPT_H > >+/* Define to 1 if you have the <iconv.h> header file. */ >+#undef HAVE_ICONV_H >+ > /* Define to 1 if you have the <inttypes.h> header file. */ > #undef HAVE_INTTYPES_H > >diff -uw vilistextum-2.6.7/configure vilistextum-2.6.7-gentoo/configure >--- vilistextum-2.6.7/configure 2004-12-20 00:05:32.000000000 +0100 >+++ vilistextum-2.6.7-gentoo/configure 2005-01-02 09:13:56.000000000 +0100 >@@ -846,7 +846,7 @@ > --enable-FEATURE[=ARG] include FEATURE [ARG=yes] > --disable-dependency-tracking Speeds up one-time builds > --enable-dependency-tracking Do not reject slow dependency extractors >- --enable-multibyte Enable multibyte support. Needs libiconv. >+ --enable-multibyte Enable multibyte support. > > Optional Packages: > --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] >@@ -1541,7 +1541,7 @@ > > # Define the identity of the package. > PACKAGE=vilistextum >- VERSION=2.6.7 >+ VERSION=2.6.7-gentoo > > > cat >>confdefs.h <<_ACEOF >@@ -1673,7 +1673,7 @@ > > > cat >>confdefs.h <<_ACEOF >-#define RELEASEDATE "19.12.2004" >+#define RELEASEDATE "02.01.2005" > _ACEOF > > >@@ -3615,13 +3615,14 @@ > # Check whether --enable-multibyte or --disable-multibyte was given. > if test "${enable_multibyte+set}" = set; then > enableval="$enable_multibyte" >- multibyte="yes" >+ use_multibyte=$enableval > else >- multibyte="no" >+ use_multibyte=no > fi; >-echo "$as_me:$LINENO: result: $multibyte" >&5 >-echo "${ECHO_T}$multibyte" >&6 >-if test "$multibyte" = "yes"; then >+echo "$as_me:$LINENO: result: $use_multibyte" >&5 >+echo "${ECHO_T}$use_multibyte" >&6 >+ >+if test "$use_multibyte" = "yes"; then > > cat >>confdefs.h <<\_ACEOF > #define MULTIBYTE 1 >@@ -3629,7 +3630,154 @@ > > fi > >-if test "$multibyte" = "yes"; then >+if test "$use_multibyte" = "yes"; then >+ >+for ac_header in iconv.h >+do >+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` >+if eval "test \"\${$as_ac_Header+set}\" = set"; then >+ echo "$as_me:$LINENO: checking for $ac_header" >&5 >+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >+if eval "test \"\${$as_ac_Header+set}\" = set"; then >+ echo $ECHO_N "(cached) $ECHO_C" >&6 >+fi >+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 >+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 >+else >+ # Is the header compilable? >+echo "$as_me:$LINENO: checking $ac_header usability" >&5 >+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 >+cat >conftest.$ac_ext <<_ACEOF >+#line $LINENO "configure" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+$ac_includes_default >+#include <$ac_header> >+_ACEOF >+rm -f conftest.$ac_objext >+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >+ (eval $ac_compile) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); } && >+ { ac_try='test -s conftest.$ac_objext' >+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >+ (eval $ac_try) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); }; }; then >+ ac_header_compiler=yes >+else >+ echo "$as_me: failed program was:" >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+ac_header_compiler=no >+fi >+rm -f conftest.$ac_objext conftest.$ac_ext >+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 >+echo "${ECHO_T}$ac_header_compiler" >&6 >+ >+# Is the header present? >+echo "$as_me:$LINENO: checking $ac_header presence" >&5 >+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 >+cat >conftest.$ac_ext <<_ACEOF >+#line $LINENO "configure" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+#include <$ac_header> >+_ACEOF >+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 >+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 >+ ac_status=$? >+ grep -v '^ *+' conftest.er1 >conftest.err >+ rm -f conftest.er1 >+ cat conftest.err >&5 >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); } >/dev/null; then >+ if test -s conftest.err; then >+ ac_cpp_err=$ac_c_preproc_warn_flag >+ else >+ ac_cpp_err= >+ fi >+else >+ ac_cpp_err=yes >+fi >+if test -z "$ac_cpp_err"; then >+ ac_header_preproc=yes >+else >+ echo "$as_me: failed program was:" >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+ ac_header_preproc=no >+fi >+rm -f conftest.err conftest.$ac_ext >+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 >+echo "${ECHO_T}$ac_header_preproc" >&6 >+ >+# So? What about this header? >+case $ac_header_compiler:$ac_header_preproc in >+ yes:no ) >+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 >+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} >+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; >+ no:yes ) >+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 >+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} >+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 >+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} >+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; >+esac >+echo "$as_me:$LINENO: checking for $ac_header" >&5 >+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >+if eval "test \"\${$as_ac_Header+set}\" = set"; then >+ echo $ECHO_N "(cached) $ECHO_C" >&6 >+else >+ eval "$as_ac_Header=$ac_header_preproc" >+fi >+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 >+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 >+ >+fi >+if test `eval echo '${'$as_ac_Header'}'` = yes; then >+ cat >>confdefs.h <<_ACEOF >+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 >+_ACEOF >+ >+else >+ { { echo "$as_me:$LINENO: error: Need libiconv or iconv.h for multibyte support" >&5 >+echo "$as_me: error: Need libiconv or iconv.h for multibyte support" >&2;} >+ { (exit 1); exit 1; }; } >+fi >+ >+done >+ >+ > > echo "$as_me:$LINENO: checking for iconv in -liconv" >&5 > echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6 >@@ -3693,9 +3841,8 @@ > LIBS="-liconv $LIBS" > > else >- { { echo "$as_me:$LINENO: error: Need libiconv for multibyte support" >&5 >-echo "$as_me: error: Need libiconv for multibyte support" >&2;} >- { (exit 1); exit 1; }; } >+ { echo "$as_me:$LINENO: WARNING: only generic iconv has been found not libiconv" >&5 >+echo "$as_me: WARNING: only generic iconv has been found not libiconv" >&2;} > fi > > >diff -uw vilistextum-2.6.7/configure.in vilistextum-2.6.7-gentoo/configure.in >--- vilistextum-2.6.7/configure.in 2004-12-20 00:05:14.000000000 +0100 >+++ vilistextum-2.6.7-gentoo/configure.in 2005-01-02 09:13:30.000000000 +0100 >@@ -1,11 +1,11 @@ > dnl Process this file with autoconf to produce a configure script. > AC_INIT(src/debug.h) >-AM_INIT_AUTOMAKE(vilistextum, 2.6.7) >+AM_INIT_AUTOMAKE(vilistextum, 2.6.7-gentoo) > > AM_CONFIG_HEADER(config.h) > > dnl Set current date >-AC_DEFINE_UNQUOTED(RELEASEDATE, "19.12.2004", "Release date of the program") >+AC_DEFINE_UNQUOTED(RELEASEDATE, "02.01.2005", "Release date of the program") > > dnl Checks for programs. > AC_PROG_CC >@@ -27,17 +27,21 @@ > dnl checking for options > AC_MSG_CHECKING(if --enable-multibyte specified) > AC_ARG_ENABLE(multibyte, >- [ --enable-multibyte Enable multibyte support. Needs libiconv.], >- [multibyte="yes"], [multibyte="no"]) >-AC_MSG_RESULT($multibyte) >-if test "$multibyte" = "yes"; then >+ AC_HELP_STRING([--enable-multibyte], [Enable multibyte support.]), >+ [use_multibyte=$enableval], [use_multibyte=no]) >+AC_MSG_RESULT($use_multibyte) >+ >+if test "$use_multibyte" = "yes"; then > AC_DEFINE(MULTIBYTE, 1, "Enable multibyte support (e.g. unicode, shift_jis)") > fi > > dnl Checks for libraries. >-if test "$multibyte" = "yes"; then >+if test "$use_multibyte" = "yes"; then >+AC_CHECK_HEADERS(iconv.h,, >+ AC_MSG_ERROR(Need libiconv or iconv.h for multibyte support)) >+ > AC_CHECK_LIB(iconv, iconv,, >- AC_MSG_ERROR(Need libiconv for multibyte support)) >+ AC_MSG_WARN(only generic iconv has been found not libiconv)) > > dnl setting INTERNAL_LOCALE > AC_MSG_CHECKING(for unicode locale)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 74694
:
46170
|
46171
|
46682
|
47351
|
47389