Merge remote-tracking branch 'origin/apkg-v3' into thread-next

distro/pkg/deb/bird3.install

@@ -1,6 +1,6 @@
-etc/bird/bird.conf /usr/share/bird2/
 debian/envvars /etc/bird/
 debian/prepare-environment /usr/lib/bird/
+etc/bird/bird.conf /usr/share/bird3/
 usr/sbin/bird
 usr/sbin/birdc
 usr/sbin/birdcl

distro/pkg/deb/bird3.postinst

@@ -9,8 +9,8 @@ if [ "$1" = "configure" ]; then
 
     dpkg-statoverride --list /etc/bird > /dev/null || dpkg-statoverride --update --add bird bird 0750 /etc/bird
 
-    ucf /usr/share/bird2/bird.conf /etc/bird/bird.conf
-    ucfr -f bird2 /etc/bird/bird.conf
+    ucf /usr/share/bird3/bird.conf /etc/bird/bird.conf
+    ucfr -f bird3 /etc/bird/bird.conf
     dpkg-statoverride --list /etc/bird/bird.conf > /dev/null || dpkg-statoverride --update --add bird bird 0640 /etc/bird/bird.conf
 fi
 

distro/pkg/deb/bird3.postrm

@@ -4,7 +4,7 @@ set -e
 if test "$1" = "purge"; then
 
     # Check if there is no collision of ownership of /etc/bird/bird.conf
-    if ! command -v ucf ucfr >/dev/null || ucfr bird2 /etc/bird/bird.conf 2>/dev/null; then
+    if ! command -v ucf ucfr >/dev/null || ucfr bird3 /etc/bird/bird.conf 2>/dev/null; then
 	dpkg-statoverride --remove /etc/bird >/dev/null 2>/dev/null || true
 	dpkg-statoverride --remove /etc/bird/bird.conf >/dev/null 2>/dev/null || true
 
@@ -14,7 +14,7 @@ if test "$1" = "purge"; then
 	rm -f /etc/bird/bird.conf
 	if command -v ucf ucfr >/dev/null; then
 	    ucf --purge /etc/bird/bird.conf
-	    ucfr --purge bird2 /etc/bird/bird.conf
+	    ucfr --purge bird3 /etc/bird/bird.conf
 	fi
 
 	deluser --quiet bird > /dev/null || true

distro/pkg/deb/changelog

@@ -1,4 +1,4 @@
-bird2 ({{ version }}-cznic.{{ release }}) unstable; urgency=medium
+bird3 ({{ version }}-cznic.{{ release }}) unstable; urgency=medium
 
   * upstream package
 

distro/pkg/deb/control

@@ -1,36 +1,43 @@
-Source: bird2
+Source: bird3
 Section: net
 Priority: optional
-Build-Depends: bison,
-               debhelper,
-               docbook-xsl,
-               flex,
-               libncurses-dev,
-               libreadline-dev | libreadline6-dev | libreadline5-dev,
-               libssh-gcrypt-dev,
-               m4,
-               quilt,
-               xsltproc
-Build-Depends-Indep: linuxdoc-tools-latex,
-               opensp,
-               texlive-latex-extra
+Build-Depends:
+ bison,
+ ca-certificates,
+ debhelper,
+ docbook-xsl,
+ flex,
+ libncurses-dev,
+ libreadline-dev | libreadline6-dev | libreadline5-dev,
+ libssh-gcrypt-dev,
+ m4,
+ quilt,
+ xsltproc,
+Build-Depends-Indep:
+ linuxdoc-tools-latex,
+ opensp,
+ texlive-latex-extra,
 Maintainer: Jakub Ružička <jakub.ruzicka@nic.cz>
-Uploaders: Ondřej Surý <ondrej@debian.org>
-Standards-Version: 4.6.2
-Vcs-Browser: https://salsa.debian.org/debian/bird2
-Vcs-Git: https://salsa.debian.org/debian/bird2.git
+Standards-Version: 4.7.0
+Vcs-Browser: https://salsa.debian.org/debian/bird3
+Vcs-Git: https://salsa.debian.org/debian/bird3.git
 Homepage: https://bird.network.cz/
+Rules-Requires-Root: no
 
