Hello community,
here is the log from the commit of package s3backer for openSUSE:Factory
checked in at 2015-09-09 20:21:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/s3backer (Old)
and /work/SRC/openSUSE:Factory/.s3backer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "s3backer"
Changes:
--------
--- /work/SRC/openSUSE:Factory/s3backer/s3backer.changes 2015-05-11
20:41:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.s3backer.new/s3backer.changes 2015-09-09
20:21:09.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Sep 1 14:54:07 UTC 2015 - arc...@dellroad.org
+
+- Update to release 1.4.2
+ + Update license to fix OpenSSL vs. GPL conflict
+
+-------------------------------------------------------------------
Old:
----
s3backer-1.4.1.tar.gz
New:
----
s3backer-1.4.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ s3backer.spec ++++++
--- /var/tmp/diff_new_pack.m8zvLm/_old 2015-09-09 20:21:09.000000000 +0200
+++ /var/tmp/diff_new_pack.m8zvLm/_new 2015-09-09 20:21:09.000000000 +0200
@@ -18,7 +18,7 @@
Name: s3backer
-Version: 1.4.1
+Version: 1.4.2
Release: 0
Summary: FUSE-based single file backing store via Amazon S3
License: GPL-2.0+
++++++ s3backer-1.4.1.tar.gz -> s3backer-1.4.2.tar.gz ++++++
++++ 1824 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/CHANGES new/s3backer-1.4.2/CHANGES
--- old/s3backer-1.4.1/CHANGES 2015-05-04 17:49:52.000000000 +0200
+++ new/s3backer-1.4.2/CHANGES 2015-09-01 16:45:24.000000000 +0200
@@ -1,3 +1,9 @@
+Version 1.4.2 released September 1, 2015
+
+ - Update license to fix OpenSSL vs. GPL conflict
+ - Remove obsolete Debian files
+ - Fix typos in help output
+
Version 1.4.1 released May 4, 2015
- Fix use-after-free bug configuring base URL (github issue #44)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/COPYING new/s3backer-1.4.2/COPYING
--- old/s3backer-1.4.1/COPYING 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/COPYING 2015-09-01 16:45:24.000000000 +0200
@@ -1,3 +1,18 @@
+
+In addition to the license below, as a special exception, the copyright holders
+give permission to link the code of portions of this program with the OpenSSL
+library under certain conditions as described in each individual source file,
+and distribute linked combinations including the two.
+
+You must obey the GNU General Public License in all respects for all of the
code
+used other than OpenSSL. If you modify file(s) with this exception, you may
+extend this exception to your version of the file(s), but you are not obligated
+to do so. If you do not wish to do so, delete this exception statement from
+your version. If you delete this exception statement from all source files in
+the program, then also delete it here.
+
+----------------------
+
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/Makefile.am new/s3backer-1.4.2/Makefile.am
--- old/s3backer-1.4.1/Makefile.am 2015-04-17 22:34:04.000000000 +0200
+++ new/s3backer-1.4.2/Makefile.am 2015-09-01 16:45:24.000000000 +0200
@@ -19,6 +19,19 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations including
+# the two.
+#
+# You must obey the GNU General Public License in all respects for all
+# of the code used other than OpenSSL. If you modify file(s) with this
+# exception, you may extend this exception to your version of the
+# file(s), but you are not obligated to do so. If you do not wish to do
+# so, delete this exception statement from your version. If you delete
+# this exception statement from all source files in the program, then
+# also delete it here.
bin_PROGRAMS= s3backer
@@ -74,8 +87,6 @@
AM_CFLAGS= $(FUSE_CFLAGS)
-SUBDIRS= debian
-
gitrev.c:
printf 'const char *const s3backer_version = "%s";\n'
"`git describe`" > gitrev.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/block_cache.c new/s3backer-1.4.2/block_cache.c
--- old/s3backer-1.4.1/block_cache.c 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/block_cache.c 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
#include "s3backer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/block_cache.h new/s3backer-1.4.2/block_cache.h
--- old/s3backer-1.4.1/block_cache.h 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/block_cache.h 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
/* Configuration info structure for block_cache */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/block_part.c new/s3backer-1.4.2/block_part.c
--- old/s3backer-1.4.1/block_part.c 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/block_part.c 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
#include "s3backer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/block_part.h new/s3backer-1.4.2/block_part.h
--- old/s3backer-1.4.1/block_part.h 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/block_part.h 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
/* block_part.c */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/configure.ac new/s3backer-1.4.2/configure.ac
--- old/s3backer-1.4.1/configure.ac 2015-05-04 17:50:05.000000000 +0200
+++ new/s3backer-1.4.2/configure.ac 2015-09-01 16:48:10.000000000 +0200
@@ -18,10 +18,23 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations including
+# the two.
+#
+# You must obey the GNU General Public License in all respects for all
+# of the code used other than OpenSSL. If you modify file(s) with this
+# exception, you may extend this exception to your version of the
+# file(s), but you are not obligated to do so. If you do not wish to do
+# so, delete this exception statement from your version. If you delete
+# 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.4.1],
[https://github.com/archiecobbs/s3backer], [s3backer])
+AC_INIT([s3backer FUSE filesystem backed by Amazon S3], [1.4.2],
[https://github.com/archiecobbs/s3backer], [s3backer])
AC_CONFIG_AUX_DIR(scripts)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(foreign)
dnl AM_MAINTAINER_MODE
AC_PREREQ(2.59)
AC_PREFIX_DEFAULT(/usr)
@@ -113,7 +126,6 @@
# Generated files
AC_CONFIG_FILES(Makefile)
-AC_CONFIG_FILES(debian/Makefile)
AC_CONFIG_FILES(s3backer.spec)
AM_CONFIG_HEADER(config.h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/dcache.c new/s3backer-1.4.2/dcache.c
--- old/s3backer-1.4.1/dcache.c 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/dcache.c 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
#include "s3backer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/dcache.h new/s3backer-1.4.2/dcache.h
--- old/s3backer-1.4.1/dcache.h 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/dcache.h 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/debian/Makefile.am new/s3backer-1.4.2/debian/Makefile.am
--- old/s3backer-1.4.1/debian/Makefile.am 2015-04-17 21:20:11.000000000
+0200
+++ new/s3backer-1.4.2/debian/Makefile.am 1970-01-01 01:00:00.000000000
+0100
@@ -1,24 +0,0 @@
-
-#
-# s3backer - FUSE-based single file backing store via Amazon S3
-#
-# Copyright 2008 Archie L. Cobbs <arc...@dellroad.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-
-EXTRA_DIST= changelog compat control copyright dirs docs rules
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/debian/changelog new/s3backer-1.4.2/debian/changelog
--- old/s3backer-1.4.1/debian/changelog 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/debian/changelog 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-s3backer (1.2.2-0) intrepid; urgency=low
-
- * Initial release
-
- -- Peter Petrov <onest...@gmail.com> Wed, 24 Dec 2008 00:09:51 +0200
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/debian/compat new/s3backer-1.4.2/debian/compat
--- old/s3backer-1.4.1/debian/compat 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/debian/compat 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/debian/control new/s3backer-1.4.2/debian/control
--- old/s3backer-1.4.1/debian/control 2015-04-17 22:34:04.000000000 +0200
+++ new/s3backer-1.4.2/debian/control 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-Source: s3backer
-Section: net
-Priority: extra
-Maintainer: Peter Petrov <onest...@gmail.com>
-Build-Depends: cdbs, debhelper, autotools-dev, libfuse-dev,
libcurl4-openssl-dev | libcurl-dev, libssl-dev, zlib1g-dev, libexpat1-dev,
pkg-config
-Standards-Version: 3.8.0
-Homepage: https://github.com/archiecobbs/s3backer
-
-Package: s3backer
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: FUSE-based single file backing store via Amazon S3
- s3backer is a filesystem that contains a single file backed by the
- Amazon Simple Storage Service (Amazon S3). As a filesystem, it is
- quite small and simple: it provides a single normal file having a
- fixed size. The file is divided up into blocks, and the content of
- each block is stored in a unique Amazon S3 object. In other words,
- what s3backer provides is really more like an S3-backed virtual hard
- disk device, rather than a filesystem.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/debian/copyright new/s3backer-1.4.2/debian/copyright
--- old/s3backer-1.4.1/debian/copyright 2015-04-17 22:34:04.000000000 +0200
+++ new/s3backer-1.4.2/debian/copyright 1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-This package was debianized by Peter Petrov <onest...@gmail.com> on
-Tue, 23 Dec 2008 19:25:53 +0200.
-
-It was downloaded from https://github.com/archiecobbs/s3backer
-
-Upstream Author(s):
-
- Archie L. Cobbs <arc...@dellroad.org>
-
-Copyright:
-
- Copyright (C) 2008 Archie L. Cobbs
- Copyright (C) 2008 Peter Petrov
-
-License:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2008, Peter Petrov <onest...@gmail.com> and
-is licensed under the GPL, see above.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/debian/dirs new/s3backer-1.4.2/debian/dirs
--- old/s3backer-1.4.1/debian/dirs 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/debian/dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/bin
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/debian/docs new/s3backer-1.4.2/debian/docs
--- old/s3backer-1.4.1/debian/docs 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/debian/docs 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-CHANGES
-COPYING
-README
-TODO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/debian/rules new/s3backer-1.4.2/debian/rules
--- old/s3backer-1.4.1/debian/rules 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/debian/rules 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
-
-# Add here any variable or target overrides you need.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/ec_protect.c new/s3backer-1.4.2/ec_protect.c
--- old/s3backer-1.4.1/ec_protect.c 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/ec_protect.c 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
#include "s3backer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/ec_protect.h new/s3backer-1.4.2/ec_protect.h
--- old/s3backer-1.4.1/ec_protect.h 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/ec_protect.h 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
/* Configuration info structure for ec_protect store */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/erase.c new/s3backer-1.4.2/erase.c
--- old/s3backer-1.4.1/erase.c 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/erase.c 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
#include "s3backer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/erase.h new/s3backer-1.4.2/erase.h
--- old/s3backer-1.4.1/erase.h 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/erase.h 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
/* erase.c */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/fuse_ops.c new/s3backer-1.4.2/fuse_ops.c
--- old/s3backer-1.4.1/fuse_ops.c 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/fuse_ops.c 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
#include "s3backer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/fuse_ops.h new/s3backer-1.4.2/fuse_ops.h
--- old/s3backer-1.4.1/fuse_ops.h 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/fuse_ops.h 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
/* Forward decl's */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/gitrev.c new/s3backer-1.4.2/gitrev.c
--- old/s3backer-1.4.1/gitrev.c 2015-05-04 17:53:11.000000000 +0200
+++ new/s3backer-1.4.2/gitrev.c 2015-09-01 16:51:09.000000000 +0200
@@ -1 +1 @@
-const char *const s3backer_version = "1.4.1";
+const char *const s3backer_version = "1.4.2";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/hash.c new/s3backer-1.4.2/hash.c
--- old/s3backer-1.4.1/hash.c 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/hash.c 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/hash.h new/s3backer-1.4.2/hash.h
--- old/s3backer-1.4.1/hash.h 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/hash.h 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/http_io.c new/s3backer-1.4.2/http_io.c
--- old/s3backer-1.4.1/http_io.c 2015-04-30 23:07:05.000000000 +0200
+++ new/s3backer-1.4.2/http_io.c 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
#include "s3backer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/http_io.h new/s3backer-1.4.2/http_io.h
--- old/s3backer-1.4.1/http_io.h 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/http_io.h 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
/* Upload/download indexes */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/main.c new/s3backer-1.4.2/main.c
--- old/s3backer-1.4.1/main.c 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/main.c 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
#include "s3backer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/reset.c new/s3backer-1.4.2/reset.c
--- old/s3backer-1.4.1/reset.c 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/reset.c 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
#include "s3backer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/reset.h new/s3backer-1.4.2/reset.h
--- old/s3backer-1.4.1/reset.h 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/reset.h 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
/* reset.c */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/s3b_config.c new/s3backer-1.4.2/s3b_config.c
--- old/s3backer-1.4.1/s3b_config.c 2015-05-01 15:32:39.000000000 +0200
+++ new/s3backer-1.4.2/s3b_config.c 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
#include "s3backer.h"
@@ -1667,9 +1681,9 @@
fprintf(stderr, "\t--%-27s %s\n", "insecure", "Don't verify SSL server
identity");
fprintf(stderr, "\t--%-27s %s\n", "keyLength", "Override generated cipher
key length");
fprintf(stderr, "\t--%-27s %s\n", "listBlocks", "Auto-detect non-empty
blocks at startup");
- fprintf(stderr, "\t--%-27s %s\n", "maxDownloadSpeed=BITSPERSEC", "Max
download bandwith for a single read");
+ fprintf(stderr, "\t--%-27s %s\n", "maxDownloadSpeed=BITSPERSEC", "Max
download bandwidth for a single read");
fprintf(stderr, "\t--%-27s %s\n", "maxRetryPause=MILLIS", "Max total pause
after stale data or server error");
- fprintf(stderr, "\t--%-27s %s\n", "maxUploadSpeed=BITSPERSEC", "Max upload
bandwith for a single write");
+ fprintf(stderr, "\t--%-27s %s\n", "maxUploadSpeed=BITSPERSEC", "Max upload
bandwidth for a single write");
fprintf(stderr, "\t--%-27s %s\n", "md5CacheSize=NUM", "Max size of MD5
cache (zero = disabled)");
fprintf(stderr, "\t--%-27s %s\n", "md5CacheTime=MILLIS", "Expire time for
MD5 cache (zero = infinite)");
fprintf(stderr, "\t--%-27s %s\n", "minWriteDelay=MILLIS", "Minimum time
between same block writes");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/s3b_config.h new/s3backer-1.4.2/s3b_config.h
--- old/s3backer-1.4.1/s3b_config.h 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/s3b_config.h 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
/* Overal application configuration info */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/s3backer.1 new/s3backer-1.4.2/s3backer.1
--- old/s3backer-1.4.1/s3backer.1 2015-04-17 22:34:04.000000000 +0200
+++ new/s3backer-1.4.2/s3backer.1 2015-09-01 16:45:24.000000000 +0200
@@ -19,6 +19,20 @@
.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
.\" 02110-1301, USA.
.\"
+.\" In addition, as a special exception, the copyright holders give
+.\" permission to link the code of portions of this program with the
+.\" OpenSSL library under certain conditions as described in each
+.\" individual source file, and distribute linked combinations including
+.\" the two.
+.\"
+.\" You must obey the GNU General Public License in all respects for all
+.\" of the code used other than OpenSSL. If you modify file(s) with this
+.\" exception, you may extend this exception to your version of the
+.\" file(s), but you are not obligated to do so. If you do not wish to do
+.\" so, delete this exception statement from your version. If you delete
+.\" this exception statement from all source files in the program, then
+.\" also delete it here.
+.\"
.Dd September 7, 2009
.Dt S3BACKER 1
.Os
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/s3backer.h new/s3backer-1.4.2/s3backer.h
--- old/s3backer-1.4.1/s3backer.h 2015-04-17 22:34:04.000000000 +0200
+++ new/s3backer-1.4.2/s3backer.h 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
#include "config.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/s3backer.spec new/s3backer-1.4.2/s3backer.spec
--- old/s3backer-1.4.1/s3backer.spec 2015-05-04 17:53:11.000000000 +0200
+++ new/s3backer-1.4.2/s3backer.spec 2015-09-01 16:51:09.000000000 +0200
@@ -12,10 +12,24 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations including
+# the two.
+#
+# You must obey the GNU General Public License in all respects for all
+# of the code used other than OpenSSL. If you modify file(s) with this
+# exception, you may extend this exception to your version of the
+# file(s), but you are not obligated to do so. If you do not wish to do
+# so, delete this exception statement from your version. If you delete
+# this exception statement from all source files in the program, then
+# also delete it here.
#
Name: s3backer
-Version: 1.4.1
+Version: 1.4.2
Release: 1
License: GNU General Public License, Version 2
Summary: FUSE-based single file backing store via Amazon S3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/s3backer.spec.in new/s3backer-1.4.2/s3backer.spec.in
--- old/s3backer-1.4.1/s3backer.spec.in 2015-04-17 22:34:04.000000000 +0200
+++ new/s3backer-1.4.2/s3backer.spec.in 2015-09-01 16:45:24.000000000 +0200
@@ -12,6 +12,20 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations including
+# the two.
+#
+# You must obey the GNU General Public License in all respects for all
+# of the code used other than OpenSSL. If you modify file(s) with this
+# exception, you may extend this exception to your version of the
+# file(s), but you are not obligated to do so. If you do not wish to do
+# so, delete this exception statement from your version. If you delete
+# this exception statement from all source files in the program, then
+# also delete it here.
#
Name: s3backer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/test_io.c new/s3backer-1.4.2/test_io.c
--- old/s3backer-1.4.1/test_io.c 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/test_io.c 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
#include "s3backer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/test_io.h new/s3backer-1.4.2/test_io.h
--- old/s3backer-1.4.1/test_io.h 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/test_io.h 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
/* test_io.c */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/s3backer-1.4.1/tester.c new/s3backer-1.4.2/tester.c
--- old/s3backer-1.4.1/tester.c 2015-04-17 21:20:11.000000000 +0200
+++ new/s3backer-1.4.2/tester.c 2015-09-01 16:45:24.000000000 +0200
@@ -18,6 +18,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations including
+ * the two.
+ *
+ * You must obey the GNU General Public License in all respects for all
+ * of the code used other than OpenSSL. If you modify file(s) with this
+ * exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do
+ * so, delete this exception statement from your version. If you delete
+ * this exception statement from all source files in the program, then
+ * also delete it here.
*/
#include "s3backer.h"
