head	1.26;
access;
symbols
	rpm-4_4_8-release:1.26.4.1
	rpm-4_4_7-release:1.26.4.1
	rpm-4_4_6-release:1.26.4.1
	rpm-4_4_5-release:1.26.4.1
	rpm-4_4_4-release:1.26.4.1
	rpm-4_4_3-release:1.26.4.1
	jbj_before_tklcpatches:1.26.4.1
	rpm-4_4_2-release:1.26
	pjones-sparse-experiment:1.26.0.6
	rpm-4_4_1-release:1.26
	rpm-4_4-release:1.26
	rpm-4_4:1.26.0.4
	rpm-4_3_1-start:1.26
	rpm-4_3:1.26.0.2
	rpm-4_2_1-release:1.24
	rpm-4_1_1-release:1.20.2.1
	rpm-4_2-release:1.24
	rpm-4_2:1.24.0.2
	rpm-4_1-release:1.20
	rpm-4_1:1.20.0.2
	rpm-4_0_4-release:1.1.2.11
	jbj-before-beecrypt:1.1.2.11
	rpm-4_0_3-release:1.1.2.11
	jbj_b4_rollback:1.1.2.11
	rpm-4_0:1.1.0.2;
locks; strict;
comment	@# @;


1.26
date	2003.12.27.16.02.18;	author jbj;	state Exp;
branches
	1.26.4.1;
next	1.25;

1.25
date	2003.04.30.20.05.16;	author jbj;	state Exp;
branches;
next	1.24;

1.24
date	2002.12.20.15.03.19;	author jbj;	state Exp;
branches
	1.24.2.1;
next	1.23;

1.23
date	2002.12.15.18.30.45;	author jbj;	state Exp;
branches;
next	1.22;

1.22
date	2002.10.07.09.05.06;	author jbj;	state Exp;
branches;
next	1.21;

1.21
date	2002.08.14.21.35.35;	author jbj;	state Exp;
branches;
next	1.20;

1.20
date	2002.07.30.16.39.09;	author jbj;	state Exp;
branches
	1.20.2.1;
next	1.19;

1.19
date	2002.07.28.00.41.16;	author jbj;	state Exp;
branches;
next	1.18;

1.18
date	2002.04.07.19.52.43;	author jbj;	state Exp;
branches;
next	1.17;

1.17
date	2002.03.17.15.49.09;	author jbj;	state Exp;
branches;
next	1.16;

1.16
date	2002.03.12.16.56.18;	author jbj;	state Exp;
branches;
next	1.15;

1.15
date	2002.03.09.19.02.59;	author jbj;	state Exp;
branches;
next	1.14;

1.14
date	2002.02.10.19.00.16;	author jbj;	state Exp;
branches;
next	1.13;

1.13
date	2001.11.15.18.22.33;	author jbj;	state Exp;
branches;
next	1.12;

1.12
date	2001.06.04.13.55.58;	author jbj;	state Exp;
branches;
next	1.11;

1.11
date	2001.05.31.22.31.14;	author jbj;	state Exp;
branches;
next	1.10;

1.10
date	2001.05.25.19.51.53;	author jbj;	state Exp;
branches;
next	1.9;

1.9
date	2001.05.23.14.25.19;	author jbj;	state Exp;
branches;
next	1.8;

1.8
date	2001.05.14.21.19.34;	author jbj;	state Exp;
branches;
next	1.7;

1.7
date	2001.05.14.20.12.10;	author jbj;	state Exp;
branches;
next	1.6;

1.6
date	2001.05.11.14.52.28;	author jbj;	state Exp;
branches;
next	1.5;

1.5
date	2001.05.11.04.01.05;	author jbj;	state Exp;
branches;
next	1.4;

1.4
date	2001.05.08.13.59.47;	author jbj;	state Exp;
branches;
next	1.3;

1.3
date	2001.05.08.00.03.14;	author jbj;	state Exp;
branches;
next	1.2;

1.2
date	2001.05.07.19.21.16;	author jbj;	state Exp;
branches;
next	1.1;

1.1
date	2001.05.07.19.13.17;	author jbj;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2001.05.07.19.13.17;	author jbj;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2001.05.07.23.53.22;	author jbj;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2001.05.08.13.47.56;	author jbj;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2001.05.11.03.59.10;	author jbj;	state Exp;
branches;
next	1.1.2.5;

