openSUSE Commits November 2010

commit@lists.opensuse.org

1 participants
1023 discussions

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at Tue Nov 2 10:13:22 CET 2010. -------- --- rpm/rpm.changes 2010-10-04 19:36:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2010-10-29 15:10:18.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 29 15:03:50 CEST 2010 - mls(a)suse.de + +- add support --with-only-C and --without-C options to find-lang.sh, + add %no_lang_C macro to allow compatible builds [bnc#449847] + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- langnoc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.lnsNB1/_old 2010-11-02 10:12:26.000000000 +0100 +++ /var/tmp/diff_new_pack.lnsNB1/_new 2010-11-02 10:12:26.000000000 +0100 @@ -26,7 +26,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.8.0 -Release: 11 +Release: 12 Requires: rpm = %{version} %py_requires Source99: rpm.spec ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.lnsNB1/_old 2010-11-02 10:12:26.000000000 +0100 +++ /var/tmp/diff_new_pack.lnsNB1/_new 2010-11-02 10:12:26.000000000 +0100 @@ -29,7 +29,7 @@ AutoReqProv: on Summary: The RPM Package Manager Version: 4.8.0 -Release: 11 +Release: 12 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -117,6 +117,7 @@ Patch80: fixsbits.diff Patch81: pkgconfig-0.24.diff Patch82: rpm-gst-provides.patch +Patch83: langnoc.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -178,7 +179,7 @@ %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 -%patch -P 80 -P 81 -P 82 +%patch -P 80 -P 81 -P 82 -P 83 #chmod 755 scripts/find-supplements{,.ksyms} #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms #chmod 755 scripts/firmware.prov ++++++ langnoc.diff ++++++ --- ./macros.in.orig 2010-10-28 13:57:37.000000000 +0000 +++ ./macros.in 2010-10-29 12:35:39.000000000 +0000 @@ -1381,6 +1381,7 @@ EOF # %files -f %{name}.lang # %find_lang %{_rpmconfigdir}/find-lang.sh %{buildroot} +%no_lang_C --without-C # Commands + opts to use for retrieving remote files # Proxy opts can be set through --httpproxy/--httpport popt aliases, --- ./scripts/find-lang.sh.orig 2010-10-28 13:44:49.000000000 +0000 +++ ./scripts/find-lang.sh 2010-10-29 09:39:22.000000000 +0000 @@ -62,6 +62,8 @@ MO= MO_NAME=$NAME.lang ALL_NAME=# NO_ALL_NAME= +ONLY_C=# +NO_C=# while test $# -gt 0 ; do case "${1}" in @@ -98,6 +100,14 @@ while test $# -gt 0 ; do NO_ALL_NAME=# shift ;; + --with-only-C ) + ONLY_C= + shift + ;; + --without-C ) + NO_C= + shift + ;; * ) MO_NAME=${1} shift @@ -117,6 +127,8 @@ s:'"$TOP_DIR"':: '"$ALL_NAME$MO"'s:$.*/share/locale/$$[^/_]\+$$.*\.mo$$:%lang(\2) \1\2\3: '"$NO_ALL_NAME$MO"'s:$.*/share/locale/$$[^/_]\+$$.*/'"$NAME"'\.mo$$:%lang(\2) \1\2\3: s:^$[^%].*$:: +'"$ONLY_C"'/%lang(C)/!d +'"$NO_C"'/%lang(C)/d s:%lang(C) :: /^$/d' >> $MO_NAME_NEW @@ -131,22 +143,25 @@ s:%lang(C) :: find $TOP_DIR -type d|sed ' s:'"$TOP_DIR"':: -'"$NO_ALL_NAME$GNOME"'s:$.*/gnome/help/'"$NAME"'$$:%dir %doc \1: +'"$NO_ALL_NAME$GNOME"'s:$.*/gnome/help/'"$NAME"'$$:%lang(C) %dir %doc \1: '"$NO_ALL_NAME$GNOME"'s:$.*/gnome/help/'"$NAME"'/[a-zA-Z0-9.\_\-]/.\+$:: '"$NO_ALL_NAME$GNOME"'s:$.*/gnome/help/'"$NAME"'\/$$[^/_]\+$:%lang(\2) %doc \1\2: -'"$ALL_NAME$GNOME"'s:$.*/gnome/help/[a-zA-Z0-9.\_\-]\+$$:%dir %doc \1: +'"$ALL_NAME$GNOME"'s:$.*/gnome/help/[a-zA-Z0-9.\_\-]\+$$:%lang(C) %dir %doc \1: '"$ALL_NAME$GNOME"'s:$.*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]/.\+$:: '"$ALL_NAME$GNOME"'s:$.*/gnome/help/[a-zA-Z0-9.\_\-]\+\/$$[^/_]\+$:%lang(\2) %doc \1\2: s:%lang(.*) .*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+/.*:: s:^$[^%].*$:: +'"$ONLY_C"'/%lang(C)/!d +'"$NO_C"'/%lang(C)/d s:%lang(C) :: /^$/d' >> $MO_NAME_NEW find $TOP_DIR -type d|sed ' s:'"$TOP_DIR"':: -'"$NO_ALL_NAME$GNOME"'s:$.*/omf/'"$NAME"'$$:%dir \1: -'"$ALL_NAME$GNOME"'s:$.*/omf/[a-zA-Z0-9.\_\-]\+$$:%dir \1: +'"$NO_ALL_NAME$GNOME"'s:$.*/omf/'"$NAME"'$$:%lang(C) %dir \1: +'"$ALL_NAME$GNOME"'s:$.*/omf/[a-zA-Z0-9.\_\-]\+$$:%lang(C) %dir \1: s:^$[^%].*$:: +s:%lang(C) :: /^$/d' >> $MO_NAME_NEW find $TOP_DIR -type f|sed ' @@ -154,6 +169,8 @@ s:'"$TOP_DIR"':: '"$NO_ALL_NAME$GNOME"'s:$.*/omf/'"$NAME"'/'"$NAME"'-\([^/.]\+$\.omf\):%lang(\2) \1: '"$ALL_NAME$GNOME"'s:$.*/omf/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+-\([^/.]\+$\.omf\):%lang(\2) \1: s:^[^%].*:: +'"$ONLY_C"'/%lang(C)/!d +'"$NO_C"'/%lang(C)/d s:%lang(C) :: /^$/d' >> $MO_NAME_NEW @@ -166,6 +183,8 @@ s:'"$TOP_DIR"':: '"$ALL_NAME$KDE"'s:$.*/HTML/$$[^/_]\+$$.*/[a-zA-Z0-9.\_\-]\+/$:: '"$ALL_NAME$KDE"'s:$.*/HTML/$$[^/_]\+$$.*/[a-zA-Z0-9.\_\-]\+$$:%lang(\2) \1\2\3: s:^$[^%].*$:: +'"$ONLY_C"'/%lang(C)/!d +'"$NO_C"'/%lang(C)/d s:%lang(C) :: /^$/d' >> $MO_NAME_NEW fi @@ -179,6 +198,8 @@ s:'"$TOP_DIR"':: '"$ALL_NAME$KDE"'s:$.*/HTML/$$[^/_]\+$$.*/[a-zA-Z0-9.\_\-]\+/$:: '"$ALL_NAME$KDE"'s:$.*/HTML/$$[^/_]\+$$.*/[a-zA-Z0-9.\_\-]\+$$:%lang(\2) \1\2\3: s:^$[^%].*$:: +'"$ONLY_C"'/%lang(C)/!d +'"$NO_C"'/%lang(C)/d s:%lang(C) :: /^$/d' >> $MO_NAME_NEW fi @@ -191,6 +212,8 @@ s:'"$TOP_DIR"':: '"$ALL_NAME$QT"'s:^$[^%].*/[^/]\+_\([a-zA-Z]\{2\}_[a-zA-Z]\{2\}$\.qm$\):%lang(\2) \1: '"$ALL_NAME$QT"'s:^$[^%].*/[^/]\+_\([a-zA-Z]\{2\}$\.qm$\):%lang(\2) \1: s:^[^%].*:: +'"$ONLY_C"'/%lang(C)/!d +'"$NO_C"'/%lang(C)/d s:%lang(C) :: /^$/d' >> $MO_NAME_NEW @@ -199,6 +222,8 @@ s:'"$TOP_DIR"':: '"$ALL_NAME$MAN"'s:$.*/man/\([^/_]\+$.*/man[a-z0-9]\+/\):: '"$ALL_NAME$MAN"'s:$.*/man/\([^/_]\+$.*/man[a-z0-9]\+$\):%lang(\2) \1*: s:^$[^%].*$:: +'"$ONLY_C"'/%lang(C)/!d +'"$NO_C"'/%lang(C)/d s:%lang(C) :: /^$/d' >> $MO_NAME_NEW @@ -206,6 +231,8 @@ find $TOP_DIR -type f -o -type l|sed ' s:'"$TOP_DIR"':: '"$NO_ALL_NAME$MAN"'s:$.*/man/\([^/_]\+$.*/man[a-z0-9]\+/'"$NAME"'\.[a-z0-9].*\):%lang(\2) \1*: s:^$[^%].*$:: +'"$ONLY_C"'/%lang(C)/!d +'"$NO_C"'/%lang(C)/d s:%lang(C) :: /^$/d' >> $MO_NAME_NEW ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

11 years, 7 months

commit xz for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package xz for openSUSE:Factory checked in at Tue Nov 2 10:12:07 CET 2010. -------- --- xz/xz.changes 2010-10-28 11:19:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/xz/xz.changes 2010-10-30 22:18:10.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Oct 30 20:17:49 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xz.spec ++++++ --- /var/tmp/diff_new_pack.2c0EBX/_old 2010-11-02 10:11:53.000000000 +0100 +++ /var/tmp/diff_new_pack.2c0EBX/_new 2010-11-02 10:11:53.000000000 +0100 @@ -20,7 +20,7 @@ Name: xz Summary: A Program for Compressing Files Version: 5.0.0 -Release: 1 +Release: 2 Group: Productivity/Archiving/Compression License: LGPLv2.1+ Url: http://tukaani.org/lzma/ @@ -81,7 +81,7 @@ %build AUTOPOINT=true autoreconf -fiv %configure --libdir=/%{_lib} --disable-static --with-pic --docdir=%_docdir/%name -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %check LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

11 years, 7 months

commit glibc for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package glibc for openSUSE:Factory checked in at Tue Nov 2 09:43:04 CET 2010. -------- --- glibc/glibc.changes 2010-09-13 16:40:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/glibc/glibc.changes 2010-11-01 23:13:23.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Oct 27 03:14:37 CEST 2010 - pbaudis(a)suse.cz + +- Fix missing hconf setup in nscd - this meant `multi on` in + /etc/host.conf was ignored when nscd was used, breaking e.g. + resolving of multi-AF records in /etc/hosts [bnc#572188] +- Fix two LD_AUDIT security vulnerabilities: spurious $ORIGIN expansion + and missing setuid library check when running as setuid [bnc#646960] + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- minmem New: ---- glibc-2.11.3-audit.diff glibc-nscd-hconf.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.KtQ5c2/_old 2010-11-02 09:41:40.000000000 +0100 +++ /var/tmp/diff_new_pack.KtQ5c2/_new 2010-11-02 09:41:40.000000000 +0100 @@ -64,7 +64,7 @@ Provides: rtld(GNU_HASH) AutoReqProv: on Version: 2.11.2 -Release: 6 +Release: 7 Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -139,6 +139,8 @@ Patch66: glibc-ldconfigr-aux.diff Patch67: glibc-nis-initgroups.diff Patch68: glibc-make-3.82.patch +Patch69: glibc-nscd-hconf.diff +Patch70: glibc-2.11.3-audit.diff Patch500: ARM_glibc-2.10.1-local-eabi-wchar.diff Patch501: ARM_glibc-2.10.1-local-hwcap-updates.diff Patch502: ARM_glibc-2.10.1-local-lowlevellock.diff @@ -363,6 +365,8 @@ %patch66 -p1 %patch67 -p1 %patch68 -p1 +%patch69 -p1 +%patch70 -p1 %ifarch %arm armv5tel armv7l %patch500 %patch501 ++++++ glibc-2.11.3-audit.diff ++++++ commit 22cd1c9bcf57c5829d65b6da825f7a459d40c9eb Author: Andreas Schwab <schwab(a)redhat.com> Date: Sun Oct 24 20:40:14 2010 -0400 Don't expand DST twice in dl_open 2010-10-18 Andreas Schwab <schwab(a)redhat.com> * elf/dl-open.c (dl_open_worker): Don't expand DST here, let _dl_map_object do it. diff --git a/elf/dl-open.c b/elf/dl-open.c index 754a263..c394b3f 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -221,35 +221,6 @@ dl_open_worker (void *a) assert (_dl_debug_initialize (0, args->nsid)->r_state == RT_CONSISTENT); - /* Maybe we have to expand a DST. */ - if (__builtin_expect (dst != NULL, 0)) - { - size_t len = strlen (file); - - /* Determine how much space we need. We have to allocate the - memory locally. */ - size_t required = DL_DST_REQUIRED (call_map, file, len, - _dl_dst_count (dst, 0)); - - /* Get space for the new file name. */ - char *new_file = (char *) alloca (required + 1); - - /* Generate the new file name. */ - _dl_dst_substitute (call_map, file, new_file, 0); - - /* If the substitution failed don't try to load. */ - if (*new_file == '\0') - _dl_signal_error (0, "dlopen", NULL, - N_("empty dynamic string token substitution")); - - /* Now we have a new file name. */ - file = new_file; - - /* It does not matter whether call_map is set even if we - computed it only because of the DST. Since the path contains - a slash the value is not used. See dl-load.c. */ - } - /* Load the named object. */ struct link_map *new; args->map = new = _dl_map_object (call_map, file, 0, lt_loaded, 0, commit 8e9f92e9d5d7737afdacf79b76d98c4c42980508 Author: Andreas Schwab <schwab(a)redhat.com> Date: Sun Oct 24 21:43:15 2010 -0400 Require suid bit on audit objects in privileged programs 2010-10-22 Andreas Schwab <schwab(a)redhat.com> * include/dlfcn.h (__RTLD_SECURE): Define. * elf/dl-load.c (_dl_map_object): Remove preloaded parameter. Use mode & __RTLD_SECURE instead. (open_path): Rename preloaded parameter to secure. * sysdeps/generic/ldsodefs.h (_dl_map_object): Adjust declaration. * elf/dl-open.c (dl_open_worker): Adjust call to _dl_map_object. * elf/dl-deps.c (openaux): Likewise. * elf/rtld.c (struct map_args): Remove is_preloaded. (map_doit): Don't use it. (dl_main): Likewise. (do_preload): Use __RTLD_SECURE instead of is_preloaded. (dlmopen_doit): Add __RTLD_SECURE to mode bits. diff --git a/elf/dl-deps.c b/elf/dl-deps.c index a58de5c..a51fb6e 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c @@ -62,7 +62,7 @@ openaux (void *a) { struct openaux_args *args = (struct openaux_args *) a; - args->aux = _dl_map_object (args->map, args->name, 0, + args->aux = _dl_map_object (args->map, args->name, (args->map->l_type == lt_executable ? lt_library : args->map->l_type), args->trace_mode, args->open_mode, diff --git a/elf/dl-load.c b/elf/dl-load.c index a7162eb..aa8738f 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1812,7 +1812,7 @@ open_verify (const char *name, struct filebuf *fbp, struct link_map *loader, if MAY_FREE_DIRS is true. */ static int -open_path (const char *name, size_t namelen, int preloaded, +open_path (const char *name, size_t namelen, int secure, struct r_search_path_struct *sps, char **realname, struct filebuf *fbp, struct link_map *loader, int whatcode, bool *found_other_class) @@ -1894,7 +1894,7 @@ open_path (const char *name, size_t namelen, int preloaded, /* Remember whether we found any existing directory. */ here_any |= this_dir->status[cnt] != nonexisting; - if (fd != -1 && __builtin_expect (preloaded, 0) + if (fd != -1 && __builtin_expect (secure, 0) && INTUSE(__libc_enable_secure)) { /* This is an extra security effort to make sure nobody can @@ -1963,7 +1963,7 @@ open_path (const char *name, size_t namelen, int preloaded, struct link_map * internal_function -_dl_map_object (struct link_map *loader, const char *name, int preloaded, +_dl_map_object (struct link_map *loader, const char *name, int type, int trace_mode, int mode, Lmid_t nsid) { int fd; @@ -2067,7 +2067,8 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, for (l = loader; l; l = l->l_loader) if (cache_rpath (l, &l->l_rpath_dirs, DT_RPATH, "RPATH")) { - fd = open_path (name, namelen, preloaded, &l->l_rpath_dirs, + fd = open_path (name, namelen, mode & __RTLD_SECURE, + &l->l_rpath_dirs, &realname, &fb, loader, LA_SER_RUNPATH, &found_other_class); if (fd != -1) @@ -2082,14 +2083,15 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, && main_map != NULL && main_map->l_type != lt_loaded && cache_rpath (main_map, &main_map->l_rpath_dirs, DT_RPATH, "RPATH")) - fd = open_path (name, namelen, preloaded, &main_map->l_rpath_dirs, + fd = open_path (name, namelen, mode & __RTLD_SECURE, + &main_map->l_rpath_dirs, &realname, &fb, loader ?: main_map, LA_SER_RUNPATH, &found_other_class); } /* Try the LD_LIBRARY_PATH environment variable. */ if (fd == -1 && env_path_list.dirs != (void *) -1) - fd = open_path (name, namelen, preloaded, &env_path_list, + fd = open_path (name, namelen, mode & __RTLD_SECURE, &env_path_list, &realname, &fb, loader ?: GL(dl_ns)[LM_ID_BASE]._ns_loaded, LA_SER_LIBPATH, &found_other_class); @@ -2098,12 +2100,12 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, if (fd == -1 && loader != NULL && cache_rpath (loader, &loader->l_runpath_dirs, DT_RUNPATH, "RUNPATH")) - fd = open_path (name, namelen, preloaded, + fd = open_path (name, namelen, mode & __RTLD_SECURE, &loader->l_runpath_dirs, &realname, &fb, loader, LA_SER_RUNPATH, &found_other_class); if (fd == -1 - && (__builtin_expect (! preloaded, 1) + && (__builtin_expect (! (mode & __RTLD_SECURE), 1) || ! INTUSE(__libc_enable_secure))) { /* Check the list of libraries in the file /etc/ld.so.cache, @@ -2169,7 +2171,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1)) && rtld_search_dirs.dirs != (void *) -1) - fd = open_path (name, namelen, preloaded, &rtld_search_dirs, + fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs, &realname, &fb, l, LA_SER_DEFAULT, &found_other_class); /* Add another newline when we are tracing the library loading. */ diff --git a/elf/dl-open.c b/elf/dl-open.c index c394b3f..cf8e8cc 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -223,7 +223,7 @@ dl_open_worker (void *a) /* Load the named object. */ struct link_map *new; - args->map = new = _dl_map_object (call_map, file, 0, lt_loaded, 0, + args->map = new = _dl_map_object (call_map, file, lt_loaded, 0, mode | __RTLD_CALLMAP, args->nsid); /* If the pointer returned is NULL this means the RTLD_NOLOAD flag is diff --git a/elf/rtld.c b/elf/rtld.c index 5ecc4fe..06b534a 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -589,7 +589,6 @@ struct map_args /* Argument to map_doit. */ char *str; struct link_map *loader; - int is_preloaded; int mode; /* Return value of map_doit. */ struct link_map *map; @@ -627,16 +626,17 @@ static void map_doit (void *a) { struct map_args *args = (struct map_args *) a; - args->map = _dl_map_object (args->loader, args->str, - args->is_preloaded, lt_library, 0, args->mode, - LM_ID_BASE); + args->map = _dl_map_object (args->loader, args->str, lt_library, 0, + args->mode, LM_ID_BASE); } static void dlmopen_doit (void *a) { struct dlmopen_args *args = (struct dlmopen_args *) a; - args->map = _dl_open (args->fname, RTLD_LAZY | __RTLD_DLOPEN | __RTLD_AUDIT, + args->map = _dl_open (args->fname, + (RTLD_LAZY | __RTLD_DLOPEN | __RTLD_AUDIT + | __RTLD_SECURE), dl_main, LM_ID_NEWLM, _dl_argc, INTUSE(_dl_argv), __environ); } @@ -806,8 +806,7 @@ do_preload (char *fname, struct link_map *main_map, const char *where) args.str = fname; args.loader = main_map; - args.is_preloaded = 1; - args.mode = 0; + args.mode = __RTLD_SECURE; unsigned int old_nloaded = GL(dl_ns)[LM_ID_BASE]._ns_nloaded; @@ -1054,7 +1053,6 @@ of this helper program; chances are you did not intend to run this program.\n\ args.str = rtld_progname; args.loader = NULL; - args.is_preloaded = 0; args.mode = __RTLD_OPENEXEC; (void) _dl_catch_error (&objname, &err_str, &malloced, map_doit, &args); @@ -1066,7 +1064,7 @@ of this helper program; chances are you did not intend to run this program.\n\ else { HP_TIMING_NOW (start); - _dl_map_object (NULL, rtld_progname, 0, lt_library, 0, + _dl_map_object (NULL, rtld_progname, lt_library, 0, __RTLD_OPENEXEC, LM_ID_BASE); HP_TIMING_NOW (stop); diff --git a/include/dlfcn.h b/include/dlfcn.h index a67426d..af92483 100644 --- a/include/dlfcn.h +++ b/include/dlfcn.h @@ -9,6 +9,7 @@ #define __RTLD_OPENEXEC 0x20000000 #define __RTLD_CALLMAP 0x10000000 #define __RTLD_AUDIT 0x08000000 +#define __RTLD_SECURE 0x04000000 /* Apply additional security checks. */ #define __LM_ID_CALLER -2 diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index fcc943b..fa4b6b2 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -824,11 +824,9 @@ extern void _dl_receive_error (receiver_fct fct, void (*operate) (void *), /* Open the shared object NAME and map in its segments. LOADER's DT_RPATH is used in searching for NAME. - If the object is already opened, returns its existing map. - For preloaded shared objects PRELOADED is set to a non-zero - value to allow additional security checks. */ + If the object is already opened, returns its existing map. */ extern struct link_map *_dl_map_object (struct link_map *loader, - const char *name, int preloaded, + const char *name, int type, int trace_mode, int mode, Lmid_t nsid) internal_function attribute_hidden; ++++++ glibc-nscd-hconf.diff ++++++ diff --git a/nscd/aicache.c b/nscd/aicache.c index 3cb2208..2e92929 100644 --- a/nscd/aicache.c +++ b/nscd/aicache.c @@ -26,6 +26,7 @@ #include <time.h> #include <unistd.h> #include <sys/mman.h> +#include <resolv/res_hconf.h> #include "dbg_log.h" #include "nscd.h" @@ -103,6 +104,8 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req, if (__res_maybe_init (&_res, 0) == -1) no_more = 1; + if (!_res_hconf.initialized) + _res_hconf_init (); /* If we are looking for both IPv4 and IPv6 address we don't want the lookup functions to automatically promote IPv4 addresses to diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c index ed55bec..c79b85a 100644 --- a/resolv/res_hconf.c +++ b/resolv/res_hconf.c @@ -84,7 +84,9 @@ static const struct cmd }; /* Structure containing the state. */ +#ifndef NOT_IN_libc struct hconf _res_hconf; +#endif /* Skip white space. */ static const char * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

11 years, 7 months

Jump to page:

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

openSUSE Commits November 2010