From b257eb007f6648daccb4ca922b0b19a99d6c23eb Mon Sep 17 00:00:00 2001 From: Till Maas Date: Feb 22 2016 17:21:34 +0000 Subject: Update to new release --- diff --git a/.gitignore b/.gitignore index 809b382..259cdb9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /bindfs-1.12.4.tar.gz /bindfs-1.12.6.tar.gz /bindfs-1.13.0.tar.gz +/bindfs-1.13.1.tar.gz diff --git a/bindfs-1.13.0-nobody_gid.patch b/bindfs-1.13.0-nobody_gid.patch deleted file mode 100644 index 813c642..0000000 --- a/bindfs-1.13.0-nobody_gid.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff -up bindfs-1.13.0/tests/test_bindfs.rb.nobody_gid bindfs-1.13.0/tests/test_bindfs.rb ---- bindfs-1.13.0/tests/test_bindfs.rb.nobody_gid 2015-09-27 00:11:40.000000000 +0200 -+++ bindfs-1.13.0/tests/test_bindfs.rb 2015-11-15 15:09:02.871299551 +0100 -@@ -36,7 +36,8 @@ end - - # Some useful shorthands - $nobody_uid = nobody_uid = Etc.getpwnam('nobody').uid --$nogroup_gid = nogroup_gid = Etc.getgrnam('nogroup').gid -+$nobody_gid = nobody_gid = Etc.getpwnam('nobody').gid -+$nobody_group = nobody_group = Etc.getgrgid(nobody_gid).name - - $tests_dir = File.dirname(File.realpath(__FILE__)) - -@@ -45,11 +46,11 @@ testenv("") do - assert { File.basename(pwd) == TESTDIR_NAME } - end - --testenv("-u nobody -g nogroup") do -+testenv("-u nobody -g #{nobody_group}") do - touch('src/file') - - assert { File.stat('mnt/file').uid == nobody_uid } -- assert { File.stat('mnt/file').gid == nogroup_gid } -+ assert { File.stat('mnt/file').gid == nobody_gid } - end - - testenv("-p 0600:u+D") do -@@ -73,24 +74,24 @@ end - - root_testenv("", :title => "--create-as-user should be default for root") do - chmod(0777, 'src') -- `sudo -u nobody -g nogroup touch mnt/file` -- `sudo -u nobody -g nogroup mkdir mnt/dir` -- `sudo -u nobody -g nogroup ln -sf /tmp/foo mnt/lnk` -+ `sudo -u nobody -g #{nobody_group} touch mnt/file` -+ `sudo -u nobody -g #{nobody_group} mkdir mnt/dir` -+ `sudo -u nobody -g #{nobody_group} ln -sf /tmp/foo mnt/lnk` - - assert { File.stat('mnt/file').uid == nobody_uid } -- assert { File.stat('mnt/file').gid == nogroup_gid } -+ assert { File.stat('mnt/file').gid == nobody_gid } - assert { File.stat('src/file').uid == nobody_uid } -- assert { File.stat('src/file').gid == nogroup_gid } -+ assert { File.stat('src/file').gid == nobody_gid } - - assert { File.stat('mnt/dir').uid == nobody_uid } -- assert { File.stat('mnt/dir').gid == nogroup_gid } -+ assert { File.stat('mnt/dir').gid == nobody_gid } - assert { File.stat('src/dir').uid == nobody_uid } -- assert { File.stat('src/dir').gid == nogroup_gid } -+ assert { File.stat('src/dir').gid == nobody_gid } - - assert { File.lstat('mnt/lnk').uid == nobody_uid } -- assert { File.lstat('mnt/lnk').gid == nogroup_gid } -+ assert { File.lstat('mnt/lnk').gid == nobody_gid } - assert { File.lstat('src/lnk').uid == nobody_uid } -- assert { File.lstat('src/lnk').gid == nogroup_gid } -+ assert { File.lstat('src/lnk').gid == nobody_gid } - end - - testenv("--create-with-perms=og=r:ogd+x") do -@@ -168,8 +169,8 @@ def run_chown_chgrp_test_case(chown_flag - mntfile = 'mnt/file' - tests = [ - lambda { chown('nobody', nil, mntfile) }, -- lambda { chown(nil, 'nogroup', mntfile) }, -- lambda { chown('nobody', 'nogroup', mntfile) } -+ lambda { chown(nil, nobody_group, mntfile) }, -+ lambda { chown('nobody', nobody_group, mntfile) } - ] - - for testcase, expect in tests.zip expectations -@@ -185,16 +186,16 @@ def run_chown_chgrp_test_case(chown_flag - case expect - when :uid - assert { uid == $nobody_uid } -- assert { gid != $nogroup_gid } -+ assert { gid != $nobody_gid } - when :gid - assert { uid != $nobody_uid } -- assert { gid == $nogroup_gid } -+ assert { gid == $nobody_gid } - when :both - assert { uid == $nobody_uid } -- assert { gid == $nogroup_gid } -+ assert { gid == $nobody_gid } - when nil - assert { uid != $nobody_uid } -- assert { gid != $nogroup_gid } -+ assert { gid != $nobody_gid } - end - end - end -@@ -211,16 +212,16 @@ root_testenv("--chown-deny") do - touch('src/file') - - assert_exception(EPERM) { chown('nobody', nil, 'mnt/file') } -- assert_exception(EPERM) { chown('nobody', 'nogroup', 'mnt/file') } -- chown(nil, 'nogroup', 'mnt/file') -+ assert_exception(EPERM) { chown('nobody', nobody_group, 'mnt/file') } -+ chown(nil, nobody_group, 'mnt/file') - end - - root_testenv("--mirror=root") do - touch('src/file') -- chown('nobody', 'nogroup', 'src/file') -+ chown('nobody', nobody_group, 'src/file') - - assert { File.stat('mnt/file').uid == 0 } -- assert { File.stat('mnt/file').gid == $nogroup_gid } -+ assert { File.stat('mnt/file').gid == $nobody_gid } - end - - testenv("--chmod-allow-x --chmod-ignore") do -@@ -265,9 +266,9 @@ testenv("--chmod-filter=g-w,o-rwx") do - assert { File.stat('src/file').mode & 0777 == 0640 } - end - --root_testenv("--map=nobody/root:@nogroup/@root") do -+root_testenv("--map=nobody/root:@nobody/@root") do - touch('src/file') -- chown('nobody', 'nogroup', 'src/file') -+ chown('nobody', nobody_group, 'src/file') - - assert { File.stat('mnt/file').uid == 0 } - assert { File.stat('mnt/file').gid == 0 } -@@ -276,9 +277,9 @@ root_testenv("--map=nobody/root:@nogroup - mkdir('mnt/newdir') - - assert { File.stat('src/newfile').uid == $nobody_uid } -- assert { File.stat('src/newfile').gid == $nogroup_gid } -+ assert { File.stat('src/newfile').gid == $nobody_gid } - assert { File.stat('src/newdir').uid == $nobody_uid } -- assert { File.stat('src/newdir').gid == $nogroup_gid } -+ assert { File.stat('src/newdir').gid == $nobody_gid } - - assert { File.stat('mnt/newfile').uid == 0 } - assert { File.stat('mnt/newfile').gid == 0 } -@@ -286,9 +287,9 @@ root_testenv("--map=nobody/root:@nogroup - assert { File.stat('mnt/newdir').gid == 0 } - end - --root_testenv("--map=@nogroup/@root") do -+root_testenv("--map=@nobody/@root") do - touch('src/file') -- chown('nobody', 'nogroup', 'src/file') -+ chown('nobody', nobody_group, 'src/file') - - assert { File.stat('mnt/file').gid == 0 } - end -@@ -360,14 +361,14 @@ end - root_testenv("", :title => "setgid directories") do - mkdir('mnt/dir') - chmod("g+s", 'mnt/dir') -- chown(nil, $nogroup_gid, 'mnt/dir') -+ chown(nil, $nobody_gid, 'mnt/dir') - - touch('mnt/dir/file') - - assert { File.stat('src/dir').mode & 07000 == 02000 } -- assert { File.stat('src/dir/file').gid == $nogroup_gid } -+ assert { File.stat('src/dir/file').gid == $nobody_gid } - assert { File.stat('mnt/dir').mode & 07000 == 02000 } -- assert { File.stat('mnt/dir/file').gid == $nogroup_gid } -+ assert { File.stat('mnt/dir/file').gid == $nobody_gid } - end - - testenv("", :title => "utimens on symlinks") do diff --git a/bindfs.spec b/bindfs.spec index 2f24b50..7b729a0 100644 --- a/bindfs.spec +++ b/bindfs.spec @@ -1,16 +1,12 @@ -%global _hardened_build 1 - Name: bindfs -Version: 1.13.0 -Release: 2%{?dist} +Version: 1.13.1 +Release: 1%{?dist} Summary: Fuse filesystem to mirror a directory Group: System Environment/Base License: GPLv2+ URL: http://bindfs.org/ Source0: http://bindfs.org/downloads//bindfs-%{version}.tar.gz -# 2015-11-15: Submitted upstream: https://github.com/mpartel/bindfs/pull/25 -Patch0: bindfs-1.13.0-nobody_gid.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fuse-devel @@ -26,7 +22,6 @@ the mirror directory. %prep %setup -q -%patch0 -p1 -b .nobody_gid %build @@ -56,14 +51,17 @@ fi %files %defattr(-,root,root,-) -%{!?_licensedir:%global license %%doc} %license COPYING -%doc ChangeLog README +%doc ChangeLog README.md %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %changelog +* Mon Feb 22 2016 Till Maas - 1.13.1-1 +- Update to new release +- cleanup spec + * Wed Feb 03 2016 Fedora Release Engineering - 1.13.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 18782ed..c27496b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -67e1fc03f81c8c3a03703a6f4eef03d9 bindfs-1.13.0.tar.gz +b2b2c0dc99b355a194b82102d3653706 bindfs-1.13.1.tar.gz