1.1.2.5
date	2001.05.11.14.50.49;	author jbj;	state Exp;
branches;
next	1.1.2.6;

1.1.2.6
date	2001.05.14.20.10.26;	author jbj;	state Exp;
branches;
next	1.1.2.7;

1.1.2.7
date	2001.05.14.21.19.05;	author jbj;	state Exp;
branches;
next	1.1.2.8;

1.1.2.8
date	2001.05.23.14.23.43;	author jbj;	state Exp;
branches;
next	1.1.2.9;

1.1.2.9
date	2001.05.25.19.49.37;	author jbj;	state Exp;
branches;
next	1.1.2.10;

1.1.2.10
date	2001.05.31.22.28.35;	author jbj;	state Exp;
branches;
next	1.1.2.11;

1.1.2.11
date	2001.06.04.13.53.29;	author jbj;	state Exp;
branches;
next	1.1.2.12;

1.1.2.12
date	2002.03.25.16.13.03;	author jbj;	state Exp;
branches;
next	1.1.2.13;

1.1.2.13
date	2002.11.05.19.14.39;	author jbj;	state Exp;
branches;
next	;

1.20.2.1
date	2002.11.06.17.28.20;	author jbj;	state Exp;
branches;
next	;

1.24.2.1
date	2003.12.27.16.02.05;	author jbj;	state Exp;
branches;
next	;

1.26.4.1
date	2005.08.26.22.56.45;	author jbj;	state Exp;
branches;
next	;


desc
@@


