diff options
| author | devzero2000 <devzero2000> | 2013-07-02 15:45:08 +0000 |
|---|---|---|
| committer | devzero2000 <devzero2000> | 2013-07-02 15:45:08 +0000 |
| commit | e6f60f58f8dc2406ef0619e3071b7eddb9450d51 (patch) | |
| tree | a64acb99393076430211ca438f8dfc3c65e64a77 | |
| parent | 94c8ac26d3c6e45feace5b39afbe0748a32f3136 (diff) | |
| download | libpopt-e6f60f58f8dc2406ef0619e3071b7eddb9450d51.tar.gz | |
check secure_getenv for glibc 2.17
Use secure_getenv if it is available.
Fall back to __secure_getenv if it is not.
In glibc 2.17, __secure_getenv was renamed to secure_getenv.
So check also for it.
Reference:
http://sourceware.org/glibc/wiki/Tips_and_Tricks/secure_getenv
http://marc.info/?t=134192618500001&r=1&w=2
| -rw-r--r-- | CHANGES | 8 | ||||
| -rwxr-xr-x | configure.ac | 2 | ||||
| -rw-r--r-- | po/pt.po | 2 | ||||
| -rw-r--r-- | po/wa.po | 2 | ||||
| -rw-r--r-- | po/zh_TW.po | 2 | ||||
| -rw-r--r-- | system.h | 7 |
6 files changed, 18 insertions, 5 deletions
@@ -1,4 +1,12 @@ 1.17 -> 2.0: + - devzero2000: check secure_getenv for glibc 2.17 + Use secure_getenv if it is available. + Fall back to __secure_getenv if it is not. + In glibc 2.17, __secure_getenv was renamed to secure_getenv. + So check also for it. + Reference: + http://sourceware.org/glibc/wiki/Tips_and_Tricks/secure_getenv + http://marc.info/?t=134192618500001&r=1&w=2 - devzero2000: update the gettext version prereq - devzero2000: fix misspelling Fix misspelling using http://github.com/lyda/misspell-check diff --git a/configure.ac b/configure.ac index cc82759..3e0cf20 100755 --- a/configure.ac +++ b/configure.ac @@ -306,7 +306,7 @@ AC_TYPE_INT64_T AC_CHECK_FUNC(setreuid, [], [ AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi]) ]) -AC_CHECK_FUNCS([getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom]) +AC_CHECK_FUNCS([getuid geteuid iconv mtrace __secure_getenv secure_gentenv setregid stpcpy strerror vasprintf srandom]) # drop AC_FUNC_MALLOC, REALLOC and STRTOD AC_CHECK_FUNCS([malloc realloc strtod memset nl_langinfo stpcpy strchr strerror strrchr]) @@ -6,7 +6,7 @@ msgstr "" "PO-Revision-Date: 2002-02-13 18:32+0000\n" "Last-Translator: Pedro Morais <morais@kde.org>\n" "Language-Team: pt <morais@kde.org>\n" -"Language: \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -14,7 +14,7 @@ msgstr "" "PO-Revision-Date: 1999-03-18 23:11+0100\n" "Last-Translator: Nobody yet\n" "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n" -"Language: \n" +"Language: wa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 74a7188..07fe209 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10,7 +10,7 @@ msgstr "" "PO-Revision-Date: 2005-04-08 17:52+0800\n" "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n" "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n" -"Language: \n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -202,9 +202,14 @@ static inline char * stpcpy (char *dest, const char * src) { #define xstrdup(_str) strdup(_str) #endif /* defined(HAVE_MCHECK_H) && defined(__GNUC__) */ -#if defined(HAVE___SECURE_GETENV) && !defined(__LCLINT__) +#if !defined(__LCLINT__) +#if defined(HAVE_SECURE_GETENV) +#define getenv(_s) secure_getenv(_s) +#else +#if defined(HAVE___SECURE_GETENV) #define getenv(_s) __secure_getenv(_s) #endif +#endif /* Include configmake.h autogenerated from Makefile.am */ #include "configmake.h" |