From 9c1efb65c9b856dc96b84d880b9fddbe319031d4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 14 Oct 2024 14:27:32 +0200 Subject: [PATCH] meta: use explicit uri for all sourceforge upstream version checks Previously the check for some recipes relied on sourceforge redirecting from downloads.sourceforge.net (SRC_URI is set to that) into the actual project page. Sourceforge does this for interactive browsers, but not for wget. With the check no longer mimicking a browser, and being truthful about coming from wget we need to explicitly fetch the project page in all cases, which is what this commit does. (many recipes already set this explicitly and don't need to be tweaked) (From OE-Core rev: 4c21ce6e34f6ce8fbf4db7bc2fd017c8f7a811b4) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/classes-recipe/sourceforge-releases.bbclass | 2 ++ meta/recipes-bsp/acpid/acpid.inc | 5 +++-- meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb | 2 ++ meta/recipes-bsp/setserial/setserial_2.17.bb | 2 +- meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb | 2 +- meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb | 5 ++++- meta/recipes-extended/hdparm/hdparm_9.65.bb | 1 + meta/recipes-extended/mingetty/mingetty_1.08.bb | 2 +- meta/recipes-extended/rpcbind/rpcbind_1.2.7.bb | 2 +- meta/recipes-multimedia/lame/lame_3.100.bb | 2 +- meta/recipes-support/libfm/libfm-extra_1.3.2.bb | 5 +++-- meta/recipes-support/libfm/libfm_1.3.2.bb | 5 +++-- meta/recipes-support/libpcre/libpcre_8.45.bb | 5 +++-- 13 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 meta/classes-recipe/sourceforge-releases.bbclass diff --git a/meta/classes-recipe/sourceforge-releases.bbclass b/meta/classes-recipe/sourceforge-releases.bbclass new file mode 100644 index 0000000000..0b5e5d0711 --- /dev/null +++ b/meta/classes-recipe/sourceforge-releases.bbclass @@ -0,0 +1,2 @@ +SOURCEFORGE_PROJECT ?= "${BPN}" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/${SOURCEFORGE_PROJECT}/files/" diff --git a/meta/recipes-bsp/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc index 3d6f75f90f..ba954563b6 100644 --- a/meta/recipes-bsp/acpid/acpid.inc +++ b/meta/recipes-bsp/acpid/acpid.inc @@ -10,7 +10,8 @@ BUGTRACKER = "http://sourceforge.net/p/acpid2/tickets/?source=navbar" SECTION = "base" LICENSE = "GPL-2.0-or-later" -SRC_URI = "${SOURCEFORGE_MIRROR}/acpid2/acpid-${PV}.tar.xz \ +SOURCEFORGE_PROJECT = "acpid2" +SRC_URI = "${SOURCEFORGE_MIRROR}/${SOURCEFORGE_PROJECT}/acpid-${PV}.tar.xz \ file://init \ file://acpid.service \ file://0001-Replace-stat64-with-stat.patch \ @@ -18,7 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/acpid2/acpid-${PV}.tar.xz \ CVE_PRODUCT = "acpid2" -inherit autotools update-rc.d systemd +inherit autotools update-rc.d systemd sourceforge-releases INITSCRIPT_NAME = "acpid" INITSCRIPT_PARAMS = "defaults" diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb index a56a85bdef..8257190568 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb @@ -18,6 +18,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/files/${BP}.tar.bz2 \ " SRC_URI[sha256sum] = "7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c" +inherit sourceforge-releases + COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*|riscv64.*)-linux" COMPATIBLE_HOST:armv4 = 'null' diff --git a/meta/recipes-bsp/setserial/setserial_2.17.bb b/meta/recipes-bsp/setserial/setserial_2.17.bb index 98ab45145f..3241b21f82 100644 --- a/meta/recipes-bsp/setserial/setserial_2.17.bb +++ b/meta/recipes-bsp/setserial/setserial_2.17.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://version.h;beginline=1;endline=6;md5=2e7c59cb9e57e356a DEPENDS += "groff-native" -inherit autotools-brokensep +inherit autotools-brokensep sourceforge-releases SRC_URI = "${SOURCEFORGE_MIRROR}/setserial/${BPN}-${PV}.tar.gz \ file://add_stdlib.patch \ diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb index 9dc5caf87c..085384064d 100644 --- a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb +++ b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb @@ -25,7 +25,7 @@ EXTRA_OEMAKE = "-e MAKEFLAGS= CPPOPTX='${CPPFLAGS}' COPTX='${CFLAGS}' C++OPTX='$ # Stop failures when 'cc' can't be found export ac_cv_prog_CC = "${CC}" -inherit native +inherit sourceforge-releases native # Use -std=gnu89 to build with gcc-14 (https://bugs.gentoo.org/903876) # this needs to be after native inherit (which sets CFLAGS to BUILD_CFLAGS) diff --git a/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb b/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb index 0e155b6c95..8468750434 100644 --- a/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb +++ b/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb @@ -5,10 +5,13 @@ DESCRIPTION = "A collection of autoconf macros, plus an autogen.sh script that c LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}.berlios/${BP}.tar.bz2" +SOURCEFORGE_PROJECT = "${BPN}.berlios" +SRC_URI = "${SOURCEFORGE_MIRROR}/${SOURCEFORGE_PROJECT}/${BP}.tar.bz2" SRC_URI[md5sum] = "074afcb50d0a8bff10786a2954b2b02d" SRC_URI[sha256sum] = "3115603b891f3a163c0bbb5fea2f3742113a183fa6745ee5e89e5f6d0e9f6121" +inherit sourceforge-releases + do_configure() { : } diff --git a/meta/recipes-extended/hdparm/hdparm_9.65.bb b/meta/recipes-extended/hdparm/hdparm_9.65.bb index 1b6af566a2..34d50054ab 100644 --- a/meta/recipes-extended/hdparm/hdparm_9.65.bb +++ b/meta/recipes-extended/hdparm/hdparm_9.65.bb @@ -26,6 +26,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz \ " SRC_URI[sha256sum] = "d14929f910d060932e717e9382425d47c2e7144235a53713d55a94f7de535a4b" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/hdparm/files/hdparm/" EXTRA_OEMAKE = 'STRIP="echo" LDFLAGS="${LDFLAGS}"' diff --git a/meta/recipes-extended/mingetty/mingetty_1.08.bb b/meta/recipes-extended/mingetty/mingetty_1.08.bb index aa5a989df2..00d2564257 100644 --- a/meta/recipes-extended/mingetty/mingetty_1.08.bb +++ b/meta/recipes-extended/mingetty/mingetty_1.08.bb @@ -21,7 +21,7 @@ do_install(){ oe_runmake install DESTDIR=${D} } -inherit update-alternatives +inherit update-alternatives sourceforge-releases ALTERNATIVE:${PN} = "getty" ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.7.bb b/meta/recipes-extended/rpcbind/rpcbind_1.2.7.bb index d308071d29..e186bc35e1 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_1.2.7.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_1.2.7.bb @@ -20,7 +20,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ " SRC_URI[sha256sum] = "f6edf8cdf562aedd5d53b8bf93962d61623292bfc4d47eedd3f427d84d06f37e" -inherit autotools update-rc.d systemd pkgconfig update-alternatives +inherit autotools update-rc.d systemd pkgconfig update-alternatives sourceforge-releases PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" diff --git a/meta/recipes-multimedia/lame/lame_3.100.bb b/meta/recipes-multimedia/lame/lame_3.100.bb index 5b42795f4e..5ace46ace0 100644 --- a/meta/recipes-multimedia/lame/lame_3.100.bb +++ b/meta/recipes-multimedia/lame/lame_3.100.bb @@ -17,7 +17,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \ SRC_URI[md5sum] = "83e260acbe4389b54fe08e0bdbf7cddb" SRC_URI[sha256sum] = "ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e" -inherit autotools pkgconfig +inherit autotools pkgconfig sourceforge-releases PACKAGES += "libmp3lame libmp3lame-dev" FILES:${PN} = "${bindir}/lame" diff --git a/meta/recipes-support/libfm/libfm-extra_1.3.2.bb b/meta/recipes-support/libfm/libfm-extra_1.3.2.bb index eff1b54f73..b7a9b25f86 100644 --- a/meta/recipes-support/libfm/libfm-extra_1.3.2.bb +++ b/meta/recipes-support/libfm/libfm-extra_1.3.2.bb @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://src/fm-extra.h;beginline=8;endline=21;md5=ef1f84da64b SECTION = "x11/libs" DEPENDS = "glib-2.0-native glib-2.0 intltool-native" -SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ +SOURCEFORGE_PROJECT = "pcmanfm" +SRC_URI = "${SOURCEFORGE_MIRROR}/${SOURCEFORGE_PROJECT}/libfm-${PV}.tar.xz \ " SRC_URI[sha256sum] = "a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5" @@ -17,6 +18,6 @@ S = "${WORKDIR}/libfm-${PV}" EXTRA_OECONF = "--with-extra-only --with-gtk=no" -inherit autotools pkgconfig gtk-doc gettext +inherit autotools pkgconfig gtk-doc gettext sourceforge-releases do_configure[dirs] =+ "${S}/m4" diff --git a/meta/recipes-support/libfm/libfm_1.3.2.bb b/meta/recipes-support/libfm/libfm_1.3.2.bb index 1d7609165b..e3cf751716 100644 --- a/meta/recipes-support/libfm/libfm_1.3.2.bb +++ b/meta/recipes-support/libfm/libfm_1.3.2.bb @@ -13,14 +13,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b \ SECTION = "x11/libs" DEPENDS = "glib-2.0 glib-2.0-native pango gtk+3 menu-cache intltool-native libexif libfm-extra" -SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ +SOURCEFORGE_PROJECT = "pcmanfm" +SRC_URI = "${SOURCEFORGE_MIRROR}/${SOURCEFORGE_PROJECT}/libfm-${PV}.tar.xz \ file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch \ file://0001-Do-not-add-library-path-to-avoid-host-contamination.patch \ " SRC_URI[sha256sum] = "a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5" -inherit autotools pkgconfig gtk-doc gettext features_check mime mime-xdg +inherit autotools pkgconfig gtk-doc gettext features_check mime mime-xdg sourceforge-releases ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" EXTRA_OECONF = "--with-gtk=3" diff --git a/meta/recipes-support/libpcre/libpcre_8.45.bb b/meta/recipes-support/libpcre/libpcre_8.45.bb index 17fb6846a5..933bb00de6 100644 --- a/meta/recipes-support/libpcre/libpcre_8.45.bb +++ b/meta/recipes-support/libpcre/libpcre_8.45.bb @@ -7,7 +7,8 @@ HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE;md5=b5d5d1a69a24ea2718263f1ff85a1c58" -SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ +SOURCEFORGE_PROJECT = "pcre" +SRC_URI = "${SOURCEFORGE_MIRROR}/${SOURCEFORGE_PROJECT}/pcre-${PV}.tar.bz2 \ file://run-ptest \ file://Makefile \ " @@ -32,7 +33,7 @@ PACKAGECONFIG[jit] = "--enable-jit=auto,--disable-jit" BINCONFIG = "${bindir}/pcre-config" -inherit autotools binconfig-disabled ptest +inherit autotools binconfig-disabled ptest sourceforge-releases EXTRA_OECONF = "--enable-utf"