Hello community,

here is the log from the commit of package clicfs for openSUSE:Factory
checked in at Mon Aug 29 16:45:07 CEST 2011.



--------
--- clicfs/clicfs.changes       2011-03-23 13:15:39.000000000 +0100
+++ /mounts/work_src_done/STABLE/clicfs/clicfs.changes  2011-08-29 
12:45:13.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Aug 29 10:41:37 UTC 2011 - [email protected]
+
+- update to 1.4.2
+   - fix build with newer ld
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  fix-crash.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ clicfs.spec ++++++
--- /var/tmp/diff_new_pack.E3MJWq/_old  2011-08-29 16:44:09.000000000 +0200
+++ /var/tmp/diff_new_pack.E3MJWq/_new  2011-08-29 16:44:09.000000000 +0200
@@ -23,7 +23,7 @@
 Requires:       fuse
 Summary:        Compressed Loop Image Container
 Version:        1.4.1
-Release:        1
+Release:        2
 License:        GPLv2
 Group:          System/Filesystems
 Source:         clicfs.tar.bz2

++++++ clicfs.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/misc/CMakeLists.txt new/misc/CMakeLists.txt
--- old/misc/CMakeLists.txt     2011-03-23 12:13:07.000000000 +0100
+++ new/misc/CMakeLists.txt     2011-08-29 14:48:01.000000000 +0200
@@ -1,3 +1,3 @@
 
 add_executable(e2block2file e2block2file.c)
-TARGET_LINK_LIBRARIES(e2block2file ext2fs)
+TARGET_LINK_LIBRARIES(e2block2file ext2fs com_err)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/src/CMakeLists.txt new/src/CMakeLists.txt
--- old/src/CMakeLists.txt      2011-03-23 12:13:07.000000000 +0100
+++ new/src/CMakeLists.txt      2011-08-29 14:48:01.000000000 +0200
@@ -1,9 +1,9 @@
 
 add_executable(mkclicfs mkclicfs.cpp)
-TARGET_LINK_LIBRARIES(mkclicfs lzma crypto)
+TARGET_LINK_LIBRARIES(mkclicfs lzma crypto pthread)
 
 add_executable(clicfs clicfs.c clicfs_common.c)
-TARGET_LINK_LIBRARIES(clicfs lzma fuse)
+TARGET_LINK_LIBRARIES(clicfs lzma fuse pthread)
 
 add_executable(unclicfs unclicfs.c clicfs_common.c)
 TARGET_LINK_LIBRARIES(unclicfs lzma)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/src/clicfs.c new/src/clicfs.c
--- old/src/clicfs.c    2011-03-23 12:13:07.000000000 +0100
+++ new/src/clicfs.c    2011-08-29 14:48:01.000000000 +0200
@@ -508,13 +508,11 @@
 static int clic_write(const char *path, const char *buf, size_t size, off_t 
offset,
                       struct fuse_file_info *fi)
 {
-    if (logger) fprintf(logger, "%lx write0 %s %ld %ld %lx\n", pthread_self(), 
path, offset, size, pthread_self());
     (void) fi;
     if(path[0] == '/' && strcmp(path + 1, thefile) != 0)
        return -ENOENT;
 
     if (offset >= (off_t)thefilesize) {
-      if (logger) fprintf(logger, "%lx writeF %s %ld %ld -> 0!! %lx\n", 
pthread_self(), path, offset, size, pthread_self());
         return 0;
     }
 
@@ -522,7 +520,6 @@
        size = thefilesize-offset;
 
     if (!size) {
-      if (logger) fprintf(logger, "%lx write %s %ld %ld -> 0!!\n", 
pthread_self(), path, offset, size);
        return 0;
     }
 
@@ -536,16 +533,12 @@
     int ret = 0;
 
     if (size <= pagesize) {
-      if (logger) fprintf(logger, "%lx write2 %s %ld %ld\n", pthread_self(), 
path, offset, size);
         ret = clic_write_block(buf, block, ioff, size);
-       if (logger) fprintf(logger, "%lx write3 %s %ld %ld -> %d\n", 
pthread_self(), path, offset, size, ret);
     } else {
        size_t wrote = 0;
        do
        {
-         if (logger) fprintf(logger, "%lx write4 %s %ld %ld %lx\n", 
pthread_self(), path, offset, size, pthread_self());
            size_t diff = clic_write_block(buf, block, ioff, size > pagesize ? 
pagesize : size);
-           if (logger) fprintf(logger, "%lx write5 %s %ld %ld -> %ld\n", 
pthread_self(), path, offset, size, diff);
            ioff = 0;
            size -= diff;
            buf += diff;
@@ -555,7 +548,6 @@
 
        ret = wrote;
     }
-    if (logger) fprintf(logger, "%lx writeD %s %ld %ld -> %d\n", 
pthread_self(), path, offset, size, ret);
     return ret;
 }
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to