ovdb fix for FreeBSD, and more
Heath Kehoe
heath.kehoe at intermec.com
Thu Jun 15 04:12:46 UTC 2000
Note: this patch modifies configure.in, but doesn't include the corresponding
change to configure.
configure.in: Now looks for the BerkeleyDB bits in several locations, including
the non-standard places that FreeBSD has them.
ovdb.pod: Update to reflect new configure behavior
dbprocs.in: A couple tweaks of parameters
Thanks,
-heath
diff -rc ../inn-BETA-20000614/configure.in ./configure.in
*** ../inn-BETA-20000614/configure.in Wed Jun 14 04:03:34 2000
--- ./configure.in Wed Jun 14 22:05:45 2000
***************
*** 253,267 ****
BERKELEY_DB_LIB=
BERKELEY_DB_BINDIR=
;;
! *)
! if test "$BERKELEY_DB_DIR" = yes ; then
! BERKELEY_DB_DIR=/usr/local/BerkeleyDB
fi
BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib"
BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
BERKELEY_DB_LIB="-ldb"
BERKELEY_DB_BINDIR="$BERKELEY_DB_DIR/bin"
AC_DEFINE(USE_BERKELEY_DB)
esac
AC_SUBST(BERKELEY_DB_LDFLAGS)
AC_SUBST(BERKELEY_DB_CFLAGS)
--- 253,298 ----
BERKELEY_DB_LIB=
BERKELEY_DB_BINDIR=
;;
!
! yes)
! AC_MSG_CHECKING(for BerkeleyDB location)
! for v in BerkeleyDB BerkeleyDB.3.0 BerkeleyDB.3.1
! do
! for d in /opt /usr /usr/local
! do
! if test -d "$d/$v" ; then
! BERKELEY_DB_DIR="$d/$v"
! fi
! done
! done
!
! if test "$BERKELEY_DB_DIR" = "yes" ; then
! if test -d /usr/local/include/db2 ; then
! BERKELEY_DB_LDFLAGS="-L/usr/local/lib"
! BERKELEY_DB_CFLAGS="-I/usr/local/include/db2"
! BERKELEY_DB_LIB="-ldb2"
! BERKELEY_DB_BINDIR="/usr/local/bin"
! AC_MSG_RESULT(FreeBSD locations)
! else
! AC_MSG_ERROR(Can not find BerkeleyDB)
! fi
! else
! BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib"
! BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
! BERKELEY_DB_LIB="-ldb"
! BERKELEY_DB_BINDIR="$BERKELEY_DB_DIR/bin"
! AC_MSG_RESULT($BERKELEY_DB_DIR)
fi
+ AC_DEFINE(USE_BERKELEY_DB)
+ ;;
+
+ *)
BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib"
BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
BERKELEY_DB_LIB="-ldb"
BERKELEY_DB_BINDIR="$BERKELEY_DB_DIR/bin"
AC_DEFINE(USE_BERKELEY_DB)
+ ;;
esac
AC_SUBST(BERKELEY_DB_LDFLAGS)
AC_SUBST(BERKELEY_DB_CFLAGS)
diff -rc ../inn-BETA-20000614/doc/man/ovdb.5 ./doc/man/ovdb.5
*** ../inn-BETA-20000614/doc/man/ovdb.5 Wed Jun 14 04:03:50 2000
--- ./doc/man/ovdb.5 Wed Jun 14 22:15:33 2000
***************
*** 1,5 ****
.\" Automatically generated by Pod::Man version 1.02
! .\" Fri Jun 9 00:11:13 2000
.\"
.\" Standard preamble:
.\" ======================================================================
--- 1,5 ----
.\" Automatically generated by Pod::Man version 1.02
! .\" Wed Jun 14 22:14:57 2000
.\"
.\" Standard preamble:
.\" ======================================================================
***************
*** 138,144 ****
.\" ======================================================================
.\"
.IX Title "ovdb 5"
! .TH ovdb 5 "INN 2.3" "2000-06-09" "InterNetNews Documentation"
.UC
.SH "NAME"
ovdb \- Overview storage method for \s-1INN\s0
--- 138,144 ----
.\" ======================================================================
.\"
.IX Title "ovdb 5"
! .TH ovdb 5 "INN 2.3" "2000-06-14" "InterNetNews Documentation"
.UC
.SH "NAME"
ovdb \- Overview storage method for \s-1INN\s0
***************
*** 164,174 ****
.SH "INSTALLATION"
.IX Header "INSTALLATION"
To build ovdb support into \s-1INN\s0, specify the option \f(CW\*(C`\-\-with\-berkeleydb\*(C'\fR
! when running the configure script. By default, configure will use
! \&\fI/usr/local/BerkeleyDB\fR.
! If you installed it in a different location, you'll need to specify
! that location like this (for example): \f(CW\*(C`\-\-with\-berkeleydb=/opt/BerkeleyDB\*(C'\fR.
.PP
The ovdb database will take up more disk space for a given spool than
the other overview methods. Plan on needing at least 1.1 \s-1KB\s0 for every
article in your spool (not counting crossposts). So, if you have 5
--- 164,180 ----
.SH "INSTALLATION"
.IX Header "INSTALLATION"
To build ovdb support into \s-1INN\s0, specify the option \f(CW\*(C`\-\-with\-berkeleydb\*(C'\fR
! when running the configure script. By default, configure will search
! for a BerkeleyDB tree in several likely locations, and choose the highest
! version (based on the name of the directory, e.g., \fIBerkeleyDB.3.0\fR)
! that it finds. There will be a message in the configure output
! indicating the chosen pathname.
.PP
+ You can override this pathname by adding a path to the option, e.g.,
+ \&\f(CW\*(C`\-\-with\-berkeleydb=/usr/BerkeleyDB.3.1\*(C'\fR. This directory is expected
+ to have subdirectories \fIinclude\fR, \fIlib\fR, and \fIbin\fR containing
+ \&\fIdb.h\fR, the library itself, and the \fIdb_*\fR utilities, respectively.
+ .PP
The ovdb database will take up more disk space for a given spool than
the other overview methods. Plan on needing at least 1.1 \s-1KB\s0 for every
article in your spool (not counting crossposts). So, if you have 5
***************
*** 177,183 ****
not shrink them, even if data is removed. So, reserving extra space
above the estimate is a good idea.
Plus, you'll need additional space for transaction logs: at least 40 \s-1MB\s0,
! preferably 100 \s-1MB\s0. (The logs may be on a different filesystem
\&\-\- see the \s-1DB_CONFIG\s0 section.)
.SH "CONFIGURATION"
.IX Header "CONFIGURATION"
--- 183,189 ----
not shrink them, even if data is removed. So, reserving extra space
above the estimate is a good idea.
Plus, you'll need additional space for transaction logs: at least 40 \s-1MB\s0,
! preferably 100 \s-1MB\s0 or more. (The logs may be on a different filesystem
\&\-\- see the \s-1DB_CONFIG\s0 section.)
.SH "CONFIGURATION"
.IX Header "CONFIGURATION"
diff -rc ../inn-BETA-20000614/doc/pod/ovdb.pod ./doc/pod/ovdb.pod
*** ../inn-BETA-20000614/doc/pod/ovdb.pod Wed Jun 14 04:03:54 2000
--- ./doc/pod/ovdb.pod Wed Jun 14 22:05:45 2000
***************
*** 25,35 ****
=head1 INSTALLATION
To build ovdb support into INN, specify the option C<--with-berkeleydb>
! when running the configure script. By default, configure will use
! F</usr/local/BerkeleyDB>.
! If you installed it in a different location, you'll need to specify
! that location like this (for example): C<--with-berkeleydb=/opt/BerkeleyDB>.
The ovdb database will take up more disk space for a given spool than
the other overview methods. Plan on needing at least 1.1 KB for every
article in your spool (not counting crossposts). So, if you have 5
--- 25,41 ----
=head1 INSTALLATION
To build ovdb support into INN, specify the option C<--with-berkeleydb>
! when running the configure script. By default, configure will search
! for a BerkeleyDB tree in several likely locations, and choose the highest
! version (based on the name of the directory, e.g., F<BerkeleyDB.3.0>)
! that it finds. There will be a message in the configure output
! indicating the chosen pathname.
+ You can override this pathname by adding a path to the option, e.g.,
+ C<--with-berkeleydb=/usr/BerkeleyDB.3.1>. This directory is expected
+ to have subdirectories F<include>, F<lib>, and F<bin> containing
+ F<db.h>, the library itself, and the F<db_*> utilities, respectively.
+
The ovdb database will take up more disk space for a given spool than
the other overview methods. Plan on needing at least 1.1 KB for every
article in your spool (not counting crossposts). So, if you have 5
***************
*** 38,44 ****
not shrink them, even if data is removed. So, reserving extra space
above the estimate is a good idea.
Plus, you'll need additional space for transaction logs: at least 40 MB,
! preferably 100 MB. (The logs may be on a different filesystem
-- see the DB_CONFIG section.)
=head1 CONFIGURATION
--- 44,50 ----
not shrink them, even if data is removed. So, reserving extra space
above the estimate is a good idea.
Plus, you'll need additional space for transaction logs: at least 40 MB,
! preferably 100 MB or more. (The logs may be on a different filesystem
-- see the DB_CONFIG section.)
=head1 CONFIGURATION
diff -rc ../inn-BETA-20000614/scripts/dbprocs.in ./scripts/dbprocs.in
*** ../inn-BETA-20000614/scripts/dbprocs.in Wed Jun 14 04:04:26 2000
--- ./scripts/dbprocs.in Wed Jun 14 22:05:45 2000
***************
*** 46,52 ****
# Run checkpointer and deadlock detector
(
! db_checkpoint -p 1 -k 1000 &
echo $! > $PATHRUN/db_checkpoint.pid
wait
rm -f $PATHRUN/db_checkpoint.pid
--- 46,52 ----
# Run checkpointer and deadlock detector
(
! db_checkpoint -p 1 -k 2000 &
echo $! > $PATHRUN/db_checkpoint.pid
wait
rm -f $PATHRUN/db_checkpoint.pid
***************
*** 65,71 ****
while [ 1 ];
do
! sleep 600
db_archive -a >$PATHTMP/dba.$$
if [ -s $PATHTMP/dba.$$ ]; then
xargs rm <$PATHTMP/dba.$$
--- 65,71 ----
while [ 1 ];
do
! sleep 120
db_archive -a >$PATHTMP/dba.$$
if [ -s $PATHTMP/dba.$$ ]; then
xargs rm <$PATHTMP/dba.$$
More information about the inn-patches
mailing list