Skip to content

Commit 52f4469

Browse files
headiusheadius
committed
Merge remote-tracking branch 'origin/jruby-9.4'
2 parents 27ca382 + 025de4e commit 52f4469

File tree

6 files changed

+25
-31
lines changed

6 files changed

+25
-31
lines changed

‎SECURITY.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
## Supported Versions
44

5-
The 9.2.x series is currently being supported, and will continue to receive security updates.
5+
JRuby 10.0.x is the current version line for JRuby, and it will receive bug fixes and security updates.
66

7-
JRuby 9.3 is in development on the master branch, for release summer 2020.
7+
The 9.4.x series is still being supported for security updates.
8+
9+
JRuby 9.3 is no longer supported; we recommend upgrading to JRuby 10. Users requiring JRuby 9.3 support may contact [Headius Enterprises](https://www.headius.com/jruby-support.html) for commercial JRuby support offerings.
810

911
## Reporting a Vulnerability
1012

‎core/src/main/java/org/jruby/util/io/PopenExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,7 @@ private static RubyString execargInit(ThreadContext context, IRubyObject[] argv,
16211621
IRubyObject chdir;
16221622
if (!optForChdir.isNil() && (chdir = ((RubyHash) optForChdir).delete(chdirSym)) != null) {
16231623
eargp.chdirGiven = true;
1624-
eargp.chdir_dir = chdir.convertToString().toString();
1624+
eargp.chdir_dir = RubyFile.get_path(context, chdir).toString();
16251625
}
16261626

16271627
execFillarg(context, prog, argv_p[0], env_opt[0], env_opt[1], eargp);

‎lib/pom.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def log(message=nil)
7979
['shellwords', '0.2.2'],
8080
['singleton', '0.3.0'],
8181
['stringio', '3.1.5'],
82-
['strscan', '3.1.2'],
82+
['strscan', '3.1.5'],
8383
['subspawn', '0.1.1'], # has 3 transitive deps:
8484
['subspawn-posix', '0.1.1'],
8585
['ffi-binary-libfixposix', '0.5.1.1'],

‎lib/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ DO NOT MODIFY - GENERATED CODE
593593
<dependency>
594594
<groupId>rubygems</groupId>
595595
<artifactId>strscan</artifactId>
596-
<version>3.1.2</version>
596+
<version>3.1.5</version>
597597
<type>gem</type>
598598
<scope>provided</scope>
599599
<exclusions>
@@ -1161,7 +1161,7 @@ DO NOT MODIFY - GENERATED CODE
11611161
<include>specifications/shellwords-0.2.2*</include>
11621162
<include>specifications/singleton-0.3.0*</include>
11631163
<include>specifications/stringio-3.1.5*</include>
1164-
<include>specifications/strscan-3.1.2*</include>
1164+
<include>specifications/strscan-3.1.5*</include>
11651165
<include>specifications/subspawn-0.1.1*</include>
11661166
<include>specifications/subspawn-posix-0.1.1*</include>
11671167
<include>specifications/ffi-binary-libfixposix-0.5.1.1*</include>
@@ -1243,7 +1243,7 @@ DO NOT MODIFY - GENERATED CODE
12431243
<include>gems/shellwords-0.2.2*/**/*</include>
12441244
<include>gems/singleton-0.3.0*/**/*</include>
12451245
<include>gems/stringio-3.1.5*/**/*</include>
1246-
<include>gems/strscan-3.1.2*/**/*</include>
1246+
<include>gems/strscan-3.1.5*/**/*</include>
12471247
<include>gems/subspawn-0.1.1*/**/*</include>
12481248
<include>gems/subspawn-posix-0.1.1*/**/*</include>
12491249
<include>gems/ffi-binary-libfixposix-0.5.1.1*/**/*</include>
@@ -1325,7 +1325,7 @@ DO NOT MODIFY - GENERATED CODE
13251325
<include>cache/shellwords-0.2.2*</include>
13261326
<include>cache/singleton-0.3.0*</include>
13271327
<include>cache/stringio-3.1.5*</include>
1328-
<include>cache/strscan-3.1.2*</include>
1328+
<include>cache/strscan-3.1.5*</include>
13291329
<include>cache/subspawn-0.1.1*</include>
13301330
<include>cache/subspawn-posix-0.1.1*</include>
13311331
<include>cache/ffi-binary-libfixposix-0.5.1.1*</include>

‎spec/ruby/core/io/popen_spec.rb

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,20 @@
9595
@io = IO.popen(ruby_cmd('exit 0'), mode)
9696
end
9797

98+
it "accepts a path using the chdir: keyword argument" do
99+
File.write(@fname, 'hello world')
100+
@io = IO.popen("/bin/ls", chdir: File.dirname(@fname));
101+
@io.read.chomp.should == File.basename(@fname)
102+
end
103+
104+
it "accepts a path using the chdir: keyword argument and a coercible path" do
105+
path = mock("path")
106+
path.should_receive(:to_path).and_return(File.dirname(@fname))
107+
File.write(@fname, 'hello world')
108+
@io = IO.popen("/bin/ls", chdir: path);
109+
@io.read.chomp.should == File.basename(@fname)
110+
end
111+
98112
describe "with a block" do
99113
it "yields an open IO to the block" do
100114
IO.popen(ruby_cmd('exit'), "r") do |io|

‎tool/release.sh

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ rm -rf release
2828
git clone $REPO release
2929
cd release
3030
pwd
31-
mvn clean deploy -Psonatype-oss-release -Prelease
31+
mvn clean deploy -Prelease
3232
jruby -S rake post_process_artifacts
3333

3434
cd release
@@ -40,28 +40,6 @@ mv jruby_windows-x32_${WINDOWS_VERSION}.exe.sha1 jruby_windows_${WINDOWS_VERSION
4040
mv jruby_windows-x32_${WINDOWS_VERSION}.exe.sha256 jruby_windows_${WINDOWS_VERSION}.exe.sha256
4141
mv jruby_windows-x32_${WINDOWS_VERSION}.exe.sha512 jruby_windows_${WINDOWS_VERSION}.exe.sha512
4242

43-
pwd
44-
DOWNLOADS=s3://jruby.org/downloads
45-
VERSION=$JRUBY_VERSION
46-
47-
for FILE in jruby-bin-${VERSION}.tar.gz jruby-bin-${VERSION}.zip jruby-complete-${VERSION}.jar jruby-jars-${VERSION}.gem jruby-src-${VERSION}.tar.gz jruby-src-${VERSION}.zip jruby_windows_${WINDOWS_VERSION}.exe jruby_windows_x64_${WINDOWS_VERSION}.exe
48-
do
49-
50-
echo s3cmd sync --verbose ${FILE} ${DOWNLOADS}/${VERSION}/${FILE}
51-
s3cmd sync --verbose ${FILE} ${DOWNLOADS}/${VERSION}/${FILE}
52-
53-
for FINGERPRINT in md5 sha1 sha256 sha512
54-
do
55-
56-
s3cmd put --verbose ${FILE}.${FINGERPRINT} ${DOWNLOADS}/${VERSION}/${FILE}.${FINGERPRINT}
57-
58-
done
59-
60-
done
61-
62-
63-
s3cmd setacl ${DOWNLOADS}/${VERSION} --acl-public --recursive
64-
6543
# At this point you should run scripts on platforms to make sure things look ok.
6644
# FIXME: we should consider running a collection of scripts we can automate here and add to CI.
6745

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy