X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glibc.spec;h=c51d4b226e851f3a7cb3a5417c8b9027485f6a93;hb=2fb11e2;hp=6c2b8dd278c774d16313776a17dd0db79d5dbe70;hpb=be153b73d1e7aa83a414aa0a42c6c7a7a6a9fcf9;p=packages%2Fglibc.git

diff --git a/glibc.spec b/glibc.spec
index 6c2b8dd..c51d4b2 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,5 @@
 # TODO:
+# - consider moving klogctl.3 man to man-pages (and drop syslog.2 stub hacks here)
 # - restore --with-pkgversion when tcl upstream fixes the #3599098 (broken platform::identify).
 # - --enable-systemtap
 # - look at locale fixes/updates in bugzilla
@@ -36,7 +37,7 @@
 %undefine		with_static_pie
 %endif
 
-%define		core_version	2.33
+%define		core_version	2.34
 %define		llh_version	7:2.6.32.1-1
 
 Summary:	GNU libc
@@ -50,24 +51,24 @@ Summary(tr.UTF-8):	GNU libc
 Summary(uk.UTF-8):	GNU libc версії
 Name:		glibc
 Version:	%{core_version}
-Release:	5
+Release:	4
 Epoch:		6
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	https://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5:	390bbd889c7e8e8a7041564cb6b27cca
+# Source0-md5:	31998b53fb39cb946e96abc310af1c89
 Source2:	nscd.init
 Source3:	nscd.sysconfig
 Source4:	nscd.logrotate
 # from man-pages.spec --with tars
 Source5:	%{name}-man-pages.tar.xz
-# Source5-md5:	ff93a5e391bcff0d88dd4f8c3f96577d
+# Source5-md5:	4481fa9cbead3fe9d24af66666db1c86
 Source6:	%{name}-localedb-gen
 Source7:	%{name}-LD-path.c
 Source9:	nscd.tmpfiles
 # use branch.sh to update glibc-git.patch
-Patch0:		glibc-git.patch
-# Patch0-md5:	049e56141bf71acd5d131ee63e11211d
+#Patch0:		glibc-git.patch
+# Patch0-md5:	d41d8cd98f00b204e9800998ecf8427e
 # against GNU TP (libc domain)
 #Patch1:		%{name}-pl.po-update.patch
 Patch2:		%{name}-pld.patch
@@ -159,6 +160,9 @@ Conflicts:	xorg-driver-video-nvidia-libs < 1:295.33
 ExclusiveArch:	i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 ia64 alpha s390 s390x sparc sparc64 sparcv9 ppc ppc64 armv5tel armv6hl armv7hl armv7hnl aarch64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# errno, ps_*, __resp, __h_errno symbols
+%define		skip_post_check_so	libm.so.6 libc_malloc_debug.so.0 libcrypt.so.1 libthread_db.so.1 libresolv.so.2 libnss_db.so.2 libnss_compat.so.2 libnss_hesiod.so.2 libnsl.so.1 librt.so.1
+
 # avoid -s here (ld.so must not be stripped to allow any program debugging)
 %define		filterout_ld		(-Wl,)?-[sS] (-Wl,)?--strip.*
 # disable -D_FORTIFY_SOURCE=X and -fstack-protector
@@ -945,7 +949,7 @@ echo "Minimal supported kernel is 3.2.0" >&2
 exit 1
 %endif
 
-%patch0 -p1
+#%patch0 -p1
 
 %patch2 -p1
 %patch3 -p1
@@ -1074,11 +1078,11 @@ PICFILES="libc_pic.a libc.map
 	math/libm_pic.a libm.map
 	resolv/libresolv_pic.a"
 
-install -p $PICFILES				$RPM_BUILD_ROOT%{_libdir}
-install -p elf/sofini.os				$RPM_BUILD_ROOT%{_libdir}/sofini.o
+install -p $PICFILES		$RPM_BUILD_ROOT%{_libdir}
+install -p elf/sofini.os	$RPM_BUILD_ROOT%{_libdir}/sofini.o
 
 # Include %{_libdir}/gconv/gconv-modules.cache
-$(pwd)/elf/ld.so --library-path $(pwd) ./iconv/iconvconfig --nostdlib --prefix=$RPM_BUILD_ROOT %{_libdir}/gconv -o $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache
+:> $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache
 cd ..
 
 %if %{without cross}
@@ -1089,11 +1093,11 @@ install -p glibc-postinst				$RPM_BUILD_ROOT/sbin
 mv -f $RPM_BUILD_ROOT/%{_lib}/libpcprofile.so	$RPM_BUILD_ROOT%{_libdir}
 
 # make symlinks across top-level directories absolute
-for l in BrokenLocale anl %{?with_crypt:crypt} dl \
+for l in BrokenLocale anl %{?with_crypt:crypt} c_malloc_debug\
 %ifarch %{x8664} x32
 	mvec \
 %endif
