From fc3890705e4fe86a207177c26ed5e0293882c3be459666792d0b6cbeb715cbac Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 5 Jul 2011 08:02:08 +0000 Subject: [PATCH 1/5] Accepting request 75379 from home:a_jaeger:branches:openSUSE:Factory Cleanup OBS-URL: https://build.opensuse.org/request/show/75379 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=74 --- glibc-statfs64-ia64.diff | 12 ------------ glibc.changes | 2 ++ glibc.spec | 6 ------ 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 glibc-statfs64-ia64.diff diff --git a/glibc-statfs64-ia64.diff b/glibc-statfs64-ia64.diff deleted file mode 100644 index 1804a68..0000000 --- a/glibc-statfs64-ia64.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- sysdeps/unix/sysv/linux/statfs64.c~ 2010-01-27 02:47:32.884315000 +0100 -+++ sysdeps/unix/sysv/linux/statfs64.c 2010-01-27 02:49:17.943657000 +0100 -@@ -24,6 +24,9 @@ - #include - #include - -+/* On IA64, ia32el does not provide wrapper for statfs64() for some reason. -+ Force the compatibility code to get compiled in. [bnc#534828] */ -+#undef __ASSUME_STATFS64 - - # if __ASSUME_STATFS64 == 0 - int __no_statfs64 attribute_hidden; diff --git a/glibc.changes b/glibc.changes index 3798767..d62159f 100644 --- a/glibc.changes +++ b/glibc.changes @@ -5,6 +5,8 @@ Mon Jul 4 10:00:46 UTC 2011 - aj@suse.de and allow override of system directories (bnc#671725) - Fix futex bug (added patch glibc-fix-rwlock-stack-imbalance.patch from sourceware bug #12403). +- Remove glibc-statfs64-ia64.diff since current ia32el has the bug + fixed. ------------------------------------------------------------------- Fri Jul 1 16:09:14 UTC 2011 - aj@suse.de diff --git a/glibc.spec b/glibc.spec index 24f966c..823f737 100644 --- a/glibc.spec +++ b/glibc.spec @@ -161,8 +161,6 @@ Patch38: glibc-cpusetsize.diff Patch40: libm-x86-64-exceptions.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch41: glibc-uio-cell.diff -# PATCH-FIX-SLE -- Do not assume statfs64 exists for ia64's ia32 layer bnc#534828 -Patch42: glibc-statfs64-ia64.diff # PATCH-FIX-UPSTREAM -- add missing includes aj@suse.de Patch43: missing-include-build-fix.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines @@ -421,10 +419,6 @@ rm nscd/s-stamp %patch38 %patch40 %patch41 -p1 -%if 0%{?sles_version} -# Only apply for x86 on SLES -%patch42 -%endif %patch43 -p1 %patch44 -p1 %patch45 From 6f56020499a95b4d5251f32d4d8d551edcd53cce1a2a7d99770152bdf54e131e Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 5 Jul 2011 08:04:18 +0000 Subject: [PATCH 2/5] Accepting request 75381 from home:a_jaeger:branches:openSUSE:Factory Remove glibc-statfs64-ia64.diff OBS-URL: https://build.opensuse.org/request/show/75381 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=75 --- glibc.changes | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/glibc.changes b/glibc.changes index d62159f..4d4da2c 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 5 08:03:26 UTC 2011 - aj@suse.de + +- Remove glibc-statfs64-ia64.diff since current ia32el has the bug + fixed. + ------------------------------------------------------------------- Mon Jul 4 10:00:46 UTC 2011 - aj@suse.de @@ -5,8 +11,6 @@ Mon Jul 4 10:00:46 UTC 2011 - aj@suse.de and allow override of system directories (bnc#671725) - Fix futex bug (added patch glibc-fix-rwlock-stack-imbalance.patch from sourceware bug #12403). -- Remove glibc-statfs64-ia64.diff since current ia32el has the bug - fixed. ------------------------------------------------------------------- Fri Jul 1 16:09:14 UTC 2011 - aj@suse.de From 18abc49ff7ed64040ab40bcd5c69822257cc6a09f05465ec861e7f81ab9954db Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 5 Jul 2011 13:32:10 +0000 Subject: [PATCH 3/5] Accepting request 75423 from home:a_jaeger:branches:openSUSE:Factory Remove glibc-ppc64-vdso-time.diff (bnc#590216) OBS-URL: https://build.opensuse.org/request/show/75423 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=76 --- glibc-ppc64-vdso-time.diff | 28 ---------------------------- glibc.changes | 1 + glibc.spec | 13 +++++-------- 3 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 glibc-ppc64-vdso-time.diff diff --git a/glibc-ppc64-vdso-time.diff b/glibc-ppc64-vdso-time.diff deleted file mode 100644 index bba82b6..0000000 --- a/glibc-ppc64-vdso-time.diff +++ /dev/null @@ -1,28 +0,0 @@ -2010-03-04 Carlos Eduardo Seo - - * sysdeps/unix/sysv/linux/powerpc/powerpc64/time.c: New file. - -Index: src/sysdeps/unix/sysv/linux/powerpc/powerpc64/time.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ src/sysdeps/unix/sysv/linux/powerpc/powerpc64/time.c 2010-03-04 20:02:23.000000000 -0300 -@@ -0,0 +1,19 @@ -+/* Copyright (C) 2010 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#include diff --git a/glibc.changes b/glibc.changes index 4d4da2c..f754292 100644 --- a/glibc.changes +++ b/glibc.changes @@ -3,6 +3,7 @@ Tue Jul 5 08:03:26 UTC 2011 - aj@suse.de - Remove glibc-statfs64-ia64.diff since current ia32el has the bug fixed. +- Remove glibc-ppc64-vdso-time.diff (bnc#590216). ------------------------------------------------------------------- Mon Jul 4 10:00:46 UTC 2011 - aj@suse.de diff --git a/glibc.spec b/glibc.spec index 823f737..e0e58eb 100644 --- a/glibc.spec +++ b/glibc.spec @@ -101,11 +101,11 @@ NoSource: 0 # # PATCH-FIX-OPENSUSE remove lfs test from testsuite aj@suse.de Patch0: glibc-testsuite.patch -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines +# PATCH-FIX-OPENSUSE handle glibc binaries Patch1: glibc-2.3.90-noversion.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch2: glibc-fnmatch-multibyte.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines +# PATCH-FIX-OPENSUSE reload /etc/resolv.conf on change Patch3: glibc-resolv-reload.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch4: glibc-2.3.locales.diff.bz2 @@ -141,9 +141,9 @@ Patch24: glibc-2.3.5-nscd-zeronegtimeout.diff Patch25: glibc-2.3.90-langpackdir.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch27: glibc-2.6-configure.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines +# PATCH-FIX-OPENSUSE Fix hangs in UDP RPC calls bso#5379 Patch28: glibc-2.2-sunrpc.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines +# PATCH-FIX-OPENSUSE Workaround rpmlint warning Patch29: glibc-2.8-getconf.diff # PATCH-FIX-OPENSUSE only use ipv6 if real ipv6 address exists bnc#361697, bnc#684534 Patch30: getaddrinfo-ipv6-sanity.diff @@ -164,8 +164,6 @@ Patch41: glibc-uio-cell.diff # PATCH-FIX-UPSTREAM -- add missing includes aj@suse.de Patch43: missing-include-build-fix.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch44: glibc-ppc64-vdso-time.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch45: glibc-gai-private4.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch46: glibc-resolv-mdnshint.diff @@ -409,7 +407,7 @@ rm nscd/s-stamp %patch25 %patch27 %patch28 -%patch29 +#%patch29 %patch30 %patch31 %patch33 @@ -420,7 +418,6 @@ rm nscd/s-stamp %patch40 %patch41 -p1 %patch43 -p1 -%patch44 -p1 %patch45 %patch46 -p1 %patch47 -p1 From c62ac0182a050fa4e3decd819f77f4924d3152a79d576ee20609271e71424490 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Wed, 6 Jul 2011 08:26:32 +0000 Subject: [PATCH 4/5] - enable glibc-2.8-getconf.diff again to fix build failure OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=77 --- glibc.changes | 5 +++++ glibc.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/glibc.changes b/glibc.changes index f754292..8343320 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 6 08:24:45 UTC 2011 - lnussel@suse.de + +- enable glibc-2.8-getconf.diff again to fix build failure + ------------------------------------------------------------------- Tue Jul 5 08:03:26 UTC 2011 - aj@suse.de diff --git a/glibc.spec b/glibc.spec index e0e58eb..5c8c362 100644 --- a/glibc.spec +++ b/glibc.spec @@ -407,7 +407,7 @@ rm nscd/s-stamp %patch25 %patch27 %patch28 -#%patch29 +%patch29 %patch30 %patch31 %patch33 From afa4a7c1c834a346bf52e95307507160adcddb2b8d540f2e55770f0cd0180acc Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 7 Jul 2011 08:29:39 +0000 Subject: [PATCH 5/5] Accepting request 75602 from home:a_jaeger:branches:openSUSE:Factory Cleanup; add nscd systemd config files. OBS-URL: https://build.opensuse.org/request/show/75602 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=78 --- glibc-2.8-getconf.diff | 4 +++- glibc.changes | 5 +++++ glibc.spec | 22 +++++++++++++++++++--- nscd.conf | 1 + nscd.service | 14 ++++++++++++++ nscd.socket | 8 ++++++++ 6 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 nscd.conf create mode 100644 nscd.service create mode 100644 nscd.socket diff --git a/glibc-2.8-getconf.diff b/glibc-2.8-getconf.diff index 9c0879e..fdf9c05 100644 --- a/glibc-2.8-getconf.diff +++ b/glibc-2.8-getconf.diff @@ -1,4 +1,6 @@ -This is required for too noisy rpmlint. +This is required for too noisy rpmlint: +glibc.i586: E: hardlink-across-partition (Badness: 10000) /usr/lib/getconf/POSIX_V7_ILP32_OFFBIG /usr/bin/getconf + Index: posix/Makefile =================================================================== diff --git a/glibc.changes b/glibc.changes index 8343320..c05d086 100644 --- a/glibc.changes +++ b/glibc.changes @@ -3,6 +3,11 @@ Wed Jul 6 08:24:45 UTC 2011 - lnussel@suse.de - enable glibc-2.8-getconf.diff again to fix build failure +------------------------------------------------------------------- +Tue Jul 5 20:22:50 UTC 2011 - aj@suse.de + +- Add systemd configuration for nscd. + ------------------------------------------------------------------- Tue Jul 5 08:03:26 UTC 2011 - aj@suse.de diff --git a/glibc.spec b/glibc.spec index 5c8c362..8585efd 100644 --- a/glibc.spec +++ b/glibc.spec @@ -90,6 +90,11 @@ Source10: bindresvport.blacklist Source12: glibc_post_upgrade.c Source15: glibc.rpmlintrc Source16: baselibs.conf +# For systemd +Source20: nscd.conf +Source21: nscd.service +Source22: nscd.socket + Requires(pre): filesystem Provides: rtld(GNU_HASH) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -131,7 +136,7 @@ Patch18: glibc-2.3.3-amd64-s_ceil.diff Patch20: glibc-2.4-china.diff # PATCH-FIX-OPENSUSE Fix gb18030 code bnc#54080 Patch21: glibc-2.3.4-gb18030-big5hkscs.diff.bz2 -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines +# PATCH-FIX-OPENSUSE Handle Patch22: glibc-2.4.90-nscd.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch23: glibc-2.3.3-nscd-db-path.diff @@ -143,7 +148,7 @@ Patch25: glibc-2.3.90-langpackdir.diff Patch27: glibc-2.6-configure.diff # PATCH-FIX-OPENSUSE Fix hangs in UDP RPC calls bso#5379 Patch28: glibc-2.2-sunrpc.diff -# PATCH-FIX-OPENSUSE Workaround rpmlint warning +# PATCH-FIX-OPENSUSE Do not generate hardlink for getconf Patch29: glibc-2.8-getconf.diff # PATCH-FIX-OPENSUSE only use ipv6 if real ipv6 address exists bnc#361697, bnc#684534 Patch30: getaddrinfo-ipv6-sanity.diff @@ -173,7 +178,7 @@ Patch47: glibc-nscd-hconf.diff Patch48: glibc-malloc-arena-max.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch49: glibc-fini-unwind.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines +# PATCH-FIX-UPSTREAM install gconv-modules aj@suse.de Patch50: glibc-gconvcache-s390.diff # PATCH-FIX-UPSTREAM - Fix alloca argument bso#12445 aj@suse.de Patch51: glibc-vfprintf-positional.diff @@ -827,6 +832,13 @@ for o in %{buildroot}/%{_libdir}/crt[1in].o %{buildroot}/%{_libdir}/lib*_nonshar objcopy -R ".comment.SUSE.OPTs" -R ".note.gnu.build-id" $o done +mkdir -p %{buildroot}/usr/lib/tmpfiles.d/ +install -m 644 %{SOURCE20} %{buildroot}/usr/lib/tmpfiles.d/ +mkdir -p %{buildroot}/lib/systemd/system +install -m 644 %{SOURCE21} %{buildroot}/lib/systemd/system +install -m 644 %{SOURCE22} %{buildroot}/lib/systemd/system + + ####################################################################### ### ### ... @@ -1104,6 +1116,10 @@ exit 0 %config /etc/init.d/nscd %{_sbindir}/nscd %{_sbindir}/rcnscd +/lib/systemd/system/nscd.service +/lib/systemd/system/nscd.socket +%dir /usr/lib/tmpfiles.d +/usr/lib/tmpfiles.d/nscd.conf %dir %attr(0755,root,root) %ghost /var/run/nscd %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/nscd.pid %attr(0666,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/socket diff --git a/nscd.conf b/nscd.conf new file mode 100644 index 0000000..1807bd5 --- /dev/null +++ b/nscd.conf @@ -0,0 +1 @@ +d /var/run/nscd 0755 root root diff --git a/nscd.service b/nscd.service new file mode 100644 index 0000000..80e7626 --- /dev/null +++ b/nscd.service @@ -0,0 +1,14 @@ +[Unit] +Description=Name Service Cache Daemon +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/sbin/nscd +ExecStop=/usr/sbin/nscd --shutdown +Restart=always +PIDFile=/var/run/nscd/nscd.pid + +[Install] +WantedBy=multi-user.target +Also=nscd.socket diff --git a/nscd.socket b/nscd.socket new file mode 100644 index 0000000..cec9134 --- /dev/null +++ b/nscd.socket @@ -0,0 +1,8 @@ +[Unit] +Description=Name Service Cache Daemon Socket + +[Socket] +ListenDatagram=/var/run/nscd/socket + +[Install] +WantedBy=sockets.target