fix db dependencies to ensure db/v3 is installed

ensure db/v3 is used
also fixes build on NO_SHARED_ARCHS

with conceptual help from brad@
This commit is contained in:
sturm 2004-01-10 08:33:11 +00:00
parent 7f388c85e3
commit 04a09edf10
4 changed files with 46 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2003/12/08 17:42:34 sturm Exp $
# $OpenBSD: Makefile,v 1.16 2004/01/10 08:33:11 sturm Exp $
COMMENT= "small and efficient HTTP crawler"
@ -15,7 +15,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.monkey.org/~provos/
LIB_DEPENDS= db.3::databases/db/v3
LIB_DEPENDS= lib/db/db.3:db->3,<4:databases/db/v3
DESTDIRNAME= install_prefix

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.3 2003/12/08 17:42:34 sturm Exp $
--- configure.orig 2002-01-29 03:37:16.000000000 +0100
+++ configure 2003-12-07 13:36:36.000000000 +0100
$OpenBSD: patch-configure,v 1.4 2004/01/10 08:33:11 sturm Exp $
--- configure.orig 2002-01-29 03:37:38.000000000 +0100
+++ configure 2004-01-10 00:42:16.000000000 +0100
@@ -1017,8 +1017,8 @@ EOF
DBINC="-I$withval/dist"
@ -12,3 +12,12 @@ $OpenBSD: patch-configure,v 1.3 2003/12/08 17:42:34 sturm Exp $
owd=`pwd`
if cd $withval; then withval=`pwd`; cd $owd; fi
cat >> confdefs.h <<\EOF
@@ -1026,7 +1026,7 @@ EOF
EOF
DBINC="-I$withval/include"
- DBLIB="-L$withval/lib -ldb"
+ DBLIB="-L$withval/lib/db -ldb"
else
{ echo "configure: error: db_185.h or libdb.a not found in $withval or not configured with --enable-compat185" 1>&2; exit 1; }
fi

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.27 2003/12/08 17:42:34 sturm Exp $
# $OpenBSD: Makefile,v 1.28 2004/01/10 08:33:12 sturm Exp $
COMMENT= "sniffing tools for penetration testing"
@ -10,7 +10,7 @@ MASTER_SITES= http://monkey.org/~dugsong/dsniff/
HOMEPAGE= http://www.monkey.org/~dugsong/dsniff/
BUILD_DEPENDS= ::net/libnids
LIB_DEPENDS= db.3::databases/db/v3 \
LIB_DEPENDS= lib/db/db.3:db->3,<4:databases/db/v3 \
net::net/libnet
MAINTAINER= Dug Song <dugsong@monkey.org>

View File

@ -0,0 +1,30 @@
$OpenBSD: patch-Makefile_in,v 1.1 2004/01/10 08:33:12 sturm Exp $
--- Makefile.in.orig 2004-01-10 00:53:22.000000000 +0100
+++ Makefile.in 2004-01-10 00:53:58.000000000 +0100
@@ -94,7 +94,7 @@ libmissing.a: $(LIBOBJS)
$(RANLIB) $@
dsniff: $(HDRS) $(SRCS) $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(DBLIB) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(SSLLIB)
arpspoof: arpspoof.o arp.o
$(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB)
@@ -115,7 +115,7 @@ msgsnarf: msgsnarf.o buf.o pcaputil.o
$(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o
- $(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
+ $(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
tcpkill: tcpkill.o pcaputil.o
$(CC) $(LDFLAGS) -o $@ tcpkill.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
@@ -130,7 +130,7 @@ urlsnarf: urlsnarf.o base64.o buf.o pcap
$(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
webmitm: webmitm.o base64.o buf.o decode_http.o record.o
- $(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
+ $(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
webspy: webspy.o base64.o buf.o remote.o
$(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)