c_cpp/libs3
SHA256
8
0
Fork 0
forked from pool/libs3
Code Pull Requests Activity

Accepting request 706377 from server:mail:kopano

Browse Source 
- Update to new snapshot 4.1.git277 (287e4bee)

OBS-URL: https://build.opensuse.org/request/show/706377
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libs3?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger
2019-07-12 09:59:46 +00:00
committed by Git OBS Bridge
parent 7821fc0595
commit b35a8aa8c8
13 changed files with 18 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
0001-build-support-curl-7.62.patch
View File

@@ -1,34 +0,0 @@
From 7f2fb1be2aaef984cfa535b77eee3b3f14374ae2 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
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

5
debian.changelog
View File

@@ -1,5 +0,0 @@
libs3 (4.1.git266-0) stable; urgency=low
* OBS needs a way to convert .changes to debian.changelog
-- Development <development@kopano.io> Fri, 04 Nov 2016 00:00:00 +0000

1
debian.compat
View File

@@ -1 +0,0 @@
8

24
debian.control
View File

@@ -1,24 +0,0 @@
Source: libs3
Section: net
Priority: extra
Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
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.

2
debian.libs3-4.install
View File

@@ -1,2 +0,0 @@
usr/lib/libs3.so.*
usr/bin/s3

2
debian.libs3-dev.install
View File

@@ -1,2 +0,0 @@
usr/include/
usr/lib/libs3.so

9
debian.rules
View File

@@ -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

2
debian.series
View File

@@ -1,2 +0,0 @@
s3-am.diff -p1
0001-build-support-curl-7.62.patch

3
libs3-4.1.git266.tar.xz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:08b345fe3fd66593a3fc4f4365af925599fabb966c314bb9d609f7ffd9fa106b
size 189484

3
libs3-4.1.git277.tar.xz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ed986038c9f70507625ddc04ed24a6668eadf34994fc3e3749e6b7087cdc2b8
size 92872

10
libs3.changes
View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue May 28 10:31:17 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- 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 <jengelh@inai.de>

11
libs3.dsc
View File

@@ -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:

12
libs3.spec
View File

@@ -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