From: Matthias Schwarzott Date: Fri, 1 Dec 2006 14:36:15 +0000 (+0000) Subject: Fixing overflow, Bug #123704. Allow building more than one driver (with big warning... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5b92d8a7379667f41f8bf9c12a2cc240c05897ca;p=gentoo.git Fixing overflow, Bug #123704. Allow building more than one driver (with big warning), Bug #144951. Added irexec-initscript, Bug #124295. Added support for remotewonderplus-device, Bug #149130. Package-Manager: portage-2.1.2_rc2-r3 --- diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest index 9bd23a5f8edc..3fdda34bc769 100644 --- a/app-misc/lirc/Manifest +++ b/app-misc/lirc/Manifest @@ -1,6 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX irexec-confd 55 RMD160 fbd0bf63a01a7e5ecb97778507eb81de4b98f85d SHA1 882c8ae5398268f47bbab0e6236a19d8d1471bd4 SHA256 dea4c60210c06ce7e7c77c2f45a541f26645c019d8864d2cd8cf5944260e25ee +MD5 fad86b1ae238205e38bccb79355e5fa4 files/irexec-confd 55 +RMD160 fbd0bf63a01a7e5ecb97778507eb81de4b98f85d files/irexec-confd 55 +SHA256 dea4c60210c06ce7e7c77c2f45a541f26645c019d8864d2cd8cf5944260e25ee files/irexec-confd 55 +AUX irexec-initd 475 RMD160 789e999e36eea971b5b1a5170c3dbfe94ee0ab08 SHA1 4fc167cfd7a66bd1d85422f7694ec9392f1bf926 SHA256 91293d22f2b0fa55255910c0a3717d96afc6c1c23c44244f786ca83e9245ab6f +MD5 ce27692c35bb78ca3acf19616674f579 files/irexec-initd 475 +RMD160 789e999e36eea971b5b1a5170c3dbfe94ee0ab08 files/irexec-initd 475 +SHA256 91293d22f2b0fa55255910c0a3717d96afc6c1c23c44244f786ca83e9245ab6f files/irexec-initd 475 AUX lirc-0.8.0-conf-pixelview_bt878.diff 378 RMD160 e70daba96eb7097b20b73807a76ebd562ebb09dc SHA1 96b1976089c7a4e63d9435fb4f8bf8a19c53f4c6 SHA256 343c473210ad6fed27df49d8a93ced7e91fe0d5fc8d652b45b1ef7a7c3125ed6 MD5 a9e10dde8092a4d5fa79639a923b7a5c files/lirc-0.8.0-conf-pixelview_bt878.diff 378 RMD160 e70daba96eb7097b20b73807a76ebd562ebb09dc files/lirc-0.8.0-conf-pixelview_bt878.diff 378 @@ -29,10 +37,18 @@ AUX lirc-0.8.0-kernel-2.6.19.diff 7125 RMD160 dea341fc0e252a45a7a30c93419d3f06c3 MD5 a3ac79feacf017757b0540dabafb2b83 files/lirc-0.8.0-kernel-2.6.19.diff 7125 RMD160 dea341fc0e252a45a7a30c93419d3f06c390bdf0 files/lirc-0.8.0-kernel-2.6.19.diff 7125 SHA256 481c18e3ce2cd6b89536dd00ce61522430072e7222f4cb02cb207dfab660286b files/lirc-0.8.0-kernel-2.6.19.diff 7125 +AUX lirc-0.8.0-too-many-connections-overflow.diff 822 RMD160 434889663b6839042b5d17722bd3c86505d118eb SHA1 6d940401cb6fa07502e78b50712d8482d85363f1 SHA256 1f634d4f021f11f053cae9c7951382ea0c15871756ffa00fe155b2cc504496d6 +MD5 20f427ebc2421122cfd46388b01b8e61 files/lirc-0.8.0-too-many-connections-overflow.diff 822 +RMD160 434889663b6839042b5d17722bd3c86505d118eb files/lirc-0.8.0-too-many-connections-overflow.diff 822 +SHA256 1f634d4f021f11f053cae9c7951382ea0c15871756ffa00fe155b2cc504496d6 files/lirc-0.8.0-too-many-connections-overflow.diff 822 AUX lirc-0.8.0pre4-xbox-remote.diff 7615 RMD160 400e3a965cc4164a6cd63c8a05f36df558d8eac7 SHA1 091b9cfc3443164cedf7e9a9ec4090686caa2652 SHA256 db84d35610fe2429f9e27bc4bb24dabe1210b63afa48d76bd460d94e405904ca MD5 9dc55ee44bfdff1a3e82c2e04fbb01a4 files/lirc-0.8.0pre4-xbox-remote.diff 7615 RMD160 400e3a965cc4164a6cd63c8a05f36df558d8eac7 files/lirc-0.8.0pre4-xbox-remote.diff 7615 SHA256 db84d35610fe2429f9e27bc4bb24dabe1210b63afa48d76bd460d94e405904ca files/lirc-0.8.0pre4-xbox-remote.diff 7615 +AUX lirc-remotewonderplus.patch 876 RMD160 5fa5bd312f60ec900a38b189134627f2c27449bc SHA1 b13a5c024b0eb6f9b65cb1a795c618832aad39e3 SHA256 12e296b694fa9f3889d191756cd9c3846822ca7e653ee3e26c00bf7bf5a73a88 +MD5 e68a17220295d3c72d78c9e78d9ec9b0 files/lirc-remotewonderplus.patch 876 +RMD160 5fa5bd312f60ec900a38b189134627f2c27449bc files/lirc-remotewonderplus.patch 876 +SHA256 12e296b694fa9f3889d191756cd9c3846822ca7e653ee3e26c00bf7bf5a73a88 files/lirc-remotewonderplus.patch 876 AUX lirc-udev-094.diff 192 RMD160 dd7063bba9993b652d6252e861cf8eb2309610e0 SHA1 682ffa82b7f40df87cee3c5309f6efaa94d5cd3a SHA256 05c24a907934efdd90c1f1c8bfaaa1d5b156958451355b9cefdde21fc8977120 MD5 76ea374cc5507eead20404620aa42caf files/lirc-udev-094.diff 192 RMD160 dd7063bba9993b652d6252e861cf8eb2309610e0 files/lirc-udev-094.diff 192 @@ -78,14 +94,14 @@ EBUILD lirc-0.8.0-r5.ebuild 7881 RMD160 0743726667cd2a354ab22d288b65a3e45909c99d MD5 f3e37054e85b537563f1e226614de477 lirc-0.8.0-r5.ebuild 7881 RMD160 0743726667cd2a354ab22d288b65a3e45909c99d lirc-0.8.0-r5.ebuild 7881 SHA256 d78cdb1998399fd4cedd8b38460239a2e140fdaf56d218bb36d41ffc57caefdb lirc-0.8.0-r5.ebuild 7881 -EBUILD lirc-0.8.0-r6.ebuild 7928 RMD160 a2c3235edd455e93e89f3e3b0f0feec4a7f9c201 SHA1 3ae7a63f368b99f50572a497400d73ae35c26d64 SHA256 b33632368e148f54f619b6a3ceb380007a08ff568e7da6b6c00d0cb13f74934a -MD5 847a7a87fa8aebcd5e8264c769fb0976 lirc-0.8.0-r6.ebuild 7928 -RMD160 a2c3235edd455e93e89f3e3b0f0feec4a7f9c201 lirc-0.8.0-r6.ebuild 7928 -SHA256 b33632368e148f54f619b6a3ceb380007a08ff568e7da6b6c00d0cb13f74934a lirc-0.8.0-r6.ebuild 7928 -MISC ChangeLog 17885 RMD160 e627acdcd53461f6d376ef6f12e7e16a94af47bc SHA1 ec110e7d42a0511905b7bb55df6714a128b5f894 SHA256 2ddcb75150119cb8cd772fced5113f8c03fa6b7ee249c59596f7158de70b0d15 -MD5 3d903bdafb6cb4b1d27cb11d1dd852eb ChangeLog 17885 -RMD160 e627acdcd53461f6d376ef6f12e7e16a94af47bc ChangeLog 17885 -SHA256 2ddcb75150119cb8cd772fced5113f8c03fa6b7ee249c59596f7158de70b0d15 ChangeLog 17885 +EBUILD lirc-0.8.0-r7.ebuild 8322 RMD160 1c8b0e99d761d2dd3a4b7ebac1df2a917a0de753 SHA1 6c3c132600b36799ad0e48e0cc8362e91776a4a0 SHA256 8aee1c4f522c5a8083dc1933f5d44ea7d51ef9b6b9386328411ddcf53bd778c7 +MD5 f279d657c4e4066367b94a6333d2a48e lirc-0.8.0-r7.ebuild 8322 +RMD160 1c8b0e99d761d2dd3a4b7ebac1df2a917a0de753 lirc-0.8.0-r7.ebuild 8322 +SHA256 8aee1c4f522c5a8083dc1933f5d44ea7d51ef9b6b9386328411ddcf53bd778c7 lirc-0.8.0-r7.ebuild 8322 +MISC ChangeLog 18352 RMD160 bbba845ddb529bc3970ff7bef0152e9a24a9421e SHA1 1eafabacf9687475bf855af623a229d45159d65a SHA256 f5552de9dd9e79ced132cf3b6c6f57fe066549f0837c58584a3eb02df04be3df +MD5 5830d97641eb17c20b7bbb8b643e9f4b ChangeLog 18352 +RMD160 bbba845ddb529bc3970ff7bef0152e9a24a9421e ChangeLog 18352 +SHA256 f5552de9dd9e79ced132cf3b6c6f57fe066549f0837c58584a3eb02df04be3df ChangeLog 18352 MISC metadata.xml 252 RMD160 e1c170c221f61fa9787a04feac90fab777639d88 SHA1 9fdd5da8466c39d7ff3b40412c4dfa77dd2446b7 SHA256 4e8b5c34b3e50b781a18c9be9e6199442f1b0299e00d66ba35024f8b743b9c32 MD5 abf8a9c4b96bc3bb50f04a48349dae34 metadata.xml 252 RMD160 e1c170c221f61fa9787a04feac90fab777639d88 metadata.xml 252 @@ -102,13 +118,13 @@ SHA256 e24d5fc3d5ed85823419cd88ebc5dfa9fd7fc924e746daf282885564aa84e8cc files/di MD5 17322bfb3604e1c6663bbc5a6fb80e96 files/digest-lirc-0.8.0-r5 235 RMD160 efdbebbf9c02e761392c245f3ee1df0938778785 files/digest-lirc-0.8.0-r5 235 SHA256 e24d5fc3d5ed85823419cd88ebc5dfa9fd7fc924e746daf282885564aa84e8cc files/digest-lirc-0.8.0-r5 235 -MD5 17322bfb3604e1c6663bbc5a6fb80e96 files/digest-lirc-0.8.0-r6 235 -RMD160 efdbebbf9c02e761392c245f3ee1df0938778785 files/digest-lirc-0.8.0-r6 235 -SHA256 e24d5fc3d5ed85823419cd88ebc5dfa9fd7fc924e746daf282885564aa84e8cc files/digest-lirc-0.8.0-r6 235 +MD5 17322bfb3604e1c6663bbc5a6fb80e96 files/digest-lirc-0.8.0-r7 235 +RMD160 efdbebbf9c02e761392c245f3ee1df0938778785 files/digest-lirc-0.8.0-r7 235 +SHA256 e24d5fc3d5ed85823419cd88ebc5dfa9fd7fc924e746daf282885564aa84e8cc files/digest-lirc-0.8.0-r7 235 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFbw4Lt2vP6XvVdOcRArZUAJ9V0FfcP6YSMvMbaawO5eX4AB1VLQCfWRTZ -4U62NUo3fmxGHQinYQZNGGg= -=Hc9U +iD8DBQFFcD3at2vP6XvVdOcRAgc0AJwM2q+YdVboR8fM2zlXDZyV4zAYXgCgzSXf +i7jHWrceVNNUEhV8KPz69iI= +=qov5 -----END PGP SIGNATURE----- diff --git a/app-misc/lirc/files/digest-lirc-0.8.0-r6 b/app-misc/lirc/files/digest-lirc-0.8.0-r6 deleted file mode 100644 index 403b24365ee4..000000000000 --- a/app-misc/lirc/files/digest-lirc-0.8.0-r6 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 0bf28bf82c7766a462f90927b6bf3af1 lirc-0.8.0.tar.bz2 514359 -RMD160 045c95754820e77891bd0b3baa269ad3f04cba8c lirc-0.8.0.tar.bz2 514359 -SHA256 cc8d7fb41a045278680ea530cffaf05181977f41244b9f0ed64075cd7630b5d2 lirc-0.8.0.tar.bz2 514359 diff --git a/app-misc/lirc/lirc-0.8.0-r6.ebuild b/app-misc/lirc/lirc-0.8.0-r6.ebuild deleted file mode 100644 index 507cacb14972..000000000000 --- a/app-misc/lirc/lirc-0.8.0-r6.ebuild +++ /dev/null @@ -1,302 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.0-r6.ebuild,v 1.1 2006/11/30 16:59:45 zzam Exp $ - -WANT_AUTOMAKE="latest" -WANT_AUTOCONF="latest" - -inherit eutils linux-mod flag-o-matic autotools - -DESCRIPTION="LIRC is a package that allows you to decode and send infra-red \ - signals of many (but not all) commonly used remote controls." -HOMEPAGE="http://www.lirc.org" - -SLOT="0" -LICENSE="GPL-2" -IUSE="debug doc X hardware-carrier transmitter udev" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -SRC_URI="mirror://sourceforge/lirc/${P/_pre/pre}.tar.bz2" - -S=${WORKDIR}/${P/_pre/pre} - - -IUSE_LIRC_DEVICES_DIRECT=" - all userspace act200l act220l - adaptec alsa_usb animax atilibusb - atiusb audio audio_alsa avermedia avermedia_vdomate - avermedia98 bestbuy bestbuy2 breakoutbox - bte bw6130 caraca chronos cmdir com1 com2 com3 com4 - cph06x creative creative_infracd - devinput digimatrix dsp dvico ea65 - exaudio flyvideo gvbctv5pci hauppauge - hauppauge_dvb hercules_smarttv_stereo - igorplugusb imon imon_pad imon_rsc - irdeo irdeo_remote irman irreal it87 - knc_one kworld leadtek_0007 leadtek_0010 - leadtek_pvr2000 livedrive_midi - livedrive_seq logitech lpt1 lpt2 mceusb - mceusb2 mediafocusI mouseremote - mouseremote_ps2 mp3anywhere nslu2 - packard_bell parallel pcmak pcmak_usb - pctv pixelview_bt878 pixelview_pak - pixelview_pro provideo realmagic - remotemaster sa1100 sasem serial - silitek sir slinke streamzap tekram - tekram_bt829 tira tvbox udp uirt2 - uirt2_raw" - -IUSE_LIRC_DEVICES_SPECIAL=" - imon_pad2keys serial_igor_cesko - xboxusb usbirboy inputlirc" - -IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}" - - - -RDEPEND="virtual/libc - sys-apps/coreutils - X? ( || ( ( x11-libs/libX11 - x11-libs/libSM - x11-libs/libICE ) - virtual/x11 ) ) - lirc_devices_alsa_usb? ( media-libs/alsa-lib ) - lirc_devices_audio? ( media-libs/portaudio ) - lirc_devices_irman? ( media-libs/libirman )" - - -#device-driver which use libusb -LIBUSB_USED_BY_DEV=" - all atiusb sasem igorplugusb imon imon_pad imon_pad2keys - imon_rsc streamzap mceusb mceusb2 xboxusb" - -for dev in ${LIBUSB_USED_BY_DEV}; do - RDEPEND="${RDEPEND} lirc_devices_${dev}? ( dev-libs/libusb )" -done - -# adding only compile-time depends -DEPEND="${RDEPEND} - virtual/linux-sources" - - -# adding only run-time depends -RDEPEND="${RDEPEND} - lirc_devices_usbirboy? ( app-misc/usbirboy ) - lirc_devices_inputlirc? ( app-misc/inputlircd )" - - - -# add all devices to IUSE -for dev in ${IUSE_LIRC_DEVICES}; do - IUSE="${IUSE} lirc_devices_${dev}" -done - - -add_device() { - : $(( lirc_device_count++ )) - - if [[ ${lirc_device_count} -eq 2 ]]; then - ewarn - #ewarn "When selecting multiple devices for lirc to be supported," - #ewarn "it can not be garanteed that the drivers play nice together." - ewarn "lirc does at the moment support only one driver be compiled at a time." - ewarn "Please reduce LIRC_DEVICES to one item." - die "Multiple drivers selected for lirc." - fi - - - local dev="${1}" - local desc="device ${dev}" - if [[ -n "${2}" ]]; then - desc="${2}" - fi - - einfo "Compiling support for ${desc}" - MY_OPTS="${MY_OPTS} --with-driver=${dev}" -} - -pkg_setup() { - linux-mod_pkg_setup - - # set default configure options - MY_OPTS="" - lirc_driver_count=0 - - LIRC_DRIVER_DEVICE="/dev/lirc/0" - - local dev - - if use lirc_devices_all; then - # compile in drivers for a lot of devices - add_device all "a lot of devices" - else - # compile in only requested drivers - for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do - if use lirc_devices_${dev}; then - add_device ${dev} - fi - done - - if use lirc_devices_serial_igor_cesko; then - add_device serial "serial with Igor Cesko design" - MY_OPTS="${MY_OPTS} --with-igor" - fi - - if use lirc_devices_imon_pad2keys; then - add_device imon_pad "device imon_pad (with converting pad input to keyspresses)" - fi - - if use lirc_devices_xboxusb; then - add_device atiusb "device xboxusb" - NEED_XBOX_PATCH=1 - fi - - if use lirc_devices_usbirboy; then - add_device userspace "device usbirboy" - LIRC_DRIVER_DEVICE="/dev/usbirboy" - fi - - if [[ "${MY_OPTS}" == "" ]]; then - if [[ "${PROFILE_ARCH}" == "xbox" ]]; then - # on xbox: use special driver - add_device atiusb "device xboxusb" - NEED_XBOX_PATCH=1 - else - # no driver requested - einfo - einfo "Compiling only the lirc-applications, but no drivers." - einfo "Enable drivers with LIRC_DEVICES if you need them." - MY_OPTS="--with-driver=userspace" - fi - fi - fi - - use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier" - use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter" - - - if [[ -n "${LIRC_OPTS}" ]] ; then - ewarn - ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on." - ewarn - ewarn "Please use LIRC_DEVICES from now on." - ewarn "e.g. LIRC_DEVICES=\"serial sir\"" - ewarn - ewarn "Flags are now set per use-flags." - ewarn "e.g. transmitter, hardware-carrier" - - local opt - local unsupported_opts="" - - # test for allowed options for LIRC_OPTS - for opt in ${LIRC_OPTS}; do - case ${opt} in - --with-port=*|--with-irq=*|--with-timer=*|--with-tty=*) - MY_OPTS="${MY_OPTS} ${opt}" - ;; - *) - unsupported_opts="${unsupported_opts} ${opt}" - ;; - esac - done - if [[ -n ${unsupported_opts} ]]; then - ewarn "These options are no longer allowed to be set" - ewarn "with LIRC_OPTS: ${unsupported_opts}" - die "LIRC_OPTS is no longer recommended." - fi - fi - - - # Setup parameter for linux-mod.eclass - MODULE_NAMES="lirc(misc:${S})" - BUILD_TARGETS="all" - - ECONF_PARAMS=" --localstatedir=/var - --with-syslog=LOG_DAEMON - --enable-sandboxed - --with-kerneldir=${KV_DIR} - --with-moduledir=/lib/modules/${KV_FULL}/misc - $(use_enable debug) - $(use_with X) - ${MY_OPTS}" - - einfo - einfo "lirc-configure-opts: ${MY_OPTS}" - einfo "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}" - - filter-flags -Wl,-O1 -} - -src_unpack() { - unpack ${A} - cd ${S} - - # Apply kernel compatibility patches - epatch ${FILESDIR}/${P}-kernel-2.6.16.diff - epatch ${FILESDIR}/${P}-kernel-2.6.17.diff - epatch ${FILESDIR}/${P}-kernel-2.6.18.diff - epatch ${FILESDIR}/${P}-kernel-2.6.19.diff - - # Work with udev-094 and greater - epatch ${FILESDIR}/${PN}-udev-094.diff - - # Bugfix for i2c-driver in combination with newer ivtv and Kernel 2.6.17 - epatch ${FILESDIR}/${P}-i2c-kernel-2.6.17.diff - - # Wrong config-filename for LIRC_DEVICES=pixelview_bt878 - epatch ${FILESDIR}/${P}-conf-pixelview_bt878.diff - - # Apply patches needed for some special device-types - [[ ${NEED_XBOX_PATCH:-0} == 1 ]] && epatch ${FILESDIR}/lirc-0.8.0pre4-xbox-remote.diff - use lirc_devices_imon_pad2keys && epatch ${FILESDIR}/${P}-imon-pad2keys.patch - - # remove parallel driver on SMP systems - if linux_chkconfig_present SMP ; then - sed -i -e "s:lirc_parallel::" drivers/Makefile.in - fi - - # respect CFLAGS - sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.in - - # setting default device-node - sed -i -e '/#define LIRC_DRIVER_DEVICE/d' acconfig.h - echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h - - eautoreconf || die "autoreconf failed" -} - - -src_install() { - make DESTDIR=${D} install || die "make install failed" - - newinitd ${FILESDIR}/lircd lircd - newinitd ${FILESDIR}/lircmd lircmd - newconfd ${FILESDIR}/lircd.conf lircd - - insinto /etc/modules.d/ - newins ${FILESDIR}/modulesd.lirc lirc - - if use udev; then - insinto /etc/udev/rules.d/; - newins ${S}/contrib/lirc.rules 10-lirc.rules - fi - - if use doc ; then - dohtml doc/html/*.html - insinto /usr/share/doc/${PF}/images - doins doc/images/* - fi -} - -pkg_preinst() { - linux-mod_pkg_preinst - [[ -f "${ROOT}/etc/lircd.conf" ]] && cp ${ROOT}/etc/lircd.conf ${IMAGE}/etc -} - -pkg_postinst() { - linux-mod_pkg_postinst - echo - einfo "The lirc Linux Infrared Remote Control Package has been" - einfo "merged, please read the documentation at http://www.lirc.org" - echo -} -