diff --git a/0001-build-support-curl-7.62.patch b/0001-build-support-curl-7.62.patch deleted file mode 100644 index 2788d18..0000000 --- a/0001-build-support-curl-7.62.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7f2fb1be2aaef984cfa535b77eee3b3f14374ae2 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Fri, 16 Nov 2018 12:50:22 +0100 -Subject: [PATCH] build: support curl >= 7.62 -References: https://github.com/bji/libs3/pull/87 - -libs3 fails to build with 7.62 currently: - - src/request.c: In function 'request_curl_code_to_status': - src/request.c:1703:5: error: duplicate case value - case CURLE_SSL_CACERT: - src/request.c:1699:5: note: previously used here - case CURLE_PEER_FAILED_VERIFICATION: ---- - src/request.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/request.c b/src/request.c -index 4d43cf9..6d0a6c3 100644 ---- a/src/request.c -+++ b/src/request.c -@@ -1719,7 +1719,9 @@ S3Status request_curl_code_to_status(CURLcode code) - #else - case CURLE_SSL_PEER_CERTIFICATE: - #endif -+#if LIBCURL_VERSION_NUM < 0x073e00 - case CURLE_SSL_CACERT: -+#endif - return S3StatusServerFailedVerification; - default: - return S3StatusInternalError; --- -2.19.1 - diff --git a/debian.changelog b/debian.changelog deleted file mode 100644 index 1ba0bb6..0000000 --- a/debian.changelog +++ /dev/null @@ -1,5 +0,0 @@ -libs3 (4.1.git266-0) stable; urgency=low - - * OBS needs a way to convert .changes to debian.changelog - - -- Development Fri, 04 Nov 2016 00:00:00 +0000 diff --git a/debian.compat b/debian.compat deleted file mode 100644 index 7ee83b6..0000000 --- a/debian.compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/debian.control b/debian.control deleted file mode 100644 index 0be0e27..0000000 --- a/debian.control +++ /dev/null @@ -1,24 +0,0 @@ -Source: libs3 -Section: net -Priority: extra -Maintainer: Laszlo Boszormenyi (GCS) -Build-Depends: debhelper (>= 8), libxml2-dev, libcurl4-gnutls-dev, - libssl-dev, autotools-dev, dh-autoreconf, pkg-config -Standards-Version: 3.9.3 -Homepage: http://libs3.ischo.com/index.html - -Package: libs3-4 -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: C Library and Tools for Amazon S3 Access - This package includes the libs3 shared object library, needed to run - applications compiled against libs3, and additionally contains the s3 - utility for accessing Amazon S3. - -Package: libs3-dev -Architecture: any -Section: libdevel -Depends: ${misc:Depends}, libs3-4 (= ${binary:Version}) -Description: C Development Library for Amazon S3 Access - This package includes the libs3 header, needed to compile applications - against libs3. diff --git a/debian.libs3-4.install b/debian.libs3-4.install deleted file mode 100644 index 79af1aa..0000000 --- a/debian.libs3-4.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libs3.so.* -usr/bin/s3 diff --git a/debian.libs3-dev.install b/debian.libs3-dev.install deleted file mode 100644 index 0b96b05..0000000 --- a/debian.libs3-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/ -usr/lib/libs3.so diff --git a/debian.rules b/debian.rules deleted file mode 100644 index f746fcf..0000000 --- a/debian.rules +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/make -f -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -%: - mkdir -p m4 - dh $@ --parallel --with autoreconf diff --git a/debian.series b/debian.series deleted file mode 100644 index a5d7b2c..0000000 --- a/debian.series +++ /dev/null @@ -1,2 +0,0 @@ -s3-am.diff -p1 -0001-build-support-curl-7.62.patch diff --git a/libs3-4.1.git266.tar.xz b/libs3-4.1.git266.tar.xz deleted file mode 100644 index 6f4a51d..0000000 --- a/libs3-4.1.git266.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08b345fe3fd66593a3fc4f4365af925599fabb966c314bb9d609f7ffd9fa106b -size 189484 diff --git a/libs3-4.1.git277.tar.xz b/libs3-4.1.git277.tar.xz new file mode 100644 index 0000000..3e566ee --- /dev/null +++ b/libs3-4.1.git277.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ed986038c9f70507625ddc04ed24a6668eadf34994fc3e3749e6b7087cdc2b8 +size 92872 diff --git a/libs3.changes b/libs3.changes index ea5cd4a..7c8edc3 100644 --- a/libs3.changes +++ b/libs3.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue May 28 10:31:17 UTC 2019 - Jan Engelhardt + +- Update to new snapshot 4.1.git277 (287e4bee) + * Fix a memory leak + * Support curl >= 7.62 + * Fix bug on S3_initiate_multipart + * Increase MULTIPART_CHUNK_SIZE and maximum object size +- Removed 0001-build-support-curl-7.62.patch (upstreamed) + ------------------------------------------------------------------- Fri Nov 16 11:55:00 UTC 2018 - Jan Engelhardt diff --git a/libs3.dsc b/libs3.dsc deleted file mode 100644 index 7040959..0000000 --- a/libs3.dsc +++ /dev/null @@ -1,11 +0,0 @@ -Format: 1.0 -Source: libs3 -Binary: libs3-4, libs3-dev -Architecture: any -DEBTRANSFORM-RELEASE: 1 -Version: 4.1.git266-0 -Homepage: http://libs3.ischo.com/index.html -Standards-Version: 3.9.3 -Build-Depends: debhelper (>= 8), libxml2-dev, libcurl4-gnutls-dev, - libssl-dev, autotools-dev, dh-autoreconf, pkg-config -Files: diff --git a/libs3.spec b/libs3.spec index bf9f74d..0cd2549 100644 --- a/libs3.spec +++ b/libs3.spec @@ -1,7 +1,7 @@ # # spec file for package libs3 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,11 @@ # -%define version_unconverted 4.1.git266 +%define version_unconverted 4.1.git277 Name: libs3 %define lname libs3-4 -Version: 4.1.git266 +Version: 4.1.git277 Release: 0 Summary: C Library and tools for Amazon S3 access License: GPL-2.0-or-later OR LGPL-3.0-or-later @@ -28,8 +28,7 @@ Group: Development/Libraries/C and C++ Url: https://aws.amazon.com/developertools/Amazon-S3/1648 Source: %name-%version.tar.xz -Patch1: 0001-build-support-curl-7.62.patch -Patch2: s3-am.diff +Patch1: s3-am.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: libtool >= 2 @@ -71,8 +70,7 @@ Group: System/Management A command-line frontend for Amazon S3 access. %prep -%setup -q -%patch -P 1 -P 2 -p1 +%autosetup -p1 %build mkdir -p m4