Compare commits

...

No commits in common. 'i9c-stream-3.8' and 'c9' have entirely different histories.

2
.gitignore vendored

@ -1 +1 @@
SOURCES/jansi-2.4.0.tar.gz SOURCES/jansi-2.3.3.tar.gz

@ -1 +1 @@
f1a617ff40c5366878d35eadf3247e81124d989f SOURCES/jansi-2.4.0.tar.gz 8f825fc9e4eafb656d1e0f01c68be9b41a750a1c SOURCES/jansi-2.3.3.tar.gz

@ -0,0 +1,26 @@
From d94c5832e14504d44abeba47866dfa7dac5992b5 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Fri, 23 Jul 2021 09:22:19 +0200
Subject: [PATCH] Avoid possible NPE, fixes #214
---
src/main/java/org/fusesource/jansi/AnsiPrintStream.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/fusesource/jansi/AnsiPrintStream.java b/src/main/java/org/fusesource/jansi/AnsiPrintStream.java
index e153c43..df6e5a6 100644
--- a/src/main/java/org/fusesource/jansi/AnsiPrintStream.java
+++ b/src/main/java/org/fusesource/jansi/AnsiPrintStream.java
@@ -76,7 +76,11 @@ public void install() throws IOException {
}
public void uninstall() throws IOException {
- getOut().uninstall();
+ // If the system output stream has been closed, out should be null, so avoid a NPE
+ AnsiOutputStream out = getOut();
+ if (out != null) {
+ out.uninstall();
+ }
}
@Override

@ -6,7 +6,7 @@
} }
+ } else { + } else {
+ if (loadNativeLibrary(new File("@LIBDIR@/jansi", jansiNativeLibraryName))) { + if (loadNativeLibrary(new File("@LIBDIR@/jansi", jansiNativeLibraryName))) {
+ loaded = true; + extracted = true;
+ return; + return;
+ } + }
} }

@ -1,12 +1,11 @@
%bcond_with bootstrap %bcond_with bootstrap
Name: jansi Name: jansi
Version: 2.4.0 Version: 2.3.3
Release: 6%{?dist} Release: 6%{?dist}
Summary: Generate and interpret ANSI escape sequences in Java Summary: Generate and interpret ANSI escape sequences in Java
License: ASL 2.0 License: ASL 2.0
URL: http://fusesource.github.io/jansi/ URL: http://fusesource.github.io/jansi/
ExclusiveArch: %{java_arches}
# ./generate-tarball.sh # ./generate-tarball.sh
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
@ -16,11 +15,13 @@ Source1: generate-tarball.sh
# Change the location of the native artifact to where Fedora wants it # Change the location of the native artifact to where Fedora wants it
Patch0: %{name}-jni.patch Patch0: %{name}-jni.patch
Patch1: 0001-Avoid-NPE.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: maven-local
%if %{with bootstrap} %if %{with bootstrap}
BuildRequires: javapackages-bootstrap BuildRequires: javapackages-bootstrap
%else %else
BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform)
@ -35,7 +36,6 @@ which don't support it like Windows and provides graceful degradation for
when output is being sent to output devices which cannot support ANSI sequences. when output is being sent to output devices which cannot support ANSI sequences.
%package javadoc %package javadoc
BuildArch: noarch
Summary: Javadocs for %{name} Summary: Javadocs for %{name}
%description javadoc %description javadoc
@ -73,7 +73,6 @@ sed -i 's,@LIBDIR@,%{_prefix}/lib,' \
%build %build
%set_build_flags %set_build_flags
CC="${CC:-gcc}"
# Build the native artifact # Build the native artifact
CFLAGS="$CFLAGS -I. -I%{java_home}/include -I%{java_home}/include/linux -fPIC -fvisibility=hidden" CFLAGS="$CFLAGS -I. -I%{java_home}/include -I%{java_home}/include/linux -fPIC -fvisibility=hidden"
cd src/main/native cd src/main/native
@ -104,40 +103,35 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name}
%license license.txt %license license.txt
%changelog %changelog
* Tue Jul 25 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 2.4.0-6 * Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.3-6
- Rebuilt for MSVSphere 9.2 - Rebuild to regenerate auto-requires
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jul 18 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-5
- Ensure CC env variable is set during build
* Thu Jul 14 2022 Marian Koncek <mkoncek@redhat.com> - 2.4.0-4
- Make javadoc subpackage noarch
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.4.0-3 * Thu Aug 19 2021 Marian Koncek <mkoncek@redhat.com> - 2.3.3-5
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Nov 01 2021 Marian Koncek <mkoncek@redhat.com> - 2.4.0-1
- Update to upstream version 2.4.0
* Fri Sep 24 2021 Marian Koncek <mkoncek@redhat.com> - 2.3.3-3
- Install native artifact into a fixed location - Install native artifact into a fixed location
- Related: rhbz#1994935 - Related: rhbz#1994935
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-2 * Wed Aug 18 2021 Marian Koncek <mkoncek@redhat.com> - 2.3.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Avoid possible NullPointerException
- Resolves: rhbz#1993889
- Load native library from the correct location
- Resolves: rhbz#1994935
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.3-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Wed Jun 23 2021 Jerry James <loganjerry@gmail.com> - 2.3.3-1 * Wed Jun 23 2021 Jerry James <loganjerry@gmail.com> - 2.3.3-1
- Version 2.3.3 - Version 2.3.3
* Fri Jun 18 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-5 * Fri Jun 18 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-7
- Clean tarball from content with questionable licensing - Clean tarball from content with questionable licensing
- Resolves: rhbz#1973738 - Resolves: rhbz#1973750
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-6
- Rebuild to workaround DistroBaker issue
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-5
- Bootstrap Maven for CentOS Stream 9
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-4 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-4
- Bootstrap build - Bootstrap build

Loading…
Cancel
Save