Package: drac
Severity: normal
Hi,
I have upload NMU to 2-day DELAYED queue. Patches used are very
simple (the one was already in the bug report, but I'm including full
stack).
The Berkeley DB 5.0 support patch is not needed, but it is just added
as sanity check if the drac survives to the Berkeley DB 6.0 release :)
O.
-- System Information:
Debian Release: 6.0.1
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=cs_CZ.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
>From 177bf5e03eb66d87ec3e3bb29f801ae290610c69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ond...@sury.org>
Date: Thu, 2 Jun 2011 12:35:51 +0200
Subject: [PATCH 1/3] Build depend on generic libdb-dev
---
debian/control | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/debian/control b/debian/control
index 03ee5cb..dee448a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: drac
Section: net
Priority: optional
Maintainer: Noèl Köthe <n...@debian.org>
-Build-Depends: debhelper (>> 5.0.0), libdb4.7-dev
+Build-Depends: debhelper (>> 5.0.0), libdb-dev
Standards-Version: 3.8.2
Homepage: http://mail.cc.umanitoba.ca/drac/
--
1.7.2.5
>From 6f2e9a785d70c484745e39756d1509cbae06e5ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ond...@sury.org>
Date: Thu, 2 Jun 2011 12:38:48 +0200
Subject: [PATCH 2/3] Add support for Berkeley DB version 5.0
---
rpc.dracd.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rpc.dracd.c b/rpc.dracd.c
index 815b087..f7ba26b 100644
--- a/rpc.dracd.c
+++ b/rpc.dracd.c
@@ -148,7 +148,7 @@ drac_run() {
(initdb) ? DB_TRUNCATE|DB_CREATE : DB_CREATE,
0644, dbenv, &dbinfo, &dbp);
#endif
-#elif DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
+#elif DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
errno = db_create(&dbp, NULL, 0);
if ( errno != 0 ) {
syslog(LOG_ERR, "drac_run db_create failed: %m");
--
1.7.2.5
>From be25862aabddafeb1864c230e1dc0b057c9ba953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ond...@sury.org>
Date: Thu, 2 Jun 2011 12:39:49 +0200
Subject: [PATCH 3/3] prepare 1.12-7.1 release
---
debian/changelog | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 99e25a4..381f6d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+drac (1.12-7.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build depend on generic libdb-dev (Closes: #628244, #621350)
+ * Add support for Berkeley DB version 5.0 in rpc.dracd.c
+
+ -- Ondřej Surý <ond...@debian.org> Thu, 02 Jun 2011 12:38:52 +0200
+
drac (1.12-7) unstable; urgency=low
* debian/rules fix "ignore make clean" lintian warning
--
1.7.2.5
