diff options
author | Christian Faulhammer <fauli@gentoo.org> | 2013-05-08 04:30:18 +0000 |
---|---|---|
committer | Christian Faulhammer <fauli@gentoo.org> | 2013-05-08 04:30:18 +0000 |
commit | 6a908a9c75cdbd961d8ce47e575858d3841d07b8 (patch) | |
tree | 41772fc10a8e93b0b928f1b6448afb9bccff304c /app-admin/tmpwatch | |
parent | clean up (diff) | |
download | historical-6a908a9c75cdbd961d8ce47e575858d3841d07b8.tar.gz historical-6a908a9c75cdbd961d8ce47e575858d3841d07b8.tar.bz2 historical-6a908a9c75cdbd961d8ce47e575858d3841d07b8.zip |
Make detection of boottime non-fatal and add user patch capability, see bug 468444 and bug 468882 by Christophe Perez
Package-Manager: portage-2.1.11.62/cvs/Linux i686
Manifest-Sign-Key: 0x2B859DE3
Diffstat (limited to 'app-admin/tmpwatch')
-rw-r--r-- | app-admin/tmpwatch/ChangeLog | 9 | ||||
-rw-r--r-- | app-admin/tmpwatch/Manifest | 10 | ||||
-rw-r--r-- | app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch | 30 | ||||
-rw-r--r-- | app-admin/tmpwatch/tmpwatch-2.11-r1.ebuild | 37 |
4 files changed, 81 insertions, 5 deletions
diff --git a/app-admin/tmpwatch/ChangeLog b/app-admin/tmpwatch/ChangeLog index 72cb59329e35..837eaaf21e81 100644 --- a/app-admin/tmpwatch/ChangeLog +++ b/app-admin/tmpwatch/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/tmpwatch # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/ChangeLog,v 1.111 2013/05/08 04:18:41 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/ChangeLog,v 1.112 2013/05/08 04:30:07 fauli Exp $ + +*tmpwatch-2.11-r1 (08 May 2013) + + 08 May 2013; Christian Faulhammer <fauli@gentoo.org> + +tmpwatch-2.11-r1.ebuild, +files/tmpwatch-2.11-boottime.patch: + Make detection of boottime non-fatal and add user patch capability, see bug + 468444 and bug 468882 by Christophe Perez 08 May 2013; Christian Faulhammer <fauli@gentoo.org> -tmpwatch-2.10.3.ebuild: clean up diff --git a/app-admin/tmpwatch/Manifest b/app-admin/tmpwatch/Manifest index 3475d95de925..773ea72e3dc0 100644 --- a/app-admin/tmpwatch/Manifest +++ b/app-admin/tmpwatch/Manifest @@ -1,17 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX tmpwatch-2.11-boottime.patch 1034 SHA256 5150b5d350213a6d3d4c5d747520077e5a1d7558c5f7174bacc138e72ec92d0a SHA512 6ad3cfe0dcd1a14d071ac64ca09279aae853c3b5a47604d99c2ff24319145d5c599ed6e780ac7eb9a2e2d185495e9d7e2133c905490b647f6b639a4bcd0def92 WHIRLPOOL 553353bb72b312aaebec9aa04b2211ec1e9340c41b08cde52caeb316861b39dc260bff3548d631e94a3c6c88fd5dff463ef3618994b6dd1c6865c01685daec22 AUX tmpwatch.cron 1653 SHA256 3f2c29b48d80fb4d46fda05f208d98e2d9ae6089dd2683d4fafd7fbad5cc02fc SHA512 b3b77b17295ff124041ce1114b3237fda7991c87feed2a649d0bd4c0a64e624d29ee4fdc1dab46dd38729eb1a9a9d512e0e2c934f7c425c3a17ca4668c601b5e WHIRLPOOL 474ae302c842332eca1442b9157447021b831d8c280dc05c0eb8219571d767a7bd2e435c02ac7401af161b0fe5fb9604f58fc24ad61ad194bac29815542f22c8 DIST tmpwatch-2.10.1.tar.bz2 140103 SHA256 d0fc8e76f32a7e596ef0e3db5a429f007a94e356a63ea342a130022e6295b446 SHA512 8e7bdb48a900058a31dac55f7590b0d6f280d06e511b015afb94a02a467f9b985497b458bac6ca7a48e57f0b728a497de814847af0bcdd7d7dc9762ae4c85063 WHIRLPOOL b472a95a9c772834b04b25b31a5f8c2f08ad7a350a7787c992381b9ea5f3fa22a2b98d283452333b7ae6be1612ef231b901a0e04e6caa38e42bd904a40f03ec8 DIST tmpwatch-2.11.tar.bz2 145609 SHA256 93168112b2515bc4c7117e8113b8d91e06b79550d2194d62a0c174fe6c2aa8d4 SHA512 9242c5e1812c2ffc756cfc4cdc3023d0c0515e7c180e58ca3a838aa075d09fe4dc08dbc9afbc87ce3382e8aa8cb80a70e406deeab4ce10b39b6845d667989d97 WHIRLPOOL 94d83c4a2b1c1a19ab88632c61de37903b709bc7fa88aff9f8ac4f4b71a26b8e6fbcb1564b3bce08ed5d1d0a78511c3470978a13211356f5fdf10b4d40f2de1c EBUILD tmpwatch-2.10.1.ebuild 797 SHA256 2271bb2faab2860d0ac3c0547d7ef15bffcffdc7a64f37b71a43b4f74578b88f SHA512 b625b42281a2d468eff26790cda5c700535ba1ce02ecf940bfb34732a3ee8fa2e9df5dde9b6a36b054346b8f28daa43d6c9fc5fd9315e486ca4e9346b21ad76d WHIRLPOOL a3b3216ac0fa5723fdd30fe7f7a15db2db32f8129a55e928228578277ec8cb34c9f79a51820aefdb8ad6c8a229bcca6a4a08cb1eb5e6a8e003fbb848836c7622 +EBUILD tmpwatch-2.11-r1.ebuild 962 SHA256 96ab2137709d0914259d5d85c3819e1a126c0186d6567c24d7b4d71f98a1ac8d SHA512 f1ef8b6cb4adcc2e021c4e09a02ac854df4a1a1b0f78d1374dd61fb97d70f87a7fbc3691dcb9a161f25d708c8e256af3297aecf93b92d1803afe006b56be06eb WHIRLPOOL e99bba0611f0f8fa22435f7031e892a99d661f696f89fdb2136830c246be16e9c2b688884be8dcc06a7198c9e0d202aac09847cced9e29405cecf2ba70e4987b EBUILD tmpwatch-2.11.ebuild 870 SHA256 3fecbe3d4f7d51bb21119b88d1b5dc847c847aa77f2c85db1ff62b134a8a40be SHA512 029450af1e46f31e2e113eca033425f283ae4839c1cfed6510b074cbc5f56ed1270c3c25dae69c7125851b48aee0858eaf4e820d2447636316d1577cf6a69449 WHIRLPOOL a8db180b16adbaa4893f59827f465eddcfd66a6937aa78c717252749858c6a0f343a58933d3cb23974b2b58b36838eaa6a8f69feeadb00da030abb24c9213ddd -MISC ChangeLog 12988 SHA256 d705d6d1e2030900865475ed1bc13e3ecf5d0ee490ccb5d8ee15281d57e2f994 SHA512 f524e1f9fa0823fe0c363cbc0328414e2cc9c9fbf85954899643961aba55649cfafdb45950300510d61cba14bbc8b03060aba6dece62d264a8985b2654fa3eb3 WHIRLPOOL 72c8041969a1d1ca423daebfb9e9e8b74f228682e18924e410f5b25302064e78356d891d74698152d813cc66c6794e881188fe49261e45ee00d8867ef45c781f +MISC ChangeLog 13264 SHA256 4671a864a14a0102988c4fad4b02ed97226dccb1f343be76be2dddd8c73738c4 SHA512 d55dcd1d53cbefe33313bff65dd3096040a222640eae2ed9d009e1622a7ebdc22accd4a07583898ca76e4361f97327b7122686a41f2adaa58d142c7b21d55426 WHIRLPOOL c99d4316d52e9b910a552b477cb0f7dcbe65a970122dd9b3c05ea11e25fbb8f78c335fc3c48bce88b5c562582094b879b8eeffd71d00a19f89b237cdca1c7cdf MISC metadata.xml 240 SHA256 26de3b9f5b4c98c7d97ab9ed444c451d228e25472e694ff1d6fcb508b28a5607 SHA512 c46f313a188c6a88cc3f96432afb69887b226cf55da7ffb0a889f9e3ce646ff5dd9393684c93097c56d58698e0f1a616baa6bceb6a695a60e5febe65c1dfd74a WHIRLPOOL cbc233d287209d178c41d658bdf2b013fc23430f20c17ed9c5ac67878f72f260e0363e74ee734df317763b2fb1137cdbdea3a58cbc3503e182fa56637169b09e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlGJ0iIACgkQNQqtfCuFneO0vwCffZ/EUjnNUbZBvIhWGlGZCO7+ -1mIAniVrw2efQDTEtVEcc4gGnHxWlLzm -=TE17 +iEYEAREIAAYFAlGJ1NAACgkQNQqtfCuFnePkvwCfYytCdZ/QFlXK3F39kvXqbnDQ +Kj0AnRdaw4KeBOAQeYiGNb/gJvkhrJ1K +=0s4H -----END PGP SIGNATURE----- diff --git a/app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch b/app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch new file mode 100644 index 000000000000..b622c8d70e70 --- /dev/null +++ b/app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch @@ -0,0 +1,30 @@ +Make boot time detection failures non-fatal. Taken from PLD Linux + +Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=468444 +PLD bug: https://bugs.launchpad.net/pld-linux/+bug/1034364 +Patch: https://github.com/pld-linux/tmpwatch/blob/master/tmpwatch-boottime.patch + +--- tmpwatch-2.11/tmpwatch.c~ ++++ tmpwatch-2.11/tmpwatch.c +@@ -666,9 +666,11 @@ + time_t boot_time; + + if (clock_gettime(CLOCK_REALTIME, &real_clock) != 0 +- || clock_gettime(CLOCK_BOOTTIME, &boot_clock) != 0) +- message(LOG_FATAL, "Error determining boot time: %s\n", ++ || clock_gettime(CLOCK_BOOTTIME, &boot_clock) != 0) { ++ message(LOG_DEBUG, "Error determining boot time: %s\n", + strerror(errno)); ++ socket_kill_time = 0; /* Never remove sockets */ ++ } else { + boot_time = real_clock.tv_sec - boot_clock.tv_sec; + if (real_clock.tv_nsec < boot_clock.tv_nsec) + boot_time--; +@@ -677,6 +679,7 @@ + boot_time -= 2; + + socket_kill_time = boot_time - grace_seconds; ++ } + #else + socket_kill_time = 0; /* Never remove sockets */ + #endif diff --git a/app-admin/tmpwatch/tmpwatch-2.11-r1.ebuild b/app-admin/tmpwatch/tmpwatch-2.11-r1.ebuild new file mode 100644 index 000000000000..d364c7e09b6d --- /dev/null +++ b/app-admin/tmpwatch/tmpwatch-2.11-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/tmpwatch-2.11-r1.ebuild,v 1.1 2013/05/08 04:30:07 fauli Exp $ + +EAPI=5 + +inherit toolchain-funcs eutils + +DESCRIPTION="Files which haven't been accessed in a given period of time are removed from specified directories" +HOMEPAGE="https://fedorahosted.org/tmpwatch/" +SRC_URI="https://fedorahosted.org/releases/t/m/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="selinux" + +RDEPEND="selinux? ( sec-policy/selinux-tmpreaper )" +DEPEND="${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}/${P}-boottime.patch" + epatch_user +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + dosbin tmpwatch || die + doman tmpwatch.8 || die + dodoc ChangeLog NEWS README AUTHORS || die + + exeinto /etc/cron.daily + newexe "${FILESDIR}/${PN}.cron" "${PN}" || die +} |