sys-process/fcron: User src_prepare instead of src_unpack; indent input redirections; don't use ewarn for blank lines; use defualt src_ompile(); fix potential buffer overflow

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

5 files changed, 68 insertions, 51 deletions

diff --git a/sys-process/fcron/ChangeLog b/sys-process/fcron/ChangeLog
index 0fa75a3f6f3b..38954e47411d 100644
--- a/sys-process/fcron/ChangeLog
+++ b/sys-process/fcron/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/fcron
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.94 2012/08/29 17:48:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.95 2012/08/30 06:42:46 jlec Exp $
+
+  30 Aug 2012; Justin Lecher <jlec@gentoo.org> fcron-3.0.6-r3.ebuild,
+  +files/fcron-3.0.6-buffer-overflow.patch, metadata.xml:
+  User src_prepare instead of src_unpack; indent input redirections; don't use
+  ewarn for blank lines; use defualt src_ompile(); fix potential buffer
+  overflow
 
   29 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> fcron-3.0.6-r3.ebuild:
   Fix comment in pam.d file.
diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest
index 8f09ecc6f3ae..7d99ea73e840 100644
--- a/sys-process/fcron/Manifest
+++ b/sys-process/fcron/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX check_system_crontabs.fcron-config-file.patch 1740 SHA256 40ed92d5f2ea1468b705d624e6ff756eddda212cb8216d26fbf63ec7d50a2b86 SHA512 a4b36bc4e70018c6ddc7484692b11b0fc629be7c159d17f15d25e92e98450d007b0b5494f07797183f16629eaaa8513fad1184275189b726e4cca266a52c4571 WHIRLPOOL 7628fb092fa9dd8b8250a32a7e976899b88468921c8da1e82a93c31d62b1237632b01526ce7c9e66d141a1924d6ee3eb4f11e9a5e149f2440883bfefb496fff5
 AUX crontab 864 SHA256 ccb4bf3d5732f7f26fb9a7ae75e13e5e20603e8f1db8859cfa6ee4d4dcb9df45 SHA512 1446e401fd4578ff9c3cee1b2f923543915f24d301749e3e77a3847d9e34659d1ed39155abd9677bbbddb5ad9c33744e3d3a98042d996c7fde2c5dfa083cdeb5 WHIRLPOOL 9f01309184ccf51d72e9e99670b518844afc8af638b02cd228197398878800e9d370ab8ea7a8c4267a41d9cc1ce88bff26390070213bfb95e0d09c77b75f0a9f
 AUX fcron-3.0.5-gentoo.patch 1025 SHA256 9de8ebb711f371c5bf0a14063be5405d39658965c7b643ecdba7a63c482bbd60 SHA512 4aaa340de33cc935bb08282340e27ec1f72c48a4bc01563ddc19a763eb081161440b1ff31016a6f63a5391371398070d6be08252f02338e6a8b78b5503e166d1 WHIRLPOOL ace509071f25f567191c4c460c387064b7ac9e90b6655782b7ce46fb59416d5d44dea506b64407847437aaf71dfee3a169280adb12e263545364cbc2a0ec5c3a
+AUX fcron-3.0.6-buffer-overflow.patch 457 SHA256 8452d52d4447ecaeca37315dcfe7966f734a89ff9a106ff9ae870ea7158d0263 SHA512 d124f370419a622964702df5c3de0990ed0c88c8ff04c7143659ec32b34cfe981c8d7f8f062dc1787b9e0bbfd0052c8aa590887eb0dfcd6bcbd0fcb425251361 WHIRLPOOL 7b17fddc8ccc5a5ec55befd49fd1a49c1063e9fa34812a29079a698233b0bed1de4b3b1e74191ddc81540e6982caae12208e0c4dd417f87e98c32a27f39c0970
 AUX fcron.init.2 1562 SHA256 b8bd49ce367ed30e1f5d7f6eabfb8cbff14f1a7bc486f0816c53a64c2dc0ac6c SHA512 011ff7c3dc74b3df5729405f78ec5d948db0acfc809ab561bf176475a01de2ed229727da1962a6bab49d7ec8e95821bf3010ae0cd2891460beb1f5daa24d45f4 WHIRLPOOL 1757f7312463431e9837ea3ec2e7d9e40c058ab338d9d2c3524cba0650541b5de1686104dc6e5dbfc116dc2dd5975d81111351cb68d0077e407272671bb496a4
 AUX fcron.init.3 1371 SHA256 ceada7a1c9e8b62cff506bc94a1813706c7de1ed23daf9c3450ad549df4fafb7 SHA512 3ae8caea11c7e05d74e601d3f1a37d21d3f5fb8958c517a0e780db2cc0333601f8911892b5a700e2ea156960bcd6ee6afbe023553c72066fd908e06a33a89470 WHIRLPOOL 0a69a211edabc10859566208f37a2a8261d6f232ceab171081cbeeb8aab6d63fd78de6f21c9cfcd49819c410d98ac4fc7dbbd28157796ebfd5975f32c60186e8
 AUX fcrontab 332 SHA256 ab5c104248c51471d61e3312f52bf738d74ab3319b8c01cd0cc5c74458fb8fcc SHA512 1c6a8f0554dd4ffbdccc3ff75451e70508bc6fe5d5269f5d022301811457b76402b2bbffbdb1e39b847a48ea0537595858893357e0a46b7e0ba05351dcb9a27a WHIRLPOOL ede39398061d983adb3c4a01790132096e306561cd918f34d83ac35cd4e78eb31bf659d2cb58eda618d9e98146ae04a342178fda4e91cc9422dcdabdc869bcbf
