Actually apply the previous patch, big thanks again to Andy Lutomirski for providing an updated patch

(Portage version: 2.1.2_rc2-r2)

3 files changed, 47 insertions, 24 deletions

diff --git a/app-admin/tmpreaper/ChangeLog b/app-admin/tmpreaper/ChangeLog
index ad4d21c0dbd1..66a17e0e344f 100644
--- a/app-admin/tmpreaper/ChangeLog
+++ b/app-admin/tmpreaper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/tmpreaper
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpreaper/ChangeLog,v 1.11 2006/12/04 22:20:10 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpreaper/ChangeLog,v 1.12 2006/12/05 19:21:10 masterdriverz Exp $
+
+  05 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
+  files/tmpreaper-1.6.6-fix-protect.patch, tmpreaper-1.6.6-r1.ebuild:
+  Actually apply the previous patch, big thanks again to Andy Lutomirski for
+  providing an updated patch
 
   04 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
   -tmpreaper-1.6.6.ebuild:
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
index 8b114c1e237d..a76c80dd5fc7 100644
--- a/app-admin/tmpreaper/files/tmpreaper-1.6.6-fix-protect.patch
+++ b/app-admin/tmpreaper/files/tmpreaper-1.6.6-fix-protect.patch
@@ -1,30 +1,46 @@
---- 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 @@
+--- tmpreaper.c.orig	2006-12-05 10:55:58.000000000 -0800
++++ tmpreaper.c	2006-12-05 10:56:46.000000000 -0800
+@@ -467,6 +467,21 @@
  		    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);
++		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)) {
+                     char *dst;
+ 
+@@ -489,21 +504,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) ||
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.6-r1.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.6-r1.ebuild
index 3894e00c4165..7e81beb70f6b 100644
--- a/app-admin/tmpreaper/tmpreaper-1.6.6-r1.ebuild
+++ b/app-admin/tmpreaper/tmpreaper-1.6.6-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpreaper/tmpreaper-1.6.6-r1.ebuild,v 1.1 2006/12/04 22:13:07 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpreaper/tmpreaper-1.6.6-r1.ebuild,v 1.2 2006/12/05 19:21:10 masterdriverz Exp $
+
+inherit eutils
 
 DESCRIPTION="A utility for removing files based on when they were last accessed"
 HOMEPAGE="http://packages.debian.org/stable/admin/tmpreaper.html"