[Pkg-freeipa-devel] [Git][freeipa-team/tomcatjss][master] 24 commits: Update path to tomcat-juli.jar
Timo Aaltonen (@tjaalton)
gitlab at salsa.debian.org
Wed Nov 9 17:08:43 GMT 2022
Timo Aaltonen pushed to branch master at FreeIPA packaging / tomcatjss
Commits:
4997c8dd by Endi S. Dewata at 2022-04-12T12:07:50-05:00
Update path to tomcat-juli.jar
- - - - -
2563abc8 by Endi S. Dewata at 2022-04-12T12:08:32-05:00
Remove unused imports
- - - - -
49771bd0 by Endi S. Dewata at 2022-04-12T12:16:03-05:00
Update tests to cache container images
- - - - -
e2011148 by Endi S. Dewata at 2022-04-13T13:33:21-05:00
Drop i686 support
- - - - -
e6541445 by Endi S. Dewata at 2022-04-13T14:04:04-05:00
Remove redundant ExcludeArch
- - - - -
7878da98 by Endi S. Dewata at 2022-04-13T14:07:02-05:00
Bump JSS dependency
- - - - -
9da46f9e by Endi S. Dewata at 2022-04-13T16:14:40-05:00
Update generate_rpm_spec() in build.sh
The generate_rpm_spec() in build.sh has been modified
to edit the spec file in place.
- - - - -
603fa478 by Endi S. Dewata at 2022-04-13T16:42:36-05:00
Add build.sh --name option
The build.sh, build.xml, and tomcatjss.spec have been modified
to provide a mechanism to change the RPM package name.
- - - - -
7d8f4cb8 by Endi S. Dewata at 2022-04-18T18:58:19-05:00
Update version to 8.2.0-beta1
- - - - -
44fff531 by Endi S. Dewata at 2022-04-22T12:10:59-05:00
Update project URL
- - - - -
dd98fc45 by Endi S. Dewata at 2022-04-28T14:46:51-05:00
Add RPM macros for timestamp and commit ID
- - - - -
a263ce3b by Endi S. Dewata at 2022-04-28T14:47:16-05:00
Add RPM macro for development phase
- - - - -
7eb632e4 by Endi S. Dewata at 2022-04-28T14:47:17-05:00
Add RPM macros for version and release numbers
- - - - -
7c6196a2 by Endi S. Dewata at 2022-04-28T14:56:24-05:00
Add dogtag-tomcatjss subpackage
- - - - -
9d672369 by Endi S. Dewata at 2022-04-28T15:02:55-05:00
Update version number to 8.2.0-beta2
- - - - -
c6249690 by Endi S. Dewata at 2022-05-10T09:57:01-05:00
Fix COPR build failure
The .copr/Makefile has been updated to fix COPR build failure
caused by changes in Git 2.35.2:
fatal: unsafe repository (<current dir> is owned by someone else)
https://stackoverflow.com/questions/71901632/fatal-unsafe-repository-home-repon-is-owned-by-someone-else
- - - - -
5ff714f2 by Endi S. Dewata at 2022-06-07T23:28:13+01:00
Update OpenLDAP clients to use -H option
The latest OpenLDAP clients no longer have the -h option so the
the tests have been updated to use the -H option instead.
- - - - -
88ee82b8 by Endi S. Dewata at 2022-06-29T18:01:03-05:00
Add missing JAVA_HOME
- - - - -
f1c523e5 by Endi S. Dewata at 2022-06-29T18:03:34-05:00
Update project URL
- - - - -
80a1fc7d by Endi S. Dewata at 2022-06-29T18:04:21-05:00
Update version number to 8.2.0
- - - - -
0b4ad177 by Timo Aaltonen at 2022-11-09T19:00:41+02:00
Merge branch 'upstream'
- - - - -
7ec56fa4 by Timo Aaltonen at 2022-11-09T19:01:19+02:00
version bump
- - - - -
827372bd by Timo Aaltonen at 2022-11-09T19:07:33+02:00
control: Bump jss dependency.
- - - - -
cd5802bc by Timo Aaltonen at 2022-11-09T19:07:53+02:00
releasing package tomcatjss version 8.2.0-1
- - - - -
10 changed files:
- .classpath
- .copr/Makefile
- .github/workflows/pki-tests.yml
- build.sh
- build.xml
- debian/changelog
- debian/control
- tests/bin/ds-create.sh
- tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSContext.java
- tomcatjss.spec
Changes:
=====================================
.classpath
=====================================
@@ -6,7 +6,7 @@
<classpathentry kind="lib" path="/usr/share/java/apache-commons-logging.jar"/>
<classpathentry kind="lib" path="/usr/lib/java/jss.jar"/>
<classpathentry kind="lib" path="/usr/share/java/tomcat/tomcat-coyote.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/tomcat/tomcat-juli.jar"/>
+ <classpathentry kind="lib" path="/usr/share/tomcat/bin/tomcat-juli.jar"/>
<classpathentry kind="lib" path="/usr/share/java/tomcat/tomcat-util.jar"/>
<classpathentry kind="lib" path="/usr/share/java/slf4j/slf4j-api.jar"/>
<classpathentry kind="lib" path="/usr/share/java/tomcat/catalina.jar"/>
=====================================
.copr/Makefile
=====================================
@@ -1,5 +1,6 @@
srpm:
dnf install -y git
+ git config --global --add safe.directory ${PWD}
./build.sh --with-timestamp --with-commit-id srpm
if [[ "${outdir}" != "" ]]; then \
mv ${HOME}/build/tomcatjss/SRPMS/* ${outdir}; \
=====================================
.github/workflows/pki-tests.yml
=====================================
@@ -44,13 +44,13 @@ jobs:
BUILD_OPTS=--with-timestamp --with-commit-id
tags: tomcatjss-runner
target: tomcatjss-runner
- outputs: type=docker,dest=/tmp/tomcatjss-runner.tar
+ outputs: type=docker,dest=tomcatjss-runner.tar
- - name: Upload runner image
- uses: actions/upload-artifact at v2
+ - name: Store runner image
+ uses: actions/cache at v3
with:
- name: tomcatjss-runner-${{ matrix.os }}
- path: /tmp/tomcatjss-runner.tar
+ key: tomcatjss-runner-${{ matrix.os }}-${{ github.run_id }}
+ path: tomcatjss-runner.tar
# https://github.com/dogtagpki/pki/blob/master/docs/installation/server/Installing_Basic_PKI_Server.md
ssl-test:
@@ -65,14 +65,14 @@ jobs:
- name: Clone repository
uses: actions/checkout at v2
- - name: Download runner image
- uses: actions/download-artifact at v2
+ - name: Retrieve runner image
+ uses: actions/cache at v3
with:
- name: tomcatjss-runner-${{ matrix.os }}
- path: /tmp
+ key: tomcatjss-runner-${{ matrix.os }}-${{ github.run_id }}
+ path: tomcatjss-runner.tar
- name: Load runner image
- run: docker load --input /tmp/tomcatjss-runner.tar
+ run: docker load --input tomcatjss-runner.tar
- name: Run container
run: |
@@ -169,14 +169,14 @@ jobs:
- name: Clone repository
uses: actions/checkout at v2
- - name: Download runner image
- uses: actions/download-artifact at v2
+ - name: Retrieve runner image
+ uses: actions/cache at v3
with:
- name: tomcatjss-runner-${{ matrix.os }}
- path: /tmp
+ key: tomcatjss-runner-${{ matrix.os }}-${{ github.run_id }}
+ path: tomcatjss-runner.tar
- name: Load runner image
- run: docker load --input /tmp/tomcatjss-runner.tar
+ run: docker load --input tomcatjss-runner.tar
- name: Run container
run: |
=====================================
build.sh
=====================================
@@ -17,7 +17,9 @@ DOC_DIR="/usr/share/doc"
INSTALL_DIR=
SOURCE_TAG=
-SPEC_TEMPLATE=
+SPEC_TEMPLATE="$SRC_DIR/tomcatjss.spec"
+SPEC_FILE=
+
VERSION=
RELEASE=
@@ -32,13 +34,14 @@ usage() {
echo "Usage: $SCRIPT_NAME [OPTIONS] <target>"
echo
echo "Options:"
+ echo " --name=<name> Package name (default: $NAME)."
echo " --work-dir=<path> Working directory (default: $WORK_DIR)"
echo " --jni-dir=<path> JNI directory (default: $JNI_DIR)"
echo " --java-dir=<path> Java directory (default: $JAVA_DIR)"
echo " --doc-dir=<path> Documentation directory (default: $DOC_DIR)"
echo " --install-dir=<path> Installation directory"
echo " --source-tag=<tag> Generate RPM sources from a source tag."
- echo " --spec=<file> Use the specified RPM spec."
+ echo " --spec=<file> Use the specified RPM spec (default: $SPEC_TEMPLATE)."
echo " --version=<version> Use the specified version."
echo " --release=<release> Use the specified release."
echo " --with-timestamp Append timestamp to release number."
@@ -59,7 +62,13 @@ usage() {
generate_rpm_sources() {
- TARBALL="$NAME-$VERSION${_PHASE}.tar.gz"
+ PREFIX="tomcatjss-$VERSION"
+
+ if [[ "$PHASE" != "" ]]; then
+ PREFIX=$PREFIX-$PHASE
+ fi
+
+ TARBALL="$PREFIX.tar.gz"
if [ "$SOURCE_TAG" != "" ] ; then
@@ -70,7 +79,7 @@ generate_rpm_sources() {
git -C "$SRC_DIR" \
archive \
--format=tar.gz \
- --prefix "$NAME-$VERSION${_PHASE}/" \
+ --prefix "$PREFIX/" \
-o "$WORK_DIR/SOURCES/$TARBALL" \
$SOURCE_TAG
@@ -92,7 +101,7 @@ generate_rpm_sources() {
fi
tar czf "$WORK_DIR/SOURCES/$TARBALL" \
- --transform "s,^./,$NAME-$VERSION${_PHASE}/," \
+ --transform "s,^./,$PREFIX/," \
--exclude .git \
--exclude bin \
--exclude build \
@@ -104,7 +113,7 @@ generate_rpm_sources() {
generate_patch() {
- PATCH="$NAME-$VERSION-$RELEASE.patch"
+ PATCH="tomcatjss-$VERSION-$RELEASE.patch"
if [ "$VERBOSE" = true ] ; then
echo "Generating $PATCH for all changes since $SOURCE_TAG tag"
@@ -119,29 +128,33 @@ generate_patch() {
generate_rpm_spec() {
- RPM_SPEC="$NAME.spec"
+ SPEC_FILE="$WORK_DIR/SPECS/$NAME.spec"
if [ "$VERBOSE" = true ] ; then
- echo "Generating $RPM_SPEC"
+ echo "Creating $SPEC_FILE"
fi
+ cp "$SPEC_TEMPLATE" "$SPEC_FILE"
+
+ # hard-code package name
+ sed -i "s/^\(Name: *\).*\$/\1${NAME}/g" "$SPEC_FILE"
+
# hard-code timestamp
- commands="s/%{?_timestamp}/${_TIMESTAMP}/g"
+ if [ "$TIMESTAMP" != "" ] ; then
+ sed -i "s/%undefine *timestamp/%global timestamp $TIMESTAMP/g" "$SPEC_FILE"
+ fi
# hard-code commit ID
- commands="${commands}; s/%{?_commit_id}/${_COMMIT_ID}/g"
-
- # hard-code phase
- commands="${commands}; s/%{?_phase}/${_PHASE}/g"
+ if [ "$COMMIT_ID" != "" ] ; then
+ sed -i "s/%undefine *commit_id/%global commit_id $COMMIT_ID/g" "$SPEC_FILE"
+ fi
# hard-code patch
if [ "$PATCH" != "" ] ; then
- commands="${commands}; s/# Patch: $NAME-VERSION-RELEASE.patch/Patch: $PATCH/g"
+ sed -i "s/# Patch: tomcatjss-VERSION-RELEASE.patch/Patch: $PATCH/g" "$SPEC_FILE"
fi
- sed "$commands" "$SPEC_TEMPLATE" > "$WORK_DIR/SPECS/$RPM_SPEC"
-
- # rpmlint "$WORK_DIR/SPECS/$RPM_SPEC"
+ # rpmlint "$SPEC_FILE"
}
while getopts v-: arg ; do
@@ -153,6 +166,9 @@ while getopts v-: arg ; do
LONG_OPTARG="${OPTARG#*=}"
case $OPTARG in
+ name=?*)
+ NAME="$LONG_OPTARG"
+ ;;
work-dir=?*)
WORK_DIR="$(readlink -f "$LONG_OPTARG")"
;;
@@ -203,7 +219,8 @@ while getopts v-: arg ; do
'')
break # "--" terminates argument processing
;;
- work-dir* | jni-dir* | java-dir* | doc-dir* | install-dir* | source-tag* | spec* | version* | release* | dist*)
+ name* | work-dir* | jni-dir* | java-dir* | doc-dir* | install-dir* | \
+ source-tag* | spec* | version* | release* | dist*)
echo "ERROR: Missing argument for --$OPTARG option" >&2
exit 1
;;
@@ -229,6 +246,7 @@ else
fi
if [ "$DEBUG" = true ] ; then
+ echo "NAME: $NAME"
echo "WORK_DIR: $WORK_DIR"
echo "JNI_DIR: $JNI_DIR"
echo "JAVA_DIR: $JAVA_DIR"
@@ -247,13 +265,17 @@ if [ "$BUILD_TARGET" != "dist" ] &&
exit 1
fi
-mkdir -p "$WORK_DIR"
-cd "$WORK_DIR"
+################################################################################
+# Initialization
+################################################################################
-if [ "$SPEC_TEMPLATE" = "" ] ; then
- SPEC_TEMPLATE="$SRC_DIR/$NAME.spec"
+if [ "$VERBOSE" = true ] ; then
+ echo "Initializing $WORK_DIR"
fi
+mkdir -p "$WORK_DIR"
+cd "$WORK_DIR"
+
if [ "$VERSION" = "" ] ; then
# if version not specified, get from spec template
VERSION="$(rpmspec -P "$SPEC_TEMPLATE" | grep "^Version:" | awk '{print $2;}')"
@@ -263,6 +285,10 @@ if [ "$DEBUG" = true ] ; then
echo "VERSION: $VERSION"
fi
+################################################################################
+# Build Tomcat JSS
+################################################################################
+
if [ "$BUILD_TARGET" = "dist" ] ; then
if [ "$VERBOSE" = "true" ] ; then
@@ -293,7 +319,7 @@ if [ "$BUILD_TARGET" = "dist" ] ; then
echo
echo "Build artifacts:"
- echo "- Java archive: $WORK_DIR/build/jars/$NAME.jar"
+ echo "- Java archive: $WORK_DIR/build/jars/tomcatjss.jar"
echo
echo "To install the build: $0 install"
echo "To create RPM packages: $0 rpm"
@@ -302,6 +328,10 @@ if [ "$BUILD_TARGET" = "dist" ] ; then
exit
fi
+################################################################################
+# Install Tomcat JSS
+################################################################################
+
if [ "$BUILD_TARGET" = "install" ] ; then
if [ "$VERBOSE" = true ] ; then
@@ -317,6 +347,7 @@ if [ "$BUILD_TARGET" = "install" ] ; then
OPTIONS+=(-f $SRC_DIR/build.xml)
OPTIONS+=(-Dversion=$VERSION)
OPTIONS+=(-Dbuild.dir=$WORK_DIR)
+ OPTIONS+=(-Dpackage=$NAME)
OPTIONS+=(-Dinstall.doc.dir=$INSTALL_DIR$DOC_DIR)
OPTIONS+=(-Dinstall.jar.dir=$INSTALL_DIR$JAVA_DIR)
@@ -340,18 +371,20 @@ if [ "$DEBUG" = true ] ; then
fi
spec=$(<"$SPEC_TEMPLATE")
-regex=$'%global *_phase *([^\n]+)'
+
+regex=$'%global *phase *([^\n]+)'
if [[ $spec =~ $regex ]] ; then
- _PHASE="${BASH_REMATCH[1]}"
+ PHASE="${BASH_REMATCH[1]}"
+ RELEASE=$RELEASE.$PHASE
fi
if [ "$DEBUG" = true ] ; then
- echo "PHASE: ${_PHASE}"
+ echo "PHASE: $PHASE"
fi
if [ "$WITH_TIMESTAMP" = true ] ; then
- TIMESTAMP="$(date -u +"%Y%m%d%H%M%S%Z")"
- _TIMESTAMP=".$TIMESTAMP"
+ TIMESTAMP=$(date -u +"%Y%m%d%H%M%S%Z")
+ RELEASE=$RELEASE.$TIMESTAMP
fi
if [ "$DEBUG" = true ] ; then
@@ -359,23 +392,15 @@ if [ "$DEBUG" = true ] ; then
fi
if [ "$WITH_COMMIT_ID" = true ]; then
- COMMIT_ID="$(git -C "$SRC_DIR" rev-parse --short=8 HEAD)"
- _COMMIT_ID=".$COMMIT_ID"
+ COMMIT_ID=$(git -C "$SRC_DIR" rev-parse --short=8 HEAD)
+ RELEASE=$RELEASE.$COMMIT_ID
fi
if [ "$DEBUG" = true ] ; then
echo "COMMIT_ID: $COMMIT_ID"
fi
-echo "Building $NAME-$VERSION-$RELEASE${_TIMESTAMP}${_COMMIT_ID}"
-
-################################################################################
-# Initialize working directory
-################################################################################
-
-if [ "$VERBOSE" = true ] ; then
- echo "Initializing $WORK_DIR"
-fi
+echo "Building $NAME-$VERSION-$RELEASE"
rm -rf BUILD
rm -rf RPMS
@@ -424,24 +449,16 @@ OPTIONS=()
OPTIONS+=(--quiet)
OPTIONS+=(--define "_topdir ${WORK_DIR}")
-if [ "$WITH_TIMESTAMP" = true ] ; then
- OPTIONS+=(--define "_timestamp ${_TIMESTAMP}")
-fi
-
-if [ "$WITH_COMMIT_ID" = true ] ; then
- OPTIONS+=(--define "_commit_id ${_COMMIT_ID}")
-fi
-
if [ "$DIST" != "" ] ; then
OPTIONS+=(--define "dist .$DIST")
fi
if [ "$DEBUG" = true ] ; then
- echo rpmbuild -bs "${OPTIONS[@]}" "$WORK_DIR/SPECS/$RPM_SPEC"
+ echo rpmbuild -bs "${OPTIONS[@]}" "$SPEC_FILE"
fi
# build SRPM with user-provided options
-rpmbuild -bs "${OPTIONS[@]}" "$WORK_DIR/SPECS/$RPM_SPEC"
+rpmbuild -bs "${OPTIONS[@]}" "$SPEC_FILE"
rc=$?
=====================================
build.xml
=====================================
@@ -50,6 +50,7 @@
<property name="optimize" value="true"/>
<property name="specfile" value="tomcatjss.spec"/>
<property name="jnidir" value="/usr/lib/java" />
+ <property name="package" value="${name}" />
<property name="install.doc.dir" value="/usr/share/doc" />
<property name="install.jar.dir" value="/usr/share/java" />
@@ -236,8 +237,8 @@
</target>
<target name="install" depends="compile,package">
- <copy file="LICENSE" todir="${install.doc.dir}/tomcatjss"/>
- <copy file="README" todir="${install.doc.dir}/tomcatjss"/>
+ <copy file="LICENSE" todir="${install.doc.dir}/${package}"/>
+ <copy file="README" todir="${install.doc.dir}/${package}"/>
<delete file="${install.jar.dir}/tomcatjss.jar"/>
<copy file="${build.jars}/tomcatjss.jar" tofile="${install.jar.dir}/tomcatjss.jar"/>
</target>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+tomcatjss (8.2.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * control: Bump jss dependency.
+
+ -- Timo Aaltonen <tjaalton at debian.org> Wed, 09 Nov 2022 19:07:34 +0200
+
tomcatjss (8.1.0-1) unstable; urgency=medium
* New upstream version.
=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Build-Depends:
default-jdk,
javahelper,
libcommons-lang3-java,
- libjss-java (>= 5.1.0),
+ libjss-java (>= 5.2.0),
libslf4j-java,
libtomcat9-java (>= 9.0.37-2~),
Standards-Version: 4.6.0
@@ -21,7 +21,7 @@ Package: libtomcatjss-java
Architecture: all
Depends: libtomcat9-java, ${java:Depends}, ${misc:Depends},
libcommons-lang3-java,
- libjss-java (>= 5.1.0),
+ libjss-java (>= 5.2.0),
libslf4j-java,
Conflicts: libtcnative-1
Breaks: pki-server (<< 10.3.5-2)
=====================================
tests/bin/ds-create.sh
=====================================
@@ -13,7 +13,7 @@ sed -i \
dscreate from-file ds.inf
-ldapadd -h $HOSTNAME -x -D "cn=Directory Manager" -w Secret.123 << EOF
+ldapadd -H ldap://$HOSTNAME -x -D "cn=Directory Manager" -w Secret.123 << EOF
dn: dc=example,dc=com
objectClass: domain
dc: example
=====================================
tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSContext.java
=====================================
@@ -1,15 +1,14 @@
package org.dogtagpki.tomcat;
-import org.apache.tomcat.util.net.jss.TomcatJSS;
import java.security.KeyManagementException;
import java.security.SecureRandom;
-import java.util.Collection;
-import java.util.EventListener;
+
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
+import org.apache.tomcat.util.net.jss.TomcatJSS;
import org.mozilla.jss.JSSProvider;
import org.mozilla.jss.provider.javax.crypto.JSSKeyManager;
import org.mozilla.jss.provider.javax.crypto.JSSTrustManager;
=====================================
tomcatjss.spec
=====================================
@@ -2,16 +2,33 @@
Name: tomcatjss
################################################################################
+%global product_id dogtag-tomcatjss
+
+# Upstream version number:
+%global major_version 8
+%global minor_version 2
+%global update_version 0
+
+# Downstream release number:
+# - development/stabilization (unsupported): 0.<n> where n >= 1
+# - GA/update (supported): <n> where n >= 1
+%global release_number 1
+
+# Development phase:
+# - development (unsupported): alpha<n> where n >= 1
+# - stabilization (unsupported): beta<n> where n >= 1
+# - GA/update (supported): <none>
+%undefine phase
+
+%undefine timestamp
+%undefine commit_id
+
Summary: JSS Connector for Apache Tomcat
-URL: http://www.dogtagpki.org/wiki/TomcatJSS
+URL: https://github.com/dogtagpki/tomcatjss
License: LGPLv2+
BuildArch: noarch
-
-# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
-# For official (i.e. supported) releases, use x.y.z-r where r >=1.
-Version: 8.1.0
-Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
-#global _phase -alpha1
+Version: %{major_version}.%{minor_version}.%{update_version}
+Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
# To generate the source tarball:
# $ git clone https://github.com/dogtagpki/tomcatjss.git
@@ -21,7 +38,7 @@ Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# --prefix tomcatjss-VERSION/ \
# -o tomcatjss-VERSION.tar.gz \
# <version tag>
-Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_phase}/tomcatjss-%{version}%{?_phase}.tar.gz
+Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?phase:-}%{?phase}/tomcatjss-%{version}%{?phase:-}%{?phase}.tar.gz
# To create a patch for all changes since a version tag:
# $ git format-patch \
@@ -57,7 +74,7 @@ BuildRequires: slf4j
BuildRequires: slf4j-jdk14
# JSS
-BuildRequires: jss >= 5.1.0
+BuildRequires: jss >= 5.2.0
# Tomcat
%if 0%{?rhel} && ! 0%{?eln}
@@ -66,10 +83,18 @@ BuildRequires: pki-servlet-engine >= 1:9.0.7
BuildRequires: tomcat >= 1:9.0.7
%endif
+%description
+JSS Connector for Apache Tomcat, installed via the tomcatjss package,
+is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
+uses Java Security Services (JSS), a Java interface to Network Security
+Services (NSS).
+
################################################################################
-# Runtime Dependencies
+%package -n %{product_id}
################################################################################
+Summary: JSS Connector for Apache Tomcat
+
# Java
Requires: apache-commons-lang3
Requires: %{java_headless}
@@ -80,7 +105,7 @@ Requires: slf4j
Requires: slf4j-jdk14
# JSS
-Requires: jss >= 5.0.0
+Requires: jss >= 5.2.0
# Tomcat
%if 0%{?rhel} && ! 0%{?eln}
@@ -89,6 +114,9 @@ Requires: pki-servlet-engine >= 1:9.0.7
Requires: tomcat >= 1:9.0.7
%endif
+Obsoletes: tomcatjss < %{version}-%{release}
+Provides: tomcatjss = %{version}-%{release}
+
# PKI
Conflicts: pki-base < 10.10.0
@@ -98,7 +126,7 @@ Conflicts: pki-base < 10.10.0
%define _sharedstatedir /var/lib
%endif
-%description
+%description -n %{product_id}
JSS Connector for Apache Tomcat, installed via the tomcatjss package,
is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
uses Java Security Services (JSS), a Java interface to Network Security
@@ -108,14 +136,17 @@ Services (NSS).
%prep
################################################################################
-%autosetup -n tomcatjss-%{version}%{?_phase} -p 1
+%autosetup -n tomcatjss-%{version}%{?phase:-}%{?phase} -p 1
################################################################################
%build
################################################################################
+export JAVA_HOME=%{java_home}
+
./build.sh \
%{?_verbose:-v} \
+ --name=%{product_id} \
--work-dir=%{_vpath_builddir} \
--version=%{version} \
--jni-dir=%{_jnidir} \
@@ -127,6 +158,7 @@ Services (NSS).
./build.sh \
%{?_verbose:-v} \
+ --name=%{product_id} \
--work-dir=%{_vpath_builddir} \
--version=%{version} \
--java-dir=%{_javadir} \
@@ -135,7 +167,7 @@ Services (NSS).
install
################################################################################
-%files
+%files -n %{product_id}
################################################################################
%license LICENSE
View it on GitLab: https://salsa.debian.org/freeipa-team/tomcatjss/-/compare/6d6a28fcbade1055c55b2c48ee162f0206c866a8...cd5802bc2c9a4abf30ab56f8e94e070e190c242b
--
View it on GitLab: https://salsa.debian.org/freeipa-team/tomcatjss/-/compare/6d6a28fcbade1055c55b2c48ee162f0206c866a8...cd5802bc2c9a4abf30ab56f8e94e070e190c242b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20221109/8518cfca/attachment-0001.htm>
More information about the Pkg-freeipa-devel
mailing list