Hello community,
here is the log from the commit of package apache2-mod_nss for openSUSE:Factory
checked in at 2019-07-08 15:10:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2-mod_nss (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_nss.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2-mod_nss"
Mon Jul 8 15:10:37 2019 rev:32 rq:713601 version:1.0.18
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2-mod_nss/apache2-mod_nss.changes
2018-12-06 12:18:37.589435463 +0100
+++
/work/SRC/openSUSE:Factory/.apache2-mod_nss.new.4615/apache2-mod_nss.changes
2019-07-08 15:10:38.787323293 +0200
@@ -1,0 +2,5 @@
+Fri Jun 28 11:15:10 UTC 2019 - Petr Gajdos <[email protected]>
+
+- use apache-rex in %check
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2-mod_nss.spec ++++++
--- /var/tmp/diff_new_pack.k7lsqm/_old 2019-07-08 15:10:39.759324226 +0200
+++ /var/tmp/diff_new_pack.k7lsqm/_new 2019-07-08 15:10:39.759324226 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apache2-mod_nss
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -39,12 +39,14 @@
Patch1: mod_nss-migrate.patch
Patch2: mod_nss-gencert-correct-ownership.patch
Patch4: mod_nss-gencert_use_ss_instead_of_netstat.patch
+BuildRequires: apache-rex
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel >= 2.2.12
BuildRequires: apr-devel
BuildRequires: apr-util-devel
BuildRequires: automake
BuildRequires: bison
+%apache_rex_deps
BuildRequires: curl
BuildRequires: findutils
BuildRequires: flex
@@ -141,59 +143,9 @@
perl -pi -e "s:$NSS_LIB_DIR:$NSS_BIN:" %{buildroot}%{_sbindir}/gencert
%check
-set +x
-mkdir -p %{apache_test_module_dir}
-# create password file including internal token to suppress apache 'builtin
dialog'
-cat << EOF > %{apache_test_module_dir}/password.conf
-internal:httptest
-EOF
-# create test configuration
-cat << EOF > %{apache_test_module_dir}/mod_nss-test.conf
-NSSEngine on
-NSSNickname Server-Cert
-NSSCertificateDatabase %{apache_test_module_dir}/mod_nss.d
-NSSPassPhraseDialog file:%{apache_test_module_dir}/password.conf
-NSSPassPhraseHelper %{buildroot}%{_sbindir}/nss_pcache
-NSSCipherSuite
+ecdhe_ecdsa_aes_128_gcm_sha,+ecdh_ecdsa_aes_128_gcm_sha,+ecdhe_rsa_aes_256_sha,+ecdh_rsa_aes_256_sha,+ecdhe_rsa_aes_128_gcm_sha,+ecdh_rsa_aes_128_gcm_sha,+ecdhe_rsa_aes_128_sha,+ecdh_rsa_aes_128_sha,+rsa_aes_128_gcm_sha,+rsa_aes_256_sha,+rsa_aes_128_sha,+rsa_aes_128_sha256,+rsa_aes_256_sha256
-NSSProtocol TLSv1.0,TLSv1.1,TLSv1.2
-<Directory /tmp/apache2-mod_nss_test/htdocs>
-%if 0%{?apache_branch} >= 204
- Require local
-%else
- Allow from localhost
-%endif
-</Directory>
-EOF
-# create test certificate
-mkdir -p %{apache_test_module_dir}/mod_nss.d
-# bend gencert to use ServerName of apache test instance
-cp %{buildroot}%{_sbindir}/gencert .
-sed -i 's:FQDN=`getFQDN`:FQDN=test:' gencert
-./gencert %{apache_test_module_dir}/mod_nss.d >
%{apache_test_module_dir}/mod_nss.d/LOG 2>&1
-# create test document
-mkdir -p %{apache_test_module_dir}/htdocs
-cat << EOF > %{apache_test_module_dir}/htdocs/index.html
-HTTPS HELLO
-EOF
-exit_code=0
-# run apache test instance
-%apache_test_module_start_apache -m nss -i mod_nss-test.conf
-# get test document
-%apache_test_module_curl -r https -d /index.html -o
%{apache_test_module_dir}/output.txt
-echo
-echo 'Testing /index.html output'
-grep 'HTTPS HELLO' %{apache_test_module_dir}/output.txt || exit_code=1
-if [ $exit_code -eq 0 ]; then
- echo 'SUCCESS'
-else
- echo 'FAILED, error_log:'
- cat %{apache_test_module_dir}/error_log
-fi
-echo
-# stop apache test instance
-%apache_test_module_stop_apache
-set -x
-exit $exit_code
+# specific file name format for module is required by apache-rex
+ln .libs/libmodnss.so .libs/mod_nss.so
+%apache_rex_check -m .libs/ -b . mod_nss-basic
%post
umask 077
