head	1.4;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.2
	OPENPKG_E1_FP:1.2
	OPENPKG_2_STABLE_MP:1.2
	OPENPKG_2_STABLE_20061018:1.2
	OPENPKG_2_STABLE_20060622:1.2
	OPENPKG_2_STABLE:1.2.0.2
	OPENPKG_2_STABLE_BP:1.2
	OPENPKG_2_5_RELEASE:1.1
	OPENPKG_2_5_SOLID:1.1.0.12
	OPENPKG_2_5_SOLID_BP:1.1
	OPENPKG_2_4_RELEASE:1.1
	OPENPKG_2_4_SOLID:1.1.0.10
	OPENPKG_2_4_SOLID_BP:1.1
	OPENPKG_CW_FP:1.1
	OPENPKG_2_3_RELEASE:1.1
	OPENPKG_2_3_SOLID:1.1.0.8
	OPENPKG_2_3_SOLID_BP:1.1
	OPENPKG_2_2_RELEASE:1.1
	OPENPKG_2_2_SOLID:1.1.0.6
	OPENPKG_2_2_SOLID_BP:1.1
	OPENPKG_2_1_RELEASE:1.1
	OPENPKG_2_1_SOLID:1.1.0.4
	OPENPKG_2_1_SOLID_BP:1.1
	OPENPKG_2_0_RELEASE:1.1
	OPENPKG_2_0_SOLID:1.1.0.2
	OPENPKG_2_0_SOLID_BP:1.1
	OPENPKG_1_STABLE_MP:1.1;
locks; strict;
comment	@# @;


1.4
date	2009.06.25.07.12.02;	author rse;	state dead;
branches;
next	1.3;
commitid	bgqKB1knJERAScTt;

1.3
date	2006.12.04.18.34.20;	author rse;	state Exp;
branches;
next	1.2;
commitid	ebHiGkx0Qps2GeXr;

1.2
date	2006.06.17.20.22.00;	author rse;	state Exp;
branches;
next	1.1;
commitid	sAT8QKSuegpLJoBr;

1.1
date	2003.03.23.11.02.07;	author rse;	state Exp;
branches;
next	;


desc
@@


1.4
log
@upgrading package: dbtool 1.6 -> 1.7
@
text
@Index: Makefile.in
--- Makefile.in.orig	2003-03-22 21:55:48 +0100
+++ Makefile.in	2006-12-04 19:28:59 +0100
@@@@ -66,7 +66,7 @@@@
 dbtool_SOURCES = cipher.cc  config.cc  dbtool.cc  digest.cc  engine.cc  rijndael.cc
 man_MANS = dbtool.1
 EXTRA_DIST = $(man_MANS)
-CXXFLAGS = -g -Wstrict-prototypes -O
+CXXFLAGS = -O
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
Index: cipher.h
--- cipher.h.orig	2003-03-22 21:39:42 +0100
+++ cipher.h	2006-12-04 19:28:59 +0100
@@@@ -62,12 +62,12 @@@@
   MD5Digest dig;
   unsigned char key[32];
   string blah;
-  const char* cipher::error(int num);
+  const char* error(int num);
 
  public:
   cipher() {};
   ~cipher() {};
-  void cipher::init(const string & phrase);
+  void init(const string & phrase);
   string encrypt(const string& source);
   string decrypt(const string& source);
 };
