tags 549886 + patch
tags 549854 + patch
tags 544433 + patch
thanks
This patch fixes building against DB 4.8 (it should apply over 2.0.4 as
well as over 2.0.7 for the Debian 2.0.4 packaging ports fine), among a
few other details.
The salient point is this:
+-#if (DB_VERSION_MAJOR == 4 && \
+- DB_VERSION_MINOR == 7)
++#if ((DB_VERSION_MAJOR > 4) || \
++ (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 7))
+ if (private->log_auto_remove) {
+ ret = dbenv->log_set_config (dbenv,
DB_LOG_AUTO_REMOVE, 1);
-- Cyrille
diff -urN glusterfs-2.0.4.vanilla/debian/changelog glusterfs-2.0.7/debian/changelog
--- glusterfs-2.0.4.vanilla/debian/changelog 2009-10-23 09:39:55.000000000 +0200
+++ glusterfs-2.0.7/debian/changelog 2009-10-23 10:50:53.000000000 +0200
@@ -1,3 +1,18 @@
+glusterfs (2.0.7-0.0.1) unstable; urgency=low
+ * new upstream release. (Closes: #544434)
+ * Building against DB 4.8 should not fail:
+ - debian/patches/10_accept_also_db4.8: added (hits xlators/storage/bdb/src/bdb-ll.c)
+ (Closes: #549854, #549886)
+ * add glusterfs-volgen from extras which appears now to be the correct way to
+ build new volumes. (FIXME: glusterfs-volgen.8)
+ - debian/rules
+ - debian/glusterfs-server.install
+ * Add the VIM and EMACS modes from extras
+ - debian/libglusterfs0.install
+ * debian/glusterfs-server.dirs: needed as well as on the client side (Closes:#544433)
+
+ -- Cyrille CHÉPÉLOV <cyrille.chepe...@keyconsulting.fr> Fri, 23 Oct 2009 10:00:00 +0000
+
glusterfs (2.0.4-2) unstable; urgency=low
* Fix "circular dependency with glusterfs-server" (Closes: #537787)
diff -urN glusterfs-2.0.4.vanilla/debian/glusterfs-server.dirs glusterfs-2.0.7/debian/glusterfs-server.dirs
--- glusterfs-2.0.4.vanilla/debian/glusterfs-server.dirs 1970-01-01 01:00:00.000000000 +0100
+++ glusterfs-2.0.7/debian/glusterfs-server.dirs 2009-10-23 10:14:30.000000000 +0200
@@ -0,0 +1 @@
+/var/log/glusterfs
diff -urN glusterfs-2.0.4.vanilla/debian/glusterfs-server.install glusterfs-2.0.7/debian/glusterfs-server.install
--- glusterfs-2.0.4.vanilla/debian/glusterfs-server.install 2009-10-23 09:39:55.000000000 +0200
+++ glusterfs-2.0.7/debian/glusterfs-server.install 2009-10-23 10:48:18.000000000 +0200
@@ -1,3 +1,5 @@
debian/tmp/etc/glusterfs/glusterfs.vol
debian/tmp/etc/glusterfs/glusterfsd.vol
debian/tmp/usr/sbin/glusterfsd
+debian/tmp/usr/sbin/glusterfs-volgen
+
diff -urN glusterfs-2.0.4.vanilla/debian/libglusterfs0.install glusterfs-2.0.7/debian/libglusterfs0.install
--- glusterfs-2.0.4.vanilla/debian/libglusterfs0.install 2009-10-23 09:39:55.000000000 +0200
+++ glusterfs-2.0.7/debian/libglusterfs0.install 2009-10-23 10:48:24.000000000 +0200
@@ -1,3 +1,6 @@
debian/tmp/usr/lib/glusterfs/*
debian/tmp/usr/lib/libglusterfs.so.*
debian/tmp/usr/lib/libglusterfsclient.so.*
+debian/tmp/usr/share/vim/vim72/glusterfs.vim
+debian/tmp/usr/share/emacs/site-lisp/glusterfs-mode.el
+
diff -urN glusterfs-2.0.4.vanilla/debian/patches/00list glusterfs-2.0.7/debian/patches/00list
--- glusterfs-2.0.4.vanilla/debian/patches/00list 2009-10-23 09:39:55.000000000 +0200
+++ glusterfs-2.0.7/debian/patches/00list 2009-10-23 10:27:40.000000000 +0200
@@ -1 +1,3 @@
01_bashism
+10_accept_also_db4.8
+
diff -urN glusterfs-2.0.4.vanilla/debian/patches/10_accept_also_db4.8 glusterfs-2.0.7/debian/patches/10_accept_also_db4.8
--- glusterfs-2.0.4.vanilla/debian/patches/10_accept_also_db4.8 1970-01-01 01:00:00.000000000 +0100
+++ glusterfs-2.0.7/debian/patches/10_accept_also_db4.8 2009-10-23 10:27:29.000000000 +0200
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_accept_also_db4.8 by Cyrille CHÉPÉLOV <cyrille.chepe...@keyconsulting.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix FTBFS against DB4.8
+## DP: the version test should check against DB >= 4.7 not == 4.7
+
+...@dpatch@
+--- glusterfs-2.0.7.vanilla/xlators/storage/bdb/src/bdb-ll.c 2009-10-01 15:19:54.000000000 +0200
++++ glusterfs-2.0.7/xlators/storage/bdb/src/bdb-ll.c 2009-10-23 10:24:02.000000000 +0200
+@@ -954,8 +954,8 @@
+ }
+
+ ret = 0;
+-#if (DB_VERSION_MAJOR == 4 && \
+- DB_VERSION_MINOR == 7)
++#if ((DB_VERSION_MAJOR > 4) || \
++ (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 7))
+ if (private->log_auto_remove) {
+ ret = dbenv->log_set_config (dbenv, DB_LOG_AUTO_REMOVE, 1);
+ } else {
diff -urN glusterfs-2.0.4.vanilla/debian/rules glusterfs-2.0.7/debian/rules
--- glusterfs-2.0.4.vanilla/debian/rules 2009-10-23 09:39:55.000000000 +0200
+++ glusterfs-2.0.7/debian/rules 2009-10-23 10:48:39.000000000 +0200
@@ -9,6 +9,7 @@
mv debian/tmp/etc/glusterfs/glusterfsd.vol.sample \
debian/tmp/etc/glusterfs/glusterfsd.vol
ln -s glusterfs.8 debian/tmp/usr/share/man/man8/glusterfsd.8
+ install -D -m 755 extras/glusterfs-volgen.py debian/tmp/usr/sbin/glusterfs-volgen
install/libglusterfs0::
for f in debian/tmp/usr/lib/glusterfs/*/xlator/debug/trace.so; do \
@@ -16,6 +17,8 @@
install -d "`dirname $$debug_path`"; \
objcopy --only-keep-debug "$$f" "$$debug_path"; \
done
+ install -D -m 644 extras/glusterfs.vim debian/tmp/usr/share/vim/vim72/glusterfs.vim
+ install -D -m 644 extras/glusterfs-mode.el debian/tmp/usr/share/emacs/site-lisp/glusterfs-mode.el
strip --remove-section=.comment --remove-section=.note --strip-unneeded \
debian/tmp/usr/lib/glusterfs/*/xlator/debug/trace.so
strip --remove-section=.comment --remove-section=.note --strip-unneeded \
