Skip to content

Commit 4016ca1

Browse files
Upgrades lasso to version 2.9.0 (#14622)
Co-authored-by: Aninda <v-anipradhan@microsoft.com>
1 parent 2cbbe9e commit 4016ca1

3 files changed

Lines changed: 79 additions & 67 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"lasso-2.8.0.tar.gz": "ffcbd5851d98586c7e1caf43bad66164211a3b61d12bf860a0598448ff9f2b38"
3+
"lasso-2.9.0.tar.gz": "225f664fe602b73bb5eaf5c4b60a6b07eb2d936d0dd0cafb222524c801d98e5d"
44
}
55
}

SPECS-EXTENDED/lasso/lasso.spec

Lines changed: 76 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,26 @@ Distribution: Azure Linux
33
%global with_java 0
44
%global with_php 0
55
%global with_perl 1
6+
%global with_python3 1
67
%global with_wsf 0
7-
%global obsolete_old_lang_subpackages 0
8+
%global default_sign_algo "rsa-sha1"
9+
%global min_hash_algo "sha1"
810

911
%if %{with_php}
10-
%if "%{php_version}" < "5.6"
11-
%global ini_name %{name}.ini
12-
%else
1312
%global ini_name 40-%{name}.ini
1413
%endif
15-
%endif
1614

1715
%global configure_args %{nil}
1816
%global configure_args %{configure_args}
1917

18+
%if %{default_sign_algo}
19+
%global configure_args %{configure_args} --with-default-sign-algo=%{default_sign_algo}
20+
%endif
21+
22+
%if %{min_hash_algo}
23+
%global configure_args %{configure_args} --with-min-hash-algo=%{min_hash_algo}
24+
%endif
25+
2026
%if !%{with_java}
2127
%global configure_args %{configure_args} --disable-java
2228
%endif
@@ -26,66 +32,56 @@ Distribution: Azure Linux
2632
%endif
2733

2834
%if %{with_php}
29-
%global configure_args %{configure_args} --enable-php5=yes --with-php5-config-dir=%{php_inidir}
35+
%global configure_args %{configure_args} --enable-php5=no --enable-php7=yes --with-php7-config-dir=%{php_inidir}
3036
%else
31-
%global configure_args %{configure_args} --enable-php5=no
37+
%global configure_args %{configure_args} --enable-php5=no --enable-php7=no
3238
%endif
3339

3440
%if %{with_wsf}
3541
%global configure_args %{configure_args} --enable-wsf --with-sasl2=%{_prefix}/sasl2
3642
%endif
3743

44+
%if !%{with_python3}
45+
%global configure_args %{configure_args} --disable-python
46+
%endif
47+
3848

3949
Summary: Liberty Alliance Single Sign On
4050
Name: lasso
41-
Version: 2.8.0
51+
Version: 2.9.0
4252
Release: 1%{?dist}
43-
License: GPLv2+
44-
URL: http://lasso.entrouvert.org/
45-
Source: http://dev.entrouvert.org/lasso/lasso-%{version}.tar.gz
53+
License: GPL-2.0-or-later
54+
URL: https://lasso.entrouvert.org/
55+
Source0: https://git.entrouvert.org/entrouvert/lasso/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
4656

4757
BuildRequires: autoconf
4858
BuildRequires: automake
4959
BuildRequires: check-devel
60+
BuildRequires: gcc
5061
BuildRequires: glib2-devel
5162
BuildRequires: gtk-doc
5263
BuildRequires: libtool
5364
BuildRequires: libtool-ltdl-devel
5465
BuildRequires: libxml2-devel
55-
BuildRequires: libxslt-devel
66+
BuildRequires: make
5667
BuildRequires: openssl-devel
57-
BuildRequires: swig
58-
BuildRequires: xmlsec1-devel >= 1.2.25-4
59-
BuildRequires: xmlsec1-openssl-devel >= 1.2.25-4
60-
BuildRequires: zlib-devel
61-
%if %{with_java}
62-
BuildRequires: java-devel
63-
BuildRequires: jpackage-utils
64-
%endif
65-
%if %{with_perl}
66-
BuildRequires: perl-devel
67-
BuildRequires: perl-generators
68-
BuildRequires: perl(Error)
69-
BuildRequires: perl(ExtUtils::MakeMaker)
70-
BuildRequires: perl(strict)
71-
BuildRequires: perl(Test::More)
72-
BuildRequires: perl(warnings)
73-
BuildRequires: perl(XSLoader)
74-
%endif
75-
%if %{with_php}
76-
BuildRequires: expat-devel
77-
BuildRequires: php-devel
78-
%endif
79-
# The Lasso build system requires python, especially the binding generators
8068
BuildRequires: python3
81-
BuildRequires: python3-devel
82-
BuildRequires: python3-lxml
8369
BuildRequires: python3-six
70+
BuildRequires: (python3-setuptools if python3 >= 3.12)
71+
BuildRequires: swig
72+
BuildRequires: xmlsec1-devel
73+
BuildRequires: xmlsec1-openssl-devel
74+
BuildRequires: zlib-devel
8475
%if %{with_wsf}
8576
BuildRequires: cyrus-sasl-devel
8677
%endif
8778

