The package rpms/nspr.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nspr.git/commit/?id=69e1a3f180eac....
Change:
-%ifarch i686 x86_64
Thanks.
Full change:
============
commit 69e1a3f180eac9fd4880e699e853219be4570c81
Author: Daiki Ueno <dueno(a)redhat.com>
Date: Mon Nov 2 16:18:59 2020 +0100
merged into nss package
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 6b93d25..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-/nspr-4.13.1.tar.gz
-/nspr-4.14.0.tar.gz
-/nspr-4.15.0.tar.gz
-/nspr-4.16.0.tar.gz
-/nspr-4.17.0.tar.gz
-/nspr-4.18.0.tar.gz
-/nspr-4.19.0.tar.gz
-/nspr-4.20.tar.gz
-/nspr-4.21.tar.gz
-/nspr-4.22.tar.gz
-/nspr-4.23.tar.gz
-/nspr-4.24.tar.gz
-/nspr-4.25.tar.gz
-/nspr-4.26.tar.gz
-/nspr-4.28.tar.gz
-/nspr-4.29.tar.gz
diff --git a/STAGE2-nspr b/STAGE2-nspr
deleted file mode 100644
index f28735d..0000000
--- a/STAGE2-nspr
+++ /dev/null
@@ -1,11 +0,0 @@
-case "$TARGET" in
- *armv[567]* ) FLAGS2="--enable-thumb2" ;;
- * ) FLAGS2="" ;;
-esac
-
-mcd $BUILDDIR/nspr
-
-$SRC/nspr-*/nspr/configure $TCONFIGARGS $FLAGS2
-
-make $J
-make $J install
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..d47c880
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+merged into nss package
diff --git a/nspr-config-pc.patch b/nspr-config-pc.patch
deleted file mode 100644
index 2c1fe87..0000000
--- a/nspr-config-pc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -up nspr/config/nspr-config.in.flags nspr/config/nspr-config.in
---- nspr/config/nspr-config.in.flags 2013-05-29 13:46:34.147971410 -0700
-+++ nspr/config/nspr-config.in 2013-05-29 14:17:10.990838914 -0700
-@@ -102,7 +102,7 @@ if test -z "$includedir"; then
- includedir=@includedir@
- fi
- if test -z "$libdir"; then
-- libdir=@libdir@
-+ libdir=`pkg-config --variable=libdir nspr`
- fi
-
- if test "$echo_prefix" = "yes"; then
-@@ -136,12 +136,12 @@ if test "$echo_libs" = "yes"; then
- if test -n "$lib_nspr"; then
- libdirs="$libdirs -lnspr${major_version}"
- fi
-- os_ldflags="@LDFLAGS@"
-+ os_ldflags=`pkg-config --variable=ldflags nspr`
- for i in $os_ldflags ; do
- if echo $i | grep \^-L >/dev/null; then
- libdirs="$libdirs $i"
- fi
- done
-- echo $libdirs @OS_LIBS@
-+ echo $libdirs `pkg-config --variable=os_libs nspr`
- fi
-
-diff -up nspr/config/nspr.pc.in.flags nspr/config/nspr.pc.in
---- nspr/config/nspr.pc.in.flags 2013-05-29 13:48:15.026643570 -0700
-+++ nspr/config/nspr.pc.in 2013-05-29 13:49:47.795202949 -0700
-@@ -6,5 +6,5 @@ includedir=@includedir@
- Name: NSPR
- Description: The Netscape Portable Runtime
- Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.(a)MOD_PATCH_VERSION@
--Libs: -L@libdir@ -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@
-lnspr@MOD_MAJOR_VERSION@
-+Libs: -L@libdir@ -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@
-lnspr@MOD_MAJOR_VERSION@ @OS_LIBS@
- Cflags: -I@includedir@
diff --git a/nspr-config.xml b/nspr-config.xml
deleted file mode 100644
index 9e3f99c..0000000
--- a/nspr-config.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY date SYSTEM "date.xml">
-<!ENTITY version SYSTEM "version.xml">
-]>
-
-<refentry id="nspr-config">
-
- <refentryinfo>
- <date>&date;</date>
- <title>Netscape Portable Runtime</title>
- <productname>nspr</productname>
- <productnumber>&version;</productnumber>
- </refentryinfo>
-
- <refmeta>
- <refentrytitle>nspr-config</refentrytitle>
- <manvolnum>1</manvolnum>
- </refmeta>
-
- <refnamediv>
- <refname>nspr-config</refname>
- <refpurpose>Return meta information about nspr libraries</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>nspr-config</command>
- <arg><option>--prefix</option></arg>
- <arg><option>--exec-prefix</option></arg>
- <arg><option>--includedir</option></arg>
- <arg><option>--libs</option></arg>
- <arg><option>--cflags</option></arg>
- <arg><option>--libdir</option></arg>
- <arg><option>--version</option></arg>
- </cmdsynopsis>
- </refsynopsisdiv>
-
-<refsection id="description">
- <title>Description</title>
- <para><command>nspr-config</command> is a shell script which can be
used to obtain gcc options for building client pacakges of nspr.</para>
- </refsection>
-
- <refsection>
- <title>Options</title>
-
- <variablelist>
- <varlistentry>
- <term><option>--prefix</option></term>
- <listitem><simpara>Returns the top level system directory under which
the nspr libraries are installed.</simpara></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--exec-prefix</option></term>
- <listitem><simpara>Returns the top level system directory under which
any nspr binaries would be installed.</simpara></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--includedir</option>
<replaceable>count</replaceable></term>
- <listitem><simpara>Returns the path to the directory were the nspr
headers are installed.</simpara></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--version</option></term>
- <listitem><simpara>Returns the upstream version of nspr in the form
major_version-minor_version-patch_version.</simpara></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--libs</option></term>
- <listitem><simpara>Returns the compiler linking
flags.</simpara></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--cflags</option></term>
- <listitem><simpara>Returns the compiler include
flags.</simpara></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--libdir</option></term>
- <listitem><simpara>Returns the path to the directory were the nspr
libraries are installed.</simpara></listitem>
- </varlistentry>
-
- </variablelist>
- </refsection>
-
- <refsection>
- <title>Examples</title>
-
- <para>The following example will query for both include path and linkage
flags:
- <programlisting>
- /usr/bin/nspr-config --cflags --libs
- </programlisting>
- </para>
-
-
- </refsection>
-
- <refsection>
- <title>Files</title>
-
- <para><filename>/usr/bin/nspr-config</filename></para>
-
- </refsection>
-
- <refsection>
- <title>See also</title>
- <para>pkg-config(1)</para>
- </refsection>
-
- <refsection id="authors">
- <title>Authors</title>
- <para>The NSPR liraries were written and maintained by developers with
Netscape, Red Hat, Sun, Oracle, Mozilla, and Google.</para>
- <para>
- Authors: Elio Maldonado &lt;emaldona(a)redhat.com>.
- </para>
- </refsection>
-
-<!-- don't change -->
- <refsection id="license">
- <title>LICENSE</title>
- <para>Licensed under the Mozilla Public License, v. 2.0. If a copy of the MPL
was not distributed with this file, You can obtain one at
http://mozilla.org/MPL/2.0/.
- </para>
- </refsection>
-
-</refentry>
-
diff --git a/nspr-gcc-atomics.patch b/nspr-gcc-atomics.patch
deleted file mode 100644
index b94e840..0000000
--- a/nspr-gcc-atomics.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
---- a/pr/include/md/_linux.h
-+++ b/pr/include/md/_linux.h
-@@ -82,53 +82,73 @@
- #define NO_DLOPEN_NULL
- #endif
-
- #if defined(__FreeBSD_kernel__) || defined(__GNU__)
- #define _PR_HAVE_SOCKADDR_LEN
- #endif
-
- #if defined(__i386__)
-+#if defined(__GNUC__)
-+/* Use GCC built-in functions */
-+#define _PR_HAVE_ATOMIC_OPS
-+#define _MD_INIT_ATOMIC()
-+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
-+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)
-+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i)
-+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv)
-+#else
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
- extern PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val);
- #define _MD_ATOMIC_INCREMENT _PR_x86_AtomicIncrement
- extern PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val);
- #define _MD_ATOMIC_DECREMENT _PR_x86_AtomicDecrement
- extern PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val);
- #define _MD_ATOMIC_ADD _PR_x86_AtomicAdd
- extern PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval);
- #define _MD_ATOMIC_SET _PR_x86_AtomicSet
- #endif
-+#endif
-
- #if defined(__ia64__)
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
- extern PRInt32 _PR_ia64_AtomicIncrement(PRInt32 *val);
- #define _MD_ATOMIC_INCREMENT _PR_ia64_AtomicIncrement
- extern PRInt32 _PR_ia64_AtomicDecrement(PRInt32 *val);
- #define _MD_ATOMIC_DECREMENT _PR_ia64_AtomicDecrement
- extern PRInt32 _PR_ia64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
- #define _MD_ATOMIC_ADD _PR_ia64_AtomicAdd
- extern PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval);
- #define _MD_ATOMIC_SET _PR_ia64_AtomicSet
- #endif
-
- #if defined(__x86_64__)
-+#if defined(__GNUC__)
-+/* Use GCC built-in functions */
-+#define _PR_HAVE_ATOMIC_OPS
-+#define _MD_INIT_ATOMIC()
-+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
-+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)
-+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i)
-+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv)
-+#else
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
- extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val);
- #define _MD_ATOMIC_INCREMENT _PR_x86_64_AtomicIncrement
- extern PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val);
- #define _MD_ATOMIC_DECREMENT _PR_x86_64_AtomicDecrement
- extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
- #define _MD_ATOMIC_ADD _PR_x86_64_AtomicAdd
- extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
- #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet
- #endif
-+#endif
-
- #if defined(__or1k__)
- #if defined(__GNUC__)
- /* Use GCC built-in functions */
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
- #define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
- #define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)
diff --git a/nspr.spec b/nspr.spec
deleted file mode 100644
index 9597765..0000000
--- a/nspr.spec
+++ /dev/null
@@ -1,558 +0,0 @@
-%global nspr_version 4.29.0
-
-# The upstream omits the trailing ".0", while we need it for
-# consistency with the pkg-config version:
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1578106
-%{lua:
-rpm.define(string.format("nspr_archive_version %s",
- string.gsub(rpm.expand("%nspr_version"), "(.*)%.0$",
"%1")))
-}
-
-Summary: Netscape Portable Runtime
-Name: nspr
-Version: %{nspr_version}
-Release: 1%{?dist}
-License: MPLv2.0
-URL:
http://www.mozilla.org/projects/nspr/
-Conflicts: filesystem < 3
-BuildRequires: gcc
-
-# Sources available at
ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/
-# When hg tag based snapshots are being used, refer to hg documentation on
-#
mozilla.org and check out subdirectory mozilla/nsprpub.
-Source0: %{name}-%{nspr_archive_version}.tar.gz
-Source1: nspr-config.xml
-
-Patch1: nspr-config-pc.patch
-Patch2: nspr-gcc-atomics.patch
-
-%description
-NSPR provides platform independence for non-GUI operating system
-facilities. These facilities include threads, thread synchronization,
-normal file and network I/O, interval timing and calendar time, basic
-memory management (malloc and free) and shared library linking.
-
-%package devel
-Summary: Development libraries for the Netscape Portable Runtime
-Requires: nspr = %{version}-%{release}
-Requires: pkgconfig
-BuildRequires: xmlto
-Conflicts: filesystem < 3
-
-%description devel
-Header files for doing development with the Netscape Portable Runtime.
-
-%prep
-
-%setup -q -n %{name}-%{nspr_archive_version}
-
-# Original nspr-config is not suitable for our distribution,
-# because on different platforms it contains different dynamic content.
-# Therefore we produce an adjusted copy of nspr-config that will be
-# identical on all platforms.
-# However, we need to use original nspr-config to produce some variables
-# that go into nspr.pc for pkg-config.
-
-cp ./nspr/config/nspr-config.in ./nspr/config/nspr-config-pc.in
-%patch1 -p0 -b .flags
-pushd nspr
-%patch2 -p1 -b .gcc-atomics
-popd
-
-%build
-%define _configure ./nspr/configure
-%configure \
- --prefix=%{_prefix} \
- --libdir=%{_libdir} \
- --includedir=%{_includedir}/nspr4 \
-%ifnarch noarch
-%if 0%{__isa_bits} == 64
- --enable-64bit \
-%endif
-%endif
-%ifarch armv7l armv7hl armv7nhl
- --enable-thumb2 \
-%endif
- --enable-optimize="$RPM_OPT_FLAGS" \
- --disable-debug
-
-# The assembly files are only for legacy atomics, to which we prefer GCC atomics
-%ifarch i686 x86_64
-sed -i '/^PR_MD_ASFILES/d' config/autoconf.mk
-%endif
-make
-
-date +"%e %B %Y" | tr -d '\n' > date.xml
-echo -n %{version} > version.xml
-
-for m in %{SOURCE1}; do
- cp ${m} .
-done
-for m in nspr-config.xml; do
- xmlto man ${m}
-done
-
-%check
-
-# Run test suite.
-perl ./nspr/pr/tests/runtests.pl 2>&1 | tee output.log
-
-TEST_FAILURES=`grep -c FAILED ./output.log` || :
-if [ $TEST_FAILURES -ne 0 ]; then
- echo "error: test suite returned failure(s)"
- exit 1
-fi
-echo "test suite completed"
-
-%install
-
-%{__rm} -Rf $RPM_BUILD_ROOT
-
-DESTDIR=$RPM_BUILD_ROOT \
- make install
-
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-
-NSPR_LIBS=`./config/nspr-config --libs`
-NSPR_CFLAGS=`./config/nspr-config --cflags`
-NSPR_VERSION=`./config/nspr-config --version`
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
-
-# Get rid of the things we don't want installed (per upstream)
-%{__rm} -rf \
- $RPM_BUILD_ROOT/%{_bindir}/compile-et.pl \
- $RPM_BUILD_ROOT/%{_bindir}/prerr.properties \
- $RPM_BUILD_ROOT/%{_libdir}/libnspr4.a \
- $RPM_BUILD_ROOT/%{_libdir}/libplc4.a \
- $RPM_BUILD_ROOT/%{_libdir}/libplds4.a \
- $RPM_BUILD_ROOT/%{_datadir}/aclocal/nspr.m4 \
- $RPM_BUILD_ROOT/%{_includedir}/nspr4/md
-
-for f in nspr-config; do
- install -c -m 644 ${f}.1 $RPM_BUILD_ROOT%{_mandir}/man1/${f}.1
-done
-
-%ldconfig_scriptlets
-
-%files
-%{!?_licensedir:%global license %%doc}
-%license nspr/LICENSE
-%{_libdir}/libnspr4.so
-%{_libdir}/libplc4.so
-%{_libdir}/libplds4.so
-
-%files devel
-%{_includedir}/nspr4
-%{_libdir}/pkgconfig/nspr.pc
-%{_bindir}/nspr-config
-%{_mandir}/man*/*
-
-%changelog
-* Sat Sep 19 2020 Daiki Ueno <dueno(a)redhat.com> - 4.29.0-1
-- Update to NSPR 4.29
-
-* Mon Aug 24 2020 Daiki Ueno <dueno(a)redhat.com> - 4.28.0-1
-- Update to NSPR 4.28
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.26.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Daiki Ueno <dueno(a)redhat.com> - 4.26.0-1
-- Update to NSPR 4.26
-
-* Mon Feb 17 2020 Daiki Ueno <dueno(a)redhat.com> - 4.25.0-1
-- Update to NSPR 4.25
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.24.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jan 3 2020 Daiki Ueno <dueno(a)redhat.com> - 4.24.0-1
-- Update to NSPR 4.24
-
-* Fri Oct 18 2019 Daiki Ueno <dueno(a)redhat.com> - 4.23.0-1
-- Update to NSPR 4.23
-
-* Tue Sep 3 2019 Daiki Ueno <dueno(a)redhat.com> - 4.22.0-1
-- Update to NSPR 4.22
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.21.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Mar 20 2019 Daiki Ueno <dueno(a)redhat.com> - 4.21.0-1
-- Update to NSPR 4.21
-
-* Wed Mar 13 2019 Paolo Bonzini <pbonzini(a)redhat.com> - 4.20.0-3
-- Prefer GCC atomics on i686 and x86_64
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.20.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Sep 3 2018 Daiki Ueno <dueno(a)redhat.com> - 4.20.0-1
-- Update to NSPR 4.20
-- Use the upstream tarball as it is (rhbz#1578106)
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.19.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Mar 8 2018 Daiki Ueno <dueno(a)redhat.com> - 4.19.0-1
-- Update to NSPR 4.19
-- Add gcc to BuildRequires
-
-* Sat Feb 24 2018 Florian Weimer <fweimer(a)redhat.com> - 4.18.0-4
-- Use LDFLAGS from redhat-rpm-config
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.18.0-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Jan 30 2018 Daiki Ueno <dueno(a)redhat.com> - 4.18.0-2
-- Rebuild
-
-* Mon Jan 22 2018 Daiki Ueno <dueno(a)redhat.com> - 4.18.0-1
-- Update to NSPR 4.18
-
-* Wed Sep 20 2017 Daiki Ueno <dueno(a)redhat.com> - 4.17.0-1
-- Update to NSPR 4.17
-
-* Thu Aug 3 2017 Daiki Ueno <dueno(a)redhat.com> - 4.16.0-1
-- Update to NSPR 4.16
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.15.0-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.15.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed Jun 21 2017 Daiki Ueno <dueno(a)redhat.com> - 4.15.0-1
-- Update to NSPR 4.15
-
-* Fri Apr 21 2017 Daiki Ueno <dueno(a)redhat.com> - 4.14.0-2
-- Rebase to NSPR 4.14
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.13.1-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Oct 21 2016 Daiki Ueno <dueno(a)redhat.com> - 4.13.1-1
-- Rebase to NSPR 4.13.1
-
-* Thu Sep 29 2016 Daiki Ueno <dueno(a)redhat.com> - 4.13.0-1
-- Rebase to NSPR 4.13
-
-* Sun Feb 21 2016 Elio Maldonado <emaldona(a)redhat.com> - 4.12.0-1
-- Rebase to NSPR 4.12
-
-* Mon Jan 18 2016 Elio Maldonado <emaldona(a)redhat.com> - 4.11.0-1
-- Rebase to NSPR 4.11
-
-* Sat Nov 14 2015 Elio Maldonado <emaldona(a)redhat.com> - 4.10.10-2
-- Use __isa_bits macro instead of list of 64-bit architectures
-- Patch contributed by Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com>
-- Resolves: Bug 1258425
-
-* Thu Oct 29 2015 Elio Maldonado <emaldona(a)redhat.com> - 4.10.10-1
-- Update to NSPR_4_10_10_RTM
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
4.10.8-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu Jan 29 2015 Elio Maldonado <emaldona(a)redhat.com> - 4.10.8-1
-- Update to NSPR_4_10_8_RTM
-
-* Tue Aug 19 2014 Elio Maldonado <emaldona(a)redhat.com> - 4.10.7-1
-- Update to NSPR_4_10_7_RTM
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
4.10.6-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Fri Jul 18 2014 Tom Callaway <spot(a)fedoraproject.org> - 4.10.6-2
-- fix license handling
-
-* Tue Jun 10 2014 Elio Maldonado <emaldona(a)redhat.com> - 4.10.6-1
-- Update to NSPR_4_10_6_RTM
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
4.10.5-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue May 06 2014 Elio Maldonado <emaldona(a)redhat.com> - 4.10.5-1
-- Update to NSPR_4_10_5_RTM
-- Remove patch no longer needed due to the rebase
-
-* Wed Apr 02 2014 Elio Maldonado <emaldona(a)redhat.com> - 4.10.4-2
-- Resolves: Bug 1083725 - Add ppc64le support to nspr
-- Use a patch by Ulrich Weigand already applied upstream
-
-* Sat Mar 15 2014 Elio Maldonado <emaldona(a)redhat.com> - 4.10.4-1
-- Update to NSPR_4_10_4_RTM
-
-* Thu Dec 05 2013 Dennis Gilmore <dennis(a)ausil.us> - 4.10.2-3
-- escape the rpm macro in the previous commit
-
-* Tue Dec 3 2013 Peter Robinson <pbrobinson(a)fedoraproject.org> 4.10.2-2
-- Fix running %%configure to ensure appropriate config options and fix aarch64 builds
-
-* Sat Nov 23 2013 Elio Maldonado <emaldona(a)redhat.com> - 4.10.2-1
-- Update to NSPR_4_10_2_RTM
-- Avoid unsigned integer wrapping in PL_ArenaAllocate
-- Resolves: rhbz#1031465 - CVE-2013-5607
-
-* Thu Sep 26 2013 Elio Maldonado <emaldona(a)redhat.com> - 4.10.1-1
-- Update to NSPR_4_10_1_RTM
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
4.10.0-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Jun 27 2013 Elio Maldonado <emaldona(a)redhat.com> - 4.10.0-3
-- Repackage the source tar ball as nspr-4.10.0.tar.bz2
-- Ensure client packages dependency resolution succeeds
-
-* Tue Jun 18 2013 Elio Maldonado <emaldona(a)redhat.com> - 4.10-2
-- Install man page for the nspr-config script
-
-* Wed May 29 2013 Elio Maldonado <emaldona(a)redhat.com> - 4.10-1
-- Update to NSPR_4_10_RTM
-
-* Mon May 06 2013 Elio Maldonado <emaldona(a)redhat.com> - 4.9.6-1
-- Update to NSPR_4_9_6_RTM
-
-* Mon Feb 18 2013 Elio Maldonado <emaldona(a)redhat.com> - 4.9.5-2
-- Resolves: rhbz#912483 - Add spec file support for AArch64
-
-* Fri Feb 01 2013 Elio Maldonado <emaldona(a)redhat.com> - 4.9.5-1
-- Update to NSPR_4_9_5_RTM
-
-* Mon Dec 17 2012 Elio Maldonado <emaldona(a)redhat.com> - 4.9.4-1
-- Update to NSPR_4_9_4_RTM
-
-* Mon Oct 01 2012 Elio Maldonado <emaldona(a)redhat.com> - 4.9.3-0.1.beta1.1
-- Update to NSPR_4_9_5_BETA1
-
-* Sun Aug 26 2012 Elio Maldonado <emaldona(a)redhat.com> - 4.9.2-1
-- Update to NSPR_4_9_2_RTM
-
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
4.9.1-6
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Wed Jul 11 2012 Elio Maldonado <emaldona(a)redhat.com> - 4.9.1-5
-- Updated License: to MPLv2.0 per upstream
-
-* Fri Jun 22 2012 Elio Maldonado <emaldona(a)redhat.com> - 4.9.1-4
-- Update the nspr-config-pc.patch to prevent multilib regressions
-
-* Thu Jun 21 2012 Elio Maldonado <emaldona(a)redhat.com> - 4.9.1-3
-- Bump the release tag
-
-* Thu Jun 21 2012 Elio Maldonado <emaldona(a)redhat.com> - 4.9.1-3
-- Resolves: rhbz#833529 - restore the good changes to nspr.pc
-
-* Thu Jun 21 2012 Elio Maldonado <emaldona(a)redhat.com> - 4.9.1-2
-- Resolves: rhbz#833529 - revert unwanted change to nspr.pc
-- Removed nspr-config.pc.in.patch
-
-* Mon Jun 18 2012 Elio Maldonado <emaldona(a)redhat.com> - 4.9.1-1
-- Update to NSPR_4_9_1_RTM
-
-* Wed Mar 21 2012 Elio Maldonado <emaldona(a)redhat.com> - 4.9-2
-- Resolves: Bug 805672 - Library needs partial RELRO support added
-
-* Wed Feb 29 2012 Elio Maldonado <emaldona(a)redhat.com> - 4.9-1
-- Update to NSPR_4_9_RTM
-
-* Wed Jan 25 2012 Harald Hoyer <harald(a)redhat.com> 4.9-0.2.beta3.1
-- install everything in /usr
-
https://fedoraproject.org/wiki/Features/UsrMove
-
-* Wed Jan 25 2012 Harald Hoyer <harald(a)redhat.com> 4.9-0.2.beta3.1
--
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
4.9-0.2.beta3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Oct 06 2011 Elio Maldonado <emaldona(a)redhat.com> - 4.9-0.1.beta3
-- Update to NSPR_4_9_BETA3
-
-* Thu Sep 8 2011 Ville Skyttä <ville.skytta(a)iki.fi> - 4.8.9-2
-- Avoid %%post/un shell invocations and dependencies.
-
-* Tue Aug 09 2011 Elio Maldonado <emaldona(a)redhat.com> - 4.8.9-1
-- Update to NSPR_4_8_9_RTM
-
-* Mon Jul 18 2011 Elio Maldonado <emaldona(a)redhat.com> - 4.8.8-4
-- The tests must pass for the build to succeed
-
-* Mon Jul 18 2011 Elio Maldonado <emaldona(a)redhat.com> - 4.8.8-3
-- Run the nspr test suite in the %%check section
-
-* Wed Jul 06 2011 Elio Maldonado <emaldona(a)redhat.com> - 4.8.8-2
-- Conditionalize Thumb2 build support on right Arm arches
-
-* Fri May 06 2011 Elio Maldonado <emaldona(a)redhat.com> - 4.8.8-1
-- Update to NSPR_4_8_8_RTM
-
-* Mon Apr 25 2011 Elio Maldonado Batiz <emaldona(a)redhat.com> - 4.8.8-0.1.beta3
-- Update to NSPR_4_8_8_BETA3
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
4.8.7-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Jan 12 2011 Elio Maldonado <emaldona(a)redhat.com> - 4.8.7-1
-- Update to 4.8.7
-
-* Mon Dec 27 2010 Elio Maldonado <emaldona(a)redhat.com> - 4.8.7-0.1beta2
-- Rebuilt according to fedora pre-release naming guidelines
-
-* Fri Dec 10 2010 Elio Maldonado <emaldona(a)redhat.com> - 4.8.6.99.2-1
-- Update to NSPR_4_8_7_BETA2
-
-* Tue Dec 07 2010 Elio Maldonado <emaldona(a)redhat.com> - 4.8.6.99.1-1
-- Update to NSPR_4_8_7_BETA1
-
-* Mon Aug 16 2010 Elio Maldonado <emaldona(a)redhat.com> - 4.8.6-1
-- Update to 4.8.6
-
-* Fri Mar 12 2010 Till Maas <opensource(a)till.name> - 4.8.4-2
-- Fix release value
-
-* Tue Feb 23 2010 Elio Maldonado <emaldona(a)redhat.com> - 4.8.4-1
-- Update to 4.8.4
-
-* Sat Nov 14 2009 Elio Maldonado<emaldona(a)redhat.com> - 4.8.2-3
-- update to 4.8.2
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
4.8-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Jun 30 2009 Christopher Aillon <caillon(a)redhat.com> 4.8-1
-- update to 4.8
-
-* Fri Jun 05 2009 Kai Engert <kaie(a)redhat.com> - 4.7.4-2
-- update to 4.7.4
-
-* Wed Mar 04 2009 Kai Engert <kaie(a)redhat.com> - 4.7.3-5
-- add a workaround for bug 487844
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
4.7.3-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Dec 3 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm(a)gmail.com> - 4.7.3-3
-- Rebuild for pkgconfig
-
-* Wed Nov 19 2008 Kai Engert <kaie(a)redhat.com> - 4.7.3-2
-- update to 4.7.3
-* Thu Oct 23 2008 Kai Engert <kaie(a)redhat.com> - 4.7.2-2
-- update to 4.7.2
-
-* Thu Oct 9 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 4.7.1-5
-- forgot to cvs add patch... whoops. :/
-
-* Thu Oct 9 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 4.7.1-4
-- properly handle sparc64 in nspr code
-
-* Tue Sep 30 2008 Dennis Gilmore <dennis(a)ausil.us> - 4.7.1-3
-- add sparc64 to the list of 64 bit arches
-
-* Mon Jun 02 2008 Kai Engert <kengert(a)redhat.com> - 4.7.1-2
-- Update to 4.7.1
-
-* Thu Mar 20 2008 Jesse Keating <jkeating(a)redhat.com> - 4.7.0.99.2-2
-- Drop the old obsoletes/provides that aren't needed anymore.
-
-* Mon Mar 17 2008 Kai Engert <kengert(a)redhat.com> - 4.7.0.99.2-1
-- Update to NSPR_4_7_1_BETA2
-* Tue Feb 26 2008 Kai Engert <kengert(a)redhat.com> - 4.7.0.99.1-2
-- Addressed cosmetic review comments from bug 226202
-* Fri Feb 22 2008 Kai Engert <kengert(a)redhat.com> - 4.7.0.99.1-1
-- Update to NSPR 4.7.1 Beta 1
-- Use /usr/lib{64} as devel libdir, create symbolic links.
-* Sat Feb 09 2008 Kai Engert <kengert(a)redhat.com> - 4.7-1
-- Update to NSPR 4.7
-
-* Thu Jan 24 2008 Kai Engert <kengert(a)redhat.com> - 4.6.99.3-1
-* NSPR 4.7 beta snapshot 20080120
-
-* Mon Jan 07 2008 Kai Engert <kengert(a)redhat.com> - 4.6.99-2
-- move .so files to /lib
-
-* Wed Nov 07 2007 Kai Engert <kengert(a)redhat.com> - 4.6.99-1
-- NSPR 4.7 alpha
-
-* Tue Aug 28 2007 Kai Engert <kengert(a)redhat.com> - 4.6.7-3
-- Updated license tag
-
-* Fri Jul 06 2007 Kai Engert <kengert(a)redhat.com> - 4.6.7-2
-- Update to 4.6.7
-
-* Fri Jul 06 2007 Kai Engert <kengert(a)redhat.com> - 4.6.6-2
-- Update thread-cleanup patch to latest upstream version
-- Add upstream patch to support PR_STATIC_ASSERT
-
-* Wed Mar 07 2007 Kai Engert <kengert(a)redhat.com> - 4.6.6-1
-- Update to 4.6.6
-- Adjust IPv6 patch to latest upstream version
-
-* Sat Feb 24 2007 Kai Engert <kengert(a)redhat.com> - 4.6.5-2
-- Update to latest ipv6 upstream patch
-- Add upstream patch to fix a thread cleanup issue
-- Now requires pkgconfig
-
-* Mon Jan 22 2007 Wan-Teh Chang <wtchang(a)redhat.com> - 4.6.5-1
-- Update to 4.6.5
-
-* Tue Jan 16 2007 Kai Engert <kengert(a)redhat.com> - 4.6.4-2
-- Include upstream patch to fix ipv6 support (rhbz 222554)
-
-* Tue Nov 21 2006 Kai Engert <kengert(a)redhat.com> - 4.6.4-1
-- Update to 4.6.4
-
-* Thu Sep 14 2006 Kai Engert <kengert(a)redhat.com> - 4.6.3-1
-- Update to 4.6.3
-
-* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 4.6.2-1.1
-- rebuild
-
-* Fri May 26 2006 Kai Engert <kengert(a)redhat.com> - 4.6.2-1
-- Update to 4.6.2
-- Tweak nspr-config to be identical on all platforms.
-
-* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 4.6.1-2.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 4.6.1-2.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Thu Jan 5 2006 Kai Engert <kengert(a)redhat.com> 4.6.1-2
-- Do not use -ansi when compiling, because of a compilation
- problem with latest glibc and anonymous unions.
- See also
bugzilla.mozilla.org # 322427.
-
-* Wed Jan 4 2006 Kai Engert <kengert(a)redhat.com>
-- Add an upstream patch to fix gcc visibility issues.
-
-* Tue Jan 3 2006 Christopher Aillon <caillon(a)redhat.com>
-- Stop shipping static libraries; NSS and dependencies no longer
- require static libraries to build.
-
-* Thu Dec 15 2005 Christopher Aillon <caillon(a)redhat.com> 4.6.1-1
-- Update to 4.6.1
-
-* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com>
-- rebuilt
-
-* Fri Jul 15 2005 Christopher Aillon <caillon(a)redhat.com> 4.6-4
-- Use the NSPR version numbering scheme reported by NSPR,
- which unfortunately is not exactly the same as the real
- version (4.6 != 4.6.0 according to RPM and pkgconfig).
-
-* Fri Jul 15 2005 Christopher Aillon <caillon(a)redhat.com> 4.6-3
-- Correct the CFLAGS reported by pkgconfig
-
-* Tue Jul 12 2005 Christopher Aillon <caillon(a)redhat.com> 4.6-2
-- Temporarily include the static libraries allowing nss and
- its dependencies to build.
-
-* Tue Jul 12 2005 Christopher Aillon <caillon(a)redhat.com> 4.6-1
-- Update to NSPR 4.6
-
-* Wed Apr 20 2005 Christopher Aillon <caillon(a)redhat.com> 4.4.1-2
-- NSPR doesn't have make install, but it has make real_install. Use it.
-
-* Thu Apr 14 2005 Christopher Aillon <caillon(a)redhat.com> 4.4.1-1
-- Let's make an RPM.
diff --git a/sources b/sources
deleted file mode 100644
index 97d2983..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (nspr-4.29.tar.gz) =
ba5ac275fe0beb69d7a7674c9ee9e4429bd5761daed285edd975ccc829af30d062bf4a0f5e44361e3bd191f21b1905f96ab146d53b55324020f13ecb3c05609b
diff --git a/tests/NSS-tools-should-not-use-SHA1-by-default-when/Makefile
b/tests/NSS-tools-should-not-use-SHA1-by-default-when/Makefile
deleted file mode 100644
index ea65d87..0000000
--- a/tests/NSS-tools-should-not-use-SHA1-by-default-when/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Makefile of /CoreOS/nss/Regression/NSS-tools-should-not-use-SHA1-by-default-when
-# Description: NSS tools should not use SHA1 by default when
-# Author: Hubert Kario <hkario(a)redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Copyright (c) 2016 Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing
-# to use, modify, copy, or redistribute it subject to the terms
-# and conditions of the GNU General Public License version 2.
-#
-# This program is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/nss/Regression/NSS-tools-should-not-use-SHA1-by-default-when
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
- ./runtest.sh
-
-build: $(BUILT_FILES)
- test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
- rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
- @echo "Owner: Hubert Kario <hkario(a)redhat.com>" >
$(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "Description: NSS tools should not use SHA1 by default when"
>> $(METADATA)
- @echo "Type: Regression" >> $(METADATA)
- @echo "TestTime: 10m" >> $(METADATA)
- @echo "RunFor: nss openssl" >> $(METADATA)
- @echo "Requires: nss nss-tools openssl" >> $(METADATA)
- @echo "Priority: Normal" >> $(METADATA)
- @echo "License: GPLv2" >> $(METADATA)
- @echo "Confidential: no" >> $(METADATA)
- @echo "Destructive: no" >> $(METADATA)
- @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >>
$(METADATA)
-
- rhts-lint $(METADATA)
diff --git a/tests/NSS-tools-should-not-use-SHA1-by-default-when/PURPOSE
b/tests/NSS-tools-should-not-use-SHA1-by-default-when/PURPOSE
deleted file mode 100644
index 7caf493..0000000
--- a/tests/NSS-tools-should-not-use-SHA1-by-default-when/PURPOSE
+++ /dev/null
@@ -1,4 +0,0 @@
-PURPOSE of NSS-tools-should-not-use-SHA1-by-default-when
-Description: NSS tools should not use SHA1 by default when
-Author: Hubert Kario <hkario(a)redhat.com>
-Summary: NSS tools should not use SHA1 by default when generating digital
signatures/certificates
diff --git a/tests/NSS-tools-should-not-use-SHA1-by-default-when/runtest.sh
b/tests/NSS-tools-should-not-use-SHA1-by-default-when/runtest.sh
deleted file mode 100755
index 8290d92..0000000
--- a/tests/NSS-tools-should-not-use-SHA1-by-default-when/runtest.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# runtest.sh of NSS-tools-should-not-use-SHA1-by-default-when
-# Description: NSS tools should not use SHA1 by default when
-# Author: Hubert Kario <hkario(a)redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Copyright (c) 2016 Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing
-# to use, modify, copy, or redistribute it subject to the terms
-# and conditions of the GNU General Public License version 2.
-#
-# This program is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="nss"
-PACKAGES="nss openssl"
-DBDIR="nssdb"
-
-rlJournalStart
- rlPhaseStartSetup
- rlAssertRpm --all
- rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
- rlRun "pushd $TmpDir"
- rlRun "mkdir nssdb"
- rlRun "certutil -N -d $DBDIR --empty-password"
- rlLogInfo "Create a JAR file"
- rlRun "mkdir java-dir"
- rlRun "pushd java-dir"
- rlRun "mkdir META-INF mypackage"
- rlRun "echo 'Main-Class: mypackage/MyMainFile' >
META-INF/MANIFEST.MF"
- rlRun "echo 'Those are not the droids you are looking for' >
mypackage/MyMainFile.class"
- #rlRun "jar -cfe package.jar mypackage/MyMainFile
mypackage/MyMainFile.class"
- rlRun "popd"
- #rlRun "mv java-dir/package.jar ."
- rlPhaseEnd
-
- rlPhaseStartTest "Self signing certificates"
- rlRun "dd if=/dev/urandom of=noise bs=1 count=32 >/dev/null"
- rlRun "certutil -d $DBDIR -S -n 'CA' -t 'cTC,cTC,cTC' -s
'CN=CA' -x -z noise"
- rlRun -s "certutil -d $DBDIR -L -n 'CA' -a | openssl x509 -noout
-text"
- rlAssertGrep "Signature Algorithm: sha256WithRSAEncryption"
"$rlRun_LOG"
- rlAssertNotGrep "Signature Algorithm: sha1WithRSAEncryption"
$rlRun_LOG
- rlPhaseEnd
-
- rlPhaseStartTest "Signing certificates"
- rlRun "dd if=/dev/urandom of=noise bs=1 count=32 >/dev/null"
- rlRun "certutil -d $DBDIR -S -n 'server' -t 'u,u,u' -s
'CN=server.example.com' -c 'CA' -z noise --nsCertType
sslClient,sslServer,objectSigning,smime"
- rlRun -s "certutil -d $DBDIR -L -n 'server' -a | openssl x509 -noout
-text"
- rlAssertGrep "Signature Algorithm: sha256WithRSAEncryption"
"$rlRun_LOG"
- rlAssertNotGrep "Signature Algorithm: sha1WithRSAEncryption"
$rlRun_LOG
- rlPhaseEnd
-
- rlPhaseStartTest "Certificate request"
- rlRun "dd if=/dev/urandom of=noise bs=1 count=32 >/dev/null"
- rlRun "mkdir srv2db"
- rlRun "certutil -d srv2db -N --empty-password"
- rlRun "certutil -d srv2db -R -s
CN=www.example.com -o srv2.req -a -z
noise"
- rlRun -s "openssl req -noout -text -in srv2.req"
- rlAssertGrep "Signature Algorithm: sha256WithRSAEncryption"
"$rlRun_LOG"
- rlAssertNotGrep "Signature Algorithm: sha1WithRSAEncryption"
$rlRun_LOG
- rlRun "certutil -d $DBDIR -C -c 'CA' -i srv2.req -a -o
srv2.crt"
- rlRun -s "openssl x509 -in srv2.crt -noout -text"
- rlAssertGrep "Signature Algorithm: sha256WithRSAEncryption"
"$rlRun_LOG"
- rlAssertNotGrep "Signature Algorithm: sha1WithRSAEncryption"
$rlRun_LOG
- rlRun "rm -rf srv2db"
- rlPhaseEnd
-
- rlPhaseStartTest "Certificate request with SHA1"
- rlRun "dd if=/dev/urandom of=noise bs=1 count=32 >/dev/null"
- rlRun "mkdir srv2db"
- rlRun "certutil -d srv2db -N --empty-password"
- rlRun "certutil -d srv2db -R -s
CN=www.example.com -o srv2.req -a -z noise
-Z SHA1"
- rlRun -s "openssl req -noout -text -in srv2.req"
- rlAssertGrep "Signature Algorithm: sha1WithRSAEncryption"
"$rlRun_LOG"
- rlRun "certutil -d $DBDIR -C -c 'CA' -i srv2.req -a -o
srv2.crt"
- rlRun -s "openssl x509 -in srv2.crt -noout -text"
- rlAssertGrep "Signature Algorithm: sha256WithRSAEncryption"
"$rlRun_LOG"
- rlAssertNotGrep "Signature Algorithm: sha1WithRSAEncryption"
$rlRun_LOG
- rlRun "rm -rf srv2db"
- rlPhaseEnd
-
- rlPhaseStartTest "Signing CMS messages"
- rlRun "echo 'This is a document' > document.txt"
- rlRun "cmsutil -S -d $DBDIR -N 'server' -i document.txt -o
document.cms"
- rlRun -s "openssl cms -in document.cms -inform der -noout -cmsout
-print"
- rlAssertGrep "algorithm: sha256" $rlRun_LOG
- rlAssertNotGrep "algorithm: sha1" $rlRun_LOG
- rlPhaseEnd
-
- rlPhaseStartTest "CRL signing"
- rlRun "echo $(date --utc +update=%Y%m%d%H%M%SZ) > script"
- rlRun "echo $(date -d 'next week' --utc +nextupdate=%Y%m%d%H%M%SZ)
>> script"
- rlRun "echo addext crlNumber 0 1245 >>script"
- rlRun "echo addcert 12 $(date -d 'yesterday' --utc +%Y%m%d%H%M%SZ)
>>script"
- rlRun "echo addext reasonCode 0 0 >>script"
- rlRun "cat script"
- rlRun "crlutil -G -c script -d $DBDIR -n CA -o ca.crl"
- rlRun -s "openssl crl -in ca.crl -inform der -noout -text"
- rlAssertGrep "Signature Algorithm: sha256WithRSAEncryption" $rlRun_LOG
- rlAssertNotGrep "Signature Algorithm: sha1WithRSAEncryption"
$rlRun_LOG
- rlPhaseEnd
-
- rlPhaseStartCleanup
- rlRun "popd"
- rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
- rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index df64aa2..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# This first play always runs on the local staging system
-- hosts: localhost
- roles:
- - role: standard-test-beakerlib
- tags:
- - classic
- tests:
- - NSS-tools-should-not-use-SHA1-by-default-when
- required_packages:
- - nss-tools
- - nss