From owner-svn-ports-all@freebsd.org Thu Feb 1 22:52:30 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 67352ED0F76; Thu, 1 Feb 2018 22:52:30 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3D2D86C4BB; Thu, 1 Feb 2018 22:52:30 +0000 (UTC) (envelope-from feld@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 381C713736; Thu, 1 Feb 2018 22:52:30 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w11MqUBf031039; Thu, 1 Feb 2018 22:52:30 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w11MqUdq031037; Thu, 1 Feb 2018 22:52:30 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201802012252.w11MqUdq031037@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 1 Feb 2018 22:52:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460648 - in head/security/snort3: . files X-SVN-Group: ports-head X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in head/security/snort3: . files X-SVN-Commit-Revision: 460648 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Feb 2018 22:52:30 -0000 Author: feld Date: Thu Feb 1 22:52:29 2018 New Revision: 460648 URL: https://svnweb.freebsd.org/changeset/ports/460648 Log: security/snort3: Fix build with FreeBSD 10.3 Reference: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210890 MFH: 2018Q1 Added: head/security/snort3/files/ head/security/snort3/files/freebsd103_patch-src_memory_memory__allocator.h (contents, props changed) Modified: head/security/snort3/Makefile Modified: head/security/snort3/Makefile ============================================================================== --- head/security/snort3/Makefile Thu Feb 1 22:30:58 2018 (r460647) +++ head/security/snort3/Makefile Thu Feb 1 22:52:29 2018 (r460648) @@ -40,6 +40,12 @@ DEBUG_CONFIGURE_DISABLE= corefiles DEBUG_MAKE_ENV= DONTSTRIP="yes" LRGPCAP_CONFIGURE_ENABLE= large-pcap +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1004000 +EXTRA_PATCHES= ${PATCHDIR}/freebsd103_patch-src_memory_memory__allocator.h +.endif + .include GNU_CONFIGURE= yes @@ -49,4 +55,4 @@ CFLAGS+= -I${LOCALBASE}/include CONFLICTS= snort-2* -.include +.include Added: head/security/snort3/files/freebsd103_patch-src_memory_memory__allocator.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/snort3/files/freebsd103_patch-src_memory_memory__allocator.h Thu Feb 1 22:52:29 2018 (r460648) @@ -0,0 +1,14 @@ +--- src/memory/memory_allocator.h.orig 2018-02-01 22:21:37 UTC ++++ src/memory/memory_allocator.h +@@ -34,4 +34,11 @@ struct MemoryAllocator + + } // namespace memory + ++// Fix for FreeBSD 10.3's broken toolchain ++typedef struct { ++ long long __max_align1 __aligned(_Alignof(long long)); ++ long double __max_align2 __aligned(_Alignof(long double)); ++} max_align_t; ++ ++ + #endif