Merge ~mitchdz/ubuntu/+source/checksecurity:merge-lp2040370-noble into ubuntu/+source/checksecurity:debian/sid

[Mitchell Dzurick]

PPA - https://launchpad.net/~mitchdz/+archive/ubuntu/merge-lp2040370-noble

[Mitchell Dzurick (mitchdz)]

Did some testing of the package. Fresh install seems fine, but upgrading to the package doesn't work correctly.

## Fresh Noble Install

$ lxc launch ubuntu-daily:noble n
$ lxc shell n
# add-apt-repository ppa:mitchdz/merge-lp2040370-noble -y
# apt update -y
# apt install -y checksecurity
# dpkg -s checksecurity | grep Version
Version: 2.0.16+nmu4ubuntu1~noble1
# checksecurity
...
# echo $?
0

## Noble Install while upgrading existing package

$ lxc launch ubuntu-daily:noble n
$ lxc shell n
# apt update -y
# apt install -y checksecurity
# dpkg -s checksecurity | grep Version
Version: 2.0.16+nmu3ubuntu1
# checksecurity
...
# echo $?
0
# add-apt-repository ppa:mitchdz/merge-lp2040370-noble -y
# apt update -y
# apt install -y checksecurity
# dpkg -s checksecurity | grep Version
Version: 2.0.16+nmu4ubuntu1~noble1
# checksecurity
find: ‘/dev/.lxd-mounts’: Permission denied
# echo $?
0

At this point, trying to use checksecurity will result in the Permission denied. Purging the package then installing again fixes this.

[Mitchell Dzurick (mitchdz)]

The only change from debian is to upgrade to 3.0 source format.

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1007335

[Mitchell Dzurick (mitchdz)]

First comment of mine can be ignored. That was just due to my misunderstanding of the package. This MP is good to merge.

There is no functional change in this package from Debian.

[Simon Quigley (tsimonq2)]

\_________________/
| | | |
| | | |
| | | |
|_______| |_______|
|_______ _______|
| | | |
| | | |
 \ | | /
  \ | | /
   \ | | /
    \ | | /
     \ | | /
      \ | | /
       \| |/
        \_/

review: Approve

[Mitchell Dzurick (mitchdz)]

The "find: ‘/dev/.lxd-mounts’: Permission denied" is an issue in lxd containers, I created a bug for that[0] - but I don't think it's worth fixing for the merge as it is part of one of the extensions that can be configured by the user.

[0] - https://bugs.launchpad.net/ubuntu/+source/checksecurity/+bug/2043521

[Andreas Hasenack (ahasenack)]

This is in noble already, marking the MP as merged.

