From cb35c90824e12860c131a565ca18fcaacfbce156 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Wed, 11 Jul 2018 03:23:47 +0200 Subject: [PATCH 01/12] Fixed missing gcc build dependency --- jss.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/jss.spec b/jss.spec index ed29f10..a3adf87 100644 --- a/jss.spec +++ b/jss.spec @@ -7,7 +7,7 @@ URL: http://www.dogtagpki.org/wiki/JSS License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: 4.5.0 -Release: 0.3%{?_timestamp}%{?_commit_id}%{?dist} +Release: 0.4%{?_timestamp}%{?_commit_id}%{?dist} %global _phase -a3 # To generate the source tarball: @@ -27,13 +27,14 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas # > jss-VERSION-RELEASE.patch # Patch: jss-VERSION-RELEASE.patch -Conflicts: idm-console-framework < 1.1.17-4 -Conflicts: pki-base < 10.6.3 -Conflicts: tomcatjss < 7.3.2 +################################################################################ +# Build Dependencies +################################################################################ # autosetup BuildRequires: git +BuildRequires: gcc-c++ BuildRequires: nss-devel >= 3.28.4-6 BuildRequires: nspr-devel >= 4.13.1 BuildRequires: java-devel @@ -61,6 +62,10 @@ Requires: apache-commons-lang Requires: apache-commons-codec Requires: ldapjdk +Conflicts: idm-console-framework < 1.1.17-4 +Conflicts: pki-base < 10.6.3 +Conflicts: tomcatjss < 7.3.2 + %description Java Security Services (JSS) is a java native interface which provides a bridge for java-based applications to use native Network Security Services (NSS). @@ -168,6 +173,9 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ################################################################################ %changelog +* Tue Jul 10 2018 Dogtag PKI Team 4.5.0-0.4 +- Fixed missing gcc build dependency + * Thu Jul 5 2018 Dogtag PKI Team 4.5.0-0.3 - Rebased to JSS 4.5.0-a3 From 3983d2446076ad36903597531ced30de77185f6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 06:43:12 +0000 Subject: [PATCH 02/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jss.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jss.spec b/jss.spec index a3adf87..ef71bb3 100644 --- a/jss.spec +++ b/jss.spec @@ -172,6 +172,9 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ################################################################################ %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 4.5.0-0.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jul 10 2018 Dogtag PKI Team 4.5.0-0.4 - Fixed missing gcc build dependency From e959e1f980d41aa08129223405d111a097aad1d5 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Wed, 11 Jul 2018 03:23:47 +0200 Subject: [PATCH 03/12] Rebased to JSS 4.5.0-a4 --- .gitignore | 1 + jss.spec | 35 ++++++++++++++++------------------- sources | 2 +- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index fc4dd1f..c12f2fb 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ jss-4.2.6.tar.gz /jss-4.5.0-a1.tar.gz /jss-4.5.0-a2.tar.gz /jss-4.5.0-a3.tar.gz +/jss-4.5.0-a4.tar.gz diff --git a/jss.spec b/jss.spec index ef71bb3..df34e6a 100644 --- a/jss.spec +++ b/jss.spec @@ -8,7 +8,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: 4.5.0 Release: 0.4%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -a3 +%global _phase -a4 # To generate the source tarball: # $ git clone https://github.com/dogtagpki/jss.git @@ -40,12 +40,13 @@ BuildRequires: nspr-devel >= 4.13.1 BuildRequires: java-devel BuildRequires: jpackage-utils BuildRequires: slf4j -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?rhel} && 0%{?rhel} <= 7 +# no slf4j-jdk14 +%else BuildRequires: slf4j-jdk14 %endif BuildRequires: apache-commons-lang BuildRequires: apache-commons-codec -BuildRequires: ldapjdk %if 0%{?fedora} >= 25 || 0%{?rhel} > 7 BuildRequires: perl-interpreter @@ -55,12 +56,17 @@ Requires: nss >= 3.28.4-6 Requires: java-headless Requires: jpackage-utils Requires: slf4j -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?rhel} && 0%{?rhel} <= 7 +# no slf4j-jdk14 +%else Requires: slf4j-jdk14 %endif Requires: apache-commons-lang Requires: apache-commons-codec -Requires: ldapjdk + +Conflicts: idm-console-framework < 1.1.17-4 +Conflicts: pki-base < 10.6.3 +Conflicts: tomcatjss < 7.3.2 Conflicts: idm-console-framework < 1.1.17-4 Conflicts: pki-base < 10.6.3 @@ -159,22 +165,20 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} %defattr(-,root,root,-) %doc jss.html MPL-1.1.txt gpl.txt lgpl.txt -%{_libdir}/jss/* +%{_libdir}/* %{_jnidir}/* -%{_libdir}/jss/lib*.so ################################################################################ %files javadoc %defattr(-,root,root,-) -%dir %{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name}-%{version}/* +%{_javadocdir}/%{name}-%{version}/ ################################################################################ %changelog -* Fri Jul 13 2018 Fedora Release Engineering - 4.5.0-0.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - +* Fri Jul 20 2018 Dogtag PKI Team 4.5.0-0.4 +- Rebased to JSS 4.5.0-a4 +- Red Hat Bugzilla #1604462 - jss: FTBFS in Fedora rawhide * Tue Jul 10 2018 Dogtag PKI Team 4.5.0-0.4 - Fixed missing gcc build dependency @@ -187,10 +191,3 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} * Fri Jun 15 2018 Dogtag PKI Team 4.5.0-0.1 - Rebased to JSS 4.5.0-a1 - -* Tue May 29 2018 Dogtag PKI Team 4.4.4-1 -- Rebased to JSS 4.4.4 - -* Thu Apr 05 2018 Dogtag PKI Team 4.4.3-1 -- Rebased to JSS 4.4.3 -- Red Hat Bugzilla #1548548 - Partial Fedora build flags injection diff --git a/sources b/sources index db64094..6625c82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-4.5.0-a3.tar.gz) = 76e201b39cd7fbfc48ca1714030c3d9cfbc8a7acb175e371ace5a0dc3c86531c48f1237724338a59959f918e17351d9332fe99f8e059b821edb85230d4d202d9 +SHA512 (jss-4.5.0-a4.tar.gz) = 9a3e8adb87ff18102c7c497f8db40e07ee1efab157dae04e8b15ee49f3dc99069865a829b50ed9b4ee9ef3c649619697f88c31b8ff5461c426b63fec298d5f84 From cd0324780ced501e4d5858b992c00e3c86dccbfb Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Tue, 7 Aug 2018 17:19:08 +0200 Subject: [PATCH 04/12] Rebased to JSS 4.5.0-b1 --- .gitignore | 1 + copr-build.sh | 9 +++++++++ jss.spec | 18 +++++++++++++----- sources | 2 +- sources-update.sh | 7 +++++++ 5 files changed, 31 insertions(+), 6 deletions(-) create mode 100755 copr-build.sh create mode 100755 sources-update.sh diff --git a/.gitignore b/.gitignore index c12f2fb..ce97b1d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ jss-4.2.6.tar.gz /jss-4.5.0-a2.tar.gz /jss-4.5.0-a3.tar.gz /jss-4.5.0-a4.tar.gz +/jss-4.5.0-b1.tar.gz diff --git a/copr-build.sh b/copr-build.sh new file mode 100755 index 0000000..156c705 --- /dev/null +++ b/copr-build.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +REPO=$1 + +if [ "$REPO" == "" ]; then + REPO="pki-10.6" +fi + +fedpkg copr-build --nowait $REPO diff --git a/jss.spec b/jss.spec index df34e6a..0c7eec4 100644 --- a/jss.spec +++ b/jss.spec @@ -7,8 +7,8 @@ URL: http://www.dogtagpki.org/wiki/JSS License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: 4.5.0 -Release: 0.4%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -a4 +Release: 0.6%{?_timestamp}%{?_commit_id}%{?dist} +%global _phase -b1 # To generate the source tarball: # $ git clone https://github.com/dogtagpki/jss.git @@ -35,8 +35,9 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas BuildRequires: git BuildRequires: gcc-c++ -BuildRequires: nss-devel >= 3.28.4-6 BuildRequires: nspr-devel >= 4.13.1 +BuildRequires: nss-devel >= 3.28.4-6 +BuildRequires: nss-tools >= 3.28.4-6 BuildRequires: java-devel BuildRequires: jpackage-utils BuildRequires: slf4j @@ -65,8 +66,8 @@ Requires: apache-commons-lang Requires: apache-commons-codec Conflicts: idm-console-framework < 1.1.17-4 -Conflicts: pki-base < 10.6.3 -Conflicts: tomcatjss < 7.3.2 +Conflicts: pki-base < 10.6.5 +Conflicts: tomcatjss < 7.3.4 Conflicts: idm-console-framework < 1.1.17-4 Conflicts: pki-base < 10.6.3 @@ -135,6 +136,7 @@ export USE_64 make -C coreconf make make javadoc +make test_jss ################################################################################ %install @@ -176,6 +178,12 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ################################################################################ %changelog +* Tue Aug 7 2018 Dogtag PKI Team 4.5.0-0.6 +- Rebased to JSS 4.5.0-b1 + +* Tue Aug 7 2018 Dogtag PKI Team 4.5.0-0.5 +- Red Hat Bugzilla #1612063 - Do not override system crypto policy (support TLS 1.3) + * Fri Jul 20 2018 Dogtag PKI Team 4.5.0-0.4 - Rebased to JSS 4.5.0-a4 - Red Hat Bugzilla #1604462 - jss: FTBFS in Fedora rawhide diff --git a/sources b/sources index 6625c82..623be8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-4.5.0-a4.tar.gz) = 9a3e8adb87ff18102c7c497f8db40e07ee1efab157dae04e8b15ee49f3dc99069865a829b50ed9b4ee9ef3c649619697f88c31b8ff5461c426b63fec298d5f84 +SHA512 (jss-4.5.0-b1.tar.gz) = e5f5efbcf3e75c2e343e5531e11e131cd7704d4397adc419011eb1190d4aca44e4b9344ca2b985aaeb9823b377d01057f9736515c01d61676cd08f34dafe5300 diff --git a/sources-update.sh b/sources-update.sh new file mode 100755 index 0000000..96129ca --- /dev/null +++ b/sources-update.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +SOURCE=$1 +TARGET=`basename $1` + +cp $SOURCE $TARGET +sha512sum --tag $TARGET > sources From 6462f3dc28f121bb4aa3ce742550c9c16f793c19 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 10 Aug 2018 22:53:52 +0200 Subject: [PATCH 05/12] Rebased to JSS 4.5.0 --- .gitignore | 1 + jss.spec | 20 +++++++++++--------- sources | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index ce97b1d..521c173 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ jss-4.2.6.tar.gz /jss-4.5.0-a3.tar.gz /jss-4.5.0-a4.tar.gz /jss-4.5.0-b1.tar.gz +/jss-4.5.0.tar.gz diff --git a/jss.spec b/jss.spec index 0c7eec4..c080e11 100644 --- a/jss.spec +++ b/jss.spec @@ -7,8 +7,8 @@ URL: http://www.dogtagpki.org/wiki/JSS License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: 4.5.0 -Release: 0.6%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -b1 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +# global _phase -a1 # To generate the source tarball: # $ git clone https://github.com/dogtagpki/jss.git @@ -65,9 +65,10 @@ Requires: slf4j-jdk14 Requires: apache-commons-lang Requires: apache-commons-codec -Conflicts: idm-console-framework < 1.1.17-4 -Conflicts: pki-base < 10.6.5 +Conflicts: ldapjdk < 4.20 +Conflicts: idm-console-framework < 1.2 Conflicts: tomcatjss < 7.3.4 +Conflicts: pki-base < 10.6.5 Conflicts: idm-console-framework < 1.1.17-4 Conflicts: pki-base < 10.6.3 @@ -178,20 +179,21 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ################################################################################ %changelog -* Tue Aug 7 2018 Dogtag PKI Team 4.5.0-0.6 +* Fri Aug 10 2018 Dogtag PKI Team 4.5.0-1 +- Rebased to JSS 4.5.0 + +* Tue Aug 07 2018 Dogtag PKI Team 4.5.0-0.6 - Rebased to JSS 4.5.0-b1 -* Tue Aug 7 2018 Dogtag PKI Team 4.5.0-0.5 +* Tue Aug 07 2018 Dogtag PKI Team 4.5.0-0.5 - Red Hat Bugzilla #1612063 - Do not override system crypto policy (support TLS 1.3) * Fri Jul 20 2018 Dogtag PKI Team 4.5.0-0.4 - Rebased to JSS 4.5.0-a4 - Red Hat Bugzilla #1604462 - jss: FTBFS in Fedora rawhide - -* Tue Jul 10 2018 Dogtag PKI Team 4.5.0-0.4 - Fixed missing gcc build dependency -* Thu Jul 5 2018 Dogtag PKI Team 4.5.0-0.3 +* Thu Jul 05 2018 Dogtag PKI Team 4.5.0-0.3 - Rebased to JSS 4.5.0-a3 * Fri Jun 22 2018 Dogtag PKI Team 4.5.0-0.2 diff --git a/sources b/sources index 623be8c..e88e6d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-4.5.0-b1.tar.gz) = e5f5efbcf3e75c2e343e5531e11e131cd7704d4397adc419011eb1190d4aca44e4b9344ca2b985aaeb9823b377d01057f9736515c01d61676cd08f34dafe5300 +SHA512 (jss-4.5.0.tar.gz) = abebd75104f747a95dc3160dc6218c549235f5c9ee2d416299bfe132072b76fb7f0fec4ce2664931bf971280836ab0eb26746f964c13300393fa6a5937f81cda From c10f2d1e2b2fa0ee8b3af0cbe1bcf168e43ef815 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Thu, 29 Nov 2018 15:50:39 -0500 Subject: [PATCH 06/12] Rebased to JSS v4.5.1 Signed-off-by: Alexander Scheel --- .gitignore | 1 + jss.spec | 56 +++++++++++++++++++++--------------------------------- sources | 2 +- 3 files changed, 24 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 521c173..f89e975 100644 --- a/.gitignore +++ b/.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 diff --git a/jss.spec b/jss.spec index c080e11..54897e4 100644 --- a/jss.spec +++ b/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 @@ -101,43 +105,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" -export XCFLAGS - -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 +CFLAGS="-g $RPM_OPT_FLAGS" +export CFLAGS # The Makefile is not thread-safe -make -C coreconf -make -make javadoc -make test_jss +rm -rf build && mkdir -p build && cd build +%cmake \ + -DJAVA_HOME=%{java_home} \ + -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \ + .. + +%{__make} all test javadoc ################################################################################ %install @@ -146,19 +129,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} @@ -179,6 +162,11 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ################################################################################ %changelog +* Thu Nov 29 2018 Dogtag PKI Team 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 4.5.0-1 - Rebased to JSS 4.5.0 diff --git a/sources b/sources index e88e6d8..9d27161 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-4.5.0.tar.gz) = abebd75104f747a95dc3160dc6218c549235f5c9ee2d416299bfe132072b76fb7f0fec4ce2664931bf971280836ab0eb26746f964c13300393fa6a5937f81cda +SHA512 (jss-4.5.1.tar.gz) = b16c422853fad83b750775633315278becfe2156a5c1ee6e6000a345a77dbfd6c1c059d458edf9fe770a4a66f58727568d268853220ffa7f4acb57a40c2f7f96 From 20a823f08599118294aa804dc549f934f6814965 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Mon, 14 Jan 2019 15:12:05 -0500 Subject: [PATCH 07/12] Rebased to JSS v4.5.2 Signed-off-by: Alexander Scheel --- .gitignore | 1 + jss.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f89e975..dbd1390 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ jss-4.2.6.tar.gz /jss-4.5.0-b1.tar.gz /jss-4.5.0.tar.gz /jss-4.5.1.tar.gz +/jss-4.5.2.tar.gz diff --git a/jss.spec b/jss.spec index 54897e4..5c9538b 100644 --- a/jss.spec +++ b/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.1 +Version: 4.5.2 Release: 1%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 @@ -162,6 +162,9 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ################################################################################ %changelog +* Mon Jan 14 2019 Dogtag PKI Team 4.5.2-1 +- Rebased to JSS 4.5.2 + * Thu Nov 29 2018 Dogtag PKI Team 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 diff --git a/sources b/sources index 9d27161..a43c93f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-4.5.1.tar.gz) = b16c422853fad83b750775633315278becfe2156a5c1ee6e6000a345a77dbfd6c1c059d458edf9fe770a4a66f58727568d268853220ffa7f4acb57a40c2f7f96 +SHA512 (jss-4.5.2.tar.gz) = 344b31a218b7aebb15cc24e24d5697978889bf37856ddefc9521899d2a2a80b1bc9ed0b498a6e0cd19deed169fe1bc56f1ad42e7b8cfc188fadd28245d7bec31 From c96fd155a5938ff579086b06b2b3cfb2c5c18bbb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:49 +0100 Subject: [PATCH 08/12] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- jss.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/jss.spec b/jss.spec index 5c9538b..8db9eb4 100644 --- a/jss.spec +++ b/jss.spec @@ -88,7 +88,6 @@ This only works with gcj. Other JREs require that JCE providers be signed. ################################################################################ Summary: Java Security Services (JSS) Javadocs -Group: Documentation Requires: jss = %{version}-%{release} %description javadoc From 701e6010eac1c934df961c562701b01e5ca255ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 04:51:03 +0000 Subject: [PATCH 09/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jss.spec b/jss.spec index 8db9eb4..b605cda 100644 --- a/jss.spec +++ b/jss.spec @@ -7,7 +7,7 @@ URL: http://www.dogtagpki.org/wiki/JSS License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: 4.5.2 -Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +Release: 2%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 # To generate the source tarball: @@ -161,6 +161,9 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ################################################################################ %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 4.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 14 2019 Dogtag PKI Team 4.5.2-1 - Rebased to JSS 4.5.2 From f94ddad8393b730ab66ee868f330f0124e40c9e2 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Fri, 1 Feb 2019 11:14:43 -0500 Subject: [PATCH 10/12] Add nuxwdog patch from PKI Signed-off-by: Alexander Scheel --- ...ki-sync-netscape-security-util-Utils.patch | 94 +++++++++++++++++++ jss.spec | 12 ++- 2 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 jss-pki-sync-netscape-security-util-Utils.patch diff --git a/jss-pki-sync-netscape-security-util-Utils.patch b/jss-pki-sync-netscape-security-util-Utils.patch new file mode 100644 index 0000000..41545a8 --- /dev/null +++ b/jss-pki-sync-netscape-security-util-Utils.patch @@ -0,0 +1,94 @@ +From a5b0caf63837acfd876ee15e3823fbfdf5685432 Mon Sep 17 00:00:00 2001 +From: Dinesh Prasanth M K +Date: Wed, 30 Jan 2019 12:31:29 -0500 +Subject: [PATCH] Add exec method to execute shell commands with input + +- This is an effort to move duplicate code from PKI code + base to JSS code base + +- This chunk of code was originally introduced in PKI + code: https://github.com/dogtagpki/pki/pull/131 + +- This PR is a joined effort of: + https://github.com/dogtagpki/pki/pull/122 + +Signed-off-by: Dinesh Prasanth M K +--- + .../jss/netscape/security/util/Utils.java | 57 +++++++++++++++++++ + 1 file changed, 57 insertions(+) + +diff --git a/org/mozilla/jss/netscape/security/util/Utils.java b/org/mozilla/jss/netscape/security/util/Utils.java +index b1a3c341..b45381ae 100644 +--- a/org/mozilla/jss/netscape/security/util/Utils.java ++++ b/org/mozilla/jss/netscape/security/util/Utils.java +@@ -25,6 +25,7 @@ + import java.io.FileWriter; + import java.io.IOException; + import java.io.InputStream; ++import java.io.InputStreamReader; + import java.io.OutputStream; + import java.io.OutputStreamWriter; + import java.io.PrintWriter; +@@ -96,6 +97,62 @@ public static boolean exec(String cmd) { + return false; + } + ++ public static String readFromStream(InputStream inputStream) throws IOException { ++ StringBuilder sb = new StringBuilder(); ++ BufferedReader br = null; ++ try { ++ br = new BufferedReader(new InputStreamReader(inputStream)); ++ String line = null; ++ while ((line = br.readLine()) != null) { ++ sb.append(line + System.getProperty("line.separator")); ++ } ++ } finally { ++ br.close(); ++ } ++ return sb.toString().trim(); ++ } ++ ++ public static void writeToStream(OutputStream outputStream, String input) throws IOException { ++ BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(outputStream)); ++ writer.write(input); ++ writer.flush(); ++ writer.close(); ++ } ++ ++ /** ++ * Utility method to execute system commands ++ * ++ * @param cmd The command to be executed and its arguments ++ * @param input The stdin input to be passed to the cmd ++ * @return stdout or stderr of the command executed ++ * @throws IOException ++ * @throws InterruptedException ++ */ ++ public static String exec(String[] cmd, String input) throws IOException, InterruptedException { ++ ++ ProcessBuilder pb = new ProcessBuilder(cmd); ++ ++ Process p = pb.start(); ++ ++ if (input != null) { ++ writeToStream(p.getOutputStream(), input); ++ } ++ ++ p.waitFor(); ++ ++ String output; ++ if (p.exitValue() == 0) { ++ output = readFromStream(p.getInputStream()); ++ } else { ++ output = readFromStream(p.getErrorStream()); ++ } ++ p.destroy(); ++ ++ return output; ++ } ++ ++ ++ + public static String SpecialURLDecode(String s) { + if (s == null) + return null; diff --git a/jss.spec b/jss.spec index b605cda..bd0d370 100644 --- a/jss.spec +++ b/jss.spec @@ -7,7 +7,7 @@ URL: http://www.dogtagpki.org/wiki/JSS License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: 4.5.2 -Release: 2%{?_timestamp}%{?_commit_id}%{?dist} +Release: 3%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 # To generate the source tarball: @@ -26,6 +26,7 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas # \ # > jss-VERSION-RELEASE.patch # Patch: jss-VERSION-RELEASE.patch +Patch1: jss-pki-sync-netscape-security-util-Utils.patch ################################################################################ # Build Dependencies @@ -38,8 +39,8 @@ BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: nspr-devel >= 4.13.1 -BuildRequires: nss-devel >= 3.28.4-6 -BuildRequires: nss-tools >= 3.28.4-6 +BuildRequires: nss-devel >= 3.30 +BuildRequires: nss-tools >= 3.30 BuildRequires: java-devel BuildRequires: jpackage-utils BuildRequires: slf4j @@ -56,7 +57,7 @@ BuildRequires: apache-commons-codec BuildRequires: perl-interpreter %endif -Requires: nss >= 3.28.4-6 +Requires: nss >= 3.30 Requires: java-headless Requires: jpackage-utils Requires: slf4j @@ -161,6 +162,9 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ################################################################################ %changelog +* Fri Feb 01 2019 Dogtag PKI Team 4.5.2-3 +- Include nuxwdog patch for netscape.security.util.Utils from PKI + * Fri Feb 01 2019 Fedora Release Engineering - 4.5.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b9caa96092b0130c96e641a656cab090c6681e11 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Tue, 19 Mar 2019 14:14:43 -0400 Subject: [PATCH 11/12] Rebase to JSS v4.5.3 Signed-off-by: Alexander Scheel --- .gitignore | 1 + ...ki-sync-netscape-security-util-Utils.patch | 94 ------------------- jss.spec | 6 +- sources | 2 +- 4 files changed, 5 insertions(+), 98 deletions(-) delete mode 100644 jss-pki-sync-netscape-security-util-Utils.patch diff --git a/.gitignore b/.gitignore index dbd1390..d1f14a6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ jss-4.2.6.tar.gz /jss-4.5.0.tar.gz /jss-4.5.1.tar.gz /jss-4.5.2.tar.gz +/jss-4.5.3.tar.gz diff --git a/jss-pki-sync-netscape-security-util-Utils.patch b/jss-pki-sync-netscape-security-util-Utils.patch deleted file mode 100644 index 41545a8..0000000 --- a/jss-pki-sync-netscape-security-util-Utils.patch +++ /dev/null @@ -1,94 +0,0 @@ -From a5b0caf63837acfd876ee15e3823fbfdf5685432 Mon Sep 17 00:00:00 2001 -From: Dinesh Prasanth M K -Date: Wed, 30 Jan 2019 12:31:29 -0500 -Subject: [PATCH] Add exec method to execute shell commands with input - -- This is an effort to move duplicate code from PKI code - base to JSS code base - -- This chunk of code was originally introduced in PKI - code: https://github.com/dogtagpki/pki/pull/131 - -- This PR is a joined effort of: - https://github.com/dogtagpki/pki/pull/122 - -Signed-off-by: Dinesh Prasanth M K ---- - .../jss/netscape/security/util/Utils.java | 57 +++++++++++++++++++ - 1 file changed, 57 insertions(+) - -diff --git a/org/mozilla/jss/netscape/security/util/Utils.java b/org/mozilla/jss/netscape/security/util/Utils.java -index b1a3c341..b45381ae 100644 ---- a/org/mozilla/jss/netscape/security/util/Utils.java -+++ b/org/mozilla/jss/netscape/security/util/Utils.java -@@ -25,6 +25,7 @@ - import java.io.FileWriter; - import java.io.IOException; - import java.io.InputStream; -+import java.io.InputStreamReader; - import java.io.OutputStream; - import java.io.OutputStreamWriter; - import java.io.PrintWriter; -@@ -96,6 +97,62 @@ public static boolean exec(String cmd) { - return false; - } - -+ public static String readFromStream(InputStream inputStream) throws IOException { -+ StringBuilder sb = new StringBuilder(); -+ BufferedReader br = null; -+ try { -+ br = new BufferedReader(new InputStreamReader(inputStream)); -+ String line = null; -+ while ((line = br.readLine()) != null) { -+ sb.append(line + System.getProperty("line.separator")); -+ } -+ } finally { -+ br.close(); -+ } -+ return sb.toString().trim(); -+ } -+ -+ public static void writeToStream(OutputStream outputStream, String input) throws IOException { -+ BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(outputStream)); -+ writer.write(input); -+ writer.flush(); -+ writer.close(); -+ } -+ -+ /** -+ * Utility method to execute system commands -+ * -+ * @param cmd The command to be executed and its arguments -+ * @param input The stdin input to be passed to the cmd -+ * @return stdout or stderr of the command executed -+ * @throws IOException -+ * @throws InterruptedException -+ */ -+ public static String exec(String[] cmd, String input) throws IOException, InterruptedException { -+ -+ ProcessBuilder pb = new ProcessBuilder(cmd); -+ -+ Process p = pb.start(); -+ -+ if (input != null) { -+ writeToStream(p.getOutputStream(), input); -+ } -+ -+ p.waitFor(); -+ -+ String output; -+ if (p.exitValue() == 0) { -+ output = readFromStream(p.getInputStream()); -+ } else { -+ output = readFromStream(p.getErrorStream()); -+ } -+ p.destroy(); -+ -+ return output; -+ } -+ -+ -+ - public static String SpecialURLDecode(String s) { - if (s == null) - return null; diff --git a/jss.spec b/jss.spec index bd0d370..77eb21d 100644 --- a/jss.spec +++ b/jss.spec @@ -6,8 +6,8 @@ Summary: Java Security Services (JSS) URL: http://www.dogtagpki.org/wiki/JSS License: MPLv1.1 or GPLv2+ or LGPLv2+ -Version: 4.5.2 -Release: 3%{?_timestamp}%{?_commit_id}%{?dist} +Version: 4.5.3 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 # To generate the source tarball: @@ -26,7 +26,7 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas # \ # > jss-VERSION-RELEASE.patch # Patch: jss-VERSION-RELEASE.patch -Patch1: jss-pki-sync-netscape-security-util-Utils.patch +# Patch1: jss-pki-sync-netscape-security-util-Utils.patch ################################################################################ # Build Dependencies diff --git a/sources b/sources index a43c93f..8c326c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-4.5.2.tar.gz) = 344b31a218b7aebb15cc24e24d5697978889bf37856ddefc9521899d2a2a80b1bc9ed0b498a6e0cd19deed169fe1bc56f1ad42e7b8cfc188fadd28245d7bec31 +SHA512 (jss-4.5.3.tar.gz) = 6a5d5065803a36a42f15c19fa870edf4844d650911c690a8033288ee0e2e6e115868de39a7c9c955e068568a859baf5fb3e8e970b4167dfc19782bb661ab6d71 From dad6b5be8ccd19a460780c7f6ff3ac816acf9623 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Tue, 19 Mar 2019 14:18:07 -0400 Subject: [PATCH 12/12] Updates to spec file from upstream Also adds changelog entry for the release of 4.5.3. Signed-off-by: Alexander Scheel --- jss.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/jss.spec b/jss.spec index 77eb21d..d1dcd99 100644 --- a/jss.spec +++ b/jss.spec @@ -26,7 +26,6 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas # \ # > jss-VERSION-RELEASE.patch # Patch: jss-VERSION-RELEASE.patch -# Patch1: jss-pki-sync-netscape-security-util-Utils.patch ################################################################################ # Build Dependencies @@ -53,9 +52,7 @@ BuildRequires: slf4j-jdk14 BuildRequires: apache-commons-lang BuildRequires: apache-commons-codec -%if 0%{?fedora} >= 25 || 0%{?rhel} > 7 -BuildRequires: perl-interpreter -%endif +BuildRequires: junit Requires: nss >= 3.30 Requires: java-headless @@ -75,10 +72,6 @@ Conflicts: idm-console-framework < 1.2 Conflicts: tomcatjss < 7.3.4 Conflicts: pki-base < 10.6.5 -Conflicts: idm-console-framework < 1.1.17-4 -Conflicts: pki-base < 10.6.3 -Conflicts: tomcatjss < 7.3.2 - %description Java Security Services (JSS) is a java native interface which provides a bridge for java-based applications to use native Network Security Services (NSS). @@ -120,7 +113,8 @@ rm -rf build && mkdir -p build && cd build -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \ .. -%{__make} all test javadoc +%{__make} all javadoc +ctest --output-on-failure ################################################################################ %install @@ -162,7 +156,10 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ################################################################################ %changelog -* Fri Feb 01 2019 Dogtag PKI Team 4.5.2-3 +* Tue Mar 19 2019 Dogtag PKI Team - 4.5.3-1 +- Rebase to JSS 4.5.3 + +* Fri Feb 01 2019 Dogtag PKI Team - 4.5.2-3 - Include nuxwdog patch for netscape.security.util.Utils from PKI * Fri Feb 01 2019 Fedora Release Engineering - 4.5.2-2