From f0da27381659b850c627915166a2e33d5f783be0100068e7620915fdcbcda77e Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 28 Jan 2011 15:56:03 +0000 Subject: [PATCH] Accepting request 59369 from Base:System Accepted submit request 59369 from user rguenther OBS-URL: https://build.opensuse.org/request/show/59369 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=34 --- glibc-2.11.3-bso12397.diff | 11 +++++++++++ glibc.changes | 5 +++++ glibc.spec | 17 ++++++++++++----- ready | 0 4 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 glibc-2.11.3-bso12397.diff create mode 100644 ready diff --git a/glibc-2.11.3-bso12397.diff b/glibc-2.11.3-bso12397.diff new file mode 100644 index 0000000..0b54d63 --- /dev/null +++ b/glibc-2.11.3-bso12397.diff @@ -0,0 +1,11 @@ +--- sysdeps/unix/sysv/linux/mkdirat.c.orig 2011-01-28 15:50:00.000000000 +0100 ++++ sysdeps/unix/sysv/linux/mkdirat.c 2011-01-28 15:51:42.000000000 +0100 +@@ -43,7 +43,7 @@ + { + res = INLINE_SYSCALL (mkdirat, 3, fd, file, mode); + # ifndef __ASSUME_ATFCTS +- if (res == -1 && res == ENOSYS) ++ if (res == -1 && errno == ENOSYS) + __have_atfcts = -1; + else + # endif diff --git a/glibc.changes b/glibc.changes index 82d5407..adc4b56 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 28 14:53:35 UTC 2011 - rguenther@novell.com + +- Fix ENOSYS detection for mkdirat. [bso#12397] + ------------------------------------------------------------------- Thu Dec 9 12:33:35 UTC 2010 - rguenther@novell.com diff --git a/glibc.spec b/glibc.spec index 825cf1e..9436496 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,7 +1,7 @@ # # spec file for package glibc (Version 2.11.3) # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -64,7 +64,7 @@ Obsoletes: glibc-32bit Provides: rtld(GNU_HASH) AutoReqProv: on Version: 2.11.3 -Release: 2 +Release: 3 Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -141,7 +141,8 @@ Patch502: ARM_glibc-2.10.1-local-lowlevellock.diff Patch503: ARM_glibc-2.10.1-local-no-hwcap.diff # http://sources.redhat.com/bugzilla/show_bug.cgi?id=11155 Patch600: glibc-sparc64-fxstat.diff -Patch601: glibc-2.11.3-bnc658509.diff +Patch601: glibc-2.11.3-bnc658509.diff +Patch602: glibc-2.11.3-bso12397.diff %description The GNU C Library provides the most important standard libraries used @@ -364,6 +365,7 @@ rm nscd/s-stamp %endif %patch600 -p1 %patch601 +%patch602 # # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed! # @@ -384,12 +386,12 @@ rm nscd/s-stamp rm -fv sysdeps/powerpc/powerpc32/power4/hp-timing.c sysdeps/powerpc/powerpc32/power4/hp-timing.h find . -name configure | xargs touch + ####################################################################### ### ### BUILD ### ####################################################################### - %build if [ -x /bin/uname.bin ]; then /bin/uname.bin -a @@ -554,6 +556,7 @@ $BuildCC -static -Os -g $RPM_SOURCE_DIR/glibc_post_upgrade.c -o glibc_post_upgra %endif '-DLIBDIR="/%{_lib}"' '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' + ####################################################################### ### ### CHECK @@ -576,6 +579,7 @@ $BuildCC -static -Os -g $RPM_SOURCE_DIR/glibc_post_upgrade.c -o glibc_post_upgra %endif make -C cc-base check-abi || echo check-abi failed + ####################################################################### ### ### INSTALL @@ -668,6 +672,7 @@ cp -av bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h ln -sf ../%{_lib}/ld-%{version}.so $RPM_BUILD_ROOT/lib/ld64.so.1 %endif + # Miscelanna: install -m 0700 glibc_post_upgrade $RPM_BUILD_ROOT%{_sbindir} @@ -688,6 +693,7 @@ cp -p manual/libc/*.html $RPM_BUILD_ROOT/usr/share/doc/glibc cd manpages; make install_root=$RPM_BUILD_ROOT install; cd .. + # nscd tools: cp nscd/nscd.conf $RPM_BUILD_ROOT/etc @@ -761,6 +767,7 @@ for o in $RPM_BUILD_ROOT/%{_libdir}/crt[1in].o $RPM_BUILD_ROOT/%{_libdir}/lib*_n objcopy -R ".comment.SUSE.OPTs" -R ".note.gnu.build-id" $o done + ####################################################################### ### ### ... @@ -798,6 +805,7 @@ done %insserv_cleanup exit 0 + ####################################################################### ### ### FILES @@ -805,7 +813,6 @@ exit 0 ####################################################################### # glibc - %files %defattr(-,root,root) %doc LICENSES diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4