Merge branch 'devel' into v11.1.0

jcorporation · Jul 29, 2023 · f5330c0 · f5330c0
2 parents 3054778 + ce048fe
commit f5330c0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@ This is a small bug fix release.
 
 - Fix: set translated title for navbar icons
 - Fix: jukebox list context menu actions
+- Fix: calculate correct myMPDuri for IPv6 [::]
 
 ***
 

diff --git a/contrib/packaging/gentoo/acct-group/mympd/mympd-0.ebuild b/contrib/packaging/gentoo/acct-group/mympd/mympd-0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit acct-group
 

diff --git a/contrib/packaging/gentoo/acct-user/mympd/mympd-0.ebuild b/contrib/packaging/gentoo/acct-user/mympd/mympd-0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit acct-user
 

diff --git a/contrib/packaging/gentoo/media-sound/mympd/mympd-11.1.0.ebuild b/contrib/packaging/gentoo/media-sound/mympd/mympd-11.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit eutils cmake systemd
+inherit cmake systemd
 
 MY_PN="myMPD"
 

diff --git a/src/lib/utility.c b/src/lib/utility.c
@@ -262,7 +262,9 @@ sds resolv_mympd_uri(sds uri, sds mpd_host, struct t_config *config) {
  * @return address of the embedded webserver as sds string
  */
 static sds get_mympd_host(sds mpd_host, sds http_host) {
-    if (strcmp(http_host, "0.0.0.0") != 0) {
+    if (strcmp(http_host, "0.0.0.0") != 0 &&
+        strcmp(http_host, "[::]") != 0)
+    {
         //host defined in configuration
         return sdsdup(http_host);
     }