Control: tags 636459 + patch
Dear maintainer,
I've prepared an NMU for tmpreaper (versioned as 1.6.14+nmu2).
The diff is attached to this message.
cu
Adrian
diff -Nru tmpreaper-1.6.14+nmu1/ChangeLog tmpreaper-1.6.14+nmu2/ChangeLog
--- tmpreaper-1.6.14+nmu1/ChangeLog 2019-09-06 16:20:49.000000000 +0300
+++ tmpreaper-1.6.14+nmu2/ChangeLog 2021-08-03 08:35:41.000000000 +0300
@@ -1,3 +1,11 @@
+tmpreaper (1.6.14+nmu2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Apply patch from Mick Switser to fix protect on directory.
+ (Closes: #636459)
+
+ -- Adrian Bunk <b...@debian.org> Tue, 03 Aug 2021 08:35:41 +0300
+
tmpreaper (1.6.14+nmu1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru tmpreaper-1.6.14+nmu1/debian/changelog tmpreaper-1.6.14+nmu2/debian/changelog
--- tmpreaper-1.6.14+nmu1/debian/changelog 2019-09-06 16:20:49.000000000 +0300
+++ tmpreaper-1.6.14+nmu2/debian/changelog 2021-08-03 08:35:41.000000000 +0300
@@ -1,3 +1,11 @@
+tmpreaper (1.6.14+nmu2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Apply patch from Mick Switser to fix protect on directory.
+ (Closes: #636459)
+
+ -- Adrian Bunk <b...@debian.org> Tue, 03 Aug 2021 08:35:41 +0300
+
tmpreaper (1.6.14+nmu1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru tmpreaper-1.6.14+nmu1/tmpreaper.c tmpreaper-1.6.14+nmu2/tmpreaper.c
--- tmpreaper-1.6.14+nmu1/tmpreaper.c 2019-01-05 17:23:01.000000000 +0200
+++ tmpreaper-1.6.14+nmu2/tmpreaper.c 2021-08-03 08:35:41.000000000 +0300
@@ -519,6 +519,21 @@
continue;
}
+ if (FLAGS_PROTECT_P (flags)) {
+ skip = i = 0;
+ do {
+ if (sb.st_ino == protect_table[i].inode) {
+ message (LOG_VERBOSE,
+ "Entry matching `--protect' pattern skipped. `%s'\n",
+ protect_table[i].name);
+ skip = 1;
+ break;
+ }
+ } while (protect_table[i++].name);
+ if (skip)
+ continue;
+ }
+
if (S_ISDIR (sb.st_mode)) {
#ifdef HAVE_LIBMOUNT_LIBMOUNT_H
struct mountpoint_control ctl = { NULL };
@@ -565,21 +580,6 @@
(u_int) getpid(), ent->d_name);
}
- if (FLAGS_PROTECT_P (flags)) {
- skip = i = 0;
- do {
- if (sb.st_ino == protect_table[i].inode) {
- message (LOG_VERBOSE,
- "Entry matching `--protect' pattern skipped. `%s'\n",
- protect_table[i].name);
- skip = 1;
- break;
- }
- } while (protect_table[i++].name);
- if (skip)
- continue;
- }
-
/* Decide whether to remove the file or not */
/* check for mtime on directory instead of atime if requested */
if ( FLAGS_MTIME_P(flags) ||
