From patchwork Mon May 27 03:56:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 2269 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id ADADB8AC1E9 for ; Sun, 26 May 2019 18:56:53 +0100 (BST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 45BnqS4pnzz51tcH; Sun, 26 May 2019 18:56:52 +0100 (BST) Received: from tuxedo.stevee (213162073153.public.t-mobile.at [213.162.73.153]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 45BnqQ18wkz51tcH; Sun, 26 May 2019 18:56:50 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904rsa; t=1558893410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=0QYgYnTWHyDcXVMlel2YtZUAndj/L/VEypIqisQbgnY=; b=BSA+SIhfWbt/ECQb+GQnXD0KtWsH2h3Ji80TL5II3uQr/qGApiteGwkPa1iwD+5hKHNJWC 4Ut1qxpf7HviMk8bc4o+nP9C8tiG7n+pQXyqeUJfaqKpatCd8FUKixZMAuu+38Fa+c+hIc eIGaYO5LhbdfUvpM+EYbRCSIHx9DVtYcDjkgbU8Ju4uQb7JiZYSorYM2ESjoQvOGAZx5Fm OZ8bCVdvolVJ0xbOboawcJb5QFGXEC99YkyF2F6TKQKG+BOmXBNx3EIvHvdAHB8Ha6wrFR PZb2LvU+SklDHiW0q8yr28yRDxddAlTDhxfhVHwvIkfNwB/Wwns76NydKv07fw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904ed25519; t=1558893410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=0QYgYnTWHyDcXVMlel2YtZUAndj/L/VEypIqisQbgnY=; b=AYJttkJpsbN38lG3errVBoSVI+enUJkxMoH3M2oa3CVX6Ta1uw9Lws/vZUUxWRikQUaO7k VelDrjE/Ho/qBCAw== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 1/3] colm: New package Date: Sun, 26 May 2019 19:56:45 +0200 Message-Id: <20190526175647.4101-1-stefan.schantl@ipfire.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=stevee smtp.mailfrom=stefan.schantl@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" X-Spam: Yes This is a build dependency of ragel, which is a build dependency of hyperscan. Signed-off-by: Stefan Schantl --- config/rootfiles/common/colm | 21 ++++++++++ lfs/colm | 79 ++++++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 101 insertions(+) create mode 100644 config/rootfiles/common/colm create mode 100644 lfs/colm diff --git a/config/rootfiles/common/colm b/config/rootfiles/common/colm new file mode 100644 index 000000000..7f0d22396 --- /dev/null +++ b/config/rootfiles/common/colm @@ -0,0 +1,21 @@ +#usr/bin/colm +#usr/include/colm +#usr/include/colm/bytecode.h +#usr/include/colm/colm.h +#usr/include/colm/config.h +#usr/include/colm/debug.h +#usr/include/colm/defs.h +#usr/include/colm/input.h +#usr/include/colm/internal.h +#usr/include/colm/map.h +#usr/include/colm/pdarun.h +#usr/include/colm/pool.h +#usr/include/colm/program.h +#usr/include/colm/struct.h +#usr/include/colm/tree.h +#usr/include/colm/type.h +#usr/lib/libcolm-0.13.0.6.so +#usr/lib/libcolm.la +#usr/lib/libcolm.so +#usr/share/doc/colm +#usr/share/doc/colm/colm.vim diff --git a/lfs/colm b/lfs/colm new file mode 100644 index 000000000..5a722ba5e --- /dev/null +++ b/lfs/colm @@ -0,0 +1,79 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.13.0.6 + +THISAPP = colm-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 16aaf566cbcfe9a06154e094638ac709 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-static + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 2a5584f1a..8c9fec6c3 100755 --- a/make.sh +++ b/make.sh @@ -1321,6 +1321,7 @@ buildipfire() { lfsmake2 jansson lfsmake2 yaml lfsmake2 libhtp + lfsmake2 colm lfsmake2 suricata lfsmake2 oinkmaster lfsmake2 ids-ruleset-sources