Accepting request 434699 from Base:System
- cpuid-assertion.patch: Don't assert on older Intel CPUs (BZ #20647) - glibc-2.3.3-nscd-db-path.diff: Move persistent nscd databases to /var/lib/nscd - glibc-2.3.90-langpackdir.diff: simplify (forwarded request 434696 from Andreas_Schwab) OBS-URL: https://build.opensuse.org/request/show/434699 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=207
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
8ece547945
21
cpuid-assertion.patch
Normal file
21
cpuid-assertion.patch
Normal file
@ -0,0 +1,21 @@
|
||||
2016-10-12 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
[BZ #20647]
|
||||
* sysdeps/x86/cacheinfo.c (handle_intel): Return -1 if the
|
||||
maximum CPUID level is less than 2.
|
||||
|
||||
Index: glibc-2.24/sysdeps/x86/cacheinfo.c
|
||||
===================================================================
|
||||
--- glibc-2.24.orig/sysdeps/x86/cacheinfo.c
|
||||
+++ glibc-2.24/sysdeps/x86/cacheinfo.c
|
||||
@@ -259,7 +259,9 @@ intel_check_word (int name, unsigned int
|
||||
static long int __attribute__ ((noinline))
|
||||
handle_intel (int name, unsigned int maxidx)
|
||||
{
|
||||
- assert (maxidx >= 2);
|
||||
+ /* Return -1 for older CPUs. */
|
||||
+ if (maxidx < 2)
|
||||
+ return -1;
|
||||
|
||||
/* OK, we can use the CPUID instruction to get all info about the
|
||||
caches. */
|
||||
@ -1,7 +1,3 @@
|
||||
2004-12-09 Thorsten Kukuk <kukuk@suse.de>
|
||||
|
||||
* nscd/nscd.h: Move persistent storage back to /var/run/nscd
|
||||
|
||||
Index: glibc-2.17.90/nscd/nscd.h
|
||||
===================================================================
|
||||
--- glibc-2.17.90.orig/nscd/nscd.h
|
||||
@ -15,11 +11,11 @@ Index: glibc-2.17.90/nscd/nscd.h
|
||||
-#define _PATH_NSCD_HOSTS_DB "/var/db/nscd/hosts"
|
||||
-#define _PATH_NSCD_SERVICES_DB "/var/db/nscd/services"
|
||||
-#define _PATH_NSCD_NETGROUP_DB "/var/db/nscd/netgroup"
|
||||
+#define _PATH_NSCD_PASSWD_DB "/var/run/nscd/passwd"
|
||||
+#define _PATH_NSCD_GROUP_DB "/var/run/nscd/group"
|
||||
+#define _PATH_NSCD_HOSTS_DB "/var/run/nscd/hosts"
|
||||
+#define _PATH_NSCD_SERVICES_DB "/var/run/nscd/services"
|
||||
+#define _PATH_NSCD_NETGROUP_DB "/var/run/nscd/netgroup"
|
||||
+#define _PATH_NSCD_PASSWD_DB "/var/lib/nscd/passwd"
|
||||
+#define _PATH_NSCD_GROUP_DB "/var/lib/nscd/group"
|
||||
+#define _PATH_NSCD_HOSTS_DB "/var/lib/nscd/hosts"
|
||||
+#define _PATH_NSCD_SERVICES_DB "/var/lib/nscd/services"
|
||||
+#define _PATH_NSCD_NETGROUP_DB "/var/lib/nscd/netgroup"
|
||||
|
||||
/* Path used when not using persistent storage. */
|
||||
#define _PATH_NSCD_XYZ_DB_TMP "/var/run/nscd/dbXXXXXX"
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Index: glibc-2.17.90/intl/loadmsgcat.c
|
||||
Index: glibc-2.24/intl/loadmsgcat.c
|
||||
===================================================================
|
||||
--- glibc-2.17.90.orig/intl/loadmsgcat.c
|
||||
+++ glibc-2.17.90/intl/loadmsgcat.c
|
||||
@@ -806,8 +806,52 @@ _nl_load_domain (domain_file, domainbind
|
||||
--- glibc-2.24.orig/intl/loadmsgcat.c
|
||||
+++ glibc-2.24/intl/loadmsgcat.c
|
||||
@@ -829,8 +829,47 @@ _nl_load_domain (struct loaded_l10nfile
|
||||
if (domain_file->filename == NULL)
|
||||
goto out;
|
||||
|
||||
@ -11,25 +11,21 @@ Index: glibc-2.17.90/intl/loadmsgcat.c
|
||||
+ /* Replace /locale/ with /usr/share/locale-langpack/ */
|
||||
+ const char *langpackdir = "/usr/share/locale-langpack/";
|
||||
+ char *filename_langpack = malloc (strlen (domain_file->filename) +
|
||||
+ strlen (langpackdir));
|
||||
+ strlen (langpackdir));
|
||||
+ if (filename_langpack != NULL)
|
||||
+ {
|
||||
+ char *p = strstr (domain_file->filename, "/locale/");
|
||||
+ if (p != NULL)
|
||||
+ {
|
||||
+ strcpy (filename_langpack, langpackdir);
|
||||
+ strcpy (&filename_langpack[strlen (langpackdir)],
|
||||
+ (p+8));
|
||||
+ if ((fd = open (filename_langpack, O_RDONLY | O_BINARY)) == -1)
|
||||
+ fd = open (domain_file->filename, O_RDONLY | O_BINARY);
|
||||
+ strcpy (&filename_langpack[strlen (langpackdir)], p + 8);
|
||||
+ fd = open (filename_langpack, O_RDONLY | O_BINARY);
|
||||
+ }
|
||||
+ else
|
||||
+ /* Try to open the addressed file. */
|
||||
+ fd = open (domain_file->filename, O_RDONLY | O_BINARY);
|
||||
+
|
||||
+ free (filename_langpack);
|
||||
+ }
|
||||
+ else
|
||||
+
|
||||
+ if (fd == -1)
|
||||
+ /* Try to open the addressed file. */
|
||||
+ fd = open (domain_file->filename, O_RDONLY | O_BINARY);
|
||||
+
|
||||
@ -45,8 +41,7 @@ Index: glibc-2.17.90/intl/loadmsgcat.c
|
||||
+ if (p != NULL)
|
||||
+ {
|
||||
+ strcpy (filename_bundle, bundle_dir);
|
||||
+ strcpy (&filename_bundle[strlen (bundle_dir)],
|
||||
+ (p+8));
|
||||
+ strcpy (&filename_bundle[strlen (bundle_dir)], p + 8);
|
||||
+ fd = open (filename_bundle, O_RDONLY | O_BINARY);
|
||||
+ }
|
||||
+
|
||||
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 13 08:24:22 UTC 2016 - schwab@suse.de
|
||||
|
||||
- cpuid-assertion.patch: Don't assert on older Intel CPUs (BZ #20647)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 5 15:01:46 UTC 2016 - schwab@suse.de
|
||||
|
||||
- glibc-2.3.3-nscd-db-path.diff: Move persistent nscd databases to
|
||||
/var/lib/nscd
|
||||
- glibc-2.3.90-langpackdir.diff: simplify
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 2 13:55:44 UTC 2016 - schwab@suse.de
|
||||
|
||||
|
||||
@ -36,7 +36,6 @@ Name: glibc-testsuite
|
||||
Summary: Standard Shared Libraries (from the GNU C Library)
|
||||
License: LGPL-2.1+ and SUSE-LGPL-2.1+-with-GCC-exception and GPL-2.0+
|
||||
Group: System/Libraries
|
||||
# UTILS-SUMMARY-END
|
||||
BuildRequires: audit-devel
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libcap-devel
|
||||
@ -249,6 +248,10 @@ Patch306: glibc-fix-double-loopback.diff
|
||||
###
|
||||
# Patches from upstream
|
||||
###
|
||||
# PATCH-FIX-UPSTREAM ARM: mark __startcontext as .cantunwind (BZ #20435)
|
||||
Patch1000: startcontext-cantunwind.patch
|
||||
# PATCH-FIX-UPSTREAM X86: Don't assert on older Intel CPUs (BZ #20647)
|
||||
Patch1001: cpuid-assertion.patch
|
||||
|
||||
###
|
||||
# Patches awaiting upstream approval
|
||||
@ -267,8 +270,6 @@ Patch2005: nss-files-long-lines-2.patch
|
||||
Patch2006: iconv-reset-input-buffer.patch
|
||||
# PATCH-FIX-UPSTREAM Reinitialize dl_load_write_lock on fork (BZ #19282)
|
||||
Patch2008: reinitialize-dl_load_write_lock.patch
|
||||
# PATCH-FIX-UPSTREAM ARM: mark __startcontext as .cantunwind (BZ #20435)
|
||||
Patch2009: startcontext-cantunwind.patch
|
||||
|
||||
# Non-glibc patches
|
||||
# PATCH-FIX-OPENSUSE Remove debianisms from manpages
|
||||
@ -471,6 +472,9 @@ rm nscd/s-stamp
|
||||
%patch304 -p1
|
||||
%patch306 -p1
|
||||
|
||||
%patch1000 -p1
|
||||
%patch1001 -p1
|
||||
|
||||
%patch2000 -p1
|
||||
%patch2001 -p1
|
||||
%patch2002 -p1
|
||||
@ -478,7 +482,6 @@ rm nscd/s-stamp
|
||||
%patch2005 -p1
|
||||
%patch2006 -p1
|
||||
%patch2008 -p1
|
||||
%patch2009 -p1
|
||||
|
||||
%patch3000
|
||||
|
||||
@ -908,12 +911,13 @@ popd
|
||||
|
||||
# nscd tools:
|
||||
|
||||
%ifnarch i686
|
||||
cp nscd/nscd.conf %{buildroot}/etc
|
||||
mkdir -p %{buildroot}/etc/init.d
|
||||
ln -sf /sbin/service %{buildroot}/usr/sbin/rcnscd
|
||||
mkdir -p %{buildroot}/run/nscd
|
||||
touch %{buildroot}/run/nscd/{passwd,group,hosts,services,netgroup}
|
||||
touch %{buildroot}/run/nscd/{socket,nscd.pid}
|
||||
mkdir -p %{buildroot}/var/lib/nscd
|
||||
%endif
|
||||
|
||||
#
|
||||
# Create ld.so.conf
|
||||
@ -958,10 +962,12 @@ for o in %{buildroot}/%{_libdir}/crt[1in].o %{buildroot}/%{_libdir}/lib*_nonshar
|
||||
objcopy -R ".comment.SUSE.OPTs" -R ".note.gnu.build-id" $o
|
||||
done
|
||||
|
||||
%ifnarch i686
|
||||
mkdir -p %{buildroot}/usr/lib/tmpfiles.d/
|
||||
install -m 644 %{SOURCE20} %{buildroot}/usr/lib/tmpfiles.d/
|
||||
mkdir -p %{buildroot}/usr/lib/systemd/system
|
||||
install -m 644 %{SOURCE21} %{buildroot}/usr/lib/systemd/system
|
||||
%endif
|
||||
|
||||
%ifarch armv6hl armv7hl
|
||||
# Provide compatibility link
|
||||
@ -987,10 +993,7 @@ rm -rf %{buildroot}%{_libdir}/audit
|
||||
# Remove files from glibc-{extra,info,i18ndata} and nscd
|
||||
rm -rf %{buildroot}%{_infodir} %{buildroot}%{_prefix}/share/i18n
|
||||
rm -f %{buildroot}%{_bindir}/makedb %{buildroot}/var/lib/misc/Makefile
|
||||
rm -f %{buildroot}/etc/*nscd* %{buildroot}%{_sbindir}/*nscd*
|
||||
rm -rf %{buildroot}/usr/lib/systemd
|
||||
rm -rf %{buildroot}/usr/lib/tmpfiles.d
|
||||
rm -rf %{buildroot}/run/nscd
|
||||
rm -f %{buildroot}%{_sbindir}/nscd
|
||||
%endif # i686
|
||||
|
||||
# LSB
|
||||
@ -1325,11 +1328,12 @@ exit 0
|
||||
%dir %attr(0755,root,root) %ghost /run/nscd
|
||||
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/nscd.pid
|
||||
%attr(0666,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/socket
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/passwd
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/group
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/hosts
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/services
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/netgroup
|
||||
%dir %attr(0755,root,root) /var/lib/nscd
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/passwd
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/group
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/hosts
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/services
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/netgroup
|
||||
%endif # !i686
|
||||
|
||||
%if %{build_profile}
|
||||
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 13 08:24:22 UTC 2016 - schwab@suse.de
|
||||
|
||||
- cpuid-assertion.patch: Don't assert on older Intel CPUs (BZ #20647)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 5 15:01:46 UTC 2016 - schwab@suse.de
|
||||
|
||||
- glibc-2.3.3-nscd-db-path.diff: Move persistent nscd databases to
|
||||
/var/lib/nscd
|
||||
- glibc-2.3.90-langpackdir.diff: simplify
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 2 13:55:44 UTC 2016 - schwab@suse.de
|
||||
|
||||
|
||||
@ -35,7 +35,6 @@ Name: glibc-utils
|
||||
Summary: Development utilities from GNU C library
|
||||
License: LGPL-2.1+
|
||||
Group: Development/Languages/C and C++
|
||||
# UTILS-SUMMARY-END
|
||||
BuildRequires: audit-devel
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libcap-devel
|
||||
@ -248,6 +247,10 @@ Patch306: glibc-fix-double-loopback.diff
|
||||
###
|
||||
# Patches from upstream
|
||||
###
|
||||
# PATCH-FIX-UPSTREAM ARM: mark __startcontext as .cantunwind (BZ #20435)
|
||||
Patch1000: startcontext-cantunwind.patch
|
||||
# PATCH-FIX-UPSTREAM X86: Don't assert on older Intel CPUs (BZ #20647)
|
||||
Patch1001: cpuid-assertion.patch
|
||||
|
||||
###
|
||||
# Patches awaiting upstream approval
|
||||
@ -266,8 +269,6 @@ Patch2005: nss-files-long-lines-2.patch
|
||||
Patch2006: iconv-reset-input-buffer.patch
|
||||
# PATCH-FIX-UPSTREAM Reinitialize dl_load_write_lock on fork (BZ #19282)
|
||||
Patch2008: reinitialize-dl_load_write_lock.patch
|
||||
# PATCH-FIX-UPSTREAM ARM: mark __startcontext as .cantunwind (BZ #20435)
|
||||
Patch2009: startcontext-cantunwind.patch
|
||||
|
||||
# Non-glibc patches
|
||||
# PATCH-FIX-OPENSUSE Remove debianisms from manpages
|
||||
@ -471,6 +472,9 @@ rm nscd/s-stamp
|
||||
%patch304 -p1
|
||||
%patch306 -p1
|
||||
|
||||
%patch1000 -p1
|
||||
%patch1001 -p1
|
||||
|
||||
%patch2000 -p1
|
||||
%patch2001 -p1
|
||||
%patch2002 -p1
|
||||
@ -478,7 +482,6 @@ rm nscd/s-stamp
|
||||
%patch2005 -p1
|
||||
%patch2006 -p1
|
||||
%patch2008 -p1
|
||||
%patch2009 -p1
|
||||
|
||||
%patch3000
|
||||
|
||||
@ -908,12 +911,13 @@ popd
|
||||
|
||||
# nscd tools:
|
||||
|
||||
%ifnarch i686
|
||||
cp nscd/nscd.conf %{buildroot}/etc
|
||||
mkdir -p %{buildroot}/etc/init.d
|
||||
ln -sf /sbin/service %{buildroot}/usr/sbin/rcnscd
|
||||
mkdir -p %{buildroot}/run/nscd
|
||||
touch %{buildroot}/run/nscd/{passwd,group,hosts,services,netgroup}
|
||||
touch %{buildroot}/run/nscd/{socket,nscd.pid}
|
||||
mkdir -p %{buildroot}/var/lib/nscd
|
||||
%endif
|
||||
|
||||
#
|
||||
# Create ld.so.conf
|
||||
@ -958,10 +962,12 @@ for o in %{buildroot}/%{_libdir}/crt[1in].o %{buildroot}/%{_libdir}/lib*_nonshar
|
||||
objcopy -R ".comment.SUSE.OPTs" -R ".note.gnu.build-id" $o
|
||||
done
|
||||
|
||||
%ifnarch i686
|
||||
mkdir -p %{buildroot}/usr/lib/tmpfiles.d/
|
||||
install -m 644 %{SOURCE20} %{buildroot}/usr/lib/tmpfiles.d/
|
||||
mkdir -p %{buildroot}/usr/lib/systemd/system
|
||||
install -m 644 %{SOURCE21} %{buildroot}/usr/lib/systemd/system
|
||||
%endif
|
||||
|
||||
%ifarch armv6hl armv7hl
|
||||
# Provide compatibility link
|
||||
@ -987,10 +993,7 @@ rm -rf %{buildroot}%{_libdir}/audit
|
||||
# Remove files from glibc-{extra,info,i18ndata} and nscd
|
||||
rm -rf %{buildroot}%{_infodir} %{buildroot}%{_prefix}/share/i18n
|
||||
rm -f %{buildroot}%{_bindir}/makedb %{buildroot}/var/lib/misc/Makefile
|
||||
rm -f %{buildroot}/etc/*nscd* %{buildroot}%{_sbindir}/*nscd*
|
||||
rm -rf %{buildroot}/usr/lib/systemd
|
||||
rm -rf %{buildroot}/usr/lib/tmpfiles.d
|
||||
rm -rf %{buildroot}/run/nscd
|
||||
rm -f %{buildroot}%{_sbindir}/nscd
|
||||
%endif # i686
|
||||
|
||||
# LSB
|
||||
@ -1325,11 +1328,12 @@ exit 0
|
||||
%dir %attr(0755,root,root) %ghost /run/nscd
|
||||
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/nscd.pid
|
||||
%attr(0666,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/socket
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/passwd
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/group
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/hosts
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/services
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/netgroup
|
||||
%dir %attr(0755,root,root) /var/lib/nscd
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/passwd
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/group
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/hosts
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/services
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/netgroup
|
||||
%endif # !i686
|
||||
|
||||
%if %{build_profile}
|
||||
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 13 08:24:22 UTC 2016 - schwab@suse.de
|
||||
|
||||
- cpuid-assertion.patch: Don't assert on older Intel CPUs (BZ #20647)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 5 15:01:46 UTC 2016 - schwab@suse.de
|
||||
|
||||
- glibc-2.3.3-nscd-db-path.diff: Move persistent nscd databases to
|
||||
/var/lib/nscd
|
||||
- glibc-2.3.90-langpackdir.diff: simplify
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 2 13:55:44 UTC 2016 - schwab@suse.de
|
||||
|
||||
|
||||
34
glibc.spec
34
glibc.spec
@ -36,7 +36,6 @@ Name: glibc
|
||||
Summary: Standard Shared Libraries (from the GNU C Library)
|
||||
License: LGPL-2.1+ and SUSE-LGPL-2.1+-with-GCC-exception and GPL-2.0+
|
||||
Group: System/Libraries
|
||||
# UTILS-SUMMARY-END
|
||||
BuildRequires: audit-devel
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libcap-devel
|
||||
@ -249,6 +248,10 @@ Patch306: glibc-fix-double-loopback.diff
|
||||
###
|
||||
# Patches from upstream
|
||||
###
|
||||
# PATCH-FIX-UPSTREAM ARM: mark __startcontext as .cantunwind (BZ #20435)
|
||||
Patch1000: startcontext-cantunwind.patch
|
||||
# PATCH-FIX-UPSTREAM X86: Don't assert on older Intel CPUs (BZ #20647)
|
||||
Patch1001: cpuid-assertion.patch
|
||||
|
||||
###
|
||||
# Patches awaiting upstream approval
|
||||
@ -267,8 +270,6 @@ Patch2005: nss-files-long-lines-2.patch
|
||||
Patch2006: iconv-reset-input-buffer.patch
|
||||
# PATCH-FIX-UPSTREAM Reinitialize dl_load_write_lock on fork (BZ #19282)
|
||||
Patch2008: reinitialize-dl_load_write_lock.patch
|
||||
# PATCH-FIX-UPSTREAM ARM: mark __startcontext as .cantunwind (BZ #20435)
|
||||
Patch2009: startcontext-cantunwind.patch
|
||||
|
||||
# Non-glibc patches
|
||||
# PATCH-FIX-OPENSUSE Remove debianisms from manpages
|
||||
@ -471,6 +472,9 @@ rm nscd/s-stamp
|
||||
%patch304 -p1
|
||||
%patch306 -p1
|
||||
|
||||
%patch1000 -p1
|
||||
%patch1001 -p1
|
||||
|
||||
%patch2000 -p1
|
||||
%patch2001 -p1
|
||||
%patch2002 -p1
|
||||
@ -478,7 +482,6 @@ rm nscd/s-stamp
|
||||
%patch2005 -p1
|
||||
%patch2006 -p1
|
||||
%patch2008 -p1
|
||||
%patch2009 -p1
|
||||
|
||||
%patch3000
|
||||
|
||||
@ -908,12 +911,13 @@ popd
|
||||
|
||||
# nscd tools:
|
||||
|
||||
%ifnarch i686
|
||||
cp nscd/nscd.conf %{buildroot}/etc
|
||||
mkdir -p %{buildroot}/etc/init.d
|
||||
ln -sf /sbin/service %{buildroot}/usr/sbin/rcnscd
|
||||
mkdir -p %{buildroot}/run/nscd
|
||||
touch %{buildroot}/run/nscd/{passwd,group,hosts,services,netgroup}
|
||||
touch %{buildroot}/run/nscd/{socket,nscd.pid}
|
||||
mkdir -p %{buildroot}/var/lib/nscd
|
||||
%endif
|
||||
|
||||
#
|
||||
# Create ld.so.conf
|
||||
@ -958,10 +962,12 @@ for o in %{buildroot}/%{_libdir}/crt[1in].o %{buildroot}/%{_libdir}/lib*_nonshar
|
||||
objcopy -R ".comment.SUSE.OPTs" -R ".note.gnu.build-id" $o
|
||||
done
|
||||
|
||||
%ifnarch i686
|
||||
mkdir -p %{buildroot}/usr/lib/tmpfiles.d/
|
||||
install -m 644 %{SOURCE20} %{buildroot}/usr/lib/tmpfiles.d/
|
||||
mkdir -p %{buildroot}/usr/lib/systemd/system
|
||||
install -m 644 %{SOURCE21} %{buildroot}/usr/lib/systemd/system
|
||||
%endif
|
||||
|
||||
%ifarch armv6hl armv7hl
|
||||
# Provide compatibility link
|
||||
@ -987,10 +993,7 @@ rm -rf %{buildroot}%{_libdir}/audit
|
||||
# Remove files from glibc-{extra,info,i18ndata} and nscd
|
||||
rm -rf %{buildroot}%{_infodir} %{buildroot}%{_prefix}/share/i18n
|
||||
rm -f %{buildroot}%{_bindir}/makedb %{buildroot}/var/lib/misc/Makefile
|
||||
rm -f %{buildroot}/etc/*nscd* %{buildroot}%{_sbindir}/*nscd*
|
||||
rm -rf %{buildroot}/usr/lib/systemd
|
||||
rm -rf %{buildroot}/usr/lib/tmpfiles.d
|
||||
rm -rf %{buildroot}/run/nscd
|
||||
rm -f %{buildroot}%{_sbindir}/nscd
|
||||
%endif # i686
|
||||
|
||||
# LSB
|
||||
@ -1325,11 +1328,12 @@ exit 0
|
||||
%dir %attr(0755,root,root) %ghost /run/nscd
|
||||
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/nscd.pid
|
||||
%attr(0666,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/socket
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/passwd
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/group
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/hosts
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/services
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/netgroup
|
||||
%dir %attr(0755,root,root) /var/lib/nscd
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/passwd
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/group
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/hosts
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/services
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/netgroup
|
||||
%endif # !i686
|
||||
|
||||
%if %{build_profile}
|
||||
|
||||
@ -10,7 +10,7 @@ Summary: Development utilities from GNU C library\n\
|
||||
License: LGPL-2.1+\n\
|
||||
Group: Development/Languages/C and C++"
|
||||
}
|
||||
/UTILS-SUMMARY-END/ { ignore = 0 }
|
||||
/^BuildRequires/ { ignore = 0 }
|
||||
/^%description$/ {
|
||||
ignore = 1
|
||||
print "\
|
||||
|
||||
Loading…
Reference in New Issue
Block a user