pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2022Q3]: pkgsrc/lang Pullup ticket #6708 - requested by taca
details: https://anonhg.NetBSD.org/pkgsrc/rev/e62ea4b6bd8a
branches: pkgsrc-2022Q3
changeset: 389140:e62ea4b6bd8a
user: bsiegert <bsiegert%pkgsrc.org@localhost>
date: Wed Nov 30 17:37:35 2022 +0000
description:
Pullup ticket #6708 - requested by taca
lang/ruby27-base: security fix
Revisions pulled up:
- lang/ruby/rubyversion.mk 1.258
- lang/ruby27-base/distinfo 1.11
- lang/ruby27-base/patches/patch-configure 1.3
---
Module Name: pkgsrc
Committed By: taca
Date: Sat Nov 26 13:09:59 UTC 2022
Modified Files:
pkgsrc/lang/ruby: rubyversion.mk
pkgsrc/lang/ruby27-base: distinfo
pkgsrc/lang/ruby27-base/patches: patch-configure
Log Message:
lang/ruby27-base: update to 2.7.7
Ruby 2.7.7 Released (2022-11-24)
Ruby 2.7.7 has been released.
This release includes a security fix. Please check the topics below for
details.
* CVE-2021-33621: HTTP response splitting in CGI
This release also includes some build problem fixes. They are not
considered to affect compatibility with previous versions. See the commit
logs for further details.
diffstat:
lang/ruby/rubyversion.mk | 8 +-
lang/ruby27-base/distinfo | 10 ++--
lang/ruby27-base/patches/patch-configure | 73 ++++++++++++++++++-------------
3 files changed, 52 insertions(+), 39 deletions(-)
diffs (205 lines):
diff -r 9be62ce78728 -r e62ea4b6bd8a lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk Wed Nov 30 17:25:42 2022 +0000
+++ b/lang/ruby/rubyversion.mk Wed Nov 30 17:37:35 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.252.4.2 2022/11/30 17:25:42 bsiegert Exp $
+# $NetBSD: rubyversion.mk,v 1.252.4.3 2022/11/30 17:37:35 bsiegert Exp $
#
# This file determines which Ruby version is used as a dependency for
@@ -214,7 +214,7 @@
# current supported Ruby's version
RUBY26_VERSION= 2.6.10
-RUBY27_VERSION= 2.7.6
+RUBY27_VERSION= 2.7.7
RUBY30_VERSION= 3.0.5
RUBY31_VERSION= 3.1.3
@@ -331,7 +331,7 @@
RUBY_BENCHMARK_VER= 0.1.0
RUBY_BIGDECIMAL_VER= 2.0.0
RUBY_BUNDLER_VER= 2.1.4
-RUBY_CGI_VER= 0.1.0.1
+RUBY_CGI_VER= 0.1.0.2
RUBY_CSV_VER= 3.1.2
RUBY_DATE_VER= 3.0.3
RUBY_DBM_VER= 1.1.0
@@ -356,7 +356,7 @@
RUBY_NET_TELNET_VER= 0.2.0
RUBY_OBSERVER_VER= 0.1.0
RUBY_OPEN3_VER= 0.1.0
-RUBY_OPENSSL_VER= 2.1.3
+RUBY_OPENSSL_VER= 2.1.4
RUBY_OSTRUCT_VER= 0.2.0
RUBY_POWER_ASSERT_VER= 1.1.7
RUBY_PRIME_VER= 0.1.1
diff -r 9be62ce78728 -r e62ea4b6bd8a lang/ruby27-base/distinfo
--- a/lang/ruby27-base/distinfo Wed Nov 30 17:25:42 2022 +0000
+++ b/lang/ruby27-base/distinfo Wed Nov 30 17:37:35 2022 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2022/04/12 14:21:00 taca Exp $
+$NetBSD: distinfo,v 1.10.4.1 2022/11/30 17:37:36 bsiegert Exp $
-BLAKE2s (ruby-2.7.6.tar.xz) = 4cc99a73c925a1652758b41769e06a1a4c8bd9e7cb0da7ffe5ece6e8b132e920
-SHA512 (ruby-2.7.6.tar.xz) = e86410b59d5917786fe43b00fd75dedd0e7f84611286b9274c542d2e562088fcee6bcc6c2596c30ccf793280d2bac6bfbb2619ef0513b3ca31f10f88684c7b1f
-Size (ruby-2.7.6.tar.xz) = 12084408 bytes
-SHA1 (patch-configure) = 5ee800f6824b18efd06e56a659235ea784819f2e
+BLAKE2s (ruby-2.7.7.tar.xz) = 4dc4c991e5799b1a67fcb18d73ddc4a43aafa1564eac9f8879698f9fb59a53ef
+SHA512 (ruby-2.7.7.tar.xz) = a19be3f0dfce040fe79f439e606f179d6750d2cc6e7b64fd65933edd487f5995573f7d0730beec9d3edadf942f8e9216f01ab3fff189d6cbe9d46a9add3e2683
+Size (ruby-2.7.7.tar.xz) = 12101804 bytes
+SHA1 (patch-configure) = 6f4b2abb5d22270ebcf211b4aa25d7efb6c0d2e9
SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
SHA1 (patch-ext_openssl_ossl__pkey__rsa.c) = 925fa135abb90b9a1fa16da14b17c0d2b2bec364
SHA1 (patch-lib_mkmf.rb) = 4a3cd18548dbdf43a13695d4e76f817c0347e335
diff -r 9be62ce78728 -r e62ea4b6bd8a lang/ruby27-base/patches/patch-configure
--- a/lang/ruby27-base/patches/patch-configure Wed Nov 30 17:25:42 2022 +0000
+++ b/lang/ruby27-base/patches/patch-configure Wed Nov 30 17:37:35 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.2 2021/04/11 12:32:03 taca Exp $
+$NetBSD: patch-configure,v 1.2.12.1 2022/11/30 17:37:36 bsiegert Exp $
* Adding Interix support.
* Ignore doxygen.
@@ -6,26 +6,26 @@
* Handle SSP in pkgsrc.
* Put -std= in CFLAGS not CPPFLAGS.
---- configure.orig 2021-04-05 12:39:40.000000000 +0000
+--- configure.orig 2022-11-24 12:42:10.000000000 +0000
+++ configure
-@@ -6469,7 +6469,7 @@ else
- if test x"$target_alias" = x; then :
+@@ -7709,7 +7709,7 @@ else $as_nop
+ then :
case "$target_os" in #(
- darwin*) :
+ nodarwin*) :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
- $as_echo_n "checking for real target cpu... " >&6; }
-@@ -8839,6 +8839,7 @@ fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
+ printf %s "checking for real target cpu... " >&6; }
+@@ -10064,6 +10064,7 @@ fi
stack_protector=no
;; #(
*) :
+ stack_protector=no
;;
esac
- if test -z "${stack_protector+set}"; then :
-@@ -10703,6 +10704,10 @@ esac
+ if test -z "${stack_protector+set}"
+@@ -12017,6 +12018,10 @@ esac
ac_cv_func___builtin_setjmp=no
;; #(
@@ -36,16 +36,18 @@
*) :
;;
esac
-@@ -22277,6 +22282,8 @@ else
- # ifdef _MSC_VER
+@@ -23748,7 +23753,9 @@ else
+ #include <stdlib.h>
+ #include <stddef.h>
+ #ifndef alloca
+-# ifdef __GNUC__
++# if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
++# include <stdlib.h>
++# elif defined __GNUC__
+ # define alloca __builtin_alloca
+ # elif defined _MSC_VER
# include <malloc.h>
- # define alloca _alloca
-+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
-+# include <stdlib.h>
- # else
- # ifdef HAVE_ALLOCA_H
- # include <alloca.h>
-@@ -27482,7 +27489,9 @@ fi
+@@ -28604,7 +28611,9 @@ fi
interix*) :
: ${LDSHARED='$(CC) -shared'}
XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -55,16 +57,25 @@
rb_cv_dlopen=yes ;; #(
freebsd*|dragonfly*) :
-@@ -28743,7 +28752,7 @@ fi
+@@ -28775,7 +28784,7 @@ fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $flag is accepted for bundle" >&5
+ printf %s "checking whether $flag is accepted for bundle... " >&6; }
+ : > conftest.c
+- if ${LDSHARED/'$(CC)'/$CC} -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err &&
++ if $(echo ${LDSHARED} | sed -e "s/'$(CC)'/$CC/g") -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err &&
+ test ! -s conftest.err
+ then :
+
+@@ -29929,7 +29938,7 @@ fi
;; #(
freebsd*|dragonfly*) :
- LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
+ LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)$(TEENY)'
LIBRUBY_SONAME='$(LIBRUBY_SO)'
- if test "$rb_cv_binary_elf" != "yes" ; then :
-
-@@ -28822,9 +28831,10 @@ esac
+ if test "$rb_cv_binary_elf" != "yes"
+ then :
+@@ -30010,9 +30019,10 @@ esac
;; #(
darwin*) :
@@ -74,10 +85,10 @@
- LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)'
+ LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)'
+ LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)'
- if test "$load_relative" = yes; then :
+ if test "$load_relative" = yes
+ then :
- libprefix="@executable_path/../${libdir_basename}"
-@@ -28845,7 +28855,12 @@ fi
+@@ -30035,7 +30045,12 @@ fi
;; #(
interix*) :
@@ -91,7 +102,7 @@
;; #(
mingw*|cygwin*|mswin*) :
-@@ -29027,7 +29042,7 @@ if test "$enable_rpath" = yes; then :
+@@ -30228,7 +30243,7 @@ then :
esac
rpathflag=`IFS="$PATH_SEPARATOR"
echo x "$rpathflag" |
@@ -100,19 +111,21 @@
`
LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -31751,19 +31766,7 @@ which seems to be undefined. Please mak
+@@ -33031,21 +33046,7 @@ which seems to be undefined. Please mak
"Makefile":F)
tmpmk=confmk$$.tmp
{
-- if test ${VCS+set}; then :
+- if test ${VCS+set}
+-then :
-
- :
-
--elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then :
+-elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`
+-then :
-
- VCS='$(GIT)'
-
--else
+-else $as_nop
-
VCS='echo cannot'
-
Home |
Main Index |
Thread Index |
Old Index