debian: sync bullseye packaging with upstream debian.org (#58788)

This commit is contained in:
Frédéric Péters 2021-11-20 10:19:36 +01:00
parent 71d4bf9c08
commit d4259f0517
9 changed files with 133 additions and 138 deletions

View File

@ -1,3 +1,91 @@
lasso (2.7.0-2) unstable; urgency=medium
* debian/rules: introduce build-arch/build-indep targets.
* debian/rules: clean perl META files.
* debian/rules: remove cleaning of id-wsf directory, it doesn't exist
anymore.
* debian/liblasso3.symbols: add lasso_log symbol introduced in 2.7.0-1.
-- Frederic Peters <fpeters@debian.org> Sat, 06 Nov 2021 13:42:52 +0100
lasso (2.7.0-1) unstable; urgency=medium
* New upstream release.
* debian/patches/: remove, all patches are now upstream.
-- Frederic Peters <fpeters@debian.org> Mon, 16 Aug 2021 18:31:12 +0200
lasso (2.6.1-3) unstable; urgency=high
* debian/patches/0001-Fix-signature-checking-on-unsigned-response-with-mul.patch,
taken from upstream repository,
* CVE-2021-28091: Signature checking on unsigned response with multiple
assertions
-- Frederic Peters <fpeters@debian.org> Tue, 01 Jun 2021 14:43:55 +0200
lasso (2.6.1-2) unstable; urgency=medium
* debian/control: add gtk-doc-tools to build-depends, required when running
autoreconf against autoconf 2.70. (closes: 978846)
-- Frederic Peters <fpeters@debian.org> Thu, 31 Dec 2020 15:41:40 +0100
lasso (2.6.1-1) unstable; urgency=medium
* New upstream release.
* debian/patches/: remove, all patches are now upstream.
-- Frederic Peters <fpeters@debian.org> Thu, 23 Apr 2020 20:52:51 +0200
lasso (2.6.0-8) unstable; urgency=medium
* d/p/fix-parsing-of-saml-authncontext.diff: import upstream commit
to fix parsing of saml:AuthnContextDecl (closes: #955354)
-- Frederic Peters <fpeters@debian.org> Mon, 30 Mar 2020 15:55:54 +0200
lasso (2.6.0-7) unstable; urgency=medium
* Move lasso.pc to a multiarch location. (patch by Helmut Grohne,
thanks, closes: #949989)
-- Frederic Peters <fpeters@debian.org> Tue, 28 Jan 2020 08:53:34 +0100
lasso (2.6.0-6) unstable; urgency=medium
* d/control: remove unnecessary python build-dependency (closes: #936817)
* d/p/build-without-python2.diff: import upstream commits related to
building with Python 3.
-- Frederic Peters <fpeters@debian.org> Sun, 19 Jan 2020 10:23:50 +0100
lasso (2.6.0-5) unstable; urgency=medium
* d/rules: update build/install target to support coinstalling for multiple
Python 3 versions (closes: #945123)
-- Frederic Peters <fpeters@debian.org> Wed, 20 Nov 2019 11:01:24 +0100
lasso (2.6.0-4) unstable; urgency=medium
* d/compat: bump to debhelper level 10.
* d/control: bump Standards-Version to 4.4, but no switch to "dh" yet.
* d/control, d/rules: remove obsolete support for building Java and PHP
bindings; this also removes the d/control.in mechanism.
* d/control: add explicit python dependency, still required for lasso/*.py
build tools. (will be fixed in next upstream tarball)
* d/rules: remove PYDEF variable unused with the removal of python-lasso.
* d/rules: clean Python 3 __pycache__ directories.
-- Frederic Peters <fpeters@debian.org> Thu, 05 Sep 2019 08:03:12 +0200
lasso (2.6.0-3) unstable; urgency=medium
* d/*: remove python-lasso (closes: #936817)
-- Frederic Peters <fpeters@debian.org> Fri, 30 Aug 2019 10:39:11 +0200
lasso (2.6.0-2) unstable; urgency=medium
* d/compat: bump do debhelper level 9.

View File

@ -1 +1 @@
9
10

View File

@ -5,23 +5,18 @@ Maintainer: Frederic Peters <fpeters@debian.org>
Build-Depends: debhelper (>= 9),
dh-python,
dh-autoreconf,
gtk-doc-tools,
libxml2-dev,
libxslt1-dev,
libxmlsec1-dev,
libxmlsec1-openssl,
libglib2.0-dev,
python-all-dev (>= 2.6.6-3~),
python3-all-dev (>= 3.2),
libexpat1-dev,
fastjar,
python-lxml,
python3-lxml,
python-six,
python3-six,
chrpath,
dh-python
Standards-Version: 4.1.4
X-Python-Version: >= 2.7
chrpath
Standards-Version: 4.4
X-Python3-Version: >= 3.4
Homepage: http://lasso.entrouvert.org
@ -50,21 +45,6 @@ Description: Library for Liberty Alliance and SAML protocols - runtime library
This package contains liblasso library used by applications to gain Library
Alliance support.
Package: python-lasso
Conflicts: liblasso0-python2.3, python2.3-lasso, python2.4-lasso
Replaces: liblasso0-python2.3, python2.3-lasso, python2.4-lasso
Provides: liblasso0-python2.3, ${python:Provides}
Section: python
Architecture: any
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Description: Library for Liberty Alliance and SAML protocols - Python bindings
Lasso is an implementation of Liberty Alliance and related protocols, for
network identity federations, single sign-on and other web services protocols.
The main specifications implemented by the library are ID-FF, ID-WSF and SAML.
.
This package contains Python bindings for liblasso, needed to use lasso
in Python applications.
Package: python3-lasso
Section: python
Architecture: any
@ -77,18 +57,6 @@ Description: Library for Liberty Alliance and SAML protocols - Python bindings
This package contains Python bindings for liblasso, needed to use lasso
in Python applications.
#JAVA#Package: liblasso-java
#JAVA#Section: libs
#JAVA#Architecture: amd64 armel i386 ia64 mips mipsel powerpc ppc64 s390 sparc kfreebsd-i386 kfreebsd-amd64
#JAVA#Depends: ${shlibs:Depends}, ${misc:Depends}
#JAVA#Description: Library for Liberty Alliance and SAML protocols - Java bindings
#JAVA# Lasso is an implementation of Liberty Alliance and related protocols, for
#JAVA# network identity federations, single sign-on and other web services protocols.
#JAVA# The main specifications implemented by the library are ID-FF, ID-WSF and SAML.
#JAVA# .
#JAVA# This package provides the Java interface to liblasso, needed to use lasso in
#JAVA# Java applications
Package: liblasso-perl
Section: perl
Architecture: any
@ -101,15 +69,3 @@ Description: Library for Liberty Alliance and SAML protocols - Perl bindings
.
This package contains Perl bindings for liblasso, needed to use lasso
in Perl applications.

1
debian-bullseye/files Normal file
View File

@ -0,0 +1 @@
lasso_2.7.0-2_source.buildinfo libs optional

View File

@ -1 +0,0 @@
usr/lib/jni/

View File

@ -1,2 +0,0 @@
debian/tmp/usr/lib/jni/*.so
debian/tmp/usr/share/java/*.jar

View File

@ -69,8 +69,6 @@ liblasso.so.3 liblasso3 #MINVER#
lasso_flag_verify_signature@Base 2.3.5
lasso_get_prefix_for_dst_service_href@Base 2.3.5
lasso_get_prefix_for_idwsf2_dst_service_href@Base 2.3.5
lasso_get_default_key_encryption_method@Base 2.8.0
lasso_get_default_signature_method@Base 2.8.0
lasso_identity_destroy@Base 2.3.5
lasso_identity_dump@Base 2.3.5
lasso_identity_get_federation@Base 2.3.5
@ -151,7 +149,7 @@ liblasso.so.3 liblasso3 #MINVER#
lasso_lib_status_response_new@Base 2.3.5
lasso_lib_subject_get_type@Base 2.3.5
lasso_lib_subject_new@Base 2.3.5
lasso_log@Base 2.8.0
lasso_log@Base 2.7.0-2
lasso_log_remove_handler@Base 2.3.5
lasso_log_set_handler@Base 2.3.5
lasso_login_accept_sso@Base 2.3.5
@ -263,7 +261,6 @@ liblasso.so.3 liblasso3 #MINVER#
lasso_paos_response_get_type@Base 2.5.0
lasso_paos_response_new@Base 2.5.0
lasso_paos_response_validate@Base 2.5.0
lasso_parse_key_encryption_method@Base 2.8.0
lasso_profile_get_artifact@Base 2.3.5
lasso_profile_get_artifact_message@Base 2.3.5
lasso_profile_get_identity@Base 2.3.5
@ -301,7 +298,6 @@ liblasso.so.3 liblasso3 #MINVER#
lasso_provider_get_encryption_mode@Base 2.3.5
lasso_provider_get_first_http_method@Base 2.3.5
lasso_provider_get_idp_supported_attributes@Base 2.3.5
lasso_provider_get_key_encryption_method@Base 2.8.0
lasso_provider_get_metadata_keys_for_role@Base 2.3.5
lasso_provider_get_metadata_list@Base 2.3.5
lasso_provider_get_metadata_list_for_role@Base 2.3.5
@ -321,7 +317,6 @@ liblasso.so.3 liblasso3 #MINVER#
lasso_provider_saml2_node_encrypt@Base 2.3.5
lasso_provider_set_encryption_mode@Base 2.3.5
lasso_provider_set_encryption_sym_key_type@Base 2.3.5
lasso_provider_set_key_encryption_method@Base 2.8.0
lasso_provider_set_protocol_conformance@Base 2.5.0
lasso_provider_set_server_signing_key@Base 2.5.0
lasso_provider_verify_signature@Base 2.5.0
@ -549,7 +544,6 @@ liblasso.so.3 liblasso3 #MINVER#
lasso_session_new@Base 2.3.5
lasso_session_new_from_dump@Base 2.3.5
lasso_session_remove_assertion@Base 2.3.5
lasso_set_default_key_encryption_method@Base 2.8.0
lasso_set_flag@Base 2.3.5
lasso_shutdown@Base 2.3.5
lasso_soap_body_get_type@Base 2.3.5

View File

@ -1,2 +0,0 @@
debian/tmp/usr/lib/python2*/dist-packages/*.py
debian/tmp/usr/lib/python2*/dist-packages/*.so

View File

@ -9,26 +9,11 @@
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_TARGET_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
include /usr/share/dpkg/architecture.mk
ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
with_java := no
no_java_archs := alpha arm hppa hurd-i386
ifneq ($(DEB_TARGET_ARCH),i386)
ifneq ($(DEB_TARGET_ARCH),amd64)
ifeq ($(DEB_TARGET_ARCH), $(findstring $(DEB_TARGET_ARCH),$(no_java_archs)))
with_java := disabled for architecture $(DEB_TARGET_ARCH)
endif
endif
endif
with_php := no
PYVERS := $(shell pyversions -vr)
DEFAULT_PYTHON3 := $(shell py3versions -dv)
PY3VERS := $(shell py3versions -vr '>= 3.0')
CFLAGS = `dpkg-buildflags --get CFLAGS`
@ -51,44 +36,32 @@ CONFIGURE_ARGS := \
--infodir=\$${prefix}/share/info \
--enable-tests=no \
--disable-gtk-doc \
--disable-java \
--disable-php \
--enable-perl
ifeq ($(with_java),yes)
CONFIGURE_ARGS += --enable-java
else
CONFIGURE_ARGS += --disable-java
endif
ifeq ($(with_php),yes)
CONFIGURE_ARGS += --enable-php5 --with-php5-config-dir=/etc/php5/mods-available/ --enable-php7 --with-php7-config-dir=/etc/php/7.3/mods-available/
else
CONFIGURE_ARGS += --disable-php5 --disable-php7
endif
config.status: configure
config.status: configure.ac
dh_testdir
# Add here commands to configure the package.
dh_autoreconf
for v in $(PYVERS) $(PY3VERS); do \
CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --with-python=/usr/bin/python$$v $(CONFIGURE_ARGS); \
rm -rf bindings/python$$v; \
cp -a bindings/python bindings/python$$v; \
# run configure once per Python3 version, and copy resulting directory
# aside
set -e; \
for v in $(PY3VERS); do \
CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(CONFIGURE_ARGS) --with-python=/usr/bin/python$$v; \
rm -rf bindings/python$$v; \
cp -a bindings/python bindings/python$$v; \
done
build: build-stamp
build-stamp: config.status
build-arch: build-stamp
build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
$(MAKE) V=1
set -e; \
for v in $(PYVERS) $(PY3VERS); do \
$(MAKE) -C bindings/python$$v clean; \
$(MAKE) -C bindings/python$$v V=1; \
for v in $(PY3VERS); do \
$(MAKE) PYTHON=/usr/bin/python$$v -C bindings/python$$v clean; \
$(MAKE) PYTHON=/usr/bin/python$$v -C bindings/python$$v; \
done
touch build-stamp
@ -96,67 +69,57 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
rm -f build-stamp
ifeq ($(with_java),yes)
sed -e 's/^#JAVA#//' < debian/control.in > debian/control
else
sed -e 's/^#JAVA#.*//' < debian/control.in > debian/control
endif
ifeq ($(with_php),yes)
sed -e 's/^#PHP#//' < debian/control.in > debian/control
else
sed -e 's/^#PHP#.*//' < debian/control.in > debian/control
endif
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
for v in $(PY2VERS) $(PY3VERS); do \
for v in $(PY3VERS); do \
rm -rf bindings/python$$v; \
done
rm -f config.log
rm -f debian/liblasso-perl.install
rm -f ./bindings/perl/MYMETA.json ./bindings/perl/MYMETA.yml
rm -rf ./bindings/perl/__pycache__ ./bindings/__pycache__ ./bindings/python/__pycache__
dh_autoreconf_clean
dh_clean
install: build
install-arch: build-arch
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
# Add here commands to install the package into debian/tmp
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
GACUTIL="/usr/bin/gacutil -root $(CURDIR)/debian/tmp/usr/lib"
# install and rename module for all supporter Python 3 versions
set -e; \
for v in $(PYVERS) $(PY3VERS); do \
for v in $(PY3VERS); do \
$(MAKE) -C bindings/python$$v install DESTDIR=$(CURDIR)/debian/tmp; \
PYVER=/usr/bin/python$$v ; \
SUFFIX=$$($$PYVER -c 'import sysconfig; print(sysconfig.get_config_var("EXT_SUFFIX"))') ; \
mv $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/_lasso.so \
$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/_lasso$$SUFFIX ; \
done
ifeq ($(with_java),yes)
mkdir $(CURDIR)/debian/tmp/usr/lib/jni/
if [ -e $(CURDIR)/debian/tmp/usr/lib/java ]; then \
mv $(CURDIR)/debian/tmp/usr/lib/java/*.so $(CURDIR)/debian/tmp/usr/lib/jni/ ; \
fi
endif
sed -e 's,$${archlib},$(ARCHLIB),g' debian/liblasso-perl.install.in > debian/liblasso-perl.install
# remove id-wsf directory if it is empty
-rmdir $(CURDIR)/debian/tmp/usr/include/lasso/id-wsf/
build-indep:
install-indep:
build: build-arch build-indep
# Build architecture-independent files here.
binary-indep: build install
binary-indep: build-indep install-indep
#dh_makeclilibs -L liblasso-cil -r
# Build architecture-dependent files here.
binary-arch: build install
binary-arch: build-arch install-arch
dh_testdir
dh_testroot
dh_installchangelogs
@ -164,23 +127,21 @@ binary-arch: build install
dh_installexamples -XCVS
dh_installman
dh_install
mkdir $(CURDIR)/debian/liblasso3-dev/usr/lib/$(DEB_HOST_MULTIARCH)
mv $(CURDIR)/debian/liblasso3-dev/usr/lib/pkgconfig $(CURDIR)/debian/liblasso3-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
chrpath -d $(CURDIR)/debian/liblasso-perl/$(ARCHLIB)/auto/Lasso/Lasso.so
dh_link
dh_strip
dh_perl
dh_python2 -ppython-lasso
dh_python3 -ppython3-lasso
dh_compress
dh_fixperms
dh_makeshlibs -a -V
dh_installdeb
dh_shlibdeps -a
ifeq ($(with_php),yes)
echo "php:Depends=phpapi-`php-config5 --phpapi`" >> $(CURDIR)/debian/php5-lasso.substvars
endif
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
.PHONY: build build-arch install-arch build-indep install-indep clean binary-indep binary-arch binary install