|
|
@@ -24,6 +24,7 @@
|
|
|
%define buildpower6 0
|
|
|
%endif
|
|
|
%define biarcharches %{ix86} x86_64 ppc ppc64 s390 s390x
|
|
|
+%global _enable_debug_packages 1
|
|
|
%define debuginfocommonarches %{biarcharches} alpha alphaev6
|
|
|
%define multiarcharches ppc ppc64 %{ix86} x86_64 %{sparc}
|
|
|
# Remove -s to get verbose output.
|
|
|
@@ -33,7 +34,7 @@ Summary: The GNU libc libraries
|
|
|
Summary(ja): GNU libc ライブラリ
|
|
|
Name: glibc
|
|
|
Version: %{glibcversion}
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
|
|
|
# Things that are linked directly into dynamically linked programs
|
|
|
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
|
|
|
@@ -57,7 +58,7 @@ Source11: SUPPORTED
|
|
|
Source1000: rpm-old-changelog.txt
|
|
|
|
|
|
# patched form upstream
|
|
|
-Patch0: glibc-2.31-20200319.patch
|
|
|
+Patch0: glibc-2.31-20200508.patch
|
|
|
|
|
|
# patches from Fedora
|
|
|
Patch1: glibc-post_upgrade.patch
|
|
|
@@ -389,7 +390,15 @@ Summary(ja): ネームサービスキャッシングデーモン (nscd)
|
|
|
Group: System Environment/Daemons
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Requires: audit-libs >= 1.1.3
|
|
|
-Requires(pre): /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel, sh-utils
|
|
|
+Requires(pre): /usr/sbin/useradd, coreutils
|
|
|
+Requires(postun): /usr/sbin/userdel
|
|
|
+%if %{with systemd}
|
|
|
+Requires(post): systemd
|
|
|
+Requires(preun): systemd
|
|
|
+Requires(postun): systemd
|
|
|
+%else
|
|
|
+Requires(pre): /sbin/chkconfig
|
|
|
+%endif
|
|
|
|
|
|
%description -n nscd
|
|
|
Nscd caches name service lookups and can dramatically improve
|
|
|
@@ -833,8 +842,8 @@ install -m 644 nscd/nscd.conf %{glibc_sysroot}/etc
|
|
|
%if %{with systemd}
|
|
|
mkdir -p %{glibc_sysroot}%{_tmpfilesdir}
|
|
|
install -m 644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}
|
|
|
-mkdir -p %{glibc_sysroot}/lib/systemd/system
|
|
|
-install -m 644 nscd/nscd.service nscd/nscd.socket %{glibc_sysroot}/lib/systemd/system
|
|
|
+mkdir -p %{glibc_sysroot}%{_unitdir}
|
|
|
+install -m 644 nscd/nscd.service nscd/nscd.socket %{glibc_sysroot}%{_unitdir}/
|
|
|
%else
|
|
|
mkdir -p %{glibc_sysroot}/etc/rc.d/init.d
|
|
|
install -m 755 nscd/nscd.init %{glibc_sysroot}/etc/rc.d/init.d/nscd
|
|
|
@@ -1159,6 +1168,11 @@ for module in compat files db dns hesiod; do
|
|
|
done
|
|
|
grep -e "libmemusage.so" -e "libpcprofile.so" master.filelist >> glibc.filelist
|
|
|
|
|
|
+cat glibc.filelist \
|
|
|
+ | grep -v \
|
|
|
+ -e '/sbin/ldconfig' \
|
|
|
+ > compat32-glibc.filelist
|
|
|
+
|
|
|
###############################################################################
|
|
|
# glibc-devel
|
|
|
###############################################################################
|
|
|
@@ -1541,6 +1555,7 @@ if posix.access("/etc/ld.so.cache") then
|
|
|
end
|
|
|
end
|
|
|
|
|
|
+%if %{without systemd}
|
|
|
%triggerin common -p <lua> -- tzdata
|
|
|
function update (filename, new_data)
|
|
|
local fd = io.open(filename)
|
|
|
@@ -1579,6 +1594,7 @@ fd:close()
|
|
|
if not data then return end
|
|
|
update("/etc/localtime", data)
|
|
|
update("/var/spool/postfix/etc/localtime", data)
|
|
|
+%endif
|
|
|
|
|
|
%post common-extra -p <lua>
|
|
|
-- cp -f /usr/lib/locale/locale-archive-extra.tmpl /usr/lib/locale/locale-archive.tmpl
|
|
|
@@ -1645,21 +1661,33 @@ getent passwd nscd >/dev/null ||
|
|
|
-c "NSCD Daemon" -u 28 -g nscd nscd
|
|
|
|
|
|
%post -n nscd
|
|
|
+%if %{with systemd}
|
|
|
+%systemd_post nscd.service
|
|
|
+%else
|
|
|
/sbin/chkconfig --add nscd
|
|
|
+%endif
|
|
|
|
|
|
%preun -n nscd
|
|
|
-if [ $1 = 0 ] ; then
|
|
|
+%if %{with systemd}
|
|
|
+%systemd_preun nscd.service
|
|
|
+%else
|
|
|
+if [ $1 = 0 -o -x /bin/systemctl ] ; then
|
|
|
/sbin/service nscd stop > /dev/null 2>&1
|
|
|
/sbin/chkconfig --del nscd
|
|
|
fi
|
|
|
+%endif
|
|
|
|
|
|
%postun -n nscd
|
|
|
if [ $1 = 0 ] ; then
|
|
|
/usr/sbin/userdel nscd > /dev/null 2>&1 || :
|
|
|
fi
|
|
|
+%if %{with systemd}
|
|
|
+%systemd_postun_with_restart nscd.service
|
|
|
+%else
|
|
|
if [ "$1" -ge "1" ]; then
|
|
|
service nscd condrestart > /dev/null 2>&1 || :
|
|
|
fi
|
|
|
+%endif
|
|
|
|
|
|
%if %{xenpackage}
|
|
|
%post xen -p /sbin/ldconfig
|
|
|
@@ -1672,9 +1700,12 @@ rm -f *.filelist*
|
|
|
|
|
|
%files -f glibc.filelist
|
|
|
%defattr(-,root,root)
|
|
|
+/sbin/ldconfig
|
|
|
/%{_lib}/libnsl.so.*
|
|
|
%dir %{_prefix}/%{_lib}/audit
|
|
|
-%if %{without systemd}
|
|
|
+%if %{with systemd}
|
|
|
+%exclude /etc/localtime
|
|
|
+%else
|
|
|
%verify(not md5 size mtime) %config(noreplace) /etc/localtime
|
|
|
%endif
|
|
|
%verify(not md5 size mtime) %config(noreplace) /etc/nsswitch.conf
|
|
|
@@ -1694,7 +1725,7 @@ rm -f *.filelist*
|
|
|
%license COPYING COPYING.LIB LICENSES
|
|
|
|
|
|
%if %{build_compat32}
|
|
|
-%files -f glibc.filelist -n compat32-%{name}
|
|
|
+%files -f compat32-glibc.filelist -n compat32-%{name}
|
|
|
/%{_lib}/libnsl.so.*
|
|
|
%endif
|
|
|
|
|
|
@@ -1750,7 +1781,10 @@ rm -f *.filelist*
|
|
|
%files -f nscd.filelist -n nscd
|
|
|
%defattr(-,root,root)
|
|
|
%config(noreplace) /etc/nscd.conf
|
|
|
-%if %{without systemd}
|
|
|
+%if %{with systemd}
|
|
|
+%{_unitdir}/*
|
|
|
+%{_tmpfilesdir}/*
|
|
|
+%else
|
|
|
%config /etc/rc.d/init.d/nscd
|
|
|
%endif
|
|
|
%dir %attr(0755,root,root) /var/run/nscd
|
|
|
@@ -1780,6 +1814,11 @@ rm -f *.filelist*
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Sat May 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.31-2
|
|
|
+- updated Patch0.
|
|
|
+- added systemd support (disabled as default).
|
|
|
+- dropped /sbin/ldconfig from compat32.
|
|
|
+
|
|
|
* Thu Mar 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.31-1
|
|
|
- updated to 2.31.
|
|
|
- updated Patch0.
|
tomop