Version bump

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

5 files changed, 239 insertions, 3 deletions

diff --git a/app-laptop/prey/ChangeLog b/app-laptop/prey/ChangeLog
index 5eaf4ac040aa..2b4548383c52 100644
--- a/app-laptop/prey/ChangeLog
+++ b/app-laptop/prey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/prey
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/prey/ChangeLog,v 1.4 2012/06/01 00:22:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/prey/ChangeLog,v 1.5 2012/07/19 21:42:45 hwoarang Exp $
+
+*prey-0.5.4 (19 Jul 2012)
+
+  19 Jul 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/prey-0.5.4-cron-functions.patch, +files/prey-0.5.4-gtk-ui.patch,
+  +prey-0.5.4.ebuild:
+  Version bump
 
   01 Jun 2012; Zac Medico <zmedico@gentoo.org> prey-0.5.3.ebuild:
   inherit user for enewgroup
@@ -18,4 +25,3 @@
   +files/prey.cron, +files/prey-cron-functions.patch, +metadata.xml:
   Initial commit. Thanks to Travis Hansen <travisghansen@yahoo.com> and Thomas
   Kear <thomas.kear@gmail.com> for the ebuilds. Bug #305813
-
diff --git a/app-laptop/prey/Manifest b/app-laptop/prey/Manifest
index 131716a74ebe..64a5fcb4c5ec 100644
--- a/app-laptop/prey/Manifest
+++ b/app-laptop/prey/Manifest
@@ -1,8 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX prey-0.5.3-gtk-ui.patch 1179 SHA256 e6272e6999cb939c7a539633916691448344da7fd43d0fe106cf697259e66fc1 SHA512 97b831dbb20b9325f9702336d924a112af175c22ac0b95da6dca38e0ec00cb8bf9c06d08ac12713c50f2d29b138853adc905b9e9b4a4c623c98cb29c9cbf8769 WHIRLPOOL fbef7b8feecfdc96155ef9b281dc73db63c52a4004047c2e0db3cabbe4a66b999a8784bfd382acabf45eb89ae62ed32dda1dc6b182e49a7d9c55087f4d0776c1
 AUX prey-0.5.3-mplayer-support.patch 1502 SHA256 e36f42783d7d17e73038dbb09b29812d272ecb2cf2d89e5848078d949d5e8245 SHA512 3e9336e97de31f39cfb6d36bfb6dd211ab87906e9c8cf4e1ced3a866244001fb362de728863858c04e4feaddb641a5ed5c82268ebee9f100904c1a4838b07b45 WHIRLPOOL 8dfdc365e12249e00c47174304419aef96e1b130589b9e027619be5a894ae160fab6aa32405b942eec598c887b40ccd48ac1481ec87aef00bc701a1dc1370a31
