Fix up build errors with fortify source #264395 by Diego E. Pettenò.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 25 insertions, 13 deletions

diff --git a/dev-embedded/ponyprog/ChangeLog b/dev-embedded/ponyprog/ChangeLog
index 64136a146268..9ceea70d086f 100644
--- a/dev-embedded/ponyprog/ChangeLog
+++ b/dev-embedded/ponyprog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-embedded/ponyprog
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ChangeLog,v 1.15 2008/08/05 19:07:33 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ChangeLog,v 1.16 2009/06/20 11:50:43 vapier Exp $
+
+  20 Jun 2009; Mike Frysinger <vapier@gentoo.org> ponyprog-2.07a.ebuild,
+  files/ponyprog-2.07a-gcc43.patch:
+  Fix up build errors with fortify source #264395 by Diego E. Pettenò.
 
   05 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch b/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch
index ea934f1c255a..652af6d783fe 100644
--- a/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch
+++ b/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch
@@ -42,3 +42,14 @@
  
      ++_instances;		// bump reference counter
    }
+--- a/rs232int.cpp
++++ b/rs232int.cpp
+@@ -145,7 +145,7 @@ int RS232Interface::OpenSerial(int no)
+ 		snprintf(lockname, MAXPATH, LOCK_DIR "/LCK..ttyS%d", no);
+ 		UserDebug1(UserApp2, "RS232Interface::OpenSerial() now lock the device %s\n", lockname);
+ 
+-		fd = open ((const char *)lockname,O_RDWR|O_EXCL|O_CREAT);
++		fd = open ((const char *)lockname,O_RDWR|O_EXCL|O_CREAT,0664);
+ 		if (fd < 0)
+ 		{
+ 			fd = open ((const char *)lockname,O_RDONLY);
diff --git a/dev-embedded/ponyprog/ponyprog-2.07a.ebuild b/dev-embedded/ponyprog/ponyprog-2.07a.ebuild
index a601bab35b51..c83ece1c599b 100644
--- a/dev-embedded/ponyprog/ponyprog-2.07a.ebuild
+++ b/dev-embedded/ponyprog/ponyprog-2.07a.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.07a.ebuild,v 1.4 2008/06/20 20:24:44 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.07a.ebuild,v 1.5 2009/06/20 11:50:43 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="Serial device programmer"
 HOMEPAGE="http://www.lancos.com/ppwin95.html"
 SRC_URI="mirror://sourceforge/${PN}/PonyProg2000-${PV}.tar.gz"
+
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="epiphany firefox seamonkey"
+
 RDEPEND="x11-libs/libXaw
 	x11-libs/libXmu
 	x11-libs/libXt
@@ -56,12 +58,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-gcc43.patch"
 }
 
-src_compile() {
-	emake || die "Compilation failed"
-}
-
-src_install () {
-	dobin bin/ponyprog2000
+src_install() {
+	dobin bin/ponyprog2000 || die
 	keepdir /var/lock/uucp
 	fowners uucp:uucp /var/lock/uucp
 	fperms 755 /var/lock/uucp
@@ -70,9 +68,8 @@ src_install () {
 }
 
 pkg_postinst() {
-	elog "To use the COM port in user mode (not as root) you need to"
-	elog "make sure you have the rights to write to /dev/ttyS? devices"
-	elog "and /var/lock directory."
+	elog "To use the COM port in user mode (not as root), you need to"
+	elog "be in the 'uucp' group."
 	elog
 	elog "To use the LPT port in user mode (not as root) you need a kernel with"
 	elog "ppdev, parport and parport_pc compiled in or as modules. You need the"