Your message dated Thu, 03 Aug 2006 09:18:23 -0700
with message-id <[EMAIL PROTECTED]>
and subject line Bug#335872: fixed in cloop 2.04-1+eb.1-3
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: cloop-utils
Version: 2.02.1+eb.10+kbsd
Severity: important
Tags: patch
Fails to build on GNU/kFreeBSD. The attached patch solves the problem (it
removes duplicate byteswapping code and merges all cases into a
system-independant one).
Please could you send this to upstream?
-- System Information:
Debian Release: testing/unstable
Architecture: kfreebsd-i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: GNU/kFreeBSD 5.4-1-686
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ANSI_X3.4-1968) (ignored: LC_ALL
set to C)
Versions of packages cloop-utils depends on:
ii libc0.1 2.3-1+kbsd.11 GNU C Library: Shared libraries an
ii libgcc1 1:4.0.2-2 GCC support library
ii libstdc++6 4.0.2-2 The GNU Standard C++ Library v3
ii zlib1g 1:1.2.3-6 compression library - runtime
cloop-utils recommends no packages.
-- no debconf information
diff -ur cloop-2.02.1+eb.10.old/advancecomp-1.14/advfs.cc cloop-2.02.1+eb.10+kbsd/advancecomp-1.14/advfs.cc
--- cloop-2.02.1+eb.10.old/advancecomp-1.14/advfs.cc 2005-10-04 01:37:21.000000000 +0200
+++ cloop-2.02.1+eb.10+kbsd/advancecomp-1.14/advfs.cc 2005-10-26 09:12:55.000000000 +0200
@@ -38,6 +38,7 @@
#include <sys/stat.h>
#include <pthread.h>
#include <time.h>
+#include <endian.h>
#include <fcntl.h>
#include <zlib.h>
#include "compressed_loop.h"
@@ -90,33 +91,27 @@
#define MAXLEN(blocksize) ((blocksize) + (blocksize)/1000 + 12)
-# if defined(linux) || defined(__linux__)
-#include <asm/byteorder.h>
-#define ENSURE64UINT(x) __cpu_to_be64(x)
+#ifdef __CYGWIN__
+typedef uint64_t loff_t;
#endif
-
-#if defined(__CYGWIN__)
-
+#ifndef be64toh
static __inline __uint64_t
__bswap64(__uint64_t _x)
{
- return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) |
- ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) |
- ((_x << 24) & ((__uint64_t)0xff << 40)) |
- ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56)));
+ return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) |
+ ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) |
+ ((_x << 24) & ((__uint64_t)0xff << 40)) |
+ ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56)));
}
-#define ENSURE64UINT(x) __bswap64(x)
-#endif
-
-// FIXME: also use __bswap64 on BSD with additional checks, see
-// extract_compressed_fs.c
-
-#ifndef ENSURE64UINT
-#warning System not Linux, endian correction macro not available
-#warning Assuming the system is Big-Endian (eg. PowerPC)
-#define ENSURE64UINT(x) (uint64_t) x
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define be64toh(x) __bswap64(x)
+#else
+#define be64toh(x)
#endif
+#endif /* !be64toh */
+#define __be64_to_cpu be64toh
+#define ENSURE64UINT __be64_to_cpu
#define die(msg) { cerr << "ERROR: " << msg << ". Exiting..."<<endl; exit(1); }
diff -ur cloop-2.02.1+eb.10.old/debian/control cloop-2.02.1+eb.10+kbsd/debian/control
--- cloop-2.02.1+eb.10.old/debian/control 2005-08-20 10:19:52.000000000 +0200
+++ cloop-2.02.1+eb.10+kbsd/debian/control 2005-10-26 08:59:10.000000000 +0200
@@ -2,7 +2,7 @@
Section: misc
Priority: optional
Maintainer: Eduard Bloch <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), zlib1g-dev, module-assistant, bzip2
+Build-Depends: debhelper (>> 3.0.0), zlib1g-dev, module-assistant [!kfreebsd-i386], bzip2
Standards-Version: 3.6.2.1
Package: cloop-utils
diff -ur cloop-2.02.1+eb.10.old/extract_compressed_fs.c cloop-2.02.1+eb.10+kbsd/extract_compressed_fs.c
--- cloop-2.02.1+eb.10.old/extract_compressed_fs.c 2005-09-25 17:17:36.000000000 +0200
+++ cloop-2.02.1+eb.10+kbsd/extract_compressed_fs.c 2005-10-26 09:12:17.000000000 +0200
@@ -5,39 +5,15 @@
#include <stdlib.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <endian.h>
#include <errno.h>
#include <string.h>
#include <zlib.h>
#include <netinet/in.h>
-#if defined(__FreeBSD__)
-#include <sys/endian.h>
-#include <netinet/in.h>
-typedef uint64_t loff_t;
-#ifndef be64toh
-static __inline __uint64_t
-__bswap64(__uint64_t _x)
-{
- return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) |
- ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) |
- ((_x << 24) & ((__uint64_t)0xff << 40)) |
- ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56)));
-}
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define be64toh(x) __bswap64(x)
-#else
-#define be64toh(x)
-#endif
-#endif
-#define __be64_to_cpu be64toh
-#else
-#include <asm/byteorder.h>
-#endif
-#include "compressed_loop.h"
-
-#if defined(__CYGWIN__)
-#include <netinet/in.h>
+#ifdef __CYGWIN__
typedef uint64_t loff_t;
+#endif
#ifndef be64toh
static __inline __uint64_t
__bswap64(__uint64_t _x)
@@ -53,9 +29,9 @@
#else
#define be64toh(x)
#endif
-#endif
+#endif /* !be64toh */
#define __be64_to_cpu be64toh
-#endif
+#include "compressed_loop.h"
struct compressed_block
{
--- End Message ---
--- Begin Message ---
Source: cloop
Source-Version: 2.04-1+eb.1-3
We believe that the bug you reported is fixed in the latest version of
cloop, which is due to be installed in the Debian FTP archive:
cloop-src_2.04-1+eb.1-3_all.deb
to pool/main/c/cloop/cloop-src_2.04-1+eb.1-3_all.deb
cloop-utils_2.04-1+eb.1-3_amd64.deb
to pool/main/c/cloop/cloop-utils_2.04-1+eb.1-3_amd64.deb
cloop_2.04-1+eb.1-3.dsc
to pool/main/c/cloop/cloop_2.04-1+eb.1-3.dsc
cloop_2.04-1+eb.1-3.tar.gz
to pool/main/c/cloop/cloop_2.04-1+eb.1-3.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Eduard Bloch <[EMAIL PROTECTED]> (supplier of updated cloop package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Wed, 02 Aug 2006 23:51:14 +0200
Source: cloop
Binary: cloop-src cloop-utils
Architecture: source amd64 all
Version: 2.04-1+eb.1-3
Distribution: unstable
Urgency: low
Maintainer: Eduard Bloch <[EMAIL PROTECTED]>
Changed-By: Eduard Bloch <[EMAIL PROTECTED]>
Description:
cloop-src - Source of the compressed loopback device module
cloop-utils - Tools for handling with cloop compressed volumes
Closes: 164015 296179 335872 337546 380384
Changes:
cloop (2.04-1+eb.1-3) unstable; urgency=low
.
* rewrite of the work control in multithreaded advfs/create_compressed_fs,
now definitely not adding a zero block on aligned data (closes: #296179)
* fixed a memory leak in "best" mode and better control for memory
allocation now (finally closes: #164015 and hopefully closes: #380384,
reopen if it doesn't)
* added pt.po (closes: #337546)
* added GNU/kFreeBSD porting patch from Robert Millan (closes: #335872)
Files:
eaf2682cfce2db1431b338d5930e5dbb 535 misc optional cloop_2.04-1+eb.1-3.dsc
aca0c78c96e04740786cc172f6cb1978 299571 misc optional
cloop_2.04-1+eb.1-3.tar.gz
08e6721725e203f7e68bd0a8daccfe73 34004 misc optional
cloop-src_2.04-1+eb.1-3_all.deb
2b8ca9c441d1365dfeff4e8f1a8e5961 82820 misc optional
cloop-utils_2.04-1+eb.1-3_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
iD8DBQFE0R674QZIHu3wCMURAqOIAJsH5IipJRaRGSUOUrpwF+xunEScbgCeIKsR
zjUQdHgq6Z7IurNbb3+MifY=
=P9b4
-----END PGP SIGNATURE-----
--- End Message ---
