Subject: [alpine-aports] [PATCH] main/ca-certificates: fix bug in processing of local CA certificates

From: Andy Shinn <[email-masked]>
Date: Wed, 6 May 2015 12:17:54 -0500

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

---

From: Timo Teras <[email-masked]>
Date: Wed, 6 May 2015 22:07:22 +0300

Hi,

On Wed, 6 May 2015 12:17:54 -0500
Andy Shinn <[email-masked]> wrote:

> 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. ---

Thanks, applied with minor changes.

Also the patch was white-space mangled so I did the changes manually.

/Timo

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---