Hello community, here is the log from the commit of package s3backer for openSUSE:Factory checked in at 2013-04-03 13:06:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/s3backer (Old) and /work/SRC/openSUSE:Factory/.s3backer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "s3backer", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/s3backer/s3backer.changes 2013-01-29 14:40:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.s3backer.new/s3backer.changes 2013-04-03 13:06:23.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 3 01:47:44 UTC 2013 - archie@dellroad.org + +- Update to version 1.3.4 + + Add support for fallocate(2) + +------------------------------------------------------------------- Old: ---- s3backer-1.3.3.tar.gz New: ---- s3backer-1.3.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ s3backer.spec ++++++ --- /var/tmp/diff_new_pack.TKatZZ/_old 2013-04-03 13:06:23.000000000 +0200 +++ /var/tmp/diff_new_pack.TKatZZ/_new 2013-04-03 13:06:23.000000000 +0200 @@ -1,30 +1,31 @@ -# $Id: s3backer.spec 405 2009-10-19 17:41:23Z archie.cobbs $ - -# -# Copyright 2008 Archie L. Cobbs. # -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at +# spec file for package s3backer # -# http://www.apache.org/licenses/LICENSE-2.0 +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright 2008 Archie L. Cobbs. # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: s3backer -Version: 1.3.3 -Release: 1 -License: GPL-2.0+ +Version: 1.3.4 +Release: 0 Summary: FUSE-based single file backing store via Amazon S3 +License: GPL-2.0+ Group: System/Filesystems Source: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.gz -URL: http://%{name}.googlecode.com/ -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Url: http://%{name}.googlecode.com/ +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1100 BuildRequires: libcurl-devel >= 7.16.2 BuildRequires: libopenssl-devel ++++++ s3backer-1.3.3.tar.gz -> s3backer-1.3.4.tar.gz ++++++ ++++ 5066 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.3.3/CHANGES new/s3backer-1.3.4/CHANGES --- old/s3backer-1.3.3/CHANGES 2012-04-07 23:25:26.000000000 +0200 +++ new/s3backer-1.3.4/CHANGES 2013-04-03 03:44:48.000000000 +0200 @@ -1,4 +1,8 @@ +Version 1.3.4 (r476) released 2 Apr 2013 + + - Support FUSE fallocate() call to zero unused blocks + Version 1.3.3 (r463) released 7 Apr 2012 - Fix bug in validation of --baseURL parameter (issue #34) @@ -130,4 +134,4 @@ Version 1.0.0 released 19 June 2008 -$Id: CHANGES 463 2012-04-07 21:25:25Z archie.cobbs $ +$Id: CHANGES 476 2013-04-03 01:44:44Z archie.cobbs $ 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.3.3/COPYING new/s3backer-1.3.4/COPYING --- old/s3backer-1.3.3/COPYING 2011-11-04 04:02:06.000000000 +0100 +++ new/s3backer-1.3.4/COPYING 2013-01-23 16:40:52.000000000 +0100 @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -303,17 +303,16 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + 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. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. 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.3.3/config.h.in new/s3backer-1.3.4/config.h.in --- old/s3backer-1.3.3/config.h.in 2012-04-07 23:26:13.000000000 +0200 +++ new/s3backer-1.3.4/config.h.in 2013-04-03 03:45:20.000000000 +0200 @@ -1,5 +1,11 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* FUSE fallocate() support */ +#undef FUSE_FALLOCATE + +/* FUSE API version */ +#undef FUSE_USE_VERSION + /* Define to 1 if you have the header file. */ #undef HAVE_ASSERT_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.3.3/configure.ac new/s3backer-1.3.4/configure.ac --- old/s3backer-1.3.3/configure.ac 2011-11-04 04:02:06.000000000 +0100 +++ new/s3backer-1.3.4/configure.ac 2013-03-04 19:31:21.000000000 +0100 @@ -18,15 +18,15 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. # -# $Id: configure.ac 458 2011-08-04 21:56:47Z archie.cobbs $ +# $Id: configure.ac 470 2013-03-04 18:31:13Z archie.cobbs $ # -AC_INIT([s3backer FUSE filesystem backed by Amazon S3], [1.3.3], [http://s3backer.googlecode.com/], [s3backer]) +AC_INIT([s3backer FUSE filesystem backed by Amazon S3], [1.3.4], [http://s3backer.googlecode.com/], [s3backer]) AC_CONFIG_AUX_DIR(scripts) AM_INIT_AUTOMAKE dnl AM_MAINTAINER_MODE AC_PREREQ(2.59) -AC_REVISION($Id: configure.ac 458 2011-08-04 21:56:47Z archie.cobbs $) +AC_REVISION($Id: configure.ac 470 2013-03-04 18:31:13Z archie.cobbs $) AC_PREFIX_DEFAULT(/usr) AC_PROG_MAKE_SET @@ -41,6 +41,10 @@ # Compile flags for Mac OS AC_DEFINE(_DARWIN_C_SOURCE, 1, MacOS functions) +# Compile flags for FUSE +AC_DEFINE(FUSE_USE_VERSION, 26, FUSE API version) +AC_DEFINE(FUSE_FALLOCATE, 0, FUSE fallocate() support) + # Check for required programs AC_PROG_INSTALL AC_PROG_CC @@ -68,6 +72,13 @@ long x = CURLOPT_HTTP_CONTENT_DECODING; ]])],, [AC_MSG_ERROR([version of curl is not 7.16.2 or later])]) +# See if FUSE version is 2.9.2 or later +AC_MSG_CHECKING([for fallocate() support in fuse]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include +struct fuse_operations x = { fallocate: (void*)1 }; +]])],[AC_MSG_RESULT([yes]); AC_DEFINE(FUSE_FALLOCATE)],AC_MSG_RESULT([no])) + # Set some O/S specific stuff case `uname -s` in Darwin|FreeBSD) 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.3.3/fuse_ops.c new/s3backer-1.3.4/fuse_ops.c --- old/s3backer-1.3.3/fuse_ops.c 2011-11-04 04:02:06.000000000 +0100 +++ new/s3backer-1.3.4/fuse_ops.c 2013-03-04 19:31:21.000000000 +0100 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. * - * $Id: fuse_ops.c 448 2011-02-01 17:31:15Z archie.cobbs $ + * $Id: fuse_ops.c 470 2013-03-04 18:31:13Z archie.cobbs $ */ #include "s3backer.h" @@ -61,7 +61,7 @@ ****************************************************************************/ /* FUSE functions */ -static void *fuse_op_init(void); +static void *fuse_op_init(struct fuse_conn_info *conn); static void fuse_op_destroy(void *data); static int fuse_op_getattr(const char *path, struct stat *st); static int fuse_op_fgetattr(const char *path, struct stat *st, struct fuse_file_info *); @@ -77,6 +77,9 @@ static int fuse_op_truncate(const char *path, off_t size); static int fuse_op_flush(const char *path, struct fuse_file_info *fi); static int fuse_op_fsync(const char *path, int isdatasync, struct fuse_file_info *fi); +#if FUSE_FALLOCATE +static int fuse_op_fallocate(const char *path, int mode, off_t offset, off_t len, struct fuse_file_info *fi); +#endif /* Attribute functions */ static void fuse_op_getattr_file(struct fuse_ops_private *priv, struct stat *st); @@ -106,6 +109,9 @@ .flush = fuse_op_flush, .fsync = fuse_op_fsync, .release = fuse_op_release, +#if FUSE_FALLOCATE + .fallocate = fuse_op_fallocate, +#endif }; /* Configuration and underlying s3backer_store */ @@ -127,11 +133,11 @@ } /**************************************************************************** - * INTERNAL FUNCTION DEFINITIONS * + * FUSE OPERATION FUNCTIONS * ****************************************************************************/ static void * -fuse_op_init(void) +fuse_op_init(struct fuse_conn_info *conn) { struct fuse_ops_private *priv; @@ -498,6 +504,89 @@ return 0; } +#if FUSE_FALLOCATE +static int +fuse_op_fallocate(const char *path, int mode, off_t offset, off_t len, struct fuse_file_info *fi) +{ + struct fuse_ops_private *const priv = (struct fuse_ops_private *)fuse_get_context()->private_data; + const u_int mask = config->block_size - 1; + size_t size = (size_t)len; + s3b_block_t block_num; + void *zero_block; + size_t num_blocks; + int r; + + /* Handle stats file */ + if (fi->fh != 0) + return -EOPNOTSUPP; + + /* Sanity check */ + if (offset < 0 || len <= 0) + return -EINVAL; + if (offset + len > priv->file_size) + return -ENOSPC; + + /* Handle request */ + if ((mode & FALLOC_FL_PUNCH_HOLE) == 0) + return 0; +/* + if ((mode & FALLOC_FL_KEEP_SIZE) == 0) + return -EINVAL; +*/ + + /* Create an empty block */ + if ((zero_block = calloc(1, config->block_size)) == NULL) + return -ENOMEM; + + /* Write first block fragment (if any) */ + if ((offset & mask) != 0) { + size_t fragoff = (size_t)(offset & mask); + size_t fraglen = (size_t)config->block_size - fragoff; + + if (fraglen > size) + fraglen = size; + block_num = offset >> priv->block_bits; + if ((r = (*priv->s3b->write_block_part)(priv->s3b, block_num, fragoff, fraglen, zero_block)) != 0) { + free(zero_block); + return -r; + } + offset += fraglen; + size -= fraglen; + } + + /* Get block number and count */ + block_num = offset >> priv->block_bits; + num_blocks = size >> priv->block_bits; + + /* Write intermediate complete blocks */ + while (num_blocks-- > 0) { + if ((r = (*priv->s3b->write_block)(priv->s3b, block_num++, NULL, NULL, NULL, NULL)) != 0) { + free(zero_block); + return -r; + } + } + + /* Write last block fragment (if any) */ + if ((size & mask) != 0) { + const size_t fraglen = size & mask; + + if ((r = (*priv->s3b->write_block_part)(priv->s3b, block_num, 0, fraglen, zero_block)) != 0) { + free(zero_block); + return -r; + } + } + + /* Done */ + priv->file_mtime = time(NULL); + free(zero_block); + return 0; +} +#endif + +/**************************************************************************** + * OTHER INTERNAL FUNCTIONS * + ****************************************************************************/ + static struct stat_file * fuse_op_stats_create(struct fuse_ops_private *priv) { 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.3.3/http_io.c new/s3backer-1.3.4/http_io.c --- old/s3backer-1.3.3/http_io.c 2012-04-07 23:22:06.000000000 +0200 +++ new/s3backer-1.3.4/http_io.c 2013-03-04 19:33:15.000000000 +0100 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. * - * $Id: http_io.c 462 2012-04-07 21:22:05Z archie.cobbs $ + * $Id: http_io.c 471 2013-03-04 18:33:11Z archie.cobbs $ */ #include "s3backer.h" @@ -1565,6 +1565,7 @@ config->prefix, S3B_BLOCK_NUM_DIGITS, (uintmax_t)block_num); resource = buf + strlen(config->baseURL) + strlen(config->bucket); } + (void)len; /* avoid compiler warning when NDEBUG defined */ assert(len < bufsiz); return resource; } 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.3.3/main.c new/s3backer-1.3.4/main.c --- old/s3backer-1.3.3/main.c 2011-11-04 04:02:06.000000000 +0100 +++ new/s3backer-1.3.4/main.c 2013-03-04 19:31:21.000000000 +0100 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. * - * $Id: main.c 448 2011-02-01 17:31:15Z archie.cobbs $ + * $Id: main.c 470 2013-03-04 18:31:13Z archie.cobbs $ */ #include "s3backer.h" @@ -52,6 +52,6 @@ /* Start */ (*config->log)(LOG_INFO, "s3backer process %lu for %s started", (u_long)getpid(), config->mount); - return fuse_main(config->fuse_args.argc, config->fuse_args.argv, fuse_ops); + return fuse_main(config->fuse_args.argc, config->fuse_args.argv, fuse_ops, NULL); } 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.3.3/s3b_config.c new/s3backer-1.3.4/s3b_config.c --- old/s3backer-1.3.3/s3b_config.c 2012-01-24 03:13:43.000000000 +0100 +++ new/s3backer-1.3.4/s3b_config.c 2012-06-25 19:16:14.000000000 +0200 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. * - * $Id: s3b_config.c 459 2012-01-24 02:13:43Z archie.cobbs $ + * $Id: s3b_config.c 468 2012-06-25 17:16:14Z archie.cobbs $ */ #include "s3backer.h" @@ -691,6 +691,7 @@ if (nconv < 1) return -1; if (nconv >= 2) { + int found = 0; int i; for (i = 0; i < sizeof(size_suffixes) / sizeof(*size_suffixes); i++) { @@ -698,9 +699,14 @@ if (ss->bits >= sizeof(off_t) * 8) break; - if (strcasecmp(suffix, ss->suffix) == 0) + if (strcasecmp(suffix, ss->suffix) == 0) { *valp <<= ss->bits; + found = 1; + break; + } } + if (!found) + return -1; } return 0; } 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.3.3/s3backer.h new/s3backer-1.3.4/s3backer.h --- old/s3backer-1.3.3/s3backer.h 2011-11-04 04:02:06.000000000 +0100 +++ new/s3backer-1.3.4/s3backer.h 2013-03-04 19:31:21.000000000 +0100 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. * - * $Id: s3backer.h 448 2011-02-01 17:31:15Z archie.cobbs $ + * $Id: s3backer.h 470 2013-03-04 18:31:13Z archie.cobbs $ */ #include "config.h" @@ -70,14 +70,20 @@ #include #include - -#define FUSE_USE_VERSION 25 #include #ifndef FUSE_OPT_KEY_DISCARD #define FUSE_OPT_KEY_DISCARD -4 #endif +/* In case we don't have glibc >= 2.18 */ +#ifndef FALLOC_FL_KEEP_SIZE +#define FALLOC_FL_KEEP_SIZE 0x01 +#endif +#ifndef FALLOC_FL_PUNCH_HOLE +#define FALLOC_FL_PUNCH_HOLE 0x02 +#endif + /* * Integral type for holding a block number. */ 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.3.3/s3backer.spec new/s3backer-1.3.4/s3backer.spec --- old/s3backer-1.3.3/s3backer.spec 2012-04-07 23:26:18.000000000 +0200 +++ new/s3backer-1.3.4/s3backer.spec 2013-04-03 03:45:29.000000000 +0200 @@ -17,7 +17,7 @@ # Name: s3backer -Version: 1.3.3 +Version: 1.3.4 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.3.3/scripts/missing new/s3backer-1.3.4/scripts/missing --- old/s3backer-1.3.3/scripts/missing 2012-04-07 23:26:14.000000000 +0200 +++ new/s3backer-1.3.4/scripts/missing 2013-04-03 03:45:21.000000000 +0200 @@ -1,10 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.18; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' sed_minuso='s/.* -o \([^ ]*\).*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac 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.3.3/svnrev.c new/s3backer-1.3.4/svnrev.c --- old/s3backer-1.3.3/svnrev.c 2012-04-07 23:26:18.000000000 +0200 +++ new/s3backer-1.3.4/svnrev.c 2013-04-03 03:45:30.000000000 +0200 @@ -1 +1 @@ -const int s3backer_svnrev = 463; +const int s3backer_svnrev = 476;