+AUX prey-0.5.4-cron-functions.patch 1092 SHA256 095373878d722e8aba7aaa9458d291bf1b4989171123eb18988f88a15b4ba91b SHA512 8329c8b9724f27bfa2380bb1e3145c59676bea8a063ac113de8638c8398ba8f4c5e737f9db033e048206e7943e7d39e8e7879f604b14a2a66c1d49f99bf6320c WHIRLPOOL 321ccad74b726609cbcd9f20ed44528fee4c373552112e1e683672cc88e4120f37c8b19f02987f27a497f2aebfe9604dcfef5b8fd23b0259bf1998871d7c1ca0
+AUX prey-0.5.4-gtk-ui.patch 802 SHA256 ab92a66af6d0c3fa7f3512a2467229d7e1a5c805e465fcbf368087dddd347a7c SHA512 4f134a7dda86215550e427f0c22fdac2a34a834f49f1d32778ade3a3a2b233c065f5c8c48ed23b5d1252dd2c21eb92be29ec09ad0d0a5bc479e975200f5532a1 WHIRLPOOL 6d14cd2b7cbead62b0ba9bbfe12f7e138fd59dc59e323d480f50b82472d909ac105eccc91647903bd52c400681d2e8bfa91b651f0ebb7a7f0ebc63719288bf5b
 AUX prey-cron-functions.patch 1118 SHA256 365841680a0351621970a1ca1466c33e470146b3527eb0246990c7b0c3cabd7b SHA512 42760fafa45912d7efa2795d8c3fdd429a2338020994999611d0a9bdcb058ffb26165980df6cd7d17b8e92c25f50bd43e6f37668a984de8d374fe3273c1f1d49 WHIRLPOOL dac579f2f8cd0ccd90ee904fa2a65ab63ddb03086ab4c57d753f071ac1497715974ad0686e025e747d108532271485c9fa4073a2f6fb4e022b4763a911675cdd
 AUX prey.cron 40 SHA256 db734b149b34c68bb28894d01b0fd4d189cc86aca8cacffddfa9059f44d1413c SHA512 2b2e22934428b541e0b2abb0e4838ef2d18f5c44bb61c1aef1e24b83e07bf7dd4e99a3c6e5f4291bc64e089af3dc01cd6fa1c9c3b5851af32b0a0b37e03418f7 WHIRLPOOL 43e10cacb567fb42bc89d3a5d90d005252bdfc836049efa213ec6c44cc75e0672e944d009d349246bcfdb188d76e0a164466afb33601012469ef363945f54550
 DIST prey-0.5.3-linux.zip 639364 SHA256 fdeed1987d30b4ca585e19ac9884194bc8a108bd56112d2913206fc85be3bd9b SHA512 ee64e00435a805503eee0c879eb4440b4ddf12e9a0a8d6ae53bf4b009ddf3e571ad51e5b17b691f08782c4b53a28bd75c76158ce4f033febc590b31cfd2f9d0b WHIRLPOOL 0779de7936ca3ab97b689a0f037208dcbe723556ce11049da796dec36c96310079beb882155012ed6bbafb12660d7633e2b46eb32f466baec376deac7b74db80
+DIST prey-0.5.4-linux.zip 646891 SHA256 5d0f6f3e3a48dc5668ff82de55e202e5c28b3fab1f4d71dd55c22b8565583d7e SHA512 15e13b08dd786b3fddf39f8d0e02ceb0e2503be09ea3abde9cfc6431fb2c8388c077f2960dd82d9fb2119929274f2f57e70f642cd8cf3c6e6d76af9701c56724 WHIRLPOOL 3d7e10cfb5926a7f6a5a46c638bb859e6b4b2decb49a979f39573e8f4d2a9c66904e595c144dc4039018d567cd3810f69ef31658018ab3e2dd167ee8bcbbd114
 EBUILD prey-0.5.3.ebuild 4311 SHA256 9f643ac859a95176004ee24ce1496ab30d6f565eeae4cf9cea2cdb3470abf181 SHA512 52fe131474e928b20c9085e83bc76b02897d282c196bd09035f40a56e268baa908f43a993474822002de8ad4f6b0b1a0608d1fddafe18c61b7702b2b1311cd5f WHIRLPOOL eac215524b074eda52feacb65a68a18d07f320ac324274b0b1ce66dcce5b41d7eded4c4bd9ac0f6081dce492049b9c63abe901642937296f308d2ad8cb2f469b
