From owner-svn-ports-head@freebsd.org Thu Dec 31 06:18:47 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC2BEA57257; Thu, 31 Dec 2015 06:18:47 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A11461336; Thu, 31 Dec 2015 06:18:47 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBV6IkmB081941; Thu, 31 Dec 2015 06:18:46 GMT (envelope-from kevlo@FreeBSD.org) Received: (from kevlo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBV6IkwZ081937; Thu, 31 Dec 2015 06:18:46 GMT (envelope-from kevlo@FreeBSD.org) Message-Id: <201512310618.tBV6IkwZ081937@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevlo set sender to kevlo@FreeBSD.org using -f From: Kevin Lo Date: Thu, 31 Dec 2015 06:18:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404909 - in head/net: hping hping-devel hping-devel/files hping/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Dec 2015 06:18:48 -0000 Author: kevlo Date: Thu Dec 31 06:18:46 2015 New Revision: 404909 URL: https://svnweb.freebsd.org/changeset/ports/404909 Log: Mark this unbroken on FreeBSD < 1100030. Pointed out by: mat Added: head/net/hping-devel/files/extra-patch-sendip.c - copied unchanged from r404908, head/net/hping-devel/files/patch-sendip.c head/net/hping/files/extra-patch-sendip.c - copied unchanged from r404908, head/net/hping/files/patch-sendip.c Deleted: head/net/hping-devel/files/patch-sendip.c head/net/hping/files/patch-sendip.c Modified: head/net/hping-devel/Makefile head/net/hping/Makefile Modified: head/net/hping-devel/Makefile ============================================================================== --- head/net/hping-devel/Makefile Thu Dec 31 06:04:45 2015 (r404908) +++ head/net/hping-devel/Makefile Thu Dec 31 06:18:46 2015 (r404909) @@ -29,6 +29,12 @@ PORTEXAMPLES= README apd.htcl apd2.htcl passivets.htcl ping.htcl raw.htcl show-tcpseq.htcl \ showled.htcl +.include + +.if (${OSVERSION} >= 1100030) +EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendip.c +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hping3 ${STAGEDIR}${PREFIX}/sbin/hping ${INSTALL_MAN} ${WRKSRC}/docs/hping3.8 ${STAGEDIR}${PREFIX}/man/man8/hping.8 @@ -43,4 +49,4 @@ do-install: .endfor ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/lib/|} ${STAGEDIR}${EXAMPLESDIR} -.include +.include Copied: head/net/hping-devel/files/extra-patch-sendip.c (from r404908, head/net/hping-devel/files/patch-sendip.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/hping-devel/files/extra-patch-sendip.c Thu Dec 31 06:18:46 2015 (r404909, copy of r404908, head/net/hping-devel/files/patch-sendip.c) @@ -0,0 +1,33 @@ +--- sendip.c.orig 2003-08-01 21:28:07.000000000 +0800 ++++ sendip.c 2015-12-22 23:16:39.296072000 +0800 +@@ -48,12 +48,12 @@ + ip->ihl = (IPHDR_SIZE + optlen + 3) >> 2; + ip->tos = ip_tos; + +-#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI +-/* FreeBSD */ ++#if defined OSTYPE_NETBSD || defined OSTYPE_BSDI + /* NetBSD */ + ip->tot_len = packetsize; + #else + /* Linux */ ++/* FreeBSD */ + /* OpenBSD */ + ip->tot_len = htons(packetsize); + #endif +@@ -73,13 +73,13 @@ + htons((unsigned short) src_id); + } + +-#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD | defined OSTYPE_BSDI +-/* FreeBSD */ ++#if defined OSTYPE_NETBSD | defined OSTYPE_BSDI + /* NetBSD */ + ip->frag_off |= more_fragments; + ip->frag_off |= fragoff >> 3; + #else + /* Linux */ ++/* FreeBSD */ + /* OpenBSD */ + ip->frag_off |= htons(more_fragments); + ip->frag_off |= htons(fragoff >> 3); /* shift three flags bit */ Modified: head/net/hping/Makefile ============================================================================== --- head/net/hping/Makefile Thu Dec 31 06:04:45 2015 (r404908) +++ head/net/hping/Makefile Thu Dec 31 06:18:46 2015 (r404909) @@ -27,6 +27,12 @@ PORTDOCS= AS-BACKDOOR HPING2-HOWTO.txt H OPTIONS_DEFINE= DOCS +.include + +.if (${OSVERSION} >= 1100030) +EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendip.c +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hping2 ${STAGEDIR}${PREFIX}/sbin/hping ${INSTALL_MAN} ${WRKSRC}/docs/hping2.8 \ @@ -36,4 +42,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR} .endfor -.include +.include Copied: head/net/hping/files/extra-patch-sendip.c (from r404908, head/net/hping/files/patch-sendip.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/hping/files/extra-patch-sendip.c Thu Dec 31 06:18:46 2015 (r404909, copy of r404908, head/net/hping/files/patch-sendip.c) @@ -0,0 +1,33 @@ +--- sendip.c.orig 2003-08-01 21:28:07.000000000 +0800 ++++ sendip.c 2015-12-22 23:16:39.296072000 +0800 +@@ -48,12 +48,12 @@ + ip->ihl = (IPHDR_SIZE + optlen + 3) >> 2; + ip->tos = ip_tos; + +-#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI +-/* FreeBSD */ ++#if defined OSTYPE_NETBSD || defined OSTYPE_BSDI + /* NetBSD */ + ip->tot_len = packetsize; + #else + /* Linux */ ++/* FreeBSD */ + /* OpenBSD */ + ip->tot_len = htons(packetsize); + #endif +@@ -73,13 +73,13 @@ + htons((unsigned short) src_id); + } + +-#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD | defined OSTYPE_BSDI +-/* FreeBSD */ ++#if defined OSTYPE_NETBSD | defined OSTYPE_BSDI + /* NetBSD */ + ip->frag_off |= more_fragments; + ip->frag_off |= fragoff >> 3; + #else + /* Linux */ ++/* FreeBSD */ + /* OpenBSD */ + ip->frag_off |= htons(more_fragments); + ip->frag_off |= htons(fragoff >> 3); /* shift three flags bit */