set minicom executable group to uucp, with sgid permission (#108088); set default script by its full name, /usr/bin/runscript (#114754)

Package-Manager: portage-2.0.51.22-r3

5 files changed, 130 insertions, 6 deletions

diff --git a/net-dialup/minicom/ChangeLog b/net-dialup/minicom/ChangeLog
index cb99ba3963d6..5b2773346c64 100644
--- a/net-dialup/minicom/ChangeLog
+++ b/net-dialup/minicom/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/minicom
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/ChangeLog,v 1.31 2005/10/04 19:25:34 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/ChangeLog,v 1.32 2005/12/13 06:07:46 mrness Exp $
+
+*minicom-2.1-r2 (13 Dec 2005)
+
+  13 Dec 2005; Alin Nastac <mrness@gentoo.org>
+  +files/minicom-2.1-gentoo-runscript.patch, +minicom-2.1-r2.ebuild:
+  Install minicom with group uucp and sgid for allowing normal users to lock
+  the serial ports that are entitled to use (#108088). Set default script
+  program by its full path (/usr/bin/runscript) for avoiding usage of
+  baselayout's runscript (#114754).
 
   04 Oct 2005; Alin Nastac <mrness@gentoo.org> minicom-2.1-r1.ebuild:
   Remove INSTALL from docs.
diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest
index 7d1f3dfd7d0f..daaa5a8393b7 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -2,16 +2,19 @@
 Hash: SHA1
 
 MD5 9ee65fa1771556feb2c314a342a71f93 minicom-2.1-r1.ebuild 1159
-MD5 36431eb4c81499b72d4ed43dfa004766 ChangeLog 3821
+MD5 6ec44048f9c1e8705417060f01c81478 minicom-2.1-r2.ebuild 1471
+MD5 bf08b4cdd8e0f6728d788c0dcca13570 ChangeLog 4226
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 6362e781f7e7a1300d8a3c7b602ddd6f files/minirc.dfl 66
 MD5 e1a7644e6acfcf2a67f65c032167bcf6 files/minicom-2.1-gcc4.patch 421
+MD5 e2b8240bae3218176bc27ab815d38833 files/minicom-2.1-gentoo-runscript.patch 2292
 MD5 a31777cb2fefdf6dde761b58a8076333 files/minicom-2.1-memcpy-bounds.diff 487
 MD5 67f667abec40aca4b4418ae3937105ff files/digest-minicom-2.1-r1 63
+MD5 67f667abec40aca4b4418ae3937105ff files/digest-minicom-2.1-r2 63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDQtdMNSP4Vda7IdsRAsiwAJ46ySwkBXpoC9Vu8EDdm8dYsrASbQCbBgUi
-yCYMLL5vIJuxXVPh2WPsLuU=
-=QaYG
+iD8DBQFDnmVCNSP4Vda7IdsRAjQMAJ40UMvuSVyJqVhnkokoN4zZlEK4bgCgh88m
+ucd7kLX/io8KizPj3fE7VbQ=
+=8iJV
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/minicom/files/digest-minicom-2.1-r2 b/net-dialup/minicom/files/digest-minicom-2.1-r2
new file mode 100644
index 000000000000..5e8d7ce8b8f5
--- /dev/null
+++ b/net-dialup/minicom/files/digest-minicom-2.1-r2
@@ -0,0 +1 @@
+MD5 1c8f3b247c38fb16c3c2170df9fc102a minicom-2.1.tar.gz 607939
diff --git a/net-dialup/minicom/files/minicom-2.1-gentoo-runscript.patch b/net-dialup/minicom/files/minicom-2.1-gentoo-runscript.patch
new file mode 100644
index 000000000000..b67006d3708f
--- /dev/null
+++ b/net-dialup/minicom/files/minicom-2.1-gentoo-runscript.patch
@@ -0,0 +1,55 @@
+diff -Nru minicom-2.1.orig/extras/scriptdemo minicom-2.1/extras/scriptdemo
+--- minicom-2.1.orig/extras/scriptdemo	2003-03-30 21:55:39.000000000 +0300
++++ minicom-2.1/extras/scriptdemo	2005-12-12 23:59:40.447479750 +0200
+@@ -1,5 +1,5 @@
+ # A little demonstration of the possibilities of "runscript".
+-# This script can be executed by typing: "runscript scriptdemo".
++# This script can be executed by typing: "/usr/bin/runscript scriptdemo".
+ #
+ # Adjust the stty's below to your system: BSD-like or SysV-like.
+ # Linux ofcourse accepts both :-)
+diff -Nru minicom-2.1.orig/man/minicom.1 minicom-2.1/man/minicom.1
+--- minicom-2.1.orig/man/minicom.1	2003-04-26 10:31:06.000000000 +0300
++++ minicom-2.1/man/minicom.1	2005-12-12 23:59:04.861255750 +0200
+@@ -414,7 +414,7 @@
+ .TP 0.5i
+ .B D - Script program
+ Which program to use as the script interpreter. Defaults to the
+-program "runscript", but if you want to use something else (eg,
++program "/usr/bin/runscript", but if you want to use something else (eg,
+ /bin/sh or "expect") it is possible.  Stdin and stdout are connected
+ to the modem, stderr to the screen.
+ .RS 0.5i
+diff -Nru minicom-2.1.orig/man/runscript.1 minicom-2.1/man/runscript.1
+--- minicom-2.1.orig/man/runscript.1	2003-03-30 21:55:42.000000000 +0300
++++ minicom-2.1/man/runscript.1	2005-12-13 00:02:40.698744750 +0200
+@@ -7,7 +7,7 @@
+ .SH NAME
+ runscript \- script interpreter for minicom
+ .SH SYNOPSIS
+-.B runscript
++.B /usr/bin/runscript
+ .RI "scriptname [logfile [homedir]]"
+ .SH DESCRIPTION
+ .B runscript
+diff -Nru minicom-2.1.orig/src/rwconf.c minicom-2.1/src/rwconf.c
+--- minicom-2.1.orig/src/rwconf.c	2003-04-13 01:52:20.000000000 +0300
++++ minicom-2.1/src/rwconf.c	2005-12-12 23:58:47.356161750 +0200
+@@ -119,7 +119,7 @@
+   { N_("No"),		PRIVATE,  "kermreal" },
+   { "3",		PUBLIC,   "colusage" },
+   /* The script program */
+-  { "runscript",	PUBLIC,   "scriptprog" },
++  { "/usr/bin/runscript",	PUBLIC,   "scriptprog" },
+   /* Modem parameters */
+   { "~^M~AT S7=45 S0=0 L1 V1 X4 &c1 E1 Q0^M",   PUBLIC,   "minit" },
+   { "^M~ATZ^M~",	PUBLIC,   "mreset" },
+@@ -253,7 +253,7 @@
+   int lineno = 0;
+   int matched;
+ 
+-  if (init) strcpy(P_SCRIPTPROG, "runscript");
++  if (init) strcpy(P_SCRIPTPROG, "/usr/bin/runscript");
+ 
+   while(fgets(line, 80, fp) != (char *)0) {
+ 
diff --git a/net-dialup/minicom/minicom-2.1-r2.ebuild b/net-dialup/minicom/minicom-2.1-r2.ebuild
new file mode 100644
index 000000000000..7821268742ee
--- /dev/null
+++ b/net-dialup/minicom/minicom-2.1-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/minicom-2.1-r2.ebuild,v 1.1 2005/12/13 06:07:46 mrness Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Serial Communication Program"
+HOMEPAGE="http://alioth.debian.org/projects/minicom"
+SRC_URI="http://alioth.debian.org/download.php/123/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.2-r3"
+RDEPEND="${DEPEND}
+	net-dialup/lrzsz"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# solar@gentoo.org (Mar 24 2004)
+	# propolice/ssp caught minicom going out of bounds here.
+	epatch "${FILESDIR}"/${P}-memcpy-bounds.diff
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+	epatch "${FILESDIR}"/${P}-gentoo-runscript.patch
+}
+
+src_compile() {
+	# avoid lazy binding (minicom is sgided)
+	append-ldflags "-Wl,-z,now"
+
+	econf --sysconfdir=/etc/${PN} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	einstall || die "einstall failed"
+
+	#minicom must be uucp sgided is needed for being able to lock serial ports
+	#when run as simple user
+	fowners root:uucp /usr/bin/minicom
+	fperms g+s /usr/bin/minicom
+
+	dodoc doc/minicom.FAQ
+	insinto /etc/minicom
+	doins "${FILESDIR}"/minirc.dfl
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_preinst() {
+	[[ -s /etc/minicom/minirc.dfl ]] \
+		&& rm -f "${IMAGE}"/etc/minicom/minirc.dfl
+}