Hi, From: Tobias Nygren <[email protected]>, Date: Tue, 24 Mar 2015 04:47:57 +0100
> On Mon, 23 Mar 2015 10:23:42 +0000 > "S.P.Zeidler" <[email protected]> wrote: > >> the vulnerability fixes for the latest advisory set from OpenSSL went >> in last week; this is merely an exercise getting to a clean copy, >> especially since OpenSSL changed the source format and we'll want to >> do updates in the future, too. As a result, the diffs are sadly very messy. >> >> I've tested amd64. i386 and sparc will get a run by the automated tester; >> if people with powerpc and sparc64 running -current could give it a whirl >> before pullups to the release branches, that would be helpful. > > Hi, > Thanks for doing this. pkgsrc does not seem to detect this new version > correctly though. The BUILTIN_VERSION.openssl awk script in > security/openssl/builtin.mk is returning empty string leading to all > packages depending on openssl from pkgsrc. > (If I force BUILTIN_VERSION.openssl to 1.0.1m it works fine.) How about following patch? It works 1.0.1k and 1.0.1m. Index: builtin.mk =================================================================== RCS file: /cvsroot/pkgsrc/security/openssl/builtin.mk,v retrieving revision 1.42 diff -u -r1.42 builtin.mk --- builtin.mk 5 Jun 2014 12:16:06 -0000 1.42 +++ builtin.mk 24 Mar 2015 12:29:55 -0000 @@ -32,16 +32,16 @@ ${AWK} 'BEGIN { hex="0123456789abcdef"; \ alpha="abcdefghijklmnopqrstuvwxyz"; \ } \ - /\#define[ ]*OPENSSL_VERSION_NUMBER/ { \ - major = index(hex, substr($$3, 3, 1)) - 1; \ - i = 16 * (index(hex, substr($$3, 4, 1)) - 1); \ - i += index(hex, substr($$3, 5, 1)) - 1; \ + /\#[ ]*define[ ]*OPENSSL_VERSION_NUMBER/ { \ + major = index(hex, substr($$NF, 3, 1)) - 1; \ + i = 16 * (index(hex, substr($$NF, 4, 1)) - 1); \ + i += index(hex, substr($$NF, 5, 1)) - 1; \ minor = "."i; \ - i = 16 * (index(hex, substr($$3, 6, 1)) - 1); \ - i += index(hex, substr($$3, 7, 1)) - 1; \ + i = 16 * (index(hex, substr($$NF, 6, 1)) - 1); \ + i += index(hex, substr($$NF, 7, 1)) - 1; \ teeny = "."i; \ - i = 16 * (index(hex, substr($$3, 8, 1)) - 1); \ - i += index(hex, substr($$3, 9, 1)) - 1; \ + i = 16 * (index(hex, substr($$NF, 8, 1)) - 1); \ + i += index(hex, substr($$NF, 9, 1)) - 1; \ if (i == 0) { \ patchlevel = ""; \ } else if (i > 26) { \ -- Ryo ONODERA // [email protected] PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB FD1B F404 27FA C7D1 15F3
