+++ /dev/null
-From 36ffb8b9d426f68267e9f1fabe41f3bd8d5dcb46 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <goneri@rulezlan.org>
-Date: Sat, 31 Dec 2011 15:33:42 +0100
-Subject: [PATCH] drop the / from the OSNAME
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-on GNU kFreeBSD, uname -s returns "GNU/kFreeBSD", the / is not
-accepted a macro and the build fails with -Werror
-
-../../config/config.h:9:15: error: missing whitespace after the macro name [-Werror]
-
-Signed-off-by: Gonéri Le Bouder <goneri@rulezlan.org>
----
- config/configure.inc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/config/configure.inc b/config/configure.inc
-index 2bafea0..0a1b4c0 100644
---- a/config/configure.inc
-+++ b/config/configure.inc
-@@ -653,7 +653,7 @@ EOF
- AC_PROG_CPP
- AC_PROG_INSTALL
-
-- ac_os=`uname -s | sed 's/[-_].*//'`
-+ ac_os=`uname -s | sed 's/[-_].*//' | sed 's,/,,'`
- _os=`echo $ac_os | tr '[a-z]' '[A-Z]'`
- AC_DEFINE OS_$_os 1
- eval OS_${_os}=1
---
-1.7.7.3
-
+++ /dev/null
-From 28098606f545c3904afdc6ef2c0994199de7dca7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <goneri@rulezlan.org>
-Date: Sat, 31 Dec 2011 16:14:27 +0100
-Subject: [PATCH] ignore utimensat on GNU/kFreeBSD
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-See: http://bugs.debian.org/651104
-See: http://lists.debian.org/debian-bsd/2011/03/msg00063.html
-
-Signed-off-by: Gonéri Le Bouder <goneri@rulezlan.org>
----
- config/configure | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/config/configure b/config/configure
-index 8841fff..a1272c3 100755
---- a/config/configure
-+++ b/config/configure
-@@ -59,7 +59,11 @@ AC_CHECK_HEADERS unistd.h
- AC_CHECK_HEADERS linux/fs.h
- AC_CHECK_HEADERS sys/ioctl.h
-
--AC_CHECK_FUNCS utimensat
-+# on GNU/kFreeBSD utimensat is defined in the GNU libc
-+# but won't work
-+if [ -z "$OS_GNUKFREEBSD" ]; then
-+ AC_CHECK_FUNCS utimensat
-+fi
- AC_CHECK_FUNCS utimes
- AC_CHECK_FUNCS lutimes
-
---
-1.7.7.3
-
+++ /dev/null
-Date: Wed, 14 Sep 2011 21:10:53 +0200
-From: Julien Cristau <jcristau@debian.org>
-Subject: Re: Bug#641488: bup: FTBFS on sparc (bus error in bloom test)
-
-With the following patch, the package builds fine on smetana. This
-avoids 4-byte accesses to unaligned buffers:
-
---- bup-0.24b.orig/lib/bup/_helpers.c
-+++ bup-0.24b/lib/bup/_helpers.c
-@@ -137,59 +137,58 @@ static PyObject *firstword(PyObject *sel
-
- #define BLOOM2_HEADERLEN 16
-
--typedef struct {
-- uint32_t high;
-- unsigned char low;
--} bits40_t;
--
--static void to_bloom_address_bitmask4(const bits40_t *buf,
-+static void to_bloom_address_bitmask4(const unsigned char *buf,
- const int nbits, uint64_t *v, unsigned char *bitmask)
- {
- int bit;
-+ uint32_t high;
- uint64_t raw, mask;
-
-+ memcpy(&high, buf, 4);
- mask = (1<<nbits) - 1;
-- raw = (((uint64_t)ntohl(buf->high)) << 8) | buf->low;
-+ raw = (((uint64_t)ntohl(high) << 8) | buf[4]);
- bit = (raw >> (37-nbits)) & 0x7;
- *v = (raw >> (40-nbits)) & mask;
- *bitmask = 1 << bit;
- }
-
--static void to_bloom_address_bitmask5(const uint32_t *buf,
-+static void to_bloom_address_bitmask5(const unsigned char *buf,
- const int nbits, uint32_t *v, unsigned char *bitmask)
- {
- int bit;
-+ uint32_t high;
- uint32_t raw, mask;
-
-+ memcpy(&high, buf, 4);
- mask = (1<<nbits) - 1;
-- raw = ntohl(*buf);
-+ raw = ntohl(high);
- bit = (raw >> (29-nbits)) & 0x7;
- *v = (raw >> (32-nbits)) & mask;
- *bitmask = 1 << bit;
- }
-
--#define BLOOM_SET_BIT(name, address, itype, otype) \
--static void name(unsigned char *bloom, const void *buf, const int nbits)\
-+#define BLOOM_SET_BIT(name, address, otype) \
-+static void name(unsigned char *bloom, const unsigned char *buf, const int nbits)\
- {\
- unsigned char bitmask;\
- otype v;\
-- address((itype *)buf, nbits, &v, &bitmask);\
-+ address(buf, nbits, &v, &bitmask);\
- bloom[BLOOM2_HEADERLEN+v] |= bitmask;\
- }
--BLOOM_SET_BIT(bloom_set_bit4, to_bloom_address_bitmask4, bits40_t, uint64_t)
--BLOOM_SET_BIT(bloom_set_bit5, to_bloom_address_bitmask5, uint32_t, uint32_t)
-+BLOOM_SET_BIT(bloom_set_bit4, to_bloom_address_bitmask4, uint64_t)
-+BLOOM_SET_BIT(bloom_set_bit5, to_bloom_address_bitmask5, uint32_t)
-
-
--#define BLOOM_GET_BIT(name, address, itype, otype) \
--static int name(const unsigned char *bloom, const void *buf, const int nbits)\
-+#define BLOOM_GET_BIT(name, address, otype) \
-+static int name(const unsigned char *bloom, const unsigned char *buf, const int nbits)\
- {\
- unsigned char bitmask;\
- otype v;\
-- address((itype *)buf, nbits, &v, &bitmask);\
-+ address(buf, nbits, &v, &bitmask);\
- return bloom[BLOOM2_HEADERLEN+v] & bitmask;\
- }
--BLOOM_GET_BIT(bloom_get_bit4, to_bloom_address_bitmask4, bits40_t, uint64_t)
--BLOOM_GET_BIT(bloom_get_bit5, to_bloom_address_bitmask5, uint32_t, uint32_t)
-+BLOOM_GET_BIT(bloom_get_bit4, to_bloom_address_bitmask4, uint64_t)
-+BLOOM_GET_BIT(bloom_get_bit5, to_bloom_address_bitmask5, uint32_t)
-
-
- static PyObject *bloom_add(PyObject *self, PyObject *args)
-
projects / packages / b / bup.git / commitdiff