diff --git a/glibc-rh1070416.patch b/glibc-rh1070416.patch deleted file mode 100644 index 0975e0f..0000000 --- a/glibc-rh1070416.patch +++ /dev/null @@ -1,38 +0,0 @@ -Short description: Add syslog.target dependency. -Author(s): Fedora glibc team -Origin: PATCH -Bug-Fedora: #1070416 -Upstream status: not-needed - -Fedora-specific changes to the nscd.service file. -See also: glibc-nscd-sysconfig.patch. - ---- a/nscd/nscd.service -+++ b/nscd/nscd.service -@@ -2,6 +2,7 @@ - - [Unit] - Description=Name Service Cache Daemon -+After=syslog.target - - [Service] - Type=forking -@@ -17,3 +18,4 @@ - - [Install] - WantedBy=multi-user.target -+Also=nscd.socket -diff --git a/nscd/nscd.socket b/nscd/nscd.socket -new file mode 100644 -index 0000000..7e512d5 ---- /dev/null -+++ b/nscd/nscd.socket -@@ -0,0 +1,8 @@ -+[Unit] -+Description=Name Service Cache Daemon Socket -+ -+[Socket] -+ListenDatagram=/var/run/nscd/socket -+ -+[Install] -+WantedBy=sockets.target diff --git a/glibc.spec b/glibc.spec index 1422638..5410d5f 100644 --- a/glibc.spec +++ b/glibc.spec @@ -152,7 +152,7 @@ end} Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 9%{?dist} +Release: 10%{?dist} # In general, GPLv2+ is used by programs, LGPLv2+ is used for # libraries. @@ -220,7 +220,6 @@ Patch4: glibc-fedora-linux-tcsetattr.patch Patch8: glibc-fedora-manual-dircategory.patch Patch9: glibc-rh827510.patch Patch13: glibc-fedora-localedata-rh61908.patch -Patch15: glibc-rh1070416.patch Patch17: glibc-cs-path.patch Patch23: glibc-python3.patch Patch30: glibc-deprecated-selinux-makedb.patch @@ -2176,6 +2175,9 @@ update_gconv_modules_cache () %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %changelog +* Wed Mar 09 2022 Arjun Shankar - 2.35.9000-10 +- Drop glibc-rh1070416.patch; nscd related, thus no longer relevant. + * Tue Mar 08 2022 Arjun Shankar - 2.35.9000-9 - Auto-sync with upstream branch master, commit 6de743a4e31a94e3d022e64a90c9082290a5a573: