Add patch from splite to fix Bug 66774. The patch makes ssh the default transport if the "crypt" flag is used. It also fixes the yacc grammer so that bison can again be used. It changes the output format of the noexec option. Finally, it installs the files as group root instead of bin and man.

Package-Manager: portage-2.1.3.16

5 files changed, 110 insertions, 5 deletions

diff --git a/net-misc/rdist/ChangeLog b/net-misc/rdist/ChangeLog
index 5c46cbae9960..4c70e7822fa0 100644
--- a/net-misc/rdist/ChangeLog
+++ b/net-misc/rdist/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/rdist
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdist/ChangeLog,v 1.12 2007/05/14 19:45:45 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdist/ChangeLog,v 1.13 2007/11/04 14:51:50 masterdriverz Exp $
+
+*rdist-6.1.5-r2 (04 Nov 2007)
+
+  04 Nov 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  +files/rdist-6.1.5-mkstemp.patch, +rdist-6.1.5-r2.ebuild:
+  Add patch from splite to fix Bug 66774. The patch makes ssh the default
+  transport if the "crypt" flag is used. It also fixes the yacc grammer so
+  that bison can again be used. It changes the output format of the noexec
+  option. Finally, it installs the files as group root instead of bin and man.
 
   14 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/net-misc/rdist/Manifest b/net-misc/rdist/Manifest
index 7d71476148f7..245af141a1c4 100644
--- a/net-misc/rdist/Manifest
+++ b/net-misc/rdist/Manifest
@@ -1,12 +1,20 @@
+AUX rdist-6.1.5-mkstemp.patch 824 RMD160 02b5ea91298a31fbff9ccb634638274b36b82e59 SHA1 1144ef72200b8f5be8fe1f5e384274fb2cc1f5d5 SHA256 7a3744376ce5481d89a9ba0b95cff5a2e4442b632f4150284f05afa7d71f6d5a
+MD5 8efff3176a477119dfa1c3fc7ac1079d files/rdist-6.1.5-mkstemp.patch 824
+RMD160 02b5ea91298a31fbff9ccb634638274b36b82e59 files/rdist-6.1.5-mkstemp.patch 824
+SHA256 7a3744376ce5481d89a9ba0b95cff5a2e4442b632f4150284f05afa7d71f6d5a files/rdist-6.1.5-mkstemp.patch 824
 DIST rdist-6.1.5.tar.gz 117861 RMD160 7344e137ab74192aeb2517fd63b4bbed0f70e039 SHA1 42ab6002631fd3632b3421d85a5628477f49f69b SHA256 2bb0d0f5904eadc9e7fe3d60c15389d6897fcf884211070e289a6c710ff37f96
 EBUILD rdist-6.1.5-r1.ebuild 1106 RMD160 4d7676342845f863e7be4e5e72668711dda8e95b SHA1 e117005143bcae2a9fbc78f4d6d3385ca17216d9 SHA256 cc3051b6acaba6067d9e4400271121f8c45155bb7bb2da5fc75084b3c6cbe0a3
 MD5 b07d477917b9d41a8b328f22f447a548 rdist-6.1.5-r1.ebuild 1106
 RMD160 4d7676342845f863e7be4e5e72668711dda8e95b rdist-6.1.5-r1.ebuild 1106
 SHA256 cc3051b6acaba6067d9e4400271121f8c45155bb7bb2da5fc75084b3c6cbe0a3 rdist-6.1.5-r1.ebuild 1106
-MISC ChangeLog 1256 RMD160 ce130f451134893cc94a8df90dde84b51afed272 SHA1 19eb95a0638e4d6d79eb63b3649f8bcbc5d449df SHA256 b7c3e6c6e2f83e4f7fd37879462ce3d5fa6b831055397a8263dbfdaf650d20ce
-MD5 ec52ae361f9e2b8fa84437487968bfa8 ChangeLog 1256
-RMD160 ce130f451134893cc94a8df90dde84b51afed272 ChangeLog 1256
-SHA256 b7c3e6c6e2f83e4f7fd37879462ce3d5fa6b831055397a8263dbfdaf650d20ce ChangeLog 1256
+EBUILD rdist-6.1.5-r2.ebuild 1799 RMD160 12d277a496f5fdaef0c49e9b60d8516b6b82c391 SHA1 3cfacefd69626f9675b8360d1a6343fda0dea20f SHA256 0e6f8429ac3d672e65a64c382c42fa8ea6bf10a2428816aa1a9b54f39f570587
+MD5 3e90adab28d6e47b68a1ef4514c75951 rdist-6.1.5-r2.ebuild 1799
+RMD160 12d277a496f5fdaef0c49e9b60d8516b6b82c391 rdist-6.1.5-r2.ebuild 1799
+SHA256 0e6f8429ac3d672e65a64c382c42fa8ea6bf10a2428816aa1a9b54f39f570587 rdist-6.1.5-r2.ebuild 1799
+MISC ChangeLog 1716 RMD160 e73b224cbadda576d0b9bec20a92ba8a1e82db0d SHA1 598f22c6ad7ba2b04c7f03bdea086c0c56b873cb SHA256 fd1a64b379d08e74bd9905e2084d16228da894ecb1618e724dbcb78da060291b
+MD5 949d38dc9cbcd1e407c5e66398d846d3 ChangeLog 1716
+RMD160 e73b224cbadda576d0b9bec20a92ba8a1e82db0d ChangeLog 1716
+SHA256 fd1a64b379d08e74bd9905e2084d16228da894ecb1618e724dbcb78da060291b ChangeLog 1716
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
@@ -14,3 +22,6 @@ SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a metadata
 MD5 bb4317ac9be237c9cf795387fce99a39 files/digest-rdist-6.1.5-r1 235
 RMD160 e062f3419de6bccf5c297689ca8481786f3cf7d2 files/digest-rdist-6.1.5-r1 235
 SHA256 308a397af5dcaa611518ce1447e37f3ea1fa0bf4b113ce4015011f987bfc8ea3 files/digest-rdist-6.1.5-r1 235
