mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-30 10:38:37 +00:00
Code Issues Releases Activity

- Fix BROKEN after r317848 commit

Browse Source 
- Patch Makefile to disable libmissing
- Support bmake by using ${ECHO_CMD} instead of ${TRUE}

Reported by:	linimon
This commit is contained in:
Sofian Brabez 2013-05-12 22:01:25 +00:00
parent f96664bfcd
commit 837e8fc184
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=317982
2 changed files with 66 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
security/dsniff/Makefile
View File

@ -12,9 +12,8 @@ MAINTAINER= sbz@FreeBSD.org
COMMENT= Various sniffing utilities for penetration testing
LICENSE= BSD
BROKEN= tries to link with both libnet1.0 and libnet1.1
BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10 \
BUILD_DEPENDS= ${LOCALBASE}/lib/libnet10/libnet.a:${PORTSDIR}/net/libnet10 \
${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids
GNU_CONFIGURE= yes
@ -30,7 +29,13 @@ MAN8= arpspoof.8 ${PORTNAME}.8 macof.8 mailsnarf.8 tcpkill.8 \
tcpnice.8 urlsnarf.8 filesnarf.8 dnsspoof.8 msgsnarf.8 \
sshmitm.8 webmitm.8
LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
LIBNET_VERSION= 10
LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet${LIBNET_VERSION}-config
LIBNET_INC= "`${LIBNET_CONFIG} --defines` `${LIBNET_CONFIG} --cflags`"
# ugly hack because net/libnet10 doesn't install shared library, only static archive
# so we can't use libnet-config10 --libs to retrieve linker flags
LIBNET_LIB= "-L${LOCALBASE}/include/libnet${LIBNET_VERSION} \
${LOCALBASE}/lib/libnet${LIBNET_VERSION}/libnet.a"
.include <bsd.port.pre.mk>
@ -38,7 +43,7 @@ LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
# the corresponding library and additional linker flags.
LIBNIDS_GLIB2?=
.if exists(${LOCALBASE}/lib/libnids.a)
LIBNIDS_GLIB2!= nm -u ${LOCALBASE}/lib/libnids.a | ${GREP} g_thread_init || ${TRUE}
LIBNIDS_GLIB2!= nm -u ${LOCALBASE}/lib/libnids.a | ${GREP} g_thread_init || ${ECHO_CMD}
.endif
.if !empty(LIBNIDS_GLIB2)
@ -58,8 +63,8 @@ post-patch:
@${REINPLACE_CMD} -Ee \
's|libnet-config|${LIBNET_CONFIG:T}|; \
s|test -f \$${prefix}/include/libnet.h|${TRUE}|; \
s|(LNETINC=).*|\1"`${LIBNET_CONFIG} --cflags`"|; \
s|(LNETLIB=).*|\1"`${LIBNET_CONFIG} --libs`"|' \
s|(LNETINC=).*|\1${LIBNET_INC}|; \
s|(LNETLIB=).*|\1${LIBNET_LIB}|' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
.if !empty(LIBNIDS_GLIB2)

55
security/dsniff/files/patch-Makefile.in Normal file
View File

@ -0,0 +1,55 @@
--- ./Makefile.in.orig 2000-12-15 21:03:26.000000000 +0100
+++ ./Makefile.in 2013-03-15 07:33:57.000000000 +0100
@@ -26,7 +26,7 @@
LNETLIB = @LNETLIB@
NIDSINC = @NIDSINC@
-NIDSLIB = @NIDSLIB@
+NIDSLIB = @NIDSLIB@ `pkg-config --libs gthread-2.0` `pkg-config --libs gthread-2.0` `pkg-config --libs gthread-2.0`
DBINC = @DBINC@
DBLIB = @DBLIB@
@@ -37,9 +37,8 @@
X11INC = @X_CFLAGS@
X11LIB = @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
-INCS = -I. $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC) \
- -I$(srcdir)/missing
-LIBS = @LIBS@ -L$(srcdir) -lmissing
+INCS = -I. $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC)
+LIBS = @LIBS@ -L$(srcdir) -lmd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -76,7 +75,7 @@
.c.o:
$(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c
-all: libmissing.a $(PROGS)
+all: $(PROGS)
mount.c: mount.x
rpcgen -h mount.x -o mount.h
@@ -86,13 +85,6 @@
rpcgen -h nfs_prot.x -o nfs_prot.h
rpcgen -c nfs_prot.x -o nfs_prot.c
-$(LIBOBJS):
- $(CC) $(CFLAGS) $(INCS) -c $(srcdir)/missing/$*.c
-
-libmissing.a: $(LIBOBJS)
- ar -cr $@ $(LIBOBJS)
- $(RANLIB) $@
-
dsniff: $(HDRS) $(SRCS) $(OBJS)
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
@@ -153,7 +145,7 @@
done
clean:
- rm -f *.o *~ $(GEN) libmissing.a $(PROGS) webmitm.crt
+ rm -f *.o *~ $(GEN) $(PROGS) webmitm.crt
distclean: clean
rm -f Makefile config.h config.cache config.log config.status