summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Radici <antonio@dyne.org>2011-03-07 00:24:16 +0000
committerAntonio Radici <antonio@dyne.org>2011-03-07 00:24:16 +0000
commitb348be2a47e6df68948d797df0084b3c4290cd94 (patch)
tree58e58dba5b54bb8044a24713a0cb5fa9d8c15c6c
parent185a4c6baaf526200fa0e2ebd8185c15fddff4de (diff)
Integrated Christian's NMU in the changelog (Closes: 610103), added disable-transaction-logic to prevent postgrey from crashing after a berkeleydb update (Closes: 614968)
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/disable-transaction-logic30
-rw-r--r--debian/patches/series1
3 files changed, 36 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 6f285c9..b1969af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
postgrey (1.33-2) unstable; urgency=low
* promoting to unstable
+ * Integrated Christian's NMU in the changelog (Closes: 610103)
+ * debian/patches:
+ + added disable-transaction-logic to prevent postgrey from crashing after a
+ berkeleydb update (Closes: 614968)
+
-- Antonio Radici <antonio@dyne.org> Mon, 07 Mar 2011 00:16:25 +0000
diff --git a/debian/patches/disable-transaction-logic b/debian/patches/disable-transaction-logic
new file mode 100644
index 0000000..a82a121
--- /dev/null
+++ b/debian/patches/disable-transaction-logic
@@ -0,0 +1,30 @@
+patch to disable the transactional logic during the cleaning of the DB, this
+fixes a problem seen as result of updates of BerkeleyDB.
+See http://bugs.debian.org/614968 for more info
+
+--- a/postgrey
++++ b/postgrey
+@@ -276,11 +276,7 @@
+ $nr_keys_after++;
+ }
+ }
+- my $db_obj = $self->{postgrey}{db_obj};
+- my $txn = $db_env->txn_begin();
+- $db_obj->Txn($txn);
+ for my $key (@old_keys) { delete $db->{$key}; }
+- $txn->txn_commit();
+
+ $self->mylog(1, "cleaning main database finished. before: $nr_keys_before, after: $nr_keys_after");
+
+@@ -300,11 +296,7 @@
+ $nr_keys_after++;
+ }
+ }
+- my $db_cawl_obj = $self->{postgrey}{db_cawl_obj};
+- $txn = $db_env->txn_begin();
+- $db_cawl_obj->Txn($txn);
+ for my $key (@old_keys_cawl) { delete $cawl_db->{$key}; }
+- $txn->txn_commit();
+
+ $self->mylog(1, "cleaning clients database finished. before: $nr_keys_before, after: $nr_keys_after");
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 7fae60d..1be4a73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
imported-upstream-diff
+disable-transaction-logic