Hello community,
here is the log from the commit of package glibc for openSUSE:Factory checked
in at 2019-04-08 10:29:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glibc (Old)
and /work/SRC/openSUSE:Factory/.glibc.new.3908 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glibc"
Mon Apr 8 10:29:40 2019 rev:229 rq:691283 version:2.29
Changes:
--------
--- /work/SRC/openSUSE:Factory/glibc/glibc.changes 2019-03-12
09:43:41.263948934 +0100
+++ /work/SRC/openSUSE:Factory/.glibc.new.3908/glibc.changes 2019-04-08
10:29:45.119095768 +0200
@@ -1,0 +2,7 @@
+Wed Apr 3 14:56:02 UTC 2019 - Andreas Schwab <sch...@suse.de>
+
+- japanese-era-name-may-2019.patch: ja_JP locale: Add entry for the new
+ Japanese era (BZ #22964)
+- Replace glibc_post_upgrade with lua script
+
+-------------------------------------------------------------------
Old:
----
glibc_post_upgrade.c
New:
----
japanese-era-name-may-2019.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glibc.spec ++++++
--- /var/tmp/diff_new_pack.tpw3Lr/_old 2019-04-08 10:29:50.447102235 +0200
+++ /var/tmp/diff_new_pack.tpw3Lr/_new 2019-04-08 10:29:50.451102241 +0200
@@ -170,7 +170,6 @@
Source4: manpages.tar.bz2
Source5: nsswitch.conf
Source7: bindresvport.blacklist
-Source8: glibc_post_upgrade.c
Source9: glibc.rpmlintrc
Source10: baselibs.conf
# For systemd
@@ -285,6 +284,8 @@
Patch1006: add-new-Fortran-vector-math-header-file.patch
# PATCH-FIX-UPSTREAM regex: fix read overrun (CVE-2019-9169, BZ #24114)
Patch1007: regex-read-overrun.patch
+# PATCH-FIX-UPSTREAM ja_JP locale: Add entry for the new Japanese era (BZ
#22964)
+Patch1008: japanese-era-name-may-2019.patch
###
# Patches awaiting upstream approval
@@ -504,6 +505,7 @@
%patch1005 -p1
%patch1006 -p1
%patch1007 -p1
+%patch1008 -p1
%patch2000 -p1
%patch2004 -p1
@@ -718,39 +720,6 @@
make -C cc-base html
%endif
-#
-# Build glibc_post_upgrade binary
-#
-mkdir glibc-post-upgrade
-cat > glibc-post-upgrade/Makefile <<\EOF
-subdir := glibc-post-upgrade
-include ../Makeconfig
-vpath %.c $(dir %{SOURCE8})
-others = glibc_post_upgrade
-others-static = glibc_post_upgrade
-libof-glibc_post_upgrade = glibc_post_upgrade
-$(objpfx)glibc_post_upgrade: $(common-objpfx)elf/static-stubs.o
-CFLAGS-glibc_post_upgrade.o = \
- -Os -Wno-write-strings -DREMOVE_TLS_DIRS -DREMOVE_PPC_OPTIMIZE_POWER5 \
-%ifarch ppc ppc64
- %if !%{powerpc_optimize_cpu_power4}
- -DREMOVE_PPC_OPTIMIZE_POWER4 \
- %endif
- %if !%{powerpc_optimize_cpu_power6}
- -DREMOVE_PPC_OPTIMIZE_POWER6 \
- %endif
- %if !%{powerpc_optimize_cpu_power7}
- -DREMOVE_PPC_OPTIMIZE_POWER7 \
- %endif
- %if !%{powerpc_optimize_cpu_cell}
- -DREMOVE_PPC_OPTIMIZE_CELL \
- %endif
-%endif
- -DLIBDIR='"/%{_lib}"' -DGCONV_MODULES_DIR='"%{_libdir}/gconv"'
-include ../Rules
-EOF
-make -C cc-base subdirs=glibc-post-upgrade glibc-post-upgrade/others
-
%check
%if %{build_testsuite}
# The testsuite will fail if asneeded is used
@@ -891,8 +860,6 @@
# Miscelanna:
-install -m 0700 cc-base/glibc-post-upgrade/glibc_post_upgrade
%{buildroot}%{_sbindir}
-
install -m 644 %{SOURCE7} %{buildroot}/etc
install -m 644 %{SOURCE5} %{buildroot}/etc
install -m 644 posix/gai.conf %{buildroot}/etc
@@ -1033,7 +1000,67 @@
%if %{build_main}
-%post -p %{_sbindir}/glibc_post_upgrade
+%post -p <lua>
+function exec(path, ...)
+ local pid = posix.fork()
+ if pid == 0 then
+ posix.exec(path, ...)
+ io.write(path, ": exec failed: ", posix.errno(), "\n")
+ os.exit(1)
+ end
+ if not pid then
+ error(path .. ": fork failed: " .. posix.errno() .. "\n")
+ end
+ posix.wait(pid)
+end
+
+-- First, get rid of platform-optimized libraries. We remove any we have
+-- ever built, since otherwise we might end up using some old leftover
+-- libraries when new ones aren't installed in their place anymore.
+libraries = { "libc.so.6", "libc.so.6.1", "libm.so.6", "libm.so.6.1",
+ "librt.so.1", "libpthread.so.0", "libthread_db.so.1" }
+remove_dirs = {
+%ifarch i586
+ "/%{_lib}/i686/",
+%endif
+%ifarch ppc ppc64
+%if !%{powerpc_optimize_cpu_power4}
+ "/%{_lib}/power4/", "/%{_lib}/ppc970/",
+%endif
+ "/%{_lib}/power5/", "/%{_lib}/power5+/",
+%if !%{powerpc_optimize_cpu_power6}
+ "/%{_lib}/power6/", "/%{_lib}/power6x/",
+%endif
+%if !%{powerpc_optimize_cpu_power7}
+ "/%{_lib}/power7/",
+%endif
+%if !%{powerpc_optimize_cpu_cell}
+ "/%{_lib}/ppc-cell-be/",
+%endif
+%endif
+ "/%{_lib}/tls/"
+}
+for i, remove_dir in ipairs(remove_dirs) do
+ for j, library in ipairs(libraries) do
+ local file = remove_dir .. library
+ -- This file could be a symlink to library-%{version}.so, so check
+ -- this and don't remove only the link, but also the library itself.
+ local link = posix.readlink(file)
+ if link then
+ if link:sub(1, 1) ~= "/" then link = remove_dir .. link end
+ os.remove(link)
+ end
+ os.remove(file)
+ end
+end
+if posix.access("/sbin/ldconfig", "x") then
+ exec("/sbin/ldconfig", "-X")
+end
+if posix.utime("%{_libdir}/gconv/gconv-modules.cache") then
+ exec("/usr/sbin/iconvconfig", "-o", "%{_libdir}/gconv/gconv-modules.cache",
+ "--nostdlib", "%{_libdir}/gconv")
+end
+
%postun -p /sbin/ldconfig
%post locale-base
@@ -1214,7 +1241,6 @@
%{_bindir}/localedef
%dir %attr(0755,root,root) %{_libexecdir}/getconf
%{_libexecdir}/getconf/*
-%{_sbindir}/glibc_post_upgrade
%{_sbindir}/iconvconfig
%files locale-base -f libc.lang
++++++ japanese-era-name-may-2019.patch ++++++
2019-04-02 TAMUKI Shoichi <tam...@linet.gr.jp>
[BZ #22964]
* localedata/locales/ja_JP (LC_TIME): Add entry for the new Japanese
era.
Index: glibc-2.29/localedata/locales/ja_JP
===================================================================
--- glibc-2.29.orig/localedata/locales/ja_JP
+++ glibc-2.29/localedata/locales/ja_JP
@@ -14946,7 +14946,9 @@ am_pm "<U5348><U524D>";"<U5348><U5F8C>"
t_fmt_ampm "%p%I<U6642>%M<U5206>%S<U79D2>"
-era "+:2:1990//01//01:+*:<U5E73><U6210>:%EC%Ey<U5E74>";/
+era "+:2:2020//01//01:+*:<U4EE4><U548C>:%EC%Ey<U5E74>";/
+ "+:1:2019//05//01:2019//12//31:<U4EE4><U548C>:%EC<U5143><U5E74>";/
+ "+:2:1990//01//01:2019//04//30:<U5E73><U6210>:%EC%Ey<U5E74>";/
"+:1:1989//01//08:1989//12//31:<U5E73><U6210>:%EC<U5143><U5E74>";/
"+:2:1927//01//01:1989//01//07:<U662D><U548C>:%EC%Ey<U5E74>";/
"+:1:1926//12//25:1926//12//31:<U662D><U548C>:%EC<U5143><U5E74>";/
