pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2017Q2]: pkgsrc/lang/ruby22-base Pullup ticket #5543 - request...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c74b847df547
branches: pkgsrc-2017Q2
changeset: 408687:c74b847df547
user: spz <spz%pkgsrc.org@localhost>
date: Fri Sep 15 19:25:02 2017 +0000
description:
Pullup ticket #5543 - requested by taca
lang/ruby22-base: security and build fixes
Revisions pulled up:
- lang/ruby22-base/Makefile 1.18
- lang/ruby22-base/distinfo 1.18-1.19
- lang/ruby22-base/patches/patch-configure 1.5
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: taca
Date: Thu Jul 6 16:35:05 UTC 2017
Modified Files:
pkgsrc/lang/ruby22-base: distinfo
pkgsrc/lang/ruby22-base/patches: patch-configure
pkgsrc/lang/ruby23-base: distinfo
pkgsrc/lang/ruby23-base/patches: patch-configure
Log Message:
Fix build problem when PKGSRC_USE_RELRO is not "no".
* Pass LDFLAGS to LIBRUBY_DLDFLAGS via DLDFLAGS as Ruby 2.4 dose.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/ruby22-base/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ruby22-base/patches/patch-configure
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: taca
Date: Wed Aug 30 03:32:55 UTC 2017
Modified Files:
pkgsrc/lang/ruby22-base: Makefile distinfo
Log Message:
Add patch to fix vulnerabilities of rubygems.
https://www.ruby-lang.org/en/news/2017/08/29/multiple-vulnerabilities-in-rubygems/
* a DNS request hijacking vulnerability
* an ANSI escape sequence vulnerability
* a DoS vulernerability in the query command
* a vulnerability in the gem installer that allowed a malicious gem to
overwrite arbitrary files
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/ruby22-base/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/ruby22-base/distinfo
diffstat:
lang/ruby22-base/Makefile | 6 +-
lang/ruby22-base/distinfo | 8 +-
lang/ruby22-base/patches/patch-configure | 97 ++++++++++++++++++++++++++++---
3 files changed, 97 insertions(+), 14 deletions(-)
diffs (204 lines):
diff -r 0358c1fc8358 -r c74b847df547 lang/ruby22-base/Makefile
--- a/lang/ruby22-base/Makefile Wed Sep 13 18:01:01 2017 +0000
+++ b/lang/ruby22-base/Makefile Fri Sep 15 19:25:02 2017 +0000
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.17 2017/05/30 15:46:21 taca Exp $
+# $NetBSD: Makefile,v 1.17.2.1 2017/09/15 19:25:02 spz Exp $
DISTNAME= ${RUBY_DISTNAME}
PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
+PKGREVISION= 1
CATEGORIES= lang ruby
MASTER_SITES= ${MASTER_SITE_RUBY}
+PATCH_SITES= https://bugs.ruby-lang.org/attachments/download/6690/
+PATCHFILES= rubygems-2613-ruby22.patch
+
MAINTAINER= taca%NetBSD.org@localhost
HOMEPAGE= ${RUBY_HOMEPAGE}
COMMENT= Ruby ${RUBY_VERSION} release minimum base package
diff -r 0358c1fc8358 -r c74b847df547 lang/ruby22-base/distinfo
--- a/lang/ruby22-base/distinfo Wed Sep 13 18:01:01 2017 +0000
+++ b/lang/ruby22-base/distinfo Fri Sep 15 19:25:02 2017 +0000
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.17 2017/04/09 15:49:50 taca Exp $
+$NetBSD: distinfo,v 1.17.2.1 2017/09/15 19:25:02 spz Exp $
SHA1 (ruby-2.2.7.tar.bz2) = 0b5b79f55a1e7a7c2f6600e75167c1b9cc435042
RMD160 (ruby-2.2.7.tar.bz2) = 5aef4d373a0ea7434b7c32098b43ecc6fba542a6
SHA512 (ruby-2.2.7.tar.bz2) = 83756cd1c91516962b83961e0de59d858618f7ed3e9795f930aab4f199d47a95ed8f867d8aa9b51d508be26d9babf2140117c88241168bac41e6ef702cfadf20
Size (ruby-2.2.7.tar.bz2) = 13381078 bytes
-SHA1 (patch-configure) = ad3d1862a48d12b793fd0062eb357372caa19abc
+SHA1 (rubygems-2613-ruby22.patch) = e5199afa6cfbe07f729dafab5f1358e7ed193b84
+RMD160 (rubygems-2613-ruby22.patch) = b80aa70e6ba6f5b62d4797b5d0f6e9390203a7ce
+SHA512 (rubygems-2613-ruby22.patch) = 301a32b3107ab03642a900660b8b43a62263e55a0d6d645ca4dd95d38e0c5068e84c1ec85ef0cd7bb2063433fcf26f0037cf32e6cb149f8a74950d3e2c083ab2
+Size (rubygems-2613-ruby22.patch) = 11094 bytes
+SHA1 (patch-configure) = fda86ab23ec6291f3a51001793686904d4433b38
SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959
SHA1 (patch-ext_openssl_ossl__ssl.c) = e887a5576959921da116a5cee629c25610169593
SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d
diff -r 0358c1fc8358 -r c74b847df547 lang/ruby22-base/patches/patch-configure
--- a/lang/ruby22-base/patches/patch-configure Wed Sep 13 18:01:01 2017 +0000
+++ b/lang/ruby22-base/patches/patch-configure Fri Sep 15 19:25:02 2017 +0000
@@ -1,11 +1,12 @@
-$NetBSD: patch-configure,v 1.4 2016/05/15 14:07:48 taca Exp $
+$NetBSD: patch-configure,v 1.4.10.1 2017/09/15 19:25:03 spz Exp $
* Adding Interix support.
* Ignore doxygen.
+* Pass LDFLAGS to LIBRUBY_DLDFLAGS via DLDFLAGS as Ruby 2.4 dose.
---- configure.orig 2016-04-26 04:51:48.000000000 +0000
+--- configure.orig 2017-03-28 07:53:45.000000000 +0000
+++ configure
-@@ -5579,7 +5579,7 @@ esac
+@@ -5581,7 +5581,7 @@ esac
else
if test x"$target_alias" = x; then
case "$target_os" in #(
@@ -14,7 +15,15 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
$as_echo_n "checking for real target cpu... " >&6; }
-@@ -8850,6 +8850,10 @@ esac
+@@ -7456,6 +7456,7 @@ fi
+
+
+
++: ${DLDFLAGS="$LDFLAGS"}
+
+ case $RUBY_PATCHLEVEL in #(
+ -*) :
+@@ -8909,6 +8910,10 @@ esac
LIBS="-lm $LIBS"
ac_cv_func_round=no
;; #(
@@ -25,7 +34,7 @@
nacl) :
LIBS="-lm $LIBS"
-@@ -16945,6 +16949,8 @@ else
+@@ -17004,6 +17009,8 @@ else
# ifdef _MSC_VER
# include <malloc.h>
# define alloca _alloca
@@ -34,7 +43,7 @@
# else
# ifdef HAVE_ALLOCA_H
# include <alloca.h>
-@@ -21234,7 +21240,9 @@ esac ;; #(
+@@ -21293,7 +21300,9 @@ esac ;; #(
interix*) :
: ${LDSHARED='$(CC) -shared'}
XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -44,7 +53,26 @@
rb_cv_dlopen=yes ;; #(
freebsd*|dragonfly*) :
-@@ -22455,7 +22463,7 @@ esac
+@@ -22503,7 +22512,17 @@ esac
+ ;; #(
+ linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu) :
+
+- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR"
++ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS)
++ for rb_opt in '-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' "$LDFLAGS_OPTDIR"; do
++ case " ${LIBRUBY_DLDFLAGS-} " in #(
++ *" ${rb_opt} "*) :
++ ;; #(
++ ' ') :
++ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #(
++ *) :
++ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;;
++esac
++ done
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
+ if test "$load_relative" = yes; then
+ libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
+@@ -22514,7 +22533,7 @@ esac
freebsd*|dragonfly*) :
SOLIBS='$(LIBS)'
@@ -53,7 +81,54 @@
if test "$rb_cv_binary_elf" != "yes" ; then
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
LIBRUBY_ALIASES=''
-@@ -22534,7 +22542,12 @@ esac
+@@ -22524,7 +22543,17 @@ esac
+
+ SOLIBS='$(LIBS)'
+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
+- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'" $LDFLAGS_OPTDIR"
++ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS)
++ for rb_opt in '-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' "$LDFLAGS_OPTDIR"; do
++ case " ${LIBRUBY_DLDFLAGS-} " in #(
++ *" ${rb_opt} "*) :
++ ;; #(
++ ' ') :
++ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #(
++ *) :
++ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;;
++esac
++ done
+ if test "$rb_cv_binary_elf" = yes; then # ELF platforms
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
+ else # a.out platforms
+@@ -22556,7 +22585,17 @@ esac
+ ;; #(
+ aix*) :
+
+- LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS $LDFLAGS_OPTDIR"
++ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS)
++ for rb_opt in "${linker_flag}-bnoentry" "$XLDFLAGS" "$LDFLAGS_OPTDIR"; do
++ case " ${LIBRUBY_DLDFLAGS-} " in #(
++ *" ${rb_opt} "*) :
++ ;; #(
++ ' ') :
++ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #(
++ *) :
++ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;;
++esac
++ done
+ LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
+ SOLIBS='-lm -lc'
+ ;; #(
+@@ -22565,7 +22604,7 @@ esac
+ case "$target_cpu" in #(
+ powerpc*) :
+
+- LIBRUBY_DLDFLAGS="-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o $LDFLAGS_OPTDIR"
++ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS -f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o $LDFLAGS_OPTDIR"
+ ;; #(
+ *) :
+ ;;
+@@ -22593,7 +22632,12 @@ esac
;; #(
interix*) :
@@ -67,7 +142,7 @@
;; #(
mingw*|cygwin*|mswin*) :
-@@ -22707,7 +22720,7 @@ if test "$enable_rpath" = yes; then
+@@ -22766,7 +22810,7 @@ if test "$enable_rpath" = yes; then
esac
rpathflag=`IFS="$PATH_SEPARATOR"
echo x "$rpathflag" |
@@ -76,7 +151,7 @@
`
LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -23026,11 +23039,7 @@ if test "$install_doc" != no; then
+@@ -23085,11 +23129,7 @@ if test "$install_doc" != no; then
else
RDOCTARGET="nodoc"
fi
@@ -89,7 +164,7 @@
else
RDOCTARGET="nodoc"
CAPITARGET="nodoc"
-@@ -25136,17 +25145,7 @@ which seems to be undefined. Please mak
+@@ -25195,17 +25235,7 @@ which seems to be undefined. Please mak
"Makefile":F)
tmpmk=confmk$$.tmp
{
Home |
Main Index |
Thread Index |
Old Index