Verified Commit 45c7d18e authored by A. Wilcox's avatar A. Wilcox 🦊
Browse files

Update Ruby to 2.7.1

* Coroutines are using libucontext; added to ruby depends_dev.

* Asciidoctor updated to 2.x branch since we have newer Ruby now.

* uWSGI may not work properly with Rack; currently untested.
parent 36a36b43
# Contributor: Seung Soo Mun <hamletmun@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=asciidoctor
pkgver=1.5.8
pkgver=2.0.10
pkgrel=0
pkgdesc="An implementation of AsciiDoc in Ruby"
url="https://rubygems.org/gems/$pkgname"
......@@ -13,7 +13,7 @@ makedepends=""
source="https://rubygems.org/downloads/$pkgname-$pkgver.gem"
package() {
local gemdir="$(ruby -e 'puts Gem.default_dir')"
gemdir="$(ruby -e 'puts Gem.default_dir')"
gem install \
--local \
......@@ -26,7 +26,7 @@ package() {
rm -rf "$pkgdir"/$gemdir/cache
cd "$pkgdir"
local i; for i in usr/lib/ruby/gems/*/bin/*; do
for i in usr/lib/ruby/gems/*/bin/*; do
if [ -e "$i" ]; then
mkdir -p "$pkgdir"/usr/bin
ln -s /$i "$pkgdir"/usr/bin/
......@@ -34,4 +34,4 @@ package() {
done
}
sha512sums="34ff0df98ff9ebb2d3640629870cd848cf2f4b617564a42e7b30b6cf60c01d1188b4cc695af49550e054c9e833accc1ed5d622b4952ece3da99c8ed98af769ac asciidoctor-1.5.8.gem"
sha512sums="41db1947da60be27079eaef99c76ae7a20797f0291313ac82582466774a569130e995c674f7ef884a05d3d3783d70df3d5ef83b42ded1c722dd9ab7b1a3357ab asciidoctor-2.0.10.gem"
......@@ -42,21 +42,20 @@
# - CVE-2020-8130
#
pkgname=ruby
pkgver=2.5.7
pkgver=2.7.1
_abiver="${pkgver%.*}.0"
pkgrel=1
pkgrel=0
pkgdesc="An object-oriented language for quick and easy programming"
url="https://www.ruby-lang.org/"
arch="all"
license="Ruby AND BSD-2-Clause"
depends="ca-certificates"
depends_dev="ruby=$pkgver-r$pkgrel gmp-dev"
depends_dev="ruby=$pkgver-r$pkgrel gmp-dev libucontext-dev"
makedepends="$depends_dev zlib-dev openssl-dev db-dev libedit-dev
libffi-dev coreutils yaml-dev linux-headers autoconf"
install="$pkgname.post-upgrade"
subpackages="$pkgname-doc $pkgname-dev
$pkgname-bigdecimal
$pkgname-did_you_mean::noarch
$pkgname-fiddle
$pkgname-io-console:io_console
$pkgname-irb::noarch
......@@ -78,7 +77,6 @@ source="https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/$pkgname-$pkgver.tar.x
test_insns-lower-recursion-depth.patch
fix-get_main_stack.patch
libedit-compat.patch
CVE-2020-8130.patch
"
replaces="ruby-etc ruby-gems"
......@@ -111,6 +109,9 @@ build() {
export CFLAGS="$CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing"
export CPPFLAGS="$CPPFLAGS -fno-omit-frame-pointer -fno-strict-aliasing"
# Needed for coroutine stuff
export LIBS="-lucontext"
# ruby saves path to install. we want use $PATH
export INSTALL=install
......@@ -147,7 +148,7 @@ package() {
rm -R "$pkgdir"$_gemdir/cache/*
if [ -d "$pkgdir"/usr/local ]; then
local f="$(cd "$pkgdir" ; find usr/local -type f)"
f="$(cd "$pkgdir" ; find usr/local -type f)"
if [ -n "$f" ]; then
error "Found files in /usr/local:"
echo "$f"
......@@ -165,14 +166,6 @@ bigdecimal() {
_mvgem bigdecimal
}
did_you_mean() {
pkgdesc="Did you mean? experience in Ruby"
license="MIT"
depends="$pkgname-libs"
_mvgem did_you_mean
}
fiddle() {
pkgdesc="A libffi wrapper for Ruby"
license="BSD-2-Clause"
......@@ -298,7 +291,7 @@ full() {
}
_mv() {
local i; for i in "$@"; do
for i in "$@"; do
mkdir -p "$subpkgdir"/${i%/*}
mv "$pkgdir"/${i} "$subpkgdir"/${i%/*}/
done
......@@ -306,7 +299,7 @@ _mv() {
_mvgem() {
cd "$pkgdir"
local path; for path in ./$_rubydir/${1}.rb \
for path in ./$_rubydir/${1}.rb \
./$_rubydir/${1} \
./$_rubydir/$_chost/${1} \
./$_rubydir/$_chost/${1}.so \
......@@ -317,9 +310,8 @@ _mvgem() {
done
}
sha512sums="63b7c75fab44cd1bd22f22ddec00c740cf379ac7240da0dfafcec54347766695faef47428ce1c433fd77fa96992e976c984697067fa526236d383b12adc9ce75 ruby-2.5.7.tar.xz
20e7e5ee9936a93872fe1ad836dd1fde001fe4a0e7ed54c26727ad83da3ceb0e6247681d9dd4f98a69e1b0250703ed8fc682d44075780d5f47faa1d5f58d2bdb rubygems-avoid-platform-specific-gems.patch
sha512sums="79f98b1ea98e0b10ec79da1883e8fc84d48ffe5c09ae945cbebde94365e35a589d919aac965f74d70ca7e21370ecee631ac5a8f9c4eac61d62f5aa629f27bf31 ruby-2.7.1.tar.xz
a142199140fa711a64717429e9069fd2082319abaf4b129f561db374b3bc16e2a90cc4c849b5d28334505d1c71fed242aef3c44d983da3513d239dcb778673a5 rubygems-avoid-platform-specific-gems.patch
814fe6359505b70d8ff680adf22f20a74b4dbd3fecc9a63a6c2456ee9824257815929917b6df5394ed069a6869511b8c6dce5b95b4acbbb7867c1f3a975a0150 test_insns-lower-recursion-depth.patch
e99b36940fa8fdd445d82738c70b8fc042cab042a4662cab156578aad2dac9673a96da22b6676aa36beac08070e92a7798c60d6f36eeb169216c4c51864ce2fe fix-get_main_stack.patch
6b88fccce164db1d8beb16adeffdd7effd077e9842b7f61deddebeb39afcf9b839192b68a43ce66a1ff0c9aeaacc4f13a0ee56184c22e822cd8b10a07a1c87b2 libedit-compat.patch
50b3a2aca1c0d7a7b557e030fbf57049512730cd6516cb6b26624855c25a20e84eef7f84ec9eafb94200de067ec67790e5fe0902e69681ac4de9195240b318dc CVE-2020-8130.patch"
3ffc034c01110ee5531265333ca5ee8d61d08131843fe3004c5b34c88c9c1b32cb4ed89574f393177c8bd526e9c15da61ab344f93adf07b9148c561ee19e2eb5 fix-get_main_stack.patch
6cbeb9d05a3c028e6bd371deaeec6e97fa8ebd03f0dc9d406648a03b569bb44a148e2bd81998a2a973e91ded8a08af141bdebe3e324bdc32df5e74209a42b024 libedit-compat.patch"
Note: adjusted paths since it's being vendored inside ruby.
From 5b8f8fc41a5d7d7d6a5d767e48464c60884d3aee Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Mon, 22 Jul 2019 10:23:43 +0900
Subject: [PATCH] Use File.open explicitly.
--- ruby-2.5.7/gems/rake-12.3.0/lib/rake/file_list.rb
+++ ruby-2.5.7/gems/rake-12.3.0/lib/rake/file_list.rb
@@ -294,7 +294,7 @@ def egrep(pattern, *options)
matched = 0
each do |fn|
begin
- open(fn, "r", *options) do |inf|
+ File.open(fn, "r", *options) do |inf|
count = 0
inf.each do |line|
count += 1
......@@ -2,7 +2,7 @@ diff --git a/thread_pthread.c b/thread_pthread.c
index 951885ffa0..cf90321d1d 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -552,9 +552,6 @@ hpux_attr_getstackaddr(const pthread_attr_t *attr, void **addr)
@@ -656,9 +656,6 @@ hpux_attr_getstackaddr(const pthread_attr_t *attr, void **addr)
# define MAINSTACKADDR_AVAILABLE 0
# endif
#endif
......@@ -12,7 +12,7 @@ index 951885ffa0..cf90321d1d 100644
#ifdef STACKADDR_AVAILABLE
/*
@@ -632,6 +629,55 @@ get_stack(void **addr, size_t *size)
@@ -740,6 +737,55 @@ get_stack(void **addr, size_t *size)
return 0;
#undef CHECK_ERR
}
......
--- ruby-2.5.5/ext/readline/readline.c.old 2017-09-30 08:35:23.000000000 +0000
+++ ruby-2.5.5/ext/readline/readline.c 2019-09-09 06:12:00.300098741 +0000
@@ -571,6 +571,9 @@
@@ -572,6 +572,9 @@
rb_syserr_fail(save_errno, "fdopen");
}
rl_instream = readline_rl_instream = f;
......@@ -10,7 +10,7 @@
readline_instream = input;
}
return input;
@@ -607,6 +610,9 @@
@@ -608,6 +611,9 @@
rb_syserr_fail(save_errno, "fdopen");
}
rl_outstream = readline_rl_outstream = f;
......
......@@ -17,7 +17,7 @@ a platform-agnostic (source) gem. Users can override it using
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -764,7 +764,10 @@
@@ -759,7 +759,10 @@
def self.platforms
@platforms ||= []
if @platforms.empty?
......
......@@ -3,7 +3,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=protobuf
_gemname=google-protobuf
pkgver=3.11.3
pkgver=3.11.4
_tstver=1.8.1
pkgrel=0
pkgdesc="Library for extensible, efficient structure packing"
......@@ -111,5 +111,5 @@ vim() {
"$subpkgdir"/usr/share/vim/vimfiles/syntax/proto.vim
}
sha512sums="beac21d495bfd8e9b40120d1db9fd82251958f954533fc6f76cd0b9c28f92533ac35368a4c298ebb1d8e09047b670ed3bd948bb7da6eb5cca7fdc0c1c44aa39b protobuf-3.11.3.tar.gz
sha512sums="777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261 protobuf-3.11.4.tar.gz
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 googletest-1.8.1.tar.gz"
......@@ -2,7 +2,7 @@
# Maintainer: Alyx Wolcott <alyx@leuhta.com>
_gemname=bundler
pkgname=ruby-$_gemname
pkgver=2.1.2
pkgver=2.1.4
pkgrel=0
pkgdesc="Manage an application's gem dependencies"
url="https://bundler.io/"
......@@ -16,7 +16,7 @@ source="https://rubygems.org/downloads/$_gemname-$pkgver.gem"
builddir="$srcdir/$_gemname-$pkgver"
package() {
local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gem install --local \
--install-dir "$gemdir" \
......@@ -39,4 +39,4 @@ package() {
}
sha512sums="2a3b42fa2c6f40998c900eaf9d81d6417970f3daa572e4f1c5cc954fd8ce1e3cacbda0dc9b77d44b2fa756cfb1e72838ef3edee1812881198bbe8c946017e22b bundler-2.1.2.gem"
sha512sums="6c870061a78e17d97a9219433c7ef8fbf1112de17d0e0f3d8b6db1a518318528e3803184278412aabe65008e93f451ffa59465062856918ef488f9438399eff6 bundler-2.1.4.gem"
......@@ -3,7 +3,7 @@
pkgname=ruby-diff-lcs
_gemname=${pkgname#ruby-}
pkgver=1.3
pkgrel=1
pkgrel=2
pkgdesc="Generate difference sets between Ruby sequences"
url="http://halostatue.github.io/diff-lcs/"
arch="noarch"
......@@ -19,8 +19,8 @@ build() {
}
package() {
local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
local geminstdir="$gemdir/gems/$_gemname-$pkgver"
gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
geminstdir="$gemdir/gems/$_gemname-$pkgver"
gem install --local \
--install-dir "$gemdir" \
......
......@@ -3,7 +3,7 @@
pkgname=ruby-rake-compiler
_gemname=${pkgname#ruby-}
pkgver=1.1.0
pkgrel=0
pkgrel=1
pkgdesc="Provide a standard and simplified way to build and package Ruby extensions"
url="https://github.com/rake-compiler/rake-compiler"
arch="noarch"
......@@ -24,7 +24,7 @@ check() {
}
package() {
local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gem install --local \
--install-dir "$gemdir" \
......
......@@ -3,7 +3,7 @@
pkgname=ruby-rspec-core
_gemname=${pkgname#ruby-}
pkgver=3.9.1
pkgrel=0
pkgrel=1
pkgdesc="RSpec runner and formatters"
url="https://relishapp.com/rspec/rspec-core"
arch="noarch"
......@@ -21,7 +21,7 @@ build() {
}
package() {
local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gem install --local \
--install-dir "$gemdir" \
......
......@@ -2,7 +2,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=ruby-rspec-expectations
_gemname=${pkgname#ruby-}
pkgver=3.9.0
pkgver=3.9.1
pkgrel=0
pkgdesc="Provides a readable API to express expected outcomes of a code example in RSpec"
url="https://relishapp.com/rspec/rspec-expectations/"
......@@ -21,7 +21,7 @@ build() {
}
package() {
local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gem install --local \
--install-dir "$gemdir" \
......@@ -36,5 +36,5 @@ package() {
"$gemdir"/doc
}
sha512sums="663b9739681c19b5bb1301447017ce4e10bc377ea3f4e51745ccfaa12b014a47e893aeb262b6fa3792e823adb90ae7a15f5c146c48aa80c72eec5faaf84d516c ruby-rspec-expectations-3.9.0.tar.gz
sha512sums="23a453a46c3eb3bd3f2a39f48f62f05832cf559b570ba0e09235dd6299687254491bab50f5502fefe69dbdeefa09e9d8c5568bc77d0b6b658bb469e197e67572 ruby-rspec-expectations-3.9.1.tar.gz
1d477004521852e23d01b197187dbb434a2c7fd179e506c82a12e17f5d52470fe2a113112e7052b9479077eafa6759beb07c03301de1f8ea7f5c4643c92d8346 gemspec.patch"
......@@ -3,7 +3,7 @@
pkgname=ruby-rspec-mocks
_gemname=${pkgname#ruby-}
pkgver=3.9.1
pkgrel=0
pkgrel=1
pkgdesc="RSpec's 'test double' framework, with support for stubbing and mocking"
url="https://relishapp.com/rspec/rspec-mocks/"
arch="noarch"
......@@ -21,7 +21,7 @@ build() {
}
package() {
local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gem install --local \
--install-dir "$gemdir" \
......
......@@ -3,7 +3,7 @@
pkgname=ruby-rspec-support
_gemname=${pkgname#ruby-}
pkgver=3.9.2
pkgrel=0
pkgrel=1
pkgdesc="Support utilities for RSpec gems"
url="https://rubygems.org/gems/rspec-support"
arch="noarch"
......@@ -21,7 +21,7 @@ build() {
}
package() {
local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gem install --local \
--install-dir "$gemdir" \
......
......@@ -3,7 +3,7 @@
pkgname=ruby-rspec
_gemname=${pkgname#ruby-}
pkgver=3.9.0
pkgrel=0
pkgrel=1
pkgdesc="Behaviour Driven Development for Ruby"
url="http://rspec.info/"
arch="noarch"
......@@ -23,7 +23,7 @@ build() {
}
package() {
local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
gem install --local \
--install-dir "$gemdir" \
......
......@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=uwsgi
pkgver=2.0.18
pkgrel=0
pkgrel=1
pkgdesc="Web application server"
url="https://projects.unbit.it/uwsgi"
arch="all"
......
......@@ -2,7 +2,7 @@
# Contributor: zlg <zlg+adelie@zlg.space>
# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=weechat
pkgver=2.7.1
pkgver=2.8
pkgrel=0
pkgdesc="Fast, light, extensible ncurses-based chat client"
url="https://www.weechat.org"
......@@ -49,8 +49,8 @@ package() {
}
_plugin() {
local _name="${subpkgname#*-}"
local _dir=usr/lib/weechat/plugins
_name="${subpkgname#*-}"
_dir=usr/lib/weechat/plugins
pkgdesc="WeeChat $_name plugin"
depends="weechat"
if [ "$_name" = spell ]; then
......@@ -61,4 +61,4 @@ _plugin() {
mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir
}
sha512sums="2d2f555a4c48dbfa60a97845657e041fcd37bdde01974b4a49ff2d0ef6b92f16147f84b0e60772e9f54ba3e05ae1772012d3551a5fbb8bdf8332a08ef63a352d weechat-2.7.1.tar.gz"
sha512sums="3071fc6c5d88d4e388fc22f23242cf264b9533b389668914fc25e71e9939b739ba63a4e182445222ed0a7470dc0b1d958828b56d2c82ac47e9dfce6513c70d80 weechat-2.8.tar.gz"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment