RHEL 9.0.0 Alpha bootstrap

The content of this branch was automatically imported from Fedora ELN
with the following as its source:
https://src.fedoraproject.org/rpms/pki-core#8b79c54b742c4a25d28eb51f9909c72ef40ad600
This commit is contained in:
Troy Dawson 2020-10-14 16:04:28 -07:00
parent 32c805f92f
commit a800dadd0f
9 changed files with 1631 additions and 0 deletions

77
.gitignore vendored
View File

@ -0,0 +1,77 @@
/pki-core-9.0.0.tar.gz
/pki-core-9.0.1.tar.gz
/pki-core-9.0.2.tar.gz
/pki-core-9.0.3.tar.gz
/pki-core-9.0.5.tar.gz
/pki-core-9.0.6.tar.gz
/pki-core-9.0.7.tar.gz
/pki-core-9.0.9.tar.gz
/pki-core-9.0.14.tar.gz
/pki-core-9.0.15.tar.gz
/pki-core-9.0.16.tar.gz
/pki-core-9.0.17.tar.gz
/pki-core-9.0.18.tar.gz
/pki-core-9.0.19.tar.gz
/pki-core-9.0.20.tar.gz
/pki-core-9.0.21.tar.gz
/pki-core-10.0.0.a1.tar.gz
/pki-core-10.0.0.a2.tar.gz
/pki-core-10.0.0.b1.tar.gz
/pki-core-10.0.0.b2.tar.gz
/pki-core-10.0.0.b3.tar.gz
/pki-core-10.0.0.tar.gz
/pki-core-10.0.1.tar.gz
/pki-core-10.0.2.tar.gz
/pki-core-10.0.3.tar.gz
/pki-core-10.0.4.tar.gz
/pki-core-10.0.5.tar.gz
/pki-core-10.1.0.tar.gz
/pki-core-10.2.0.tar.gz
/pki-core-10.2.1.tar.gz
/pki-core-10.2.3.tar.gz
/pki-core-10.2.4.tar.gz
/pki-core-10.2.5.tar.gz
/pki-core-10.2.6.tar.gz
/pki-core-10.3.0.a1.tar.gz
/pki-core-10.3.0.a2.tar.gz
/pki-core-10.3.0.b1.tar.gz
/pki-core-10.3.1.tar.gz
/pki-core-10.3.2.tar.gz
/pki-core-10.3.3.tar.gz
/pki-core-10.3.5.tar.gz
/pki-core-10.4.0.tar.gz
/pki-core-10.4.1.tar.gz
/pki-core-10.4.2.tar.gz
/pki-core-10.4.3.tar.gz
/pki-core-10.4.4.tar.gz
/pki-core-10.4.5.tar.gz
/pki-core-10.4.7.tar.gz
/pki-core-10.4.8.tar.gz
/pki-core-10.5.0.tar.gz
/pki-core-10.5.1.tar.gz
/pki-core-10.5.2.tar.gz
/pki-core-10.5.3.tar.gz
/pki-core-10.5.4.tar.gz
/pki-core-10.5.5.tar.gz
/pki-core-10.5.6.tar.gz
/pki-core-10.6.0.tar.gz
/pki-10.6.0.tar.gz
/pki-10.6.0-beta2.tar.gz
/pki-10.6.1.tar.gz
/pki-10.6.1-2.patch
/pki-10.6.2.tar.gz
/pki-10.6.3.tar.gz
/pki-10.6.4.tar.gz
/pki-10.6.5.tar.gz
/pki-10.6.6.tar.gz
/pki-10.6.7.tar.gz
/pki-10.6.8.tar.gz
/pki-10.6.9.tar.gz
/pki-10.7.0.tar.gz
/pki-10.7.3.tar.gz
/pki-10.8.3.tar.gz
/pki-10.9.0-a2.tar.gz
/pki-10.9.0-b2.tar.gz
/pki-10.9.1.tar.gz
/pki-10.9.2.tar.gz
/pki-10.9.4.tar.gz

View File

