summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Shepherd <masterdriverz@gentoo.org>2006-12-04 22:13:07 +0000
committerCharlie Shepherd <masterdriverz@gentoo.org>2006-12-04 22:13:07 +0000
commit9774dc19248a08972c2fca9f5979e4803e3966db (patch)
treeaf340532a5b09387165273846f491359175392f5 /app-admin/tmpreaper/files
parentVersion bump. (diff)
downloadgentoo-2-9774dc19248a08972c2fca9f5979e4803e3966db.tar.gz
gentoo-2-9774dc19248a08972c2fca9f5979e4803e3966db.tar.bz2
gentoo-2-9774dc19248a08972c2fca9f5979e4803e3966db.zip
Fix --protect, thanks to Andy Lutomirski for the patch, bug 114218
(Portage version: 2.1.2_rc2-r2)
Diffstat (limited to 'app-admin/tmpreaper/files')
-rw-r--r--app-admin/tmpreaper/files/digest-tmpreaper-1.6.6-r13
-rw-r--r--app-admin/tmpreaper/files/tmpreaper-1.6.6-fix-protect.patch30
2 files changed, 33 insertions, 0 deletions
diff --git a/app-admin/tmpreaper/files/digest-tmpreaper-1.6.6-r1 b/app-admin/tmpreaper/files/digest-tmpreaper-1.6.6-r1
new file mode 100644
index 000000000000..cfe5082bf34b
--- /dev/null
+++ b/app-admin/tmpreaper/files/digest-tmpreaper-1.6.6-r1
@@ -0,0 +1,3 @@
+MD5 3a534f8876f318102d7a5ec38584200e tmpreaper_1.6.6.tar.gz 119219
+RMD160 f3979b4506e18e4029fa03420f74be885d4175ec tmpreaper_1.6.6.tar.gz 119219
+SHA256 c0b16e0b123b2ec965047ad94ba7430330aae4e1d017105f9151a4c11d4e5202 tmpreaper_1.6.6.tar.gz 119219
diff --git a/app-admin/tmpreaper/files/tmpreaper-1.6.6-fix-protect.patch b/app-admin/tmpreaper/files/tmpreaper-1.6.6-fix-protect.patch
new file mode 100644
index 000000000000..8b114c1e237d
--- /dev/null
+++ b/app-admin/tmpreaper/files/tmpreaper-1.6.6-fix-protect.patch
@@ -0,0 +1,30 @@
+--- tmpreaper.c.orig 2005-11-13 13:30:35.000000000 -0800
++++ tmpreaper.c 2005-11-13 13:31:29.000000000 -0800
+@@ -464,13 +464,6 @@
+ continue;
+ }
+
+- if (S_ISDIR (sb.st_mode)) {
+- cleanupDirectory (ent->d_name, killTime, flags);
+- message (LOG_VERBOSE,
+- "(PID %u) Back from recursing down `%s'.\n",
+- (u_int) getpid(), ent->d_name);
+- }
+-
+ if (FLAGS_PROTECT_P (flags)) {
+ skip = i = 0;
+ do {
+@@ -486,6 +479,13 @@
+ continue;
+ }
+
++ if (S_ISDIR (sb.st_mode)) {
++ cleanupDirectory (ent->d_name, killTime, flags);
++ message (LOG_VERBOSE,
++ "(PID %u) Back from recursing down `%s'.\n",
++ (u_int) getpid(), ent->d_name);
++ }
++
+ /* Decide whether to remove the file or not */
+ /* check for mtime on directory instead of atime if requested */
+ if ( FLAGS_MTIME_P(flags) ||