From 004f7eafb3c3bc192dc062d79e46e1d807fab39b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 25 Jun 2007 19:22:39 +0000 Subject: [PATCH 01/54] Setup of module nss-mdns --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..77a85c9 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: nss-mdns +# $Id$ +NAME := nss-mdns +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From a6384edcad6a74d2efb7ca6e72218b7ab3119b24 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 25 Jun 2007 20:12:47 +0000 Subject: [PATCH 02/54] initial import --- .cvsignore | 1 + nss-mdns.spec | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 129 insertions(+) create mode 100644 nss-mdns.spec diff --git a/.cvsignore b/.cvsignore index e69de29..f711b42 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +nss-mdns-0.10.tar.gz diff --git a/nss-mdns.spec b/nss-mdns.spec new file mode 100644 index 0000000..a764495 --- /dev/null +++ b/nss-mdns.spec @@ -0,0 +1,127 @@ +Summary: glibc plugin for .local name resolution +Name: nss-mdns +Version: 0.10 +Release: 2%{?dist} +License: LGPL +URL: http://0pointer.de/lennart/projects/nss-mdns/ +Group: System Environment/Libraries +Source: http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRequires: glibc-devel +Requires(post): /bin/sh +Requires(preun): /bin/sh +Requires(post): perl +Requires(preun): perl +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Requires: avahi + +%description +nss-mdns is a plugin for the GNU Name Service Switch (NSS) functionality of +the GNU C Library (glibc) providing host name resolution via Multicast DNS +(aka Zeroconf, aka Apple Rendezvous, aka Apple Bonjour), effectively allowing +name resolution by common Unix/Linux programs in the ad-hoc mDNS domain .local. + +nss-mdns provides client functionality only, which means that you have to +run a mDNS responder daemon separately from nss-mdns if you want to register +the local host name via mDNS (e.g. Avahi). + +%prep +%setup -q + +%build +%configure --libdir=/%{_lib} --enable-avahi=yes --enable-legacy=no +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig +# Perl-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf +if [ -f /etc/nsswitch.conf ] ; then + perl -ibak -pe ' + sub insert { + my @bits = split(" ", shift); + + if (grep { $_ eq "mdns4_minimal" || $_ eq "mdns4" + || $_ eq "mdns6_minimal" || $_ eq "mdns6" + || $_ eq "mdns_minimal" || $_ eq "mdns" } @bits) { + return join " ", @bits; + } + + return join " ", map { + $_ eq "dns" ? ("mdns4_minimal", "[NOTFOUND=return]", $_) : $_ + } @bits; + } + + s/^(hosts:\s+)(.*)$/$1.insert($2)/e; + ' /etc/nsswitch.conf +fi + +%preun +# Perl-fu to remove mdns4_minimal from the hosts line of /etc/nsswitch.conf +if [ "$1" -eq 0 -a -f /etc/nsswitch.conf ] ; then + perl -ibak -pe ' + my @remove = ( + "mdns4_minimal [NOTFOUND=return]", + "mdns4_minimal", + "mdns4", + "mdns6_minimal [NOTFOUND=return]", + "mdns6_minimal", + "mdns6", + "mdns_minimal [NOTFOUND=return]", + "mdns_minimal", + "mdns", + ); + sub remove { + my $s = shift; + foreach my $bit (@remove) { + $s =~ s/\s+\Q$bit\E//g; + } + return $s; + } + s/^(hosts:\s+)(.*)$/$1.remove($2)/e; + ' /etc/nsswitch.conf +fi + +%postun -p /sbin/ldconfig + +%files +%defattr(-, root, root) +%doc README +/%{_lib}/* + +%changelog +* Fri Jun 22 2007 - Lennart Poettering - 0.10-2 +- Fix up post/preun/postun dependencies, add "avahi" to the dependencies, + include dist tag in Release field, use _lib directory instead of literal /lib. + +* Fri Jun 22 2007 - Lennart Poettering - 0.10-1 +- Update to 0.10, replace perl script by simpler and more robust versions, + stolen from the Debian package + +* Thu Jul 13 2006 - Bastien Nocera - 0.8-2 +- Make use of Ezio's perl scripts to enable and disable mdns4 lookups + automatically, patch from Pancrazio `Ezio' de Mauro + +* Tue May 02 2006 - Bastien Nocera - 0.8-1 +- Update to 0.8, disable legacy lookups so that all lookups are made through + the Avahi daemon + +* Mon Apr 24 2006 - Bastien Nocera - 0.7-2 +- Fix building on 64-bit platforms + +* Tue Dec 13 2005 - Bastien Nocera - 0.7-1 +- Update to 0.7, fix some rpmlint errors + +* Thu Nov 10 2005 - Bastien Nocera - 0.6-1 +- Update to 0.6 + +* Tue Dec 07 2004 - Bastien Nocera 0.1-1 +- Initial package, automatically adds and remove mdns4 as a hosts service + diff --git a/sources b/sources index e69de29..e3d8ea5 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +03938f17646efbb50aa70ba5f99f51d7 nss-mdns-0.10.tar.gz From 253fb85dbe514be581d27b5f6bb07d38f7475833 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Aug 2007 04:48:15 +0000 Subject: [PATCH 03/54] - Rebuild for selinux ppc32 issue. --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index a764495..300771b 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -97,6 +97,9 @@ fi /%{_lib}/* %changelog +* Wed Aug 29 2007 Fedora Release Engineering - 0.10-3 +- Rebuild for selinux ppc32 issue. + * Fri Jun 22 2007 - Lennart Poettering - 0.10-2 - Fix up post/preun/postun dependencies, add "avahi" to the dependencies, include dist tag in Release field, use _lib directory instead of literal /lib. From 221b7a6f241b8e7b2f4242dd0fe6596a51c7d5bd Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 10:59:33 +0000 Subject: [PATCH 04/54] - Autorebuild for GCC 4.3 --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 300771b..9eadb75 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -97,6 +97,9 @@ fi /%{_lib}/* %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.10-4 +- Autorebuild for GCC 4.3 + * Wed Aug 29 2007 Fedora Release Engineering - 0.10-3 - Rebuild for selinux ppc32 issue. From 017e453c13c66116458d734adc4710cb7f9e7ebe Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 11 Aug 2008 20:24:25 +0000 Subject: [PATCH 05/54] fix license tag --- nss-mdns.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 9eadb75..83f9dd7 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,8 +1,8 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 4%{?dist} -License: LGPL +Release: 5%{?dist} +License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries Source: http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-%{version}.tar.gz @@ -97,6 +97,9 @@ fi /%{_lib}/* %changelog +* Mon Aug 11 2008 Tom "spot" Callaway - 0.10-5 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.10-4 - Autorebuild for GCC 4.3 From 9e946e1fbde6b4f6fbb111102153887535c15587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Tue, 30 Sep 2008 14:01:32 +0000 Subject: [PATCH 06/54] - use sed instead of perl in scriptlets (#462996) - consequently, removed the Requires(..): perl - removed the reqires for things that are granted - a better BuildRoot --- nss-mdns.spec | 67 +++++++++++++++------------------------------------ 1 file changed, 20 insertions(+), 47 deletions(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 83f9dd7..c1172bc 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,19 +1,12 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries Source: http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: glibc-devel -Requires(post): /bin/sh -Requires(preun): /bin/sh -Requires(post): perl -Requires(preun): perl -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: avahi %description @@ -44,48 +37,19 @@ rm -rf $RPM_BUILD_ROOT /sbin/ldconfig # Perl-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf if [ -f /etc/nsswitch.conf ] ; then - perl -ibak -pe ' - sub insert { - my @bits = split(" ", shift); - - if (grep { $_ eq "mdns4_minimal" || $_ eq "mdns4" - || $_ eq "mdns6_minimal" || $_ eq "mdns6" - || $_ eq "mdns_minimal" || $_ eq "mdns" } @bits) { - return join " ", @bits; - } - - return join " ", map { - $_ eq "dns" ? ("mdns4_minimal", "[NOTFOUND=return]", $_) : $_ - } @bits; - } - - s/^(hosts:\s+)(.*)$/$1.insert($2)/e; - ' /etc/nsswitch.conf + sed -i.bak ' + /^hosts:/ !b + /\/ b + s/\([[:blank:]]\+\)dns\>/\1mdns4_minimal [NOTFOUND=return] dns/g + ' /etc/nsswitch.conf fi %preun -# Perl-fu to remove mdns4_minimal from the hosts line of /etc/nsswitch.conf +# sed-fu to remove mdns4_minimal from the hosts line of /etc/nsswitch.conf if [ "$1" -eq 0 -a -f /etc/nsswitch.conf ] ; then - perl -ibak -pe ' - my @remove = ( - "mdns4_minimal [NOTFOUND=return]", - "mdns4_minimal", - "mdns4", - "mdns6_minimal [NOTFOUND=return]", - "mdns6_minimal", - "mdns6", - "mdns_minimal [NOTFOUND=return]", - "mdns_minimal", - "mdns", - ); - sub remove { - my $s = shift; - foreach my $bit (@remove) { - $s =~ s/\s+\Q$bit\E//g; - } - return $s; - } - s/^(hosts:\s+)(.*)$/$1.remove($2)/e; + sed -i.bak ' + /^hosts:/ !b + s/[[:blank:]]\+mdns\(4\|6\)\?\(_minimal\( \[NOTFOUND=return\]\)\?\)\?//g ' /etc/nsswitch.conf fi @@ -97,6 +61,15 @@ fi /%{_lib}/* %changelog +* Tue Sep 30 2008 Stepan Kasal - 0.10-6 +- use sed instead of perl in %%post and %%preun (#462996), + fixing two bugs in the scriptlets: + 1) the backup file shall be nsswitch.conf.bak, not nsswitch.confbak + 2) the first element after host: shall be subject to removal, too +- consequently, removed the Requires(..): perl +- removed the reqires for things that are granted +- a better BuildRoot + * Mon Aug 11 2008 Tom "spot" Callaway - 0.10-5 - fix license tag From f3bd00cfddf92bbaadc620378af8cd42a1e509fb Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 06:10:56 +0000 Subject: [PATCH 07/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index c1172bc..3b50dd2 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -61,6 +61,9 @@ fi /%{_lib}/* %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Sep 30 2008 Stepan Kasal - 0.10-6 - use sed instead of perl in %%post and %%preun (#462996), fixing two bugs in the scriptlets: From 5f2870890a6475f7f2abb23fcbd383d284b9e442 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 19:35:17 +0000 Subject: [PATCH 08/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 3b50dd2..154227f 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -61,6 +61,9 @@ fi /%{_lib}/* %changelog +* Sat Jul 25 2009 Fedora Release Engineering - 0.10-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 0.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 53e20eb7e00ec4a5e0d5e94b2f164eb0d13cfb8b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:20:14 +0000 Subject: [PATCH 09/54] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 77a85c9..4cccfca 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := nss-mdns SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 6780bb741fdbeb6c25e04ff8803a9d7fdadb038b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 04:34:02 +0000 Subject: [PATCH 10/54] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4cccfca..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: nss-mdns -# $Id$ -NAME := nss-mdns -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From d8cb2d3488a701168bedc1e8af68fc50cb909b96 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 19:08:04 -0600 Subject: [PATCH 11/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 154227f..c76a001 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -61,6 +61,9 @@ fi /%{_lib}/* %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.10-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Jul 25 2009 Fedora Release Engineering - 0.10-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 98bae2d6b229485a44075bd62e3b3c117f53fb7a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 05:16:59 -0600 Subject: [PATCH 12/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index c76a001..27a00a3 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -61,6 +61,9 @@ fi /%{_lib}/* %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.10-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 0.10-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 2f749d879b4ff317077d4db3ef8a31e4ed81cdc5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 20 Jul 2012 00:22:19 -0500 Subject: [PATCH 13/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 27a00a3..3ee77a0 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -61,6 +61,9 @@ fi /%{_lib}/* %changelog +* Fri Jul 20 2012 Fedora Release Engineering - 0.10-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 0.10-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 31e8c8c814a215e05064cc9365e8f7d5b3f4782f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 02:46:17 -0600 Subject: [PATCH 14/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 3ee77a0..b620029 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -61,6 +61,9 @@ fi /%{_lib}/* %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0.10-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Fri Jul 20 2012 Fedora Release Engineering - 0.10-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 9480649ed1444a322009da5e9f007742c973bb00 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 09:31:21 -0500 Subject: [PATCH 15/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index b620029..fcdbd00 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 12%{?dist} +Release: 13%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -61,6 +61,9 @@ fi /%{_lib}/* %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.10-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 0.10-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 50f4113c8d63bfe2c61aadba139f738488989ab7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 10:10:51 -0500 Subject: [PATCH 16/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index fcdbd00..fd5d0c9 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 13%{?dist} +Release: 14%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -61,6 +61,9 @@ fi /%{_lib}/* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.10-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 0.10-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 53f836b03bfec1fb1e8e3be359c84ded602c7b81 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 12:22:22 +0000 Subject: [PATCH 17/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index fd5d0c9..1fa1671 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 14%{?dist} +Release: 15%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -61,6 +61,9 @@ fi /%{_lib}/* %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 0.10-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.10-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 2af6a8291d2dd40c51ae0d95ff2ae68523dcf9c6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 23:24:40 +0000 Subject: [PATCH 18/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 1fa1671..91fdaaa 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 15%{?dist} +Release: 16%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -61,6 +61,9 @@ fi /%{_lib}/* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.10-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Aug 17 2014 Fedora Release Engineering - 0.10-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 133c93c933ca582f9ac4b9a11463e38a508c23ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 10:57:12 +0000 Subject: [PATCH 19/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 91fdaaa..f65eff3 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 16%{?dist} +Release: 17%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -61,6 +61,9 @@ fi /%{_lib}/* %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.10-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 0.10-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 16b5e0047f1e5ac8cc669b5a30439c8c00cc399c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 00:21:55 +0000 Subject: [PATCH 20/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index f65eff3..5ea9e94 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 17%{?dist} +Release: 18%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -61,6 +61,9 @@ fi /%{_lib}/* %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.10-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 0.10-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 955e3b86c04737ebd9247532c15c498e53e43085 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 01:18:31 +0000 Subject: [PATCH 21/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 5ea9e94..b58f225 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 18%{?dist} +Release: 19%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -61,6 +61,9 @@ fi /%{_lib}/* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.10-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.10-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From b42c8990a6c77d57d8d295666a9f2dd3ef036cb4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 04:07:16 +0000 Subject: [PATCH 22/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index b58f225..bd36ec7 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 19%{?dist} +Release: 20%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -61,6 +61,9 @@ fi /%{_lib}/* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.10-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.10-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From a136cf774b036c2bf0d37f44617871912c155d24 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 08:28:49 +0000 Subject: [PATCH 23/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index bd36ec7..c2ebdfb 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,7 +1,7 @@ Summary: glibc plugin for .local name resolution Name: nss-mdns Version: 0.10 -Release: 20%{?dist} +Release: 21%{?dist} License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries @@ -61,6 +61,9 @@ fi /%{_lib}/* %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 0.10-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 0.10-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 1bd1259e3b73045b89df7e7edd752f5f881ea9fd Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:55:45 +0100 Subject: [PATCH 24/54] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- nss-mdns.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index c2ebdfb..09903ab 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -6,7 +6,6 @@ License: LGPLv2+ URL: http://0pointer.de/lennart/projects/nss-mdns/ Group: System Environment/Libraries Source: http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-%{version}.tar.gz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: avahi %description From 05334b6e869c3e24c204b6817e2b7085c2cf6875 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:26:15 +0100 Subject: [PATCH 25/54] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- nss-mdns.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 09903ab..58ca6a9 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -29,9 +29,6 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -%clean -rm -rf $RPM_BUILD_ROOT - %post /sbin/ldconfig # Perl-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf From 0d7df1f3ed187bdd30d7625ac34fd6c5dfcbf6ea Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Thu, 25 Jan 2018 19:12:53 -0500 Subject: [PATCH 26/54] v0.13.2 --- .gitignore | 2 +- nss-mdns.spec | 48 ++++++++++++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index f711b42..3ae9d11 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -nss-mdns-0.10.tar.gz +/nss-mdns-0.13.2.tar.gz diff --git a/nss-mdns.spec b/nss-mdns.spec index 58ca6a9..ed41a8e 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,37 +1,44 @@ -Summary: glibc plugin for .local name resolution Name: nss-mdns -Version: 0.10 -Release: 21%{?dist} +Version: 0.13.2 +Release: 1%{?dist} +Summary: glibc plugin for .local name resolution + License: LGPLv2+ -URL: http://0pointer.de/lennart/projects/nss-mdns/ -Group: System Environment/Libraries -Source: http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-%{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 + +BuildRequires: pkgconfig(check) Requires: avahi - + %description nss-mdns is a plugin for the GNU Name Service Switch (NSS) functionality of the GNU C Library (glibc) providing host name resolution via Multicast DNS -(aka Zeroconf, aka Apple Rendezvous, aka Apple Bonjour), effectively allowing +(aka Zeroconf, aka Apple Rendezvous, aka Apple Bonjour), effectively allowing name resolution by common Unix/Linux programs in the ad-hoc mDNS domain .local. nss-mdns provides client functionality only, which means that you have to run a mDNS responder daemon separately from nss-mdns if you want to register the local host name via mDNS (e.g. Avahi). + %prep -%setup -q +%autosetup %build -%configure --libdir=/%{_lib} --enable-avahi=yes --enable-legacy=no -make %{?_smp_mflags} +%configure --libdir=/%{_lib} +%make_build + +%check +make check %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%make_install + %post /sbin/ldconfig -# Perl-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf +# sed-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf if [ -f /etc/nsswitch.conf ] ; then sed -i.bak ' /^hosts:/ !b @@ -51,12 +58,18 @@ fi %postun -p /sbin/ldconfig + %files -%defattr(-, root, root) -%doc README -/%{_lib}/* +%license LICENSE +%doc README.md NEWS.md ACKNOWLEDGEMENTS.md +/%{_lib}/*.so.* + %changelog +* Sun Mar 18 2018 Adam Goode - 0.13.2-1 +- New upstream release +- Modernize the spec file + * Thu Feb 08 2018 Fedora Release Engineering - 0.10-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -121,7 +134,7 @@ fi - Rebuild for selinux ppc32 issue. * Fri Jun 22 2007 - Lennart Poettering - 0.10-2 -- Fix up post/preun/postun dependencies, add "avahi" to the dependencies, +- Fix up post/preun/postun dependencies, add "avahi" to the dependencies, include dist tag in Release field, use _lib directory instead of literal /lib. * Fri Jun 22 2007 - Lennart Poettering - 0.10-1 @@ -147,4 +160,3 @@ fi * Tue Dec 07 2004 - Bastien Nocera 0.1-1 - Initial package, automatically adds and remove mdns4 as a hosts service - diff --git a/sources b/sources index e3d8ea5..683a4b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03938f17646efbb50aa70ba5f99f51d7 nss-mdns-0.10.tar.gz +SHA512 (nss-mdns-0.13.2.tar.gz) = 1e1aebfcae5ba7f7e5201488cdb2f0e2a1a2def788df8021da4c96a6f4c5002515271d20c4d8b7316f5e389f2e270dd671adfbca458e6c7df853a6e6b6907fc3 From 28bd3795b999f1176f20dfbd898ecf8929e6a153 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Sun, 18 Mar 2018 15:15:58 -0400 Subject: [PATCH 27/54] v0.14 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3ae9d11..7c3aae7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /nss-mdns-0.13.2.tar.gz +/nss-mdns-0.14.tar.gz diff --git a/sources b/sources index 683a4b9..87febec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nss-mdns-0.13.2.tar.gz) = 1e1aebfcae5ba7f7e5201488cdb2f0e2a1a2def788df8021da4c96a6f4c5002515271d20c4d8b7316f5e389f2e270dd671adfbca458e6c7df853a6e6b6907fc3 +SHA512 (nss-mdns-0.14.tar.gz) = 8afa564963bc279e848ed937f64f4c54514caffd811b1589956ff45fe6b552e3c0039b63f5e48c0c998a8fa4356b4e6ad80f1463554a1df0ad3e0c5120b4e89c From 6b06ff2db0ce82547508694e90272d5bce4ead75 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Sun, 18 Mar 2018 15:15:58 -0400 Subject: [PATCH 28/54] v0.14 (with missing files) --- .gitignore | 1 - nss-mdns.spec | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7c3aae7..ab6c40d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/nss-mdns-0.13.2.tar.gz /nss-mdns-0.14.tar.gz diff --git a/nss-mdns.spec b/nss-mdns.spec index ed41a8e..7858980 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,5 +1,5 @@ Name: nss-mdns -Version: 0.13.2 +Version: 0.14 Release: 1%{?dist} Summary: glibc plugin for .local name resolution @@ -66,7 +66,7 @@ fi %changelog -* Sun Mar 18 2018 Adam Goode - 0.13.2-1 +* Sun Mar 18 2018 Adam Goode - 0.14-1 - New upstream release - Modernize the spec file From bf907e35f4decada071129d9b81a35ad2e8c7819 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Sun, 18 Mar 2018 17:42:21 -0400 Subject: [PATCH 29/54] Add test suite output --- nss-mdns.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/nss-mdns.spec b/nss-mdns.spec index 7858980..0decfb0 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -30,6 +30,7 @@ the local host name via mDNS (e.g. Avahi). %check make check +cat ./test-suite.log %install rm -rf $RPM_BUILD_ROOT From e9b294ab4e39f12ed2173c99da0a2f9cb7f8bd1b Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Sun, 18 Mar 2018 17:50:20 -0400 Subject: [PATCH 30/54] Try again to read test-suite.log --- nss-mdns.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 0decfb0..ee63f22 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -29,8 +29,7 @@ the local host name via mDNS (e.g. Avahi). %make_build %check -make check -cat ./test-suite.log +make check || (cat ./test-suite.log; false) %install rm -rf $RPM_BUILD_ROOT From b6392ffb77975c07caf212e395c29070d7162637 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Sun, 18 Mar 2018 18:35:13 -0400 Subject: [PATCH 31/54] v0.14.1 --- .gitignore | 2 +- nss-mdns.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ab6c40d..c3b9710 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/nss-mdns-0.14.tar.gz +/nss-mdns-0.14.1.tar.gz diff --git a/nss-mdns.spec b/nss-mdns.spec index ee63f22..74d0ca4 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,5 +1,5 @@ Name: nss-mdns -Version: 0.14 +Version: 0.14.1 Release: 1%{?dist} Summary: glibc plugin for .local name resolution @@ -66,7 +66,7 @@ fi %changelog -* Sun Mar 18 2018 Adam Goode - 0.14-1 +* Sun Mar 18 2018 Adam Goode - 0.14.1-1 - New upstream release - Modernize the spec file diff --git a/sources b/sources index 87febec..f5b5182 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nss-mdns-0.14.tar.gz) = 8afa564963bc279e848ed937f64f4c54514caffd811b1589956ff45fe6b552e3c0039b63f5e48c0c998a8fa4356b4e6ad80f1463554a1df0ad3e0c5120b4e89c +SHA512 (nss-mdns-0.14.1.tar.gz) = 7c06b984443881a6c0a1f850ee33f14780562cc6168fe1cda176303eb799ece510d51d3830928616723bb95250ad6462978cd8b857f2b79d87116da2c1aeaa5e From 14a8f29e8eb43fbd40ec7c999e0d241af907e6d8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:49 +0200 Subject: [PATCH 32/54] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- nss-mdns.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/nss-mdns.spec b/nss-mdns.spec index 74d0ca4..e8444f9 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -7,6 +7,7 @@ License: LGPLv2+ URL: https://github.com/lathiat/nss-mdns Source0: https://github.com/lathiat/nss-mdns/releases/download/v%{version}/nss-mdns-%{version}.tar.gz +BuildRequires: gcc BuildRequires: pkgconfig(check) Requires: avahi From f373c9f596566ba1ca8277fe2987982e8b1db690 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 14:31:38 +0000 Subject: [PATCH 33/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index e8444f9..3f9cba4 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,6 +1,6 @@ Name: nss-mdns Version: 0.14.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: glibc plugin for .local name resolution License: LGPLv2+ @@ -67,6 +67,9 @@ fi %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.14.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Mar 18 2018 Adam Goode - 0.14.1-1 - New upstream release - Modernize the spec file From 1018d68400f0c497ac9b14282ce4b83956a0251e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:40:31 +0100 Subject: [PATCH 34/54] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- nss-mdns.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 3f9cba4..94fc431 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -38,7 +38,7 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/ldconfig +%{?ldconfig} # sed-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf if [ -f /etc/nsswitch.conf ] ; then sed -i.bak ' @@ -57,7 +57,7 @@ if [ "$1" -eq 0 -a -f /etc/nsswitch.conf ] ; then ' /etc/nsswitch.conf fi -%postun -p /sbin/ldconfig +%ldconfig_postun %files From 888123c20e2d6fd08c36337cb9a67c5d07ccbb06 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 16:33:10 +0000 Subject: [PATCH 35/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 94fc431..a2af6fc 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,6 +1,6 @@ Name: nss-mdns Version: 0.14.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: glibc plugin for .local name resolution License: LGPLv2+ @@ -67,6 +67,9 @@ fi %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0.14.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 0.14.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 47734c92fd925f0988b9064a361ebf707eacdd7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 22:36:32 +0000 Subject: [PATCH 36/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index a2af6fc..9f9640b 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,6 +1,6 @@ Name: nss-mdns Version: 0.14.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: glibc plugin for .local name resolution License: LGPLv2+ @@ -67,6 +67,9 @@ fi %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.14.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 0.14.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 1cdaa282b592e8ae29c7578b14d8504ef097e38b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 31 Jul 2019 12:45:58 -0500 Subject: [PATCH 37/54] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 923eb4834c652b9622e09e2f20bb4d7ab5fbbe85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Tue, 19 Nov 2019 12:18:43 +0100 Subject: [PATCH 38/54] use authselect to change nsswitch.conf if available --- nss-mdns.spec | 53 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 9f9640b..1c4cf60 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -39,22 +39,49 @@ rm -rf $RPM_BUILD_ROOT %post %{?ldconfig} -# sed-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf -if [ -f /etc/nsswitch.conf ] ; then - sed -i.bak ' - /^hosts:/ !b - /\/ b - s/\([[:blank:]]\+\)dns\>/\1mdns4_minimal [NOTFOUND=return] dns/g - ' /etc/nsswitch.conf + +function mod_nss() { + if [ -f "$1" ] ; then + # sed-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf + sed -i.bak ' + /^hosts:/ !b + /\/ b + s/\([[:blank:]]\+\)dns\>/\1mdns4_minimal [NOTFOUND=return] dns/g + ' "$1" + fi +} + +FILE="$(readlink /etc/nsswitch.conf || echo /etc/nsswitch.conf)" +if [ "$FILE" = "/etc/authselect/nsswitch.conf" ] && authselect check &>/dev/null; then + mod_nss "/etc/authselect/user-nsswitch.conf" + authselect apply-changes &> /dev/null || : +else + mod_nss "$FILE" + # also apply the same changes to user-nsswitch.conf to affect + # possible future authselect configuration + mod_nss "/etc/authselect/user-nsswitch.conf" fi %preun -# sed-fu to remove mdns4_minimal from the hosts line of /etc/nsswitch.conf -if [ "$1" -eq 0 -a -f /etc/nsswitch.conf ] ; then - sed -i.bak ' - /^hosts:/ !b - s/[[:blank:]]\+mdns\(4\|6\)\?\(_minimal\( \[NOTFOUND=return\]\)\?\)\?//g - ' /etc/nsswitch.conf +function mod_nss() { + if [ -f "$1" ] ; then + # sed-fu to remove mdns4_minimal from the hosts line of /etc/nsswitch.conf + sed -i.bak ' + /^hosts:/ !b + s/[[:blank:]]\+mdns\(4\|6\)\?\(_minimal\( \[NOTFOUND=return\]\)\?\)\?//g + ' "$1" + fi +} + +FILE="$(readlink /etc/nsswitch.conf || echo /etc/nsswitch.conf)" +if [ "$FILE" = "/etc/authselect/nsswitch.conf" ] && authselect check &>/dev/null; then + mod_nss "/etc/authselect/user-nsswitch.conf" + authselect apply-changes &> /dev/null || : +else + mod_nss "$FILE" + # also apply the same changes to user-nsswitch.conf to affect + # possible future authselect configuration + mod_nss "/etc/authselect/user-nsswitch.conf" fi %ldconfig_postun From ae889935893c0db1dfa4d9dca9cb6f39d0a1873a Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Sun, 19 Jan 2020 13:38:55 -0500 Subject: [PATCH 39/54] Properly work with or without authselect (BZ #1577243) --- nss-mdns.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 1c4cf60..aff70ea 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,13 +1,13 @@ Name: nss-mdns Version: 0.14.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: glibc plugin for .local name resolution License: LGPLv2+ URL: https://github.com/lathiat/nss-mdns Source0: https://github.com/lathiat/nss-mdns/releases/download/v%{version}/nss-mdns-%{version}.tar.gz -BuildRequires: gcc +BuildRequires: gcc BuildRequires: pkgconfig(check) Requires: avahi @@ -41,7 +41,7 @@ rm -rf $RPM_BUILD_ROOT %{?ldconfig} function mod_nss() { - if [ -f "$1" ] ; then + if [ -f "$1" ] ; then # sed-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf sed -i.bak ' /^hosts:/ !b @@ -52,9 +52,9 @@ function mod_nss() { } FILE="$(readlink /etc/nsswitch.conf || echo /etc/nsswitch.conf)" -if [ "$FILE" = "/etc/authselect/nsswitch.conf" ] && authselect check &>/dev/null; then +if [ "$FILE" = "/etc/authselect/nsswitch.conf" ] && authselect check &>/dev/null; then mod_nss "/etc/authselect/user-nsswitch.conf" - authselect apply-changes &> /dev/null || : + authselect apply-changes &> /dev/null || : else mod_nss "$FILE" # also apply the same changes to user-nsswitch.conf to affect @@ -64,7 +64,7 @@ fi %preun function mod_nss() { - if [ -f "$1" ] ; then + if [ -f "$1" ] ; then # sed-fu to remove mdns4_minimal from the hosts line of /etc/nsswitch.conf sed -i.bak ' /^hosts:/ !b @@ -74,9 +74,9 @@ function mod_nss() { } FILE="$(readlink /etc/nsswitch.conf || echo /etc/nsswitch.conf)" -if [ "$FILE" = "/etc/authselect/nsswitch.conf" ] && authselect check &>/dev/null; then +if [ "$FILE" = "/etc/authselect/nsswitch.conf" ] && authselect check &>/dev/null; then mod_nss "/etc/authselect/user-nsswitch.conf" - authselect apply-changes &> /dev/null || : + authselect apply-changes &> /dev/null || : else mod_nss "$FILE" # also apply the same changes to user-nsswitch.conf to affect @@ -94,6 +94,9 @@ fi %changelog +* Sun Jan 19 2020 Adam Goode - 0.14.1-5 +- Properly work with or without authselect (BZ #1577243) + * Thu Jul 25 2019 Fedora Release Engineering - 0.14.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 516e6f3ee0b42aae67a7bd6d15bc147ead9a5bac Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Sun, 19 Jan 2020 14:03:03 -0500 Subject: [PATCH 40/54] Introduce package.cfg for building all current branches --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..89b4878 --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = master fedora epel7 \ No newline at end of file From a1d226a68dab4cd02400c733057e26f66f5f43a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 19:15:47 +0000 Subject: [PATCH 41/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index aff70ea..2746966 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,6 +1,6 @@ Name: nss-mdns Version: 0.14.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: glibc plugin for .local name resolution License: LGPLv2+ @@ -94,6 +94,9 @@ fi %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.14.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Jan 19 2020 Adam Goode - 0.14.1-5 - Properly work with or without authselect (BZ #1577243) From 3cdb8ffacef094feffc823e8aa3472bb29e90849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Tue, 17 Mar 2020 16:49:57 +0100 Subject: [PATCH 42/54] Do not remove mdns from nsswitch.conf during upgrade %post needs to be moved to %posttrans in order to fix the issue since %postun is run from the old buggy package. --- nss-mdns.spec | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 2746966..8320cfb 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,6 +1,6 @@ Name: nss-mdns Version: 0.14.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: glibc plugin for .local name resolution License: LGPLv2+ @@ -40,6 +40,7 @@ rm -rf $RPM_BUILD_ROOT %post %{?ldconfig} +%posttrans function mod_nss() { if [ -f "$1" ] ; then # sed-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf @@ -73,15 +74,17 @@ function mod_nss() { fi } -FILE="$(readlink /etc/nsswitch.conf || echo /etc/nsswitch.conf)" -if [ "$FILE" = "/etc/authselect/nsswitch.conf" ] && authselect check &>/dev/null; then - mod_nss "/etc/authselect/user-nsswitch.conf" - authselect apply-changes &> /dev/null || : -else - mod_nss "$FILE" - # also apply the same changes to user-nsswitch.conf to affect - # possible future authselect configuration - mod_nss "/etc/authselect/user-nsswitch.conf" +if [ "$1" -eq 0 ] ; then + FILE="$(readlink /etc/nsswitch.conf || echo /etc/nsswitch.conf)" + if [ "$FILE" = "/etc/authselect/nsswitch.conf" ] && authselect check &>/dev/null; then + mod_nss "/etc/authselect/user-nsswitch.conf" + authselect apply-changes &> /dev/null || : + else + mod_nss "$FILE" + # also apply the same changes to user-nsswitch.conf to affect + # possible future authselect configuration + mod_nss "/etc/authselect/user-nsswitch.conf" + fi fi %ldconfig_postun @@ -94,6 +97,9 @@ fi %changelog +* Tue Mar 17 2020 Pavel Březina - 0.14.1-7 +- Do not remove mdns from nsswitch.conf during upgrade + * Wed Jan 29 2020 Fedora Release Engineering - 0.14.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 8359b97a9e25f492cd9bfc53aaa675870f7a9bff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 11:55:19 +0000 Subject: [PATCH 43/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index 8320cfb..f2f8568 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,6 +1,6 @@ Name: nss-mdns Version: 0.14.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: glibc plugin for .local name resolution License: LGPLv2+ @@ -97,6 +97,9 @@ fi %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.14.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Mar 17 2020 Pavel Březina - 0.14.1-7 - Do not remove mdns from nsswitch.conf during upgrade From 85219c1c7443ed50fbaed11546b7e33772a71390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 2 Sep 2020 13:55:12 +0200 Subject: [PATCH 44/54] Move nss module earlier on hosts: line Before the initroduction of nss-resolve, putting mdns before dns was equivalent to putting it after files, since there wasn't anything inbetween. But when systemd is installed first we get: hosts: files resolve [!UNAVAIL=return] myhostname dns which the existing scriptlet here would modify to: hosts: files resolve [!UNAVAIL=return] myhostname mdns4_minimal [NOTFOUND=return] dns but we really want: hosts: files myhostname mdns4_minimal [NOTFOUND=return] resolve [!UNAVAIL=return] dns so mdns4 has higher priority than resolve. This applies to F33 and rawhide. --- nss-mdns.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index f2f8568..88262c6 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,6 +1,6 @@ Name: nss-mdns Version: 0.14.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: glibc plugin for .local name resolution License: LGPLv2+ @@ -44,11 +44,11 @@ rm -rf $RPM_BUILD_ROOT function mod_nss() { if [ -f "$1" ] ; then # sed-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf - sed -i.bak ' - /^hosts:/ !b - /\/ b - s/\([[:blank:]]\+\)dns\>/\1mdns4_minimal [NOTFOUND=return] dns/g - ' "$1" + sed -i.bak ' + /^hosts:/ !b + /\/ b + s/\ - 0.14.1-9 +- Place 'mdns4_minimal' in /etc/nsswitch.conf after 'files' in /etc/nsswitch.conf, + so that it ends up before 'resolve' (#1867830) + * Tue Jul 28 2020 Fedora Release Engineering - 0.14.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 799c2f01f637019b810ab1dcd9c017230547e06e Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 06:01:10 +0000 Subject: [PATCH 45/54] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- nss-mdns.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/nss-mdns.spec b/nss-mdns.spec index 88262c6..eaa8fd2 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -7,6 +7,7 @@ License: LGPLv2+ URL: https://github.com/lathiat/nss-mdns Source0: https://github.com/lathiat/nss-mdns/releases/download/v%{version}/nss-mdns-%{version}.tar.gz +BuildRequires: make BuildRequires: gcc BuildRequires: pkgconfig(check) Requires: avahi From de31b1d209b62370c3b1daf724f695d6e40b428b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 21:43:38 +0000 Subject: [PATCH 46/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index eaa8fd2..b679066 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,6 +1,6 @@ Name: nss-mdns Version: 0.14.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: glibc plugin for .local name resolution License: LGPLv2+ @@ -98,6 +98,9 @@ fi %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.14.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Sep 2 2020 Zbigniew Jędrzejewski-Szmek - 0.14.1-9 - Place 'mdns4_minimal' in /etc/nsswitch.conf after 'files' in /etc/nsswitch.conf, so that it ends up before 'resolve' (#1867830) From 90920e723da46df3babbd19c2394ecb52aeeba40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 26 Mar 2021 20:40:47 +0100 Subject: [PATCH 47/54] Move nss-myhostname before nss-mdns4 Tested with nss-mdns installed after systemd and before or just systemd or just nss-mdns. --- nss-mdns.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index b679066..52e04c5 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,6 +1,6 @@ Name: nss-mdns Version: 0.14.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: glibc plugin for .local name resolution License: LGPLv2+ @@ -46,9 +46,9 @@ function mod_nss() { if [ -f "$1" ] ; then # sed-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf sed -i.bak ' - /^hosts:/ !b + /^hosts:/ !b /\/ b - s/\ - 0.14.1-11 +- Move 'myhostname' before 'mdns4_minimal' (#1943199) + * Tue Jan 26 2021 Fedora Release Engineering - 0.14.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 8adab1792ce92db05232b03f6440012cdbf4ad95 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Mon, 10 May 2021 21:49:18 -0400 Subject: [PATCH 48/54] New upstream release --- .gitignore | 2 +- nss-mdns.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c3b9710..db59c28 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/nss-mdns-0.14.1.tar.gz +/nss-mdns-0.15.tar.gz diff --git a/nss-mdns.spec b/nss-mdns.spec index 52e04c5..07d7ae3 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,6 +1,6 @@ Name: nss-mdns -Version: 0.14.1 -Release: 11%{?dist} +Version: 0.15 +Release: 1%{?dist} Summary: glibc plugin for .local name resolution License: LGPLv2+ @@ -98,6 +98,9 @@ fi %changelog +* Tue May 11 2021 Adam Goode - 0.15-1 +- New upstream release + * Fri Mar 26 2021 Zbigniew Jędrzejewski-Szmek - 0.14.1-11 - Move 'myhostname' before 'mdns4_minimal' (#1943199) diff --git a/sources b/sources index f5b5182..90f3fb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nss-mdns-0.14.1.tar.gz) = 7c06b984443881a6c0a1f850ee33f14780562cc6168fe1cda176303eb799ece510d51d3830928616723bb95250ad6462978cd8b857f2b79d87116da2c1aeaa5e +SHA512 (nss-mdns-0.15.tar.gz) = e71b625a1ac9c36cb3db71e599b89b7ac237250cd9c99ae2e392c8fc1309eb7ba2d2c32f0695eb0b7bb993142a8803065de152cf002bea967e9c263aacd4b7ac From f167465855a59817cc44816e43b717e1e2f61130 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Sat, 12 Jun 2021 11:09:54 -0400 Subject: [PATCH 49/54] 0.15.1 --- .gitignore | 2 +- nss-mdns.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index db59c28..ca4d2bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/nss-mdns-0.15.tar.gz +/nss-mdns-0.15.1.tar.gz diff --git a/nss-mdns.spec b/nss-mdns.spec index 07d7ae3..d29475d 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,5 +1,5 @@ Name: nss-mdns -Version: 0.15 +Version: 0.15.1 Release: 1%{?dist} Summary: glibc plugin for .local name resolution @@ -98,6 +98,9 @@ fi %changelog +* Sat Jun 12 2021 Adam Goode - 0.15.1-1 +- New upstream release, fixes broken 0.15 release + * Tue May 11 2021 Adam Goode - 0.15-1 - New upstream release diff --git a/sources b/sources index 90f3fb0..4de31a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nss-mdns-0.15.tar.gz) = e71b625a1ac9c36cb3db71e599b89b7ac237250cd9c99ae2e392c8fc1309eb7ba2d2c32f0695eb0b7bb993142a8803065de152cf002bea967e9c263aacd4b7ac +SHA512 (nss-mdns-0.15.1.tar.gz) = 11a82ae9f209326b4501c7e6d33c9932b370c4dcacb64d6783140e25688ad6391bbd113e51ee470fd8be12669124eac331593cfd02a040383b4f964ed6ec6154 From 66e3ffe0864d9db463cfbf31706025f3e9278926 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 16:21:34 +0000 Subject: [PATCH 50/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nss-mdns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index d29475d..f4d1aee 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,6 +1,6 @@ Name: nss-mdns Version: 0.15.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: glibc plugin for .local name resolution License: LGPLv2+ @@ -98,6 +98,9 @@ fi %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.15.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jun 12 2021 Adam Goode - 0.15.1-1 - New upstream release, fixes broken 0.15 release From 919eb5ad8b38cf694fb7d8b55e9d3243ed041a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Tue, 16 Nov 2021 12:36:08 +0100 Subject: [PATCH 51/54] spec: remove nsswitch.conf scriptlet Related to: https://fedoraproject.org/wiki/Changes/Make_Authselect_Mandatory mdns is now supported in authselect. Users are now expected to use authselect to configure the system and packages should no longer support non-authselect configurations. Resolves: rhbz#2023745 --- nss-mdns.spec | 50 ++++++-------------------------------------------- 1 file changed, 6 insertions(+), 44 deletions(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index f4d1aee..ea08145 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,6 +1,6 @@ Name: nss-mdns Version: 0.15.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: glibc plugin for .local name resolution License: LGPLv2+ @@ -42,51 +42,10 @@ rm -rf $RPM_BUILD_ROOT %{?ldconfig} %posttrans -function mod_nss() { - if [ -f "$1" ] ; then - # sed-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf - sed -i.bak ' - /^hosts:/ !b - /\/ b - s/\<\(files\( myhostname\)\?[[:blank:]]\+\)/\1mdns4_minimal [NOTFOUND=return] /g - ' "$1" - fi -} - -FILE="$(readlink /etc/nsswitch.conf || echo /etc/nsswitch.conf)" -if [ "$FILE" = "/etc/authselect/nsswitch.conf" ] && authselect check &>/dev/null; then - mod_nss "/etc/authselect/user-nsswitch.conf" - authselect apply-changes &> /dev/null || : -else - mod_nss "$FILE" - # also apply the same changes to user-nsswitch.conf to affect - # possible future authselect configuration - mod_nss "/etc/authselect/user-nsswitch.conf" -fi +authselect enable-feature with-mdns4 &> /dev/null || : %preun -function mod_nss() { - if [ -f "$1" ] ; then - # sed-fu to remove mdns4_minimal from the hosts line of /etc/nsswitch.conf - sed -i.bak ' - /^hosts:/ !b - s/[[:blank:]]\+mdns\(4\|6\)\?\(_minimal\( \[NOTFOUND=return\]\)\?\)\?//g - ' "$1" - fi -} - -if [ "$1" -eq 0 ] ; then - FILE="$(readlink /etc/nsswitch.conf || echo /etc/nsswitch.conf)" - if [ "$FILE" = "/etc/authselect/nsswitch.conf" ] && authselect check &>/dev/null; then - mod_nss "/etc/authselect/user-nsswitch.conf" - authselect apply-changes &> /dev/null || : - else - mod_nss "$FILE" - # also apply the same changes to user-nsswitch.conf to affect - # possible future authselect configuration - mod_nss "/etc/authselect/user-nsswitch.conf" - fi -fi +authselect disable-feature with-mdns4 &> /dev/null || : %ldconfig_postun @@ -98,6 +57,9 @@ fi %changelog +* Tue Nov 16 2021 Pavel Březina - 0.15.1-3 +- Rely only on authselect for nsswitch.conf changes (#2023745) + * Thu Jul 22 2021 Fedora Release Engineering - 0.15.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From c5cdd5d6865f46fe4ea6080da088a9a9740f62d6 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Wed, 12 Jan 2022 07:38:54 -0800 Subject: [PATCH 52/54] remove package.cfg --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index e5431a3..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = master fedora epel7 epel8 epel8-playground From f89abebd2d5dc898b37ca20146630bd06c190cdc Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 23 Sep 2022 08:27:07 -0700 Subject: [PATCH 53/54] authselect is to old in RHEL, switch scripts back (#2113979) --- nss-mdns.spec | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/nss-mdns.spec b/nss-mdns.spec index ea08145..3df9a68 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -1,6 +1,6 @@ Name: nss-mdns Version: 0.15.1 -Release: 3%{?dist} +Release: 3.1%{?dist} Summary: glibc plugin for .local name resolution License: LGPLv2+ @@ -42,10 +42,51 @@ rm -rf $RPM_BUILD_ROOT %{?ldconfig} %posttrans -authselect enable-feature with-mdns4 &> /dev/null || : +function mod_nss() { + if [ -f "$1" ] ; then + # sed-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf + sed -i.bak ' + /^hosts:/ !b + /\/ b + s/\<\(files\( myhostname\)\?[[:blank:]]\+\)/\1mdns4_minimal [NOTFOUND=return] /g + ' "$1" + fi +} + +FILE="$(readlink /etc/nsswitch.conf || echo /etc/nsswitch.conf)" +if [ "$FILE" = "/etc/authselect/nsswitch.conf" ] && authselect check &>/dev/null; then + mod_nss "/etc/authselect/user-nsswitch.conf" + authselect apply-changes &> /dev/null || : +else + mod_nss "$FILE" + # also apply the same changes to user-nsswitch.conf to affect + # possible future authselect configuration + mod_nss "/etc/authselect/user-nsswitch.conf" +fi %preun -authselect disable-feature with-mdns4 &> /dev/null || : +function mod_nss() { + if [ -f "$1" ] ; then + # sed-fu to remove mdns4_minimal from the hosts line of /etc/nsswitch.conf + sed -i.bak ' + /^hosts:/ !b + s/[[:blank:]]\+mdns\(4\|6\)\?\(_minimal\( \[NOTFOUND=return\]\)\?\)\?//g + ' "$1" + fi +} + +if [ "$1" -eq 0 ] ; then + FILE="$(readlink /etc/nsswitch.conf || echo /etc/nsswitch.conf)" + if [ "$FILE" = "/etc/authselect/nsswitch.conf" ] && authselect check &>/dev/null; then + mod_nss "/etc/authselect/user-nsswitch.conf" + authselect apply-changes &> /dev/null || : + else + mod_nss "$FILE" + # also apply the same changes to user-nsswitch.conf to affect + # possible future authselect configuration + mod_nss "/etc/authselect/user-nsswitch.conf" + fi +fi %ldconfig_postun @@ -57,6 +98,9 @@ authselect disable-feature with-mdns4 &> /dev/null || : %changelog +* Tue Nov 16 2021 Pavel Březina - 0.15.1-3.1 +- authselect is too old in RHEL, switch scripts back (#2113979) + * Tue Nov 16 2021 Pavel Březina - 0.15.1-3 - Rely only on authselect for nsswitch.conf changes (#2023745) From 94bbc6faa8b1f79147d36d9d37a19cc780656387 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:32:43 +0300 Subject: [PATCH 54/54] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 4de31a8..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (nss-mdns-0.15.1.tar.gz) = 11a82ae9f209326b4501c7e6d33c9932b370c4dcacb64d6783140e25688ad6391bbd113e51ee470fd8be12669124eac331593cfd02a040383b4f964ed6ec6154