[gentoo-dev] [PATCH 0/3] inline the samba mirror

[gentoo-dev] [PATCH 0/3] inline the samba mirror

[Michael Orlitzky]

Close https://bugs.gentoo.org/916556 by inlining the samba mirror into
net-fs/samba and sys-auth/pam_smb and then dropping the entry from
thirdpartymirrors.

Michael Orlitzky (3):
  net-fs/samba: inline mirror://samba/ into SRC_URI
  sys-auth/pam_smb: inline mirror://samba/ into SRC_URI
  profiles/thirdpartymirrors: drop mirror://samba/

 net-fs/samba/samba-4.18.4-r1.ebuild          | 4 ++--
 net-fs/samba/samba-4.18.5-r1.ebuild          | 4 ++--
 net-fs/samba/samba-4.18.6-r1.ebuild          | 4 ++--
 net-fs/samba/samba-4.18.7.ebuild             | 4 ++--
 net-fs/samba/samba-4.18.8.ebuild             | 4 ++--
 net-fs/samba/samba-4.19.0-r1.ebuild          | 4 ++--
 net-fs/samba/samba-4.19.1.ebuild             | 4 ++--
 net-fs/samba/samba-4.19.2.ebuild             | 4 ++--
 profiles/thirdpartymirrors                   | 1 -
 sys-auth/pam_smb/pam_smb-2.0.0_rc6-r3.ebuild | 4 ++--
 10 files changed, 18 insertions(+), 19 deletions(-)

-- 
2.41.0

[gentoo-dev] [PATCH 1/3] net-fs/samba: inline mirror://samba/ into SRC_URI

[Michael Orlitzky]

Bug: https://bugs.gentoo.org/916556
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
---
 net-fs/samba/samba-4.18.4-r1.ebuild | 4 ++--
 net-fs/samba/samba-4.18.5-r1.ebuild | 4 ++--
 net-fs/samba/samba-4.18.6-r1.ebuild | 4 ++--
 net-fs/samba/samba-4.18.7.ebuild    | 4 ++--
 net-fs/samba/samba-4.18.8.ebuild    | 4 ++--
 net-fs/samba/samba-4.19.0-r1.ebuild | 4 ++--
 net-fs/samba/samba-4.19.1.ebuild    | 4 ++--
 net-fs/samba/samba-4.19.2.ebuild    | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/net-fs/samba/samba-4.18.4-r1.ebuild b/net-fs/samba/samba-4.18.4-r1.ebuild
