diff options
author | Tom Martin <slarti@gentoo.org> | 2005-08-03 22:57:06 +0000 |
---|---|---|
committer | Tom Martin <slarti@gentoo.org> | 2005-08-03 22:57:06 +0000 |
commit | f73169190ef654e549e427ea7ffa1da692743815 (patch) | |
tree | 0f235c2e6e464bf5e2cce4408c67415f6942cfdc /app-misc | |
parent | Version bump. (diff) | |
download | gentoo-2-f73169190ef654e549e427ea7ffa1da692743815.tar.gz gentoo-2-f73169190ef654e549e427ea7ffa1da692743815.tar.bz2 gentoo-2-f73169190ef654e549e427ea7ffa1da692743815.zip |
Add in a nosuid patch from solar in a revbump.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/beep/ChangeLog | 9 | ||||
-rw-r--r-- | app-misc/beep/Manifest | 15 | ||||
-rw-r--r-- | app-misc/beep/beep-1.2.2-r1.ebuild | 34 | ||||
-rw-r--r-- | app-misc/beep/files/beep-1.2.2-nosuid.patch | 33 | ||||
-rw-r--r-- | app-misc/beep/files/digest-beep-1.2.2-r1 | 1 |
5 files changed, 80 insertions, 12 deletions
diff --git a/app-misc/beep/ChangeLog b/app-misc/beep/ChangeLog index ea805319f2db..a9e8ba96338b 100644 --- a/app-misc/beep/ChangeLog +++ b/app-misc/beep/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-misc/beep # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/beep/ChangeLog,v 1.17 2005/06/28 01:48:54 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/beep/ChangeLog,v 1.18 2005/08/03 22:57:06 slarti Exp $ + + +*beep-1.2.2-r1 (04 Aug 2004) + + 03 Aug 2005; Tom Martin <slarti@gentoo.org> + +files/beep-1.2.2-nosuid.patch, +beep-1.2.2-r1.ebuild: + New non-suid patch from Ned Ludd <solar@gentoo.org>. 28 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> beep-1.2.2.ebuild: Stable on sparc diff --git a/app-misc/beep/Manifest b/app-misc/beep/Manifest index 856cf1064986..e2f023642721 100644 --- a/app-misc/beep/Manifest +++ b/app-misc/beep/Manifest @@ -1,14 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 0960a706f434735f84d37b39843d1340 ChangeLog 1840 +MD5 09330e33e95e82550d333acfcb9d87af beep-1.2.2-r1.ebuild 785 MD5 dd3d9cc0fdfaa622a04cb071b1074feb metadata.xml 262 MD5 314c91e1ae2eb056760aab61780e9e3d beep-1.2.2.ebuild 685 -MD5 5afa577d21ef40b948ae0067cbf6e2e9 ChangeLog 1685 +MD5 32c9843b54fcfb0268d6d8f197f84f4d files/digest-beep-1.2.2-r1 61 MD5 32c9843b54fcfb0268d6d8f197f84f4d files/digest-beep-1.2.2 61 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux) - -iD8DBQFCwKyJKRy60XGEcJIRAvuxAJ97XCMwFK2apUkt7Bx856XCBYWgBACcCOpL -2eee5kB9uzbPKJxmFcIIW64= -=bVT+ ------END PGP SIGNATURE----- +MD5 38e2fc3ea98ced50038799ca80fdd9ee files/beep-1.2.2-nosuid.patch 1528 diff --git a/app-misc/beep/beep-1.2.2-r1.ebuild b/app-misc/beep/beep-1.2.2-r1.ebuild new file mode 100644 index 000000000000..985abdf38aa5 --- /dev/null +++ b/app-misc/beep/beep-1.2.2-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/beep/beep-1.2.2-r1.ebuild,v 1.1 2005/08/03 22:57:06 slarti Exp $ + +inherit eutils + +DESCRIPTION="the advanced PC speaker beeper" +HOMEPAGE="http://www.johnath.com/beep/" +SRC_URI="http://www.johnath.com/beep/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +DEPEND="virtual/libc" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-nosuid.patch +} + +src_compile() { + emake FLAGS="${CFLAGS}" || die "compile problem" +} + +src_install() { + dobin beep + # do we really have to set this suid by default? -solar + fperms 0711 /usr/bin/beep + doman beep.1.gz + dodoc CHANGELOG CREDITS README +} diff --git a/app-misc/beep/files/beep-1.2.2-nosuid.patch b/app-misc/beep/files/beep-1.2.2-nosuid.patch new file mode 100644 index 000000000000..33e6affa9ffb --- /dev/null +++ b/app-misc/beep/files/beep-1.2.2-nosuid.patch @@ -0,0 +1,33 @@ +--- beep.c.orig 2005-07-23 13:37:01.000000000 -0400 ++++ beep.c 2005-07-23 14:00:55.000000000 -0400 +@@ -218,22 +218,20 @@ + int i; /* loop counter */ + + /* try to snag the console */ +- if((console_fd = open("/dev/console", O_WRONLY)) == -1) { +- fprintf(stderr, "Could not open /dev/console for writing.\n"); +- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ +- perror("open"); +- exit(1); +- } ++ console_fd = open("/dev/console", O_WRONLY); + + /* Beep */ + for (i = 0; i < parms.reps; i++) { /* start beep */ +- if(ioctl(console_fd, KIOCSOUND, (int)(CLOCK_TICK_RATE/parms.freq)) < 0) { +- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ +- perror("ioctl"); ++ if (console_fd >= 0) { ++ ioctl(console_fd, KIOCSOUND, (int)(CLOCK_TICK_RATE/parms.freq)); ++ } else { ++ printf("\a"); /* Output the fall back for usefulness we don't have to be suid to work at all */ ++ fflush(stdout); + } + /* Look ma, I'm not ansi C compatible! */ + usleep(1000*parms.length); /* wait... */ +- ioctl(console_fd, KIOCSOUND, 0); /* stop beep */ ++ if (console_fd >= 0) ++ ioctl(console_fd, KIOCSOUND, 0); /* stop beep */ + if(parms.end_delay || (i+1 < parms.reps)) + usleep(1000*parms.delay); /* wait... */ + } /* repeat. */ diff --git a/app-misc/beep/files/digest-beep-1.2.2-r1 b/app-misc/beep/files/digest-beep-1.2.2-r1 new file mode 100644 index 000000000000..914c0afe4b54 --- /dev/null +++ b/app-misc/beep/files/digest-beep-1.2.2-r1 @@ -0,0 +1 @@ +MD5 d541419fd7e5642952d7b48cbb40c712 beep-1.2.2.tar.gz 18460 |