@@ -11,17 +12,14 @@ AUX fcrontab.2 338 SHA256 542d735935b46561a92ea36ebf33a91dd11ddc01a8576202e24741
 DIST fcron-3.0.6.src.tar.gz 552805 SHA256 9c36b1bc6c931ec8b4ef55fef569ba17004b32f3ae0a72e3cc4ec4d15bee30a1 SHA512 53dfc2f57820392e4d32230d9abeaa3ec8a2c4aac6fc4888a266553806e7c31cecc655ff8cd5dbd635e40903cf649962e752e5ba6a5bd7728c79bc42771dfb99 WHIRLPOOL 49ba19f87f3190b0a04f75c48f6aaeea8572fc75ec9bc643a07817743c51ed3c23e2c606ee731d9b2994f04b9af4c8cce5ec0efdb20b5b0345b9acff519994b5
 EBUILD fcron-3.0.6-r1.ebuild 9343 SHA256 73535e9a331823d2dd57ab8e616e97adb62c65b9fdc162c88f51503f06bb53bc SHA512 7566c13b2599fb3a9d695334fa719b0222cf4733fcdb715bf85443f3762501399419556f3ac22db5e4a9a10cd0f41019e455286f2eda4cf09e71d3f93fc66836 WHIRLPOOL c278ffb973c35c1f0327e773f0edbf7f69093c25daecb8e97b87817f9f0a908082bfd2966db229c57e1173ebb786b299c5d9937aaee500cabcdb39d4cd5bbaab
 EBUILD fcron-3.0.6-r2.ebuild 9514 SHA256 75ee65e6671f624e5c5e08bd3f8c81484814db9ae409287704e6a956eb74d92c SHA512 8fe4c61f4837bd5d835b40adfb90a84c47ecaa07e652cb44cb0e8004cd532e66c88347018d04a35599f028ab85e467144e8502197abea19c1feb069b1c3a9eff WHIRLPOOL 8f0416db1156f17a9b709175bc8210e1e6c44678a291812e6e11c81b911f6458cfcfc6999ff944e8412220d39cd350058312aa9201c0a9103a4d9e9303ab993a
