Merge ~ahasenack/ubuntu/+source/openvpn-auth-ldap:eoan-openvpn-auth-ldap-sync into ubuntu/+source/openvpn-auth-ldap:debian/sid

[Andreas Hasenack]

Merge from debian. Upstream got a new release out after what, 10 years (!). Debian grabbed it, and now we do.

This almost became a sync, were it not for a detail in the new dep8 tests that failed in our infra. I submitted this to debian[1], and for now it's our only delta.

Bileto ticket (tests still running, previous failure confirmed the need for this new delta):

https://bileto.ubuntu.com/#/ticket/3783

1. https://salsa.debian.org/debian/openvpn-auth-ldap/merge_requests/1

[Christian Ehrhardt  (paelzer)]

I saw the salsa MP is already accepted

[Christian Ehrhardt  (paelzer)]

changelog / version / .. ok

[Christian Ehrhardt  (paelzer)]

FYI - I flipped the bileto ticket status to rerun and collect test results for real

[Christian Ehrhardt  (paelzer)]

The fix you dropped is upstream.
Although tracking that was interesting as the file renamed and we now have 3 instead of 2 spots with this code.

But anyway - drop = ok

[Christian Ehrhardt  (paelzer)]

+1 on the almost sync (soon it will be) MP

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, tagging and uploading 13da5676e676bfd6a0b1b0718cd233ce4c534219

I'm subscribed to the debian package and will be made aware when they upload again, in which case it can become a sync.

$ git push pkg upload/2.0.4-1ubuntu1
Enumerating objects: 33, done.
Counting objects: 100% (33/33), done.
Delta compression using up to 2 threads
Compressing objects: 100% (27/27), done.
Writing objects: 100% (27/27), 3.09 KiB | 351.00 KiB/s, done.
Total 27 (delta 18), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/openvpn-auth-ldap
 * [new tag] upload/2.0.4-1ubuntu1 -> upload/2.0.4-1ubuntu1

$ dput ubuntu ../openvpn-auth-ldap_2.0.4-1ubuntu1_source.changes
Checking signature on .changes
gpg: ../openvpn-auth-ldap_2.0.4-1ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../openvpn-auth-ldap_2.0.4-1ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading openvpn-auth-ldap_2.0.4-1ubuntu1.dsc: done.
  Uploading openvpn-auth-ldap_2.0.4.orig.tar.gz: done.
  Uploading openvpn-auth-ldap_2.0.4-1ubuntu1.debian.tar.xz: done.
  Uploading openvpn-auth-ldap_2.0.4-1ubuntu1_source.buildinfo: done.
  Uploading openvpn-auth-ldap_2.0.4-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This migrated in eoan.

diff --git a/debian/changelog b/debian/changelog
index e64b5c2..e9494fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+openvpn-auth-ldap (2.0.4-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable.
+  * Dropped:
+    - Add patch from Aaron Peschel (~foxpass-dev) to fix a network timeout
+      crash. (LP #1602813)
+      [Fixed upstream]
+  * Added:
+    - d/t/openldap-connect.sh: only create the tun device if needed
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 06 Aug 2019 10:47:29 -0300
+
 openvpn-auth-ldap (2.0.4-1) unstable; urgency=medium
 
   * New maintainer (Closes: #877915).
@@ -11,6 +23,25 @@ openvpn-auth-ldap (2.0.4-1) unstable; urgency=medium
 
  -- Aniol Marti <[e-mail]>  Mon, 05 Aug 2019 13:10:09 +0200
 
+openvpn-auth-ldap (2.0.3-6.1ubuntu3) disco; urgency=medium
+
+  * No-change rebuild for gnustep soname changes.
+
+ -- Matthias Klose <[e-mail]>  Thu, 17 Jan 2019 19:55:27 +0000
+
+openvpn-auth-ldap (2.0.3-6.1ubuntu2) bionic; urgency=medium
+
+  * No-change rebuild for gnustep-base soname change.
+
+ -- Matthias Klose <[e-mail]>  Tue, 07 Nov 2017 06:38:05 +0000
+
+openvpn-auth-ldap (2.0.3-6.1ubuntu1) artful; urgency=medium
+
+  * Add patch from Aaron Peschel (~foxpass-dev) to fix a network timeout
+    crash. (LP: #1602813)
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 20 Apr 2017 13:39:42 +0000
+
 openvpn-auth-ldap (2.0.3-6.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 9fa2e86..052ad9e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: openvpn-auth-ldap
 Section: net
 Priority: optional
-Maintainer: Aniol Marti <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Aniol Marti <[e-mail]>
 Build-Depends: debhelper-compat (=12),
                openvpn (>=2),
                re2c,
diff --git a/debian/tests/openldap-connect.sh b/debian/tests/openldap-connect.sh
index f86aca0..cef4790 100755
--- a/debian/tests/openldap-connect.sh
+++ b/debian/tests/openldap-connect.sh
@@ -57,12 +57,14 @@ ldapsearch -x -b "dc=example,dc=com"
 mkdir /etc/openvpn/auth
 
 # chroot hack
-cd /dev
-mkdir net
-cd net
-mknod tun c 10 200
-chmod 666 tun
-cd
+if [ ! -c /dev/net/tun ]; then
+    cd /dev
+    mkdir -p net
+    cd net
+    mknod tun c 10 200
+    chmod 666 tun
+    cd
+fi
 
 # easy-rsa
 make-cadir easy-rsa/