1.26
log
@Escaped tab for non-gnu sed (#104821).
@
text
@#!/bin/sh
#set -x 
base_name=`basename $0`
base_path=`echo $0 | sed s,$base_name,,`

db_dist="${base_path}../db/dist"

rm -f config.cache

# XXX edit CFLAGS= ... out of invocation args ???
ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's%--cache-file=.*$%%'`"

CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
	--enable-shared --enable-static --enable-rpc \
	--with-uniquename=_rpmdb --srcdir=$db_dist

mv Makefile Makefile.orig
cat Makefile.orig | sed -e '/^install[:-]/c\
.PHONY: listobjs\
listobjs:\
\	@@echo $(OBJS) $(C_OBJS) \
\
distdir install check:\
\
db4_install: all install_setip' > Makefile

mv db.h db.h.orig
cat db.h.orig | sed \
	-e '/^typedef	u_int32_t	db_pgno_t;/i\
/*@@-incondefs -fielduse -enummemuse -typeuse @@*/' \
	-e '/^struct __key_range;/a\
/*@@=incondefs@@*/' \
	-e '/^#define	db_create/i\
/*@@-declundef -noparams -fcnuse@@*/' \
	-e '/^int txn_commit __P((/a\
/*@@=declundef =noparams =fcnuse =fielduse =enummemuse =typeuse @@*/' > db.h

# Generate manifest for rpmdb.
make -s listobjs > db3lobjs
@


1.26.4.1
log
@Snip out --param==ssp-buffer-size=4 from db3/configure args.
@
text
@d11 1
a11 1
ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
@


1.25
log
@splint fiddles.
@
text
@d21 1
a21 1
	@@echo $(OBJS) $(C_OBJS) \
@


1.24
log
@- dynamically link /bin/rpm, link against good old -lpthread.
@
text
@d3 4
a6 1
db_dist="../db/dist"
@


1.24.2.1
log
@Escaped tab for non-gnu sed (#104821).
@
text
@d18 1
a18 1
\	@@echo $(OBJS) $(C_OBJS) \
@


1.23
log
@- disable fcntl(2) lock on Packages until glibc+nptl is fixed.
- make cdb locks "private" for pthreads compatibility w/o NPTL.
- add --enable-posixmutexes to use NPTL.
- make dependency generation "opt-out" everywhere.
@
text
@d11 1
a11 1
	--enable-shared --enable-static --enable-rpc --enable-posixmutexes \
@


1.22
log
@lclint annotations.
@
text
@d11 1
a11 1
	--enable-shared --enable-static --enable-rpc \
@


1.21
log
@Update to db-4.1.17.
@
text
@d32 1
a32 1
	-e '/^#define db_xa_switch/a\
@


1.20
log
@- detect athlon/duron with CMOV (PLD).
@
text
@a6 4
# XXX hacks to get db-3.3.4 to configure properly
#ln -sf ../dist $db_dist/../db/dist
#ln -sf ../dist $db_dist

a13 3
# XXX hack to get db-3.3.4 to configure properly
#rm -f $db_dist/../db/dist $db_dist/dist

d15 1
a15 1
cat Makefile.orig | sed -e 's/ -g$/ -g -O2/' -e '/^install:/c\
d22 1
a22 1
db3_install: all install_setip' > Makefile
@


1.20.2.1
log
@- backport db-4.1.17 changes.
- add _noDirTokens macro for 6x builds.
@
text
@d7 4
d18 3
d22 1
a22 1
cat Makefile.orig | sed -e '/^install[:-]/c\
d29 1
a29 1
db4_install: all install_setip' > Makefile
d39 1
a39 1
	-e '/^int txn_commit __P((/a\
@


1.19
log
@- popt: display sub-table options only once on --usage.
- wire --nosignatures et al as common options, rework CLI options.
@
text
@d15 1
a15 1
	--enable-shared --enable-static --enable-debug --enable-rpc \
@


1.18
log
@- speedup large queries by ~50%.
- revert to presentation ordering Yet Again (#62158).
- non-glibc: on upgrade, mergesort is much faster than quicksort.
@
text
@d29 1
a29 1
db3_install: all install_setip \\' > Makefile
@


1.17
log
@- *really* dump signature header immutable region.
@
text
@d12 1
a12 1
ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -march=[^ ]*%%' -e 's% -mcpu=[^ ]*%%' -e 's%--cache-file=.*$%%'`"
@


1.16
log
@- drill ts/fi through verify mode, add methods to keep fi abstract.
- use mmap when calculating file digests on verify, ~20% faster.
@
text
@d11 6
a16 3
#CFLAGS="-O2 -D_GNU_SOURCE -D_REENTRANT"
CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure \
	`echo $* | sed -e "s%--cache-file=.*$% --enable-shared --enable-static --enable-debug --enable-rpc --with-uniquename=_rpmdb --srcdir=$db_dist%"`
@


1.15
log
@Strip CFLAGS passed as argument to db configure.
@
text
@d13 1
a13 1
	`echo $* | sed -e "s%CFLAGS=.* --cache-file=.*$% --enable-shared --enable-static --enable-debug --enable-rpc --with-uniquename=_rpmdb --srcdir=$db_dist%"`
@


1.14
log
@- make peace with gcc-3.1, remove compiler cruft.
@
text
@d13 1
a13 1
	`echo $* | sed -e "s% --cache-file=.*$% --enable-shared --enable-static --enable-debug --enable-rpc --with-uniquename=_rpmdb --srcdir=$db_dist%"`
@


1.13
log
@- tweak overlapped file fingerprint retrieval for speed.
@
text
@d8 2
a9 2
ln -sf ../dist $db_dist/../db/dist
ln -sf ../dist $db_dist
d16 1
a16 1
rm -f $db_dist/../db/dist $db_dist/dist
@


1.12
log
@lclint fiddles.
@
text
@d11 1
@


1.11
log
@- return multiple suggested packages (Pawel Kolodziej <pawelk@@pld.org.pl>).
- fix: return suggested packages when using Depends cache.
@
text
@d29 2
a30 2
	-e '/^struct __db;/i\
/*@@-incondefs@@*/' \
d32 5
a36 1
/*@@=incondefs@@*/' > db.h
@


1.10
log
@- perform db->verify when closing db files.
@
text
@d12 1
a12 1
	`echo $* | sed -e "s% --cache-file=.*$% --enable-shared --enable-static --enable-debug --enable-rpc --with-uniquename=rpmdb --srcdir=$db_dist%"`
d29 1
a29 1
	-e '/^struct __db;/i \
d31 1
a31 1
	-e '/^struct __key_range;/a \
@


1.9
log
@- headerFree() returns NULL, _free is C++ safe.
@
text
@d11 2
a12 2
CFALGS="-O2" $db_dist/configure \
	$(echo $* | sed -e "s% --cache-file=.*$% --enable-shared --enable-static --enable-debug --enable-rpc --with-uniquename=rpmdb --srcdir=$db_dist%")
d23 1
a23 1
distdir install:\
@


1.8
log
@Grrr, hacks to the hacks to get db3 to configure.
@
text
@d27 7
@


1.7
log
@- upgrade to db-3.3.4.
@
text
@d7 3
a9 2
# XXX hack to get db-3.3.4 to configure properly
ln -sf ../dist $db_dist/dist
d15 1
a15 1
rm -f $db_dist/dist
@


1.6
log
@Generate manifest for rpmdb.
@
text
@d6 4
d11 4
a14 1
	$(echo $* | sed -e "s% --cache-file=.*$% --enable-shared --enable-static --enable-debug --enable-rpc --srcdir=$db_dist%")
d20 1
a20 1
	@@echo $(OBJS)\
@


1.5
log
@- rpm database has rpm.rpm g+w permissions to share db3 mutexes.
- expose more db3 macro configuration tokens.
- move fprint.[ch] and hash.[ch] to rpmdb directory.
- detect and fiddle incompatible mixtures of db3 env/open flags.
- add DBI_WRITECURSOR to map to db3 flags with CDB database model.
- add rpmdbSetIteratorRewrite to warn of pending lazy (re-)writes.
@
text
@d18 3
@


1.4
log
@Create db2 file manifest, as alpha is different.
@
text
@d4 4
a7 2
CFLAGS="$CFLAGS" $db_dist/configure \
	$(echo $* | sed -e "s% --srcdir=[^ ]*% --enable-shared --enable-static --srcdir=$db_dist%")
d10 1
a10 1
cat Makefile.orig | sed -e '/^install:/c\
a17 2

make -s listobjs > db3lobjs
@


1.3
log
@- create rpmdb.la so that linkage against rpm's db-3.2.9 is possible.
@
text
@d9 3
a11 1
distdir:\
d13 1
a13 1
install:\
d16 2
@


1.2
log
@- use internal db-3.2.9 sources to build by default.
- don't build db1 by default.
@
text
@d4 2
a5 2
$db_dist/configure \
	$(echo $* | sed -e "s% --srcdir=[^ ]*% --srcdir=$db_dist%")
@


1.1
log
@file configure was initially added on branch rpm-4_0.
@
text
@d1 13
@


1.1.2.1
log
@- use internal db-3.2.9 sources to build by default.
- don't build db1 by default.
@
text
@a0 13
#!/bin/sh
#set -x 
db_dist="../db/dist"
$db_dist/configure \
	$(echo $* | sed -e "s% --srcdir=[^ ]*% --srcdir=$db_dist%")

mv Makefile Makefile.orig
cat Makefile.orig | sed -e '/^install:/c\
distdir:\
\
install:\
\
db3_install: all install_setip \\' > Makefile
@


1.1.2.2
log
@- don't build db1 support by default.
- create rpmdb.la so that linkage against rpm's db-3.2.9 is possible.
@
text
@d4 2
a5 2
CFLAGS="$CFLAGS" $db_dist/configure \
	$(echo $* | sed -e "s% --srcdir=[^ ]*% --enable-shared --enable-static --srcdir=$db_dist%")
@


1.1.2.3
log
@Create a db3 file manifest, as alpha is different.
@
text
@d9 1
a9 3
.PHONY: listobjs\
listobjs:\
	@@echo $(OBJS)\
d11 1
a11 1
distdir install:\
a13 2

make -s listobjs > db3lobjs
@


1.1.2.4
log
@- rpm database has rpm.rpm g+w permissions to share db3 mutexes.
- expose more db3 macro configuration tokens.
- move fprint.[ch] and hash.[ch] to rpmdb directory.
- detect and fiddle incompatible mixtures of db3 env/open flags.
- add DBI_WRITECURSOR to map to db3 flags with CDB database model.
- add rpmdbSetIteratorRewrite to warn of pending lazy (re-)writes.
@
text
@d4 2
a5 4

rm -f config.cache
CFALGS="-O2" $db_dist/configure \
	$(echo $* | sed -e "s% --cache-file=.*$% --enable-shared --enable-static --enable-debug --enable-rpc --srcdir=$db_dist%")
d8 1
a8 1
cat Makefile.orig | sed -e 's/ -g$/ -g -O2/' -e '/^install:/c\
d16 2
@


1.1.2.5
log
@Generate manifest for rpmdb.
@
text
@a17 3

# Generate manifest for rpmdb.
make -s listobjs > db3lobjs
@


1.1.2.6
log
@- upgrade to db-3.3.4.
@
text
@a5 4

# XXX hack to get db-3.3.4 to configure properly
ln -sf ../dist $db_dist/dist

d7 1
a7 4
	$(echo $* | sed -e "s% --cache-file=.*$% --enable-shared --enable-static --enable-debug --enable-rpc --with-uniquename=rpmdb --srcdir=$db_dist%")

# XXX hack to get db-3.3.4 to configure properly
rm -f $db_dist/dist
d13 1
a13 1
	@@echo $(OBJS) $(C_OBJS) \
@


1.1.2.7
log
@Grrr, hacks to the hacks to get db3 to configure.
@
text
@d7 2
a8 3
# XXX hacks to get db-3.3.4 to configure properly
ln -sf ../dist $db_dist/../db/dist
ln -sf ../dist $db_dist
d14 1
a14 1
rm -f $db_dist/../db/dist $db_dist/dist
@


1.1.2.8
log
@- headerFree() returns NULL, _free is C++ safe.
@
text
@a26 7
mv db.h db.h.orig
cat db.h.orig | sed \
	-e '/^struct __db;/i \
/*@@-incondefs@@*/' \
	-e '/^struct __key_range;/a \
/*@@=incondefs@@*/' > db.h

@


1.1.2.9
log
@- perform db->verify when closing db files.
@
text
@d11 2
a12 2
CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure \
	`echo $* | sed -e "s% --cache-file=.*$% --enable-shared --enable-static --enable-debug --enable-rpc --with-uniquename=rpmdb --srcdir=$db_dist%"`
d23 1
a23 1
distdir install check:\
@


1.1.2.10
log
@- return multiple suggested packages (Pawel Kolodziej <pawelk@@pld.org.pl>).
- fix: return suggested packages when using Depends cache.
@
text
@d12 1
a12 1
	`echo $* | sed -e "s% --cache-file=.*$% --enable-shared --enable-static --enable-debug --enable-rpc --with-uniquename=_rpmdb --srcdir=$db_dist%"`
d29 1
a29 1
	-e '/^struct __db;/i\
d31 1
a31 1
	-e '/^struct __key_range;/a\
@


1.1.2.11
log
@lclint fiddles.
@
text
@d29 2
a30 2
	-e '/^typedef	u_int32_t	db_pgno_t;/i\
/*@@-incondefs -fielduse -enummemuse -typeuse @@*/' \
d32 1
a32 5
/*@@=incondefs@@*/' \
	-e '/^#define	db_create/i\
/*@@-declundef -noparams -fcnuse@@*/' \
	-e '/^#define db_xa_switch/a\
/*@@=declundef =noparams =fcnuse =fielduse =enummemuse =typeuse @@*/' > db.h
@


1.1.2.12
log
@autostuff fiddles.
@
text
@d8 2
a9 2
#ln -sf ../dist $db_dist/../db/dist
#ln -sf ../dist $db_dist
d11 2
a12 6
# XXX edit CFLAGS= ... out of invocation args ???
ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's%--cache-file=.*$%%'`"

CC="gcc" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
	--enable-shared --enable-static --enable-debug --enable-rpc \
	--with-uniquename=_rpmdb --srcdir=$db_dist
d15 1
a15 1
#rm -f $db_dist/../db/dist $db_dist/dist
d39 1
a39 1
make -s listobjs > db3lobjs || :
@


1.1.2.13
log
@- backport /etc/rpm/platform changes.
- backport db-4.1.17 changes.
@
text
@d7 4
d14 2
a15 2
CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
	--enable-shared --enable-static --enable-rpc \
d18 3
d22 1
a22 1
cat Makefile.orig | sed -e '/^install[:-]/c\
d29 1
a29 1
db4_install: all install_setip' > Makefile
d39 1
a39 1
	-e '/^int txn_commit __P((/a\
d43 1
a43 1
make -s listobjs > db3lobjs
@


