<div><br></div><div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Nov 21, 2019 at 7:02 AM Richard Purdie <<a href="mailto:richard.purdie@linuxfoundation.org">richard.purdie@linuxfoundation.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Richard Purdie <<a href="mailto:richard.purdie@linuxfoundation.org" target="_blank">richard.purdie@linuxfoundation.org</a>><br>
---<br>
.../opkg/opkg/open_inner.patch | 150 ++++++++++++++++<br>
.../opkg/opkg/opkg_archive.patch | 160 ++++++++++++++++++<br>
meta/recipes-devtools/opkg/<a href="http://opkg_0.4.1.bb" rel="noreferrer" target="_blank">opkg_0.4.1.bb</a> | 2 +<br>
3 files changed, 312 insertions(+)<br>
create mode 100644 meta/recipes-devtools/opkg/opkg/open_inner.patch<br>
create mode 100644 meta/recipes-devtools/opkg/opkg/opkg_archive.patch<br>
<br>
diff --git a/meta/recipes-devtools/opkg/opkg/open_inner.patch b/meta/recipes-devtools/opkg/opkg/open_inner.patch<br>
new file mode 100644<br>
index 00000000000..9edccda33ea<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/opkg/opkg/open_inner.patch<br>
@@ -0,0 +1,150 @@<br>
+From <a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a> Wed Nov 20 22:35:02 2019<br>
+Return-Path: <richard.purdie+caf_=rpurdie=<a href="mailto:rpsys.net@linuxfoundation.org" target="_blank">rpsys.net@linuxfoundation.org</a>><br>
+X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on <a href="http://dan.rpsys.net" rel="noreferrer" target="_blank">dan.rpsys.net</a><br>
+X-Spam-Level: <br>
+X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,<br>
+ HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,<br>
+ SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2<br>
+Received: from <a href="http://mail-vs1-f54.google.com" rel="noreferrer" target="_blank">mail-vs1-f54.google.com</a> (<a href="http://mail-vs1-f54.google.com" rel="noreferrer" target="_blank">mail-vs1-f54.google.com</a><br>
+ [209.85.217.54]) by <a href="http://dan.rpsys.net" rel="noreferrer" target="_blank">dan.rpsys.net</a> (8.15.2/8.15.2/Debian-10) with ESMTPS id<br>
+ xAKMZ0Lh008396 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128<br>
+ verify=NOT) for <<a href="mailto:rpurdie@rpsys.net" target="_blank">rpurdie@rpsys.net</a>>; Wed, 20 Nov 2019 22:35:02 GMT<br>
+Received: by <a href="http://mail-vs1-f54.google.com" rel="noreferrer" target="_blank">mail-vs1-f54.google.com</a> with SMTP id a143so842733vsd.9<br>
+ for <<a href="mailto:rpurdie@rpsys.net" target="_blank">rpurdie@rpsys.net</a>>; Wed, 20 Nov 2019 14:35:02 -0800 (PST)<br>
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=<a href="http://1e100.net" rel="noreferrer" target="_blank">1e100.net</a>;<br>
+ s=20161025;<br>
+ h=x-original-authentication-results:x-gm-message-state:delivered-to<br>
+ :from:to:cc:subject:date:message-id:in-reply-to:references<br>
+ :mime-version:content-transfer-encoding;<br>
+ bh=KhZ2BZSLg854tEjeyRybBtwjcbtPiM0dOPJA6ODniyc=;<br>
+ b=gWeCNByEKyLw0dgzMAzHowAbjPywF8aHCjjjDOeFB/48Lr/e3A42S47HsxON9j+BoP<br>
+ Ai2HT0MOqAIRWqz3tQM/1Q9mXOy0PNU2Dqpzu5u7QCZeoFX1XpXH0hbVn+JOdg3bcPwn<br>
+ Nm+A/vS1By4S8c0EGQ+JQ6EBMc4xtpG8rOKiPuAtj5FlRVIQ1/AM8fEMrtQfFemBbIoO<br>
+ KhGQVSmXg9CQKzPBoFR+IgiiKuUJjKBAcz7gzvQjJ6y/sCKUtk3FE8QUNeGqMGQXkD1/<br>
+ XEWZq2qLjkEezUbqW+ixeaWUlN7EqTn0YT+g5sO9tEL4xoUR3w9KwCkdwOvUlgEftbUB aPCA==<br>
+X-Original-Authentication-Results: <a href="http://mx.google.com" rel="noreferrer" target="_blank">mx.google.com</a>; spf=pass<br>
+ (<a href="http://google.com" rel="noreferrer" target="_blank">google.com</a>: domain of prvs=222760f524=<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a><br>
+ designates 148.163.156.75 as permitted sender)<br>
+ smtp.mailfrom="prvs=222760f524=<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a>"; <br>
+ dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=<a href="http://ni.com" rel="noreferrer" target="_blank">ni.com</a><br>
+X-Gm-Message-State:<br>
+ APjAAAWPWaQQBF8I9vWh3dmrrR3q+FLW/OiQFoIv220MYnIHfdNqqufD<br>
+ I54SM2ZkAI8VGILL5cnno25yyFO4MmqyzLBlkBkUHPoMGpk1l8U6Gg==<br>
+X-Received: by 2002:a67:f649:: with SMTP id<br>
+ u9mr3437665vso.20.1574289295541; Wed, 20 Nov 2019 14:34:55 -0800 (PST)<br>
+X-Forwarded-To: <a href="mailto:rpurdie@rpsys.net" target="_blank">rpurdie@rpsys.net</a><br>
+X-Forwarded-For: <a href="mailto:richard.purdie@linuxfoundation.org" target="_blank">richard.purdie@linuxfoundation.org</a> <a href="mailto:rpurdie@rpsys.net" target="_blank">rpurdie@rpsys.net</a><br>
+Delivered-To: <a href="mailto:richard.purdie@linuxfoundation.org" target="_blank">richard.purdie@linuxfoundation.org</a><br>
+Received: by 2002:a67:ca9b:0:0:0:0:0 with SMTP id a27csp2232978vsl;<br>
+ Wed, 20 Nov 2019 14:34:53 -0800 (PST)<br>
+X-Google-Smtp-Source:<br>
+ APXvYqzu0124T/A2v8nyGwvi00K3wFZx5WfkgZyaqKf27zfmydLbudST3y3wGviqkEtUN4fkFdsl<br>
+X-Received: by 2002:a17:902:d901:: with SMTP id<br>
+ c1mr5251580plz.93.1574289293448; Wed, 20 Nov 2019 14:34:53 -0800 (PST)<br>
+ARC-Seal: i=1; a=rsa-sha256; t=1574289293; cv=none; d=<a href="http://google.com" rel="noreferrer" target="_blank">google.com</a>;<br>
+ s=arc-20160816;<br>
+ b=wICD7meblSbVcD2gv1eC5y6GdeaaEHOHrP5D7it3PNtBwqNTqRmU1F8UJWdOdmsbKu<br>
+ JSKc9assSlXVI9F7Bu+ZsczsEbA9MqWxKmgPLS5YHVTCMU3QRwTX1uLMtdeEUmCDo2+N<br>
+ edCAO1bdrNbsM1Yhu/7nur8mBRrmcP/2uq4cgvfV03/1i1x3YiRiLmEj/WaU1V2oGzjL<br>
+ F8lQpfIQIcIbX0dlq28GnJKntNSDe++OMLBwlhxY5FR+lCaXhf91kw/WndILbB99U0yf<br>
+ 6FkzOxwcTbLLahDdHDgVmtk+grUVcz0N7HnRM5Wj8FqAmbtetw/NnWovsUMUlbQRvQm5 /xKA==<br>
+ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=<a href="http://google.com" rel="noreferrer" target="_blank">google.com</a>;<br>
+ s=arc-20160816;<br>
+ h=content-transfer-encoding:mime-version:references:in-reply-to<br>
+ :message-id:date:subject:cc:to:from;<br>
+ bh=KhZ2BZSLg854tEjeyRybBtwjcbtPiM0dOPJA6ODniyc=;<br>
+ b=MIgWm3wUiLmTZuhjNXKsih84SdE0NfFoXpMJqshToFqGG8ElxCzyorlvK+0PGjN428<br>
+ O/vMXpqOqd1iR6IZ9/wEb3JsHOrOxNWFwA1MVp/QkSKQwhjvRNl62i5C7fl7idVwuUl/<br>
+ 7EZJZ4ZYTXEGUv+wIUuij+MAffGrqQDg0Ubd9ccVymjPA6nDLryHEbWrUepJVnKPd3nQ<br>
+ iJxxkYgBP8QP3Aq/a3QNxqxXdMilrGeMljx0wpWwKqkBEvC913vISPJZ0nLbxglYzebM<br>
+ K3B2Ksf4Ct7C/dXPAUjkt5mtLDYT6mZ7v8oFesgsbxvIHlKe6CCry0a5wYUqaSvfElfY V6kA==<br>
+ARC-Authentication-Results: i=1; <a href="http://mx.google.com" rel="noreferrer" target="_blank">mx.google.com</a>; spf=pass (<a href="http://google.com" rel="noreferrer" target="_blank">google.com</a>:<br>
+ domain of prvs=222760f524=<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a> designates<br>
+ 148.163.156.75 as permitted sender)<br>
+ smtp.mailfrom="prvs=222760f524=<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a>"; dmarc=pass<br>
+ (p=NONE sp=NONE dis=NONE) header.from=<a href="http://ni.com" rel="noreferrer" target="_blank">ni.com</a><br>
+Received: from <a href="http://mx0b-00010702.pphosted.com" rel="noreferrer" target="_blank">mx0b-00010702.pphosted.com</a> (<a href="http://mx0a-00010702.pphosted.com" rel="noreferrer" target="_blank">mx0a-00010702.pphosted.com</a>.<br>
+ [148.163.156.75]) by <a href="http://mx.google.com" rel="noreferrer" target="_blank">mx.google.com</a> with ESMTPS id<br>
+ 4si680517plb.245.2019.11.20.14.34.53 for<br>
+ <<a href="mailto:richard.purdie@linuxfoundation.org" target="_blank">richard.purdie@linuxfoundation.org</a>> (version=TLS1_2<br>
+ cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Nov 2019 14:34:53<br>
+ -0800 (PST)<br>
+Received-SPF: pass (<a href="http://google.com" rel="noreferrer" target="_blank">google.com</a>: domain of<br>
+ prvs=222760f524=<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a> designates 148.163.156.75 as<br>
+ permitted sender) client-ip=148.163.156.75;<br>
+Authentication-Results: <a href="http://mx.google.com" rel="noreferrer" target="_blank">mx.google.com</a>; spf=pass (<a href="http://google.com" rel="noreferrer" target="_blank">google.com</a>: domain of<br>
+ prvs=222760f524=<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a> designates 148.163.156.75 as<br>
+ permitted sender)<br>
+ smtp.mailfrom="prvs=222760f524=<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a>"; dmarc=pass<br>
+ (p=NONE sp=NONE dis=NONE) header.from=<a href="http://ni.com" rel="noreferrer" target="_blank">ni.com</a><br>
+Received: from pps.filterd (<a href="http://m0098781.ppops.net" rel="noreferrer" target="_blank">m0098781.ppops.net</a> [127.0.0.1]) by<br>
+ <a href="http://mx0a-00010702.pphosted.com" rel="noreferrer" target="_blank">mx0a-00010702.pphosted.com</a> (<a href="http://8.16.0.42/8.16.0.42" rel="noreferrer" target="_blank">8.16.0.42/8.16.0.42</a>) with SMTP id<br>
+ xAKMRxBj018942; Wed, 20 Nov 2019 16:34:52 -0600<br>
+Received: from <a href="http://ni.com" rel="noreferrer" target="_blank">ni.com</a> (<a href="http://skprod3.natinst.com" rel="noreferrer" target="_blank">skprod3.natinst.com</a> [130.164.80.24])<br>
+ by <a href="http://mx0a-00010702.pphosted.com" rel="noreferrer" target="_blank">mx0a-00010702.pphosted.com</a> with ESMTP id 2wae13ps20-1<br>
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);<br>
+ Wed, 20 Nov 2019 16:34:52 -0600<br>
+Received: from <a href="http://us-aus-exch2.ni.corp.natinst.com" rel="noreferrer" target="_blank">us-aus-exch2.ni.corp.natinst.com</a><br>
+ (<a href="http://us-aus-exch2.ni.corp.natinst.com" rel="noreferrer" target="_blank">us-aus-exch2.ni.corp.natinst.com</a> [130.164.68.12]) by<br>
+ <a href="http://us-aus-skprod3.natinst.com" rel="noreferrer" target="_blank">us-aus-skprod3.natinst.com</a> (<a href="http://8.16.0.27/8.16.0.27" rel="noreferrer" target="_blank">8.16.0.27/8.16.0.27</a>) with ESMTPS id<br>
+ xAKMYpHv003993 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256<br>
+ verify=NOT); Wed, 20 Nov 2019 16:34:51 -0600<br>
+Received: from <a href="http://us-aus-exhub1.ni.corp.natinst.com" rel="noreferrer" target="_blank">us-aus-exhub1.ni.corp.natinst.com</a> (130.164.68.41) by<br>
+ <a href="http://us-aus-exch2.ni.corp.natinst.com" rel="noreferrer" target="_blank">us-aus-exch2.ni.corp.natinst.com</a> (130.164.68.12) with Microsoft SMTP Server<br>
+ (TLS) id 15.0.1395.4; Wed, 20 Nov 2019 16:34:51 -0600<br>
+Received: from <a href="http://delcastillo3.natinst.com" rel="noreferrer" target="_blank">delcastillo3.natinst.com</a> (172.18.68.32) by<br>
+ <a href="http://us-aus-exhub1.ni.corp.natinst.com" rel="noreferrer" target="_blank">us-aus-exhub1.ni.corp.natinst.com</a> (130.164.68.41) with Microsoft SMTP<br>
+ Server id 15.0.1395.4 via Frontend Transport; Wed, 20 Nov 2019 16:34:51<br>
+ -0600<br>
+From: Alejandro del Castillo <<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a>><br>
+To: <<a href="mailto:opkg-devel@googlegroups.com" target="_blank">opkg-devel@googlegroups.com</a>>, <<a href="mailto:richard.purdie@linuxfoundation.org" target="_blank">richard.purdie@linuxfoundation.org</a>><br>
+CC: Alejandro del Castillo <<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a>><br>
+Subject: [opkg][PATCH 2/2] open_inner: add support for empty payloads<br>
+Date: Wed, 20 Nov 2019 16:34:48 -0600<br>
+Message-ID: <<a href="mailto:20191120223448.26522-3-alejandro.delcastillo@ni.com" target="_blank">20191120223448.26522-3-alejandro.delcastillo@ni.com</a>><br>
+X-Mailer: git-send-email 2.22.0<br>
+In-Reply-To: <<a href="mailto:20191120223448.26522-1-alejandro.delcastillo@ni.com" target="_blank">20191120223448.26522-1-alejandro.delcastillo@ni.com</a>><br>
+References: <<a href="mailto:20191120223448.26522-1-alejandro.delcastillo@ni.com" target="_blank">20191120223448.26522-1-alejandro.delcastillo@ni.com</a>><br>
+MIME-Version: 1.0<br>
+Content-Type: text/plain<br>
+X-Proofpoint-Virus-Version: vendor=fsecure<br>
+ engine=2.50.10434:6.0.95,18.0.572<br>
+ definitions=2019-11-20_07:2019-11-20,2019-11-20 signatures=0<br>
+X-Proofpoint-Spam-Reason: safe<br>
+X-Virus-Scanned: clamav-milter 0.101.4 at dan<br>
+X-Virus-Status: Clean<br>
+X-Evolution-Source: 1525863794.3857.16@hex<br>
+Content-Transfer-Encoding: 8bit</blockquote><div dir="auto"><br></div><div dir="auto">Perhaps this raw mail header can be removed it seems to add no value moreover is distracting </div><div dir="auto"><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
+<br>
+Support for empty compressed payloads need to be explicitly enabled on<br>
+libarchive.<br>
+<br>
+Signed-off-by: Alejandro del Castillo <<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a>><br>
+<br>
+Upstream-Status: Backport<br>
+---<br>
+ libopkg/opkg_archive.c | 7 +++++++<br>
+ 1 file changed, 7 insertions(+)<br>
+<br>
+diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c<br>
+index 0e9ccea..f19cece 100644<br>
+--- a/libopkg/opkg_archive.c<br>
++++ b/libopkg/opkg_archive.c<br>
+@@ -618,6 +618,13 @@ static struct archive *open_inner(struct archive *outer)<br>
+ goto err_cleanup;<br>
+ }<br>
+ <br>
++ r = archive_read_support_format_empty(inner);<br>
++ if (r != ARCHIVE_OK) {<br>
++ opkg_msg(ERROR, "Empty format not supported: %s\n",<br>
++ archive_error_string(inner));<br>
++ goto err_cleanup;<br>
++ }<br>
++<br>
+ r = archive_read_open(inner, data, NULL, inner_read, inner_close);<br>
+ if (r != ARCHIVE_OK) {<br>
+ opkg_msg(ERROR, "Failed to open inner archive: %s\n",<br>
+-- <br>
+2.22.0<br>
+<br>
+<br>
diff --git a/meta/recipes-devtools/opkg/opkg/opkg_archive.patch b/meta/recipes-devtools/opkg/opkg/opkg_archive.patch<br>
new file mode 100644<br>
index 00000000000..56a275a2342<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/opkg/opkg/opkg_archive.patch<br>
@@ -0,0 +1,160 @@<br>
+From <a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a> Wed Nov 20 22:35:01 2019<br>
+Return-Path: <richard.purdie+caf_=rpurdie=<a href="mailto:rpsys.net@linuxfoundation.org" target="_blank">rpsys.net@linuxfoundation.org</a>><br>
+X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on <a href="http://dan.rpsys.net" rel="noreferrer" target="_blank">dan.rpsys.net</a><br>
+X-Spam-Level: <br>
+X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,<br>
+ HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,<br>
+ SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2<br>
+Received: from <a href="http://mail-ua1-f41.google.com" rel="noreferrer" target="_blank">mail-ua1-f41.google.com</a> (<a href="http://mail-ua1-f41.google.com" rel="noreferrer" target="_blank">mail-ua1-f41.google.com</a><br>
+ [209.85.222.41]) by <a href="http://dan.rpsys.net" rel="noreferrer" target="_blank">dan.rpsys.net</a> (8.15.2/8.15.2/Debian-10) with ESMTPS id<br>
+ xAKMZ0gk008395 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128<br>
+ verify=NOT) for <<a href="mailto:rpurdie@rpsys.net" target="_blank">rpurdie@rpsys.net</a>>; Wed, 20 Nov 2019 22:35:01 GMT<br>
+Received: by <a href="http://mail-ua1-f41.google.com" rel="noreferrer" target="_blank">mail-ua1-f41.google.com</a> with SMTP id p18so339793uar.7<br>
+ for <<a href="mailto:rpurdie@rpsys.net" target="_blank">rpurdie@rpsys.net</a>>; Wed, 20 Nov 2019 14:35:01 -0800 (PST)<br>
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=<a href="http://1e100.net" rel="noreferrer" target="_blank">1e100.net</a>;<br>
+ s=20161025;<br>
+ h=x-original-authentication-results:x-gm-message-state:delivered-to<br>
+ :from:to:cc:subject:date:message-id:in-reply-to:references<br>
+ :mime-version:content-transfer-encoding;<br>
+ bh=Y9OOjY7NCD3Wm+XzvK+9TzmDhgbtPVQl7aMAusdzDho=;<br>
+ b=XjoAkiz0bsIvromNySMA4g4jfIJopfXAr8WYyCO5/I74DxBvUelc2e/2DyZYt5VYuW<br>
+ NaMD9rSCOk9gn+ld+INdJmH3ceuPGZm1Y4kgLVCTL7IknlPWjuJtWL599/8lrn4uhVWD<br>
+ cOwFsyu09EPjYvGzwjqxqf8Wca+HgymmDV/vor92kqu2trl8CsWC835pFG0a8/B4rAYH<br>
+ hOMhvqeU+UrkMe5iyIzB4L6nBX3Gwwgt8EI+W2mgWh6W8HwLfdrv9IOKWj00V98xU9Nn<br>
+ gUEGsCeQa1/bo5qYY1Z/w/lotR0vVJu6B+w/V/d/cniuciVnsEyfEQmBjebT8746mzz+ dTnw==<br>
+X-Original-Authentication-Results: <a href="http://mx.google.com" rel="noreferrer" target="_blank">mx.google.com</a>; spf=pass<br>
+ (<a href="http://google.com" rel="noreferrer" target="_blank">google.com</a>: domain of prvs=222760f524=<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a><br>
+ designates 148.163.156.75 as permitted sender)<br>
+ smtp.mailfrom="prvs=222760f524=<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a>"; <br>
+ dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=<a href="http://ni.com" rel="noreferrer" target="_blank">ni.com</a><br>
+X-Gm-Message-State:<br>
+ APjAAAX1zcx9B1j4E7KLRgNh2OtNUmWztKYgWCXumfNL62Clsc75k1g+<br>
+ 8eUvzPiRBh6riiNx3HKjZJOp30ExyEMZgztnyB9JpBxhwfzt2ttNog==<br>
+X-Received: by 2002:ab0:2618:: with SMTP id<br>
+ c24mr3345925uao.75.1574289294734; Wed, 20 Nov 2019 14:34:54 -0800 (PST)<br>
+X-Forwarded-To: <a href="mailto:rpurdie@rpsys.net" target="_blank">rpurdie@rpsys.net</a><br>
+X-Forwarded-For: <a href="mailto:richard.purdie@linuxfoundation.org" target="_blank">richard.purdie@linuxfoundation.org</a> <a href="mailto:rpurdie@rpsys.net" target="_blank">rpurdie@rpsys.net</a><br>
+Delivered-To: <a href="mailto:richard.purdie@linuxfoundation.org" target="_blank">richard.purdie@linuxfoundation.org</a><br>
+Received: by 2002:a67:ca9b:0:0:0:0:0 with SMTP id a27csp2232973vsl;<br>
+ Wed, 20 Nov 2019 14:34:53 -0800 (PST)<br>
+X-Google-Smtp-Source:<br>
+ APXvYqyxMeKT9TRfjbvSZeBERtCkHKj+Y0dywybZSRWjh2KpKGAS3ujTon8MetFDJPz/XaV9C4CN<br>
+X-Received: by 2002:a17:902:8bc9:: with SMTP id<br>
+ r9mr4994639plo.319.1574289293016; Wed, 20 Nov 2019 14:34:53 -0800 (PST)<br>
+ARC-Seal: i=1; a=rsa-sha256; t=1574289293; cv=none; d=<a href="http://google.com" rel="noreferrer" target="_blank">google.com</a>;<br>
+ s=arc-20160816;<br>
+ b=04u3YSzfPN0+WkK0LLFKW07PbOQyk5T2b4rCKit5CG/Ec1pY+E6UTqRdu/fbhIJ2Xo<br>
+ qmpdqhcieKhtvY5kx+S28NLXszEPZcAIjNnXepU1qvTZXnCkNfXyJFSPGLDmLTGLEdUB<br>
+ TktdoM4IjNjOx4qwRnqdTdLV66cWGB7ojNTAih6qYb0t+2fgv70uiElgjxiTfhNTke22<br>
+ GaSyUo4vnzAekGOVPJwLqqS7gkElQro7NM2rlW2J3UEWyrMy0Gj4BuVFszxzAu8mazqT<br>
+ XtrsWLuzSGRjYA2EtNj8+62lABsaWuxPy5x/9VX8bblNZIu2GqaHC/AO0nQkDqf8cX9q TmiA==<br>
+ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=<a href="http://google.com" rel="noreferrer" target="_blank">google.com</a>;<br>
+ s=arc-20160816;<br>
+ h=content-transfer-encoding:mime-version:references:in-reply-to<br>
+ :message-id:date:subject:cc:to:from;<br>
+ bh=Y9OOjY7NCD3Wm+XzvK+9TzmDhgbtPVQl7aMAusdzDho=;<br>
+ b=mRussZx0Qx8Lxch1ZO1ZDWs4BKZNLsgzwIdr1z6rVp7/cI+CPBebzvrEPoqBji+ta6<br>
+ m1gpgsPum3Vg3JHHvFCNz/Pon4ygv4KIVSphBcgjti+2qnoRn48H4YvCirHZ4mDR6h3u<br>
+ rhl6Ojls0KI0YIiidpTRphIbS0vpBbkI/PUGkfVJzxQaEYuJa4TIQq2bmsrCImVwuBZs<br>
+ t2ktebY1vt+ZBKPVq43CsAiMl1Srr/50sBhOk5NFkiaBVDJQzIj1kI7bnU3zktBaGdOK<br>
+ 1jDpOoOnBV3SVe2M8eb38+Ge8AdL4jdMVGbdXfzXUWvF1eNgZRmkQVe1mRw4SwBnPsgs f64g==<br>
+ARC-Authentication-Results: i=1; <a href="http://mx.google.com" rel="noreferrer" target="_blank">mx.google.com</a>; spf=pass (<a href="http://google.com" rel="noreferrer" target="_blank">google.com</a>:<br>
+ domain of prvs=222760f524=<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a> designates<br>
+ 148.163.156.75 as permitted sender)<br>
+ smtp.mailfrom="prvs=222760f524=<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a>"; dmarc=pass<br>
+ (p=NONE sp=NONE dis=NONE) header.from=<a href="http://ni.com" rel="noreferrer" target="_blank">ni.com</a><br>
+Received: from <a href="http://mx0b-00010702.pphosted.com" rel="noreferrer" target="_blank">mx0b-00010702.pphosted.com</a> (<a href="http://mx0a-00010702.pphosted.com" rel="noreferrer" target="_blank">mx0a-00010702.pphosted.com</a>.<br>
+ [148.163.156.75]) by <a href="http://mx.google.com" rel="noreferrer" target="_blank">mx.google.com</a> with ESMTPS id<br>
+ 21si715567pgq.469.2019.11.20.14.34.52 for<br>
+ <<a href="mailto:richard.purdie@linuxfoundation.org" target="_blank">richard.purdie@linuxfoundation.org</a>> (version=TLS1_2<br>
+ cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Nov 2019 14:34:53<br>
+ -0800 (PST)<br>
+Received-SPF: pass (<a href="http://google.com" rel="noreferrer" target="_blank">google.com</a>: domain of<br>
+ prvs=222760f524=<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a> designates 148.163.156.75 as<br>
+ permitted sender) client-ip=148.163.156.75;<br>
+Authentication-Results: <a href="http://mx.google.com" rel="noreferrer" target="_blank">mx.google.com</a>; spf=pass (<a href="http://google.com" rel="noreferrer" target="_blank">google.com</a>: domain of<br>
+ prvs=222760f524=<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a> designates 148.163.156.75 as<br>
+ permitted sender)<br>
+ smtp.mailfrom="prvs=222760f524=<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a>"; dmarc=pass<br>
+ (p=NONE sp=NONE dis=NONE) header.from=<a href="http://ni.com" rel="noreferrer" target="_blank">ni.com</a><br>
+Received: from pps.filterd (<a href="http://m0098780.ppops.net" rel="noreferrer" target="_blank">m0098780.ppops.net</a> [127.0.0.1]) by<br>
+ <a href="http://mx0a-00010702.pphosted.com" rel="noreferrer" target="_blank">mx0a-00010702.pphosted.com</a> (<a href="http://8.16.0.42/8.16.0.42" rel="noreferrer" target="_blank">8.16.0.42/8.16.0.42</a>) with SMTP id<br>
+ xAKMSIJ5016740; Wed, 20 Nov 2019 16:34:52 -0600<br>
+Received: from <a href="http://ni.com" rel="noreferrer" target="_blank">ni.com</a> (<a href="http://skprod3.natinst.com" rel="noreferrer" target="_blank">skprod3.natinst.com</a> [130.164.80.24])<br>
+ by <a href="http://mx0a-00010702.pphosted.com" rel="noreferrer" target="_blank">mx0a-00010702.pphosted.com</a> with ESMTP id 2wafh16muy-1<br>
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);<br>
+ Wed, 20 Nov 2019 16:34:52 -0600<br>
+Received: from <a href="http://us-aus-exch2.ni.corp.natinst.com" rel="noreferrer" target="_blank">us-aus-exch2.ni.corp.natinst.com</a><br>
+ (<a href="http://us-aus-exch2.ni.corp.natinst.com" rel="noreferrer" target="_blank">us-aus-exch2.ni.corp.natinst.com</a> [130.164.68.12]) by<br>
+ <a href="http://us-aus-skprod3.natinst.com" rel="noreferrer" target="_blank">us-aus-skprod3.natinst.com</a> (<a href="http://8.16.0.27/8.16.0.27" rel="noreferrer" target="_blank">8.16.0.27/8.16.0.27</a>) with ESMTPS id<br>
+ xAKMYpHw003993 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256<br>
+ verify=NOT); Wed, 20 Nov 2019 16:34:51 -0600<br>
+Received: from <a href="http://us-aus-exch5.ni.corp.natinst.com" rel="noreferrer" target="_blank">us-aus-exch5.ni.corp.natinst.com</a> (130.164.68.15) by<br>
+ <a href="http://us-aus-exch2.ni.corp.natinst.com" rel="noreferrer" target="_blank">us-aus-exch2.ni.corp.natinst.com</a> (130.164.68.12) with Microsoft SMTP Server<br>
+ (TLS) id 15.0.1395.4; Wed, 20 Nov 2019 16:34:51 -0600<br>
+Received: from <a href="http://us-aus-exhub1.ni.corp.natinst.com" rel="noreferrer" target="_blank">us-aus-exhub1.ni.corp.natinst.com</a> (130.164.68.41) by<br>
+ <a href="http://us-aus-exch5.ni.corp.natinst.com" rel="noreferrer" target="_blank">us-aus-exch5.ni.corp.natinst.com</a> (130.164.68.15) with Microsoft SMTP Server<br>
+ (TLS) id 15.0.1395.4; Wed, 20 Nov 2019 16:34:50 -0600<br>
+Received: from <a href="http://delcastillo3.natinst.com" rel="noreferrer" target="_blank">delcastillo3.natinst.com</a> (172.18.68.32) by<br>
+ <a href="http://us-aus-exhub1.ni.corp.natinst.com" rel="noreferrer" target="_blank">us-aus-exhub1.ni.corp.natinst.com</a> (130.164.68.41) with Microsoft SMTP<br>
+ Server id 15.0.1395.4 via Frontend Transport; Wed, 20 Nov 2019 16:34:50<br>
+ -0600<br>
+From: Alejandro del Castillo <<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a>><br>
+To: <<a href="mailto:opkg-devel@googlegroups.com" target="_blank">opkg-devel@googlegroups.com</a>>, <<a href="mailto:richard.purdie@linuxfoundation.org" target="_blank">richard.purdie@linuxfoundation.org</a>><br>
+CC: Alejandro del Castillo <<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a>><br>
+Subject: [opkg][PATCH 1/2] opkg_archive.c: avoid double free on uncompress<br>
+ error<br>
+Date: Wed, 20 Nov 2019 16:34:47 -0600<br>
+Message-ID: <<a href="mailto:20191120223448.26522-2-alejandro.delcastillo@ni.com" target="_blank">20191120223448.26522-2-alejandro.delcastillo@ni.com</a>><br>
+X-Mailer: git-send-email 2.22.0<br>
+In-Reply-To: <<a href="mailto:20191120223448.26522-1-alejandro.delcastillo@ni.com" target="_blank">20191120223448.26522-1-alejandro.delcastillo@ni.com</a>><br>
+References: <<a href="mailto:20191120223448.26522-1-alejandro.delcastillo@ni.com" target="_blank">20191120223448.26522-1-alejandro.delcastillo@ni.com</a>><br>
+MIME-Version: 1.0<br>
+Content-Type: text/plain<br>
+X-Proofpoint-Virus-Version: vendor=fsecure<br>
+ engine=2.50.10434:6.0.95,18.0.572<br>
+ definitions=2019-11-20_07:2019-11-20,2019-11-20 signatures=0<br>
+X-Proofpoint-Spam-Reason: safe<br>
+X-Virus-Scanned: clamav-milter 0.101.4 at dan<br>
+X-Virus-Status: Clean<br>
+X-Evolution-Source: 1525863794.3857.16@hex<br>
+Content-Transfer-Encoding: 8bit<br>
+<br>
+The open-inner function calls archive_read_open. On error,<br>
+archive_read_open calls inner_close, which also closes the outter<br>
+archive. On error, return NULL directly to avoid double free.<br>
+<br>
+<br>
+Upstream-Status: Backport<br>
+<br>
+Signed-off-by: Alejandro del Castillo <<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a>><br>
+---<br>
+ libopkg/opkg_archive.c | 4 ++--<br>
+ 1 file changed, 2 insertions(+), 2 deletions(-)<br>
+<br>
+diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c<br>
+index 3d87db1..0e9ccea 100644<br>
+--- a/libopkg/opkg_archive.c<br>
++++ b/libopkg/opkg_archive.c<br>
+@@ -622,7 +622,7 @@ static struct archive *open_inner(struct archive *outer)<br>
+ if (r != ARCHIVE_OK) {<br>
+ opkg_msg(ERROR, "Failed to open inner archive: %s\n",<br>
+ archive_error_string(inner));<br>
+- goto err_cleanup;<br>
++ return NULL;<br>
+ }<br>
+ <br>
+ return inner;<br>
+@@ -683,7 +683,7 @@ static struct archive *extract_outer(const char *filename, const char *arname)<br>
+ <br>
+ inner = open_inner(outer);<br>
+ if (!inner)<br>
+- goto err_cleanup;<br>
++ return NULL;<br>
+ <br>
+ return inner;<br>
+ <br>
+-- <br>
+2.22.0<br>
+<br>
+<br>
diff --git a/meta/recipes-devtools/opkg/<a href="http://opkg_0.4.1.bb" rel="noreferrer" target="_blank">opkg_0.4.1.bb</a> b/meta/recipes-devtools/opkg/<a href="http://opkg_0.4.1.bb" rel="noreferrer" target="_blank">opkg_0.4.1.bb</a><br>
index 149ee3ca190..f0ae8b36bd1 100644<br>
--- a/meta/recipes-devtools/opkg/<a href="http://opkg_0.4.1.bb" rel="noreferrer" target="_blank">opkg_0.4.1.bb</a><br>
+++ b/meta/recipes-devtools/opkg/<a href="http://opkg_0.4.1.bb" rel="noreferrer" target="_blank">opkg_0.4.1.bb</a><br>
@@ -14,6 +14,8 @@ PE = "1"<br>
SRC_URI = "<a href="http://downloads.yoctoproject.org/releases/$%7BBPN%7D/$%7BBPN%7D-$%7BPV%7D.tar.gz" rel="noreferrer" target="_blank">http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz</a> \<br>
file://opkg.conf \<br>
file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \<br>
+ file://opkg_archive.patch \<br>
+ file://open_inner.patch \<br>
file://run-ptest \<br>
"<br>
<br>
-- <br>
2.20.1<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div></div>