Skip to contentSkip to conversation

convert remaining ftp SRC_URIs to https/http

PATCH In review [email protected] 1 participant 7 messages Apr 9, 2024 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

cover convert remaining ftp SRC_URIs to https/http

From: Randy MacLeod <[email protected]>

Fedora 40 is switching to wget2:
https://fedoraproject.org/wiki/Releases/40/ChangeSet?ref=news.itsfoss.com#Wget2_as_wget
which is rumoured to have dropped support for --passive-ftp and more and more firewalls are blocking ftp trafic so covert the 5 packages in meta-openembedded that are still using ftp in their SRC_URI to https or http.

Also clean up some HOMEPAGE links and drop some obsolete SRC_URI[md5sum]s.

Randy MacLeod (5):
ncftp: Upgrade to 3.2.7
pimd: switch SRC_URI to https
tnftp: switch the SRC_URI to https
postfix: switch SRC_URI to http
libmad: switch links/SRC_URI to https sites

 .../ncftp/ncftp/ncftp-3.2.5-gcc10.patch       | 83 -------------------
 .../ncftp/{ncftp_3.2.6.bb => ncftp_3.2.7.bb}  |  6 +-
 .../recipes-daemons/postfix/postfix_3.8.6.bb  |  2 +-
 .../recipes-support/pimd/pimd_2.3.2.bb        |  3 +-
 .../recipes-support/tnftp/tnftp_20230507.bb   |  2 +-
 .../libmad/libmad_0.15.1b.bb                  |  7 +-
 6 files changed, 8 insertions(+), 95 deletions(-)
 delete mode 100644 meta-networking/recipes-daemons/ncftp/ncftp/ncftp-3.2.5-gcc10.patch
 rename meta-networking/recipes-daemons/ncftp/{ncftp_3.2.6.bb => ncftp_3.2.7.bb} (79%)
Signature · 1 line
2.43.0
#1 lore raw

PATCH 1/5 ncftp: Upgrade to 3.2.7

From: Randy MacLeod <[email protected]>

Switch the SRC_URI from "ftp:" to "https:". Drop the obsolete SRC_URI[md5sum]. Drop ncftp-3.2.5-gcc10.patch since we're using gcc13 and upstream has fixed the build to work by adding an extern to sh_util/gpshare.c for example.

---
 .../ncftp/ncftp/ncftp-3.2.5-gcc10.patch       | 83 -------------------
 .../ncftp/{ncftp_3.2.6.bb => ncftp_3.2.7.bb}  |  6 +-
 2 files changed, 2 insertions(+), 87 deletions(-)
 delete mode 100644 meta-networking/recipes-daemons/ncftp/ncftp/ncftp-3.2.5-gcc10.patch
 rename meta-networking/recipes-daemons/ncftp/{ncftp_3.2.6.bb => ncftp_3.2.7.bb} (79%)
