On Tue, Jan 18, 2022 at 05:15:39PM +0100, Florian Ernst wrote:
> On Fri, Aug 24, 2018 at 03:14:18PM +0200, Sebastien Bacher wrote:
> > There is a new upstream version available, it would be nice to get the
> > update in Debian
> > https://github.com/jpirko/libndp/commits/v1.7
> 
> FWIW, by now there already is v1.8 available, with commits dealing with
> some leaks and a buffer overflow and adding options to ndptool.

I have prepared a rather minimal update for this at
<https://salsa.debian.org/florian/libndp> (i.e. in a fork of the latest
<https://salsa.debian.org/debian/libndp>). Of course further changes are
possible, as e.g. suggested by lintian.

Upstream v1.8 seems to build sanely from this, and I also tested
building the reverse dependencies of libndp-dev, i.e. network-manager,
which succeeded as well showing no differences.

Please find attached the changes to debian/ to ease review.

Cheers,
Flo
diff --git a/debian/changelog b/debian/changelog
index 173649e..cab4437 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,38 @@
+libndp (1.8-0.1) UNRELEASED; urgency=medium
+
+  [ Michael Biebl ]
+  * Drop --disable-silent-rules from debian/rules. This is now handled by dh
+    directly depending on whether the DH_QUIET environment variable is set.
+
+  [ Ondřej Nový ]
+  * d/copyright: Use https protocol in Format field
+  * d/control: Deprecating priority extra as per policy 4.0.1
+  * d/control: Set Vcs-* to salsa.debian.org
+
+  [ Debian Janitor ]
+  * [07f0e48] Transition to automatic debug package (from: libndp-dbg).
+    Changes-By: lintian-brush
+    Fixes: lintian: debian-control-has-obsolete-dbg-package
+    See-also: https://lintian.debian.org/tags/debian-control-has-obsolete-dbg-package.html
+  * [0e8a255] Bump debhelper from deprecated 9 to 10.
+    Changes-By: lintian-brush
+    Fixes: lintian: package-uses-deprecated-debhelper-compat-version
+    See-also: https://lintian.debian.org/tags/package-uses-deprecated-debhelper-compat-version.html
+  * [3ef06fb] Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, Repository-Browse.
+    Changes-By: lintian-brush
+    Fixes: lintian: upstream-metadata-file-is-missing
+    See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html
+    Fixes: lintian: upstream-metadata-missing-bug-tracking
+    See-also: https://lintian.debian.org/tags/upstream-metadata-missing-bug-tracking.html
+    Fixes: lintian: upstream-metadata-missing-repository
+    See-also: https://lintian.debian.org/tags/upstream-metadata-missing-repository.html
+
+  [ Florian Ernst ]
+  * [2f15507] New upstream version 1.8 (Closes: #907174)
+  * [79a30ff] update symbols for upstream 1.8
+
+ -- Florian Ernst <flor...@debian.org>  Wed, 16 Feb 2022 22:24:38 +0100
+
 libndp (1.6-1) unstable; urgency=high
 
   * New upstream release. Fixes CVE-2016-3698. (Closes: #824545, #781755)
@@ -65,4 +100,3 @@ libndp (1.2-1) unstable; urgency=low
   * Initial release (Closes: #742973)
 
  -- Andrew Ayer <a...@andrewayer.name>  Sat, 29 Mar 2014 10:40:30 -0700
-
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 3df0519..d68b3e9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,26 +1,12 @@
 Source: libndp
 Priority: optional
 Maintainer: Andrew Ayer <a...@andrewayer.name>
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 10~)
 Standards-Version: 3.9.8
 Section: net
 Homepage: http://libndp.org
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/libndp.git
-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/libndp.git
-
-Package: libndp-dbg
-Section: debug
-Priority: extra
-Architecture: linux-any kfreebsd-any
-Multi-Arch: same
-Depends: libndp0 (= ${binary:Version}), ${misc:Depends}
-Description: Library for Neighbor Discovery Protocol (debug symbols)
- libndp is a library for the IPv6 Neighbor Discovery Protocol (NDP).  It
- contains functions for building and parsing NDP messages, and provides
- a high-level interface for sending and receiving NDP messages on a
- network interface.
- .
- This package provides debug symbols.
+Vcs-Git: https://salsa.debian.org/debian/libndp.git
+Vcs-Browser: https://salsa.debian.org/debian/libndp
 
 Package: libndp-dev
 Section: libdevel
diff --git a/debian/copyright b/debian/copyright
index abae717..2036d75 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libndp
 Source: https://github.com/jpirko/libndp
 
diff --git a/debian/libndp0.symbols b/debian/libndp0.symbols
index 72f91b4..556f385 100644
--- a/debian/libndp0.symbols
+++ b/debian/libndp0.symbols
@@ -5,6 +5,7 @@ libndp.so.0 libndp0 #MINVER#
  ndp_get_eventfd@Base 1.2
  ndp_get_log_priority@Base 1.2
  ndp_msg_addrto@Base 1.2
+ ndp_msg_dest_set@Base 1.8
  ndp_msg_destroy@Base 1.2
  ndp_msg_ifindex@Base 1.2
  ndp_msg_ifindex_set@Base 1.2
@@ -26,6 +27,7 @@ libndp.so.0 libndp0 #MINVER#
  ndp_msg_opt_route_preference@Base 1.2
  ndp_msg_opt_route_prefix@Base 1.2
  ndp_msg_opt_route_prefix_len@Base 1.2
+ ndp_msg_opt_set@Base 1.8
  ndp_msg_opt_slladdr@Base 1.2
  ndp_msg_opt_slladdr_len@Base 1.2
  ndp_msg_opt_tlladdr@Base 1.2
@@ -38,6 +40,7 @@ libndp.so.0 libndp0 #MINVER#
  ndp_msg_payload_opts_len@Base 1.2
  ndp_msg_send@Base 1.2
  ndp_msg_send_with_flags@Base 1.6
+ ndp_msg_target_set@Base 1.8
  ndp_msg_type@Base 1.2
  ndp_msgna@Base 1.2
  ndp_msgna_flag_override@Base 1.6
diff --git a/debian/rules b/debian/rules
index 5daf4b0..d777afa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,5 @@
 %:
 	dh $@
 
-# Disable silent make rules so blhc can check build log for hardening flags
-override_dh_auto_configure:
-	dh_auto_configure -- --disable-silent-rules
-
 override_dh_strip:
-	dh_strip --dbg-package=libndp-dbg
+	dh_strip --dbgsym-migration='libndp-dbg (<< 1.6-2~)'
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..c674426
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/jpirko/libndp/issues
+Bug-Submit: https://github.com/jpirko/libndp/issues/new
+Repository: https://github.com/jpirko/libndp.git
+Repository-Browse: https://github.com/jpirko/libndp

Attachment: signature.asc
Description: PGP signature

Reply via email to