Merge ~powersj/ubuntu/+source/logcheck:xenial-1357880 into ~usd-import-team/ubuntu/+source/logcheck:ubuntu/xenial-devel

[Joshua Powers]

[Andreas Hasenack (ahasenack)]

Could you please re-target this against ubuntu/xenial-devel?

[Joshua Powers (powersj)]

Resubmitted against xenial-devel

8861f4b... by Joshua Powers on 2017-07-20

Update maintainer

[Andreas Hasenack (ahasenack)]

Looks good. Verified:
- one commit per change, plus changelog and metadata (maintainer)
- same fix is upstream (https://anonscm.debian.org/cgit/logcheck/logcheck.git/tree/rulefiles/linux/ignore.d.server/dhclient)
- fix works as expected (followed the SRU test case)
- also induced dhclient errors, to see if they would be let through and show up in the logcheck report, and they were
- checked SRU package version and that it will upgrade to Xenial+1

+1

review: Approve

[Joshua Powers (powersj)]

Thanks @ahasenack

Need a sponsor now, please :)

[Nish Aravamudan (nacc)]

$ git ubuntu lint powersj/xenial-1357880 --target-branch=pkg/ubuntu/xenial-devel
E: Version (1.3.17ubuntu0.1) does not match expected version (1.3.17ubuntu0.16.04.1)
Some lint checks failed. Please investigate.

This is a false positive because "vivid" shows up in the active series list.

@Robie, do we want to hardcode that "vivid" is not active in our series functions?

[Robie Basak (racb)]

AIUI, Vivid was active because of the phone. In the past, I've asked for accommodation for Vivid in calculating version numbers in SRUs because otherwise we'd be giving (minor) trouble to phone developers who may want to SRU the same package in Vivid.

This seems unlikely for the phone now, particularly for logcheck. But I don't see a particular reason for the lint to make an exception here. It's being consistent, and that consistency is easier to teach new developers. It's also easier to review: I'm not sure I'd reject 1.3.17ubuntu0.1 in an SRU review, but 1.3.17ubuntu0.16.04.1 would save me having to go through the exercise of considering edge cases in order to conclude that 1.3.17ubuntu0.1 is OK.

[Nish Aravamudan (nacc)]

On Wed, Aug 2, 2017 at 4:01 PM, Robie Basak <email address hidden> wrote:
> AIUI, Vivid was active because of the phone. In the past, I've asked for accommodation for Vivid in calculating version numbers in SRUs because otherwise we'd be giving (minor) trouble to phone developers who may want to SRU the > same package in Vivid.

This is a good point, it's consistent to require the 16.04.1 since
vivid version == xenial version.
>
> This seems unlikely for the phone now, particularly for logcheck. But I don't see a particular reason for the lint to make an exception here. It's being consistent, and that consistency is easier to teach new developers. It's also easier to
> review: I'm not sure I'd reject 1.3.17ubuntu0.1 in an SRU review, but 1.3.17ubuntu0.16.04.1 would save me having to go through the exercise of considering edge cases in order to conclude that 1.3.17ubuntu0.1 is OK.

Yep, so maybe it's *not* a false positive :)

[Joshua Powers (powersj)]

> > review: I'm not sure I'd reject 1.3.17ubuntu0.1 in an SRU review, but
> 1.3.17ubuntu0.16.04.1 would save me having to go through the exercise of
> considering edge cases in order to conclude that 1.3.17ubuntu0.1 is OK.
>
> Yep, so maybe it's *not* a false positive :)

Would you like me to update the version such that lint works or is this good to go?

[Nish Aravamudan (nacc)]

review: Approve

[Nish Aravamudan (nacc)]

Upload tagged and sponsored.

