From: mikoxyz <mikoxyz@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd
Date: Mon, 15 Nov 2021 13:51:42 +0100 [thread overview]
Message-ID: <20211115125142.ssxF9MmHARokYGdj9NDKzwrrRVAf_0bmSvT5VOXL34w@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34090@inbox.vuxu.org>
[-- 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: 2375 bytes --]
From a94d70c772733f272273ce6a5acf765be19eb760 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..71f97e7ebdf0 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"
@@ -13,6 +13,7 @@ checksum=2e1a77fc9ff36e993a39b10016fe38723784ca7e3141ca00e4d6f43545d2988c
conf_files="
/etc/mdns.d/ssh.service"
+conflicts="mDNSResponder"
pre_configure() {
./autogen.sh
From d9a8cfda06cbf766d5875ed44f67abe1d730bb11 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
next prev parent reply other threads:[~2021-11-15 12:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 7:27 [PR PATCH] " mikoxyz
2021-11-15 12:37 ` [PR PATCH] [Updated] " mikoxyz
2021-11-15 12:51 ` mikoxyz [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211115125142.ssxF9MmHARokYGdj9NDKzwrrRVAf_0bmSvT5VOXL34w@z \
--to=mikoxyz@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).