Hello community, here is the log from the commit of package bindfs for openSUSE:Factory checked in at 2013-08-23 11:07:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bindfs (Old) and /work/SRC/openSUSE:Factory/.bindfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bindfs" Changes: -------- --- /work/SRC/openSUSE:Factory/bindfs/bindfs.changes 2013-03-05 06:43:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bindfs.new/bindfs.changes 2013-08-23 11:07:39.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 7 20:56:34 UTC 2013 - [email protected] + +- Update to new upstream release 1.12.2 +* Added --chmod-filter + +------------------------------------------------------------------- Old: ---- bindfs-1.12.tar.xz New: ---- bindfs-1.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bindfs.spec ++++++ --- /var/tmp/diff_new_pack.BXmTAQ/_old 2013-08-23 11:07:40.000000000 +0200 +++ /var/tmp/diff_new_pack.BXmTAQ/_new 2013-08-23 11:07:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: bindfs -Version: 1.12 +Version: 1.12.2 Release: 0 Summary: Mount Directories to other Locations and alter Permission Bits License: GPL-2.0+ @@ -25,7 +25,7 @@ Url: http://code.google.com/p/bindfs/ #Git-Clone: git://github.com/mpartel/bindfs -#DL-URL: http://bindfs.googlecode.com/files/bindfs-1.12.tar.gz +#DL-URL: http://bindfs.org/downloads/bindfs-1.12.2.tar.gz Source: %name-%version.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig ++++++ bindfs-1.12.tar.xz -> bindfs-1.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bindfs-1.12/ChangeLog new/bindfs-1.12.2/ChangeLog --- old/bindfs-1.12/ChangeLog 2013-03-01 01:47:45.000000000 +0100 +++ new/bindfs-1.12.2/ChangeLog 2013-07-22 10:17:18.000000000 +0200 @@ -1,10 +1,20 @@ +2013-07-22 Martin Pärtel <martin dot partel at gmail dot com> + + * Added --chmod-filter, contributed by Anton Ageev. Thanks! + * Released 1.12.2 + +2013-05-08 Martin Pärtel <martin dot partel at gmail dot com> + + * Fixed building against latest FUSE e.g. on Ubuntu 13.04. + * Released 1.12.1 + 2013-03-01 Martin Pärtel <martin dot partel at gmail dot com> * Deprecated --user, --owner and --group in favor of --force-user and --force-group to avoid conflict with standard mount options (issue 25). - * Release 1.12 + * Released 1.12 2012-09-15 Martin Pärtel <martin dot partel at gmail dot com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bindfs-1.12/Makefile.in new/bindfs-1.12.2/Makefile.in --- old/bindfs-1.12/Makefile.in 2013-03-01 01:47:51.000000000 +0100 +++ new/bindfs-1.12.2/Makefile.in 2013-07-22 10:17:23.000000000 +0200 @@ -212,6 +212,7 @@ mkdir_p = @mkdir_p@ my_CFLAGS = @my_CFLAGS@ my_CPPFLAGS = @my_CPPFLAGS@ +my_LDFLAGS = @my_LDFLAGS@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bindfs-1.12/configure new/bindfs-1.12.2/configure --- old/bindfs-1.12/configure 2013-03-01 01:47:50.000000000 +0100 +++ new/bindfs-1.12.2/configure 2013-07-22 10:17:22.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for bindfs 1.12. +# Generated by GNU Autoconf 2.68 for bindfs 1.12.2. # # Report bugs to <[email protected]>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='bindfs' PACKAGE_TARNAME='bindfs' -PACKAGE_VERSION='1.12' -PACKAGE_STRING='bindfs 1.12' +PACKAGE_VERSION='1.12.2' +PACKAGE_STRING='bindfs 1.12.2' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -620,6 +620,7 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG +my_LDFLAGS my_CFLAGS my_CPPFLAGS CPP @@ -1301,7 +1302,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 bindfs 1.12 to adapt to many kinds of systems. +\`configure' configures bindfs 1.12.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1371,7 +1372,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bindfs 1.12:";; + short | recursive ) echo "Configuration of bindfs 1.12.2:";; esac cat <<\_ACEOF @@ -1483,7 +1484,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bindfs configure 1.12 +bindfs configure 1.12.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1761,7 +1762,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bindfs $as_me 1.12, which was +It was created by bindfs $as_me 1.12.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2577,7 +2578,7 @@ # Define the identity of the package. PACKAGE='bindfs' - VERSION='1.12' + VERSION='1.12.2' cat >>confdefs.h <<_ACEOF @@ -11241,6 +11242,8 @@ my_CPPFLAGS="-D_REENTRANT -D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=25" my_CFLAGS="$my_CFLAGS -Wall" +my_LDFLAGS="-pthread" + @@ -12019,7 +12022,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by bindfs $as_me 1.12, which was +This file was extended by bindfs $as_me 1.12.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12085,7 +12088,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -bindfs config.status 1.12 +bindfs config.status 1.12.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bindfs-1.12/configure.ac new/bindfs-1.12.2/configure.ac --- old/bindfs-1.12/configure.ac 2013-03-01 01:47:45.000000000 +0100 +++ new/bindfs-1.12.2/configure.ac 2013-07-22 10:17:18.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([bindfs],[1.12],[[email protected]]) +AC_INIT([bindfs],[1.12.2],[[email protected]]) AM_INIT_AUTOMAKE([foreign]) AM_CONFIG_HEADER(config.h) @@ -33,8 +33,10 @@ my_CPPFLAGS="-D_REENTRANT -D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=25" my_CFLAGS="$my_CFLAGS -Wall" +my_LDFLAGS="-pthread" AC_SUBST([my_CPPFLAGS]) AC_SUBST([my_CFLAGS]) +AC_SUBST([my_LDFLAGS]) # Check for xattrs AC_CHECK_FUNCS([setxattr getxattr listxattr removexattr]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bindfs-1.12/src/Makefile.am new/bindfs-1.12.2/src/Makefile.am --- old/bindfs-1.12/src/Makefile.am 2013-03-01 01:47:45.000000000 +0100 +++ new/bindfs-1.12.2/src/Makefile.am 2013-07-22 10:17:18.000000000 +0200 @@ -7,6 +7,6 @@ AM_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} AM_CFLAGS = ${my_CFLAGS} -bindfs_LDADD = $(fuse_LIBS) +bindfs_LDADD = $(fuse_LIBS) ${my_LDFLAGS} man_MANS = bindfs.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bindfs-1.12/src/Makefile.in new/bindfs-1.12.2/src/Makefile.in --- old/bindfs-1.12/src/Makefile.in 2013-03-01 01:47:50.000000000 +0100 +++ new/bindfs-1.12.2/src/Makefile.in 2013-07-22 10:17:23.000000000 +0200 @@ -54,7 +54,7 @@ usermap.$(OBJEXT) bindfs_OBJECTS = $(am_bindfs_OBJECTS) am__DEPENDENCIES_1 = -bindfs_DEPENDENCIES = $(am__DEPENDENCIES_1) +bindfs_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -211,6 +211,7 @@ mkdir_p = @mkdir_p@ my_CFLAGS = @my_CFLAGS@ my_CPPFLAGS = @my_CPPFLAGS@ +my_LDFLAGS = @my_LDFLAGS@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -228,7 +229,7 @@ bindfs_SOURCES = bindfs.c debug.c permchain.c userinfo.c misc.c usermap.c AM_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} AM_CFLAGS = ${my_CFLAGS} -bindfs_LDADD = $(fuse_LIBS) +bindfs_LDADD = $(fuse_LIBS) ${my_LDFLAGS} man_MANS = bindfs.1 all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bindfs-1.12/src/bindfs.1 new/bindfs-1.12.2/src/bindfs.1 --- old/bindfs-1.12/src/bindfs.1 2013-03-01 01:47:45.000000000 +0100 +++ new/bindfs-1.12.2/src/bindfs.1 2013-07-22 10:17:18.000000000 +0200 @@ -168,6 +168,12 @@ Makes chmod always fail with a 'permission denied' error. .TP +.B \-\-chmod\-filter=\fIpermissions\fP,, \-o chmod\-filter=... +Changes the permission bits of a chmod request before it is applied to the +original file. Accepts the same permission syntax as \-\-perms. +See \fB\%PERMISSION \%SPECIFICATION\fP below for details. + +.TP .B \-\-chmod\-allow\-x, \-o chmod\-allow\-x Allows setting and clearing the executable attribute on files (but not directories). When used with \-\-chmod\-ignore, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bindfs-1.12/src/bindfs.c new/bindfs-1.12.2/src/bindfs.c --- old/bindfs-1.12/src/bindfs.c 2013-03-01 01:47:45.000000000 +0100 +++ new/bindfs-1.12.2/src/bindfs.c 2013-07-22 10:17:18.000000000 +0200 @@ -114,6 +114,8 @@ int chmod_allow_x; + struct permchain *chmod_permchain; /* the --chmod-filter option */ + enum XAttrPolicy { XATTR_UNIMPLEMENTED, XATTR_READ_ONLY, @@ -595,6 +597,7 @@ switch (settings.chmod_policy) { case CHMOD_NORMAL: + mode = permchain_apply(settings.chmod_permchain, mode); if (chmod(path, mode) == -1) return -errno; return 0; @@ -964,6 +967,7 @@ " --chmod-normal Try to chmod the original files (the default).\n" " --chmod-ignore Have all chmods fail silently.\n" " --chmod-deny Have all chmods fail with 'permission denied'.\n" + " --chmod-filter Change permissions of chmod requests.\n" " --chmod-allow-x Allow changing file execute bits in any case.\n" "\n" "Extended attribute policy:\n" @@ -1313,6 +1317,8 @@ settings.permchain = NULL; permchain_destroy(settings.create_permchain); settings.create_permchain = NULL; + permchain_destroy(settings.chmod_permchain); + settings.chmod_permchain = NULL; free(settings.mirrored_users); settings.mirrored_users = NULL; free(settings.mirrored_members); @@ -1336,6 +1342,7 @@ char *create_for_user; char *create_for_group; char *create_with_perms; + char *chmod_filter; int no_allow_other; int multithreaded; } od; @@ -1383,6 +1390,7 @@ OPT2("--chmod-normal", "chmod-normal", OPTKEY_CHMOD_NORMAL), OPT2("--chmod-ignore", "chmod-ignore", OPTKEY_CHMOD_IGNORE), OPT2("--chmod-deny", "chmod-deny", OPTKEY_CHMOD_DENY), + OPT_OFFSET2("--chmod-filter=%s", "chmod-filter=%s", chmod_filter, -1), OPT2("--chmod-allow-x", "chmod-allow-x", OPTKEY_CHMOD_ALLOW_X), OPT2("--xattr-none", "xattr-none", OPTKEY_XATTR_NONE), @@ -1418,6 +1426,7 @@ settings.chgrp_policy = CHGRP_NORMAL; settings.chmod_policy = CHMOD_NORMAL; settings.chmod_allow_x = 0; + settings.chmod_permchain = permchain_create(); settings.xattr_policy = XATTR_READ_WRITE; settings.mirrored_users_only = 0; settings.mirrored_users = NULL; @@ -1531,6 +1540,12 @@ return 1; } } + if (od.chmod_filter) { + if (add_chmod_rules_to_permchain(od.chmod_filter, settings.chmod_permchain) != 0) { + fprintf(stderr, "Invalid permission specification: '%s'\n", od.chmod_filter); + return 1; + } + } /* Single-threaded mode by default */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bindfs-1.12/tests/Makefile.am new/bindfs-1.12.2/tests/Makefile.am --- old/bindfs-1.12/tests/Makefile.am 2013-03-01 01:47:45.000000000 +0100 +++ new/bindfs-1.12.2/tests/Makefile.am 2013-07-22 10:17:18.000000000 +0200 @@ -2,8 +2,5 @@ noinst_PROGRAMS = readdir_inode readdir_inode_SOURCES = readdir_inode.c -test_internals_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -test_internals_CFLAGS = ${my_CFLAGS} - TESTS = test_bindfs.rb SUBDIRS = internals diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bindfs-1.12/tests/Makefile.in new/bindfs-1.12.2/tests/Makefile.in --- old/bindfs-1.12/tests/Makefile.in 2013-03-01 01:47:50.000000000 +0100 +++ new/bindfs-1.12.2/tests/Makefile.in 2013-07-22 10:17:23.000000000 +0200 @@ -214,6 +214,7 @@ mkdir_p = @mkdir_p@ my_CFLAGS = @my_CFLAGS@ my_CPPFLAGS = @my_CPPFLAGS@ +my_LDFLAGS = @my_LDFLAGS@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -228,8 +229,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ readdir_inode_SOURCES = readdir_inode.c -test_internals_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -test_internals_CFLAGS = ${my_CFLAGS} TESTS = test_bindfs.rb SUBDIRS = internals all: all-recursive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bindfs-1.12/tests/internals/Makefile.am new/bindfs-1.12.2/tests/internals/Makefile.am --- old/bindfs-1.12/tests/internals/Makefile.am 2013-03-01 01:47:45.000000000 +0100 +++ new/bindfs-1.12.2/tests/internals/Makefile.am 2013-07-22 10:17:18.000000000 +0200 @@ -4,5 +4,6 @@ test_internals_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -I$(top_builddir)/src test_internals_CFLAGS = ${my_CFLAGS} +test_internals_LDADD = ${my_LDFLAGS} TESTS = test_internals_valgrind.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bindfs-1.12/tests/internals/Makefile.in new/bindfs-1.12.2/tests/internals/Makefile.in --- old/bindfs-1.12/tests/internals/Makefile.in 2013-03-01 01:47:50.000000000 +0100 +++ new/bindfs-1.12.2/tests/internals/Makefile.in 2013-07-22 10:17:23.000000000 +0200 @@ -49,7 +49,8 @@ am_test_internals_OBJECTS = test_internals-test_internals.$(OBJEXT) \ test_internals-misc.$(OBJEXT) test_internals_OBJECTS = $(am_test_internals_OBJECTS) -test_internals_LDADD = $(LDADD) +am__DEPENDENCIES_1 = +test_internals_DEPENDENCIES = $(am__DEPENDENCIES_1) test_internals_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_internals_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -180,6 +181,7 @@ mkdir_p = @mkdir_p@ my_CFLAGS = @my_CFLAGS@ my_CPPFLAGS = @my_CPPFLAGS@ +my_LDFLAGS = @my_LDFLAGS@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -196,6 +198,7 @@ test_internals_SOURCES = test_internals.c $(top_builddir)/src/misc.c test_internals_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -I$(top_builddir)/src test_internals_CFLAGS = ${my_CFLAGS} +test_internals_LDADD = ${my_LDFLAGS} TESTS = test_internals_valgrind.sh all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bindfs-1.12/tests/test_bindfs.rb new/bindfs-1.12.2/tests/test_bindfs.rb --- old/bindfs-1.12/tests/test_bindfs.rb 2013-03-01 01:47:45.000000000 +0100 +++ new/bindfs-1.12.2/tests/test_bindfs.rb 2013-07-22 10:17:18.000000000 +0200 @@ -258,6 +258,14 @@ assert_exception(EPERM) { chmod(0700, 'mnt/dir') } # chmod on dir should not work end +testenv("--chmod-filter=g-w,o-rwx") do + touch('src/file') + + chmod(0666, 'mnt/file') + + assert { File.stat('src/file').mode & 0777 == 0640 } +end + root_testenv("--map=nobody/root:@nogroup/@root") do touch('src/file') chown('nobody', 'nogroup', 'src/file') -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
