Hello community, here is the log from the commit of package clicfs for openSUSE:Factory checked in at 2012-02-14 18:59:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clicfs (Old) and /work/SRC/openSUSE:Factory/.clicfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clicfs", Maintainer is "co...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/clicfs/clicfs.changes 2011-10-18 14:10:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.clicfs.new/clicfs.changes 2012-02-14 18:59:49.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 10 15:18:29 UTC 2011 - co...@suse.com + +- some safety catches for a bug I can no longer reproduce + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clicfs.spec ++++++ --- /var/tmp/diff_new_pack.hBpmng/_old 2012-02-14 18:59:50.000000000 +0100 +++ /var/tmp/diff_new_pack.hBpmng/_new 2012-02-14 18:59:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package clicfs # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: clicfs Version: 1.4.4 -Release: 1 -License: GPLv2 +Release: 0 Summary: Compressed Loop Image Container +License: GPL-2.0 Group: System/Filesystems Source: clicfs.tar.bz2 BuildRequires: cmake ++++++ clicfs.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CMakeLists.txt new/CMakeLists.txt --- old/CMakeLists.txt 2011-10-17 16:39:44.000000000 +0200 +++ new/CMakeLists.txt 2012-02-09 15:04:54.000000000 +0100 @@ -34,5 +34,5 @@ ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(doc) -ADD_SUBDIRECTORY(misc) +#ADD_SUBDIRECTORY(misc) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/misc/makeiso.sh new/misc/makeiso.sh --- old/misc/makeiso.sh 2011-10-17 16:39:44.000000000 +0200 +++ new/misc/makeiso.sh 2012-02-09 15:04:54.000000000 +0100 @@ -6,7 +6,7 @@ find . | cpio --create --format=newc --quiet | gzip -9 -f > ../CD1/$loaderdir cd .. loaderdir=$(cd CD1 ; ls -1 boot/*/loader/isolinux.bin) -genisoimage -R -J -f -pad -joliet-long -no-emul-boot -boot-load-size 4 -boot-info-table -b $loaderdir -o kde2.iso CD1/ -isohybrid -id $(cat CD1/boot/grub/mbrid) kde2.iso +genisoimage -V 0x8efb7557 -R -J -f -pad -joliet-long -no-emul-boot -boot-load-size 4 -boot-info-table -b $loaderdir -o kde2.iso CD1/ +isohybrid -id 0x8efb7557 kde2.iso dd if=/dev/zero seek=1000 count=1 bs=1M of=kde2.iso diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/clicfs.c new/src/clicfs.c --- old/src/clicfs.c 2011-10-17 16:39:44.000000000 +0200 +++ new/src/clicfs.c 2012-02-09 15:04:54.000000000 +0100 @@ -454,7 +454,7 @@ static ssize_t lastblock = -1; #endif - fprintf(logger, "access %ld+8 (part %ld)\n", (long)block*8, part); + fprintf(logger, "access %ld+8 (part %ld)\n", (long)block*8, (long)part); #if 0 if (lastblock >= 0 && block != (size_t)(lastblock + 1)) @@ -539,7 +539,10 @@ static size_t clic_write_block(const char *buf, off_t block, off_t ioff, size_t size) { - if (logger) fprintf(logger, "clic_write_block %ld block:%ld ioff:%ld size:%ld\n", detached_allocated, block, ioff, size); + if (!size) return 0; + + if (logger) fprintf(logger, "clic_write_block %lld block:%lld ioff:%lld size:%lld\n", + (long long)detached_allocated, (long long)block, (long long)ioff, (long long)size); if (clic_detach(block)) { if (logger) fprintf(logger, "clic_detach FAILED\n"); return -ENOSPC; @@ -559,7 +562,7 @@ if(path[0] == '/' && strcmp(path + 1, thefile) != 0) return -ENOENT; - if (logger) fprintf(logger, "clic_write offset %ld - size %ld (%ld)\n", offset, size, thefilesize); + if (logger) fprintf(logger, "clic_write offset %lld - size %lld (%lld)\n", (long long)offset, (long long)size, (long long)thefilesize); if (offset >= (off_t)thefilesize) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
