X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glibc.spec;h=a0e49d10609d001cd8fc039c30a51340e031e05d;hb=372462db45c0270b8a593a90225b516fcee30df3;hp=4c33f4e6010163c159da6f3176112bc4fe21475d;hpb=1f28605eac27fbcdc4e41889abd84080b340f32f;p=packages%2Fglibc.git diff --git a/glibc.spec b/glibc.spec index 4c33f4e..a0e49d1 100644 --- a/glibc.spec +++ b/glibc.spec @@ -17,6 +17,7 @@ %bcond_without nss_crypt # disable crypt features based on Mozilla NSS library %bcond_with bash_nls # use bash NLS in shell scripts (ldd, sotruss); restores /bin/bash dep %bcond_without cet # Intel Control-flow Enforcement Technology (CET) +%bcond_without crypt # don't build obsolete libcrypt # %ifarch %{ix86} %{x8664} %{!?min_kernel:%global min_kernel 3.2.0} @@ -31,7 +32,7 @@ %undefine with_cet %endif -%define core_version 2.31 +%define core_version 2.32 %define llh_version 7:2.6.32.1-1 Summary: GNU libc @@ -45,24 +46,24 @@ Summary(tr.UTF-8): GNU libc Summary(uk.UTF-8): GNU libc версії Name: glibc Version: %{core_version} -Release: 4 +Release: 6 Epoch: 6 License: LGPL v2.1+ Group: Libraries -Source0: http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz -# Source0-md5: 78a720f17412f3c3282be5a6f3363ec6 +Source0: https://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz +# Source0-md5: 720c7992861c57cf97d66a2f36d8d1fa Source2: nscd.init Source3: nscd.sysconfig Source4: nscd.logrotate # from man-pages.spec --with tars Source5: %{name}-man-pages.tar.xz -# Source5-md5: 852c1c77c7435615c0b17d8e4acf05d8 +# Source5-md5: e66023386d2cc0d6a1d5c29bdbf03550 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: d1127a0c732137212299f256bf96251a +# Patch0-md5: 2feec2e270f668fb41b8cde1e5f2ba68 # against GNU TP (libc domain) #Patch1: %{name}-pl.po-update.patch Patch2: %{name}-pld.patch @@ -144,8 +145,9 @@ Conflicts: openssh-server < 2:8.2p1-1 Conflicts: poldek < 0.30.1-9 Conflicts: rc-scripts < 0.3.1-13 Conflicts: rpm < 4.1 +Conflicts: util-linux < 2.35.1-2 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 +ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 ia64 alpha s390 s390x sparc sparc64 sparcv9 ppc ppc64 armv5tel aarch64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # avoid -s here (ld.so must not be stripped to allow any program debugging) @@ -436,39 +438,6 @@ Módulo hesiod NSS de glibc. %description -n nss_hesiod -l pl.UTF-8 Moduł glibc NSS (Name Service Switch) dostępu do baz danych. -%package -n nss_nis -Summary: NIS(YP) NSS glibc module -Summary(es.UTF-8): Módulo NIS(YP) NSS de glibc -Summary(pl.UTF-8): Moduł NIS(YP) NSS glibc -Group: Base -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description -n nss_nis -glibc NSS (Name Service Switch) module for NIS(YP) databases access. - -%description -n nss_nis -l es.UTF-8 -Módulo NSS de glibc para acceder las bases de datos NIS(YP). - -%description -n nss_nis -l pl.UTF-8 -Moduł glibc NSS (Name Service Switch) dostępu do baz danych NIS(YP). - -%package -n nss_nisplus -Summary: NIS+ NSS module -Summary(es.UTF-8): Módulo NIS+ NSS -Summary(pl.UTF-8): Moduł NIS+ NSS -Group: Base -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description -n nss_nisplus -glibc NSS (Name Service Switch) module for NIS+ databases access. - -%description -n nss_nisplus -l es.UTF-8 -Módulo NSS (Name Service Switch) de glibc para acceder las bases de -datos NIS+. - -%description -n nss_nisplus -l pl.UTF-8 -Moduł glibc NSS (Name Service Switch) dostępu do baz danych NIS+. - %package memusage Summary: Memory usage profiler Summary(pl.UTF-8): Narzędzie do profilowania zużycia pamięci @@ -496,7 +465,11 @@ Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-devel-utils = %{epoch}:%{version}-%{release} Requires: %{name}-headers = %{epoch}:%{version}-%{release} +%if %{with crypt} Requires: %{name}-libcrypt(%{_target_cpu}) = %{epoch}:%{version}-%{release} +%else +Requires: libxcrypt-devel +%endif Provides: %{name}-devel(%{_target_cpu}) = %{epoch}:%{version}-%{release} %ifarch %{ix86} Provides: %{name}-devel(ix86) = %{epoch}:%{version}-%{release} @@ -675,7 +648,7 @@ Summary: Documentation needed for development using standard C libraries Summary(pl.UTF-8): Dokumentacja do tworzenia programów przy użyciu standardowych bibliotek C Group: Documentation Conflicts: man-pages < 4.09 -%if "%{_rpmversion}" >= "5" +%if "%{_rpmversion}" >= "4.6" BuildArch: noarch %endif @@ -703,6 +676,7 @@ Summary(ru.UTF-8): Статические библиотеки glibc Summary(uk.UTF-8): Статичні бібліотеки glibc Group: Development/Libraries Requires: %{name}-devel = %{epoch}:%{version}-%{release} +%{!?with_crypt:Requires: libxcrypt-static} Provides: %{name}-static(%{_target_cpu}) = %{epoch}:%{version}-%{release} %ifarch %{ix86} Provides: %{name}-static(ix86) = %{epoch}:%{version}-%{release} @@ -945,7 +919,7 @@ echo "Minimal supported kernel is 3.2.0" >&2 exit 1 %endif -%patch0 -p1 +#%patch0 -p1 %patch2 -p1 %patch3 -p0 @@ -999,6 +973,9 @@ AWK="gawk" \ ../%configure \ %if %{with cet} --enable-cet \ +%endif +%if %{without crypt} + --disable-crypt \ %endif --enable-bind-now \ --enable-experimental-malloc \ @@ -1006,7 +983,6 @@ AWK="gawk" \ --enable-kernel="%{min_kernel}" \ --enable-nss-crypt%{!?with_nss_crypt:=no} \ --enable-obsolete-nsl \ - --enable-obsolete-rpc \ --enable-profile \ --enable-stack-protector=strong \ --enable-stackguard-randomization \ @@ -1074,7 +1050,6 @@ PICFILES="libc_pic.a libc.map resolv/libresolv_pic.a" install -p $PICFILES $RPM_BUILD_ROOT%{_libdir} -install -p elf/soinit.os $RPM_BUILD_ROOT%{_libdir}/soinit.o install -p elf/sofini.os $RPM_BUILD_ROOT%{_libdir}/sofini.o # Include %{_libdir}/gconv/gconv-modules.cache @@ -1089,11 +1064,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 crypt dl \ +for l in BrokenLocale anl %{?with_crypt:crypt} dl \ %ifarch %{x8664} x32 mvec \ %endif - nsl resolv rt thread_db util; do + resolv rt thread_db util; 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 @@ -1169,14 +1144,15 @@ done # guc (gtk-vnc) # haw (iso-codes, stellarium) # hrx (stellarium) -# ie (xfce) +# ie (xfce, cinnamon) # ilo (kudzu, libosinfo, libreport) # io (alacarte, gtk+2, gnome, iso-codes) # jam (iso-codes) -# jv (avant-window-navigator, gmpc, kdesudo, mate) +# jv (avant-window-navigator, gmpc, kdesudo, mate, cinnamon) # ki (iso-codes) # kok@latin (inkscape) # kmr (vlc) +# ksw (cinnamon) # ku_IQ (mate) # kv (iso-codes) # kw@kkcor, kw@uccor (libosinfo - currently empty) - add as supported variants when non-empty? @@ -1186,12 +1162,14 @@ done # mus (bluez-gnome) # na (iso-codes) # nah (iso-codes, mate) +# nap (cinnamon) # nqo (mate) # nv (iso-codes) # pi (iso-codes) # pms (deluge, mate-tweak) +# rue (cinnamon) # sat@deva[nagari] (inkscape) -# sco (gnomad2, mate, picard, stellarium) +# sco (gnomad2, mate, picard, stellarium, cinnamon) # son (gtkspell3, iso-codes) # su (terminator) # swg (sim) @@ -1241,6 +1219,7 @@ done # nl=nl_NL # om=om_ET # or=or_IN +# os=os_RU # pa=pa_IN # pt=pt_PT # quz=quz_PE @@ -1270,12 +1249,12 @@ done for i in aa aa@saaho af ak am an ang anp ar ar_TN as ast az az_IR \ be@latin be@tarask bem bg bho bn bn_IN bo br brx bs byn \ ca@valencia ce chr ckb cmn crh csb cv cy de_AT de_CH doi dv dz \ - en en@boldquot en@quot en@shaw en_AU en_CA en_NZ en_US eo \ + en en@boldquot en@quot en@shaw en_AU en_CA en_IE en_NZ en_US en_ZA eo \ es_AR es_CL es_CO es_CR es_DO es_EC es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_SV es_UY es_VE \ et eu fa ff fil fo fr_BE fr_CA fr_CH fur fy ga gd gez gu gv \ ha he hi hne ht hsb hy ia id ig ik is it_CH iu \ ka kab kg kk kl km kn kok ks ks@devanagari ku kw ky la lb lg li ln lo lt lv \ - mai mg mhr mi mjw mk ml mn mni mr ms mt my nds ne nl_BE nn nr nso oc om or \ + mai mg mhr mi mjw mk ml mn mni mr ms mt my nds ne nl_BE nn nr nso oc om or os \ pa pap ps pt ps quz rm ro \ sa sat sc sd sd@devanagari se shn si sid sl so sq \ sr sr@Latn sr@ije sr@ijekavian sr@ijekavianlatin sr@latin ss st sw szl \ @@ -1493,7 +1472,6 @@ fi %attr(755,root,root) %{_bindir}/getent %attr(755,root,root) %{_bindir}/iconv %attr(755,root,root) %{_bindir}/locale -%attr(755,root,root) %{_bindir}/rpcgen %attr(755,root,root) %{_sbindir}/zdump %attr(755,root,root) %{_sbindir}/zic @@ -1507,7 +1485,6 @@ fi %{_mandir}/man1/getent.1* %{_mandir}/man1/iconv.1* %{_mandir}/man1/locale.1* -%{_mandir}/man1/rpcgen.1* %{_mandir}/man5/gai.conf.5* %{_mandir}/man5/locale.5* %{_mandir}/man5/nss.5* @@ -1614,7 +1591,6 @@ fi %lang(ja) %{_mandir}/ja/man1/getent.1* %lang(ja) %{_mandir}/ja/man1/iconv.1* %lang(ja) %{_mandir}/ja/man1/locale.1* -%lang(ja) %{_mandir}/ja/man1/rpcgen.1* %lang(ja) %{_mandir}/ja/man5/gai.conf.5* %lang(ja) %{_mandir}/ja/man5/locale.5* %lang(ja) %{_mandir}/ja/man5/nss.5* @@ -1681,7 +1657,6 @@ fi %lang(ru) %{_mandir}/ru/man1/getent.1* %lang(ru) %{_mandir}/ru/man1/iconv.1* %lang(ru) %{_mandir}/ru/man1/locale.1* -%lang(ru) %{_mandir}/ru/man1/rpcgen.1* %lang(ru) %{_mandir}/ru/man5/locale.5* %lang(ru) %{_mandir}/ru/man5/nsswitch.conf.5* %lang(ru) %{_mandir}/ru/man5/rpc.5* @@ -1756,6 +1731,7 @@ fi %lang(zh_CN) %{_mandir}/zh_CN/man1/ldd.1* %lang(zh_TW) %{_mandir}/zh_TW/man1/ldd.1* +%if %{with crypt} %files libcrypt %defattr(644,root,root,755) %attr(755,root,root) /%{_lib}/libcrypt-%{core_version}.so @@ -1764,6 +1740,7 @@ fi %else %attr(755,root,root) %ghost /%{_lib}/libcrypt.so.1 %endif +%endif %files ld %defattr(644,root,root,755) @@ -1787,7 +1764,11 @@ fi %ifarch ppc64 s390x %attr(755,root,root) /%{_lib}/ld64.so.1 %endif -%ifnarch %{ix86} sparc sparcv9 sparc64 alpha sh ia64 %{x8664} x32 ppc64 s390x %{arm} +%ifarch aarch64 +%attr(755,root,root) /lib/ld-linux-aarch64.so.1 +%attr(755,root,root) /%{_lib}/ld-linux-aarch64.so.1 +%endif +%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) /sbin/ldconfig @@ -1839,16 +1820,6 @@ fi %attr(755,root,root) /%{_lib}/libnss_hesiod-%{core_version}.so %attr(755,root,root) /%{_lib}/libnss_hesiod.so.2 -%files -n nss_nis -%defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/libnss_nis-%{core_version}.so -%attr(755,root,root) /%{_lib}/libnss_nis.so.2 - -%files -n nss_nisplus -%defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/libnss_nisplus-%{core_version}.so -%attr(755,root,root) /%{_lib}/libnss_nisplus.so.2 - %if %{with memusage} %files memusage %defattr(644,root,root,755) @@ -1865,13 +1836,12 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libBrokenLocale.so %attr(755,root,root) %{_libdir}/libanl.so -%attr(755,root,root) %{_libdir}/libcrypt.so +%{?with_crypt:%attr(755,root,root) %{_libdir}/libcrypt.so} %attr(755,root,root) %{_libdir}/libdl.so %attr(755,root,root) %{_libdir}/libm.so %ifarch %{x8664} x32 %attr(755,root,root) %{_libdir}/libmvec.so %endif -%attr(755,root,root) %{_libdir}/libnsl.so %attr(755,root,root) %{_libdir}/libpcprofile.so %attr(755,root,root) %{_libdir}/libresolv.so %attr(755,root,root) %{_libdir}/librt.so @@ -1889,8 +1859,7 @@ fi %ifarch alpha ppc sparc %{_libdir}/libnldbl_nonshared.a %endif -%{_libdir}/librpcsvc.a -%ifarch %{ix86} %{x8664} x32 ppc ppc64 s390 s390x sparc sparcv9 sparc64 +%ifarch %{ix86} %{x8664} x32 ppc ppc64 s390 s390x sparc sparcv9 sparc64 aarch64 # ABI-dependent headers %{_includedir}/gnu/stubs-*.h %endif @@ -1922,7 +1891,6 @@ fi %{_includedir}/nfs %{_includedir}/protocols %{_includedir}/rpc -%{_includedir}/rpcsvc %{_includedir}/scsi %{_includedir}/sys @@ -1934,18 +1902,16 @@ fi %attr(755,root,root) %{_bindir}/sprof %attr(755,root,root) %{_bindir}/xtrace %{_mandir}/man1/mtrace.1* +%{_mandir}/man1/sprof.1* %lang(ja) %{_mandir}/ja/man1/mtrace.1* +%lang(ja) %{_mandir}/ja/man1/sprof.1* +%lang(ru) %{_mandir}/ru/man1/sprof.1* %files devel-doc %defattr(644,root,root,755) %doc documentation/* %{_infodir}/libc.info* -%{_mandir}/man1/sprof.1* -# just a link to getcwd.3 -%{_mandir}/man2/getcwd.2* -# just a link to killpg.3 -%{_mandir}/man2/killpg.2* %{_mandir}/man3/* %{_mandir}/man7/aio.7* %{_mandir}/man7/attributes.7* @@ -1962,13 +1928,9 @@ fi %{_mandir}/man7/sem_overview.7* %{_mandir}/man7/shm_overview.7* %lang(cs) %{_mandir}/cs/man3/* -%lang(de) %{_mandir}/de/man2/killpg.2* %lang(de) %{_mandir}/de/man3/* -%lang(es) %{_mandir}/es/man2/killpg.2* %lang(es) %{_mandir}/es/man3/* %lang(es) %{_mandir}/es/man7/glob.7* -%lang(fr) %{_mandir}/fr/man2/getcwd.2* -%lang(fr) %{_mandir}/fr/man2/killpg.2* %lang(fr) %{_mandir}/fr/man3/* %lang(fr) %{_mandir}/fr/man7/aio.7* %lang(fr) %{_mandir}/fr/man7/complex.7* @@ -1985,9 +1947,6 @@ fi %lang(hu) %{_mandir}/hu/man3/* %lang(it) %{_mandir}/it/man3/* %lang(it) %{_mandir}/it/man7/glob.7* -%lang(ja) %{_mandir}/ja/man1/sprof.1* -%lang(ja) %{_mandir}/ja/man2/getcwd.2* -%lang(ja) %{_mandir}/ja/man2/killpg.2* %lang(ja) %{_mandir}/ja/man3/* %lang(ja) %{_mandir}/ja/man7/aio.7* %lang(ja) %{_mandir}/ja/man7/complex.7* @@ -2000,16 +1959,11 @@ fi %lang(ja) %{_mandir}/ja/man7/pthreads.7* %lang(ja) %{_mandir}/ja/man7/sem_overview.7* %lang(ja) %{_mandir}/ja/man7/shm_overview.7* -%lang(ko) %{_mandir}/ko/man2/killpg.2* %lang(ko) %{_mandir}/ko/man3/* %lang(nl) %{_mandir}/nl/man3/* -%lang(pl) %{_mandir}/pl/man2/killpg.2* %lang(pl) %{_mandir}/pl/man3/* -%lang(pt) %{_mandir}/pt/man2/killpg.2* %lang(pt) %{_mandir}/pt/man3/* %lang(pt) %{_mandir}/pt/man7/glob.7* -%lang(ru) %{_mandir}/ru/man1/sprof.1* -%lang(ru) %{_mandir}/ru/man2/killpg.2* %lang(ru) %{_mandir}/ru/man3/* %lang(ru) %{_mandir}/ru/man7/glob.7* %lang(tr) %{_mandir}/tr/man3/* @@ -2024,7 +1978,7 @@ fi %{_libdir}/libanl.a %{_libdir}/libBrokenLocale.a %{_libdir}/libc.a -%{_libdir}/libcrypt.a +%{?with_crypt:%{_libdir}/libcrypt.a} %{_libdir}/libdl.a %{_libdir}/libm.a %{_libdir}/libmcheck.a @@ -2032,7 +1986,6 @@ fi %{_libdir}/libm-%{core_version}.a %{_libdir}/libmvec.a %endif -%{_libdir}/libnsl.a %{_libdir}/libpthread.a %{_libdir}/libresolv.a %{_libdir}/librt.a @@ -2046,7 +1999,6 @@ fi %defattr(644,root,root,755) %{_libdir}/lib*_pic.a %{_libdir}/lib*.map -%{_libdir}/soinit.o %{_libdir}/sofini.o %files -n nscd