From 5640a3bdcd3362d4c47f90ee4d3bce105d66d0d0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Wed, 2 Oct 2019 08:59:44 +0000 Subject: [PATCH] - rel 13; allow poldek to fetch over ftp even if mktime fails (and that can easily happen if there is no tzdata installed). Error manifested itself with: [...] Retrieving th::packages.ndir.md... error: vfff: unknown error Retrying...(#2) [...] --- poldek-notzdata.patch | 12 ++++++++++++ poldek.spec | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 poldek-notzdata.patch diff --git a/poldek-notzdata.patch b/poldek-notzdata.patch new file mode 100644 index 0000000..24ac681 --- /dev/null +++ b/poldek-notzdata.patch @@ -0,0 +1,12 @@ +--- poldek-0.32.2/vfile/vfff/ftp.c~ 2016-01-30 14:05:57.000000000 +0000 ++++ poldek-0.32.2/vfile/vfff/ftp.c 2019-10-02 08:50:20.832444438 +0000 +@@ -654,6 +654,9 @@ + tm.tm_year -= 1900; + tm.tm_mon -= 1; + ts = mktime(&tm); ++ /* We can't do much if time can't be represented */ ++ if (ts < 0) ++ return 0; + } + return ts; + } diff --git a/poldek.spec b/poldek.spec index 013a819..5d725a6 100644 --- a/poldek.spec +++ b/poldek.spec @@ -34,7 +34,7 @@ %define ver_rpm 5.4.10 %endif -%define rel 12 +%define rel 13 Summary: RPM packages management helper tool Summary(hu.UTF-8): RPM csomagkezelést segítő eszköz Summary(pl.UTF-8): Pomocnicze narzędzie do zarządzania pakietami RPM @@ -69,6 +69,7 @@ Patch5: python-fix.patch Patch6: poldek-ext-down-enable.patch Patch7: multiple-options.patch Patch8: openssl.patch +Patch9: poldek-notzdata.patch URL: http://poldek.pld-linux.org/ BuildRequires: %{db_pkg}-devel >= %{ver_db}-%{ver_db_rel} BuildRequires: autoconf @@ -238,6 +239,7 @@ Moduły języka Python dla poldka. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %{__rm} m4/libtool.m4 m4/lt*.m4 -- 2.44.0