Simple update to the latest release of Puma. Changelog available at https://github.com/puma/puma/blob/master/History.md
Remove patch applied upstream. Among other things, fixes the following security issues: * CVE-2022-24790 * GHSA-rmj8-8hhh-gv5h * CVE-2021-41136 Tested on amd64. Will be committing in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile =================================================================== RCS file: /cvs/ports/www/ruby-puma/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile 11 Mar 2022 20:10:55 -0000 1.12 +++ Makefile 23 Aug 2022 16:48:43 -0000 @@ -1,8 +1,7 @@ COMMENT = simple, fast, threaded webserver for rack applications -DISTNAME = puma-5.3.2 +DISTNAME = puma-5.6.5 CATEGORIES = www -REVISION = 0 HOMEPAGE = https://puma.io/ Index: distinfo =================================================================== RCS file: /cvs/ports/www/ruby-puma/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo 26 May 2021 20:32:38 -0000 1.8 +++ distinfo 23 Aug 2022 16:49:07 -0000 @@ -1,2 +1,2 @@ -SHA256 (puma-5.3.2.gem) = ssrmO5dY1HUKrg24IIRLA9yiBsU8IIVQSfUUoQrAqlI= -SIZE (puma-5.3.2.gem) = 201216 +SHA256 (puma-5.6.5.gem) = ZhAp0VoRXp9sBkGmnIMP/Z8bmsY/zQeR2UzNkA4D+GM= +SIZE (puma-5.6.5.gem) = 208384 Index: patches/patch-ext_puma_http11_mini_ssl_c =================================================================== RCS file: patches/patch-ext_puma_http11_mini_ssl_c diff -N patches/patch-ext_puma_http11_mini_ssl_c --- patches/patch-ext_puma_http11_mini_ssl_c 11 Mar 2022 20:10:55 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -Fix build with Opaque DH in LibreSSL 3.5. - -Index: ext/puma_http11/mini_ssl.c ---- ext/puma_http11/mini_ssl.c.orig -+++ ext/puma_http11/mini_ssl.c -@@ -91,13 +91,13 @@ DH *get_dh2048() { - static unsigned char dh2048_g[] = { 0x02 }; - - DH *dh; --#if !(OPENSSL_VERSION_NUMBER < 0x10100005L || defined(LIBRESSL_VERSION_NUMBER)) -+#if !(OPENSSL_VERSION_NUMBER < 0x10100005L) - BIGNUM *p, *g; - #endif - - dh = DH_new(); - --#if OPENSSL_VERSION_NUMBER < 0x10100005L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100005L - dh->p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL); - dh->g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL); - Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/ruby-puma/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- pkg/PLIST 11 Mar 2022 20:10:55 -0000 1.8 +++ pkg/PLIST 23 Aug 2022 16:50:46 -0000 @@ -21,9 +21,6 @@ ${GEM_LIB}/gems/${DISTNAME}/docs/images/ ${GEM_LIB}/gems/${DISTNAME}/docs/jungle/ ${GEM_LIB}/gems/${DISTNAME}/docs/jungle/README.md ${GEM_LIB}/gems/${DISTNAME}/docs/jungle/rc.d/ -${GEM_LIB}/gems/${DISTNAME}/docs/jungle/rc.d/README.md -${GEM_LIB}/gems/${DISTNAME}/docs/jungle/rc.d/puma -${GEM_LIB}/gems/${DISTNAME}/docs/jungle/rc.d/puma.conf ${GEM_LIB}/gems/${DISTNAME}/docs/kubernetes.md ${GEM_LIB}/gems/${DISTNAME}/docs/nginx.md ${GEM_LIB}/gems/${DISTNAME}/docs/plugins.md @@ -54,7 +51,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/puma/err ${GEM_LIB}/gems/${DISTNAME}/lib/puma/events.rb ${GEM_LIB}/gems/${DISTNAME}/lib/puma/io_buffer.rb ${GEM_LIB}/gems/${DISTNAME}/lib/puma/jruby_restart.rb -${GEM_LIB}/gems/${DISTNAME}/lib/puma/json.rb +${GEM_LIB}/gems/${DISTNAME}/lib/puma/json_serialization.rb ${GEM_LIB}/gems/${DISTNAME}/lib/puma/launcher.rb ${GEM_LIB}/gems/${DISTNAME}/lib/puma/minissl/ ${GEM_LIB}/gems/${DISTNAME}/lib/puma/minissl.rb