diff --git a/debian/changelog b/debian/changelog
index 106fb5b..634d1e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+logcheck (1.3.17ubuntu0.1) xenial; urgency=medium
+
+  * ignore.d.server/dhclient: rewrite rules (Closes LP: #1357880)
+
+ -- Joshua Powers <[e-mail]>  Wed, 19 Jul 2017 15:58:35 -0700
+
 logcheck (1.3.17) unstable; urgency=low
 
   [ Hannes von Haugwitz ]
diff --git a/debian/control b/debian/control
index 808dec5..22ca4d1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: logcheck
 Section: admin
 Priority: optional
-Maintainer: Debian logcheck Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian logcheck Team <[e-mail]>
 Uploaders: Todd Troxell <[e-mail]>, Eric Evans <[e-mail]>, martin f. krafft <[e-mail]>, Marc Haber <[e-mail]>, maximilian attems <[e-mail]>, Hanspeter Kunz <[e-mail]>, Hannes von Haugwitz <[e-mail]>
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 9)
diff --git a/rulefiles/linux/ignore.d.server/dhclient b/rulefiles/linux/ignore.d.server/dhclient
index c7b98e9..b96ac71 100644
--- a/rulefiles/linux/ignore.d.server/dhclient
+++ b/rulefiles/linux/ignore.d.server/dhclient
@@ -1,26 +1,15 @@
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: Internet (Software|Systems) Consortium DHCP Client [.[:alnum:]-]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: Copyright [-0-9]+ Internet Systems Consortium\.$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: All rights reserved\.$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: For info, please visit http(://www\.isc\.org/(products/DHCP|sw/dhcp/)|s://www\.isc\.org/software/dhcp/)$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: There is already a pid file /var/run/dhclient\.[[:alnum:]]+\.pid with pid [[:digit:]]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: killed old client process, removed PID file$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?:$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: Listening on [^[:space:].]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: Sending on[[:space:]]+[^[:space:]]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: DHCPDISCOVER on [[:alnum:].-]+ to [.0-9]{7,15} port 67 interval [0-9]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: DHCP(NAK|ACK|OFFER) (of [.0-9]{7,15} )?from [.0-9]{7,15}$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: DHCP(REQUEST|RELEASE) (of [.0-9]{7,15} )?on [[:alnum:].-]+ to [.0-9]{7,15} port 67$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: bound(:| to [.0-9]{7,15} --) renewal in [0-9]+ seconds\.$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: [[:lower:]]+[0-9]: unknown hardware address type [0-9]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: Trying recorded lease [.0-9]{7,15}$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: No working leases in persistent database( - sleeping)?\.$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: send_packet: Network is unreachable$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: send_packet: please consult README file regarding broadcast address\.$
-# dhcp-client 2.0
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: Copyright (199[5-9],? ){5}(The )?Internet Software Consortium\.$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: Please contribute if you find this software useful\.$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: For info, please visit http://www.isc.org/dhcp-contrib.html$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: No DHCPOFFERS received\.$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: Sleeping\.$
-# 3.0
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient: parse_option_buffer: option [-[:alnum:]]+ \([[:digit:]]+\) larger than buffer\.$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: Internet Systems Consortium DHCP Client [.[:alnum:]-]+$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: Copyright 2004-20[[:digit:]]{2} Internet Systems Consortium\.$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: All rights reserved\.$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: For info, please visit https://www\.isc\.org/software/dhcp/$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]:$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\] Trying recorded lease [.0-9]{7,15}$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: DHCP(NAK|ACK|OFFER) (of [.0-9]{7,15} )?from [.0-9]{7,15}( \(xid=0x[0-9a-f]{8}\))?$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: DHCP(REQUEST|RELEASE) (of [.0-9]{7,15} )?on [[:alnum:].-]+ to [.0-9]{7,15} port 67( \(xid=0x[0-9a-f]{8}\))?$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: DHCPDISCOVER on [[:alnum:].-]+ to [.0-9]{7,15} port 67 interval [0-9]+( \(xid=0x[0-9a-f]{8}\))?$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: Killed old client process$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: Listening on [^[:space:].]+$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: No DHCPOFFERS received\.$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: No working leases in persistent database - sleeping\.$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: Sending on[[:space:]]+[^[:space:]]+$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ dhclient\[[[:digit:]]+\]: bound to [.0-9]{7,15} -- renewal in [0-9]+ seconds\.$