From patchwork Mon May 27 03:51:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 2267 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 4DF8B8AC1E9 for ; Sun, 26 May 2019 18:51:49 +0100 (BST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 45Bnjc0ffMz51tbj; Sun, 26 May 2019 18:51:48 +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 45BnjX6xnDz51tbj; Sun, 26 May 2019 18:51:44 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904rsa; t=1558893105; 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=iMg4te+t2iMHY3UAuptRwoCW0XyHBwayldua8gJ5FeE=; b=pkFnBKyDvbkttJosxaU6UqjneL51tFHOZli8dHTmJzwq8L9NBuSbCHk5eFjyqpbTtCwPyM zckLRsmI0DYzIIEYEIzVz7aaanuzFIrm49kY3aIlxczNuSnkzCDIFXuX8x6QMJkz2eoS5P HmYkfF9zAtJYQL6s7aAn9J/fhF3AkESc+d3l3TDAS+xYJ5hF9x6S7xUXatypiVpqDVdDil 3ezyZukNuM35aY09eo41qkKKngRgntn5Z14m+SRPfCJyr0AI86B/DQfoYRYn0/jNoWYOZD 7IKgFurgvgcFGk3BZgNjDKq+inJuKqs9Gp25XRf6fptDY/QyrDlXgU+rCnh0dg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904ed25519; t=1558893105; 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=iMg4te+t2iMHY3UAuptRwoCW0XyHBwayldua8gJ5FeE=; b=wbYeiW3oLN/OtdJ1J2hu4HIBtczfbuOSkJx1/M/OlOzgOW5Jm3LpI+QsGPhx3noUv35tJ3 PYvVWmHSfjCfqCBQ== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 1/2] jansson: Move to core system and update to 2.12 Date: Sun, 26 May 2019 19:51:39 +0200 Message-Id: <20190526175140.3231-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 Signed-off-by: Stefan Schantl --- config/rootfiles/{packages => common}/jansson | 2 +- lfs/jansson | 8 ++------ make.sh | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) rename config/rootfiles/{packages => common}/jansson (85%) diff --git a/config/rootfiles/packages/jansson b/config/rootfiles/common/jansson similarity index 85% rename from config/rootfiles/packages/jansson rename to config/rootfiles/common/jansson index 3901a0690..005bd2ce5 100644 --- a/config/rootfiles/packages/jansson +++ b/config/rootfiles/common/jansson @@ -4,5 +4,5 @@ #usr/lib/libjansson.la #usr/lib/libjansson.so usr/lib/libjansson.so.4 -usr/lib/libjansson.so.4.10.0 +usr/lib/libjansson.so.4.11.1 #usr/lib/pkgconfig/jansson.pc diff --git a/lfs/jansson b/lfs/jansson index 14c6a3ee3..2c95c62ef 100644 --- a/lfs/jansson +++ b/lfs/jansson @@ -24,17 +24,13 @@ include Config -VER = 2.10 +VER = 2.12 THISAPP = jansson-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = jansson -PAK_VER = 1 - -DEPS = "" ############################################################################### # Top-level Rules @@ -44,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 16a2c4e84c0a80ca61bd6e619a0f9358 +$(DL_FILE)_MD5 = 0ed1f3a924604aae68067c214b0010ef install : $(TARGET) diff --git a/make.sh b/make.sh index e70da788e..2a5584f1a 100755 --- a/make.sh +++ b/make.sh @@ -1318,6 +1318,7 @@ buildipfire() { lfsmake2 setserial lfsmake2 setup lfsmake2 libdnet + lfsmake2 jansson lfsmake2 yaml lfsmake2 libhtp lfsmake2 suricata @@ -1479,7 +1480,6 @@ buildipfire() { lfsmake2 watchdog lfsmake2 libpri lfsmake2 libsrtp - lfsmake2 jansson lfsmake2 asterisk lfsmake2 usb_modeswitch lfsmake2 usb_modeswitch_data