X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id CE85DDCA25D for ; Wed, 6 May 2015 17:18:00 +0000 (UTC) Received: from mail-vn0-f52.google.com (mail-vn0-f52.google.com [209.85.216.52]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 98139DC0063 for ; Wed, 6 May 2015 17:17:55 +0000 (UTC) Received: by vnbf62 with SMTP id f62so1196603vnb.13 for ; Wed, 06 May 2015 10:17:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:message-id:subject:from:to:content-type; bh=oyOxq8gpPQDnfCShXyTPkAGW+JUyD9FerL/awcbHwho=; b=Q4CB8d4h9Q9YJkDwBYaQcz17aqvH6pptwqnRNyPAw7aw07A+VeCTrv5duICub56rOh Nf9mE1Bz8zvVfHgN7bMv6/V5XJT/pX3bNRailJlorAQFpF5a1kiE16bWGbobh7smGh6t wrDyaFsKLgZYQPcO3AjU2dGZRNoNfYA0YSWCZxmYypQpuoQIDQtu75KMsXumwyr2rD8J B6q6MqXnnWnvsOpaiXCBdNVkT5sc42onYHw0tVV89pscCrF5DWb8HwmSl1uDH3NaY3TG wxxpl/yoDvLsfNVAHTjjCSGN6JseYK3HjWRsErfCEVqYPIUZzP7cwRhECW89m5xky3OO myAA== X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 X-Received: by 10.52.90.42 with SMTP id bt10mr35870044vdb.13.1430932674653; Wed, 06 May 2015 10:17:54 -0700 (PDT) Sender: andy.shinn@gmail.com Received: by 10.52.154.194 with HTTP; Wed, 6 May 2015 10:17:54 -0700 (PDT) Received: by 10.52.154.194 with HTTP; Wed, 6 May 2015 10:17:54 -0700 (PDT) Date: Wed, 6 May 2015 12:17:54 -0500 X-Google-Sender-Auth: 6JEYwoEgnT7A8jtGoHTezPBstro Message-ID: Subject: [alpine-aports] [PATCH] main/ca-certificates: fix bug in processing of local CA certificates From: Andy Shinn To: alpine-aports@lists.alpinelinux.org Content-Type: multipart/alternative; boundary=001a1136af6cc5332805156cf962 X-Virus-Scanned: ClamAV using ClamSMTP --001a1136af6cc5332805156cf962 Content-Type: text/plain; charset=UTF-8 We were only grabbing the index of the certlist table, which was making the filename appear as a number. It would seem like the seem like the second variables from the pairs() function is the actual name we want. --- main/ca-certificates/APKBUILD | 8 ++++---- main/ca-certificates/update-ca-certificates | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/main/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD index 2db2af0..ab50977 100644 --- a/main/ca-certificates/APKBUILD +++ b/main/ca-certificates/APKBUILD @@ -7,7 +7,7 @@ _nmu="+nmu${pkgver#*_p}" [ "$_nmu" = "+nmu${pkgver}" ] && _nmu="" _ver=${pkgver} -pkgrel=1 +pkgrel=2 pkgdesc="Common CA certificates PEM files" url="http://packages.debian.org/sid/ca-certificates" arch="noarch" @@ -62,8 +62,8 @@ EOF } md5sums="f619282081c8bfc65ea64c37fa5285ed ca-certificates_20141019.tar.xz -bb24a9e2caf6150053a981e617a209a9 update-ca-certificates" +938c774087a8fd858450ee1fd1b3a3d9 update-ca-certificates" sha256sums="684902d3f4e9ad27829f4af0d9d2d588afed03667997579b9c2be86fcd1eb73a ca-certificates_20141019.tar.xz -4f109a22d74ef36f691933716a83c015b8475ed4e47d21bd0d7f8baef4de046b update-ca-certificates" +75e2f462861a84bdb57a3e8c95148806e4dee642caf4d693f9b0ea5b6ed33401 update-ca-certificates" sha512sums="5b0e8fb917f5642a5a2b4fde46a706db0c652ff3fb31a5053d9123a5b670b50c6e3cf2496915cc01c613dcbe964d6432f393c12d8a697baedfad58f9d13e568b ca-certificates_20141019.tar.xz -dadf046999f226cef0b14bd9014e59f04fa05a984339ff84940a2beb0f33f70bc921233d22291a294f9366c67989f5d337febd1832574c2e28317c14de84ff00 update-ca-certificates" +a547a9a527b2ef91c05fc86257baa03cdfa9af3fd978fe55e20eb77c052bc68f3fd851f3fc1c74f0397fde66cbd3f9ce57805bb49baace233c5d4eb668f397fd update-ca-certificates" diff --git a/main/ca-certificates/update-ca-certificates b/main/ca-certificates/update-ca-certificates index 53f45df..ebe044d 100755 --- a/main/ca-certificates/update-ca-certificates +++ b/main/ca-certificates/update-ca-certificates @@ -47,8 +47,7 @@ end local certlist = posix.glob(LOCALCERTSDIR..'*.crt') if certlist ~= nil then table.sort(certlist) - for f in pairs(certlist) do - local fn = LOCALCERTSDIR..f + for index,fn in pairs(certlist) do if posix.stat(fn, 'type') == 'regular' then add(fn, bundle, calinks) end -- 1.9.1 --001a1136af6cc5332805156cf962 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

