Hello community, here is the log from the commit of package s3backer for openSUSE:Factory checked in at 2019-10-09 15:19:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/s3backer (Old) and /work/SRC/openSUSE:Factory/.s3backer.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "s3backer" Wed Oct 9 15:19:42 2019 rev:17 rq:736308 version:1.5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/s3backer/s3backer.changes 2019-08-13 13:17:10.193479250 +0200 +++ /work/SRC/openSUSE:Factory/.s3backer.new.2352/s3backer.changes 2019-10-09 15:19:43.540456811 +0200 @@ -1,0 +2,7 @@ +Tue Oct 8 17:25:01 UTC 2019 - <archie.co...@gmail.com> + +- Upgrade to release 1.5.4 + + Only set "x-amz-server-side-encryption" header with PUT requests (issue #116) + + Don't kill IAM thread unless actually started (issue #115). + +------------------------------------------------------------------- Old: ---- s3backer-1.5.3.tar.gz New: ---- s3backer-1.5.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ s3backer.spec ++++++ --- /var/tmp/diff_new_pack.kJUTMd/_old 2019-10-09 15:19:44.020455574 +0200 +++ /var/tmp/diff_new_pack.kJUTMd/_new 2019-10-09 15:19:44.024455563 +0200 @@ -18,7 +18,7 @@ Name: s3backer -Version: 1.5.3 +Version: 1.5.4 Release: 0 Summary: FUSE-based single file backing store via Amazon S3 License: GPL-2.0-or-later ++++++ s3backer-1.5.3.tar.gz -> s3backer-1.5.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.5.3/CHANGES new/s3backer-1.5.4/CHANGES --- old/s3backer-1.5.3/CHANGES 2019-08-09 20:44:49.000000000 +0200 +++ new/s3backer-1.5.4/CHANGES 2019-10-08 19:18:16.000000000 +0200 @@ -1,3 +1,8 @@ +Version 1.5.4 released October 8, 2019 + + - Only set "x-amz-server-side-encryption" header with PUT requests (issue #116) + - Don't kill IAM thread unless actually started (issue #115). + Version 1.5.3 released August 9, 2019 - Fixed bug where IAM update thread was killed after fork (issue #115) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.5.3/configure new/s3backer-1.5.4/configure --- old/s3backer-1.5.3/configure 2019-08-09 20:47:04.000000000 +0200 +++ new/s3backer-1.5.4/configure 2019-10-08 19:19:47.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for s3backer FUSE filesystem backed by Amazon S3 1.5.3. +# Generated by GNU Autoconf 2.69 for s3backer FUSE filesystem backed by Amazon S3 1.5.4. # # Report bugs to <https://github.com/archiecobbs/s3backer>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='s3backer FUSE filesystem backed by Amazon S3' PACKAGE_TARNAME='s3backer' -PACKAGE_VERSION='1.5.3' -PACKAGE_STRING='s3backer FUSE filesystem backed by Amazon S3 1.5.3' +PACKAGE_VERSION='1.5.4' +PACKAGE_STRING='s3backer FUSE filesystem backed by Amazon S3 1.5.4' PACKAGE_BUGREPORT='https://github.com/archiecobbs/s3backer' PACKAGE_URL='' @@ -1280,7 +1280,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures s3backer FUSE filesystem backed by Amazon S3 1.5.3 to adapt to many kinds of systems. +\`configure' configures s3backer FUSE filesystem backed by Amazon S3 1.5.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1346,7 +1346,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of s3backer FUSE filesystem backed by Amazon S3 1.5.3:";; + short | recursive ) echo "Configuration of s3backer FUSE filesystem backed by Amazon S3 1.5.4:";; esac cat <<\_ACEOF @@ -1449,7 +1449,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -s3backer FUSE filesystem backed by Amazon S3 configure 1.5.3 +s3backer FUSE filesystem backed by Amazon S3 configure 1.5.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1797,7 +1797,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by s3backer FUSE filesystem backed by Amazon S3 $as_me 1.5.3, which was +It was created by s3backer FUSE filesystem backed by Amazon S3 $as_me 1.5.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2660,7 +2660,7 @@ # Define the identity of the package. PACKAGE='s3backer' - VERSION='1.5.3' + VERSION='1.5.4' cat >>confdefs.h <<_ACEOF @@ -5498,7 +5498,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by s3backer FUSE filesystem backed by Amazon S3 $as_me 1.5.3, which was +This file was extended by s3backer FUSE filesystem backed by Amazon S3 $as_me 1.5.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5564,7 +5564,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -s3backer FUSE filesystem backed by Amazon S3 config.status 1.5.3 +s3backer FUSE filesystem backed by Amazon S3 config.status 1.5.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.5.3/configure.ac new/s3backer-1.5.4/configure.ac --- old/s3backer-1.5.3/configure.ac 2019-08-09 20:45:06.000000000 +0200 +++ new/s3backer-1.5.4/configure.ac 2019-10-08 19:18:57.000000000 +0200 @@ -32,7 +32,7 @@ # this exception statement from all source files in the program, then # also delete it here. -AC_INIT([s3backer FUSE filesystem backed by Amazon S3], [1.5.3], [https://github.com/archiecobbs/s3backer], [s3backer]) +AC_INIT([s3backer FUSE filesystem backed by Amazon S3], [1.5.4], [https://github.com/archiecobbs/s3backer], [s3backer]) AC_CONFIG_AUX_DIR(scripts) AM_INIT_AUTOMAKE(foreign) dnl AM_MAINTAINER_MODE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.5.3/gitrev.c new/s3backer-1.5.4/gitrev.c --- old/s3backer-1.5.3/gitrev.c 2019-08-09 20:47:13.000000000 +0200 +++ new/s3backer-1.5.4/gitrev.c 2019-10-08 19:19:50.000000000 +0200 @@ -1 +1 @@ -const char *const s3backer_version = "1.5.3"; +const char *const s3backer_version = "1.5.4"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.5.3/http_io.c new/s3backer-1.5.4/http_io.c --- old/s3backer-1.5.3/http_io.c 2019-08-05 11:51:51.000000000 +0200 +++ new/s3backer-1.5.4/http_io.c 2019-10-01 17:00:44.000000000 +0200 @@ -155,9 +155,10 @@ struct http_io_stats stats; LIST_HEAD(, curl_holder) curls; pthread_mutex_t mutex; - u_int *non_zero; // config->nonzero_bitmap is moved to here - pthread_t iam_thread; // IAM credentials refresh thread - u_char shutting_down; + u_int *non_zero; // config->nonzero_bitmap is moved to here + pthread_t iam_thread; // IAM credentials refresh thread + u_char iam_thread_alive; // IAM thread was successfully created + u_char iam_thread_shutdown; // Flag to the IAM thread telling it to exit /* Encryption info */ const EVP_CIPHER *cipher; @@ -463,15 +464,16 @@ int r; /* Shut down IAM thread */ - priv->shutting_down = 1; - if (config->ec2iam_role != NULL) { + if (priv->iam_thread_alive) { (*config->log)(LOG_DEBUG, "waiting for EC2 IAM thread to shutdown"); + priv->iam_thread_shutdown = 1; if ((r = pthread_cancel(priv->iam_thread)) != 0) (*config->log)(LOG_ERR, "pthread_cancel: %s", strerror(r)); if ((r = pthread_join(priv->iam_thread, NULL)) != 0) (*config->log)(LOG_ERR, "pthread_join: %s", strerror(r)); else (*config->log)(LOG_DEBUG, "EC2 IAM thread successfully shutdown"); + priv->iam_thread_alive = 0; } /* Clean up openssl */ @@ -882,9 +884,12 @@ int r; /* Start IAM updater thread if appropriate */ - if (config->ec2iam_role != NULL - && (r = pthread_create(&priv->iam_thread, NULL, update_iam_credentials_main, priv)) != 0) - return r; + if (config->ec2iam_role != NULL) { + assert(!priv->iam_thread_alive); + if ((r = pthread_create(&priv->iam_thread, NULL, update_iam_credentials_main, priv)) != 0) + return r; + priv->iam_thread_alive = 1; + } /* Done */ return 0; @@ -1035,7 +1040,7 @@ } /* Add Server Side Encryption value (if needed) */ - if (config->sse != NULL) + if (config->sse != NULL && new_value != 0) io.headers = http_io_add_header(priv, io.headers, "%s: %s", SSE_HEADER, config->sse); /* Add storage class header (if needed) */ @@ -1130,13 +1135,13 @@ { struct http_io_private *const priv = arg; - while (!priv->shutting_down) { + while (!priv->iam_thread_shutdown) { - // Sleep for five minutes + // Sleep for five minutes, or until woken up by pthread_cancel() sleep(300); // Shutting down? - if (priv->shutting_down) + if (priv->iam_thread_shutdown) break; // Attempt to update credentials @@ -1695,7 +1700,7 @@ io.headers = http_io_add_header(priv, io.headers, "%s: \"%s\"", HMAC_HEADER, hmacbuf); /* Add Server Side Encryption header (if needed) */ - if (config->sse != NULL) + if (config->sse != NULL && src != NULL) io.headers = http_io_add_header(priv, io.headers, "%s: %s", SSE_HEADER, config->sse); /* Add storage class header (if needed) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.5.3/s3backer.1 new/s3backer-1.5.4/s3backer.1 --- old/s3backer-1.5.3/s3backer.1 2019-07-06 22:55:09.000000000 +0200 +++ new/s3backer-1.5.4/s3backer.1 2019-09-11 16:12:08.000000000 +0200 @@ -236,6 +236,11 @@ .Fl \-compress flag. Compression is automatically enabled when encryption is enabled. +.Ss Server Side Encryption +.Nm +supports server side encryption via the +.Fl \-sse +flag. .Ss Read-Only Access An Amazon S3 account is not required in order to use .Nm . @@ -783,6 +788,14 @@ will exit with an error unless .Fl \-force is also given. +.It Fl \-sse=ALGORITHM +Enable server side encryption. +This adds the +.Pa x-amz-server-side-encryption +header to all PUT requests. +.Pp +Currently the only supported encryption algorithm is +.Pa AES256 . .It Fl \-ssl Equivalent to .Bk -words diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/s3backer-1.5.3/s3backer.spec new/s3backer-1.5.4/s3backer.spec --- old/s3backer-1.5.3/s3backer.spec 2019-08-09 20:47:11.000000000 +0200 +++ new/s3backer-1.5.4/s3backer.spec 2019-10-08 19:19:50.000000000 +0200 @@ -29,7 +29,7 @@ # Name: s3backer -Version: 1.5.3 +Version: 1.5.4 Release: 1 License: GNU General Public License, Version 2 Summary: FUSE-based single file backing store via Amazon S3