control: -1 tags patch
quit
Hi,
On Mon, 20 Jul 2020 19:35:35 +0000 Niels Thykier
<nthyk...@master.debian.org> wrote:
> Source: sofia-sip
> Version: 1.12.11+20110422.1-2.1
> Severity: normal
> Usertags: compat-5-6-removal
>
> Hi,
>
> The package sofia-sip uses debhelper with a compat level of 5 or 6,
> which is deprecated and scheduled for removal[1].
>
> Please bump the debhelper compat at your earliest convenience
> /outside the freeze/!
>
> * Compat 13 is recommended (supported in stable-backports)
>
> * Compat 7 is the bare minimum
I have tried my hand at producing a patch to bump debhelper (and
hopefully don't break anything), which I'll attach here.
The patch could probably be improved to only skip the failing test
instead of disabling the whole testsuite, but this is as far as I got
after a few hours of poking it with a stick :)
>
> At the time of filing this bug, compat 5 and 6 are expected to be
> removed "some time during the development cycle of bookworm".
>
As far as I can see sofia-sip is now marked for removal from testing on
2022-01-19, so I thought it would be somewhat urgent to get this fixed
soon.
>
> Thanks,
> ~Niels
>
>
> [1] https://lists.debian.org/debian-devel/2020/07/msg00065.html
>
> [2] https://release.debian.org/bullseye/FAQ.html
>
> [3] The choice of 2021-01-01 as a "deadline" is set before the actual
> freeze deadline to provide a safe cut off point for most people.
>
> Mind you, it is still your responsibility to ensure that the upload
> makes it into testing even if you upload before that date.
>
Cheers,
--
Evangelos
PGP: B938 6554 B7DD 266B CB8E 29A9 90F0 C9B1 8A6B 4A19
From ef68921183553b8cdfefd5076da5e8ebd0afb1d8 Mon Sep 17 00:00:00 2001
From: Evangelos Ribeiro Tzaras <dev...@fortysixandtwo.eu>
Date: Wed, 22 Dec 2021 07:35:39 +0100
Subject: [PATCH 1/2] Bump debian compat to 13 and adapt to changes
* Bump to debhelper-compat 13
* Install paths got wildcards included /usr/lib/... vs /usr/lib/*/...
* Install generated libtool .la files
* Disable tests because of the following test failure:
* Closes #965829
FAIL: check_sres_sip
====================
Running suite(s): Unit tests for SIP URI resolver
0%: Checks: 19, Failures: 19, Errors: 0
check_sres_sip.c:182:F:1 - Test simple resolving:invalid:0: Early exit with return value 0
check_sres_sip.c:212:F:1 - Test simple resolving:not_found:0: Early exit with return value 0
check_sres_sip.c:237:F:1 - Test simple resolving:failure:0: Early exit with return value 0
check_sres_sip.c:298:F:1 - Test simple resolving:timeout:0: Early exit with return value 0
check_sres_sip.c:326:F:1 - Test simple resolving:found_a:0: Early exit with return value 0
check_sres_sip.c:464:F:1 - Test simple resolving:found_cname:0: Early exit with return value 0
check_sres_sip.c:380:F:1 - Test simple resolving:found_ip:0: Early exit with return value 0
check_sres_sip.c:414:F:1 - Test simple resolving:found_maddr_a:0: Early exit with return value 0
check_sres_sip.c:522:F:1 - Test simple resolving:found_maddr_ip:0: Early exit with return value 0
check_sres_sip.c:570:F:1 - Test simple resolving:found_a_aaaa:0: Early exit with return value 0
check_sres_sip.c:604:F:1 - Test simple resolving:found_naptr:0: Early exit with return value 0
check_sres_sip.c:670:F:1 - Test simple resolving:found_bad_naptr:0: Early exit with return value 0
check_sres_sip.c:634:F:1 - Test simple resolving:found_naptr_nohint:0: Early exit with return value 0
check_sres_sip.c:755:F:1 - Test simple resolving:found_naptr2:0: Early exit with return value 0
check_sres_sip.c:809:F:1 - Test simple resolving:found_naptr3:0: Early exit with return value 1
check_sres_sip.c:865:F:1 - Test simple resolving:found_naptr_with_a:0: Early exit with return value 0
check_sres_sip.c:708:F:1 - Test simple resolving:ignore_naptr:0: Early exit with return value 0
check_sres_sip.c:901:F:1 - Test simple resolving:found_srv:0: Early exit with return value 1
check_sres_sip.c:1082:F:1 - Test simple resolving:found_multi_srv:0: Early exit with return value 0
FAIL check_sres_sip (exit status: 1)
SKIP: run_test_sresolv
======================
./run_test_sresolv: started named pid 443084
./run_test_sresolv: cannot start named
./run_test_sresolv: perhaps you have to disable apparmor protection for named
SKIP run_test_sresolv (exit status: 77)
---
debian/compat | 1 -
debian/control | 2 +-
debian/libsofia-sip-ua-dev.install | 6 +-
debian/libsofia-sip-ua-glib-dev.install | 6 +-
debian/libsofia-sip-ua-glib3.install | 4 +-
debian/libsofia-sip-ua0.install | 3 +-
debian/rules | 101 ++----------------------
debian/sofia-sip-doc.docs | 4 +-
8 files changed, 20 insertions(+), 107 deletions(-)
delete mode 100644 debian/compat
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7ed6ff82..00000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/control b/debian/control
index 7b678db5..3d17c3a6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: sofia-sip
Section: net
Priority: optional
Maintainer: Ron Lee <r...@debian.org>
-Build-Depends: debhelper (>= 5), pkg-config, libglib2.0-dev, libssl-dev,
+Build-Depends: debhelper-compat (= 13), pkg-config, libglib2.0-dev, libssl-dev,
doxygen, graphviz, dpkg-dev (>= 1.13.19)
Standards-Version: 3.9.4.0
Homepage: http://sofia-sip.sourceforge.net/
diff --git a/debian/libsofia-sip-ua-dev.install b/debian/libsofia-sip-ua-dev.install
index 2494770e..04008482 100644
--- a/debian/libsofia-sip-ua-dev.install
+++ b/debian/libsofia-sip-ua-dev.install
@@ -1,7 +1,7 @@
usr/include/*/*/*.h
usr/include/*/*/*.h.in
-usr/lib/libsofia-sip-ua.a
-usr/lib/libsofia-sip-ua.so
-usr/lib/pkgconfig/sofia-sip-ua.pc
+usr/lib/*/libsofia-sip-ua.a
+usr/lib/*/libsofia-sip-ua.so
+usr/lib/*/pkgconfig/sofia-sip-ua.pc
usr/share/sofia-sip/msg_parser.awk
usr/share/sofia-sip/tag_dll.awk
diff --git a/debian/libsofia-sip-ua-glib-dev.install b/debian/libsofia-sip-ua-glib-dev.install
index 93101499..26100877 100644
--- a/debian/libsofia-sip-ua-glib-dev.install
+++ b/debian/libsofia-sip-ua-glib-dev.install
@@ -1,3 +1,3 @@
-usr/lib/libsofia-sip-ua-glib.a
-usr/lib/libsofia-sip-ua-glib.so
-usr/lib/pkgconfig/sofia-sip-ua-glib.pc
+usr/lib/*/libsofia-sip-ua-glib.a
+usr/lib/*/libsofia-sip-ua-glib.so
+usr/lib/*/pkgconfig/sofia-sip-ua-glib.pc
diff --git a/debian/libsofia-sip-ua-glib3.install b/debian/libsofia-sip-ua-glib3.install
index 58a788ed..6aca8cc0 100644
--- a/debian/libsofia-sip-ua-glib3.install
+++ b/debian/libsofia-sip-ua-glib3.install
@@ -1,2 +1,2 @@
-usr/lib/libsofia-sip-ua-glib.so.*
-
+usr/lib/*/libsofia-sip-ua-glib.so.*
+usr/lib/*/libsofia-sip-ua-glib.la
diff --git a/debian/libsofia-sip-ua0.install b/debian/libsofia-sip-ua0.install
index e06ac471..f262af65 100644
--- a/debian/libsofia-sip-ua0.install
+++ b/debian/libsofia-sip-ua0.install
@@ -1 +1,2 @@
-usr/lib/libsofia-sip-ua.so.*
+usr/lib/*/libsofia-sip-ua.so.*
+usr/lib/*/libsofia-sip-ua.la
diff --git a/debian/rules b/debian/rules
index cd8df0b7..688a504c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,100 +1,13 @@
#!/usr/bin/make -f
#
-# Copyright 2003 - 2011, Ron Lee.
+%:
+ dh $@
-SHELL = /bin/bash
+override_dh_configure:
+ ./configure --with-doxygen
-NUM_CPUS = $(shell getconf _NPROCESSORS_ONLN 2>/dev/null)
-PARALLEL = $(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-NJOBS = -j$(or $(PARALLEL),$(NUM_CPUS),1)
-
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-export DH_OPTIONS
-
-
-objdir := objs
-
-
-clean:
- dh_testdir
- dh_testroot
- $(RM) *-stamp
- $(RM) -r $(objdir) doc
- dh_clean
-
-
-$(objdir)/config.status: configure
- dh_testdir
- mkdir -p $(objdir)
- cd $(objdir) && ../configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr
-
-build: build-arch
-
-build-arch: build-arch-stamp
-build-arch-stamp: $(objdir)/config.status
- dh_testdir
- $(MAKE) $(NJOBS) -C $(objdir)
- touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp:
- dh_testdir
- $(MAKE) -C $(objdir) doxygen
- touch $@
-
-
-install: install-arch install-indep
-
-install-arch: install-arch-stamp
-install-arch-stamp: build-arch
- dh_testdir
- cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- touch $@
-
-install-indep: build-indep
-
-
-binary: binary-indep binary-arch
-
-binary-indep: DH_OPTIONS = -i
-binary-indep: install-indep
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installchangelogs
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch: DH_OPTIONS = -a
-binary-arch: install-arch
- dh_testdir
- dh_testroot
- dh_install --sourcedir=debian/tmp
+override_dh_installdocs:
+ make doxygen
dh_installdocs
- dh_installchangelogs
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs -- -c0
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-
-.PHONY: clean build build-arch build-indep install install-arch install-indep \
- binary binary-arch binary-indep
+override_dh_auto_test:
diff --git a/debian/sofia-sip-doc.docs b/debian/sofia-sip-doc.docs
index 5ac29ace..169b8c2b 100644
--- a/debian/sofia-sip-doc.docs
+++ b/debian/sofia-sip-doc.docs
@@ -1,2 +1,2 @@
-objs/libsofia-sip-ua/docs/html
-objs/libsofia-sip-ua-glib/docs/html
+libsofia-sip-ua-glib/docs/html
+libsofia-sip-ua/docs/html
--
2.34.1
