From 144a6e6463f1791bf00028d7d3ed0c49700a5a8c015ecc3e9968e3f1beeb6f33 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 18 Apr 2019 13:35:43 +0000 Subject: [PATCH] Accepting request 695596 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/695596 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nss-mdns?expand=0&rev=17 --- nss-mdns-0.10.tar.gz | 3 --- nss-mdns-0.14.1.tar.gz | 3 +++ nss-mdns.changes | 54 +++++++++++++++++++++++++++++++++++++++++- nss-mdns.spec | 28 ++++++++++++---------- unaligned.diff | 11 --------- 5 files changed, 72 insertions(+), 27 deletions(-) delete mode 100644 nss-mdns-0.10.tar.gz create mode 100644 nss-mdns-0.14.1.tar.gz delete mode 100644 unaligned.diff diff --git a/nss-mdns-0.10.tar.gz b/nss-mdns-0.10.tar.gz deleted file mode 100644 index 1c266e7..0000000 --- a/nss-mdns-0.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e683c2e7c3921814706d62fbbd3e9cbf493a75fa00255e0e715508d8134fa6d -size 353130 diff --git a/nss-mdns-0.14.1.tar.gz b/nss-mdns-0.14.1.tar.gz new file mode 100644 index 0000000..732ad22 --- /dev/null +++ b/nss-mdns-0.14.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2094101b735cade45048764ea594bdae2bfa9399837f3c852a5b264416e9c8c +size 369978 diff --git a/nss-mdns.changes b/nss-mdns.changes index 7ee032d..aae4ffc 100644 --- a/nss-mdns.changes +++ b/nss-mdns.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Thu Mar 28 20:11:00 UTC 2019 - Bjørn Lie + +- Update to version 0.14.1: + + No code changes. + + Fix unit tests to properly work on s390x. +- Changes from version 0.14.0: + + Fix -Wformat-truncation problem during reading of the allow + file. +- Changes from version 0.13.2: + + No code changes. + + Change how ./configure --enable/disable-tests works: + - --enable-tests: tests are enabled and will fail if + dependencies are not found. + - --disable-tests: tests are not enabled and will not be built + even if dependencies are found. + - no flag given: tests are conditionally enabled if + dependencies are found. +- Changes from version 0.13.1: + + Very minor code changes (should result in no binary changes). + + Reformat source to 80 columns. + + Improve configure options to allow disabling tests even if the + testing libraries are present. + + Automake is now non-recursive. + + Hardcoded paths are now exposed as configure variables. +- Changes from version 0.13: + + Fix an old memory leak in reverse lookup. + + Fix the broken workaround for nscd segfaults (not all clients + would see all results). + + Simplify buffer management. + + More unit tests, more cleanups, and fewer gotos. +- Changes from version 0.12: + + Fix segfault when using nscd. + + Remove untested, unmaintained BSD support (please help out if + you would like BSD support to return!). +- Changes from version 0.11: + + Moved to new GitHub location, docs migrated to markdown. + + The long-deprecated LEGACY mode is removed. + + The long-deprecated HONOUR_SEARCH_DOMAINS option is removed. + + Unit tests are now included, with make check. + + nss-mdns now implements standard heuristics for detecting + .local unicast resolution and will automatically disable + resolution when a local server responds to .local requests. + + _nss_mdns_gethostbyname3_r and _nss_mdns_gethostbyname4_r are + now implemented. + + Full dual-stack IPv4/IPv6 support is implemented. +- Run spec-cleaner, modernize spec. +- Update URL and Source to new upstream home. +- Drop unaligned.diff: Fixed upstream. +- Add pkgconfig(check) BuildRequires and make_check macro, run + buildtime tests. + ------------------------------------------------------------------- Wed Feb 28 16:37:57 UTC 2018 - dimstar@opensuse.org @@ -11,7 +63,7 @@ Sat Oct 18 20:14:00 UTC 2014 - Led ------------------------------------------------------------------- Mon Apr 15 13:34:44 UTC 2013 - idonmez@suse.com -- Add Source URL, see https://en.opensuse.org/SourceUrls +- Add Source URL, see https://en.opensuse.org/SourceUrls ------------------------------------------------------------------- Wed Jul 11 13:37:10 CEST 2012 - vuntz@opensuse.org diff --git a/nss-mdns.spec b/nss-mdns.spec index 6a87b9c..0dfb70f 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ # # spec file for package nss-mdns # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,23 +12,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: nss-mdns -# lynx is not needed, text version of README is already present -#BuildRequires: lynx -Version: 0.10 +Version: 0.14.1 Release: 0 Summary: Host Name Resolution Via Multicast DNS (Zeroconf) for glibc License: LGPL-2.1-or-later Group: Productivity/Networking/DNS/Utilities -URL: http://0pointer.de/lennart/projects/nss-mdns/ -Source: http://0pointer.de/lennart/projects/nss-mdns/%{name}-%{version}.tar.gz +URL: https://github.com/lathiat/nss-mdns +Source0: https://github.com/lathiat/nss-mdns/releases/download/v%{version}/nss-mdns-%{version}.tar.gz Source1: nss-mdns-config Source2: baselibs.conf -Patch0: unaligned.diff +BuildRequires: pkgconfig +BuildRequires: pkgconfig(check) Requires: avahi # FIXME: use proper Requires(pre/post/preun/...) PreReq: grep @@ -50,16 +49,21 @@ By default, nss-mdns tries to contact a running avahi-daemon to resolve hostnames and addresses and makes use of its superior record cacheing. %prep -%setup -q -%patch0 +%autosetup -p1 %build -%configure --libdir=/%{_lib} +%configure \ + --libdir=/%{_lib} \ + %{nil} +%make_build %install %make_install install -D -m0755 %{SOURCE1} %{buildroot}%{_sbindir}/nss-mdns-config +%check +make %{?_smp_mflags} check || (cat ./test-suite.log; false) + %post /sbin/ldconfig if [ "$1" -eq 1 ] ; then @@ -77,7 +81,7 @@ fi %files %license LICENSE -%doc README doc/*.html doc/*.css +%doc README.md NEWS.md ACKNOWLEDGEMENTS.md %{_sbindir}/nss-mdns-config /%{_lib}/libnss_mdns.so.2 /%{_lib}/libnss_mdns_minimal.so.2 diff --git a/unaligned.diff b/unaligned.diff deleted file mode 100644 index 455a9d1..0000000 --- a/unaligned.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/nss.c -+++ src/nss.c -@@ -620,7 +620,7 @@ - #ifdef MDNS_MINIMAL - - /* Only query for 169.254.0.0/16 IPv4 in minimal mode */ -- if ((af == AF_INET && ((ntohl(*(const uint32_t*) addr) & 0xFFFF0000UL) != 0xA9FE0000UL)) || -+ if ((af == AF_INET && !(((const uint8_t*) addr)[0] == 169 && (((const uint8_t*) addr)[1] == 254))) || - (af == AF_INET6 && !(((const uint8_t*) addr)[0] == 0xFE && (((const uint8_t*) addr)[1] >> 6) == 2))) { - - *errnop = EINVAL;