[DRE-commits] [SCM] bsfilter.git branch, master, updated. debian/1%1.0.17-2-15-g15ef7f6

[Taku YASUI]

The following commit has been merged in the master branch:
commit d7a8dbce95bc74712c6f6ebc9166d19d9229eaab
Author: Taku YASUI <tach at debian.org>
Date:   Sun Jun 17 22:29:50 2012 +0900

    Add debian/patches/020_disable_bdb1 not to use bdb1.

diff --git a/debian/changelog b/debian/changelog
index 6ac9c23..14547b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ bsfilter (1:1.0.17-3) UNRELEASED; urgency=low
   * debian/docs: Add HTML document to the package.
   * debian/rules: Add to run test suite.
   * Add debian/patches/010_disable_chasen not to use chasen.
+  * Add debian/patches/020_disable_bdb1 not to use bdb1.
 
  -- Taku YASUI <tach at debian.org>  Sun, 17 Jun 2012 21:54:15 +0900
 
diff --git a/debian/patches/020_disable_bdb1 b/debian/patches/020_disable_bdb1
new file mode 100644
index 0000000..55033aa
--- /dev/null
+++ b/debian/patches/020_disable_bdb1
@@ -0,0 +1,69 @@
+--- a/bsfilter/bsfilter
++++ b/bsfilter/bsfilter
+@@ -74,7 +74,6 @@
+   
+   SDBM_ext = ".sdbm"
+   GDBM_ext = ".gdbm"
+-  BDB1_ext = ".bdb1"
+   BDB_ext = ".bdb"
+   QDBM_ext = ".qdbm"
+   
+@@ -808,29 +807,6 @@
+     end
+   end
+   
+-  class TokenBDB1 < TokenDBM
+-    def initialize(options, language, ext)
+-      @filename = options["homedir"] + language + ext + BDB1_ext
+-      @lockfile = options["homedir"] + language + ext + BDB1_ext + Lock_ext
+-      super
+-    end
+-    def clear
+-      @file_count = 0
+-      @dbm.close
+-      begin
+-        File::unlink(@filename)
+-      rescue
+-      end
+-      @dbm = open_dbm(@filename, 0600)
+-      if (@options["verbose"])
+-        @options["message-fh"].printf("reopen %s by %d.\n", @filename, Process::pid)
+-      end
+-    end
+-    def open_dbm(filename, mode)
+-      BDB1::Hash.open(filename, BDB1::CREATE | BDB1::WRITE, mode)
+-    end
+-  end
+-
+   class TokenBDB < TokenDBM
+     def initialize(options, language, ext)
+       @filename = options["homedir"] + language + ext + BDB_ext
+@@ -1545,10 +1521,6 @@
+         @clean = TokenGDBM::new(@options, lang, Clean_ext)
+         @spam = TokenGDBM::new(@options, lang, Spam_ext)
+         @prob = TokenGDBM::new(@options, lang, Prob_ext)
+-      when "bdb1"
+-        @clean = TokenBDB1::new(@options, lang, Clean_ext)
+-        @spam = TokenBDB1::new(@options, lang, Spam_ext)
+-        @prob = TokenBDB1::new(@options, lang, Prob_ext)
+       when "bdb"
+         @clean = TokenBDB::new(@options, lang, Clean_ext)
+         @spam = TokenBDB::new(@options, lang, Spam_ext)
+@@ -1928,7 +1900,7 @@
+ 		check and/or study the first number of lines
+ 		default is #{Default_max_line}. 0 means all
+ 
+-	--db sdbm|gdbm|bdb1|bdb|qdbm
++	--db sdbm|gdbm|bdb|qdbm
+ 		specify the name of database type
+ 		"sdbm" by default
+ 
+@@ -3096,8 +3068,6 @@
+       require 'sdbm'
+     when "gdbm"
+       require 'gdbm'
+-    when "bdb1"
+-      require 'bdb1'
+     when "bdb"
+       require 'bdb'
+     when "qdbm"
diff --git a/debian/patches/series b/debian/patches/series
index 778ff65..18ca57e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 000_debian-changes-1:1.0.17-1
 010_disable_chasen
+020_disable_bdb1

-- 
bsfilter.git