-	resolv rt thread_db util; do
+	nss_compat nss_db nss_hesiod resolv thread_db; do
 	test -L $RPM_BUILD_ROOT%{_libdir}/lib${l}.so || exit 1
 	%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib${l}.so
 	ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/lib${l}.so.*) $RPM_BUILD_ROOT%{_libdir}/lib${l}.so
@@ -1408,14 +1412,15 @@ if [ "$1" = "0" ]; then
 	%groupremove nscd
 fi
 
+%posttrans -n iconv
+%{_sbindir}/iconvconfig --nostdlib -o %{_libdir}/gconv/gconv-modules.cache %{_libdir}/gconv
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README NEWS
 %if %{without cross}
 %attr(755,root,root) /sbin/glibc-postinst
 %endif
-# TODO: package ldconfig symlinks as %ghost
-%attr(755,root,root) /%{_lib}/ld-%{core_version}.so
 %ifarch %{ix86} sparc sparcv9 sparc64 alpha sh
 %attr(755,root,root) /%{_lib}/ld-linux.so.2
 %endif
@@ -1441,56 +1446,47 @@ fi
 %ifnarch %{ix86} sparc sparcv9 sparc64 alpha sh ia64 %{x8664} x32 ppc64 s390x %{arm} aarch64
 %attr(755,root,root) /%{_lib}/ld.so.1
 %endif
-%attr(755,root,root) /%{_lib}/libBrokenLocale-%{core_version}.so
 %ifarch alpha
 %attr(755,root,root) /%{_lib}/libBrokenLocale.so.1.1
 %else
 %attr(755,root,root) /%{_lib}/libBrokenLocale.so.1
 %endif
 %attr(755,root,root) /%{_lib}/libSegFault.so
-%attr(755,root,root) /%{_lib}/libanl-%{core_version}.so
 %attr(755,root,root) /%{_lib}/libanl.so.1
-%attr(755,root,root) /%{_lib}/libc-%{core_version}.so
 %ifarch alpha ia64
 %attr(755,root,root) /%{_lib}/libc.so.6.1
 %else
 %attr(755,root,root) /%{_lib}/libc.so.6
 %endif
-%attr(755,root,root) /%{_lib}/libdl-%{core_version}.so
+# for debugging and not linking
+%attr(755,root,root) /%{_lib}/libc_malloc_debug.so.0
+%attr(755,root,root) %{_libdir}/libc_malloc_debug.so
 %ifarch alpha
 %attr(755,root,root) /%{_lib}/libdl.so.2.1
 %else
 %attr(755,root,root) /%{_lib}/libdl.so.2
 %endif
-%attr(755,root,root) /%{_lib}/libm-%{core_version}.so
 %ifarch alpha ia64
 %attr(755,root,root) /%{_lib}/libm.so.6.1
 %else
 %attr(755,root,root) /%{_lib}/libm.so.6
 %endif
 %ifarch %{x8664} x32
-%attr(755,root,root) /%{_lib}/libmvec-%{core_version}.so
 %attr(755,root,root) /%{_lib}/libmvec.so.1
 %endif
-%attr(755,root,root) /%{_lib}/libnsl-%{core_version}.so
 %ifarch alpha
 %attr(755,root,root) /%{_lib}/libnsl.so.1.1
 %else
 %attr(755,root,root) /%{_lib}/libnsl.so.1
 %endif
-%attr(755,root,root) /%{_lib}/libpthread-%{core_version}.so
 %attr(755,root,root) /%{_lib}/libpthread.so.0
-%attr(755,root,root) /%{_lib}/libresolv-%{core_version}.so
 %ifarch alpha
 %attr(755,root,root) /%{_lib}/libresolv.so.2.1
 %else
 %attr(755,root,root) /%{_lib}/libresolv.so.2
 %endif
-%attr(755,root,root) /%{_lib}/librt-%{core_version}.so
 %attr(755,root,root) /%{_lib}/librt.so.1
-%attr(755,root,root) /%{_lib}/libthread_db-1.0.so
 %attr(755,root,root) /%{_lib}/libthread_db.so.1
-%attr(755,root,root) /%{_lib}/libutil-%{core_version}.so
 %ifarch alpha
 %attr(755,root,root) /%{_lib}/libutil.so.1.1
 %else
@@ -1500,12 +1496,10 @@ fi
 
 #%files -n nss_dns
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/libnss_dns-%{core_version}.so
 %attr(755,root,root) /%{_lib}/libnss_dns.so.2
 
 #%files -n nss_files
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/libnss_files-%{core_version}.so
 %attr(755,root,root) /%{_lib}/libnss_files.so.2
 
 %defattr(644,root,root,755)
@@ -1802,11 +1796,10 @@ fi
 %if %{with crypt}
 %files libcrypt
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/libcrypt-%{core_version}.so
 %ifarch alpha
