From owner-svn-ports-all@freebsd.org Fri Feb 2 19:53:34 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 4861AEEBFE7 for ; Fri, 2 Feb 2018 19:53:34 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from mail-io0-x236.google.com (mail-io0-x236.google.com [IPv6:2607:f8b0:4001:c06::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CEF7A7CEAE for ; Fri, 2 Feb 2018 19:53:33 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: by mail-io0-x236.google.com with SMTP id z6so24114587iob.11 for ; Fri, 02 Feb 2018 11:53:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sunpoet-net.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=J/yGXXWzHF7v/i3VvWnRQJmTSSsZ1AEUdQi6qrqFf/A=; b=hY98lSUhyRprb3+XB6DLlTGxaQvRVABrK24eL9B1SCUReBhfdqLb4HKVr+v6dhk59B uxpQ+pXgmWPzvThMn3TbdXsdR4dMCvwOtNYd+eX6/yYzZBFLN7FWXaHbBiae9xEC1xqr e5VtuJw4JA2+nE4V9rmsla6b5B2mIRKRop7RgGd55/UkDbB4LHg+XK7gC9poFGVh5Cak h4xtphrW7B60vyr/3MAtLlvVxEJaqK+hmpJ/GfNaomwAT5nltG7bisKDNBAo6fELuiF8 mOTr2+lnejl4/2gk9PoYJfwCU5hIW9uRB/BEfRFCKOwvdnrBR/SKhHoor+b9dWB3eQ6k bpXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=J/yGXXWzHF7v/i3VvWnRQJmTSSsZ1AEUdQi6qrqFf/A=; b=uIonr5ltmuVHrhv97EimVJJdmYsVofMZZvvv4A5p2og7EXczWKFwEv5MPufv8+AMIM p9X9sUa2857a84Xwt3Qu6pvwCcw3HYHmnxYDmtjM84bqNj6inZTvY7e/lsF7hh8ekjnm K13bbH/W6ansrtivJ2H0anVuet2CdDwyMyfA/nGG9BhkMp1kOGOWuYHCGc5VWSxkBIaG On7bFzgT4y/MY+UkhpF+GoJj272iC/RTnWT9q8Wxmh2GMvGrvXQU6y0DpqthPAaM0yPf X5aHSDYNtw9JlDQwa/Z+Q19cVy8/z1Bg4qOkhTVxNOdcS6vlrRJqecv8YPPxMo/+MMwl ScGA== X-Gm-Message-State: AKwxytdgeUuF8aEi6O12ZnUFgtZyB4fLQ46c0UQFTRD/Kj32WgwygYKg vMFo8CVfBsBNojknz6PJLq9GQv/TtnX/gO43+ZBdfw== X-Google-Smtp-Source: AH8x225x1BK42hWdkCS/V2WTPAUFhwWApj603Y1aS/Gyx8b49tP5eFrzs42KX6y8hgDY0ODiNMV12xemPbqIrdjAj5k= X-Received: by 10.107.128.232 with SMTP id k101mr29459722ioi.152.1517601213230; Fri, 02 Feb 2018 11:53:33 -0800 (PST) MIME-Version: 1.0 Sender: sunpoet@sunpoet.net Received: by 10.2.133.1 with HTTP; Fri, 2 Feb 2018 11:52:52 -0800 (PST) In-Reply-To: <201802012252.w11MqUdq031037@repo.freebsd.org> References: <201802012252.w11MqUdq031037@repo.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sat, 3 Feb 2018 03:52:52 +0800 X-Google-Sender-Auth: yMrTE-TAJ-gWp-G9gq0HI1sa_Lk Message-ID: Subject: Re: svn commit: r460648 - in head/security/snort3: . files To: Mark Felder Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 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: Fri, 02 Feb 2018 19:53:34 -0000 On Fri, Feb 2, 2018 at 6:52 AM, Mark Felder wrote: > 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-s > rc_memory_memory__allocator.h > +.endif > + > .include > Hi, The .include line can be removed now. > 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_memor > y__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 > >