From f6e0eaa0644d816909e2be1d3fe2468ca6a089832c083c964d2e17e966f3bbc5 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 10 May 2019 14:26:12 +0000 Subject: [PATCH 1/4] - Upgrade to 1.10.1 + Clean up target->curl_handle rather than target->handle (rh#1694411) + Add an option to preserve timestamps of the downloaded files (rh#1688537) + Fix fetching repositories supplied by SUSE Customer Center + [tests] Wait for server to start instead of doing arbitrary sleep - Drop patch included in this release * Patch: librepo-PR148-clean-up-curl-target_handle.patch OBS-URL: https://build.opensuse.org/package/show/system:packagemanager:dnf/librepo?expand=0&rev=17 --- librepo-1.10.1.tar.gz | 3 ++ librepo-1.9.6.tar.gz | 3 -- ...po-PR148-clean-up-curl-target_handle.patch | 28 ------------------- librepo.changes | 11 ++++++++ librepo.spec | 7 ++--- 5 files changed, 16 insertions(+), 36 deletions(-) create mode 100644 librepo-1.10.1.tar.gz delete mode 100644 librepo-1.9.6.tar.gz delete mode 100644 librepo-PR148-clean-up-curl-target_handle.patch diff --git a/librepo-1.10.1.tar.gz b/librepo-1.10.1.tar.gz new file mode 100644 index 0000000..cdf9482 --- /dev/null +++ b/librepo-1.10.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43ef5a1e02a269674f38a434eec9e320b4ec9a9d3cfaa402c0f6789d706785f5 +size 811172 diff --git a/librepo-1.9.6.tar.gz b/librepo-1.9.6.tar.gz deleted file mode 100644 index da85c05..0000000 --- a/librepo-1.9.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d16ef973c29b93ea82dba1ea92d6979eed0ec322869f445acda11acfa43bba7f -size 810407 diff --git a/librepo-PR148-clean-up-curl-target_handle.patch b/librepo-PR148-clean-up-curl-target_handle.patch deleted file mode 100644 index bd55846..0000000 --- a/librepo-PR148-clean-up-curl-target_handle.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e7d7a50ef8a6c2ac1c3492a15fffaab68546a49f Mon Sep 17 00:00:00 2001 -From: Jonathan Dieter -Date: Sun, 31 Mar 2019 18:04:32 +0100 -Subject: [PATCH] Clean up target->curl_handle rather than target->handle - -Cleaning up target->handle causes a segfault when this codepath is run, so -this patch fixes it so we clean up target->curl_handle - -Signed-off-by: Jonathan Dieter ---- - librepo/downloader.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/librepo/downloader.c b/librepo/downloader.c -index d7e2d70..9650f07 100644 ---- a/librepo/downloader.c -+++ b/librepo/downloader.c -@@ -1451,8 +1451,8 @@ prepare_next_transfer(LrDownload *dd, gboolean *candidatefound, GError **err) - if(target->zck_state == LR_ZCK_DL_FINISHED) { - g_debug("%s: Target already fully downloaded: %s", __func__, target->target->path); - target->state = LR_DS_FINISHED; -- curl_easy_cleanup(target->handle); -- target->handle = NULL; -+ curl_easy_cleanup(target->curl_handle); -+ target->curl_handle = NULL; - g_free(target->headercb_interrupt_reason); - target->headercb_interrupt_reason = NULL; - fclose(target->f); diff --git a/librepo.changes b/librepo.changes index 6ea8831..8c96054 100644 --- a/librepo.changes +++ b/librepo.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri May 10 14:21:16 UTC 2019 - Neal Gompa + +- Upgrade to 1.10.1 + + Clean up target->curl_handle rather than target->handle (rh#1694411) + + Add an option to preserve timestamps of the downloaded files (rh#1688537) + + Fix fetching repositories supplied by SUSE Customer Center + + [tests] Wait for server to start instead of doing arbitrary sleep +- Drop patch included in this release + * Patch: librepo-PR148-clean-up-curl-target_handle.patch + ------------------------------------------------------------------- Sun Mar 31 18:26:16 UTC 2019 - Neal Gompa diff --git a/librepo.spec b/librepo.spec index e0746d1..5bb7e08 100644 --- a/librepo.spec +++ b/librepo.spec @@ -29,7 +29,7 @@ %define devname %{name}-devel Name: librepo -Version: 1.9.6 +Version: 1.10.1 Release: 0 Summary: Repodata downloading library License: LGPL-2.0-or-later @@ -38,10 +38,6 @@ Group: Development/Libraries/C and C++ URL: https://github.com/rpm-software-management/librepo Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# Patches proposed upstream -## Clean up target->curl_handle rather than target->handle (rh#1694411) -Patch0101: librepo-PR148-clean-up-curl-target_handle.patch - BuildRequires: cmake BuildRequires: doxygen BuildRequires: gpgme-devel @@ -87,6 +83,7 @@ BuildRequires: python3-devel BuildRequires: python3-gpg BuildRequires: python3-Flask BuildRequires: python3-nose +BuildRequires: python3-requests %endif BuildRequires: python3-Sphinx BuildRequires: python3-xattr From 0f4f1caeece041920dc1b837afa4b8accf53ea07d3ea7bd8a395090d99618502 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 10 May 2019 14:57:13 +0000 Subject: [PATCH 2/4] - Disable executing test suite on ARM and RISC-V due to performance issues with builders OBS-URL: https://build.opensuse.org/package/show/system:packagemanager:dnf/librepo?expand=0&rev=18 --- librepo.changes | 1 + librepo.spec | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/librepo.changes b/librepo.changes index 8c96054..928653d 100644 --- a/librepo.changes +++ b/librepo.changes @@ -8,6 +8,7 @@ Fri May 10 14:21:16 UTC 2019 - Neal Gompa + [tests] Wait for server to start instead of doing arbitrary sleep - Drop patch included in this release * Patch: librepo-PR148-clean-up-curl-target_handle.patch +- Disable executing test suite on ARM and RISC-V due to performance issues with builders ------------------------------------------------------------------- Sun Mar 31 18:26:16 UTC 2019 - Neal Gompa diff --git a/librepo.spec b/librepo.spec index 5bb7e08..cc97794 100644 --- a/librepo.spec +++ b/librepo.spec @@ -17,7 +17,13 @@ # +%ifarch %{arm} aarc64 riscv64 +# Don't run tests on ARM and RISC-V for now. There are problems +# with performance on the builders and often these time out. +%bcond_with tests +%else %bcond_without tests +%endif # zchunk is only available in Leap 15.1 and newer %if 0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550 From 37cdda5223a7d344d70568648f583c94226ef1304a2b1b8dd8db8a402e69a655 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 11 May 2019 02:38:54 +0000 Subject: [PATCH 3/4] Fix typo on ifarch statement OBS-URL: https://build.opensuse.org/package/show/system:packagemanager:dnf/librepo?expand=0&rev=19 --- librepo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/librepo.spec b/librepo.spec index cc97794..db93119 100644 --- a/librepo.spec +++ b/librepo.spec @@ -17,7 +17,7 @@ # -%ifarch %{arm} aarc64 riscv64 +%ifarch %{arm} aarch64 riscv64 # Don't run tests on ARM and RISC-V for now. There are problems # with performance on the builders and often these time out. %bcond_with tests From d994ace9bb4f72242d1b4fe749e12185afb23144ad892767e1bdf4c89d2e6bbf Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 12 May 2019 02:59:53 +0000 Subject: [PATCH 4/4] - Upgrade to 1.10.2 + Fix librepo isn't able to load zchunk files from next server on failure (rh#1706321) OBS-URL: https://build.opensuse.org/package/show/system:packagemanager:dnf/librepo?expand=0&rev=20 --- librepo-1.10.1.tar.gz | 3 --- librepo-1.10.2.tar.gz | 3 +++ librepo.changes | 6 ++++++ librepo.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 librepo-1.10.1.tar.gz create mode 100644 librepo-1.10.2.tar.gz diff --git a/librepo-1.10.1.tar.gz b/librepo-1.10.1.tar.gz deleted file mode 100644 index cdf9482..0000000 --- a/librepo-1.10.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43ef5a1e02a269674f38a434eec9e320b4ec9a9d3cfaa402c0f6789d706785f5 -size 811172 diff --git a/librepo-1.10.2.tar.gz b/librepo-1.10.2.tar.gz new file mode 100644 index 0000000..890b489 --- /dev/null +++ b/librepo-1.10.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec33e30dc91599b730a7d2adacc8e04fbf74a67d725733bb1b22e1b48fbf8ef3 +size 811190 diff --git a/librepo.changes b/librepo.changes index 928653d..473be51 100644 --- a/librepo.changes +++ b/librepo.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun May 12 02:58:52 UTC 2019 - Neal Gompa + +- Upgrade to 1.10.2 + + Fix librepo isn't able to load zchunk files from next server on failure (rh#1706321) + ------------------------------------------------------------------- Fri May 10 14:21:16 UTC 2019 - Neal Gompa diff --git a/librepo.spec b/librepo.spec index db93119..7efb17e 100644 --- a/librepo.spec +++ b/librepo.spec @@ -35,7 +35,7 @@ %define devname %{name}-devel Name: librepo -Version: 1.10.1 +Version: 1.10.2 Release: 0 Summary: Repodata downloading library License: LGPL-2.0-or-later