[pkg-nagios-changes] [Git][nagios-team/nagios-plugins-contrib][master] Update check-cert-expire-dir, check-packages, update-apt-status and...

[Jan Wagner (@waja)]

Jan Wagner pushed to branch master at Debian Nagios Maintainer Group / nagios-plugins-contrib


Commits:
463396bf by Jan Wagner at 2025-04-20T12:55:16+00:00
Update check-cert-expire-dir, check-packages, update-apt-status and update-unowned-file-status from dsa upstream

- - - - -


4 changed files:

- dsa/checks/dsa-check-cert-expire-dir
- dsa/checks/dsa-check-packages
- dsa/sbin/dsa-update-apt-status
- dsa/sbin/dsa-update-unowned-file-status


Changes:

=====================================
dsa/checks/dsa-check-cert-expire-dir
=====================================
@@ -52,7 +52,7 @@ cWARN=0
 cCRIT=0
 cUNKNOWN=0
 
-t=$(tempfile)
+t=$(mktemp)
 trap "rm -f '$t'" EXIT
 
 for i in "$DIR"/*.crt; do


=====================================
dsa/checks/dsa-check-packages
=====================================
@@ -143,7 +143,7 @@ sub get_packages {
 			if ($1 eq $installed->{$pkgname}{'candidate'}) {
 				$candidate_found = 1;
 			}
-		} elsif (($line =~ / +[0-9]+ [^ ]+\/(security\.([^ ]+\.)?debian\.org|debian-security).*\/updates\//) && $candidate_found ) {
+		} elsif (($line =~ / +[0-9]+ [^ ]+\/(security\.([^ ]+\.)?debian\.org|debian-security).*(-security|\/updates)\//) && $candidate_found ) {
 			$installed->{$pkgname}{'security-update'} = 1;
 		} elsif ($line =~ /^ +\*\*\*/) {
 			$line = shift @lines;


=====================================
dsa/sbin/dsa-update-apt-status
=====================================
@@ -78,7 +78,7 @@ if [ "$count" -ge "$UPDATE_RUNS" ]; then
 fi
 
 # run the apt check itself
-tmp=`tempfile`
+tmp=`mktemp`
 trap "rm -f '$tmp'" exit
 #/usr/share/dsa/apt-status-check --noupdate --timeout=600 > "$tmp"
 /usr/lib/nagios/plugins/dsa-check-packages > "$tmp"


=====================================
dsa/sbin/dsa-update-unowned-file-status
=====================================
@@ -27,7 +27,7 @@ STATUS="${STATUSDIR}"/nouser
 
 mkdir -p "${STATUSDIR}"
 
-tmp=`tempfile`
+tmp=`mktemp`
 trap "rm -f '$tmp'" exit
 
 if command -v ionice >/dev/null 2>&1; then



View it on GitLab: https://salsa.debian.org/nagios-team/nagios-plugins-contrib/-/commit/463396bf0bf1199be02a7d837ecccb38224ef99b

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/nagios-plugins-contrib/-/commit/463396bf0bf1199be02a7d837ecccb38224ef99b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20250420/b8ba9e8b/attachment-0001.htm>