Rebased to JSS v4.5.1

Signed-off-by: Alexander Scheel <ascheel@redhat.com>

.gitignore

@@ -11,3 +11,4 @@ jss-4.2.6.tar.gz
 /jss-4.5.0-a4.tar.gz
 /jss-4.5.0-b1.tar.gz
 /jss-4.5.0.tar.gz
+/jss-4.5.1.tar.gz

jss.spec

@@ -6,7 +6,7 @@ Summary:        Java Security Services (JSS)
 URL:            http://www.dogtagpki.org/wiki/JSS
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
-Version:        4.5.0
+Version:        4.5.1
 Release:        1%{?_timestamp}%{?_commit_id}%{?dist}
 # global         _phase -a1
 
@@ -33,6 +33,8 @@ Source:         https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
 
 # autosetup
 BuildRequires:  git
+BuildRequires:  make
+BuildRequires:  cmake
 
 BuildRequires:  gcc-c++
 BuildRequires:  nspr-devel >= 4.13.1
@@ -41,6 +43,7 @@ BuildRequires:  nss-tools >= 3.28.4-6
 BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
 BuildRequires:  slf4j
+BuildRequires:  glassfish-jaxb-api
 %if 0%{?rhel} && 0%{?rhel} <= 7
 # no slf4j-jdk14
 %else
@@ -57,6 +60,7 @@ Requires:       nss >= 3.28.4-6
 Requires:       java-headless
 Requires:       jpackage-utils
 Requires:       slf4j
+Requires:       glassfish-jaxb-api
 %if 0%{?rhel} && 0%{?rhel} <= 7
 # no slf4j-jdk14
 %else
@@ -97,43 +101,22 @@ This package contains the API documentation for JSS.
 %set_build_flags
 
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
-[ -z "$USE_INSTALLED_NSPR" ] && export USE_INSTALLED_NSPR=1
-[ -z "$USE_INSTALLED_NSS" ] && export USE_INSTALLED_NSS=1
 
 # Enable compiler optimizations
 export BUILD_OPT=1
 
 # Generate symbolic info for debuggers
-XCFLAGS="-g $RPM_OPT_FLAGS"
+CFLAGS="-g $RPM_OPT_FLAGS"
-export XCFLAGS
+export CFLAGS
-
-PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-
-export PKG_CONFIG_ALLOW_SYSTEM_LIBS
-export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
-
-NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'`
-NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
-
-NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss | sed 's/-I//'`
-NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss | sed 's/-L//'`
-
-export NSPR_INCLUDE_DIR
-export NSPR_LIB_DIR
-export NSS_INCLUDE_DIR
-export NSS_LIB_DIR
-
-%if 0%{?__isa_bits} == 64
-USE_64=1
-export USE_64
-%endif
 
 # The Makefile is not thread-safe
-make -C coreconf
+rm -rf build && mkdir -p build && cd build
-make
+%cmake \
-make javadoc
+    -DJAVA_HOME=%{java_home} \
-make test_jss
+    -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
+    ..
+
+%{__make} all test javadoc
 
 ################################################################################
 %install
@@ -142,19 +125,19 @@ make test_jss
 
 # jars
 install -d -m 0755 $RPM_BUILD_ROOT%{_jnidir}
-install -m 644 ../dist/xpclass.jar ${RPM_BUILD_ROOT}%{_jnidir}/jss4.jar
+install -m 644 build/jss4.jar ${RPM_BUILD_ROOT}%{_jnidir}/jss4.jar
 
 # We have to use the name libjss4.so because this is dynamically
 # loaded by the jar file.
 install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/jss
-install -m 0755 ../dist/Linux*.OBJ/lib/libjss4.so ${RPM_BUILD_ROOT}%{_libdir}/jss/
+install -m 0755 build/libjss4.so ${RPM_BUILD_ROOT}%{_libdir}/jss/
 pushd  ${RPM_BUILD_ROOT}%{_libdir}/jss
     ln -fs %{_jnidir}/jss4.jar jss4.jar
 popd
 
 # javadoc
 install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp ../dist/jssdoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -rp build/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -p jss.html $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
@@ -175,6 +158,11 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 ################################################################################
 %changelog
+* Thu Nov 29 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.1-1
+- Rebased to JSS 4.5.1
+- Red Hat Bugzilla #1582323 - DER encoding error for enumerated types with a value of zero
+- Red Hat Bugzilla #1534765 - javadoc for org.mozilla.jss.pkix.cms.SignedData.getSignerInfos() is incorrect
+
 * Fri Aug 10 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-1
 - Rebased to JSS 4.5.0
 

sources

@@ -1 +1 @@
-SHA512 (jss-4.5.0.tar.gz) = abebd75104f747a95dc3160dc6218c549235f5c9ee2d416299bfe132072b76fb7f0fec4ce2664931bf971280836ab0eb26746f964c13300393fa6a5937f81cda
+SHA512 (jss-4.5.1.tar.gz) = b16c422853fad83b750775633315278becfe2156a5c1ee6e6000a345a77dbfd6c1c059d458edf9fe770a4a66f58727568d268853220ffa7f4acb57a40c2f7f96