-%attr(755,root,root) %ghost /%{_lib}/libcrypt.so.1.1
+%attr(755,root,root) /%{_lib}/libcrypt.so.1.1
 %else
-%attr(755,root,root) %ghost /%{_lib}/libcrypt.so.1
+%attr(755,root,root) /%{_lib}/libcrypt.so.1
 %endif
 %endif
 
@@ -1829,19 +1822,16 @@ fi
 
 %files -n nss_compat
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/libnss_compat-%{core_version}.so
 %attr(755,root,root) /%{_lib}/libnss_compat.so.2
 
 %files -n nss_db
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/makedb
-%attr(755,root,root) /%{_lib}/libnss_db-%{core_version}.so
 %attr(755,root,root) /%{_lib}/libnss_db.so.2
 %{_var}/db/Makefile
 
 %files -n nss_hesiod
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/libnss_hesiod-%{core_version}.so
 %attr(755,root,root) /%{_lib}/libnss_hesiod.so.2
 
 %if %{with memusage}
@@ -1859,24 +1849,28 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libBrokenLocale.so
-%attr(755,root,root) %{_libdir}/libanl.so
 %{?with_crypt:%attr(755,root,root) %{_libdir}/libcrypt.so}
-%attr(755,root,root) %{_libdir}/libdl.so
+# for dlopen and not linking
+%attr(755,root,root) %{_libdir}/libanl.so
 %attr(755,root,root) %{_libdir}/libm.so
 %ifarch %{x8664} x32
 %attr(755,root,root) %{_libdir}/libmvec.so
 %endif
 %attr(755,root,root) %{_libdir}/libpcprofile.so
 %attr(755,root,root) %{_libdir}/libresolv.so
-%attr(755,root,root) %{_libdir}/librt.so
+# for dlopen and not linking
 %attr(755,root,root) %{_libdir}/libthread_db.so
-%attr(755,root,root) %{_libdir}/libutil.so
+# empty archives, so linking with obsolete -lXX (these below) works
+%{_libdir}/libanl.a
+%{_libdir}/libdl.a
+%{_libdir}/libpthread.a
+%{_libdir}/librt.a
+%{_libdir}/libutil.a
 %{_libdir}/crt[1in].o
 %{_libdir}/[MSgr]crt1.o
 %{?with_static_pie:%{_libdir}/grcrt1.o}
 # ld scripts
 %{_libdir}/libc.so
-%{_libdir}/libpthread.so
 # static-only libs
 %{_libdir}/libc_nonshared.a
 %{_libdir}/libg.a
@@ -2003,30 +1997,40 @@ fi
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libanl.a
 %{_libdir}/libBrokenLocale.a
 %{_libdir}/libc.a
 %{?with_crypt:%{_libdir}/libcrypt.a}
-%{_libdir}/libdl.a
 %{_libdir}/libm.a
 %{_libdir}/libmcheck.a
 %ifarch %{x8664} x32
 %{_libdir}/libm-%{core_version}.a
 %{_libdir}/libmvec.a
 %endif
-%{_libdir}/libpthread.a
 %{_libdir}/libresolv.a
-%{_libdir}/librt.a
-%{_libdir}/libutil.a
 
 %files profile
 %defattr(644,root,root,755)
-%{_libdir}/lib*_p.a
+%{_libdir}/libBrokenLocale_p.a
+%{_libdir}/libanl_p.a
+%{_libdir}/libc_p.a
+%{?with_crypt:%{_libdir}/libcrypt_p.a}
+%{_libdir}/libdl_p.a
+%{_libdir}/libm_p.a
+%ifarch %{x8664} x32
+%{_libdir}/libmvec_p.a
+%endif
+%{_libdir}/libpthread_p.a
+%{_libdir}/libresolv_p.a
+%{_libdir}/librt_p.a
+%{_libdir}/libutil_p.a
 
 %files pic
 %defattr(644,root,root,755)
-%{_libdir}/lib*_pic.a
-%{_libdir}/lib*.map
+%{_libdir}/libc_pic.a
+%{_libdir}/libm_pic.a
+%{_libdir}/libresolv_pic.a
+%{_libdir}/libc.map
+%{_libdir}/libm.map
 %{_libdir}/sofini.o
 
 %files -n nscd
@@ -2078,6 +2082,8 @@ fi
 %attr(755,root,root) %{_sbindir}/iconvconfig
 %dir %{_libdir}/gconv
 %{_libdir}/gconv/gconv-modules
+%dir %{_libdir}/gconv/gconv-modules.d
+%{_libdir}/gconv/gconv-modules.d/gconv-modules-extra.conf
 %verify(not md5 mtime size) %{_libdir}/gconv/gconv-modules.cache
 %attr(755,root,root) %{_libdir}/gconv/*.so
 %{_mandir}/man8/iconvconfig.8*