@ -0,0 +1,40 @@
From f35d270b5551ae35e699163d78d451e5b7c247da Mon Sep 17 00:00:00 2001
From: Alexander Scheel <ascheel@redhat.com>
Date: Mon, 14 Sep 2020 16:51:08 -0400
Subject: [PATCH 1/3] Add dependencies in Java11-specific libraries
This ensures lib/ gets created prior to any Java11-specific symlinks.
Signed-off-by: Alexander Scheel <ascheel@redhat.com>
---
base/common/CMakeLists.txt | 1 +
base/server/CMakeLists.txt | 1 +
2 files changed, 2 insertions(+)
diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt
index c58393e01..26431bac0 100644
--- a/base/common/CMakeLists.txt
+++ b/base/common/CMakeLists.txt
@@ -48,6 +48,7 @@ add_custom_command(
if(JAVA_VERSION GREATER 10)
add_custom_target(pki-java11plus-lib ALL
+ DEPENDS pki-lib
COMMENT "Creating links for library required in Java 11+")
add_custom_command(
diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt
index 599642277..62a5b68bd 100644
--- a/base/server/CMakeLists.txt
+++ b/base/server/CMakeLists.txt
@@ -118,6 +118,7 @@ add_custom_command(
if(JAVA_VERSION GREATER 10)
add_custom_target(pki-server-java11plus-lib ALL
+ DEPENDS pki-server-common-lib
COMMENT "Creating links for server library required in Java 11+")
add_custom_command(
--
2.26.2

View File

@ -0,0 +1,26 @@
From 54de035b3a16144a888d807c636d05b15c806572 Mon Sep 17 00:00:00 2001
From: Alexander Scheel <ascheel@redhat.com>
Date: Tue, 15 Sep 2020 10:49:48 -0400
Subject: [PATCH 2/3] Make PKI_JAVA_PATH respect PKI_JAVA_PATH
Signed-off-by: Alexander Scheel <ascheel@redhat.com>
---
base/common/share/etc/pki.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/base/common/share/etc/pki.conf b/base/common/share/etc/pki.conf
index 0671f7ab7..5bbde3830 100644
--- a/base/common/share/etc/pki.conf
+++ b/base/common/share/etc/pki.conf
@@ -11,7 +11,7 @@ JAVA_HOME=${JAVA_HOME}
export JAVA_HOME
# Java interpreter
-PKI_JAVA_PATH=${Java_JAVA_EXECUTABLE}
+PKI_JAVA_PATH=${PKI_JAVA_PATH}
export PKI_JAVA_PATH
# JNI jar file location
--
2.26.2

View File

@ -0,0 +1,29 @@
From 8c6af8d9c5482ae95c2912ba8553474e9e8e6435 Mon Sep 17 00:00:00 2001
From: Alexander Scheel <ascheel@redhat.com>
Date: Wed, 16 Sep 2020 15:49:00 -0400
Subject: [PATCH 3/3] Fix %{java_version} -> ${java_version}
Because java_version isn't a RPM spec file attribute (and is instead an
inline shell variable), we have to use $ instead of % to reference it.
Signed-off-by: Alexander Scheel <ascheel@redhat.com>
---
pki.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pki.spec b/pki.spec
index 4446d657d..a461f10e8 100644
--- a/pki.spec
+++ b/pki.spec
@@ -855,7 +855,7 @@ cd build
-DVERSION=%{version}-%{release} \
-DVAR_INSTALL_DIR:PATH=/var \
-DP11_KIT_TRUST=/etc/alternatives/libnssckbi.so.%{_arch} \
- -DJAVA_VERSION=%{java_version} \
+ -DJAVA_VERSION=${java_version} \
-DJAVA_HOME=%java_home \
-DPKI_JAVA_PATH=%java \
-DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
--
2.26.2

9
copr-build.sh Executable file
View File

@ -0,0 +1,9 @@
#!/bin/sh
REPO=$1
if [ "$REPO" == "" ]; then
REPO="pki-10.6"
fi
fedpkg copr-build --nowait $REPO

4
pki-core.rpmlintrc Normal file
View File

@ -0,0 +1,4 @@
addFilter('W: spelling-error')
addFilter('W: dangling-symlink')
addFilter('W: no-manual-page-for-binary')
addFilter('W: log-files-without-logrotate')

1438
pki-core.spec Normal file

File diff suppressed because it is too large Load Diff

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (pki-10.9.4.tar.gz) = a2e572b1e2625cfbd432ccc11f6aefb77801f4e9f6a49e00c8fcf98fedd09e9ec806c5caa42a1bd48f8d6eff4c794e28a3dca86ee5720e348415c8bd3e9e4882

7
sources-update.sh Executable file
View File

@ -0,0 +1,7 @@
#!/bin/sh
SOURCE=$1
TARGET=`basename $1`
cp $SOURCE $TARGET
sha512sum --tag $TARGET > sources