From 44c4c7e42c6d5f9ae21d753e5a3cadb7620e1e5e Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Thu, 29 Jun 2023 10:55:28 +0200 Subject: [PATCH] re-import sources as agreed with the maintainer --- .fmf/version | 1 - .gitignore | 9 ++++++++- 0001-Avoid-NPE.patch | 26 -------------------------- gating.yaml | 9 --------- generate-tarball.sh | 20 -------------------- jansi-jni.patch | 14 -------------- plans/JansiLoadLibrary.class | Bin 361 -> 0 bytes plans/JansiLoadLibrary.java | 8 -------- plans/smoke.fmf | 5 ----- 9 files changed, 8 insertions(+), 84 deletions(-) delete mode 100644 .fmf/version delete mode 100644 0001-Avoid-NPE.patch delete mode 100644 gating.yaml delete mode 100755 generate-tarball.sh delete mode 100644 jansi-jni.patch delete mode 100644 plans/JansiLoadLibrary.class delete mode 100644 plans/JansiLoadLibrary.java delete mode 100644 plans/smoke.fmf diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 54408b3..0d71627 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,9 @@ -SOURCES/jansi-project-1.17.1.tar.gz +/jansi-1.6.tar.xz +/jansi-1.9.tar.xz +/jansi-1.11.tar.xz +/noarch +/.build-*.log +/*.src.rpm +/jansi-project-1.16.tar.gz +/jansi-project-1.17.tar.gz /jansi-project-1.17.1.tar.gz diff --git a/0001-Avoid-NPE.patch b/0001-Avoid-NPE.patch deleted file mode 100644 index 1aaa967..0000000 --- a/0001-Avoid-NPE.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d94c5832e14504d44abeba47866dfa7dac5992b5 Mon Sep 17 00:00:00 2001 -From: Guillaume Nodet -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 diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 9214b2f..0000000 --- a/gating.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- !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} diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100755 index 0d2f36c..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/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" diff --git a/jansi-jni.patch b/jansi-jni.patch deleted file mode 100644 index e9e106f..0000000 --- a/jansi-jni.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 diff --git a/plans/JansiLoadLibrary.class b/plans/JansiLoadLibrary.class deleted file mode 100644 index 57babc6eba917c5ec9c255ff0c68fd2f877837bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmZ9HzfQwI48}jVA%PHR`BOF|*jff|WB{=sF`x*BB9LIZv`6G9y-1e?3Eqkc#J~ga zPzYZJDsiW?E&J#1?C+n?F90VP#R#wwV-tf2!w6f1@Qf`t=Y;-vaz_X*s<|NyQnu#0 zU1Y}H>a3JZu+VG?d*jEn(9c?x+U9E7IJWtzZ;Yo^>t^PXJv_S7w&t|b^OQ5E-OI7> zNw9)2!ghik>=K6mAxSNzZ?eM78p5PP~b?) J>jL(W`~q#+N)G@4 diff --git a/plans/JansiLoadLibrary.java b/plans/JansiLoadLibrary.java deleted file mode 100644 index 1b05101..0000000 --- a/plans/JansiLoadLibrary.java +++ /dev/null @@ -1,8 +0,0 @@ -// 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(); - } -} diff --git a/plans/smoke.fmf b/plans/smoke.fmf deleted file mode 100644 index 140921c..0000000 --- a/plans/smoke.fmf +++ /dev/null @@ -1,5 +0,0 @@ -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