-EBUILD fcron-3.0.6-r3.ebuild 5600 SHA256 dee18f862b6d66ed8115d65c239e34eca28553853e449d1ed52767a46aa9d98a SHA512 e545084e2dd21ff99c3d1c0939314be5a5412ba32166137aadd3aa05f11af22c55acb20efafd983844745c10ab86c5c74b724ef601e127d4e47d9f23a9095245 WHIRLPOOL 8d8a74f0a2b15cd3fcd4a9f5e6984879ed410d80c1ebfbc8f597808b8b52445cbf3b9e90cc96487918ac767a9d7e597d1640f5eabe6096ac3c69efeb780483b9
-MISC ChangeLog 22005 SHA256 723c309202c6feec9cfed6a82210b2ef7266c41be2fa1f17e79811e074f19428 SHA512 6390c602f8f07c907e875bb571f5dd6953bf99314b1eb6faaea63658e42d5d156c1f82c9d30e663c0078a6b7b5594f8cd852a38c296ce7e89e6e1a8a43fc19c5 WHIRLPOOL 145a6e89e23b96f8052de9fedf44b29a5672b4050de9c09b016577cd3e753b1a4101ac8b27de391bc8cd923f69806f43ab531d37f5008ad0cce24d111ffb7f30
-MISC metadata.xml 1145 SHA256 fc17c178fee45cab1119feadafef9f53ea70ac7a9b07a7226ec973a1db20491c SHA512 4eb05c2e74d31926dd5586a1632dc2355d4708614fe9278c721ea081d24a981ab4694afb8c2709ee28b19be90b00b341b9dcbffd859256db9246dd95aefa9e35 WHIRLPOOL a00955c5c3907a4d33a0816e7b6d30722205a100d4e6165701a155f92f760ea19d36690e0f8931b0145096c4dd44c67521f52db33cbd79eac07110ba92e3feef
+EBUILD fcron-3.0.6-r3.ebuild 5621 SHA256 8cdaca6e115452faa85dc88317ad41e2af6dcd265c74948d1b162e0c1e99aeea SHA512 1c84a79b62e20eb454495e4e13904b59b1f89a42854ddf1d46b1a3991efe49f24ade0304bb4b66e1c00924d492bc5cb3e7449f7e09bb67b8b2a5f9e2cc20776c WHIRLPOOL c8bb070d7c4449747e679a9b2157f4ed5779766c3a9ebb19de32e90ab023359b734eb4b74b5b7f2ec54e2f04751f0f1b6de4c58119dfb7eba88dbece3e6c4589
+MISC ChangeLog 22291 SHA256 655e27e43b7b735fd52bdbe2bac14f17f38bb6ef1ba7e197fdb5b61579b7eee8 SHA512 947bbaa350bed50792fc6dd4647392a4ddc8adecd85ba1cd053f0be40985d21c64f78fddc2acb1a998603d9c7288b8e26e3b5bcd958e352ac7ac7b9b36f77f92 WHIRLPOOL bbb776a11d2f9b61ba21abc1d50092df2da650affdb9bcb063296a49d2a942fdb07c12b7fad667d6ecb44d316232532672b9b13450fc0876e7298a50d964deef
+MISC metadata.xml 1122 SHA256 87b044588d8d558ab7fa3390e9b096a8ed0c40bc4dcf0e9b76f3db404fe5cec7 SHA512 6937186a3fac4b18aef260c1c5363c569647e00a1eb0c40e267221206b38d6e047428fa60f895a87c5f988313462934de8855b93f8d86176209e135a34e868bb WHIRLPOOL 0a6db2fe057a1a734da7325ab56c2df2abca0ab0748957bc061cd7b2ee5eb39ef41993b71e0fc44b1887267df57fbaac51bf48052ff0cbe7563a1d2495e5a988
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQEcBAEBCAAGBQJQPlYYAAoJEBzRPIrUMBNCj0MIAIW5U9XChEPrYjzAf/pz68gd
-7MQ1p8NF6kOPClLpfCI86HkVpd4OfPa6XEojrPBUNVvFqsicGDfiLkRWufu/nSk0
-eKhlAXgc8/qOzPJzBVAO5jfS7DG1X0RzH2BME+XknDQ71o5HeANHUOQF/EUYxzUX
-KHkpnVph/Gj58SkciGaMnb/vD6RG11dH6hQEHq0ZE076bfNHqp6l47145owfCL8Z
-03Lt3dBSEAB8jTXce36OwhgJO2uHyl3Nyuqo/xwdCi2OyLk5CLnEABUbVHw5hluL
-lAPJiA6+uOF4Z8SRjXqLgV/AMPzjKm16ZE6ph8wGt3WUzhlKWDOJuPu+ScaVFwE=
-=G2Vd
+iEYEAREIAAYFAlA/C2wACgkQgAnW8HDreRbpqACfVwdRU8i9VSXf2v8IOLI/hDa9
+KNYAn39Xz6tJ5Owic3/I98YkB324TSI6
+=SLfU
 -----END PGP SIGNATURE-----
diff --git a/sys-process/fcron/fcron-3.0.6-r3.ebuild b/sys-process/fcron/fcron-3.0.6-r3.ebuild
index dded08a27119..c59483953ffb 100644
--- a/sys-process/fcron/fcron-3.0.6-r3.ebuild
+++ b/sys-process/fcron/fcron-3.0.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.6-r3.ebuild,v 1.2 2012/08/29 17:48:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.6-r3.ebuild,v 1.3 2012/08/30 06:42:46 jlec Exp $
 
 EAPI=4
 
