Import rpm: 72bf2d2adfd6bae10c9d28db89de5e5981ac6d21
This commit is contained in:
James Antill
commit
8a6dfc7877
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
||||
1
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
SOURCES/jansi-project-1.17.1.tar.gz
|
||||
26
0001-Avoid-NPE.patch
Normal file
26
0001-Avoid-NPE.patch
Normal file
@ -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
|
||||
9
gating.yaml
Normal file
9
gating.yaml
Normal file
@ -0,0 +1,9 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_contexts:
|
||||
- osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
# https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test
|
||||
- !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}
|
||||
20
generate-tarball.sh
Executable file
20
generate-tarball.sh
Executable file
@ -0,0 +1,20 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
name=jansi
|
||||
version="$(sed -n 's/Version:\s*//p' *.spec)"
|
||||
|
||||
# RETRIEVE
|
||||
wget "https://github.com/fusesource/jansi/archive/jansi-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
|
||||
|
||||
rm -rf tarball-tmp
|
||||
mkdir tarball-tmp
|
||||
pushd tarball-tmp
|
||||
tar xf "../${name}-${version}.orig.tar.gz"
|
||||
|
||||
# CLEAN TARBALL
|
||||
rm -r */src/main/native/inc_{mac,win}/
|
||||
|
||||
tar -czf "../${name}-${version}.tar.gz" *
|
||||
popd
|
||||
rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
|
||||
14
jansi-jni.patch
Normal file
14
jansi-jni.patch
Normal file
@ -0,0 +1,14 @@
|
||||
--- a/src/main/java/org/fusesource/jansi/internal/JansiLoader.java 2020-12-15 03:03:00.000000000 -0700
|
||||
+++ b/src/main/java/org/fusesource/jansi/internal/JansiLoader.java 2020-12-15 07:57:30.238720226 -0700
|
||||
@@ -295,6 +295,11 @@ public class JansiLoader {
|
||||
} else {
|
||||
triedPaths.add(jansiNativeLibraryPath);
|
||||
}
|
||||
+ } else {
|
||||
+ if (loadNativeLibrary(new File("@LIBDIR@/jansi", jansiNativeLibraryName))) {
|
||||
+ extracted = true;
|
||||
+ return;
|
||||
+ }
|
||||
}
|
||||
|
||||
// Load the os-dependent library from the jar file
|
||||
149
jansi.spec
Normal file
149
jansi.spec
Normal file
@ -0,0 +1,149 @@
|
||||
Name: jansi
|
||||
Version: 1.17.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Jansi is a java library for generating and interpreting ANSI escape sequences
|
||||
License: ASL 2.0
|
||||
URL: http://fusesource.github.io/jansi/
|
||||
|
||||
Source0: https://github.com/fusesource/jansi/archive/jansi-project-%{version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.fusesource:fusesource-pom:pom:)
|
||||
BuildRequires: mvn(org.fusesource.hawtjni:hawtjni-runtime)
|
||||
BuildRequires: mvn(org.fusesource.jansi:jansi-native)
|
||||
|
||||
%description
|
||||
Jansi is a small java library that allows you to use ANSI escape sequences
|
||||
in your Java console applications. It implements ANSI support on platforms
|
||||
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.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadocs for %{name}
|
||||
|
||||
%description javadoc
|
||||
This package contains the API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n jansi-jansi-project-%{version}
|
||||
|
||||
%pom_disable_module example
|
||||
%pom_xpath_remove "pom:build/pom:extensions"
|
||||
|
||||
%pom_remove_plugin -r :maven-site-plugin
|
||||
|
||||
# No maven-uberize-plugin
|
||||
%pom_remove_plugin -r :maven-uberize-plugin
|
||||
|
||||
# Remove unnecessary deps for jansi-native builds
|
||||
pushd jansi
|
||||
%pom_remove_dep :jansi-windows32
|
||||
%pom_remove_dep :jansi-windows64
|
||||
%pom_remove_dep :jansi-osx
|
||||
%pom_remove_dep :jansi-freebsd32
|
||||
%pom_remove_dep :jansi-freebsd64
|
||||
# it's there only to be bundled in uberjar and we disable uberjar generation
|
||||
%pom_remove_dep :jansi-linux32
|
||||
%pom_remove_dep :jansi-linux64
|
||||
popd
|
||||
|
||||
# javadoc generation fails due to strict doclint in JDK 8
|
||||
%pom_remove_plugin -r :maven-javadoc-plugin
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
%files -f .mfiles
|
||||
%license license.txt
|
||||
%doc readme.md changelog.md
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license license.txt
|
||||
|
||||
%changelog
|
||||
* Tue Jun 05 2018 Michael Simacek <msimacek@redhat.com> - 1.17.1-1
|
||||
- Update to upstream version 1.17.1
|
||||
|
||||
* Mon Feb 26 2018 Michael Simacek <msimacek@redhat.com> - 1.17-1
|
||||
- Update to upstream version 1.17
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Jun 14 2017 Michael Simacek <msimacek@redhat.com> - 1.16-1
|
||||
- Update to upstream version 1.16
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 1.11-11
|
||||
- Remove BR on maven-site-plugin
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Thu May 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-8
|
||||
- Remove maven-javadoc-plugin execution
|
||||
|
||||
* Tue Jan 27 2015 Mat Booth <mat.booth@redhat.com> - 1.11-7
|
||||
- Add/remove BRs to fix FTBFS bug
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Mon May 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-5
|
||||
- Migrate BuildRequires from junit4 to junit
|
||||
|
||||
* Mon May 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-4
|
||||
- Remove BuildRequires on maven-surefire-provider-junit4
|
||||
|
||||
* Wed Sep 11 2013 Marek Goldmann <mgoldman@redhat.com> - 1.11-3
|
||||
- Using xmvn
|
||||
- Remove the jboss-native deps with classifiers
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Tue May 21 2013 Marek Goldmann <mgoldman@redhat.com> - 1.11-1
|
||||
- Upstream release 1.11 RHBZ#962761
|
||||
- CVE-2013-2035 HawtJNI: predictable temporary file name leading to local arbitrary code execution RHBZ#962614
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.9-2
|
||||
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
||||
- Replace maven BuildRequires with maven-local
|
||||
|
||||
* Tue Oct 09 2012 Marek Goldmann <mgoldman@redhat.com> - 1.9-1
|
||||
- Upstream release 1.9, RHBZ#864490
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Fri May 04 2012 Tomas Radej <tradej@redhat.com> - 1.6-3
|
||||
- Removed maven-license-plugin BR
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Thu Aug 25 2011 Marek Goldmann <mgoldman@redhat.com> 1.6-1
|
||||
- Upstream release 1.6
|
||||
- Spec file cleanup
|
||||
|
||||
* Fri May 27 2011 Marek Goldmann <mgoldman@redhat.com> 1.5-1
|
||||
- Initial packaging
|
||||
|
||||
BIN
plans/JansiLoadLibrary.class
Normal file
BIN
plans/JansiLoadLibrary.class
Normal file
Binary file not shown.
8
plans/JansiLoadLibrary.java
Normal file
8
plans/JansiLoadLibrary.java
Normal file
@ -0,0 +1,8 @@
|
||||
// Compile with:
|
||||
// $ javac -cp /usr/lib/java/jansi/jansi.jar JansiLoadLibrary.java
|
||||
|
||||
class JansiLoadLibrary {
|
||||
public static void main(String[] args) {
|
||||
org.fusesource.jansi.internal.JansiLoader.initialize();
|
||||
}
|
||||
}
|
||||
5
plans/smoke.fmf
Normal file
5
plans/smoke.fmf
Normal file
@ -0,0 +1,5 @@
|
||||
summary: Basic smoke test
|
||||
execute:
|
||||
script:
|
||||
- dnf -y install java-11-openjdk-headless
|
||||
- /usr/lib/jvm/jre-11-openjdk/bin/java -cp /usr/lib/java/jansi/jansi.jar:plans JansiLoadLibrary
|
||||
Loading…
Reference in New Issue
Block a user