-Package: bird2
-Architecture: kfreebsd-any linux-any
-Pre-Depends: init-system-helpers,
-             ${misc:Pre-Depends}
-Depends: adduser,
-         ucf,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Conflicts: bird
-Suggests: bird2-doc
+Package: bird3
+Architecture: linux-any kfreebsd-any
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ adduser,
+ ucf,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Conflicts:
+ bird2,
+ bird,
+Suggests:
+ bird3-doc,
 Description: Internet Routing Daemon
  BIRD is an Internet routing daemon with full support for all the major
  routing protocols. It allows redistribution between protocols with a
@@ -41,10 +48,11 @@ Description: Internet Routing Daemon
  protocols. It also supports supplementary protocols like BFD, RPKI-Router
  and IPv6 router advertisements.
 
-Package: bird2-doc
+Package: bird3-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: Internet Routing Daemon - documentation
  BIRD is an Internet routing daemon with full support for all the major
  routing protocols. It allows redistribution between protocols with a

distro/pkg/deb/rules

@@ -11,7 +11,7 @@ include /usr/share/dpkg/default.mk
 
 COMMON_FLAGS= --prefix=/usr --sysconfdir=/etc/bird --mandir=\$${prefix}/share/man \
 	--infodir=\$${prefix}/share/info --localstatedir=/var --runstatedir=/run/bird \
-	--docdir=\$${prefix}/share/bird2 \
+	--docdir=\$${prefix}/share/bird3 \
 	--enable-client
 
 CFLAGS += -g -O2 -fno-strict-aliasing -fno-strict-overflow -fPIC

distro/pkg/deb/source/lintian-overrides

@@ -0,0 +1,9 @@
+# UPSTREAM: not relevant for upstream package
+source: maintainer-upload-has-incorrect-version-number
+# UPSTREAM: we package cross-distro, this always differs
+source: newer-standards-version
+# UPSTREAM: we package cross-distro, use the default debhelper available
+source: no-versioned-debhelper-prerequisite
+source: package-uses-old-debhelper-compat-version
+# UPSTREAM: we package cross-distro, this is for old distro compat
+source: uses-debhelper-compat-file

distro/tests/control

@@ -1,3 +1,3 @@
 Tests: test-bird.sh
 Restrictions: needs-root
-Depends: bird2, iproute2
+Depends: bird3, iproute2

proto/ospf/config.Y

@@ -38,7 +38,7 @@ ospf_iface_finish(void)
   ip->passwords = get_passwords();
 
   if (ospf_cfg_is_v2() && (ip->autype == OSPF_AUTH_CRYPT) && (ip->helloint < 5))
-    cf_warn("Hello or poll interval less that 5 makes cryptographic authenication prone to replay attacks");
+    cf_warn("Hello or poll interval less that 5 makes cryptographic authentication prone to replay attacks");
 
   if ((ip->autype == OSPF_AUTH_NONE) && (ip->passwords != NULL))
     cf_warn("Password option without authentication option does not make sense");

proto/rpki/rpki.c

@@ -200,7 +200,7 @@ rpki_stop_refresh(struct rpki_proto *p)
 static const char *str_cache_states[] = {
   [RPKI_CS_CONNECTING] 		= "Connecting",
   [RPKI_CS_ESTABLISHED] 	= "Established",
-  [RPKI_CS_RESET] 		= "Reseting",
+  [RPKI_CS_RESET] 		= "Resetting",
   [RPKI_CS_SYNC_START] 		= "Sync-Start",
   [RPKI_CS_SYNC_RUNNING] 	= "Sync-Running",
   [RPKI_CS_FAST_RECONNECT] 	= "Fast-Reconnect",

sysdep/unix/io.c

@@ -1415,7 +1415,7 @@ sk_ssh_connect(sock *s)
 	break;
 
       case SSH_KNOWN_HOSTS_OTHER:
-	LOG_WARN_ABOUT_SSH_SERVER_VALIDATION(s, "The server gave use a key of a type while we had an other type recorded. " \
+	LOG_WARN_ABOUT_SSH_SERVER_VALIDATION(s, "The server gave use a key of a type while we had another type recorded. " \
 					     "It is a possible attack.");
 	server_identity_is_ok = 0;
 	break;