From 9ddff809333f05403aa96ce9df7d93303758b142 Mon Sep 17 00:00:00 2001 From: "Sven Schwyn (svoop)" Date: Sun, 15 Feb 2009 15:16:27 +0000 Subject: app-misc/heyu: Version bump and various - including security relevant - improvements, thanks to Tommy. svn path=/sunrise/; revision=7928 --- app-misc/heyu/ChangeLog | 8 +++- app-misc/heyu/Manifest | 8 ++-- app-misc/heyu/files/2.4.0/heyu.init | 24 ----------- app-misc/heyu/files/2.5.0/heyu.init | 22 +++++++++++ app-misc/heyu/heyu-2.4.0.ebuild | 70 -------------------------------- app-misc/heyu/heyu-2.5.0.ebuild | 79 +++++++++++++++++++++++++++++++++++++ 6 files changed, 112 insertions(+), 99 deletions(-) delete mode 100644 app-misc/heyu/files/2.4.0/heyu.init create mode 100644 app-misc/heyu/files/2.5.0/heyu.init delete mode 100644 app-misc/heyu/heyu-2.4.0.ebuild create mode 100644 app-misc/heyu/heyu-2.5.0.ebuild (limited to 'app-misc/heyu') diff --git a/app-misc/heyu/ChangeLog b/app-misc/heyu/ChangeLog index 31de4f206..02321e264 100644 --- a/app-misc/heyu/ChangeLog +++ b/app-misc/heyu/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for app-misc/heyu -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 15 Feb 2009; Sven Schwyn (svoop) -files/2.4.0, + -heyu-2.4.0.ebuild, -files/2.4.0/heyu.init, +heyu-2.5.0.ebuild, + +files/2.5.0, +files/2.5.0/heyu.init: + Version bump and various - including security relevant - improvements, + thanks to Tommy. + 12 Dec 2008; Thomas Sachau (Tommy[D]) -files/2.3.2, -files/2.3.2/heyu.init: Drop old files too diff --git a/app-misc/heyu/Manifest b/app-misc/heyu/Manifest index 5b74b3bb8..02ee7afc9 100644 --- a/app-misc/heyu/Manifest +++ b/app-misc/heyu/Manifest @@ -1,5 +1,5 @@ -AUX 2.4.0/heyu.init 386 RMD160 4d085a00c988fda52ec946913747c9b8f3036197 SHA1 c52f45f09834c6f43a58f2f97c2bdd5a4919980c SHA256 9a3a17980dd2722406de0a13bcb497f9b074c0e3566c607168fa3f8b72770e3a -DIST heyu-2.4.0.tgz 487725 RMD160 e58e18fff4f59506cc9da46ad701273c5924176b SHA1 33c85b2653536e36244b1a093f8c2a96714e4540 SHA256 7a02c9774d9445bf9f5834b248a8aaffdb3f7a3791212845aa4ffbbebbd46bdc -EBUILD heyu-2.4.0.ebuild 2463 RMD160 b822fff5663bf8ba0f3185bb9b5746195ae8c896 SHA1 26bd96d225de57d4196cacc9644be1d343eafa73 SHA256 e24baa26cd6d36b6503b911ab16640941f5e0bb1f1b6fdce4494ecc3699cda7f -MISC ChangeLog 1003 RMD160 296dadda6bfb1a3107afb276b88c94ce6454a4da SHA1 01e7c99327dd5c66e356e68d9486ca004dd61ac0 SHA256 62ef5b305a3c888b0eae50532b2e2f24339512fc58a94f795c2243683d94a04f +AUX 2.5.0/heyu.init 423 RMD160 96dd75247188abdb8847807863c1cf2952c54279 SHA1 aac324ffc55a7ec20055ce5af6340372a892b853 SHA256 aee16c73a380015858137f7bbc0f1944727ddd82403bc7b2734d291855d0a9a9 +DIST heyu-2.5.0.tgz 502270 RMD160 663728c0909b7295f7dbb31ae7df7496ba31ff50 SHA1 9fdbb33bc2fd278eda17d05050331750dad6d914 SHA256 9ca31fc340b42c693821534bbeee04665becdf483f69bfde67662da3d4f16c99 +EBUILD heyu-2.5.0.ebuild 3297 RMD160 4a3670d523d6bcf6709153676687e3d1a79dcf34 SHA1 a914a0743add7de8c1af63558d398116434ea57f SHA256 2dc4e6953cc14f7db9177ec3b3b4344442d17785081c2efa80c9df9527826bfa +MISC ChangeLog 1274 RMD160 a0ad1cacc09511a2835d47931c35ec120ac432a5 SHA1 c086b9e501e583a870ffd7dc571f7419b83ad06b SHA256 d78f2a5bbf87974e6c96d924eb1850cda513bc99c46be5bb471cc1d43b3c8134 MISC metadata.xml 1225 RMD160 9cc4a306989b21aadc2c46cbe77b49d94f5f7531 SHA1 01b5d2dfc5446f495689a0d1a8357982464e54fb SHA256 9b9ac8546a69802b4de3818d06e98c4738485d6634fb6375f087cb1ae2853a07 diff --git a/app-misc/heyu/files/2.4.0/heyu.init b/app-misc/heyu/files/2.4.0/heyu.init deleted file mode 100644 index e8ff76e0d..000000000 --- a/app-misc/heyu/files/2.4.0/heyu.init +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -start() { - ebegin "Starting heyu" - mkdir /var/tmp/heyu 2>/dev/null - chmod a=rwx /var/tmp/heyu - /usr/bin/heyu start >/dev/null - eend $? -} - -stop() { - ebegin "Stopping heyu" - /usr/bin/heyu stop - eend $? -} - -restart() { - svc_stop - sleep 5 - svc_start -} diff --git a/app-misc/heyu/files/2.5.0/heyu.init b/app-misc/heyu/files/2.5.0/heyu.init new file mode 100644 index 000000000..93a66517d --- /dev/null +++ b/app-misc/heyu/files/2.5.0/heyu.init @@ -0,0 +1,22 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +start() { + ebegin "Starting heyu" + start-stop-daemon --start --quiet --exec /usr/bin/heyu --chuid heyu:heyu -- start >/dev/null + eend $? +} + +stop() { + ebegin "Stopping heyu" + start-stop-daemon --stop --quiet --exec /usr/bin/heyu + eend $? +} + +restart() { + svc_stop + sleep 5 + svc_start +} diff --git a/app-misc/heyu/heyu-2.4.0.ebuild b/app-misc/heyu/heyu-2.4.0.ebuild deleted file mode 100644 index aa3efd387..000000000 --- a/app-misc/heyu/heyu-2.4.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils toolchain-funcs - -DESCRIPTION="Utility to control and program CM11A, CM17A and CM12U X10 interfaces." -HOMEPAGE="http://heyu.tanj.com" -SRC_URI="http://heyu.tanj.com/download/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="kernel_Darwin kernel_FreeBSD kernel_linux cm17a dmx210 ext0 ore rfxm rfxs" - -src_compile() { - mv x10config.sample x10.conf.sample - ./Configure \ - $(if use kernel_FreeBSD; then echo "freebsd"; fi) \ - $(if use kernel_Darwin; then echo "darwin"; fi) \ - $(if use kernel_linux; then echo "linux"; fi) \ - $(if ! use cm17a; then echo "-nocm17a"; fi) \ - $(if ! use dmx210; then echo "-nodmx"; fi) \ - $(if ! use ext0; then echo "-noext0"; fi) \ - $(if ! use ore; then echo "-noore"; fi) \ - $(if ! use rfxm; then echo "-norfxm"; fi) \ - $(if ! use rfxs; then echo "-norfxs"; fi) \ - || die "configure failed" - sed -i "s/CC\s*=.*/CC = $(tc-getCC)/" "${S}"/Makefile - sed -i "s/CFLAGS\s*=.*/CFLAGS = ${CFLAGS} \$(DFLAGS)/" "${S}"/Makefile - emake || die "make failed" -} - -src_install() { - dobin heyu || die "installing binary failed" - doman heyu.1 x10config.5 x10scripts.5 x10sched.5 - newinitd "${FILESDIR}"/${PVR}/heyu.init heyu - diropts -o nobody -g nogroup -m 0777 - dodir /var/tmp/heyu - diropts -o root -g root -m 0744 - dodir /etc/heyu - keepdir /etc/heyu - insinto /etc/heyu - insopts -o root -g root -m 0644 - doins x10.conf.sample || die "installing config sample failed" - doins x10.sched.sample || die "installing schedule sample failed" -} - -pkg_postinst() { - elog - elog "Don't forget to tell heyu where to find your CM11 or CM17. Therefore" - elog "the file /etc/heyu/x10.conf must contain a line starting with 'TTY'" - elog "followed by the corresponding device such as:" - elog - elog "TTY /dev/ttyS0 <-- on first serial port" - elog "TTY /dev/ttyS1 <-- on second serial port" - elog "TTY /dev/ttyUSB0 <-- on USB port" - elog - elog "To use your device on a USB port, the corresponding USB serial converter" - elog "kernel module must be loaded. Older CM11 are usually delivered with a" - elog "a Prolific 2303 cable (kernel module: pl2303) while newer come with a" - elog "FTDI cable (kernel module: ftdi_sio)." - elog - elog "Execute the following command if you wish to start the HEYU daemon" - elog "at boot time:" - elog - elog "rc-update add heyu default" - elog - epause 5 -} diff --git a/app-misc/heyu/heyu-2.5.0.ebuild b/app-misc/heyu/heyu-2.5.0.ebuild new file mode 100644 index 000000000..2b16b78aa --- /dev/null +++ b/app-misc/heyu/heyu-2.5.0.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils toolchain-funcs + +DESCRIPTION="Utility to control and program CM11A, CM17A and CM12U X10 interfaces." +HOMEPAGE="http://heyu.tanj.com" +SRC_URI="http://heyu.tanj.com/download/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="kernel_Darwin kernel_FreeBSD kernel_linux cm17a dmx210 ext0 ore rfxm rfxs" + +DEPEND="" +RDEPEND="" + +pkg_setup() { + enewgroup ${PN} + enewuser ${PN} -1 -1 /var/lib/${PN} "${PN},uucp" +} + +src_compile() { + mv x10config.sample x10.conf.sample + "${S}"/Configure \ + $(use kernel_FreeBSD && echo "freebsd") \ + $(use kernel_Darwin && echo "darwin") \ + $(use kernel_linux && echo "linux") \ + $(use cm17a || echo "-nocm17a") \ + $(use dmx210 || echo "-nodmx") \ + $(use ext0 || echo "-noext0") \ + $(use ore || echo "-noore") \ + $(use rfxm || echo "-norfxm") \ + $(use rfxs || echo "-norfxs") \ + || die "configure failed" + sed -i "s/CC\s*=.*/CC = $(tc-getCC)/" "${S}"/Makefile || die "adjustment of CC failed" + sed -i "s/CFLAGS\s*=.*/CFLAGS = ${CFLAGS} \$(DFLAGS)/" "${S}"/Makefile || die "adjustment of CFLAGS failed" + sed -i -r 's%^(DFLAGS.+)-DSYSBASEDIR=\\"[^\]+\\"%\1%' "${S}"/Makefile || die "removing DSYSBASEDIR from DFLAGS failed" + sed -i -r 's%^(DFLAGS\s*=\s*)%\1-DSYSBASEDIR=\\"/var/lib/heyu\\" %' "${S}"/Makefile || die "adding DSYSBASEDIR to DFLAGS failed" + sed -i -r 's%^(DFLAGS.+)-DSPOOLDIR=\\"[^\]+\\"%\1%' "${S}"/Makefile || die "removing DSPOOLDIR from DFLAGS failed" + sed -i -r 's%^(DFLAGS\s*=\s*)%\1-DSPOOLDIR=\\"/var/lib/heyu\\" %' "${S}"/Makefile || die "adding DSPOOLDIR to DFLAGS failed" + sed -i -r 's%^(DFLAGS.+)-DLOCKDIR=\\"[^\]+\\"%\1%' "${S}"/Makefile || die "removing DLOCKDIR from DFLAGS failed" + sed -i -r 's%^(DFLAGS\s*=\s*)%\1-DLOCKDIR=\\"/var/lock\\" %' "${S}"/Makefile || die "adding DLOCKDIR to DFLAGS failed" + sed -i -r 's%(LOG_DIR.*?)NONE%\1/var/log/heyu%' "${S}"/x10.conf.sample || die "changing LOG_DIR failed" + emake || die "make failed" +} + +src_install() { + dobin heyu || die "installing binary failed" + doman heyu.1 x10config.5 x10scripts.5 x10sched.5 + newinitd "${FILESDIR}"/${PV}/heyu.init heyu + insinto /etc/heyu + doins x10.*.sample || die "installing config samples failed" + diropts -m 0750 -o heyu + dodir /var/log/heyu || die "creating log directory failed" + dosym /etc/heyu/x10.conf /var/lib/heyu/x10.conf + dosym /etc/heyu/x10.sched /var/lib/heyu/x10.sched +} + +pkg_postinst() { + elog "Don't forget to tell heyu where to find your CM11 or CM17. Therefore" + elog "the file /etc/heyu/x10.conf must contain a line starting with 'TTY'" + elog "followed by the corresponding device such as:" + elog + elog "TTY /dev/ttyS0 <-- on first serial port" + elog "TTY /dev/ttyS1 <-- on second serial port" + elog "TTY /dev/ttyUSB0 <-- on USB port" + elog + elog "To use your device on a USB port, the corresponding USB serial converter" + elog "kernel module must be loaded. Older CM11 are usually delivered with a" + elog "a Prolific 2303 cable (kernel module: pl2303) while newer come with a" + elog "FTDI cable (kernel module: ftdi_sio)." + elog + elog "Execute the following command if you wish to start the HEYU daemon" + elog "at boot time:" + elog + elog "rc-update add heyu default" +} -- cgit v1.2.3-65-gdbad