Don't run configure twice

Resolves: rhbz#1935987 - lasso implements and/or uses the deprecated SHA1 algorithm by default
This commit is contained in:
Jakub Hrozek 2021-06-28 22:50:41 +02:00
parent 2a7e323b5c
commit eac5c72fe6
2 changed files with 35 additions and 1 deletions

28
autogen.noconfig Normal file
View File

@ -0,0 +1,28 @@
diff -up lasso-2.7.0/autogen.sh.noconfig lasso-2.7.0/autogen.sh
--- lasso-2.7.0/autogen.sh.noconfig 2021-06-28 22:39:00.473005330 +0200
+++ lasso-2.7.0/autogen.sh 2021-06-28 22:39:43.028114738 +0200
@@ -77,11 +77,6 @@ test $TEST_TYPE $FILE || {
exit 1
}
-if test "$#" = 0; then
- echo "I am going to run ./configure with no arguments - if you wish "
- echo "to pass any to it, please specify them on the $0 command line."
-fi
-
# to support timj aclocal setup we are shipping gnome-doc-utils.m4
# and making sure automake picks it up ;)
# this is bad as -I prepends to the search path
@@ -107,12 +102,3 @@ autoconf || exit $?
echo "* Running $AUTOMAKE"
$AUTOMAKE --add-missing -Wno-portability $am_opt || exit $?
-
-cd "$THEDIR"
-
-if [ "$1" != "noconfig" ]; then
- $srcdir/configure --enable-gtk-doc --enable-maintainer-mode "$@" || exit $?
-fi
-
-echo
-echo "Now type 'make install' to install $PROJECT."

View File

@ -59,7 +59,7 @@
Summary: Liberty Alliance Single Sign On Summary: Liberty Alliance Single Sign On
Name: lasso Name: lasso
Version: 2.7.0 Version: 2.7.0
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://lasso.entrouvert.org/ URL: http://lasso.entrouvert.org/
Source: http://dev.entrouvert.org/lasso/lasso-%{version}.tar.gz Source: http://dev.entrouvert.org/lasso/lasso-%{version}.tar.gz
@ -95,6 +95,7 @@ Patch0004: 0004-Mass-replace-LASSO_SIGNATURE_METHOD_RSA_SHA1-with-la.patch
Patch0005: 0005-Check-if-the-signature-method-is-allowed-in-addition.patch Patch0005: 0005-Check-if-the-signature-method-is-allowed-in-addition.patch
Patch0006: 0006-python-Skip-the-DSA-key-test-unless-SHA-1-is-configu.patch Patch0006: 0006-python-Skip-the-DSA-key-test-unless-SHA-1-is-configu.patch
Patch0007: 0007-test13_test_lasso_server_load_metadata-Don-t-verify-.patch Patch0007: 0007-test13_test_lasso_server_load_metadata-Don-t-verify-.patch
Patch0008: autogen.noconfig
%description %description
Lasso is a library that implements the Liberty Alliance Single Sign On Lasso is a library that implements the Liberty Alliance Single Sign On
@ -321,6 +322,11 @@ rm -fr %{buildroot}%{_defaultdocdir}/%{name}
%endif %endif
%changelog %changelog
* Mon Jun 28 2021 Jakub Hrozek <jhrozek@redhat.com> - 2.7.0-5
- Don't run configure twice
- Resolves: rhbz#1935987 - lasso implements and/or uses the deprecated
SHA-1 algorithm by default
* Thu Jun 24 2021 Jakub Hrozek <jhrozek@redhat.com> - 2.7.0-4 * Thu Jun 24 2021 Jakub Hrozek <jhrozek@redhat.com> - 2.7.0-4
- Resolves: rhbz#1935987 - lasso implements and/or uses the deprecated - Resolves: rhbz#1935987 - lasso implements and/or uses the deprecated
SHA-1 algorithm by default SHA-1 algorithm by default