Attachment #107655 for bug #148451

View | Details | Raw Unified | Return to bug 148451
Collapse All | Expand All




MAINTAINER=	wxs@FreeBSD.org
COMMENT=	ICMP active OS fingerprint scanner

GNU_CONFIGURE=	yes
CONFIGURE_ENV=	INSTALL=${INSTALL}
MAKE_JOBS_SAFE=	yes

MAN1=		xprobe2.1

post-install:	.SILENT
	if [ ! -f ${ETCDIR}/${PORTNAME}.conf ]; then \
		${INSTALL_DATA} ${ETCDIR}/${PORTNAME}.conf.sample \
			${ETCDIR}/${PORTNAME}.conf; \
	fi
	@${FIND} ${WRKSRC}/src/xpmodules/os_probe -name Makefile | ${XARGS} ${REINPLACE_CMD} -e 's|${CFLAGS}|-O0|'

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/xprobe2 ${PREFIX}/bin
	${INSTALL} -d ${PREFIX}/etc/xprobe2
	${INSTALL_DATA} ${WRKSRC}/etc/xprobe2.conf ${PREFIX}/etc/xprobe2
	${INSTALL_MAN} ${WRKSRC}/docs/xprobe2.1 ${PREFIX}/man/man1

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)net/xprobe/pkg-plist (-2 / +4 lines)
1	bin/xprobe2	1	bin/xprobe2
2	etc/xprobe2/xprobe2.conf	2	@unexec if cmp -s %D/%%ETCDIR%%/xprobe2.conf.sample %D/%%ETCDIR%%/xprobe2.conf; then rm -f %D/%%ETCDIR%%/xprobe2.conf; fi
3	@dirrm etc/xprobe2	3	%%ETCDIR%%/xprobe2.conf.sample
		4	@exec if [ ! -f %D/%%ETCDIR%%/xprobe2.conf ]; then cp -p %D/%F %B/xprobe2.conf; fi
		5	@dirrm %%ETCDIR%%




--- Makefile.in~
+++ Makefile.in
@@ -43,8 +40,8 @@ SIG=md5sum -b
 
 
 all: 
-	cd libs-external/USI++/src; ${MAKE}
-	cd src; ${MAKE}
+	(cd libs-external/USI++/src; ${MAKE})
+	(cd src; ${MAKE})
 
 
 clean:
@@ -55,11 +52,11 @@ distclean: clean
 	cd libs-external/USI++/src; ${MAKE} distclean
 	cd src; ${MAKE} distclean
 install: src/xprobe2
-	$(INSTALL_PROGRAM) -d $(DESTDIR)/$(bindir)
-	$(INSTALL_PROGRAM) -d $(DESTDIR)/$(mandir)/man1
-	$(INSTALL_PROGRAM) -d $(DESTDIR)/$(sysconfdir)/xprobe2
-	$(INSTALL_PROGRAM) -m 0755 src/xprobe2 $(DESTDIR)/$(bindir)
-	$(INSTALL_PROGRAM) -m 0444 etc/xprobe2.conf $(DESTDIR)/$(sysconfdir)/xprobe2
+	$(INSTALL) -d $(DESTDIR)/$(bindir)
+	$(INSTALL) -d $(DESTDIR)/$(mandir)/man1
+	$(INSTALL) -d $(DESTDIR)/$(sysconfdir)/xprobe2
+	$(INSTALL_PROGRAM) src/xprobe2 $(DESTDIR)/$(bindir)
+	$(INSTALL_DATA) etc/xprobe2.conf $(DESTDIR)/$(sysconfdir)/xprobe2/xprobe2.conf.sample
 	$(INSTALL_DATA) docs/xprobe2.1 $(DESTDIR)/$(mandir)/man1
 
 configure: configure.in

Added Link Here

(-)net/xprobe/files/patch-libs-external-USI++-src-ip.cc (+10 lines)
1	--- libs-external/USI++/src/ip.cc~
2	+++ libs-external/USI++/src/ip.cc
3	@@ -15,6 +15,7 @@
4	#include "config.h"
5	#include <iostream>
6	#include <string.h>
7	+#include <cstdlib>
8	#include <errno.h>
9	#include <new>
10	#include <vector>

Added Link Here

(-)net/xprobe/files/patch-libs-external-USI++-src-misc.cc (+10 lines)
1	--- libs-external/USI++/src/misc.cc~
2	+++ libs-external/USI++/src/misc.cc
3	@@ -1,6 +1,7 @@
4	#include "usi++/usi++"
5	#include "usi++/usi-structs.h"
6	#include <string.h>
7	+#include <cstdlib>
8	#include <unistd.h>
9	#include <sys/ioctl.h>
10	#include <errno.h>

Added Link Here