meta-networking/recipes-daemons/ncftp/ncftp/ncftp-3.2.5-gcc10.patch deleted +0 -83
deleted file mode 100644
index 5dee824d7..000000000
@@ -1,83 +0,0 @@
-Fix build with -fno-common
-
-Patch from https://src.fedoraproject.org/rpms/ncftp/raw/master/f/ncftp-3.2.5-gcc10.patch
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
-
---- a/ncftp/bookmark.h
-+++ b/ncftp/bookmark.h
-@@ -29,6 +29,8 @@ typedef struct Bookmark {
-     int             reserved;
- } Bookmark;
- 
-+extern Bookmark gBm;
-+
- #define kBookmarkVersion		8
- #define kBookmarkMinVersion		3
- #if (defined(WIN32) || defined(_WINDOWS)) && !defined(__CYGWIN__)
---- a/ncftp/cmds.c
-+++ b/ncftp/cmds.c
-@@ -98,7 +98,7 @@ extern char gPager[], gHome[], gShell[];
- extern char gOS[];
- extern int gAutoResume;
- extern int gAutoSaveChangesToExistingBookmarks;
--extern Bookmark gBm;
-+//extern Bookmark gBm;
- extern int gLoadedBm, gConfirmClose, gSavePasswords, gScreenColumns;
- extern char gLocalCWD[512], gPrevLocalCWD[512];
- extern int gMayCancelJmp;
---- a/ncftp/main.c
-+++ b/ncftp/main.c
-@@ -38,7 +38,7 @@ extern int gUnprocessedJobs;
- char gLocalCWD[512], gPrevLocalCWD[512];
- 
- extern char gRemoteCWD[512], gPrevRemoteCWD[512];
--extern Bookmark gBm;
-+//extern Bookmark gBm;
- extern int gLoadedBm;
- extern int gFirewallType;
- extern char gAutoAscii[];
---- a/sh_util/gpshare.c
-+++ b/sh_util/gpshare.c
-@@ -28,7 +28,7 @@
- 
- static int gIsAtty1 = 1, gIsAtty2 = 1;
- extern int gLoadedBm, gBookmarkMatchMode;
--Bookmark gBm;
-+//Bookmark gBm;
- 
- double
- FileSize(double size, const char **uStr0, double *uMult0)
---- a/sh_util/ncftpget.c
-+++ b/sh_util/ncftpget.c
-@@ -40,7 +40,7 @@ extern unsigned int gFirewallPort;
- extern char gFirewallExceptionList[256];
- extern int gFwDataPortMode;
- extern const char gOS[], gVersion[];
--extern Bookmark gBm;
-+//extern Bookmark gBm;
- 
- static void
- #if (defined(__GNUC__)) && (__GNUC__ >= 2)
---- a/sh_util/ncftpls.c
-+++ b/sh_util/ncftpls.c
-@@ -39,7 +39,7 @@ extern unsigned int gFirewallPort;
- extern char gFirewallExceptionList[256];
- extern int gFwDataPortMode;
- extern const char gOS[], gVersion[];
--extern Bookmark gBm;
-+//extern Bookmark gBm;
- 
- static int FTPRemoteRecursiveMList(FTPCIPtr cip, const char *const rdir, /* FTPFileInfoListPtr files, */ FTPLineListPtr lines);
- 
---- a/sh_util/ncftpput.c
-+++ b/sh_util/ncftpput.c
-@@ -41,7 +41,6 @@ extern unsigned int gFirewallPort;
- extern char gFirewallExceptionList[256];
- extern int gFwDataPortMode;
- extern const char gOS[], gVersion[];
--extern Bookmark gBm;
- extern int gSendfileInProgress;
- 
- static void
meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb renamed from meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb +2 -4
similarity index 79%
rename from meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb
rename to meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb
index e66325c83..15bb00a3a 100644
@@ -5,14 +5,12 @@ LICENSE = "ClArtistic"
 LIC_FILES_CHKSUM = "file://ncftp/cmds.c;beginline=3;endline=4;md5=9c2390809f71465aa7ff76e03dc14d91"
 DEPENDS = "ncurses"
 
-SRC_URI = "ftp://ftp.ncftp.com/${BPN}/${BP}-src.tar.xz \
+SRC_URI = "https://www.ncftp.com/public_ftp/ncftp/${BP}-src.tar.xz \
            file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \
            file://unistd.patch \
-           file://ncftp-3.2.5-gcc10.patch \
            file://0001-Forward-port-defining-PREFIX_BINDIR-to-use-new-autoc.patch \
            "
-SRC_URI[md5sum] = "42d0f896d69a4d603ec097546444245f"
-SRC_URI[sha256sum] = "5f200687c05d0807690d9fb770327b226f02dd86155b49e750853fce4e31098d"
+SRC_URI[sha256sum] = "d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8"
 
 inherit autotools-brokensep pkgconfig
 
Signature · 1 line
2.43.0
#2 lore raw

PATCH 2/5 pimd: switch SRC_URI to https

In reply to [email protected]

From: Randy MacLeod <[email protected]>

Switch SRC_URI to https (yes, the URI still has ftp in the path!). Also drop the obsolete SRC_URI[md5sum].

---
 meta-networking/recipes-support/pimd/pimd_2.3.2.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta-networking/recipes-support/pimd/pimd_2.3.2.bb +1 -2
index 2b622ae6d..647f9df51 100644
@@ -4,10 +4,9 @@ SECTION = "net"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=94f108f91fab720d62425770b70dd790"
 
-SRC_URI = "ftp://ftp.troglobit.com/pimd/${BP}.tar.gz \
+SRC_URI = "https://ftp.troglobit.com/pimd/${BP}.tar.gz \
            file://0001-configure-Dont-use-uname-to-determine-target-OS.patch \
            "
-SRC_URI[md5sum] = "a3c03e40540980b2c06e265a17988e60"
 SRC_URI[sha256sum] = "c77a9812751f114490a28a6839b16aac8b020c8d9fd6aa22bf3880c054e19f1d"
 
 EXTRA_OECONF:append:libc-musl = " --embedded-libc"
Signature · 1 line
2.43.0
#3 lore raw

PATCH 3/5 tnftp: switch the SRC_URI to https

In reply to [email protected]

From: Randy MacLeod <[email protected]>

---
 meta-networking/recipes-support/tnftp/tnftp_20230507.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-support/tnftp/tnftp_20230507.bb +1 -1
index 79c3dadea..bdd9759f2 100644
@@ -14,7 +14,7 @@ LICENSE = "BSD-2-Clause"
 
 DEPENDS = "ncurses"
 
-SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \
+SRC_URI = "https://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \
            file://0001-libedit-Include-missing-header-stdc-predef.h.patch \
 "
 
Signature · 1 line
2.43.0
#4 lore raw

PATCH 4/5 postfix: switch SRC_URI to http