+MD5 bb4317ac9be237c9cf795387fce99a39 files/digest-rdist-6.1.5-r2 235
+RMD160 e062f3419de6bccf5c297689ca8481786f3cf7d2 files/digest-rdist-6.1.5-r2 235
+SHA256 308a397af5dcaa611518ce1447e37f3ea1fa0bf4b113ce4015011f987bfc8ea3 files/digest-rdist-6.1.5-r2 235
diff --git a/net-misc/rdist/files/digest-rdist-6.1.5-r2 b/net-misc/rdist/files/digest-rdist-6.1.5-r2
new file mode 100644
index 000000000000..9b298744880f
--- /dev/null
+++ b/net-misc/rdist/files/digest-rdist-6.1.5-r2
@@ -0,0 +1,3 @@
+MD5 546779700af70aa5f9103e08782cdcac rdist-6.1.5.tar.gz 117861
+RMD160 7344e137ab74192aeb2517fd63b4bbed0f70e039 rdist-6.1.5.tar.gz 117861
+SHA256 2bb0d0f5904eadc9e7fe3d60c15389d6897fcf884211070e289a6c710ff37f96 rdist-6.1.5.tar.gz 117861
diff --git a/net-misc/rdist/files/rdist-6.1.5-mkstemp.patch b/net-misc/rdist/files/rdist-6.1.5-mkstemp.patch
new file mode 100644
index 000000000000..642f69b1ff80
--- /dev/null
+++ b/net-misc/rdist/files/rdist-6.1.5-mkstemp.patch
@@ -0,0 +1,26 @@
+--- src/message.c.orig	1998-11-09 23:13:30.000000000 -0500
++++ src/message.c	2005-01-20 11:39:48.156866817 -0500
+@@ -455,6 +455,8 @@
+ 	int flags;
+ 	char *msgbuf;
+ {
++	int fd;
++
+ 	if (IS_ON(flags, MT_DEBUG))
+ 		return;
+ 
+@@ -475,10 +477,12 @@
+ 		(void) sprintf(tempfile, "%s/%s", cp, _RDIST_TMP);
+ 
+ 		msgfac->mf_filename = tempfile;
+-		(void) mktemp(msgfac->mf_filename);
+-		if ((msgfac->mf_fptr = fopen(msgfac->mf_filename, "w"))==NULL)
++		if ((fd = mkstemp(msgfac->mf_filename)) == -1)
+ 			fatalerr("Cannot open notify file for writing: %s: %s.",
+ 			      msgfac->mf_filename, SYSERR);
++		if ((msgfac->mf_fptr = fdopen(fd, "w")) == NULL)
++			fatalerr("Cannot associate stream with file %s: %s.",
++			      msgfac->mf_filename, SYSERR);
+ 		debugmsg(DM_MISC, "Created notify temp file '%s'",
+ 			 msgfac->mf_filename);
+ 	}
diff --git a/net-misc/rdist/rdist-6.1.5-r2.ebuild b/net-misc/rdist/rdist-6.1.5-r2.ebuild
new file mode 100644
index 000000000000..a366402088b4
--- /dev/null
+++ b/net-misc/rdist/rdist-6.1.5-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdist/rdist-6.1.5-r2.ebuild,v 1.1 2007/11/04 14:51:50 masterdriverz Exp $
+
+DESCRIPTION="Remote software distribution system"
+HOMEPAGE="http://www.magnicomp.com/rdist/rdist.shtml"
+SRC_URI="http://www.magnicomp.com/download/rdist/${P}.tar.gz"
+
+LICENSE="RDist"
+SLOT="1"
+KEYWORDS="~alpha ~ia64 ~ppc ~sparc ~x86"
+IUSE="crypt"
+
+DEPEND="sys-devel/bison"
+RDEPEND="crypt? ( virtual/ssh )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Change the following #define (10 Mar 2004 agriffis)
+	sed -i -e 's/^\(#define ARG_TYPE\).*/\1 ARG_STDARG/' config/os-linux.h \
+		|| die "sed ARG_TYPE failed"
+	# Linux switched from a.out to ELF years ago...
+	sed -i -e 's/^\(#define EXE_TYPE\).*/\1 EXE_ELF/' config/os-linux.h \
+		|| die "sed EXE_TYPE failed"
+	sed -i -e 's/a\.out/ELF/g' doc/rdist.man || die "sed a.out failed"
+
+	# crypto lovers prefer ssh to rsh
+	if use crypt; then
+		sed -i -e 's,^\(#define _PATH_REMSH\).*,\1 "/usr/bin/ssh",' \
+			config/os-linux.h || die "sed _PATH_REMSH failed"
+	fi
+
+	# remove yacc-isms eshewed by modern bisons
+	sed -i -e '/^%type/ s/,//g' -e 's/= {/{/g' src/gram.y || die "fixup of gram.y failed"
+
+	# use mkstemp(3) instead of mktemp(3)
+	epatch "${FILESDIR}/rdist_mkstemp.patch"
+}
+
+src_compile() {
+	# pull in <string.h> so strerror() is defined properly (64-bit bug)
+	emake DEFS_LOCAL=-DNEED_STRING_H YACC='bison -y' || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man{1,8}
+	make install \
+		BIN_GROUP=root \
+		BIN_DIR="${D}/usr/bin" || die "make install failed"
+	make install.man \
+		MAN_GROUP=root \
+		MAN_1_DIR=${D}/usr/share/man/man1 MAN_8_DIR=${D}/usr/share/man/man8 \
+		|| die "make install.man failed"
+}