(-)net/xprobe/files/patch-libs-external-USI++-src-usi++-tcp.h (+11 lines)
1	--- libs-external/USI++/usi++/tcp.h~
2	+++ libs-external/USI++/usi++/tcp.h
3	@@ -12,6 +12,8 @@
4	#ifndef _TCP_H_
5	#define _TCP_H_
6
7	+#include <cstring>
8	+
9	#include "usi-structs.h"
10	#include "datalink.h"
11	#include "ip.h"

Added Link Here

(-)net/xprobe/files/patch-src-Makefile.in (+10 lines)
1	--- src/Makefile.in~
2	+++ src/Makefile.in
3	@@ -49,7 +49,6 @@ all: lib xprobe2
4
5	xprobe2: $(OBJS) modules
6	$(CXX) $(CFLAGS) $(OBJS) $(MODOBJS) -o $@ $(LDFLAGS) $(LIBS)
7	- strip $@
8
9	modules:
10	cd xpmodules; ${MAKE}

Return to bug 148451

Lines 13-33 MASTER_SITES= SF/xprobe/${PORTNAME}/Xpro Link Here

(-)net/xprobe/Makefile (-13 / +8 lines)
13	MAINTAINER= wxs@FreeBSD.org	13	MAINTAINER= wxs@FreeBSD.org
14	COMMENT= ICMP active OS fingerprint scanner	14	COMMENT= ICMP active OS fingerprint scanner
15		15
16	HAS_CONFIGURE= yes	16	GNU_CONFIGURE= yes
		17	CONFIGURE_ENV= INSTALL=${INSTALL}
		18	MAKE_JOBS_SAFE= yes
17		19
18	MAN1= xprobe2.1	20	MAN1= xprobe2.1
19		21
20	pre-configure:	22	post-install: .SILENT
21	( cd ${WRKSRC}/libs-external/USI++/src ; CFLAGS="${CFLAGS}" ./configure --prefix=${PREFIX} ${CONFIGURE_TARGET} )	23	if [ ! -f ${ETCDIR}/${PORTNAME}.conf ]; then \
22		24	${INSTALL_DATA} ${ETCDIR}/${PORTNAME}.conf.sample \
23	# force -O0 for these modules otherwise gcc 3.3.3 20031106 dies with internal error	25	${ETCDIR}/${PORTNAME}.conf; \
24	post-configure:	26	fi
25	@${FIND} ${WRKSRC}/src/xpmodules/os_probe -name Makefile \| ${XARGS} ${REINPLACE_CMD} -e 's\|${CFLAGS}\|-O0\|'
26
27	do-install:
28	${INSTALL_PROGRAM} ${WRKSRC}/src/xprobe2 ${PREFIX}/bin
29	${INSTALL} -d ${PREFIX}/etc/xprobe2
30	${INSTALL_DATA} ${WRKSRC}/etc/xprobe2.conf ${PREFIX}/etc/xprobe2
31	${INSTALL_MAN} ${WRKSRC}/docs/xprobe2.1 ${PREFIX}/man/man1
32		27
33	.include <bsd.port.mk>	28	.include <bsd.port.mk>

Added Link Here

(-)net/xprobe/files/patch-Makefile.in (+30 lines)
1	--- Makefile.in~
2	+++ Makefile.in
3	@@ -43,8 +40,8 @@ SIG=md5sum -b
4
5
6	all:
7	- cd libs-external/USI++/src; ${MAKE}
8	- cd src; ${MAKE}
9	+ (cd libs-external/USI++/src; ${MAKE})
10	+ (cd src; ${MAKE})
11
12
13	clean:
14	@@ -55,11 +52,11 @@ distclean: clean
15	cd libs-external/USI++/src; ${MAKE} distclean
16	cd src; ${MAKE} distclean
17	install: src/xprobe2
18	- $(INSTALL_PROGRAM) -d $(DESTDIR)/$(bindir)
19	- $(INSTALL_PROGRAM) -d $(DESTDIR)/$(mandir)/man1
20	- $(INSTALL_PROGRAM) -d $(DESTDIR)/$(sysconfdir)/xprobe2
21	- $(INSTALL_PROGRAM) -m 0755 src/xprobe2 $(DESTDIR)/$(bindir)
22	- $(INSTALL_PROGRAM) -m 0444 etc/xprobe2.conf $(DESTDIR)/$(sysconfdir)/xprobe2
23	+ $(INSTALL) -d $(DESTDIR)/$(bindir)
24	+ $(INSTALL) -d $(DESTDIR)/$(mandir)/man1
25	+ $(INSTALL) -d $(DESTDIR)/$(sysconfdir)/xprobe2
26	+ $(INSTALL_PROGRAM) src/xprobe2 $(DESTDIR)/$(bindir)
27	+ $(INSTALL_DATA) etc/xprobe2.conf $(DESTDIR)/$(sysconfdir)/xprobe2/xprobe2.conf.sample
28	$(INSTALL_DATA) docs/xprobe2.1 $(DESTDIR)/$(mandir)/man1
29
30	configure: configure.in