- https-redirect.patch from PLD

diff --git a/poldek-https-redirect.patch b/poldek-https-redirect.patch
new file mode 100644 (file)
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 f4699fc4a4da345a38f9a27a660d7b95b3acef8d..5d9f58a60b88c6b3866c918796b679d7ffff5958 100644 (file)
--- 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
 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
 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
 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
 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
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1

+%patch24 -p1

 
 %{__rm} doc/poldek.info
 %{__rm} m4/libtool.m4 m4/lt*.m4
 
 %{__rm} doc/poldek.info
 %{__rm} m4/libtool.m4 m4/lt*.m4