From 8696c55b7271f36bee16c36be3b09fc52241e8f3 Mon Sep 17 00:00:00 2001 From: Charlie Shepherd Date: Tue, 5 Dec 2006 19:21:10 +0000 Subject: [PATCH] Actually apply the previous patch, big thanks again to Andy Lutomirski for providing an updated patch Package-Manager: portage-2.1.2_rc2-r2 --- app-admin/tmpreaper/ChangeLog | 7 ++- app-admin/tmpreaper/Manifest | 24 ++++---- .../files/tmpreaper-1.6.6-fix-protect.patch | 60 ++++++++++++------- app-admin/tmpreaper/tmpreaper-1.6.6-r1.ebuild | 4 +- 4 files changed, 59 insertions(+), 36 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 + 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 -tmpreaper-1.6.6.ebuild: diff --git a/app-admin/tmpreaper/Manifest b/app-admin/tmpreaper/Manifest index 7916614c1009..5325721bd692 100644 --- a/app-admin/tmpreaper/Manifest +++ b/app-admin/tmpreaper/Manifest @@ -1,21 +1,21 @@ -AUX tmpreaper-1.6.6-fix-protect.patch 849 RMD160 1cf05fc0776f751f16bc7405d6be091bef468a46 SHA1 2cd0fe1a607d7518b5aea2832e0629b0b380b585 SHA256 d946eb7ade853dc8bc994887f93c30a734740cc967e3a6bb937f0212bccf7180 -MD5 1c59256312919bbf2cd4a0d8f7f09f7e files/tmpreaper-1.6.6-fix-protect.patch 849 -RMD160 1cf05fc0776f751f16bc7405d6be091bef468a46 files/tmpreaper-1.6.6-fix-protect.patch 849 -SHA256 d946eb7ade853dc8bc994887f93c30a734740cc967e3a6bb937f0212bccf7180 files/tmpreaper-1.6.6-fix-protect.patch 849 +AUX tmpreaper-1.6.6-fix-protect.patch 1160 RMD160 87bc50a61fa1af497f11eafeb99035a728e506eb SHA1 55982dd9d20f01338db4630af773cf69f5bab657 SHA256 5cc25c0b7b9ecc4f67bb6b0b96d9ae2b93628429b394ab8c02bd531f27a9f7fd +MD5 67298a9c0bc5309a3c075ca7dad87421 files/tmpreaper-1.6.6-fix-protect.patch 1160 +RMD160 87bc50a61fa1af497f11eafeb99035a728e506eb files/tmpreaper-1.6.6-fix-protect.patch 1160 +SHA256 5cc25c0b7b9ecc4f67bb6b0b96d9ae2b93628429b394ab8c02bd531f27a9f7fd files/tmpreaper-1.6.6-fix-protect.patch 1160 DIST tmpreaper_1.6.5.tar.gz 111249 RMD160 57e4a3470a278e845f1e122eeeb54de288e3a3e7 SHA1 ddb7ae284afec12d16534582033e4738182c723d SHA256 bda75aa235f9de8557a26210e078faeae95fcfbb603b254d7b3f47295ab503e0 DIST tmpreaper_1.6.6.tar.gz 119219 RMD160 f3979b4506e18e4029fa03420f74be885d4175ec SHA1 23df41ada80658602492604c27c790102e0fa356 SHA256 c0b16e0b123b2ec965047ad94ba7430330aae4e1d017105f9151a4c11d4e5202 EBUILD tmpreaper-1.6.5.ebuild 671 RMD160 bef47808068b9a6bcae9745fca0deeb775f625ba SHA1 7f4fbd1b422d5ffa4d68195489a8e33fcaeea3ba SHA256 8af934bcf0b7c8e5a73abe4f947f1fe48d822e111969ba5c07be004a34a2a5c6 MD5 cc40aea07d831af91de84c6799d122fc tmpreaper-1.6.5.ebuild 671 RMD160 bef47808068b9a6bcae9745fca0deeb775f625ba tmpreaper-1.6.5.ebuild 671 SHA256 8af934bcf0b7c8e5a73abe4f947f1fe48d822e111969ba5c07be004a34a2a5c6 tmpreaper-1.6.5.ebuild 671 -EBUILD tmpreaper-1.6.6-r1.ebuild 762 RMD160 07f9cab4bb0ad5b1baf03b3c352ca3027516e8e6 SHA1 99b9dec3048e1b7e2fe3ee493f6cbe68c996cda3 SHA256 31a886fd9d8245147f70af9268297beb0a70a4b588ad53b6f43ce49a2684ff9f -MD5 00b32eda234ff7e5c5ce40b6e723becc tmpreaper-1.6.6-r1.ebuild 762 -RMD160 07f9cab4bb0ad5b1baf03b3c352ca3027516e8e6 tmpreaper-1.6.6-r1.ebuild 762 -SHA256 31a886fd9d8245147f70af9268297beb0a70a4b588ad53b6f43ce49a2684ff9f tmpreaper-1.6.6-r1.ebuild 762 -MISC ChangeLog 3172 RMD160 e7a25f1366da5ee2627278874f9e37840f5942fa SHA1 1e49c6217879b694e99d5e1fe2d8c936a75ead44 SHA256 c8d75570152af60142583cd765ac43c0bbeca21bdc46e07d28b67d38f5863e7b -MD5 ad31af0e964b23d85613de6305abe1a9 ChangeLog 3172 -RMD160 e7a25f1366da5ee2627278874f9e37840f5942fa ChangeLog 3172 -SHA256 c8d75570152af60142583cd765ac43c0bbeca21bdc46e07d28b67d38f5863e7b ChangeLog 3172 +EBUILD tmpreaper-1.6.6-r1.ebuild 778 RMD160 2ac4b4ca1a616acf582cfb909242dacbbc7ff4b9 SHA1 a5aa3edca7b23163dab69bdb07f2ca7256d5aedc SHA256 7215a92fa1199b6f64032326d48460252acdd467890efb416988e83d61cbae3e +MD5 2f8b97cb270ef1b7ea679b98e06bff17 tmpreaper-1.6.6-r1.ebuild 778 +RMD160 2ac4b4ca1a616acf582cfb909242dacbbc7ff4b9 tmpreaper-1.6.6-r1.ebuild 778 +SHA256 7215a92fa1199b6f64032326d48460252acdd467890efb416988e83d61cbae3e tmpreaper-1.6.6-r1.ebuild 778 +MISC ChangeLog 3408 RMD160 a928d752bdd7b69f0d3051d4e7b5f074e1999f82 SHA1 d97253af6003d49a8de44c4c83b795e9b29d7873 SHA256 74ac3c07cd8d78bf955595aaa61d1a54eca4e269b43a141b12d424cdb2ba4f60 +MD5 09bc39ad37bc98d995493ceed6060902 ChangeLog 3408 +RMD160 a928d752bdd7b69f0d3051d4e7b5f074e1999f82 ChangeLog 3408 +SHA256 74ac3c07cd8d78bf955595aaa61d1a54eca4e269b43a141b12d424cdb2ba4f60 ChangeLog 3408 MISC metadata.xml 254 RMD160 2a9e181efd140c3c1a2136376000c63f7459246d SHA1 2d72cad2ed2c3fce67f5ae575a00c3a3ee4e1604 SHA256 ddd8e09da8727f957651a073ae2b61e4a381ee69ab83c93a3077a653743b887f MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254 RMD160 2a9e181efd140c3c1a2136376000c63f7459246d metadata.xml 254 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" -- 2.26.2