head 1.4; access; symbols pkgsrc-2022Q3:1.3.0.12 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.10 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.8 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.6 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.4 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.2 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.2.0.18 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.16 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.14 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.12 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.8 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.10 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.6 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.4 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.2 pkgsrc-2019Q1-base:1.2; locks; strict; comment @# @; 1.4 date 2022.10.10.03.29.30; author taca; state dead; branches; next 1.3; commitid 73PigbYpIBHzA7XD; 1.3 date 2021.04.11.12.28.37; author taca; state Exp; branches; next 1.2; commitid cMDgpvqg7YFJ9SOC; 1.2 date 2019.03.14.09.57.54; author jperkin; state Exp; branches 1.2.18.1; next 1.1; commitid YTC0Udc8vKbCIjfB; 1.1 date 2019.02.03.13.41.33; author taca; state Exp; branches; next ; commitid KmIGO5VPLNvAckaB; 1.2.18.1 date 2021.04.15.07.10.45; author bsiegert; state Exp; branches; next ; commitid QUNmh36CeXVLgmPC; desc @@ 1.4 log @lang/ruby26-base: remove Ruby 2.6 packages from pkgsrc Ruby 2.6 reached to EOL on 22th April 2022. @ text @$NetBSD: patch-configure,v 1.3 2021/04/11 12:28:37 taca Exp $ * Adding Interix support. * Ignore doxygen. * Ignore VCS. * Handle SSP in pkgsrc. * Put -std= in CFLAGS not CPPFLAGS. --- configure.orig 2021-04-05 11:48:36.000000000 +0000 +++ configure @@@@ -6064,7 +6064,7 @@@@ else if test x"$target_alias" = x; 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; } @@@@ -8431,6 +8431,7 @@@@ fi stack_protector=no ;; #( *) : + stack_protector=no ;; esac if test -z "${stack_protector+set}"; then : @@@@ -10277,6 +10278,10 @@@@ esac ac_cv_func___builtin_setjmp=no ;; #( + interix*) : + LIBS="-lm $LIBS" + ac_cv_func_getpgrp_void=yes + ;; #( *) : ;; esac @@@@ -21638,6 +21643,8 @@@@ else # ifdef _MSC_VER # include # define alloca _alloca +# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) +# include # else # ifdef HAVE_ALLOCA_H # include @@@@ -26842,7 +26849,9 @@@@ fi interix*) : : ${LDSHARED='$(CC) -shared'} XLDFLAGS="$XLDFLAGS -Wl,-E" + DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' LIBPATHFLAG=" -L%1\$-s" + RPATHFLAG=' -Wl,-R%1$-s' rb_cv_dlopen=yes ;; #( freebsd*|dragonfly*) : @@@@ -28084,7 +28093,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 : @@@@ -28163,9 +28172,10 @@@@ esac ;; #( darwin*) : + RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)' LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)' - LIBRUBY_SONAME='$(LIBRUBY_SO)' - 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 : libprefix="@@executable_path/../${libdir_basename}" @@@@ -28186,7 +28196,12 @@@@ fi ;; #( interix*) : - LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' + SOLIBS='$(LIBS)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' + # link explicitly to 0x48000000 + LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' + LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' ;; #( mingw*|cygwin*|mswin*) : @@@@ -28368,7 +28383,7 @@@@ if test "$enable_rpath" = yes; then : esac rpathflag=`IFS="$PATH_SEPARATOR" echo x "$rpathflag" | - sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" + sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" ` LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" @@@@ -28910,15 +28925,7 @@@@ fi if test "$install_doc" != no; then : - if test "$install_rdoc" != no; then : - - RDOCTARGET="rdoc" - -else - - RDOCTARGET="nodoc" - -fi + RDOCTARGET="nodoc" if test "$install_capi" != no -a -n "$DOXYGEN"; then : CAPITARGET="capi" @@@@ -31072,31 +31079,7 @@@@ which seems to be undefined. Please mak "Makefile":F) tmpmk=confmk$$.tmp { - if test ${VCS+set}; then : - - : - -elif svn info "$srcdir" > /dev/null 2>&1; then : - - VCS='svn' - -elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then : - - if test -d "$git_dir/svn"; then : - - VCS='$(GIT) svn' - -else - - VCS='$(GIT)' - -fi - -else - - VCS='echo cannot' - -fi + VCS='echo cannot' case "$VCS" in #( svn) : VCSUP='$(VCS) up $(SVNUPOPTIONS)' ;; #( @ 1.3 log @lang/ruby26-base: update to 2.6.7 Ruby 2.6.7 Released (2021-04-05) This release includes security fixes. Please check the topics below for details. * CVE-2020-25613: Potential HTTP Request Smuggling Vulnerability in WEBrick * CVE-2021-28965: XML round-trip vulnerability in REXML See the commit logs for details. By this release, we end the normal maintenance phase of Ruby 2.6, and Ruby 2.6 enters the security maintenance phase. This means that we will no longer backport any bug fixes to Ruby 2.6 except security fixes. The term of the security maintenance phase is scheduled for a year. Ruby 2.6 reaches EOL and its official support ends by the end of the security maintenance phase. Therefore, we recommend that you start to plan upgrade to Ruby 2.7 or 3.0. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.2 2019/03/14 09:57:54 jperkin Exp $ @ 1.2 log @ruby26-base: Fix install on Darwin. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.1 2019/02/03 13:41:33 taca Exp $ a7 1 * Fix argument for pthread_self() on NetBSD. d9 1 a9 1 --- configure.orig 2019-01-30 10:41:14.000000000 +0000 d11 1 a11 1 @@@@ -6048,7 +6048,7 @@@@ else d20 1 a20 1 @@@@ -8393,6 +8393,7 @@@@ fi d28 1 a28 1 @@@@ -10239,6 +10240,10 @@@@ esac d39 1 a39 1 @@@@ -21600,6 +21605,8 @@@@ else d48 1 a48 15 @@@@ -26151,11 +26158,11 @@@@ if ${rb_cv_func_pthread_setname_np_argum else rb_cv_func_pthread_setname_np_arguments= # Linux,AIX, (pthread_self(), name) - # NetBSD (pthread_self(), name, \"%s\") + # NetBSD (pthread_self(), \"%s\", name) # Darwin (name) for mac in \ "(pthread_self(), name)" \ - "(pthread_self(), name, \"%s\")" \ + "(pthread_self(), \"%s\", name)" \ "(name)" \ ; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@@@ -26749,7 +26756,9 @@@@ fi d58 1 a58 1 @@@@ -27991,7 +28000,7 @@@@ fi d67 1 a67 1 @@@@ -28070,9 +28079,10 @@@@ esac d80 1 a80 1 @@@@ -28093,7 +28103,12 @@@@ fi d94 1 a94 1 @@@@ -28275,7 +28290,7 @@@@ if test "$enable_rpath" = yes; then : d103 1 a103 1 @@@@ -28817,15 +28832,7 @@@@ fi d120 1 a120 1 @@@@ -30979,31 +30988,7 @@@@ which seems to be undefined. Please mak @ 1.2.18.1 log @Pullup ticket #6443 - requested by taca lang/ruby26-base: security fix, bugfix Revisions pulled up: - lang/ruby/rubyversion.mk 1.227-1.228 - lang/ruby26-base/ALTERNATIVES 1.2 - lang/ruby26-base/Makefile 1.13 - lang/ruby26-base/PLIST 1.5 - lang/ruby26-base/distinfo 1.10 - lang/ruby26-base/patches/patch-configure 1.3 - lang/ruby26-base/patches/patch-lib_webrick_httprequest.rb deleted --- Module Name: pkgsrc Committed By: taca Date: Sun Apr 11 12:16:20 UTC 2021 Modified Files: pkgsrc/lang/ruby: rubyversion.mk Log Message: lang/ruby/rubyversion.mk: pass RUBY_RAILS_ACCEPTED Pass RUBY_RAILS_ACCEPTED to MAKEFLAGS unless it isn't empty. --- Module Name: pkgsrc Committed By: taca Date: Sun Apr 11 12:28:38 UTC 2021 Modified Files: pkgsrc/lang/ruby: rubyversion.mk pkgsrc/lang/ruby26-base: Makefile PLIST distinfo pkgsrc/lang/ruby26-base/patches: patch-configure Removed Files: pkgsrc/lang/ruby26-base/patches: patch-lib_webrick_httprequest.rb Log Message: lang/ruby26-base: update to 2.6.7 Ruby 2.6.7 Released (2021-04-05) This release includes security fixes. Please check the topics below for details. * CVE-2020-25613: Potential HTTP Request Smuggling Vulnerability in WEBrick * CVE-2021-28965: XML round-trip vulnerability in REXML See the commit logs for details. By this release, we end the normal maintenance phase of Ruby 2.6, and Ruby 2.6 enters the security maintenance phase. This means that we will no longer backport any bug fixes to Ruby 2.6 except security fixes. The term of the security maintenance phase is scheduled for a year. Ruby 2.6 reaches EOL and its official support ends by the end of the security maintenance phase. Therefore, we recommend that you start to plan upgrade to Ruby 2.7 or 3.0. --- Module Name: pkgsrc Committed By: taca Date: Sun Apr 11 13:00:25 UTC 2021 Modified Files: pkgsrc/lang/ruby26-base: ALTERNATIVES Log Message: lang/ruby26-base: fix ALTERNATIVES file @ text @d1 1 a1 1 $NetBSD$ d8 1 d10 1 a10 1 --- configure.orig 2021-04-05 11:48:36.000000000 +0000 d12 1 a12 1 @@@@ -6064,7 +6064,7 @@@@ else d21 1 a21 1 @@@@ -8431,6 +8431,7 @@@@ fi d29 1 a29 1 @@@@ -10277,6 +10278,10 @@@@ esac d40 1 a40 1 @@@@ -21638,6 +21643,8 @@@@ else d49 15 a63 1 @@@@ -26842,7 +26849,9 @@@@ fi d73 1 a73 1 @@@@ -28084,7 +28093,7 @@@@ fi d82 1 a82 1 @@@@ -28163,9 +28172,10 @@@@ esac d95 1 a95 1 @@@@ -28186,7 +28196,12 @@@@ fi d109 1 a109 1 @@@@ -28368,7 +28383,7 @@@@ if test "$enable_rpath" = yes; then : d118 1 a118 1 @@@@ -28910,15 +28925,7 @@@@ fi d135 1 a135 1 @@@@ -31072,31 +31079,7 @@@@ which seems to be undefined. Please mak @ 1.1 log @lang/ruby26-base: add Ruby 2.6.1 Add Ruby release 2.6.1. Ruby 2.6.0 (2018-12-25) New major features: * A new JIT compiler. * The RubyVM::AbstractSyntaxTree module. For more detail, please refer: Ruby 2.6.1 (2019-01-30) Major change: * Net::Protocol::BufferedIO#write raises NoMethodError when sending large multi-byte string has been fixed. For more detail, please refer: @ text @d1 1 a1 1 $NetBSD$ d10 1 a10 1 --- configure.orig 2018-12-25 06:28:23.000000000 +0000 d40 1 a40 1 @@@@ -21598,6 +21603,8 @@@@ else d49 1 a49 1 @@@@ -26149,11 +26156,11 @@@@ if ${rb_cv_func_pthread_setname_np_argum d63 1 a63 1 @@@@ -26747,7 +26754,9 @@@@ fi d73 1 a73 1 @@@@ -27989,7 +27998,7 @@@@ fi d82 1 a82 1 @@@@ -28068,6 +28077,7 @@@@ esac d88 8 a95 3 LIBRUBY_SONAME='$(LIBRUBY_SO)' LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)' @@@@ -28091,7 +28101,12 @@@@ fi d109 1 a109 1 @@@@ -28273,7 +28288,7 @@@@ if test "$enable_rpath" = yes; then : d118 1 a118 1 @@@@ -28815,15 +28830,7 @@@@ fi d135 1 a135 1 @@@@ -30977,31 +30984,7 @@@@ which seems to be undefined. Please mak @