[ptxdist] [PATCH] libcap-ng: Add another fetch option.

[ptxdist] [PATCH] libcap-ng: Add another fetch option.

[Christian Melki]

people.redhat.com is down again.
Not a lot depend on it but libcap-ng is common in a lot of builds.
The github variant doesn't come in a "make dist" release.
A debian mirror of the source might do.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/libcap-ng.make | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rules/libcap-ng.make b/rules/libcap-ng.make
index 530af64ef..64786e872 100644
--- a/rules/libcap-ng.make
+++ b/rules/libcap-ng.make
@@ -18,7 +18,9 @@ LIBCAP_NG_VERSION	:= 0.8.3
 LIBCAP_NG_MD5		:= cdfc750af32f681293e43c5c1bd427c8
 LIBCAP_NG		:= libcap-ng-$(LIBCAP_NG_VERSION)
 LIBCAP_NG_SUFFIX	:= tar.gz
-LIBCAP_NG_URL		:= http://people.redhat.com/sgrubb/libcap-ng/$(LIBCAP_NG).$(LIBCAP_NG_SUFFIX)
+LIBCAP_NG_URL		:= \
+	https://people.redhat.com/sgrubb/libcap-ng/$(LIBCAP_NG).$(LIBCAP_NG_SUFFIX) \
+	https://deb.debian.org/debian/pool/main/libc/libcap-ng/libcap-ng_$(LIBCAP_NG_VERSION).orig.$(LIBCAP_NG_SUFFIX)
 LIBCAP_NG_SOURCE	:= $(SRCDIR)/$(LIBCAP_NG).$(LIBCAP_NG_SUFFIX)
 LIBCAP_NG_DIR		:= $(BUILDDIR)/$(LIBCAP_NG)
 LIBCAP_NG_LICENSE	:= LGPL-2.1-or-later AND GPL-2.0-or-later
-- 
2.34.1

Re: [ptxdist] [PATCH] libcap-ng: Add another fetch option.

[Michael Olbrich]

On Fri, Aug 11, 2023 at 07:38:59PM +0200, Christian Melki wrote:
> people.redhat.com is down again.
> Not a lot depend on it but libcap-ng is common in a lot of builds.
> The github variant doesn't come in a "make dist" release.
> A debian mirror of the source might do.

The problem with the Debian pool is, that it only contains the archives for
the releases currently available in a Debian release. So the archive may
disappear. And as a secondary URL, 'ptxdist urlcheck' will not fail while
the primary URL is available.

The server seems to be back now anyway. So I'd like to stick to just the
original URL for now. I'll reconsider if this happens more often, but it
doesn't look like it so far from what I can tell from my regular checks.

Michael

> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
>  rules/libcap-ng.make | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/libcap-ng.make b/rules/libcap-ng.make
> index 530af64ef..64786e872 100644
> --- a/rules/libcap-ng.make
> +++ b/rules/libcap-ng.make
> @@ -18,7 +18,9 @@ LIBCAP_NG_VERSION	:= 0.8.3
>  LIBCAP_NG_MD5		:= cdfc750af32f681293e43c5c1bd427c8
>  LIBCAP_NG		:= libcap-ng-$(LIBCAP_NG_VERSION)
>  LIBCAP_NG_SUFFIX	:= tar.gz
> -LIBCAP_NG_URL		:= http://people.redhat.com/sgrubb/libcap-ng/$(LIBCAP_NG).$(LIBCAP_NG_SUFFIX)
> +LIBCAP_NG_URL		:= \
> +	https://people.redhat.com/sgrubb/libcap-ng/$(LIBCAP_NG).$(LIBCAP_NG_SUFFIX) \
> +	https://deb.debian.org/debian/pool/main/libc/libcap-ng/libcap-ng_$(LIBCAP_NG_VERSION).orig.$(LIBCAP_NG_SUFFIX)
>  LIBCAP_NG_SOURCE	:= $(SRCDIR)/$(LIBCAP_NG).$(LIBCAP_NG_SUFFIX)
>  LIBCAP_NG_DIR		:= $(BUILDDIR)/$(LIBCAP_NG)
>  LIBCAP_NG_LICENSE	:= LGPL-2.1-or-later AND GPL-2.0-or-later
> -- 
> 2.34.1
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [ptxdist] [PATCH] libcap-ng: Add another fetch option.

[Roland Hieber]

On Mon, Aug 28, 2023 at 05:35:51PM +0200, Michael Olbrich wrote:
> On Fri, Aug 11, 2023 at 07:38:59PM +0200, Christian Melki wrote:
> > people.redhat.com is down again.
> > Not a lot depend on it but libcap-ng is common in a lot of builds.
> > The github variant doesn't come in a "make dist" release.
> > A debian mirror of the source might do.
> 
> The problem with the Debian pool is, that it only contains the archives for
> the releases currently available in a Debian release. So the archive may
> disappear. And as a secondary URL, 'ptxdist urlcheck' will not fail while
> the primary URL is available.

Another option is to use the pool URLs from snapshot.debian.org, see for
example rules/lsof.make:

  https://snapshot.debian.org/archive/debian/20190908T172415Z/pool/main/l/lsof/$(LSOF_TARBALL)

(I think the timestamp in the URL can just be any valid timestamp.)

 - Roland

> The server seems to be back now anyway. So I'd like to stick to just the
> original URL for now. I'll reconsider if this happens more often, but it
> doesn't look like it so far from what I can tell from my regular checks.
> 
> Michael
> 
> > Signed-off-by: Christian Melki <christian.melki@t2data.com>
> > ---
> >  rules/libcap-ng.make | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/rules/libcap-ng.make b/rules/libcap-ng.make
> > index 530af64ef..64786e872 100644
> > --- a/rules/libcap-ng.make
> > +++ b/rules/libcap-ng.make
> > @@ -18,7 +18,9 @@ LIBCAP_NG_VERSION	:= 0.8.3
> >  LIBCAP_NG_MD5		:= cdfc750af32f681293e43c5c1bd427c8
> >  LIBCAP_NG		:= libcap-ng-$(LIBCAP_NG_VERSION)
> >  LIBCAP_NG_SUFFIX	:= tar.gz
> > -LIBCAP_NG_URL		:= http://people.redhat.com/sgrubb/libcap-ng/$(LIBCAP_NG).$(LIBCAP_NG_SUFFIX)
> > +LIBCAP_NG_URL		:= \
> > +	https://people.redhat.com/sgrubb/libcap-ng/$(LIBCAP_NG).$(LIBCAP_NG_SUFFIX) \
> > +	https://deb.debian.org/debian/pool/main/libc/libcap-ng/libcap-ng_$(LIBCAP_NG_VERSION).orig.$(LIBCAP_NG_SUFFIX)
> >  LIBCAP_NG_SOURCE	:= $(SRCDIR)/$(LIBCAP_NG).$(LIBCAP_NG_SUFFIX)
> >  LIBCAP_NG_DIR		:= $(BUILDDIR)/$(LIBCAP_NG)
> >  LIBCAP_NG_LICENSE	:= LGPL-2.1-or-later AND GPL-2.0-or-later
> > -- 
> > 2.34.1
> > 
> > 
> > 
> 
> -- 
> Pengutronix e.K.                           |                             |
> Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> 
> 

-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |