Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd
@ 2021-11-15  7:27 mikoxyz
  2021-11-15 12:37 ` [PR PATCH] [Updated] " mikoxyz
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: mikoxyz @ 2021-11-15  7:27 UTC (permalink / raw)
  To: ml

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

There is a new 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: 2007 bytes --]

From 255b96f79dcbc2739c5071b4ac8a9ed90c14c17a 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..c7fd267469ff 100644
--- a/srcpkgs/mdnsd/template
+++ b/srcpkgs/mdnsd/template
@@ -1,9 +1,10 @@
 # Template file for 'mdnsd'
 pkgname=mdnsd
 version=0.10
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config libtool"
+conflicts="mDNSResponder"
 short_desc="Embeddable Multicast DNS Daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 3ee7fae14d4988b8dfe2c310e1c3992b4b28c36d 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mDNSResponder/template b/srcpkgs/mDNSResponder/template
index c0425e7b34ee..9e8d7c0d9aba 100644
--- a/srcpkgs/mDNSResponder/template
+++ b/srcpkgs/mDNSResponder/template
@@ -1,8 +1,9 @@
 # Template file for 'mDNSResponder'
 pkgname=mDNSResponder
 version=1310.80.1
-revision=1
+revision=2
 hostmakedepends="flex byacc"
+conflicts="mdnsd"
 short_desc="Implements the Bonjour/Zeroconf protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0, BSD-3-Clause"

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-11-16 12:17 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-15  7:27 [PR PATCH] mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd mikoxyz
2021-11-15 12:37 ` [PR PATCH] [Updated] " mikoxyz
2021-11-15 12:51 ` mikoxyz
2021-11-15 14:54 ` Duncaen
2021-11-15 14:55 ` Duncaen
2021-11-15 14:55 ` Duncaen
2021-11-15 15:16 ` [PR PATCH] [Updated] " mikoxyz
2021-11-15 15:16 ` mikoxyz
2021-11-16 12:17 ` [PR PATCH] [Merged]: mdnsd: Conflicts with mDNSResponder ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).