Index: config.cc
--- config.cc.orig	2003-03-22 21:36:41 +0100
+++ config.cc	2006-12-04 19:28:59 +0100
@@@@ -55,7 +55,7 @@@@
 Config::Config() {
   /* konstructor */ 
   pkg = PACKAGE;
-  default_db = DB;
+  default_db = DB_VARNAME;
 
   usage =
     "\nUsage: " + pkg + " -d database [DirusSfwVhtRFpP] [-k key] [-v value]\n"
Index: config.h
--- config.h.orig	2003-03-22 21:37:59 +0100
+++ config.h	2006-12-04 19:28:59 +0100
@@@@ -71,7 +71,7 @@@@
 
  public:
   Config();
-  void Config::args(int argc, char *argv[]);
+  void args(int argc, char *argv[]);
   int parse();
   int     force, command, with, reverse, readonly, encrypted;
   string  filename, key, value, usage, token, phrase;
Index: dbtool.cc
--- dbtool.cc.orig	2003-03-22 21:38:20 +0100
+++ dbtool.cc	2006-12-04 19:28:59 +0100
@@@@ -129,7 +129,7 @@@@
 string readpass() {
   char *pass;
   char *envpass;
-  envpass = getenv(PW);
+  envpass = getenv(PW_VARNAME);
   if(envpass != NULL) {
     string pw = envpass;
     return pw;
Index: dbtool.h
--- dbtool.h.orig	2003-03-22 21:37:47 +0100
+++ dbtool.h	2006-12-04 19:28:59 +0100
@@@@ -61,12 +61,12 @@@@
 #endif
 
 /* the name of the environment variable to be used if -d is omited */
-#ifndef DB
-#define DB "DB_DATABASE"
+#ifndef DB_VARNAME
+#define DB_VARNAME "DB_DATABASE"
 #endif
 
-#ifndef PW
-#define PW "DB_PASSPHRASE"
+#ifndef PW_VARNAME
+#define PW_VARNAME "DB_PASSPHRASE"
 #endif
 
 #include <string>
Index: engine.cc
--- engine.cc.orig	2003-03-22 21:38:40 +0100
+++ engine.cc	2006-12-04 19:31:41 +0100
@@@@ -81,7 +81,7 @@@@
 
   if(config.force == 1) {
 #ifdef HAVE_BERKELEY
-    if ((err = db->open(config.filename.c_str(), NULL, DB_HASH, mode, FILEMODE)) != 0) {
+    if ((err = db->open(NULL, config.filename.c_str(), NULL, DB_HASH, mode, FILEMODE)) != 0) {
       cerr << "Failed to open " + config.filename << "(" << strerror(err) << ")" << endl;
       exit(1);
     }
@@@@ -98,7 +98,7 @@@@
   }
   else {
 #ifdef HAVE_BERKELEY
-    if ((err = db->open(config.filename.c_str(), NULL, DB_HASH, mode, FILEMODE)) != 0) {
+    if ((err = db->open(NULL, config.filename.c_str(), NULL, DB_HASH, mode, FILEMODE)) != 0) {
       cerr << "Failed to open " + config.filename << "(" << strerror(err) << ")" << endl;
       exit(1);
     }
@


1.3
log
@fix URLs and add optional Berkeley-DB support
@
text
@@


1.2
log
@fix building under new GCC 4.1 C++ world order
@
text
@d3 1
a3 1
+++ Makefile.in	2006-06-17 22:17:02 +0200
d15 1
a15 1
+++ cipher.h	2006-06-17 22:16:22 +0200
d33 1
a33 1
+++ config.cc	2006-06-17 22:15:51 +0200
d45 1
a45 1
+++ config.h	2006-06-17 22:16:39 +0200
d57 1
a57 1
+++ dbtool.cc	2006-06-17 22:15:51 +0200
d69 1
a69 1
+++ dbtool.h	2006-06-17 22:15:51 +0200
d87 21
@


1.1
log
@new package: dbtool 1.6 (Command Line Tool for GDBM)
@
text
@d1 69
a69 2
--- dbtool.h.orig	Sat Mar 22 21:37:47 2003
+++ dbtool.h	Sun Mar 23 11:55:12 2003
a86 22
--- dbtool.cc.orig	Sat Mar 22 21:38:20 2003
+++ dbtool.cc	Sun Mar 23 11:55:42 2003
@@@@ -129,7 +129,7 @@@@
 string readpass() {
   char *pass;
   char *envpass;
-  envpass = getenv(PW);
+  envpass = getenv(PW_VARNAME);
   if(envpass != NULL) {
     string pw = envpass;
     return pw;
--- config.cc.orig	Sat Mar 22 21:36:41 2003
+++ config.cc	Sun Mar 23 11:55:25 2003
@@@@ -55,7 +55,7 @@@@
 Config::Config() {
   /* konstructor */ 
   pkg = PACKAGE;
-  default_db = DB;
+  default_db = DB_VARNAME;
 
   usage =
     "\nUsage: " + pkg + " -d database [DirusSfwVhtRFpP] [-k key] [-v value]\n"
@