From patchwork Sat Apr 6 21:10:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1079602 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="a1xx6JUb"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44c8Tr61PSz9sPS for ; Sun, 7 Apr 2019 07:10:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 835B4879FD; Sat, 6 Apr 2019 21:10:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9SvvaoE+pQYA; Sat, 6 Apr 2019 21:10:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 429CF879CF; Sat, 6 Apr 2019 21:10:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3919B1BF336 for ; Sat, 6 Apr 2019 21:10:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3699286054 for ; Sat, 6 Apr 2019 21:10:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Zq7tv9JO4C1a for ; Sat, 6 Apr 2019 21:10:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 33A1286027 for ; Sat, 6 Apr 2019 21:10:18 +0000 (UTC) Received: by mail-wm1-f42.google.com with SMTP id z24so10715432wmi.5 for ; Sat, 06 Apr 2019 14:10:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Z9z8quPc4DgFzDSctkq4UoBZjrG6GBRkfYcwsGpJio0=; b=a1xx6JUbQONnIsm0292EuorPH0gQeLB+1qrCQXKVfUQ/f21ht+oGMrL/Rbh77B58CP PfOdkxCp/P9xDAx8HXU1yDb0k0JuaMESHoeMbwzjU+D4WXllRQhYdNr1vgOEIxxDwrk0 AoLyMLAGXglDB70G7K92w1vXkywe9NTgwOo8hhWgf+/25W8W0//bs4DTyZVDWj6w8dBU lcs7F5vaKD7kr/rl+UJVqCRzbiPqCNjtX9pAhQc+SlrWht8sVV5PLUVYaPho7n3OV9ni jp+/Aujv+mvwfZxSiqLkzWKZBvVUih1TolPg8jizwNs998xJtsNqAa4xzP8MDiji7hnA Lomw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Z9z8quPc4DgFzDSctkq4UoBZjrG6GBRkfYcwsGpJio0=; b=Q/G4N1hycTYu47A877h72COE/jXoAcsDzki0qOHGVbq3Idi6D6b84KV9+SDYIziPhc /jfW/Gt//ASVMj0trH+hG0APMSzg6vpx4w4SVUgtUOoYUMTyLSwcRAyeG5zL1p8CXBny B0EQrQzLGAZHlqLhC9+73lTLHMS/z9RS+yNpvH3s/dh18jp1JBriQxtP37pRxwm3BbeH 6gU8YBR9dfv2UajTII7Aa/hNseEzIWgybrXh0Su24KVL50ql/OEhRqTVtsx5D++lXtSh Kr70fIxkq6ocWTrmmXohnK+qmQ68nfk27tRx1tmNPd7QU4Q8sqFcX7WgF/e5n2Qx8KBz iNnA== X-Gm-Message-State: APjAAAXa39F9UwJkHxBdrd/c3p9u4U89b9BDUXyTc6LZ9mJ65tT2vfua WwXSVmIqs9XlnKYTfEYyqLNS+bqe X-Google-Smtp-Source: APXvYqyaYQmg0MZSbFm2K/sPrJs36r9YZQjKKKCYozTtvYNTB6uk7z5iRVBL+XD2FsZire52qNZNSQ== X-Received: by 2002:a1c:495:: with SMTP id 143mr11472140wme.78.1554585016336; Sat, 06 Apr 2019 14:10:16 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id v16sm49481580wro.48.2019.04.06.14.10.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Apr 2019 14:10:15 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 6 Apr 2019 23:10:10 +0200 Message-Id: <20190406211010.7676-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/mxml: bump to version 3.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Remove patch (already in version) - Add hash for license files - Change license to "Apache-2.0 with exceptions", see: https://github.com/michaelrsweet/mxml/commit/f166ad1977f2f13295689772a5d9e442f73d46f1 Signed-off-by: Fabrice Fontaine --- .../0001-fix-cross-target-installation.patch | 55 ------------------- package/mxml/mxml.hash | 6 +- package/mxml/mxml.mk | 8 +-- 3 files changed, 7 insertions(+), 62 deletions(-) delete mode 100644 package/mxml/0001-fix-cross-target-installation.patch diff --git a/package/mxml/0001-fix-cross-target-installation.patch b/package/mxml/0001-fix-cross-target-installation.patch deleted file mode 100644 index 3a9fa0c0cf..0000000000 --- a/package/mxml/0001-fix-cross-target-installation.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Baruch Siach -Subject: [PATCH] mxml: workaround for cross build - -The added patch is a workaround for cross build as follows: - - * disable run of a test binary at build time - * disable generation of documentation using the mxmldoc binary - * remove now non-existent entries from the install target - * disable strip when running install - -Signed-off-by: Baruch Siach ---- -diff -Nuar mxml-2.7-orig/Makefile.in mxml-2.7/Makefile.in ---- mxml-2.7-orig/Makefile.in 2011-04-13 18:43:32.000000000 +0300 -+++ mxml-2.7/Makefile.in 2012-05-16 07:21:42.677220980 +0300 -@@ -57,7 +57,7 @@ - # Install commands... - # - --INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 -s -+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 - INSTALL_DATA = $(INSTALL) -m 644 - INSTALL_DIR = $(INSTALL) -d - INSTALL_LIB = $(LIBTOOL) $(INSTALL) -m 755 -@@ -88,7 +88,7 @@ - mxml-index.o mxml-node.o mxml-search.o mxml-set.o - LIBOBJS = $(PUBLIBOBJS) mxml-private.o mxml-string.o - OBJS = mxmldoc.o testmxml.o $(LIBOBJS) --TARGETS = $(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man -+TARGETS = $(LIBMXML) libmxml.a - - - # -@@ -140,9 +140,6 @@ - # - - install: $(TARGETS) install-$(LIBMXML) install-libmxml.a -- echo Installing mxmldoc in $(BUILDROOT)$(bindir)... -- $(INSTALL_DIR) $(BUILDROOT)$(bindir) -- $(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) - echo Installing documentation in $(BUILDROOT)$(docdir)... - $(INSTALL_DIR) $(BUILDROOT)$(docdir) - for file in $(DOCFILES); do \ -@@ -154,11 +151,6 @@ - echo Installing pkgconfig files in $(BUILDROOT)$(libdir)/pkgconfig... - $(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig - $(INSTALL_DATA) mxml.pc $(BUILDROOT)$(libdir)/pkgconfig -- echo Installing man pages in $(BUILDROOT)$(mandir)... -- $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1 -- $(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.1 -- $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3 -- $(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3 - - install-libmxml.a: - echo Installing libmxml.a to $(BUILDROOT)$(libdir)... diff --git a/package/mxml/mxml.hash b/package/mxml/mxml.hash index 90392755ba..3895dcfb24 100644 --- a/package/mxml/mxml.hash +++ b/package/mxml/mxml.hash @@ -1,4 +1,4 @@ -# From http://www.msweet.org/downloads.php?L+Z3 -md5 8804c961a24500a95690ef287d150abe mxml-2.10.tar.gz # Locally computed -sha256 267ff58b64ddc767170d71dab0c729c06f45e1df9a9b6f75180b564f09767891 mxml-2.10.tar.gz +sha256 88f05b3318f29ef6164d99c34b7dced76440c4a99106866b76b7fb729dc8310e mxml-3.0.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE +sha256 63cc06ba05adecb1fdf2c94460a98291fd71614865456e52a19a1e7cc674250f NOTICE diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk index ac270bd1bb..157c644a69 100644 --- a/package/mxml/mxml.mk +++ b/package/mxml/mxml.mk @@ -4,10 +4,10 @@ # ################################################################################ -MXML_VERSION = 2.10 -MXML_SITE = https://github.com/michaelrsweet/mxml/releases/download/release-$(MXML_VERSION) -MXML_LICENSE = LGPL-2.0+ with exceptions -MXML_LICENSE_FILES = COPYING +MXML_VERSION = 3.0 +MXML_SITE = https://github.com/michaelrsweet/mxml/releases/download/v$(MXML_VERSION) +MXML_LICENSE = Apache-2.0 with exceptions +MXML_LICENSE_FILES = LICENSE NOTICE MXML_INSTALL_STAGING = YES MXML_INSTALL_STAGING_OPTS = DSTROOT=$(STAGING_DIR) install