From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mail.openembedded.org (Postfix) with ESMTP id D179A7EEBB for ; Sun, 21 Jul 2019 16:39:31 +0000 (UTC) Received: by mail-pg1-f181.google.com with SMTP id l21so16489614pgm.3 for ; Sun, 21 Jul 2019 09:39:33 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=9XtDPz5YmCZLt/AHMQ+vpwfLk/gQ0z4wp6XHunk3zXA=; b=kO6kgyNcwpRh+uSNZ1RcxUb32E4v3ydfyBNlDYgcokcBl1kTMNwHB+9qRGPILREIXZ RZ6n9z2MHNUcz6FftLP3uuXijU1ph3GWojRijoLVnCBdPZ4IpRZm26Dl31aZgwSER0No P4uOyMwL79Q1omcA5yKngmxxpuWDcIfkoXULUgZZDK5t/HgeYNNPC5qMylwurZFcOYSm uig0WK7SiRmXO/iiGRF3DTBNmpDSfTm0FhFagsNeXxk2WLYPBeafe+D2JMLqCdDY2UD0 BriwBdol2yG03CBn9DT2cUSpTsDVrd8G5p6nzCsGnnzylB89F9373aiUeJPZI93H24qj HzSQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=9XtDPz5YmCZLt/AHMQ+vpwfLk/gQ0z4wp6XHunk3zXA=; b=sG8RWrHFQc1tk1Q1pW6l7dIecX+lBb1WSX9ChH00wad8qjWE9gTr5VkwHfvVaVS+y8 zARKmQYY+525Pw2rM/8P0NGCUkZ1JUOHdXaej6cZYdPW1dnRuVRjofOYJUnfKkY+4k5W enRqDBa6Tp8pgAfcK/xlhNMhBZOeEnQZdtmZRPggFyawxT3l3hfyJgO/XRCW/15K6YWe 7Y1WK6T5/YeuV7i9JlunxD5sndmCmxhevOrn+grUZuIgsmBUf+U7tEY4wbdbiqtkulIp y1oFI4tAgl1ZWxcyXLjjN3TRRlqfy3ywWDPNA79PjVaFpV16a7467OcX6LqX4Du/1ZI+ kU8Q== X-Gm-Message-State: APjAAAUyiAoDls6J+FNjl2UnkNkcQDcmGWAI/PLRSJ8UwF0WVNDdyKNf ocpe7vZaCMlMOZcs+/PKJ58hbscLb/0= X-Google-Smtp-Source: APXvYqyByUmqCLva/sf0i6UXuy8Z37RWsq+g46pwV/UPWrPNT7vlajxiTFoU/hEZY36geoBvwrEVjA== X-Received: by 2002:a63:5045:: with SMTP id q5mr58419393pgl.380.1563727172480; Sun, 21 Jul 2019 09:39:32 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id 35sm38763285pgw.91.2019.07.21.09.39.31 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 21 Jul 2019 09:39:32 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 21 Jul 2019 09:39:10 -0700 Message-Id: <20190721163919.32659-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190721163919.32659-1-raj.khem@gmail.com> References: <20190721163919.32659-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [meta-networking][PATCH 05/14] firewalld: Update to 0.6.3->0.6.4 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jul 2019 16:39:31 -0000 Content-Transfer-Encoding: 8bit Forward port patch to work with 0.6.4 and update the status Signed-off-by: Khem Raj --- ...a-separate-directory-outside-the-sou.patch | 19 +++++-------------- ...{firewalld_0.6.3.bb => firewalld_0.6.4.bb} | 8 ++++---- 2 files changed, 9 insertions(+), 18 deletions(-) rename meta-networking/recipes-connectivity/firewalld/{firewalld_0.6.3.bb => firewalld_0.6.4.bb} (93%) diff --git a/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch b/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch index 3f34ff2e4c..28d5902429 100644 --- a/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch +++ b/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch @@ -1,10 +1,8 @@ firewalld: fix building in a separate directory outside the source tree -Upstream-Status: Submitted [https://github.com/firewalld/firewalld/pull/456] +Upstream-Status: Accepted [https://github.com/firewalld/firewalld/pull/456] Signed-off-by: Dan Callaghan -diff --git a/config/Makefile.am b/config/Makefile.am -index 7048d2ee..5270d408 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -377,11 +377,11 @@ install-config: @@ -24,8 +22,6 @@ index 7048d2ee..5270d408 100644 uninstall-config: rmdir $(DESTDIR)$(sconfdir)/icmptypes -diff --git a/doc/xml/Makefile.am b/doc/xml/Makefile.am -index 8c93ab9c..d0313e3e 100644 --- a/doc/xml/Makefile.am +++ b/doc/xml/Makefile.am @@ -69,7 +69,8 @@ edit = sed \ @@ -38,25 +34,23 @@ index 8c93ab9c..d0313e3e 100644 transform-man.xsl: transform-man.xsl.in $(edit) $< >$@ -diff --git a/doc/xml/firewall-cmd.xml.in b/doc/xml/firewall-cmd.xml.in -index c2606553..24d77858 100644 --- a/doc/xml/firewall-cmd.xml.in +++ b/doc/xml/firewall-cmd.xml.in -@@ -1,9 +1,9 @@ +@@ -1,10 +1,10 @@ - - +- + + + - ++ ]> -diff --git a/doc/xml/firewalld.xml.in b/doc/xml/firewalld.xml.in -index de802059..3d319b04 100644 +