diff --git a/debian/changelog b/debian/changelog
index ef5d4b2..ac7fd30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+checksecurity (2.0.16+nmu4ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable (LP: #2040370). Remaining changes:
+    - d/control: Downgrade all Recommends to Suggests, except logcheck
+
+ -- Mitchell Dzurick <[e-mail]>  Thu, 09 Nov 2023 14:06:42 +0200
+
 checksecurity (2.0.16+nmu4) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -5,6 +12,15 @@ checksecurity (2.0.16+nmu4) unstable; urgency=medium
 
  -- Bastian Germann <[e-mail]>  Fri, 13 Oct 2023 19:08:08 +0000
 
+checksecurity (2.0.16+nmu3ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Downgrade all Recommends to Suggests, except logcheck (it is in main)
+  * Dropped changes:
+    - Remove fcron from Depends, it is not in the archive. [no more needed]
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 24 Mar 2022 14:21:33 +0100
+
 checksecurity (2.0.16+nmu3) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -28,6 +44,15 @@ checksecurity (2.0.16+nmu2) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Fri, 01 Jan 2021 19:17:53 +0100
 
+checksecurity (2.0.16+nmu1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable (LP: #1555357). Remaining changes:
+    - Downgrade all Recommends to Suggests.
+  * Do not downgrade logcheck to Suggests, it is in main.
+  * Remove fcron from Depends, it is not in the archive.
+
+ -- Nishanth Aravamudan <[e-mail]>  Wed, 09 Mar 2016 12:45:49 -0800
+
 checksecurity (2.0.16+nmu1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -61,6 +86,15 @@ checksecurity (2.0.16) unstable; urgency=medium
 
  -- Javier Fernández-Sanguino Peña <[e-mail]>  Sat, 21 Feb 2015 15:35:45 +0100
 
+checksecurity (2.0.15ubuntu1) utopic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Downgrade all Recommends to Suggests.
+    - Downgrade fcron from Depends to Suggest, it is in universe
+      and we are already depending on anacron
+
+ -- Michael Vogt <[e-mail]>  Wed, 04 Jun 2014 08:18:20 +0200
+
 checksecurity (2.0.15) unstable; urgency=medium
 
   * Fix bug in the CS_NFSAFS definition in etc/check-setuid.conf that prevents
@@ -73,6 +107,15 @@ checksecurity (2.0.15) unstable; urgency=medium
 
  -- Javier Fernández-Sanguino Peña <[e-mail]>  Sat, 28 Sep 2013 23:31:59 +0200
 
+checksecurity (2.0.14ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #668500). Remaining changes:
+    - Downgrade all Recommends to Suggests.
+    - Downgrade fcron from Depends to Suggest, it is in universe
+      and we are already depending on anacron
+
+ -- Angel Abad <[e-mail]>  Fri, 29 Oct 2010 21:36:58 +0200
+
 checksecurity (2.0.14) unstable; urgency=low
 
   * plugins/check-setuid:
@@ -104,6 +147,14 @@ checksecurity (2.0.13ubuntu2) lucid; urgency=low
 
  -- James Westby <[e-mail]>  Wed, 21 Apr 2010 13:45:42 +0100
 
+checksecurity (2.0.13ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Downgrade all Recommends to Suggests.
+    - Downgrade fcron from Depends to Suggest, it is in universe
+      and we are already depending on anacron
+
+ -- Muharem Hrnjadovic <[e-mail]>  Wed, 03 Jun 2009 12:25:55 +0200
 
 checksecurity (2.0.13) unstable; urgency=low
 
@@ -124,6 +175,15 @@ checksecurity (2.0.13) unstable; urgency=low
 
  -- Javier Fernandez-Sanguino Pen~a <[e-mail]>  Tue, 26 May 2009 01:14:49 +0200
 
+checksecurity (2.0.12ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #370225)
+    - Downgrade all Recommends to Suggests.
+    - Downgrade fcron from Depends to Suggest, it is in universe
+      and we are already depending on anacron
+
+ -- Bhavani Shankar <[e-mail]>  Fri, 01 May 2009 11:28:27 +0530
+
 checksecurity (2.0.12) unstable; urgency=medium
 
   * Fix bug in plugins/check_sockets which prevented it from being 
@@ -132,6 +192,15 @@ checksecurity (2.0.12) unstable; urgency=medium
 
  -- Javier Fernandez-Sanguino Pen~a <[e-mail]>  Sat, 21 Mar 2009 23:46:07 +0100
 
+checksecurity (2.0.11ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian unstable (LP: #295260), Ubuntu remaining changes:
+    - Downgrade all Recommends to Suggests.
+    - Downgrade fcron from Depends to Suggest, it is in universe
+      and we are already depending on anacron
+
+ -- Pedro Fragoso <[e-mail]>  Wed, 05 Nov 2008 02:28:39 +0000
+
 checksecurity (2.0.11) unstable; urgency=low
 
   * Debconf Translation changes:
@@ -147,6 +216,13 @@ checksecurity (2.0.10) unstable; urgency=low
 
  -- Javier Fernandez-Sanguino Pen~a <[e-mail]>  Tue, 29 Apr 2008 02:46:50 +0200
 
+checksecurity (2.0.9ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Downgrade all Recommends to Suggests.
+
+ -- Michael Vogt <[e-mail]>  Thu, 29 May 2008 09:59:37 +0200
+
 checksecurity (2.0.9) unstable; urgency=low
 
   * The "where did I leave my head release"
@@ -173,6 +249,13 @@ checksecurity (2.0.8) unstable; urgency=low
 
  -- Javier Fernandez-Sanguino Pen~a <[e-mail]>  Tue, 08 May 2007 01:01:34 +0200
 
+checksecurity (2.0.7-11ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Downgrade all Recommends to Suggests.
+
+ -- Michael Vogt <[e-mail]>  Mon, 14 May 2007 13:01:51 +0200
+
 checksecurity (2.0.7-11) unstable; urgency=low
 
   * New translations:
@@ -194,6 +277,13 @@ checksecurity (2.0.7-11) unstable; urgency=low
 
  -- Javier Fernandez-Sanguino Pen~a <[e-mail]>  Mon, 07 May 2007 23:48:14 +0200
 
+checksecurity (2.0.7-10.1ubuntu1) feisty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Downgrade all Recommends to Suggests.
+
+ -- Colin Watson <[e-mail]>  Tue, 19 Dec 2006 14:54:03 +0000
+
 checksecurity (2.0.7-10.1) unstable; urgency=low
 
   * Non-maintainer upload to fix longstanding l10n issues
@@ -208,6 +298,12 @@ checksecurity (2.0.7-10.1) unstable; urgency=low
 
  -- Christian Perrier <[e-mail]>  Thu, 16 Nov 2006 06:01:25 +0100
 
+checksecurity (2.0.7-10ubuntu1) edgy; urgency=low
+
+  * Downgrade all Recommends to Suggests
+
+ -- Matt Zimmerman <[e-mail]>  Tue, 15 Aug 2006 10:22:13 -0700
+
 checksecurity (2.0.7-10) unstable; urgency=low
 
   * Clean up all logfiles on purge as required by policy.
@@ -322,7 +418,7 @@ checksecurity (2.0.7-1) unstable; urgency=low
     (Closes: #250944) Thanks to Erik Schanze.
 
  -- Steve Kemp <[e-mail]>  Mon, 20 Sep 2004 22:04:11 +0000
-	
+
 checksecurity (2.0.6) unstable; urgency=low
 
   * Respect the NMU from Javier, much appreciated.
@@ -492,3 +588,4 @@ checksecurity (1.0.0) unstable; urgency=low
   * Only rotate setuid.changes if size > 0 (closes: #176995)
 
  -- Steve Greenland <[e-mail]>  Sun,  8 Jun 2003 15:18:08 -0500
+
diff --git a/debian/control b/debian/control
index 0bab168..492dfcf 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,16 @@
 Source: checksecurity
 Section: admin
 Priority: optional
-Maintainer: Javier Fernández-Sanguino Peña <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Javier Fernández-Sanguino Peña <[e-mail]>
 Standards-Version: 3.6.1
 Build-Depends: debhelper (>= 7)
 
 Package: checksecurity
 Architecture: all
 Depends: cron (>= 3.0pl1-74) | anacron | fcron, debconf (>= 0.5) | debconf-2.0, perl (>= 5.8.0), util-linux (>= 2.15~rc1-1)
-Recommends: tiger, logcheck, tripwire | integrit | aide | samhain | fcheck, debsecan
-Suggests: apt-watch | cron-apt, lockfile-progs
+Recommends: logcheck
+Suggests: apt-watch | cron-apt, lockfile-progs, tiger, tripwire | integrit | aide | samhain | fcheck, debsecan
 Conflicts: lockfile-progs (<< 0.1.7)
 Replaces: cron
 Provides: