Re: [PR PATCH] [Updated] mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd

[mikoxyz <mikoxyz@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 607 bytes --]

There is an updated pull request by mikoxyz against master on the void-packages repository

https://github.com/mikoxyz/void-packages mdnsd
https://github.com/void-linux/void-packages/pull/34090

mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd
mdnsd and mDNSResponder both provide /usr/bin/mdnsd, so they should be marked as conflicting.

Fixes #33762

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

A patch file from https://github.com/void-linux/void-packages/pull/34090.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mdnsd-34090.patch --]
[-- Type: text/x-diff, Size: 2485 bytes --]

From 5e43b0ed0030bdd755a5b27cc44d896aa4864ce1 Mon Sep 17 00:00:00 2001
From: Miko <65079739+mikoxyz@users.noreply.github.com>
Date: Mon, 15 Nov 2021 08:14:21 +0100
Subject: [PATCH 1/2] mdnsd: Conflicts with mDNSResponder

mdnsd and mDNSResponder both provide /usr/bin/mdnsd, so they should be
marked as conflicting.

Reported-by: MGlolenstine <not@applicable>
Signed-off-by: Miko <65079739+mikoxyz@users.noreply.github.com>
---
 srcpkgs/mdnsd/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mdnsd/template b/srcpkgs/mdnsd/template
index 53476d355366..e7b7d94aa8b2 100644
--- a/srcpkgs/mdnsd/template
+++ b/srcpkgs/mdnsd/template
@@ -1,7 +1,7 @@
 # Template file for 'mdnsd'
 pkgname=mdnsd
 version=0.10
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config libtool"
 short_desc="Embeddable Multicast DNS Daemon"
@@ -10,6 +10,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/troglobit/mdnsd"
 distfiles="https://github.com/troglobit/mdnsd/archive/v${version}.tar.gz"
 checksum=2e1a77fc9ff36e993a39b10016fe38723784ca7e3141ca00e4d6f43545d2988c
+conflicts="mDNSResponder"
 
 conf_files="
  /etc/mdns.d/ssh.service"

From 65de456ded1277d2b3b6ef5030a9e0e6539c6270 Mon Sep 17 00:00:00 2001
From: Miko <65079739+mikoxyz@users.noreply.github.com>
Date: Mon, 15 Nov 2021 08:21:34 +0100
Subject: [PATCH 2/2] mDNSResponder: Conflicts with mdnsd

mdnsd and mDNSResponder both provide /usr/bin/mdnsd, so they should be
marked as conflicting.

Reported-by: MGlolenstine <not@applicable>
Signed-off-by: Miko <65079739+mikoxyz@users.noreply.github.com>
---
 srcpkgs/mDNSResponder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mDNSResponder/template b/srcpkgs/mDNSResponder/template
index c0425e7b34ee..947438d73dbd 100644
--- a/srcpkgs/mDNSResponder/template
+++ b/srcpkgs/mDNSResponder/template
@@ -1,7 +1,7 @@
 # Template file for 'mDNSResponder'
 pkgname=mDNSResponder
 version=1310.80.1
-revision=1
+revision=2
 hostmakedepends="flex byacc"
 short_desc="Implements the Bonjour/Zeroconf protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -11,7 +11,7 @@ distfiles="https://opensource.apple.com/tarballs/${pkgname}/${pkgname}-${version
 checksum=097662447e1535573484697861d9f50eceaf2c52ec2742e451ee6ffe9bbf3e75
 
 conf_files="/etc/nss_mdns.conf"
-conflicts="nss-mdns>=0"
+conflicts="mdns nss-mdns>=0"
 
 do_build() {
 	sed -i "s,cc ,$CC ,g" Clients/Makefile