88-
Requires: xmlsec1 >= 1.2.25-4
79+
Requires: xmlsec1
80+
81+
# lasso upstream no longer supports java bindings
82+
# see https://dev.entrouvert.org/issues/45876#change-289747
83+
# and https://dev.entrouvert.org/issues/51418
84+
Obsoletes: java-lasso < %{version}-%{release}
8985

9086
%description
9187
Lasso is a library that implements the Liberty Alliance Single Sign On
@@ -104,7 +100,15 @@ documentation for Lasso.
104100
%if %{with_perl}
105101
%package -n perl-%{name}
106102
Summary: Liberty Alliance Single Sign On (lasso) Perl bindings
107-
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
103+
BuildRequires: perl-devel
104+
BuildRequires: perl-generators
105+
BuildRequires: perl-interpreter
106+
BuildRequires: perl(Error)
107+
BuildRequires: perl(ExtUtils::MakeMaker)
108+
BuildRequires: perl(strict)
109+
BuildRequires: perl(Test::More)
110+
BuildRequires: perl(warnings)
111+
BuildRequires: perl(XSLoader)
108112
Requires: %{name}%{?_isa} = %{version}-%{release}
109113

110114
%description -n perl-%{name}
@@ -114,14 +118,11 @@ Perl language bindings for the lasso (Liberty Alliance Single Sign On) library.
114118
%if %{with_java}
115119
%package -n java-%{name}
116120
Summary: Liberty Alliance Single Sign On (lasso) Java bindings
117-
Requires: java
121+
Buildrequires: java-1.8.0-openjdk-devel
122+
BuildRequires: jpackage-utils
123+
Requires: java-headless
118124
Requires: jpackage-utils
119125
Requires: %{name}%{?_isa} = %{version}-%{release}
120-
%if %{obsolete_old_lang_subpackages}
121-
Provides: %{name}-java = %{version}-%{release}
122-
Provides: %{name}-java%{?_isa} = %{version}-%{release}
123-
Obsoletes: %{name}-java < %{version}-%{release}
124-
%endif
125126

126127
%description -n java-%{name}
127128
Java language bindings for the lasso (Liberty Alliance Single Sign On) library.
@@ -130,6 +131,8 @@ Java language bindings for the lasso (Liberty Alliance Single Sign On) library.
130131
%if %{with_php}
131132
%package -n php-%{name}
132133
Summary: Liberty Alliance Single Sign On (lasso) PHP bindings
134+
BuildRequires: expat-devel
135+
BuildRequires: php-devel
133136
Requires: %{name}%{?_isa} = %{version}-%{release}
134137
Requires: php(zend-abi) = %{php_zend_api}
135138
Requires: php(api) = %{php_core_api}
@@ -139,51 +142,52 @@ PHP language bindings for the lasso (Liberty Alliance Single Sign On) library.
139142

140143
%endif
141144

145+
146+
%if %{with_python3}
142147
%package -n python3-%{name}
143148
%{?python_provide:%python_provide python3-%{name}}
144149
Summary: Liberty Alliance Single Sign On (lasso) Python bindings
150+
BuildRequires: python3-devel
151+
BuildRequires: python3-lxml
145152
Requires: python3
146153
Requires: %{name}%{?_isa} = %{version}-%{release}
147-
Provides: lasso-python = %{version}-%{release}
148154

149155
%description -n python3-%{name}
150156
Python language bindings for the lasso (Liberty Alliance Single Sign On)
151157
library.
158+
%endif
152159

153160
%prep
154-
%autosetup -p1
161+
%autosetup -n %{name}
155162

