OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Jun-2006 22:22:01
Branch: HEAD Handle: 2006061721220000
Modified files:
openpkg-src/dbtool dbtool.patch dbtool.spec
Log:
fix building under new GCC 4.1 C++ world order
Summary:
Revision Changes Path
1.2 +69 -24 openpkg-src/dbtool/dbtool.patch
1.12 +1 -1 openpkg-src/dbtool/dbtool.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dbtool/dbtool.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 dbtool.patch
--- openpkg-src/dbtool/dbtool.patch 23 Mar 2003 11:02:07 -0000 1.1
+++ openpkg-src/dbtool/dbtool.patch 17 Jun 2006 20:22:00 -0000 1.2
@@ -1,5 +1,72 @@
---- dbtool.h.orig Sat Mar 22 21:37:47 2003
-+++ dbtool.h Sun Mar 23 11:55:12 2003
+Index: Makefile.in
+--- Makefile.in.orig 2003-03-22 21:55:48 +0100
++++ Makefile.in 2006-06-17 22:17:02 +0200
+@@ -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-06-17 22:16:22 +0200
+@@ -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-06-17 22:15:51 +0200
+@@ -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-06-17 22:16:39 +0200
+@@ -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-06-17 22:15:51 +0200
+@@ -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-06-17 22:15:51 +0200
@@ -61,12 +61,12 @@
#endif
@@ -17,25 +84,3 @@
#endif
#include <string>
---- 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"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dbtool/dbtool.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 dbtool.spec
--- openpkg-src/dbtool/dbtool.spec 1 Jan 2006 13:12:59 -0000 1.11
+++ openpkg-src/dbtool/dbtool.spec 17 Jun 2006 20:22:00 -0000 1.12
@@ -33,7 +33,7 @@
Group: Database
License: GPL
Version: 1.6
-Release: 20040207
+Release: 20060617
# list of sources
Source0: ftp://ftp.daemon.de/scip/Apps/dbtool/dbtool-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
