Hello community, here is the log from the commit of package glibc for openSUSE:Factory checked in at 2012-11-26 18:54:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glibc (Old) and /work/SRC/openSUSE:Factory/.glibc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glibc", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/glibc/glibc.changes 2012-11-22 16:12:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.glibc.new/glibc.changes 2012-11-26 18:57:05.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Nov 24 13:48:40 UTC 2012 - [email protected] + +- Remove nscd init script, use systemd files. + +------------------------------------------------------------------- +Fri Nov 23 14:33:37 UTC 2012 - [email protected] + +- Fix getaddrinfo-ipv6-sanity.diff to apply again. + +------------------------------------------------------------------- Old: ---- nscd.init ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.Oi0vUb/_old 2012-11-26 18:57:46.000000000 +0100 +++ /var/tmp/diff_new_pack.Oi0vUb/_new 2012-11-26 18:57:46.000000000 +0100 @@ -33,6 +33,7 @@ BuildRequires: libselinux-devel BuildRequires: makeinfo BuildRequires: xz +BuildRequires: pkgconfig(systemd) %if %{with glibc_run_testsuite} BuildRequires: gcc-c++ BuildRequires: libstdc++-devel @@ -129,7 +130,6 @@ Source3: noversion.tar.bz2 Source4: manpages.tar.bz2 Source5: nsswitch.conf -Source6: nscd.init Source7: bindresvport.blacklist Source8: glibc_post_upgrade.c Source9: glibc.rpmlintrc @@ -315,12 +315,9 @@ Summary: Name Service Caching Daemon License: GPL-2.0+ Group: System/Daemons -Provides: aaa_base:/etc/init.d/nscd Provides: glibc:/usr/sbin/nscd Requires: glibc = %{version} -Requires(preun): %insserv_prereq -Requires(post): %insserv_prereq -Requires(postun): %insserv_prereq +%{?systemd_requires} %description -n nscd Nscd caches name service lookups and can dramatically improve @@ -466,7 +463,7 @@ %patch300 -p1 %patch301 -p1 -#%patch302 -p1 +%patch302 -p1 %patch304 -p1 %patch305 -p1 %patch306 -p1 @@ -901,8 +898,7 @@ cp nscd/nscd.conf %{buildroot}/etc mkdir -p %{buildroot}/etc/init.d -install -m 755 %{SOURCE6} %{buildroot}/etc/init.d/nscd -ln -sf /etc/init.d/nscd %{buildroot}/usr/sbin/rcnscd +ln -sf /sbin/service %{buildroot}/usr/sbin/rcnscd mkdir -p %{buildroot}/var/run/nscd touch %{buildroot}/var/run/nscd/{passwd,group,hosts} touch %{buildroot}/var/run/nscd/{socket,nscd.pid} @@ -1000,12 +996,14 @@ %postun info %install_info_delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz -%preun -n nscd +%pre -n nscd +%service_add_pre nscd.service -%stop_on_removal nscd +%preun -n nscd +%service_del_preun nscd.service %post -n nscd -%{insserv_force_if_yast nscd} +%service_add_post nscd.service mkdir -p /var/run/nscd # Previously we had nscd.socket, remove it test -x /usr/bin/systemctl && /usr/bin/systemctl stop nscd.socket || : @@ -1015,8 +1013,7 @@ exit 0 %postun -n nscd -%restart_on_update nscd -%insserv_cleanup +%service_del_postun nscd.service exit 0 ####################################################################### @@ -1243,7 +1240,6 @@ %files -n nscd %defattr(-,root,root) %config(noreplace) /etc/nscd.conf -%config /etc/init.d/nscd %{_sbindir}/nscd %{_sbindir}/rcnscd /lib/systemd/system/nscd.service ++++++ getaddrinfo-ipv6-sanity.diff ++++++ --- /var/tmp/diff_new_pack.Oi0vUb/_old 2012-11-26 18:57:46.000000000 +0100 +++ /var/tmp/diff_new_pack.Oi0vUb/_new 2012-11-26 18:57:46.000000000 +0100 @@ -1,8 +1,8 @@ -diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c -index 1a023f9..c8af8b9 100644 ---- a/sysdeps/posix/getaddrinfo.c -+++ b/sysdeps/posix/getaddrinfo.c -@@ -269,7 +269,7 @@ extern service_user *__nss_hosts_database attribute_hidden; +Index: glibc-2.16.90/sysdeps/posix/getaddrinfo.c +=================================================================== +--- glibc-2.16.90.orig/sysdeps/posix/getaddrinfo.c 2012-11-20 03:45:45.000000000 +0100 ++++ glibc-2.16.90/sysdeps/posix/getaddrinfo.c 2012-11-23 15:32:33.000000000 +0100 +@@ -269,7 +269,7 @@ extern service_user *__nss_hosts_databas static int gaih_inet (const char *name, const struct gaih_service *service, const struct addrinfo *req, struct addrinfo **pai, @@ -11,10 +11,10 @@ { const struct gaih_typeproto *tp = gaih_inet_typeproto; struct gaih_servtuple *st = (struct gaih_servtuple *) &nullserv; -@@ -832,7 +832,10 @@ gaih_inet (const char *name, const struct gaih_service *service, - no_data = 0; - nss_gethostbyname4_r fct4 - = __nss_lookup_function (nip, "gethostbyname4_r"); +@@ -839,7 +839,10 @@ gaih_inet (const char *name, const struc + if (req->ai_family == PF_UNSPEC) + fct4 = __nss_lookup_function (nip, "gethostbyname4_r"); + - if (fct4 != NULL) + /* If we don't want ipv6, don't use gethostbyname4_r, + as it's using T_UNSPEC to libc_res_nsearch, which always @@ -23,7 +23,7 @@ { int herrno; -@@ -935,7 +938,7 @@ gaih_inet (const char *name, const struct gaih_service *service, +@@ -942,7 +945,7 @@ gaih_inet (const char *name, const struc if (fct != NULL) { if (req->ai_family == AF_INET6 @@ -32,7 +32,7 @@ { gethosts (AF_INET6, struct in6_addr); no_inet6_data = no_data; -@@ -2418,7 +2421,11 @@ getaddrinfo (const char *name, const char *service, +@@ -2462,7 +2465,11 @@ getaddrinfo (const char *name, const cha if (hints->ai_family == AF_UNSPEC || hints->ai_family == AF_INET || hints->ai_family == AF_INET6) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