In reply to [email protected]

From: Randy MacLeod <[email protected]>

Switch the SRC_URI to http since the postfix site does not yet use https.

---
 meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb +1 -1
index 0e433bb51..3ec7f22ad 100644
@@ -14,7 +14,7 @@ DEPENDS = "db icu libpcre libnsl2 m4-native openssl postfix-native \
 LICENSE = "IPL-1.0 | EPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b181651ad99a7dc4cc8c4ce2f491ed1a"
 
-SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \
+SRC_URI = "http://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \
            file://main.cf \
            file://postfix \
            file://internal_recipient \
Signature · 1 line
2.43.0
#5 lore raw

PATCH 5/5 libmad: switch links/SRC_URI to https sites

In reply to [email protected]

From: Randy MacLeod <[email protected]>

Switch to the sourceforge SRC_URI since the mars.org site only supports ftp. Also switch the HOMEPAGE and BUGTRACKER links over to https.
and drop the obsolete SRC_URI[md5sum].

---
 meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb +3 -4
index d0171f3b9..e70c8e3ed 100644
@@ -1,6 +1,6 @@
 SUMMARY = "MPEG Audio Decoder library"
-HOMEPAGE = "http://sourceforge.net/projects/mad/"
-BUGTRACKER = "http://sourceforge.net/tracker/?group_id=12349&atid=112349"
+HOMEPAGE = "https://sourceforge.net/projects/mad/"
+BUGTRACKER = "https://sourceforge.net/tracker/?group_id=12349&atid=112349"
 LICENSE = "GPL-2.0-or-later"
 LICENSE_FLAGS = "commercial"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 SECTION = "libs"
 DEPENDS = "libid3tag"
 
-SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz \
+SRC_URI = "https://downloads.sourceforge.net/mad/libmad-${PV}.tar.gz \
     file://no-force-mem.patch \
     file://add-pkgconfig.patch \
     file://fix_for_mips_with_gcc-4.5.0.patch \
@@ -19,7 +19,6 @@ SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz \
 "
 SRC_URI:append:toolchain-clang = " file://0004-Remove-clang-unsupported-compiler-flags.patch "
 
-SRC_URI[md5sum] = "1be543bc30c56fb6bea1d7bf6a64e66c"
 SRC_URI[sha256sum] = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"
 
 S = "${WORKDIR}/libmad-${PV}"
Signature · 1 line
2.43.0

A message that is not in the archive (sent off-list or not yet received): [email protected]

#7 lore raw

Re: [oe] [PATCH 5/5] libmad: switch links/SRC_URI to https sites

Quoted 5 lines · Randy MacLeod via lists.openembedded.org

From: Randy MacLeod<[email protected]>

Switch to the sourceforge SRC_URI since the mars.org site only supports ftp. Also switch the HOMEPAGE and BUGTRACKER links over to https.
and drop the obsolete SRC_URI[md5sum].

For "future me" or anyone else interested, there's a well-maintained (?) fork of libmad here:

https://codeberg.org/tenacityteam/libmad

I don't have time to do the update this week so I just made the changes submitted here.

../Randy

Quoted 43 lines
---
  meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb +2 -2
index d0171f3b9..e70c8e3ed 100644
@@ -1,6 +1,6 @@
  SUMMARY = "MPEG Audio Decoder library"
-HOMEPAGE ="http://sourceforge.net/projects/mad/"
-BUGTRACKER ="http://sourceforge.net/tracker/?group_id=12349&atid=112349"
+HOMEPAGE ="https://sourceforge.net/projects/mad/"
+BUGTRACKER ="https://sourceforge.net/tracker/?group_id=12349&atid=112349"
  LICENSE = "GPL-2.0-or-later"
  LICENSE_FLAGS = "commercial"
  LIC_FILES_CHKSUM ="file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ @@ -9,7 +9,7 @@ 

LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
SECTION = "libs"
DEPENDS = "libid3tag"

meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb +0 -3
-SRC_URI ="ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz \ +SRC_URI = "https://downloads.sourceforge.net/mad/libmad-${PV}.tar.gz \
      file://no-force-mem.patch \
      file://add-pkgconfig.patch \
      file://fix_for_mips_with_gcc-4.5.0.patch \
@@ -19,7 +19,6 @@ SRC_URI ="ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz \ "
  SRC_URI:append:toolchain-clang =" file://0004-Remove-clang-unsupported-compiler-flags.patch "
 
-SRC_URI[md5sum] = "1be543bc30c56fb6bea1d7bf6a64e66c"
  SRC_URI[sha256sum] = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"
 
  S = "${WORKDIR}/libmad-${PV}"
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#109885):https://lists.openembedded.org/g/openembedded-devel/message/109885 Mute This Topic:https://lists.openembedded.org/mt/105429777/3616765
Group Owner:[email protected] Unsubscribe:https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 2 lines
# Randy MacLeod
# Wind River Linux