-MISC ChangeLog 976 SHA256 0873dcd8bae483f643e33d9b9d51e74f771d7599450e24f7dc5834ab121bf24f SHA512 569cacfb3ef0b35eed13820416d095ca27082dadc4ae32f8288c5816c7f026f2d04e00e694e5ab7db999b3f74ffc628c7cd8a9238b6bd7f83a2daae4f8d9a951 WHIRLPOOL d2f1e25649775903f446972f964b7cf18539e101e826d27acefe0affdc46ab41c32a9fcce96dc1e47c094b0e742e2c7de32870b32e78337078bd90e8fd38c815
+EBUILD prey-0.5.4.ebuild 4318 SHA256 2c071dda7b8578c52c4fb5f9be069d306019f6a01fa7096246bf9db8c50d9620 SHA512 9760fabf766b830fa9ac871c7159219357b8d83501efb0af2031deb6267a18104a3f3f068fab8b148fb3e21d3e3cc669c9fe3a30cd21819d08ec6dd4e1d127f6 WHIRLPOOL a661eadce1846992b33bdb83b2b84889113c41d733ef08c0ae68f983893c4fdd78742a3db7d2c03e1e8e4b0857748f0d193a7d27eaa8e27dd6de19af779cb249
+MISC ChangeLog 1168 SHA256 8367a370d2a44899714cd42ced5e94bbe36ce758a7d7fad93e3eb0d78a0c6c3d SHA512 670f1651c40fb5aa1aa731ad388e33182b21b19780923f0ad4d0cad2bc98b9bcb249cda511b547cd32d4567438b68cb34a7961f71e0ecf36345f2b7ca735b3ba WHIRLPOOL 4a6a753f126fbda55f1df0988d2d3f938352fb3c37bd861c4fc6443479b210a99484dc35907c8f9ee758278c3bcc670836f96f743142f82fd0590397199bbd24
 MISC metadata.xml 1344 SHA256 f0667b7a0b0ca396e48f0d1a2522361db5b795ef756c5c5f2362e4ef0c213085 SHA512 03ad661f2916fe01a1f735b8787b0e259cda9ba02d29a8e12777d40e59ce97e4d371ed6a2e2012b3f4187b6a4837f55ffcd5384605abbe21c77b69aed129fe4e WHIRLPOOL 97e37430740f5dc4629e0ba7f571fa8e7eb2cd276114dc0519a9065be6d448e69f806d88a9aab5614dc53e8802b2c8cb5170ea5ba2d804ae4af88f60d92daf40
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQCH9aAAoJEPqDWhW0r/LCoP4P/ibCxa4atrnPBoVQ2yiuVcCh
+ulzr2q3b3csoUGo0kIko98c6oddhf47P8DcUiPDmdmxIbtne2H60fZkzpmC5xIDM
+RJvKeInqbucaUs7smDPtOHg/rF4EMU/uF7j1eX8KHVO0pCO9zIBt/igeFnMEFFUC
+tREHeWrOiQjce44iaSiNBldzVWm0CzAWbot2I6brsdk+UazwqVEjh6YSsjuOYiMY
+Tq6/Q69t7OZfTURyOa/mFSxiZ4CzPpqtgGiKyMODI0cIbEsuAx4B9HaEkAmOIZ2U
+bcrKj2OK4sP7lC4tzJE9bVmST4mf2Yx1ylJE68Xzl9AGMlimnqw2LAi/9jRlC0tK
+i1032zQDwbVxljVlX2zUMmB6HM3F31nJDQiQQPu2z3Q7rL00Zi/ETZ53vz3sXIfb
+GD2+CmKy9dvpWo3HR7/84tPm+h81HJghTC2BMUa3wStb7DPA0y1q2fOs6A2ruSAi
+26cR4khvEZPb2ktfd9S1OqC5CYF60CHQm7PVzYFI45QrO5A1TpUGbjL1wJyqDrot
+szd5/xUikKENJXyvxtqu4UJ5GJoOeu6smNeX860eXmXuHUJKtT2PtR5IWaWteKAE
+hMuXg4Qa44QCnvNMlXE/pPPI0kG7axzxIsRUQQ3jbVzqkpxYHjMszHyth9n3M4jq
+dKpLlflUGH55ffggvYm2
+=143m
+-----END PGP SIGNATURE-----
diff --git a/app-laptop/prey/files/prey-0.5.4-cron-functions.patch b/app-laptop/prey/files/prey-0.5.4-cron-functions.patch
new file mode 100644
index 000000000000..963b685292c7
--- /dev/null
+++ b/app-laptop/prey/files/prey-0.5.4-cron-functions.patch
@@ -0,0 +1,28 @@
+Index: prey/core/functions
+===================================================================
+--- prey.orig/core/functions
++++ prey/core/functions
+@@ -194,12 +194,12 @@ get_delay_for(){
+ 
+ get_current_delay(){
+ 	# crontab -l | grep prey | sed "s/^..\([0-9]*\).*/\1/"
+-	crontab -l 2> /dev/null | grep prey | head -1 | sed 's/ \/.*//'
++	sed -i 's/ \/.*//' /etc/cron.d/prey.cron
+ }
+ 
+ update_execution_delay(){
+ 	local full_path=$(full_path "$base_path")
+-	(crontab -l 2> /dev/null | grep -v prey; echo "${1}" "${full_path}/prey.sh > /var/log/prey.log 2>&1") | crontab -
++	echo "${new_delay}" "/usr/bin/prey.sh > /var/log/prey.log" > /etc/cron.d/prey.cron
+ }
+ 
+ # if device is missing we'll make sure the current delay matches the one
+@@ -273,7 +273,7 @@ verify_installation(){
+ 		log " !! Cron daemon not found! Try running it with 'sudo /etc/init.d/cron start'."
+ 	fi
+ 	log " -- Checking for crontab entry..."
+-	local result=`crontab -l | grep 'prey.sh' | wc -l 2> /dev/null`
++	local result=`wc -l /etc/cron.d/prey.cron 2> /dev/null`
+ 	if [ "$result" -gt 0 ]; then
+ 		log " -- Found!"
+ 	else
diff --git a/app-laptop/prey/files/prey-0.5.4-gtk-ui.patch b/app-laptop/prey/files/prey-0.5.4-gtk-ui.patch
new file mode 100644
index 000000000000..6a50a4e0426e
--- /dev/null
+++ b/app-laptop/prey/files/prey-0.5.4-gtk-ui.patch
@@ -0,0 +1,22 @@
+Index: prey/platform/linux/prey-config.py
+===================================================================
+--- prey.orig/platform/linux/prey-config.py
++++ prey/platform/linux/prey-config.py
+@@ -23,7 +23,7 @@ import base64
+ 
+ app_name = 'prey-config'
+ lang_path = 'lang'
+-script_path = os.sys.path[0]
++script_path = '/usr/share/prey/platform/linux/'
+ 
+ ################################################
+ # gettext localization
+@@ -42,7 +42,7 @@ _ = gettext.gettext
+ ################################################
+ 
+ PREY_PATH = '/usr/share/prey'
+-PREY_CONFIG_FILE = PREY_PATH + '/config'
++PREY_CONFIG_FILE = '/etc/config'
+ PREY_COMMAND = PREY_PATH + '/prey.sh > /var/log/prey.log 2>&1'
+ CONTROL_PANEL_URL = 'http://control.preyproject.com'
+ CONTROL_PANEL_URL_SSL = 'https://control.preyproject.com'
diff --git a/app-laptop/prey/prey-0.5.4.ebuild b/app-laptop/prey/prey-0.5.4.ebuild
new file mode 100644
index 000000000000..3c9bf470c6cd
--- /dev/null
+++ b/app-laptop/prey/prey-0.5.4.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/prey/prey-0.5.4.ebuild,v 1.1 2012/07/19 21:42:45 hwoarang Exp $
+
+EAPI=4
+
+inherit eutils user
+
+DESCRIPTION="Tracking software for asset recovery"
+HOMEPAGE="http://preyproject.com/"
+SRC_URI="http://preyproject.com/releases/${PV}/${P}-linux.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk userpriv"
+
+LINGUAS="en it sv es"
+for x in ${LINGUAS}; do
+	IUSE="${IUSE} linguas_${x}"
+done
+
+MODULES="+alarm +alert +geo lock +network secure +session webcam"
+IUSE="${IUSE} ${MODULES}"
+
+DEPEND=""
+#TODO: some of these deps may be dependent on USE
+RDEPEND="${DEPEND}
+	app-shells/bash
+	virtual/cron
+	|| ( net-misc/curl net-misc/wget )
+	dev-perl/IO-Socket-SSL
+	dev-perl/Net-SSLeay
+	sys-apps/net-tools
+	alarm? ( media-sound/mpg123
+			 media-sound/pulseaudio
+		   )
+	alert? ( || ( ( gnome-extra/zenity ) ( kde-base/kdialog ) ) )
+	gtk? ( dev-python/pygtk )
+	lock? ( dev-python/pygtk )
+	network? ( net-analyzer/traceroute )
+	session? ( sys-apps/iproute2
+			   || ( media-gfx/scrot media-gfx/imagemagick )
+			 )
+	webcam? ( || ( ( media-video/mplayer[encode,jpeg,v4l] ) ( media-tv/xawtv ) ) )"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	if use userpriv; then
+		enewgroup ${PN}
+	fi
+	if use gtk; then
+		ewarn "You have the 'gtk' useflag enabled"
+		ewarn "This means that the ${PN} configuration"
+		ewarn "will be accessible via a graphical user"
+		ewarn "interface. This may allow the thief to alter"
+		ewarn "or disable the ${PN} functionality"
+	fi
+
+	# remove system module since it depends on hal and we don't
+	# have hal in portage anymore
+	rm -rf "${S}"/modules/system || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cron-functions.patch \
+		"${FILESDIR}"/${P}-gtk-ui.patch \
+		"${FILESDIR}"/${PN}-0.5.3-mplayer-support.patch
+	sed -i -e 's,readonly base_path=`dirname "$0"`,readonly \
+		base_path="/usr/share/prey",' \
+		"${S}"/prey.sh || die
+}
+
+src_install() {
+	# Remove config app if -gtk
+	if use gtk; then
+		# fix the path
+		doicon "${S}"/pixmaps/${PN}.png
+		newbin "${S}"/platform/linux/${PN}-config.py ${PN}-config
+		make_desktop_entry ${PN}-config "Prey Configuration" ${PN} \
+			"System;Monitor"
+	else
+		rm -f "${S}"/platform/linux/prey-config.py || die
+	fi
+
+	# clear out unneeded language files
+	for lang in ${LINGUAS}; do
+		use "linguas_${lang}" || rm -f lang/${lang} modules/*/lang/${lang}
+	done
+
+	# Core files
+	insinto /usr/share/prey
+	doins -r "${S}"/core "${S}"/lang "${S}"/pixmaps "${S}"/platform "${S}"/version
+
+	# Main script
+	newbin ${PN}.sh ${PN}
+
+	# Put the configuration file into /etc, strict perms, symlink
+	insinto /etc/prey
+	newins config ${PN}.conf
+	# some scripts require /usr/share/prey/config file to be present
+	# so symlink it to prey.conf
+	dosym /etc/${PN}/${PN}.conf /usr/share/${PN}/config
+	use userpriv && { fowners root:${PN} /etc/prey ; }
+	fperms 770 /etc/prey
+	use userpriv && { fowners root:${PN} /etc/prey/prey.conf ; }
+	fperms 660 /etc/prey/prey.conf
+
+	# Add cron.d script
+	insinto /etc/cron.d
+	doins "${FILESDIR}/prey.cron"
+	use userpriv && { fowners root:${PN} /etc/cron.d/prey.cron ; }
+	fperms 660 /etc/cron.d/prey.cron
+
+	dodoc README
+
+	# modules
+	cd "${S}"/modules
+	for mod in *
+	do
+		use ${mod} || continue
+
+		# move config, if present, to /etc/prey
+		if [ -f $mod/config ]
+		then
+			insinto "/etc/prey"
+			newins "$mod/config" "mod-$mod.conf"
+			use userpriv && { fowners root:${PN} "/etc/${PN}/mod-$mod.conf" ; }
+			fperms 660 "/etc/${PN}/mod-$mod.conf"
+			# Rest of the module in its expected location
+			insinto /usr/share/prey/modules
+			doins -r "$mod"
+			if [[ $mod == "lock" ]]; then
+				fperms 555 \
+					"/usr/share/${PN}/modules/lock/platform/linux/${PN}-lock"
+			fi
+		fi
+	done
+
+}
+pkg_postinst () {
+	elog "--Configuration--"
+	elog "Make sure you follow the next steps before running prey for the"
+	elog "first time"
+	if use userpriv; then
+		elog "- Add your user to ${PN} group using"
+		elog "gpasswd -a <your_user> ${PN}"
+	else
+		elog "You don't seem to have 'userpriv' enabled so"
+		elog "${PN} configuration is only accessible as root"
+	fi
+	elog "- Create an account on http://preyproject.com/"
+	elog "- Modify the core and module configuration in /etc/prey"
+	elog "- Uncomment the line in /etc/cron.d/prey.cron"
+}