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

[Utkarsh Gupta]

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

PPA: https://launchpad.net/~utkarsh/+archive/ubuntu/isc-dhcp-lp1894172-interfaces-env

Unfortunately there weren't 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, upload, and push the tag. TIA!

[Sergio Durigan Junior (sergiodj)]

Thanks, the patch LGTM, so I'm approving this MP.

A comment about git tags: you should not create the upload tag yourself, since you're not going to do the upload. It's the uploader's job to create and push the upload tag (just like we do when we're asking for sponsorship in Debian). Also, even if you could do the upload yourself, it is not a good idea to create the tag before the MP has been reviewed and approved, since you might need to make changes to the branch and force-push things. A good thing here is that the tags you created are under the "utkarsh/" namespace, so they don't conflict with the git-ubuntu tag.

A last comment is that you shouldn't create a "debian/xxyyzz" tag. When using git-ubuntu, we just have to create the "upload/xxyyzz" tag (which is done by running "git ubuntu tag --upload").

About the PPA: we usually upload using the "~ppa1" suffix, which helps to "version" the PPA uploads and makes it easier to deal with multiple uploads of the same package.

Having said all that, I uploaded and pushed the tag:

$ git push pkg upload/4.4.1-2.2ubuntu5
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.29 KiB | 331.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.4.1-2.2ubuntu5 -> upload/4.4.1-2.2ubuntu5

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

review: Approve

[Utkarsh Gupta (utkarsh)]

Hi Sergio,

> Thanks, the patch LGTM, so I'm approving this MP.

Thank you!

> A comment about git tags: you should not create the upload tag yourself,
> since you're not going > to do the upload. It's the uploader's job to
> create and push the upload tag (just like we do when we're asking for
> sponsorship in Debian). Also, even if you could do the upload yourself,
> it is not a good idea to create the tag before the MP has been reviewed
> and approved, since you might need to make changes to the branch and
> force-push things. A good thing here is that the tags you created are
> under the "utkarsh/" namespace, so they don't conflict with the git-ubuntu tag.

Aah, okay. Duly noted, thanks!

> A last comment is that you shouldn't create a "debian/xxyyzz" tag.
> When using git-ubuntu, we just have to create the "upload/xxyyzz" tag
> (which is done by running "git ubuntu tag --upload").

Gotcha! I didn't know this previously, so a nice learning point.

> About the PPA: we usually upload using the "~ppa1" suffix, which
> helps to "version" the PPA uploads and makes it easier to deal with
> multiple uploads of the same package.

Eeks, my bad. Thanks for bringing this up. The only bad side I guess is
that I need to build it again (with different version string) for PPA,
but that's okay, I guess?

> Having said all that, I uploaded and pushed the tag: (...)

Super awesome, thanks for such a careful and a helpful assist! \o/

[Sergio Durigan Junior (sergiodj)]

On Friday, February 26 2021, Utkarsh Gupta wrote:

>> About the PPA: we usually upload using the "~ppa1" suffix, which
>> helps to "version" the PPA uploads and makes it easier to deal with
>> multiple uploads of the same package.
>
> Eeks, my bad. Thanks for bringing this up. The only bad side I guess is
> that I need to build it again (with different version string) for PPA,
> but that's okay, I guess?

No need to build it again. The package has been uploaded already, so
everything is fine. This is an advice for next time :-).

Cheers,

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Bryce Harrington (bryce)]

On Fri, Feb 26, 2021 at 09:42:22PM -0000, Sergio Durigan Junior wrote:
> On Friday, February 26 2021, Utkarsh Gupta wrote:
>
> >> About the PPA: we usually upload using the "~ppa1" suffix, which
> >> helps to "version" the PPA uploads and makes it easier to deal with
> >> multiple uploads of the same package.
> >
> > Eeks, my bad. Thanks for bringing this up. The only bad side I guess is
> > that I need to build it again (with different version string) for PPA,
> > but that's okay, I guess?
>
> No need to build it again. The package has been uploaded already, so
> everything is fine. This is an advice for next time :-).

Here's the workflow I use:

$ ppa_ver=1
$ git checkout ${branch_name} -b ${branch_name}.${codename}${ppa_ver}
$ dch -l ~${codename} --distribution ${codename} "ppa build for ${codename}"
$ git commit debian/changelog -m "changelog for ppa"
$ debuild -S -i
$ git checkout ${branch_name}

(I prefer to use ~hirsute1, etc. rather than ~ppa1 for cases where I'm
doing an SRU and want to put the same debian version of a package into
two different releases. It's rare, but happened to me a couple times so
I adopted this approach.)

Bryce

diff --git a/debian/changelog b/debian/changelog
index 38c3c5c..43e9e65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+isc-dhcp (4.4.1-2.2ubuntu5) hirsute; 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]>  Fri, 26 Feb 2021 18:57:38 +0530
+
 isc-dhcp (4.4.1-2.2ubuntu4) hirsute; urgency=medium
 
   * Stop building the udeb on request.
diff --git a/debian/isc-dhcp-server.isc-dhcp-server.service b/debian/isc-dhcp-server.isc-dhcp-server.service
index b3e2794..c8c9c8e 100644
--- a/debian/isc-dhcp-server.isc-dhcp-server.service
+++ b/debian/isc-dhcp-server.isc-dhcp-server.service
@@ -18,7 +18,7 @@ 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'
+    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..ba27435 100644
--- a/debian/isc-dhcp-server.isc-dhcp-server6.service
+++ b/debian/isc-dhcp-server.isc-dhcp-server6.service
@@ -18,7 +18,7 @@ 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'
+    exec dhcpd -user dhcpd -group dhcpd -f -6 -pf /run/dhcp-server/dhcpd6.pid -cf $CONFIG_FILE $INTERFACESv6'
 
 [Install]
 WantedBy=multi-user.target