We were only grabbing the index of the certlist table, which= was making the filename appear as a number. It would seem like the seem li= ke the second variables from the pairs() function is the actual name we wan= t.
---
main/ca-certificates/APKBUILD=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 8 ++++----
main/ca-certificates/update-ca-certificates | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/main/ca-certificates/APKBUILD b/main/ca-certifi= cates/APKBUILD
index 2db2af0..ab50977 100644
--- a/main/ca-certificates/APKBUILD
+++ b/main/ca-certificates/APKBUILD
@@ -7,7 +7,7 @@ _nmu=3D"+nmu${pkgver#*_p}"
[ "$_nmu" =3D "+nmu${pkgver}" ] && _nmu=3D"= ;"
_ver=3D${pkgver}

-pkgrel=3D1
+pkgrel=3D2
pkgdesc=3D"Common CA certificates PEM files"
url=3D"http= ://packages.debian.org/sid/ca-certificates"
arch=3D"noarch"
@@ -62,8 +62,8 @@ EOF
}

md5sums=3D"f619282081c8bfc65ea64c37fa5285ed=C2=A0 ca-ce= rtificates_20141019.tar.xz
-bb24a9e2caf6150053a981e617a209a9=C2=A0 update-ca-certificates"
+938c774087a8fd858450ee1fd1b3a3d9=C2=A0 update-ca-certificates"
sha256sums=3D"684902d3f4e9ad27829f4af0d9d2d588afed03667997579b9c2be86f= cd1eb73a=C2=A0 ca-certificates_20141019.tar.xz
-4f109a22d74ef36f691933716a83c015b8475ed4e47d21bd0d7f8baef4de046b=C2=A0 upd= ate-ca-certificates"
+75e2f462861a84bdb57a3e8c95148806e4dee642caf4d693f9b0ea5b6ed33401=C2=A0 upd= ate-ca-certificates"
sha512sums=3D"5b0e8fb917f5642a5a2b4fde46a706db0c652ff3fb31a5053d9123a5= b670b50c6e3cf2496915cc01c613dcbe964d6432f393c12d8a697baedfad58f9d13e568b=C2= =A0 ca-certificates_20141019.tar.xz
-dadf046999f226cef0b14bd9014e59f04fa05a984339ff84940a2beb0f33f70bc921233d22= 291a294f9366c67989f5d337febd1832574c2e28317c14de84ff00=C2=A0 update-ca-cert= ificates"
+a547a9a527b2ef91c05fc86257baa03cdfa9af3fd978fe55e20eb77c052bc68f3fd851f3fc= 1c74f0397fde66cbd3f9ce57805bb49baace233c5d4eb668f397fd=C2=A0 update-ca-cert= ificates"
diff --git a/main/ca-certificates/update-ca-certificates b/main/ca-certific= ates/update-ca-certificates
index 53f45df..ebe044d 100755
--- a/main/ca-certificates/update-ca-certificates
+++ b/main/ca-certificates/update-ca-certificates
@@ -47,8 +47,7 @@ end
local certlist =3D posix.glob(LOCALCERTSDIR..'*.crt')
if certlist ~=3D nil then
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 table.sort(certlist)
-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 for f in pairs(certlist) do
-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 local fn =3D LOCALCERTSDIR..f
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 for index,fn in pairs(certlist) do =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 if posix.stat(fn, 'type') =3D=3D 'regular' = then
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 add(fn, bun= dle, calinks)
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 end
--
1.9.1

--001a1136af6cc5332805156cf962-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---