~ubuntu-branches/ubuntu/lucid/bogofilter/lucid-security

Committer: Bazaar Package Importer
Author(s): Bhavani Shankar
Date: 2009-05-06 05:41:52 UTC
mfrom: (1.1.11 upstream) (2.1.4 squeeze)
Revision ID: james.westby@ubuntu.com-20090506054152-tgameecssbuv4np6

Tags: 1.2.0-2ubuntu1

* Merge from debian unstable, remaining changes: LP: #372497
- don't build qdbm.
- Don't build tokyocabinet support as it's in universe.

files added:
src/listsort.c

src/listsort.h

src/tests/outputs/token.count.ref

src/tests/t.multiple.tokens.min.mul

src/tests/t.token.count

files removed:
src/mysetvbuf.c

src/mysetvbuf.h

src/tests/t.token.min.mul

files modified:
Makefile.am

Makefile.in

NEWS

aclocal.m4

bogofilter.cf.example

bogofilter.spec

config.guess

config.in

config.sub

configure

configure.ac

contrib/spamitarium.pl

debian/changelog

debian/control

doc/Makefile.in

doc/README.sqlite

doc/bf_compact.1in

doc/bf_compact.htmlin

doc/bf_compact.xml

doc/bogofilter-faq-fr.html

doc/bogofilter-faq-it.html

doc/bogofilter-faq.html

doc/integrating-with-postfix

doc/integrating-with-qmail

install-staticdblibs.sh

src/Makefile.am

src/Makefile.in

src/base64.c

src/bf_compact

src/bf_compact.in

src/bf_copy

src/bf_copy.in

src/bf_tar

src/bf_tar.in

src/bogoconfig.c

src/bogofilter.c

src/bogohist.c

src/bogolexer.c

src/bogoreader.c

src/bogotune.c

src/bogoutil.c

src/buff.c

src/collect.c

src/common.h

src/datastore.c

src/datastore_sqlite.c

src/format.c

src/format.h

src/globals.c

src/globals.h

src/iconvert.c

src/lexer.c

src/lexer_v3.c

src/lexer_v3.l

src/longoptions.h

src/maint.c

src/memstr.c

src/memstr.h

src/mime.c

src/passthrough.c

src/prob.c

src/qp.c

src/register.c

src/robx.c

src/rstats.c

src/rstats.h

src/score.c

src/score.h

src/tests/Makefile.am

src/tests/Makefile.in

src/tests/deb64.c

src/tests/deqp.c

src/tests/t._abort

src/tests/t.bf_compact

src/tests/t.frame

src/tests/t.message_id

src/tests/t.multiple.wordlists

src/tests/t.valgrind

src/token.c

src/uudecode.c

src/version.c

src/word.c

src/word.h

src/wordhash.c

src/wordhash.h

src/wordhash.main.c

trio/Makefile.in

Show diffs side-by-side

added added

removed removed

src/bf_copy.in

# use to copy wordlist.db and related files

# from one directory to another

# $Id: bf_copy.in 5906 2005-05-08 20:09:53Z m-a $

# $Id: bf_copy.in 6750 2008-10-15 23:18:45Z clint $

set -e # die on errors

: ${BOGOUTIL:=@transformed_bogoutil@}

COMPACT=0

while test "$1" ; do

case "$1" in

DST="$2"

# flush mempools

bogoutil --db-checkpoint="$SRC" || :

$BOGOUTIL --db-checkpoint="$SRC" || :

mkdir "$DST"

trap "rm -rf $TMP \"$DST\"" 0

if test $COMPACT -eq 1 ; then

# don't copy unneeded logs

bogoutil --db-list-logfiles="$SRC" >$TMP

$BOGOUTIL --db-list-logfiles="$SRC" >$TMP

else

: >$TMP

if test -f "$SRC"/DB_CONFIG ; then cp -p "$SRC"/DB_CONFIG "$DST" ; fi

for FILE in "$SRC"/*.db ; do

SIZE=`bogoutil --db-print-pagesize="$FILE"`

SIZE=`$BOGOUTIL --db-print-pagesize="$FILE"`

dd bs=$SIZE if=$FILE of="$DST/"`basename "$FILE"`

done

if test "$LOGS" ; then bogoutil --db-recover="$DST" ; fi

if test "$LOGS" ; then $BOGOUTIL --db-recover="$DST" ; fi

rm -f $TMP

trap - 0

Older »