Hello community, here is the log from the commit of package zfs-fuse for openSUSE:11.4 checked in at Wed Mar 23 19:47:00 CET 2011. -------- --- old-versions/11.4/all/zfs-fuse/zfs-fuse.changes 2010-12-02 12:58:22.000000000 +0100 +++ 11.4/zfs-fuse/zfs-fuse.changes 2011-03-22 16:44:51.000000000 +0100 @@ -1,0 +2,19 @@ +Tue Mar 22 15:36:54 UTC 2011 - gber@opensuse.org + +- updated to a current snapshot of the maint-0.6.9 maintenance + branch (0.6.9_git20110322) + - use drop_caches to clear the page cache in order to prevent fs + corruption (issue #65, bnc#679173) + - fixed ZFSFUSE_BUSY_SLEEP_FACTOR typo causing overlong delays + - fixed a bad mem ref in do_mount + - fixed zfsrc parse error when no line-end on last line + (issue #64) + - do not link zfs, zpool and zdb against libssl + - gcc 4.5 compatibility + - buildsystem fixes +- dropped obsolete zfs-fuse-0.6.9-gcc-4.5-fix.patch +- added zfs-fuse-0.7.0-fix-gcc-false-warnings.patch to silence + gcc false positive warning causing a fatal error in the + post-build-checks + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/zfs-fuse Destination is old-versions/11.4/UPDATES/all/zfs-fuse calling whatdependson for 11.4-i586 Old: ---- zfs-fuse-0.6.9-gcc-4.5-fix.patch zfs-fuse-0.6.9.tar.bz2 New: ---- zfs-fuse-0.6.9-fix-gcc-false-warnings.patch zfs-fuse-0.6.9_git20110322.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zfs-fuse.spec ++++++ --- /var/tmp/diff_new_pack.6CpWF9/_old 2011-03-23 19:46:45.000000000 +0100 +++ /var/tmp/diff_new_pack.6CpWF9/_new 2011-03-23 19:46:45.000000000 +0100 @@ -18,13 +18,13 @@ Name: zfs-fuse -Version: 0.6.9 -Release: 1 +Version: 0.6.9_git20110322 +Release: 0.<RELEASE2> Summary: A port of ZFS to the FUSE framework for the Linux operating system License: CDDL 1.0 Group: System/Filesystems Url: http://zfs-fuse.net/ -Source: http://zfs-fuse.net/releases/%{version}/zfs-fuse-%{version}.tar.bz2 +Source: zfs-fuse-%{version}.tar.bz2 Source1: zfs-fuse.init Source2: sysconfig.zfs-fuse Source3: zfsrc @@ -32,7 +32,7 @@ Patch1: zfs-fuse-0.6.9-fix-buildsystem.patch Patch2: zfs-fuse-0.6.9-fix-strncat-usage.patch Patch3: zfs-fuse-0.6.9-fix-executable-stack.patch -Patch4: zfs-fuse-0.6.9-gcc-4.5-fix.patch +Patch4: zfs-fuse-0.6.9-fix-gcc-false-warnings.patch BuildRequires: fuse-devel BuildRequires: libattr-devel BuildRequires: libaio-devel @@ -54,11 +54,6 @@ mount, use and manage ZFS file systems under Linux, bringing the uncontested reliability and large feature set of ZFS to the Linux world. -Authors: --------- - <rudd-o@rudd-o.com> - Ricardo Correia <rcorreia@wizy.org> - %prep %setup -q ++++++ zfs-fuse-0.6.9-fix-buildsystem.patch ++++++ --- /var/tmp/diff_new_pack.6CpWF9/_old 2011-03-23 19:46:45.000000000 +0100 +++ /var/tmp/diff_new_pack.6CpWF9/_new 2011-03-23 19:46:45.000000000 +0100 @@ -1,16 +1,18 @@ -diff -ur zfs-fuse-0.6.9.orig/src/lib/libumem/SConscript zfs-fuse-0.6.9/src/lib/libumem/SConscript ---- zfs-fuse-0.6.9.orig/src/lib/libumem/SConscript 2010-06-04 21:03:04.000000000 +0200 -+++ zfs-fuse-0.6.9/src/lib/libumem/SConscript 2010-11-17 15:38:58.000000000 +0100 -@@ -1,5 +1,5 @@ +diff -urNp zfs-fuse-0.7.0.orig/src/lib/libumem/SConscript zfs-fuse-0.7.0/src/lib/libumem/SConscript +--- zfs-fuse-0.7.0.orig/src/lib/libumem/SConscript 2011-03-09 16:22:30.000000000 +0100 ++++ zfs-fuse-0.7.0/src/lib/libumem/SConscript 2011-03-10 12:15:14.000000000 +0100 +@@ -1,7 +1,7 @@ + import os Import('env') -Command("Makefile", [], ["cd lib/libumem && ./configure"]) +Command("Makefile", [], [env.subst("cd lib/libumem && CFLAGS=\"$CCFLAGS\" CPPFLAGS=\"$CPPFLAGS\" LDFLAGS=\"$LINKFLAGS\" ./configure").replace("-std=c99", "-std=gnu99")]) Command("libumem.a", [Glob('*.c'),'Makefile',Glob('*.h')], ["cd lib/libumem && make && rm -f libumem.a && ln -s .libs/libumem.a"]) - -diff -ur zfs-fuse-0.6.9.orig/src/lib/libzpool/vdev.c zfs-fuse-0.6.9/src/lib/libzpool/vdev.c ---- zfs-fuse-0.6.9.orig/src/lib/libzpool/vdev.c 2010-06-04 21:03:04.000000000 +0200 -+++ zfs-fuse-0.6.9/src/lib/libzpool/vdev.c 2010-11-17 15:21:45.000000000 +0100 + if os.path.isfile("Makefile") and env.GetOption('clean'): + Execute(Action(["make -C %s distclean" % (os.path.join(env.Dir("#").abspath, 'lib/libumem'))])) +diff -urNp zfs-fuse-0.7.0.orig/src/lib/libzpool/vdev.c zfs-fuse-0.7.0/src/lib/libzpool/vdev.c +--- zfs-fuse-0.7.0.orig/src/lib/libzpool/vdev.c 2011-03-09 16:22:30.000000000 +0100 ++++ zfs-fuse-0.7.0/src/lib/libzpool/vdev.c 2011-03-10 12:15:14.000000000 +0100 @@ -43,6 +43,10 @@ #include <syslog.h> #include <libintl.h> @@ -22,7 +24,7 @@ /* * Virtual device management. */ -@@ -3056,7 +3060,7 @@ +@@ -3056,7 +3060,7 @@ vdev_set_state(vdev_t *vd, boolean_t iso return; // nothing of interest here } if (strcasecmp(top->spa_name,"$import")) { @@ -31,18 +33,18 @@ syslog(LOG_WARNING,"running zfs_pool_alert for pool %s, status %s prev status %s",top->spa_name,zpool_state_to_name(state,save_state), zpool_state_to_name(save_state,state)); int ret = system(cmd); -diff -ur zfs-fuse-0.6.9.orig/src/SConstruct zfs-fuse-0.6.9/src/SConstruct ---- zfs-fuse-0.6.9.orig/src/SConstruct 2010-06-04 21:03:04.000000000 +0200 -+++ zfs-fuse-0.6.9/src/SConstruct 2010-11-17 15:24:44.000000000 +0100 -@@ -8,6 +8,7 @@ - install_dir = ARGUMENTS.get('install_dir', '/usr/local/sbin') - man_dir = ARGUMENTS.get('man_dir', '/usr/local/share/man/man8/') - cfg_dir = ARGUMENTS.get('cfg_dir', '/etc/zfs') -+libexec_dir = ARGUMENTS.get('libexec_dir', '/usr/local/lib/zfs-fuse') +diff -urNp zfs-fuse-0.7.0.orig/src/SConstruct zfs-fuse-0.7.0/src/SConstruct +--- zfs-fuse-0.7.0.orig/src/SConstruct 2011-03-09 16:22:30.000000000 +0100 ++++ zfs-fuse-0.7.0/src/SConstruct 2011-03-10 12:57:49.000000000 +0100 +@@ -22,6 +22,7 @@ def arg_get(name, default): + install_dir = arg_get('install_dir', '/usr/local/sbin') + man_dir = arg_get('man_dir', '/usr/local/share/man/man8/') + cfg_dir = arg_get('cfg_dir', '/etc/zfs') ++libexec_dir = arg_get('libexec_dir', '/usr/local/lib/zfs-fuse') env = Environment() -@@ -16,28 +17,22 @@ +@@ -30,8 +31,13 @@ osname = f.readline().strip() f.close() env.CacheDir('/tmp/.zfs-fuse.scons') @@ -57,23 +59,30 @@ env['CCFLAGS'] = Split('-pipe -Wall -std=c99 -Wno-switch -Wno-unused -Wno-missing-braces -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DTEXT_DOMAIN=\\"zfs-fuse\\" ') if osname == "Linux": - env.Append(CPPFLAGS = " -DLINUX_AIO") +@@ -40,25 +46,12 @@ if osname == "Linux": + debug = int(ARGUMENTS.get('debug', '0')) + optim = ARGUMENTS.get('optim', '-O2') --debug = int(ARGUMENTS.get('debug', '0')) -- -if not debug: - env.Append(LINKFLAGS = ['-s']) -- env.Append(CCFLAGS = Split('-s -O2 -DNDEBUG')) +- env.Append(CCFLAGS = Split(" ".join(["-s -DNDEBUG", optim]))); -else: - env.Append(LINKFLAGS = ['-ggdb']) - env.Append(CCFLAGS = ['-ggdb']) -# Be careful here, one of DEBUG or NDEBUG must be defined, if you undef both, you'll get unexpected results - if debug == 1: -- env.Append(CCFLAGS = Split('-O2 -DDEBUG')) +- env.Append(CCFLAGS = Split(" ".join(["-DNDEBUG", optim]))); - elif debug == 2: - env.Append(CCFLAGS = ['-DDEBUG']) - elif debug == 3: - env.Append(CCFLAGS = Split('-finstrument-functions -DDEBUG')) ++env.Append(CCFLAGS = ['-DNDEBUG']) + +-if not (('-DDEBUG' in env['CCFLAGS']) or +- ('-DNDEBUG' in env['CCFLAGS'])): +- print +- print "Misconfigured debug level: Neither DEBUG or NDEBUG appears to have been defined: %s" % env['CCFLAGS'] +- sys.exit(1) +if 'CPPFLAGS' in os.environ: + env.Append(CPPFLAGS = " "+os.environ['CPPFLAGS']) +if 'CCFLAGS' in os.environ: @@ -81,16 +90,16 @@ env['CPPPATH'] = [] -@@ -99,7 +94,7 @@ +@@ -120,7 +113,7 @@ env.Install(install_dir, 'cmd/zpool/zpoo env.Install(install_dir, 'cmd/zfs/zfs') env.Install(install_dir, 'zfs-fuse/zfs-fuse') env.Install(install_dir, 'cmd/zstreamdump/zstreamdump') -env.Install(cfg_dir, '../contrib/zfs_pool_alert') +env.Install(libexec_dir, '../contrib/zfs_pool_alert') - env.Install(man_dir, '../doc/zdb.8.gz') - env.Install(man_dir, '../doc/zfs.8.gz') -@@ -110,4 +105,4 @@ + env.Install(man_dir, '../doc/zdb.8') + env.Install(man_dir, '../doc/zfs.8') +@@ -132,4 +125,4 @@ if "tags" in sys.argv: print "updating tags..." os.system("ctags --extra=+f `find -name '*.c'` `find -name '*.h'`") ++++++ zfs-fuse-0.6.9-fix-gcc-false-warnings.patch ++++++ diff -urNp zfs-fuse-0.7.0.orig/src/lib/libumem/umem_update_thread.c zfs-fuse-0.7.0/src/lib/libumem/umem_update_thread.c --- zfs-fuse-0.7.0.orig/src/lib/libumem/umem_update_thread.c 2011-03-09 16:22:30.000000000 +0100 +++ zfs-fuse-0.7.0/src/lib/libumem/umem_update_thread.c 2011-03-10 14:03:58.000000000 +0100 @@ -41,7 +41,7 @@ extern int _cond_timedwait(cond_t *cv, mutex_t *mutex, const timespec_t *delay); /*ARGSUSED*/ -static THR_RETURN +__attribute__ ((noreturn)) static THR_RETURN THR_API umem_update_thread(void *arg) { struct timeval now; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org