* Updates age to the most recent release. * Enables tests (all pass) and makes the test vectors cleanable * Fixes a nit when installing the manpage
Works fine here, with and without age-plugin-yubikey. ok?
Index: Makefile =================================================================== RCS file: /cvs/ports/security/age/Makefile,v diff -u -p -r1.16 Makefile --- Makefile 28 Dec 2022 12:11:42 -0000 1.16 +++ Makefile 19 Jun 2024 20:37:50 -0000 @@ -1,7 +1,7 @@ COMMENT = simple, modern and secure file encryption tool MODGO_MODNAME = filippo.io/age -MODGO_VERSION = v1.1.1 +MODGO_VERSION = v1.2.0 DISTNAME = age-${MODGO_VERSION} @@ -17,13 +17,16 @@ PERMIT_PACKAGE = Yes WANTLIB += c pthread MODULES = lang/go -NO_TEST = Yes MODGO_FLAGS += -ldflags="-X main.Version=${MODGO_VERSION}" pre-install: ${INSTALL_MAN} ${WRKDIR}/${MODGO_MODNAME}/doc/*.1 \ - ${DESTDIR}/usr/local/man/man1 + ${PREFIX}/man/man1 + +# c2sp.org/!c!c!t!v/age contains some read-only files and directories +post-test: + chmod -R u+w ${MODGO_WORKSPACE} .include "modules.inc" Index: distinfo =================================================================== RCS file: /cvs/ports/security/age/distinfo,v diff -u -p -r1.7 distinfo --- distinfo 28 Dec 2022 12:11:42 -0000 1.7 +++ distinfo 19 Jun 2024 20:37:50 -0000 @@ -1,26 +1,58 @@ -SHA256 (age-v1.1.1.zip) = IWBSEkGBQQhy0T4ND4bAT5RfSt82+6RR7fMejQnBuGk= -SHA256 (go_modules/filippo.io/edwards25519/@v/v1.0.0.mod) = 18MvTgz5F65FgigZwzhreQaHZbYlu+JJdGHuwPjoYpw= -SHA256 (go_modules/filippo.io/edwards25519/@v/v1.0.0.zip) = +1voKavKxjkxp6DEEKcYH6T5CffrcPc07b2nhoWSFno= -SHA256 (go_modules/golang.org/x/crypto/@v/v0.4.0.mod) = oCSfrnXTVD+PMNcJZjAsz7P2H8Q4oOyGBzOiLff5UME= -SHA256 (go_modules/golang.org/x/crypto/@v/v0.4.0.zip) = hodCa/q7P/WcJT8Ji4Y6K7NQPvrYDcAUNf/Oji6R6qg= -SHA256 (go_modules/golang.org/x/net/@v/v0.3.0.mod) = PDYKM2jCXws5pktjD+dO2ZjfAOar7pP9SfVv/nWQoTE= -SHA256 (go_modules/golang.org/x/net/@v/v0.3.0.zip) = vPEIaCQZZx7jMoRft27JaWkx+Z3LPnK+DqnX3jbzXfI= -SHA256 (go_modules/golang.org/x/sys/@v/v0.3.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= -SHA256 (go_modules/golang.org/x/sys/@v/v0.3.0.zip) = y98Y476fIRypYmhKwZ1B1L4kBCiY7AzGZL+NHClV04Q= -SHA256 (go_modules/golang.org/x/term/@v/v0.3.0.mod) = HlYfdBO3S00wyi1smHTM0Tu4yU2qDmwjd7rZ6c9tvlg= -SHA256 (go_modules/golang.org/x/term/@v/v0.3.0.zip) = HNnVjqLYYpm4VphyOOY5KlDmiNBGnMs7SkaTSfJDlQc= -SHA256 (go_modules/golang.org/x/text/@v/v0.5.0.mod) = FZKedvzgSupMkqNUQmu0M3BoRkWk7gPy510MLrFGYwQ= -SHA256 (go_modules/golang.org/x/text/@v/v0.5.0.zip) = 1sAZbL2ZWC3/X3E+0/8UCAN25rDPFFBE+JcosgQjT3w= -SIZE (age-v1.1.1.zip) = 228647 -SIZE (go_modules/filippo.io/edwards25519/@v/v1.0.0.mod) = 40 -SIZE (go_modules/filippo.io/edwards25519/@v/v1.0.0.zip) = 48930 -SIZE (go_modules/golang.org/x/crypto/@v/v0.4.0.mod) = 171 -SIZE (go_modules/golang.org/x/crypto/@v/v0.4.0.zip) = 1761018 -SIZE (go_modules/golang.org/x/net/@v/v0.3.0.mod) = 123 -SIZE (go_modules/golang.org/x/net/@v/v0.3.0.zip) = 1552668 -SIZE (go_modules/golang.org/x/sys/@v/v0.3.0.mod) = 33 -SIZE (go_modules/golang.org/x/sys/@v/v0.3.0.zip) = 1862151 -SIZE (go_modules/golang.org/x/term/@v/v0.3.0.mod) = 67 -SIZE (go_modules/golang.org/x/term/@v/v0.3.0.zip) = 19924 -SIZE (go_modules/golang.org/x/text/@v/v0.5.0.mod) = 258 -SIZE (go_modules/golang.org/x/text/@v/v0.5.0.zip) = 8614807 +SHA256 (age-v1.2.0.zip) = 6AJuH+vJadg9i72MnZxil0O+NmuX8zyYg9YIEHZu9rs= +SHA256 (go_modules/c2sp.org/!c!c!t!v/age/@v/v0.0.0-20240306222714-3ec4d716e805.mod) = 2ssdD8MjAO/iC8leBDTkFB9qjPVJ13PRrZGDw0gKtNo= +SHA256 (go_modules/c2sp.org/!c!c!t!v/age/@v/v0.0.0-20240306222714-3ec4d716e805.zip) = VUUuIfeoB59uM0CKXjdVOpvFlgMm7zEOwaquj6yx0hY= +SHA256 (go_modules/filippo.io/edwards25519/@v/v1.1.0.mod) = CZVW/E1+b1yxNe/di2u0wJMuOOoFjFP8X6XOKFVy+2E= +SHA256 (go_modules/filippo.io/edwards25519/@v/v1.1.0.zip) = msQ6aG0G/evXGfevOGbIfrBpMCJy37ExAHrfRxwwi2U= +SHA256 (go_modules/github.com/google/go-cmp/@v/v0.6.0.mod) = 58dmnUod1Ym6PgJLon9D8pPbYR/gdc4g17iENw1j/r0= +SHA256 (go_modules/github.com/google/go-cmp/@v/v0.6.0.zip) = S06b9sSCEQgGUbSR37SNaLc2xmowW8+UYFYG4bouqko= +SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.12.0.mod) = e/5bA6stTZVNm3TqzbLMv2ve9jQgGwALl/mg0gIx3H4= +SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.12.0.zip) = 1FOecWwrfygkWE5MShf2TFCL1uU1kQakBqfiPncQnN4= +SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 7n/kRmIDoB06wZrcE0zeyZvG3nGZLCjz3Zp0SAv/BgM= +SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) = u0GmArF0NF/aOSyK2D/MkyF8KFx2NplndjC+kP63peM= +SHA256 (go_modules/golang.org/x/crypto/@v/v0.24.0.mod) = TfsA4zw5LLQjnS/FtlBpqR3vs7YZC7i5dyYmfuLnRfs= +SHA256 (go_modules/golang.org/x/crypto/@v/v0.24.0.zip) = eFO1CX3q4N6H8TYaDGPQHwm/QajiD3AzOIQmqWGqnTg= +SHA256 (go_modules/golang.org/x/mod/@v/v0.18.0.mod) = XErAMQolMwdXA5zPOpjnX+/by31ETd0EkjAAOkSUW94= +SHA256 (go_modules/golang.org/x/mod/@v/v0.18.0.zip) = nGSj79pDySAUZ1NhsmIN4fKBXVmHWjefCzNhAY5b31k= +SHA256 (go_modules/golang.org/x/net/@v/v0.26.0.mod) = 82mj44SGDykPhwGlhZt2CTrof6JdWHyMnIFqLC40p5w= +SHA256 (go_modules/golang.org/x/net/@v/v0.26.0.zip) = PqkMFHQiacfB1SF7wePPWKcVUuVyT9QP+mm6UaEzrbA= +SHA256 (go_modules/golang.org/x/sync/@v/v0.7.0.mod) = cA5dsA3SaqGaF9zl/FUkNtYPaMVgbIW4IfJMPWByoVE= +SHA256 (go_modules/golang.org/x/sync/@v/v0.7.0.zip) = ILAQhSQOZhv/x/WTg/IbkPES1ml4QiDG5ZyAEkMhbSI= +SHA256 (go_modules/golang.org/x/sys/@v/v0.21.0.mod) = 0iezJfYh9OvijTm6dz6pm4cPOTt8CcNFksNlsW3VYN4= +SHA256 (go_modules/golang.org/x/sys/@v/v0.21.0.zip) = JYj053yDd0vG8WjoWU8ty9IcHSaEmod/fmoNFROS5zU= +SHA256 (go_modules/golang.org/x/telemetry/@v/v0.0.0-20240521205824-bda55230c457.mod) = txKIwdA6Q0+OoW7agOTdsHM8vdTtmW9KtmFv1dv3arM= +SHA256 (go_modules/golang.org/x/telemetry/@v/v0.0.0-20240521205824-bda55230c457.zip) = joZJM3lz0GTMRPqFh4fbfQ65DwgGgHNJdm0YDtaIn1w= +SHA256 (go_modules/golang.org/x/term/@v/v0.21.0.mod) = lr7v7NJLCYAqci5gIBTC15xPekwyjMdSEr60AtyQM5c= +SHA256 (go_modules/golang.org/x/term/@v/v0.21.0.zip) = O6WcXJKcUm4L8BZpbbj/7DE7Q4dkKGd+zaQZgxKm9pY= +SHA256 (go_modules/golang.org/x/text/@v/v0.16.0.mod) = ChicdviH/nAsHxkZtDLcIejiMbXDI6N6Cz9yMB6QZsU= +SHA256 (go_modules/golang.org/x/text/@v/v0.16.0.zip) = m3wFdciUIkvH+F36LvsO+T19VK6WLNlcjekM7LQH3pQ= +SHA256 (go_modules/golang.org/x/tools/@v/v0.22.0.mod) = cf0XssEb8eaLYH/TgnrjtX2H7PRxsFMjic+iCIsv6zo= +SHA256 (go_modules/golang.org/x/tools/@v/v0.22.0.zip) = bBLNQZ2ZcpD+u0QWmNDlLKtacb6VmsfE3QI/hrLQHR4= +SIZE (age-v1.2.0.zip) = 233036 +SIZE (go_modules/c2sp.org/!c!c!t!v/age/@v/v0.0.0-20240306222714-3ec4d716e805.mod) = 115 +SIZE (go_modules/c2sp.org/!c!c!t!v/age/@v/v0.0.0-20240306222714-3ec4d716e805.zip) = 1536469 +SIZE (go_modules/filippo.io/edwards25519/@v/v1.1.0.mod) = 40 +SIZE (go_modules/filippo.io/edwards25519/@v/v1.1.0.zip) = 55809 +SIZE (go_modules/github.com/google/go-cmp/@v/v0.6.0.mod) = 41 +SIZE (go_modules/github.com/google/go-cmp/@v/v0.6.0.zip) = 129773 +SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.12.0.mod) = 167 +SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.12.0.zip) = 190596 +SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 41 +SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) = 229017 +SIZE (go_modules/golang.org/x/crypto/@v/v0.24.0.mod) = 190 +SIZE (go_modules/golang.org/x/crypto/@v/v0.24.0.zip) = 1803483 +SIZE (go_modules/golang.org/x/mod/@v/v0.18.0.mod) = 84 +SIZE (go_modules/golang.org/x/mod/@v/v0.18.0.zip) = 166237 +SIZE (go_modules/golang.org/x/net/@v/v0.26.0.mod) = 155 +SIZE (go_modules/golang.org/x/net/@v/v0.26.0.zip) = 1836588 +SIZE (go_modules/golang.org/x/sync/@v/v0.7.0.mod) = 34 +SIZE (go_modules/golang.org/x/sync/@v/v0.7.0.zip) = 26990 +SIZE (go_modules/golang.org/x/sys/@v/v0.21.0.mod) = 33 +SIZE (go_modules/golang.org/x/sys/@v/v0.21.0.zip) = 1957330 +SIZE (go_modules/golang.org/x/telemetry/@v/v0.0.0-20240521205824-bda55230c457.mod) = 138 +SIZE (go_modules/golang.org/x/telemetry/@v/v0.0.0-20240521205824-bda55230c457.zip) = 961050 +SIZE (go_modules/golang.org/x/term/@v/v0.21.0.mod) = 68 +SIZE (go_modules/golang.org/x/term/@v/v0.21.0.zip) = 19883 +SIZE (go_modules/golang.org/x/text/@v/v0.16.0.mod) = 220 +SIZE (go_modules/golang.org/x/text/@v/v0.16.0.zip) = 9235305 +SIZE (go_modules/golang.org/x/tools/@v/v0.22.0.mod) = 339 +SIZE (go_modules/golang.org/x/tools/@v/v0.22.0.zip) = 3175435 Index: modules.inc =================================================================== RCS file: /cvs/ports/security/age/modules.inc,v diff -u -p -r1.4 modules.inc --- modules.inc 28 Dec 2022 12:11:42 -0000 1.4 +++ modules.inc 19 Jun 2024 20:37:50 -0000 @@ -1,8 +1,23 @@ MODGO_MODULES = \ - filippo.io/edwards25519 v1.0.0 \ - golang.org/x/crypto v0.4.0 \ - golang.org/x/net v0.3.0 \ - golang.org/x/sys v0.3.0 \ - golang.org/x/term v0.3.0 \ - golang.org/x/text v0.5.0 + c2sp.org/!c!c!t!v/age v0.0.0-20240306222714-3ec4d716e805 \ + filippo.io/edwards25519 v1.1.0 \ + github.com/google/go-cmp v0.6.0 \ + github.com/rogpeppe/go-internal v1.12.0 \ + github.com/yuin/goldmark v1.4.13 \ + golang.org/x/crypto v0.24.0 \ + golang.org/x/mod v0.18.0 \ + golang.org/x/net v0.26.0 \ + golang.org/x/sync v0.7.0 \ + golang.org/x/sys v0.21.0 \ + golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457 \ + golang.org/x/term v0.21.0 \ + golang.org/x/text v0.16.0 \ + golang.org/x/tools v0.22.0 + +MODGO_MODFILES = \ + golang.org/x/crypto v0.24.0 \ + golang.org/x/mod v0.18.0 \ + golang.org/x/net v0.26.0 \ + golang.org/x/sys v0.21.0 \ + golang.org/x/tools v0.22.0