Update bogofilter to 1.0.3.

Patch provided by Kimura Fuyuki in PR 35595.
And regen patch-aa.

1.0.3	2006-07-10

	* Released 1.0.3 to provide the bogotune bugfixes to a wider
	  audience.

	2006-07-09

	* Work around GNU make 3.81 incompatibility in doc/Makefile*
	  (it does not work properly with "}\" at the line ends, but
	   wants "} \" instead).

	2006-06-02

	* "make rpm" changes:
	  - document use with gpg-agent (see Makefile.am)
	  - build static RPMs (these won't fail) before shared RPMs

	2006-05-29

	* #include cleanups in common.h, system.h and C files.

	2006-04-28

	* Updated copyright dates.

	2006-04-13

	* Included additional config file options in bogofilter's
	  --help message.

	2006-03-27

	* Corrected option parsing in bogotune to support -n ham1 ham2
	  -s spam1 spam2 as suggested by bogotune -h; broken since 0.93.2.

	2006-03-26

	* Corrected problem with bogotune's -D option (thanks to Jason Smith).

	* Corrected man page description of bogotune's -n and -s options.

	2006-03-17

	* Fixed bf_compact's test for transactional environment.

	2006-03-12

	* 1.0.2 Promoted to "Stable" status

1.0.2	2006-03-03

	2006-02-19

	* Added vm-bogofilter.el for using bogofilter with VM, an
          Emacs mail tool (thanks to Björn Knutsson).
	* Added FAQ question "How do I use bogofilter with VM (an
          Emacs mail tool)?" (thanks to Pimpon).

	2006-02-14

	* SleepyCat has been acquired by Oracle, who are now providing
	  Berkeley DB. Since most of the references are to actual
	  strings in the programs or addresses that remain unchanged,
	  this will only gradually show in the bogofilter sources and
	  documentation.

	2006-02-06

	* Flush output after writing spam header line and/or message body.
	* When database is near to maximum allowed size, allow reading
	  it and disallow writing to it.

	2006-01-30

	* Fix formatting of Rtable output when in the message header,
	  this keeps verbose passthrough modes RFC-822/2822 compliant.

	2006-01-29

	* The configure script, when checking Berkeley DB capabilities,
	  now checks for logging and transactional subsystems rather
	  than the locking subsystem that was abandoned before 1.0.0.
	  This appears a suitable workaround for configure lockups on
	  OpenBSD 3.7 macppc with db 4.2 or 4.3.

	2006-01-28

	* Only print Berkeley DB file size message once per run.

	2006-01-21

	* 1.0.1 Promoted to "Stable" status

	2006-01-02

	* Fixed --input-file and --output-file command line options.

	2006-01-01

	* Added CVE-2005 identifiers for defects described in
          doc/bogofilter-SA-2005-01

1.0.1	2006-01-01

	* New names for binary rpms:

	  bogofilter-db42 - requires shared library for DB-4.2.52
	  bogofilter-db42-static - statically linked with DB-4.2.52
	  bogofilter-sqlite3 - requires shared library for SQLite3-3.2.8
	  bogofilter-sqlite3-static - statically linked with SQLite3-3.2.8

	2005-12-30

	* The configure help texts have been revised, the IEEE checks
	  for trio have been simplified (they are no longer nested) and
	  configure.ac has been updated to quiet autoconf -Wobsolete
	  warnings. The README file now reflects the new requirements.

	2005-12-29

	* For maintainers: Add install-staticdblibs.sh, a script to
	  fetch and build static & lean BerkeleyDB 4.2.52.4 and SQLite
	  3.2.8 libraries. Modify some parts of the RPM building so that
	  the binary RPMs are built without external dependencies beyond
	  glibc 2.2. This may render "make rpm" unusable on non-Linux
	  platforms, but you should still be able to "rpmbuild -tb" from
	  the source .tar.gz file.

	2005-12-27

	* Add '-O' option to direct bogoutil output to a file.
	* Fix building of binary rpms with SQLite support.
	* Include SQLite binary rpm as standard part of "make rpm"

	2005-12-26

	* Split NEWS file into files NEWS and NEWS.0 for new (version
	  1.0 and after) and old (version 0.x.y) info

	2005-12-25

	* Capitalize variables in bogofilter.spec.in to please RH9's
          RPM 4.2 implementation.

	2005-12-18

	* Fix bad return code in db_loop() in datastore_sqlite.c
	  (reported by Sami Farin).

	2005-12-17

	* XML documentation cleanups (thanks to Nicholas Kaiser).

	2005-12-06

	* bogofilter.cf.example was updated to reflect the proper default of
	  db_log_autoremove=yes. It previously claimed the default were "off".

1.0.0	2005-11-30

	2005-11-28

	* Minor FAQ updates and correctons.
	* Abort if ar(1) is not available during build.

	2005-11-19

	* bogofilter supports BerkeleyDB 4.4.16. doc/README.db and INSTALL have
	  been updated accordingly.

5 files changed, 22 insertions, 14 deletions

diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 93ef9a50fba..854d424644f 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2006/03/04 21:29:57 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2007/02/16 15:47:39 obache Exp $
 
-DISTNAME=	bogofilter-0.96.6
-PKGREVISION=	1
+DISTNAME=	bogofilter-1.0.3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bogofilter/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/bogofilter/PLIST b/mail/bogofilter/PLIST
index c8536935dbc..be5637d4068 100644
--- a/mail/bogofilter/PLIST
+++ b/mail/bogofilter/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2005/11/21 23:47:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/02/16 15:47:39 obache Exp $
 bin/bf_compact
 bin/bf_copy
 bin/bf_tar
+${QDBM}bin/bogoQDBMupgrade
 bin/bogofilter
 bin/bogolexer
 bin/bogotune
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index 4394e16af0a..ddabd0b07f5 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2005/11/21 23:47:02 wiz Exp $
+$NetBSD: distinfo,v 1.17 2007/02/16 15:47:39 obache Exp $
 
-SHA1 (bogofilter-0.96.6.tar.bz2) = ce6ea4e9b1dd1342aa102816356f0bd6bbdb536a
-RMD160 (bogofilter-0.96.6.tar.bz2) = 501fc9b4e65c23133dc517a8a3fb5f98669a87a9
-Size (bogofilter-0.96.6.tar.bz2) = 746286 bytes
-SHA1 (patch-aa) = 1609c132d8c35e04b82c45815461a1ca36223c16
+SHA1 (bogofilter-1.0.3.tar.bz2) = 88d72c810dc3ae613cb4178e19b45c6508062210
+RMD160 (bogofilter-1.0.3.tar.bz2) = d4b6d5329919cefbc4e17168350157b27bb08b9c
+Size (bogofilter-1.0.3.tar.bz2) = 778983 bytes
+SHA1 (patch-aa) = 8403c5e8a723fef0bef9a87feba639a8cabfe99e
 SHA1 (patch-ab) = f55a9956d82f56cef686a9125983ec5fd6942809
diff --git a/mail/bogofilter/options.mk b/mail/bogofilter/options.mk
index d8fe4445055..19286529c6c 100644
--- a/mail/bogofilter/options.mk
+++ b/mail/bogofilter/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2005/11/22 18:15:56 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2007/02/16 15:47:39 obache Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.bogofilter
 PKG_OPTIONS_REQUIRED_GROUPS=	database
-PKG_OPTIONS_GROUP.database=	db4 sqlite
+PKG_OPTIONS_GROUP.database=	db4 qdbm sqlite
 PKG_SUGGESTED_OPTIONS=		db4
 
 .include "../../mk/bsd.options.mk"
@@ -13,6 +13,14 @@ CONFIGURE_ARGS+=		--with-database=db
 BUILDLINK_TRANSFORM+=		l:db:db4
 .endif
 
+.if !empty(PKG_OPTIONS:Mqdbm)
+CONFIGURE_ARGS+=		--with-database=qdbm
+PLIST_SUBST+=			QDBM=
+.include "../../databases/qdbm/buildlink3.mk"
+.else
+PLIST_SUBST+=			QDBM="@comment "
+.endif
+
 .if !empty(PKG_OPTIONS:Msqlite)
 CONFIGURE_ARGS+=		--with-database=sqlite3
 .include "../../databases/sqlite3/buildlink3.mk"
diff --git a/mail/bogofilter/patches/patch-aa b/mail/bogofilter/patches/patch-aa
index 07fe5c6d47e..8ddac42f0d6 100644
--- a/mail/bogofilter/patches/patch-aa
+++ b/mail/bogofilter/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2005/11/21 23:47:02 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2007/02/16 15:47:40 obache Exp $
 
---- Makefile.in.orig	2005-11-12 23:36:29.000000000 +0100
+--- Makefile.in.orig	2006-07-10 10:14:49.000000000 +0000
 +++ Makefile.in
 @@ -258,6 +258,7 @@ SYSCONFDIR = @sysconfdir@
  
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.4 2005/11/21 23:47:02 wiz Exp $
  
  # what to distribute
  EXTRA_DIST = autogen.sh gsl config.rpath bogofilter.cf.example \
-@@ -361,14 +362,8 @@ bogogrep.obj: contrib/bogogrep.c
+@@ -412,14 +413,8 @@ bogogrep.obj: contrib/bogogrep.c
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bogogrep.obj `if test -f 'contrib/bogogrep.c'; then $(CYGPATH_W) 'contrib/bogogrep.c'; else $(CYGPATH_W) '$(srcdir)/contrib/bogogrep.c'; fi`
  uninstall-info-am:
  install-sysconfDATA: $(sysconf_DATA)