index 7be674c8b658..50bd8a8ba337 100644
--- a/net-fs/samba/samba-4.18.4-r1.ebuild
+++ b/net-fs/samba/samba-4.18.4-r1.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://samba.org/"
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
 if [[ ${PV} == *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
 else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 fi
 S="${WORKDIR}/${MY_P}"
diff --git a/net-fs/samba/samba-4.18.5-r1.ebuild b/net-fs/samba/samba-4.18.5-r1.ebuild
index cea5c8d53ad5..62e458b0c89d 100644
--- a/net-fs/samba/samba-4.18.5-r1.ebuild
+++ b/net-fs/samba/samba-4.18.5-r1.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://samba.org/"
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
 if [[ ${PV} == *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
 else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
diff --git a/net-fs/samba/samba-4.18.6-r1.ebuild b/net-fs/samba/samba-4.18.6-r1.ebuild
index cea5c8d53ad5..62e458b0c89d 100644
--- a/net-fs/samba/samba-4.18.6-r1.ebuild
+++ b/net-fs/samba/samba-4.18.6-r1.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://samba.org/"
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
 if [[ ${PV} == *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
 else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
diff --git a/net-fs/samba/samba-4.18.7.ebuild b/net-fs/samba/samba-4.18.7.ebuild
index cea5c8d53ad5..62e458b0c89d 100644
--- a/net-fs/samba/samba-4.18.7.ebuild
+++ b/net-fs/samba/samba-4.18.7.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://samba.org/"
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
 if [[ ${PV} == *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
 else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
diff --git a/net-fs/samba/samba-4.18.8.ebuild b/net-fs/samba/samba-4.18.8.ebuild
index c91b4ea77582..8135362ec56e 100644
--- a/net-fs/samba/samba-4.18.8.ebuild
+++ b/net-fs/samba/samba-4.18.8.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://samba.org/"
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
 if [[ ${PV} == *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
 else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 fi
 S="${WORKDIR}/${MY_P}"
diff --git a/net-fs/samba/samba-4.19.0-r1.ebuild b/net-fs/samba/samba-4.19.0-r1.ebuild
index 38134f5ff67e..60a4f1bf20bd 100644
--- a/net-fs/samba/samba-4.19.0-r1.ebuild
+++ b/net-fs/samba/samba-4.19.0-r1.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://samba.org/"
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
 if [[ ${PV} == *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
 else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
diff --git a/net-fs/samba/samba-4.19.1.ebuild b/net-fs/samba/samba-4.19.1.ebuild
index 38134f5ff67e..60a4f1bf20bd 100644
--- a/net-fs/samba/samba-4.19.1.ebuild
+++ b/net-fs/samba/samba-4.19.1.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://samba.org/"
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
 if [[ ${PV} == *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
 else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
diff --git a/net-fs/samba/samba-4.19.2.ebuild b/net-fs/samba/samba-4.19.2.ebuild
index 38134f5ff67e..60a4f1bf20bd 100644
--- a/net-fs/samba/samba-4.19.2.ebuild
+++ b/net-fs/samba/samba-4.19.2.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://samba.org/"
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
 if [[ ${PV} == *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
 else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
-- 
2.41.0

[gentoo-dev] [PATCH 2/3] sys-auth/pam_smb: inline mirror://samba/ into SRC_URI

[Michael Orlitzky]

Bug: https://bugs.gentoo.org/916556
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
---
 sys-auth/pam_smb/pam_smb-2.0.0_rc6-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r3.ebuild b/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r3.ebuild
index e62a1829a687..2b61b73610f9 100644
--- a/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r3.ebuild
+++ b/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ MY_P=${P/_rc/-rc}
 DESCRIPTION="PAM module for authenticating against an SMB (such as the Win_x families) server"
 HOMEPAGE="http://www.csn.ul.ie/~airlied/pam_smb/"
 SRC_URI="
-	mirror://samba/pam_smb/v2/${MY_P}.tar.gz
+	https://download.samba.org/pub/samba/pam_smb/v2/${MY_P}.tar.gz
 	http://www.csn.ul.ie/~airlied/pam_smb/v2/${MY_P}.tar.gz"
 S="${WORKDIR}"/${MY_P}
 
-- 
2.41.0

[gentoo-dev] [PATCH 3/3] profiles/thirdpartymirrors: drop mirror://samba/

[Michael Orlitzky]

This (singleton) mirror list has been inlined into the two packages
that were using it.

Closes: https://bugs.gentoo.org/916556
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
---
 profiles/thirdpartymirrors | 1 -
 1 file changed, 1 deletion(-)

diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index b28145aeac1f..1bcdb7cec8bc 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -18,7 +18,6 @@ nongnu		https://download.savannah.nongnu.org/releases/ https://ftp.cc.uoc.gr/mir
 openbsd		https://cdn.openbsd.org/pub/OpenBSD https://fastly.cdn.openbsd.org/pub/OpenBSD
 openssl		https://www.openssl.org/ https://artfiles.org/openssl.org/ https://www.mirrorservice.org/sites/ftp.openssl.org/ ftp://ftp.openssl.org
 qmail		https://qmail-mirror.jms1.net/ http://qmail.pandakc.com/ http://qmail.glasswings.com.au/ http://qmail.teraren.com/ http://qmail.mirror.cdnetworks.com/ https://qmail.mirror.choon.net/ http://qmail.cbox.biz/ http://qmail.cbox.biz/ http://qmail.mirrors.ovh.net/ftp.qmail.org/ http://qmail.rasjonell.net/ http://mirrors.ntua.gr/qmail/ http://qmail.cti.gr/ http://qmail.hypergrid.it/ http://qmail.omnis.ch/ http://qmail.cavsystems.net/ https://qmail.mivzakim.net/ http://qmail.mirror.rise.ph/
-samba		https://download.samba.org/pub/samba/
 sabayon		http://sabayon.c3sl.ufpr.br/distfiles https://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/distfiles https://ftp.rnl.tecnico.ulisboa.pt/pub/sabayon/distfiles https://ftp.fsn.hu/pub/linux/distributions/sabayon/distfiles http://cross-lfs.sabayonlinux.org/distfiles https://mirror.dkm.cz/sabayon/distfiles http://mirror.internode.on.net/pub/sabayon/distfiles https://na.mirror.garr.it/mirrors/sabayonlinux/distfiles http://distfiles.sabayon.org
 sourceforge	https://downloads.sourceforge.net
 sourceforge.jp	http://iij.dl.sourceforge.jp https://osdn.dl.sourceforge.jp https://jaist.dl.sourceforge.jp
-- 
2.41.0