Merge ~utkarsh/ubuntu/+source/isc-dhcp:lp1894172-fix-env-bionic into ubuntu/+source/isc-dhcp:ubuntu/bionic-devel

[Utkarsh Gupta]

This MR fixes env variables for $INTERFACES (LP: #1894172).

PPA: https://launchpad.net/~utkarsh/+archive/ubuntu/experimental-dump/

Unfortunately there weren't any tests in this package but the change is trivial and I've done a manual test of this.

Should you need any more details, let me know. Requesting you to please review and sponsor the upload.

[Utkarsh Gupta (utkarsh)]

Ugh, oh no! I checked out from ubuntu/bionic-devel and it had the security upload and it pulled it in for this MP as well. I am not sure where to rebase this from or how? Please let me know about this so I can get this fixed at the earliest. TIA!

review: Needs Fixing

[Utkarsh Gupta (utkarsh)]

Awesome, fixed now! \o/

[Sergio Durigan Junior (sergiodj)]

Thanks. I know that, before the last security upload, all versions were being incremented like "-ubuntu2", "-ubuntu3" and so on. However, now that there is a security upload, we should follow its versioning scheme (actually, for SRUs we always try to follow this scheme, but sometimes people forget it, like in this case).

The version for this package should be:

4.3.5-3ubuntu7.2

Let me know when you fix it, and I'll upload the package.

review: Needs Fixing

[Utkarsh Gupta (utkarsh)]

Aaah. I see. Hopefully I'll get my head around to adapt the versioning scheme. Thanks and fixed!

[Sergio Durigan Junior (sergiodj)]

Thanks, uploaded and pushed:

$ git push pkg upload/4.3.5-3ubuntu7.2
Enumerating objects: 15, done.
Counting objects: 100% (15/15), done.
Delta compression using up to 8 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (10/10), 1.40 KiB | 205.00 KiB/s, done.
Total 10 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/isc-dhcp
 * [new tag] upload/4.3.5-3ubuntu7.2 -> upload/4.3.5-3ubuntu7.2

$ dput isc-dhcp_4.3.5-3ubuntu7.2_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/isc-dhcp/isc-dhcp_4.3.5-3ubuntu7.2_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/isc-dhcp/isc-dhcp_4.3.5-3ubuntu7.2.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading isc-dhcp_4.3.5-3ubuntu7.2.dsc: done.
  Uploading isc-dhcp_4.3.5-3ubuntu7.2.debian.tar.xz: done.
  Uploading isc-dhcp_4.3.5-3ubuntu7.2_source.buildinfo: done.
  Uploading isc-dhcp_4.3.5-3ubuntu7.2_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index f267881..43177d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+isc-dhcp (4.3.5-3ubuntu7.2) bionic; urgency=medium
+
+  * Fix env variable for INTERFACES (LP: #1894172)
+    - d/isc-dhcp-server.isc-dhcp-server{,6}.service: Replace $INTERFACES
+      variable with $INTERFACEv4 and $INTERFACESv6, respectively, for
+      respective services file.
+
+ -- Utkarsh Gupta <[e-mail]>  Wed, 10 Mar 2021 19:57:51 +0530
+
 isc-dhcp (4.3.5-3ubuntu7.1) bionic-security; urgency=medium
 
   * SECURITY UPDATE: DoS via change in bind behaviour (LP: #1781699)
diff --git a/debian/isc-dhcp-server.isc-dhcp-server.service b/debian/isc-dhcp-server.isc-dhcp-server.service
index b3e2794..4e7fe42 100644
--- a/debian/isc-dhcp-server.isc-dhcp-server.service
+++ b/debian/isc-dhcp-server.isc-dhcp-server.service
@@ -18,7 +18,8 @@ ExecStart=/bin/sh -ec '\
     [ -e /var/lib/dhcp/dhcpd.leases ] || touch /var/lib/dhcp/dhcpd.leases; \
     chown root:dhcpd /var/lib/dhcp /var/lib/dhcp/dhcpd.leases; \
     chmod 775 /var/lib/dhcp ; chmod 664 /var/lib/dhcp/dhcpd.leases; \
-    exec dhcpd -user dhcpd -group dhcpd -f -4 -pf /run/dhcp-server/dhcpd.pid -cf $CONFIG_FILE $INTERFACES'
+    if test -n "$INTERFACES" -a -z "$INTERFACESv4"; then INTERFACESv4="$INTERFACES"; fi; \
+    exec dhcpd -user dhcpd -group dhcpd -f -4 -pf /run/dhcp-server/dhcpd.pid -cf $CONFIG_FILE $INTERFACESv4'
 
 [Install]
 WantedBy=multi-user.target
diff --git a/debian/isc-dhcp-server.isc-dhcp-server6.service b/debian/isc-dhcp-server.isc-dhcp-server6.service
index e3b0828..8593fda 100644
--- a/debian/isc-dhcp-server.isc-dhcp-server6.service
+++ b/debian/isc-dhcp-server.isc-dhcp-server6.service
@@ -18,7 +18,8 @@ ExecStart=/bin/sh -ec '\
     [ -e /var/lib/dhcp/dhcpd6.leases ] || touch /var/lib/dhcp/dhcpd6.leases; \
     chown root:dhcpd /var/lib/dhcp /var/lib/dhcp/dhcpd6.leases; \
     chmod 775 /var/lib/dhcp ; chmod 664 /var/lib/dhcp/dhcpd6.leases; \
-    exec dhcpd -user dhcpd -group dhcpd -f -6 -pf /run/dhcp-server/dhcpd6.pid -cf $CONFIG_FILE $INTERFACES'
+    if test -n "$INTERFACES" -a -z "$INTERFACESv6"; then INTERFACESv6="$INTERFACES"; fi; \
+    exec dhcpd -user dhcpd -group dhcpd -f -6 -pf /run/dhcp-server/dhcpd6.pid -cf $CONFIG_FILE $INTERFACESv6'
 
 [Install]
 WantedBy=multi-user.target