From 65491f7223813b67f69fa1d739843886cee68400 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 9 Jul 2023 12:37:41 +0200 Subject: [PATCH 1/2] - updated URL, we no longer support FTP --- poldek.spec | 2 +- tld-debuginfo.conf | 2 +- tld-multilib.conf | 4 ++-- tld.conf | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poldek.spec b/poldek.spec index 2e7c7ce..f4699fc 100644 --- a/poldek.spec +++ b/poldek.spec @@ -16,7 +16,7 @@ Summary(hu.UTF-8): RPM csomagkezelést segítő eszköz Summary(pl.UTF-8): Pomocnicze narzędzie do zarządzania pakietami RPM Name: poldek Version: 0.42.2 -Release: 16 +Release: 17 License: GPL v2 Group: Applications/System #Source0: http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2 diff --git a/tld-debuginfo.conf b/tld-debuginfo.conf index 7e5e262..a05b226 100644 --- a/tld-debuginfo.conf +++ b/tld-debuginfo.conf @@ -1,7 +1,7 @@ # TLD Linux - https://tld-linux.org/ _arch = %ARCH% -_prefix = ftp://ftp.tld-linux.org/TLD +_prefix = https://dist.tld-linux.org/TLD _branch = stable ############################################################ diff --git a/tld-multilib.conf b/tld-multilib.conf index 810a4cd..8743303 100644 --- a/tld-multilib.conf +++ b/tld-multilib.conf @@ -1,7 +1,7 @@ -# TLD Linux - http://www.tld-linux.org/ +# TLD Linux - https://www.tld-linux.org/ _arch = %ARCH% -_prefix = ftp://ftp.tld-linux.org/TLD +_prefix = https://dist.tld-linux.org/TLD _branch = stable ############################################################ diff --git a/tld.conf b/tld.conf index 1663d7f..4dfcfe1 100644 --- a/tld.conf +++ b/tld.conf @@ -1,7 +1,7 @@ # TLD Linux - https://tld-linux.org/ _arch = %ARCH% -_prefix = ftp://ftp.tld-linux.org/TLD +_prefix = https://dist.tld-linux.org/TLD _branch = stable ############################################################ -- 2.44.0 From 536643574c646e7cb115789db1292d95c35362f9 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 26 Apr 2024 00:52:54 +0200 Subject: [PATCH 2/2] - https-redirect.patch from PLD --- poldek-https-redirect.patch | 15 +++++++++++++++ poldek.spec | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 poldek-https-redirect.patch diff --git a/poldek-https-redirect.patch b/poldek-https-redirect.patch new file mode 100644 index 0000000..4a7cb8c --- /dev/null +++ b/poldek-https-redirect.patch @@ -0,0 +1,15 @@ +--- poldek-0.42.2/vfile/vfffmod.c.orig 2020-01-25 22:59:59.000000000 +0100 ++++ poldek-0.42.2/vfile/vfffmod.c 2023-10-19 14:05:44.263325854 +0200 +@@ -269,10 +269,10 @@ + char topath[PATH_MAX + 128], *topathp = vreq.redirected_to; + int foreign_proto = 0; + +- n_assert(cn->proto == VCN_PROTO_HTTP); ++ n_assert(cn->proto == VCN_PROTO_HTTP || cn->proto == VCN_PROTO_HTTPS); + + if (*vreq.redirected_to == '/') { +- snprintf(topath, sizeof(topath), "http://%s%s", req->host, ++ snprintf(topath, sizeof(topath), "http%s://%s%s", cn->proto == VCN_PROTO_HTTPS ? "s" : "" , req->host, + vreq.redirected_to); + topathp = topath; + } else if (strncmp(vreq.redirected_to, "http://", 7) != 0) diff --git a/poldek.spec b/poldek.spec index f4699fc..5d9f58a 100644 --- a/poldek.spec +++ b/poldek.spec @@ -16,7 +16,7 @@ Summary(hu.UTF-8): RPM csomagkezelést segítő eszköz Summary(pl.UTF-8): Pomocnicze narzędzie do zarządzania pakietami RPM Name: poldek Version: 0.42.2 -Release: 17 +Release: 18 License: GPL v2 Group: Applications/System #Source0: http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2 @@ -54,6 +54,7 @@ Patch20: boolean-deps.patch Patch21: sorted-ls-upgradable.patch Patch22: egrep-is-obsolete.patch Patch23: minus.patch +Patch24: %{name}-https-redirect.patch URL: http://poldek.pld-linux.org/ BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1:1.11 @@ -246,6 +247,7 @@ cd .. %patch21 -p1 %patch22 -p1 %patch23 -p1 +%patch24 -p1 %{__rm} doc/poldek.info %{__rm} m4/libtool.m4 m4/lt*.m4 -- 2.44.0