156163
# Remove any python script shebang lines (unless they refer to python3)
157164
sed -i -E -e '/^#![[:blank:]]*(\/usr\/bin\/env[[:blank:]]+python[^3]?\>)|(\/usr\/bin\/python[^3]?\>)/d' \
158165
`grep -r -l -E '^#![[:blank:]]*(/usr/bin/python[^3]?)|(/usr/bin/env[[:blank:]]+python[^3]?)' *`
159166

160167
%build
161-
export JAVA_HOME=%{java_home}
168+
%if 0%{?with_java}
169+
export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk
170+
%endif
171+
echo %{version} > .tarball-version
162172
./autogen.sh
163-
164-
%configure %{configure_args} --with-python=%{__python3}
173+
%if 0%{?with_python3}
174+
%configure %{configure_args} --with-python=%{__python3}
175+
%else
176+
%configure %{configure_args}
177+
%endif
165178
%make_build CFLAGS="%{optflags}"
166179

167180
%check
168-
make check CK_TIMEOUT_MULTIPLIER=5
181+
make check CK_TIMEOUT_MULTIPLIER=10
169182

170183
%install
171-
#install -m 755 -d %{buildroot}%{_datadir}/gtk-doc/html
172-
173-
make install exec_prefix=%{_prefix} DESTDIR=%{buildroot}
184+
%make_install exec_prefix=%{_prefix}
174185
find %{buildroot} -type f -name '*.la' -exec rm -f {} \;
175186
find %{buildroot} -type f -name '*.a' -exec rm -f {} \;
176187

177188
# Perl subpackage
178189
%if %{with_perl}
179190
find %{buildroot} \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
180-
181-
find %{buildroot}/usr/lib*/perl5 -type f -print |
182-
sed "s@^%{buildroot}@@g" > %{name}-perl-filelist
183-
if [ "$(cat %{name}-perl-filelist)X" = "X" ] ; then
184-
echo "ERROR: EMPTY FILE LIST"
185-
exit -1
186-
fi
187191
%endif
188192

189193
# PHP subpackage
@@ -199,10 +203,9 @@ fi
199203
%endif
200204

201205
# Remove bogus doc files
202-
rm -fr %{buildroot}%{_defaultdocdir}/%{name}
206+
rm -fr %{buildroot}%{_docdir}/%{name}
203207

204208
%ldconfig_scriptlets
205-
206209
%files
207210
%{_libdir}/liblasso.so.3*
208211
%doc AUTHORS NEWS README
@@ -214,7 +217,9 @@ rm -fr %{buildroot}%{_defaultdocdir}/%{name}
214217
%{_includedir}/%{name}
215218

216219
%if %{with_perl}
217-
%files -n perl-%{name} -f %{name}-perl-filelist
220+
%files -n perl-%{name}
221+
%{perl_vendorarch}/Lasso.pm
222+
%{perl_vendorarch}/auto/Lasso/
218223
%endif
219224

220225
%if %{with_java}
@@ -231,12 +236,18 @@ rm -fr %{buildroot}%{_defaultdocdir}/%{name}
231236
%{_datadir}/php/%{name}/lasso.php
232237
%endif
233238

239+
%if %{with_python3}
234240
%files -n python3-%{name}
235241
%{python3_sitearch}/lasso.py*
236242
%{python3_sitearch}/_lasso.so
237243
%{python3_sitearch}/__pycache__/*
244+
%endif
238245

239246
%changelog
247+
* Wed Dec 24 2025 Sumit Jena <v-sumitjena@microsoft.com> - 2.9.0-1
248+
- Upgrade to version 2.9.0
249+
- License verified
250+
240251
* Mon Sep 12 2022 Muhammad Falak <mwani@microsoft.com> - 2.8.0-1
241252
- Bump version to 2.8.0
242253
- Drop un-needed patches
@@ -462,3 +473,4 @@ rm -fr %{buildroot}%{_defaultdocdir}/%{name}
462473
to build on Fedora 20
463474
- Perl bindings are disabled as they fail to build
464475
- Disable doc building as it doesn't ork correctly for now
476+

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8651,8 +8651,8 @@
86518651
"type": "other",
86528652
"other": {
86538653
"name": "lasso",
8654-
"version": "2.8.0",
8655-
"downloadUrl": "http://dev.entrouvert.org/lasso/lasso-2.8.0.tar.gz"
8654+
"version": "2.9.0",
8655+
"downloadUrl": "https://git.entrouvert.org/entrouvert/lasso/archive/v2.9.0.tar.gz"
86568656
}
86578657
}
86588658
},

0 commit comments

Comments
 (0)