Projet

Général

Profil

0002-debian-sync-bullseye-packaging-with-upstream-debian..patch

Frédéric Péters, 20 novembre 2021 11:17

Télécharger (17,2 ko)

Voir les différences:

Subject: [PATCH 2/2] debian: sync bullseye packaging with upstream debian.org
 (#58788)

 debian-bullseye/changelog             |  88 ++++++++++++++++++++
 debian-bullseye/compat                |   2 +-
 debian-bullseye/control               |  50 +----------
 debian-bullseye/files                 |   1 +
 debian-bullseye/liblasso-java.dirs    |   1 -
 debian-bullseye/liblasso-java.install |   2 -
 debian-bullseye/liblasso3.symbols     |   8 +-
 debian-bullseye/python-lasso.install  |   2 -
 debian-bullseye/rules                 | 115 +++++++++-----------------
 9 files changed, 132 insertions(+), 137 deletions(-)
 create mode 100644 debian-bullseye/files
 delete mode 100644 debian-bullseye/liblasso-java.dirs
 delete mode 100644 debian-bullseye/liblasso-java.install
 delete mode 100644 debian-bullseye/python-lasso.install
debian-bullseye/changelog
1
lasso (2.7.0-2) unstable; urgency=medium
2

  
3
  * debian/rules: introduce build-arch/build-indep targets.
4
  * debian/rules: clean perl META files.
5
  * debian/rules: remove cleaning of id-wsf directory, it doesn't exist
6
    anymore.
7
  * debian/liblasso3.symbols: add lasso_log symbol introduced in 2.7.0-1.
8

  
9
 -- Frederic Peters <fpeters@debian.org>  Sat, 06 Nov 2021 13:42:52 +0100
10

  
11
lasso (2.7.0-1) unstable; urgency=medium
12

  
13
  * New upstream release.
14
  * debian/patches/: remove, all patches are now upstream.
15

  
16
 -- Frederic Peters <fpeters@debian.org>  Mon, 16 Aug 2021 18:31:12 +0200
17

  
18
lasso (2.6.1-3) unstable; urgency=high
19

  
20
  * debian/patches/0001-Fix-signature-checking-on-unsigned-response-with-mul.patch,
21
    taken from upstream repository,
22
    * CVE-2021-28091: Signature checking on unsigned response with multiple
23
      assertions
24

  
25
 -- Frederic Peters <fpeters@debian.org>  Tue, 01 Jun 2021 14:43:55 +0200
26

  
27
lasso (2.6.1-2) unstable; urgency=medium
28

  
29
  * debian/control: add gtk-doc-tools to build-depends, required when running
30
    autoreconf against autoconf 2.70. (closes: 978846)
31

  
32
 -- Frederic Peters <fpeters@debian.org>  Thu, 31 Dec 2020 15:41:40 +0100
33

  
34
lasso (2.6.1-1) unstable; urgency=medium
35

  
36
  * New upstream release.
37
  * debian/patches/: remove, all patches are now upstream.
38

  
39
 -- Frederic Peters <fpeters@debian.org>  Thu, 23 Apr 2020 20:52:51 +0200
40

  
41
lasso (2.6.0-8) unstable; urgency=medium
42

  
43
  * d/p/fix-parsing-of-saml-authncontext.diff: import upstream commit
44
    to fix parsing of saml:AuthnContextDecl (closes: #955354)
45

  
46
 -- Frederic Peters <fpeters@debian.org>  Mon, 30 Mar 2020 15:55:54 +0200
47

  
48
lasso (2.6.0-7) unstable; urgency=medium
49

  
50
  * Move lasso.pc to a multiarch location. (patch by Helmut Grohne,
51
    thanks, closes: #949989)
52

  
53
 -- Frederic Peters <fpeters@debian.org>  Tue, 28 Jan 2020 08:53:34 +0100
54

  
55
lasso (2.6.0-6) unstable; urgency=medium
56

  
57
  * d/control: remove unnecessary python build-dependency (closes: #936817)
58
  * d/p/build-without-python2.diff: import upstream commits related to
59
    building with Python 3.
60

  
61
 -- Frederic Peters <fpeters@debian.org>  Sun, 19 Jan 2020 10:23:50 +0100
62

  
63
lasso (2.6.0-5) unstable; urgency=medium
64

  
65
  * d/rules: update build/install target to support coinstalling for multiple
66
    Python 3 versions (closes: #945123)
67

  
68
 -- Frederic Peters <fpeters@debian.org>  Wed, 20 Nov 2019 11:01:24 +0100
69

  
70
lasso (2.6.0-4) unstable; urgency=medium
71

  
72
  * d/compat: bump to debhelper level 10.
73
  * d/control: bump Standards-Version to 4.4, but no switch to "dh" yet.
74
  * d/control, d/rules: remove obsolete support for building Java and PHP
75
    bindings; this also removes the d/control.in mechanism.
76
  * d/control: add explicit python dependency, still required for lasso/*.py
77
    build tools. (will be fixed in next upstream tarball)
78
  * d/rules: remove PYDEF variable unused with the removal of python-lasso.
79
  * d/rules: clean Python 3 __pycache__ directories.
80

  
81
 -- Frederic Peters <fpeters@debian.org>  Thu, 05 Sep 2019 08:03:12 +0200
82

  
83
lasso (2.6.0-3) unstable; urgency=medium
84

  
85
  * d/*: remove python-lasso (closes: #936817)
86

  
87
 -- Frederic Peters <fpeters@debian.org>  Fri, 30 Aug 2019 10:39:11 +0200
88

  
1 89
lasso (2.6.0-2) unstable; urgency=medium
2 90

  
3 91
  * d/compat: bump do debhelper level 9.
debian-bullseye/compat
1
9
1
10
debian-bullseye/control
5 5
Build-Depends: debhelper (>= 9),
6 6
        dh-python,
7 7
        dh-autoreconf,
8
        gtk-doc-tools,
8 9
        libxml2-dev,
9 10
        libxslt1-dev,
10 11
        libxmlsec1-dev,
11 12
        libxmlsec1-openssl,
12 13
        libglib2.0-dev,
13
        python-all-dev (>= 2.6.6-3~),
14 14
        python3-all-dev (>= 3.2),
15 15
        libexpat1-dev,
16
        fastjar,
17
        python-lxml,
18 16
        python3-lxml,
19
        python-six,
20 17
        python3-six,
21
        chrpath,
22
        dh-python
23
Standards-Version: 4.1.4
24
X-Python-Version: >= 2.7
18
        chrpath
19
Standards-Version: 4.4
25 20
X-Python3-Version: >= 3.4
26 21
Homepage: http://lasso.entrouvert.org
27 22

  
......
50 45
 This package contains liblasso library used by applications to gain Library
51 46
 Alliance support.
52 47

  
53
Package: python-lasso
54
Conflicts: liblasso0-python2.3, python2.3-lasso, python2.4-lasso
55
Replaces: liblasso0-python2.3, python2.3-lasso, python2.4-lasso
56
Provides: liblasso0-python2.3, ${python:Provides}
57
Section: python
58
Architecture: any
59
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
60
Description: Library for Liberty Alliance and SAML protocols - Python bindings
61
 Lasso is an implementation of Liberty Alliance and related protocols, for
62
 network identity federations, single sign-on and other web services protocols.
63
 The main specifications implemented by the library are ID-FF, ID-WSF and SAML.
64
 .
65
 This package contains Python bindings for liblasso, needed to use lasso
66
 in Python applications.
67

  
68 48
Package: python3-lasso
69 49
Section: python
70 50
Architecture: any
......
77 57
 This package contains Python bindings for liblasso, needed to use lasso
78 58
 in Python applications.
79 59

  
80
#JAVA#Package: liblasso-java
81
#JAVA#Section: libs
82
#JAVA#Architecture: amd64 armel i386 ia64 mips mipsel powerpc ppc64 s390 sparc kfreebsd-i386 kfreebsd-amd64
83
#JAVA#Depends: ${shlibs:Depends}, ${misc:Depends}
84
#JAVA#Description: Library for Liberty Alliance and SAML protocols - Java bindings
85
#JAVA# Lasso is an implementation of Liberty Alliance and related protocols, for
86
#JAVA# network identity federations, single sign-on and other web services protocols.
87
#JAVA# The main specifications implemented by the library are ID-FF, ID-WSF and SAML.
88
#JAVA# .
89
#JAVA# This package provides the Java interface to liblasso, needed to use lasso in
90
#JAVA# Java applications
91

  
92 60
Package: liblasso-perl
93 61
Section: perl
94 62
Architecture: any
......
101 69
 .
102 70
 This package contains Perl bindings for liblasso, needed to use lasso
103 71
 in Perl applications.
104

  
105

  
106

  
107

  
108

  
109

  
110

  
111

  
112

  
113

  
114

  
115

  
debian-bullseye/files
1
lasso_2.7.0-2_source.buildinfo libs optional
debian-bullseye/liblasso-java.dirs
1
usr/lib/jni/
debian-bullseye/liblasso-java.install
1
debian/tmp/usr/lib/jni/*.so
2
debian/tmp/usr/share/java/*.jar
debian-bullseye/liblasso3.symbols
69 69
 lasso_flag_verify_signature@Base 2.3.5
70 70
 lasso_get_prefix_for_dst_service_href@Base 2.3.5
71 71
 lasso_get_prefix_for_idwsf2_dst_service_href@Base 2.3.5
72
 lasso_get_default_key_encryption_method@Base 2.8.0
73
 lasso_get_default_signature_method@Base 2.8.0
74 72
 lasso_identity_destroy@Base 2.3.5
75 73
 lasso_identity_dump@Base 2.3.5
76 74
 lasso_identity_get_federation@Base 2.3.5
......
151 149
 lasso_lib_status_response_new@Base 2.3.5
152 150
 lasso_lib_subject_get_type@Base 2.3.5
153 151
 lasso_lib_subject_new@Base 2.3.5
154
 lasso_log@Base 2.8.0
152
 lasso_log@Base 2.7.0-2
155 153
 lasso_log_remove_handler@Base 2.3.5
156 154
 lasso_log_set_handler@Base 2.3.5
157 155
 lasso_login_accept_sso@Base 2.3.5
......
263 261
 lasso_paos_response_get_type@Base 2.5.0
264 262
 lasso_paos_response_new@Base 2.5.0
265 263
 lasso_paos_response_validate@Base 2.5.0
266
 lasso_parse_key_encryption_method@Base 2.8.0
267 264
 lasso_profile_get_artifact@Base 2.3.5
268 265
 lasso_profile_get_artifact_message@Base 2.3.5
269 266
 lasso_profile_get_identity@Base 2.3.5
......
301 298
 lasso_provider_get_encryption_mode@Base 2.3.5
302 299
 lasso_provider_get_first_http_method@Base 2.3.5
303 300
 lasso_provider_get_idp_supported_attributes@Base 2.3.5
304
 lasso_provider_get_key_encryption_method@Base 2.8.0
305 301
 lasso_provider_get_metadata_keys_for_role@Base 2.3.5
306 302
 lasso_provider_get_metadata_list@Base 2.3.5
307 303
 lasso_provider_get_metadata_list_for_role@Base 2.3.5
......
321 317
 lasso_provider_saml2_node_encrypt@Base 2.3.5
322 318
 lasso_provider_set_encryption_mode@Base 2.3.5
323 319
 lasso_provider_set_encryption_sym_key_type@Base 2.3.5
324
 lasso_provider_set_key_encryption_method@Base 2.8.0
325 320
 lasso_provider_set_protocol_conformance@Base 2.5.0
326 321
 lasso_provider_set_server_signing_key@Base 2.5.0
327 322
 lasso_provider_verify_signature@Base 2.5.0
......
549 544
 lasso_session_new@Base 2.3.5
550 545
 lasso_session_new_from_dump@Base 2.3.5
551 546
 lasso_session_remove_assertion@Base 2.3.5
552
 lasso_set_default_key_encryption_method@Base 2.8.0
553 547
 lasso_set_flag@Base 2.3.5
554 548
 lasso_shutdown@Base 2.3.5
555 549
 lasso_soap_body_get_type@Base 2.3.5
debian-bullseye/python-lasso.install
1
debian/tmp/usr/lib/python2*/dist-packages/*.py
2
debian/tmp/usr/lib/python2*/dist-packages/*.so
debian-bullseye/rules
9 9

  
10 10
# These are used for cross-compiling and for saving the configure script
11 11
# from having to guess our platform (since we know it already)
12
DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
13
DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
14

  
15
DEB_TARGET_ARCH     := $(shell dpkg-architecture -qDEB_HOST_ARCH)
12
include /usr/share/dpkg/architecture.mk
16 13

  
17 14
ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
18 15

  
19
with_java := no
20
no_java_archs := alpha arm hppa hurd-i386
21
ifneq ($(DEB_TARGET_ARCH),i386)
22
 ifneq ($(DEB_TARGET_ARCH),amd64)
23
  ifeq ($(DEB_TARGET_ARCH), $(findstring $(DEB_TARGET_ARCH),$(no_java_archs)))
24
   with_java := disabled for architecture $(DEB_TARGET_ARCH)
25
  endif
26
 endif
27
endif
28

  
29
with_php := no
30

  
31
PYVERS		:= $(shell pyversions -vr)
16
DEFAULT_PYTHON3	:= $(shell py3versions -dv)
32 17
PY3VERS		:= $(shell py3versions -vr '>= 3.0')
33 18

  
34 19
CFLAGS = `dpkg-buildflags --get CFLAGS`
......
51 36
	--infodir=\$${prefix}/share/info \
52 37
	--enable-tests=no \
53 38
	--disable-gtk-doc \
39
	--disable-java \
40
	--disable-php \
54 41
	--enable-perl
55 42

  
56 43

  
57
ifeq ($(with_java),yes)
58
  CONFIGURE_ARGS += --enable-java
59
else
60
  CONFIGURE_ARGS += --disable-java
61
endif
62

  
63
ifeq ($(with_php),yes)
64
  CONFIGURE_ARGS += --enable-php5 --with-php5-config-dir=/etc/php5/mods-available/ --enable-php7 --with-php7-config-dir=/etc/php/7.3/mods-available/
65
else
66
  CONFIGURE_ARGS += --disable-php5 --disable-php7
67
endif
68

  
69

  
70

  
71
config.status: configure
44
config.status: configure.ac
72 45
	dh_testdir
73
	# Add here commands to configure the package.
74 46
	dh_autoreconf
75
	for v in $(PYVERS) $(PY3VERS); do \
76
	  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); \
77
	  rm -rf bindings/python$$v; \
78
	  cp -a bindings/python bindings/python$$v; \
47
	# run configure once per Python3 version, and copy resulting directory
48
	# aside
49
	set -e; \
50
	for v in $(PY3VERS); do \
51
		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; \
52
		rm -rf bindings/python$$v; \
53
		cp -a bindings/python bindings/python$$v; \
79 54
	done
80 55

  
81

  
82
build: build-stamp
83
build-stamp:  config.status
56
build-arch: build-stamp
57
build-stamp: config.status
84 58
	dh_testdir
85 59

  
86
	# Add here commands to compile the package.
87 60
	$(MAKE) V=1
88 61
	set -e; \
89
	for v in $(PYVERS) $(PY3VERS); do \
90
	  $(MAKE) -C bindings/python$$v clean; \
91
	  $(MAKE) -C bindings/python$$v V=1; \
62
	for v in $(PY3VERS); do \
63
	  $(MAKE) PYTHON=/usr/bin/python$$v -C bindings/python$$v clean; \
64
	  $(MAKE) PYTHON=/usr/bin/python$$v -C bindings/python$$v; \
92 65
	done
93 66

  
94 67
	touch build-stamp
......
96 69
clean:
97 70
	dh_testdir
98 71
	dh_testroot
99
	rm -f build-stamp 
100

  
101
ifeq ($(with_java),yes)
102
	sed -e 's/^#JAVA#//' < debian/control.in > debian/control
103
else
104
	sed -e 's/^#JAVA#.*//' < debian/control.in > debian/control
105
endif
106

  
107
ifeq ($(with_php),yes)
108
	sed -e 's/^#PHP#//' < debian/control.in > debian/control
109
else
110
	sed -e 's/^#PHP#.*//' < debian/control.in > debian/control
111
endif
72
	rm -f build-stamp
112 73

  
113 74

  
114 75
	[ ! -f Makefile ] || $(MAKE) distclean
115 76

  
116
	for v in $(PY2VERS) $(PY3VERS); do \
77
	for v in $(PY3VERS); do \
117 78
	  rm -rf bindings/python$$v; \
118 79
	done
119 80

  
120 81
	rm -f config.log
121 82
	rm -f debian/liblasso-perl.install
83
	rm -f ./bindings/perl/MYMETA.json ./bindings/perl/MYMETA.yml
84
	rm -rf ./bindings/perl/__pycache__ ./bindings/__pycache__ ./bindings/python/__pycache__
122 85

  
123 86
	dh_autoreconf_clean
124 87
	dh_clean
125 88

  
126
install: build
89
install-arch: build-arch
127 90
	dh_testdir
128 91
	dh_testroot
129 92
	dh_clean -k
130 93
	dh_installdirs
131 94

  
132
	# Add here commands to install the package into debian/tmp
133 95
	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
134 96
		GACUTIL="/usr/bin/gacutil -root $(CURDIR)/debian/tmp/usr/lib"
97

  
98
	# install and rename module for all supporter Python 3 versions
135 99
	set -e; \
136
	for v in $(PYVERS) $(PY3VERS); do \
100
	for v in $(PY3VERS); do \
137 101
	  $(MAKE) -C bindings/python$$v install DESTDIR=$(CURDIR)/debian/tmp; \
102
	  PYVER=/usr/bin/python$$v ; \
103
	  SUFFIX=$$($$PYVER -c 'import sysconfig; print(sysconfig.get_config_var("EXT_SUFFIX"))') ; \
104
	  mv $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/_lasso.so \
105
		  $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/_lasso$$SUFFIX ; \
138 106
	done
139 107

  
108
	sed -e 's,$${archlib},$(ARCHLIB),g' debian/liblasso-perl.install.in > debian/liblasso-perl.install
140 109

  
141
ifeq ($(with_java),yes)
142
	mkdir $(CURDIR)/debian/tmp/usr/lib/jni/
143
	if [ -e $(CURDIR)/debian/tmp/usr/lib/java ]; then \
144
	  mv $(CURDIR)/debian/tmp/usr/lib/java/*.so $(CURDIR)/debian/tmp/usr/lib/jni/ ; \
145
	fi
146
endif
147 110

  
148
	sed -e 's,$${archlib},$(ARCHLIB),g' debian/liblasso-perl.install.in > debian/liblasso-perl.install
111
build-indep:
149 112

  
150
	# remove id-wsf directory if it is empty
151
	-rmdir $(CURDIR)/debian/tmp/usr/include/lasso/id-wsf/
113
install-indep:
152 114

  
115
build: build-arch build-indep
153 116

  
154 117
# Build architecture-independent files here.
155
binary-indep: build install
118
binary-indep: build-indep install-indep
156 119
	#dh_makeclilibs -L liblasso-cil -r
157 120

  
158 121
# Build architecture-dependent files here.
159
binary-arch: build install
122
binary-arch: build-arch install-arch
160 123
	dh_testdir
161 124
	dh_testroot
162 125
	dh_installchangelogs
......
164 127
	dh_installexamples -XCVS
165 128
	dh_installman
166 129
	dh_install
130
	mkdir $(CURDIR)/debian/liblasso3-dev/usr/lib/$(DEB_HOST_MULTIARCH)
131
	mv $(CURDIR)/debian/liblasso3-dev/usr/lib/pkgconfig $(CURDIR)/debian/liblasso3-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
167 132
	chrpath -d $(CURDIR)/debian/liblasso-perl/$(ARCHLIB)/auto/Lasso/Lasso.so
168 133
	dh_link
169 134
	dh_strip
170 135
	dh_perl
171
	dh_python2 -ppython-lasso
172 136
	dh_python3 -ppython3-lasso
173 137
	dh_compress
174 138
	dh_fixperms
175 139
	dh_makeshlibs -a -V
176 140
	dh_installdeb
177 141
	dh_shlibdeps -a
178
ifeq ($(with_php),yes)
179
	echo "php:Depends=phpapi-`php-config5 --phpapi`" >> $(CURDIR)/debian/php5-lasso.substvars
180
endif
181 142
	dh_gencontrol
182 143
	dh_md5sums
183 144
	dh_builddeb
184 145

  
185 146
binary: binary-indep binary-arch
186
.PHONY: build clean binary-indep binary-arch binary install
147
.PHONY: build build-arch install-arch build-indep install-indep clean binary-indep binary-arch binary install
187
-