* [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
* Re: [PR PATCH] [Updated] mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd
2021-11-15 7:27 [PR PATCH] mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd mikoxyz
@ 2021-11-15 12:37 ` mikoxyz
2021-11-15 12:51 ` mikoxyz
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: mikoxyz @ 2021-11-15 12:37 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd
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
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: mikoxyz @ 2021-11-15 12:51 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd
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
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Duncaen @ 2021-11-15 14:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/34090#issuecomment-968989981
Comment:
Only one of them needs the conflict.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd
2021-11-15 7:27 [PR PATCH] mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd mikoxyz
` (2 preceding siblings ...)
2021-11-15 14:54 ` Duncaen
@ 2021-11-15 14:55 ` Duncaen
2021-11-15 14:55 ` Duncaen
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Duncaen @ 2021-11-15 14:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/34090#issuecomment-968989981
Comment:
Only one of them needs the conflict conflicts are mutual and making both conflict just results in two error messages.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd
2021-11-15 7:27 [PR PATCH] mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd mikoxyz
` (3 preceding siblings ...)
2021-11-15 14:55 ` Duncaen
@ 2021-11-15 14:55 ` Duncaen
2021-11-15 15:16 ` [PR PATCH] [Updated] " mikoxyz
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Duncaen @ 2021-11-15 14:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/34090#issuecomment-968989981
Comment:
Only one of them needs the conflict, conflicts are mutual and making both conflict just results in two error messages.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd
2021-11-15 7:27 [PR PATCH] mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd mikoxyz
` (4 preceding siblings ...)
2021-11-15 14:55 ` Duncaen
@ 2021-11-15 15:16 ` mikoxyz
2021-11-15 15:16 ` mikoxyz
2021-11-16 12:17 ` [PR PATCH] [Merged]: mdnsd: Conflicts with mDNSResponder ericonr
7 siblings, 0 replies; 9+ messages in thread
From: mikoxyz @ 2021-11-15 15:16 UTC (permalink / raw)
To: ml
[-- 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: 1089 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] 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd
2021-11-15 7:27 [PR PATCH] mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd mikoxyz
` (5 preceding siblings ...)
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
7 siblings, 0 replies; 9+ messages in thread
From: mikoxyz @ 2021-11-15 15:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
New comment by mikoxyz on void-packages repository
https://github.com/void-linux/void-packages/pull/34090#issuecomment-969012394
Comment:
> Only one of them needs the conflict, conflicts are mutual and making both conflict just results in two error messages.
Thanks for the heads-up!
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Merged]: mdnsd: Conflicts with mDNSResponder
2021-11-15 7:27 [PR PATCH] mdnsd/mDNSResponder: Conflicts with mDNSResponder/mdnsd mikoxyz
` (6 preceding siblings ...)
2021-11-15 15:16 ` mikoxyz
@ 2021-11-16 12:17 ` ericonr
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-11-16 12:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 433 bytes --]
There's a merged pull request on the void-packages repository
mdnsd: Conflicts with mDNSResponder
https://github.com/void-linux/void-packages/pull/34090
Description:
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**
^ 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).