@@ -35,9 +35,8 @@ pkg_setup() {
 	[[ ${rootgroup} ]] || rootgroup=root
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-buffer-overflow.patch
 
 	# respect LDFLAGS
 	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"
@@ -76,7 +75,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "make failed"
+	default
 
 	# bug #216460
 	sed -i \
@@ -135,17 +134,17 @@ src_install() {
 	fperms 0640 /etc/fcron/fcron.{allow,deny,conf}
 
 	pamd_mimic system-services fcron auth account session
-	cat - > "${T}"/fcrontab.pam <<EOF
-# Don't ask for the user's password; fcrontab will only allow to
-# change user if running as root.
-auth		sufficient		pam_permit.so
-
-# Still use the system-auth stack for account and session as the
-# sysadmin might have set up stuff properly, and also avoids
-# sidestepping limits (since fcrontab will run \$EDITOR).
-account		include			system-auth
-session		include			system-auth
-EOF
+	cat > "${T}"/fcrontab.pam <<- EOF
+	# Don't ask for the user's password; fcrontab will only allow to
+	# change user if running as root.
+	auth		sufficient		pam_permit.so
+
+	# Still use the system-auth stack for account and session as the
+	# sysadmin might have set up stuff properly, and also avoids
+	# sidestepping limits (since fcrontab will run \$EDITOR).
+	account		include			system-auth
+	session		include			system-auth
+	EOF
 	newpamd "${T}"/fcrontab.pam fcrontab
 
 	newinitd "${FILESDIR}"/fcron.init.3 fcron
@@ -170,9 +169,9 @@ pkg_postinst() {
 	elog "  emerge --config ${CATEGORY}/${PN}"
 	elog "to configure the proper settings."
 	if ! use system-crontab; then
-		ewarn ""
+		echo ""
 		ewarn "Remember that fcron will *not* use /etc/cron.d in this configuration"
-		ewarn ""
+		echo ""
 	fi
 }
 
@@ -192,11 +191,11 @@ pkg_config() {
 	else
 		elog "This is going to set up fcron to set up a default systab that"
 		elog "executes /etc/cron.{hourly,daily,weekly,monthly}."
-		fcrontab -u systab - <<EOF
-0  *  * * *      rm -f /var/spool/cron/lastrun/cron.hourly
-1  3  * * *      rm -f /var/spool/cron/lastrun/cron.daily
-15 4  * * 6      rm -f /var/spool/cron/lastrun/cron.weekly
-30 5  1 * *      rm -f /var/spool/cron/lastrun/cron.monthly
-EOF
+		fcrontab -u systab - <<- EOF
+		0  *  * * *      rm -f /var/spool/cron/lastrun/cron.hourly
+		1  3  * * *      rm -f /var/spool/cron/lastrun/cron.daily
+		15 4  * * 6      rm -f /var/spool/cron/lastrun/cron.weekly
+		30 5  1 * *      rm -f /var/spool/cron/lastrun/cron.monthly
+		EOF
 	fi
 }
diff --git a/sys-process/fcron/files/fcron-3.0.6-buffer-overflow.patch b/sys-process/fcron/files/fcron-3.0.6-buffer-overflow.patch
new file mode 100644
index 000000000000..75fb0c3337f4
--- /dev/null
+++ b/sys-process/fcron/files/fcron-3.0.6-buffer-overflow.patch
@@ -0,0 +1,16 @@
+ socket.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/socket.c b/socket.c
+index ef04ebe..2f7f4ac 100644
+--- a/socket.c
++++ b/socket.c
+@@ -272,7 +272,7 @@ auth_client(struct fcrondyn_cl *client)
+         len += (sizeof(FIELD_STR)-1); \
+     }
+ #define Add_field(FIELD_STR) \
+-    strncat(fields, FIELD_STR, sizeof(fields) - len); \
++    strncat(fields, FIELD_STR, sizeof(fields)-1 - len); \
+     len += (sizeof(FIELD_STR)-1);
+ 
+ void
diff --git a/sys-process/fcron/metadata.xml b/sys-process/fcron/metadata.xml
index 54be2f8daf41..18d7ea120602 100644
--- a/sys-process/fcron/metadata.xml
+++ b/sys-process/fcron/metadata.xml
@@ -1,34 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cron</herd>
-  <maintainer>
-    <email>wschlich@gentoo.org</email>
-    <name>Wolfram Schlich</name>
-    <description>Primary maintainer</description>
-  </maintainer>
-  <maintainer>
-    <email>flameeyes@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="debug">
+	<herd>cron</herd>
+	<maintainer>
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer>
+		<email>flameeyes@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="debug">
       Enable debug code and output. Since version 3.0.5 this will no
       longer force foreground execution, and fcron will be able to run
       as a service properly.
     </flag>
-
-    <flag name="pam">
+		<flag name="pam">
       Enable PAM support for fcron. This means that fcron will pass
       through the "fcron" stack before executing the jobs, and
       fcrontab will use the "fcrontab" stack to authenticate the user
       before editing its crontab file.
     </flag>
-
-    <flag name="system-crontab">
+		<flag name="system-crontab">
       Set up fcron to respect /etc/crontab and /etc/cron.d. If this
       flag is disabled, /etc/cron.d and /etc/crontab will be ignored,
       but /etc/cron.{hourly,daily,weekly,monthly} will still be
       respected.
     </flag>
-  </use>
+	</use>
 </pkgmetadata>