Add support for BSD rpc.yppasswd thanks to Torsten Krah <tkrah@fachschaft.imn.htwk-leipzig.de>. Closes bug #84851.

(Portage version: 2.0.51.21)

6 files changed, 97 insertions, 10 deletions

diff --git a/net-nds/yp-tools/ChangeLog b/net-nds/yp-tools/ChangeLog
index e118fdf934a1..ff7f80d6f8b4 100644
--- a/net-nds/yp-tools/ChangeLog
+++ b/net-nds/yp-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-nds/yp-tools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/ChangeLog,v 1.23 2005/04/01 16:37:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/ChangeLog,v 1.24 2005/05/03 20:47:14 eradicator Exp $
+
+*yp-tools-2.8-r1 (03 May 2005)
+
+  03 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/yp-tools-2.8-bsd.patch, -yp-tools-2.7-r1.ebuild,
+  +yp-tools-2.8-r1.ebuild:
+  Add support for BSD rpc.yppasswd thanks to Torsten Krah
+  <tkrah@fachschaft.imn.htwk-leipzig.de>. Closes bug #84851.
 
   01 Apr 2005; Aron Griffis <agriffis@gentoo.org> yp-tools-2.8.ebuild:
   stable on ia64
diff --git a/net-nds/yp-tools/Manifest b/net-nds/yp-tools/Manifest
index d375f9b80df1..6596f1b56f36 100644
--- a/net-nds/yp-tools/Manifest
+++ b/net-nds/yp-tools/Manifest
@@ -1,6 +1,9 @@
-MD5 f3e2f4201981d00fef0cce0ccdaca464 yp-tools-2.7-r1.ebuild 1086
-MD5 2a106c26c00335716cb0d8c335f36300 yp-tools-2.8.ebuild 1129
 MD5 79aa64953078e370eb9017bc2e359f61 ChangeLog 3146
 MD5 ab59365f7f92becce9ea574af606ca09 metadata.xml 270
-MD5 2b599af2b4904c58b39a22d7043d4de0 files/digest-yp-tools-2.8 65
+MD5 f3e2f4201981d00fef0cce0ccdaca464 yp-tools-2.7-r1.ebuild 1086
+MD5 2a106c26c00335716cb0d8c335f36300 yp-tools-2.8.ebuild 1129
+MD5 a9bf72412e60244784a96d34a6009466 yp-tools-2.8-r1.ebuild 1220
 MD5 8a4aadbeac31db4a5bf80b9506607d41 files/digest-yp-tools-2.7-r1 65
+MD5 2b599af2b4904c58b39a22d7043d4de0 files/digest-yp-tools-2.8 65
+MD5 dc93b4cab3c4ad02f965961251138248 files/yp-tools-2.8-bsd.patch 2245
+MD5 2b599af2b4904c58b39a22d7043d4de0 files/digest-yp-tools-2.8-r1 65
diff --git a/net-nds/yp-tools/files/digest-yp-tools-2.7-r1 b/net-nds/yp-tools/files/digest-yp-tools-2.7-r1
deleted file mode 100644
index c0890568710e..000000000000
--- a/net-nds/yp-tools/files/digest-yp-tools-2.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8d8d2c1c8b4a7e2027215aebe086f651 yp-tools-2.7.tar.bz2 153742
diff --git a/net-nds/yp-tools/files/digest-yp-tools-2.8-r1 b/net-nds/yp-tools/files/digest-yp-tools-2.8-r1
new file mode 100644
index 000000000000..02ac929a83ce
--- /dev/null
+++ b/net-nds/yp-tools/files/digest-yp-tools-2.8-r1
@@ -0,0 +1 @@
+MD5 4a6792c367a3e01e4af7b07f449039e9 yp-tools-2.8.tar.bz2 159738
diff --git a/net-nds/yp-tools/files/yp-tools-2.8-bsd.patch b/net-nds/yp-tools/files/yp-tools-2.8-bsd.patch
new file mode 100644
index 000000000000..c54a8bce9ff3
--- /dev/null
+++ b/net-nds/yp-tools/files/yp-tools-2.8-bsd.patch
@@ -0,0 +1,67 @@
+--- yp-tools-2.8/src/yppasswd.c	2002-12-05 14:49:20.000000000 +0100
++++ yp-tools-2.8/src/yppasswd.c	2005-03-11 13:13:45.700315296 +0100
+@@ -117,6 +117,7 @@
+   fputs (_("  -f             Change GECOS field information\n"), stdout);
+   fputs (_("  -l             Change the login shell\n"), stdout);
+   fputs (_("  -p             Change the password\n"), stdout);
++  fputs (_("  -b             Enable support for *BSD rpc.yppasswd daemon\n"), stdout);
+   fputs (_("  -?, --help     Give this help list\n"), stdout);
+   fputs (_("      --usage    Give a short usage message\n"), stdout);
+   fputs (_("      --version  Print program version\n"), stdout);
+@@ -440,7 +441,7 @@
+ main (int argc, char **argv)
+ {
+   char *s, *progname, *domainname = NULL, *user = NULL, *master = NULL;
+-  int f_flag = 0, l_flag = 0, p_flag = 0, error, status;
++  int f_flag = 0, l_flag = 0, p_flag = 0, error, status, bsd_flag = 0;
+   struct yppasswd yppwd;
+   struct passwd *pwd;
+   CLIENT *clnt;
+@@ -476,7 +477,7 @@
+       };
+ 
+       c = getopt_long (argc, argv,
+-		       (l_flag == 0 && f_flag == 0) ? "flp?" : "?",
++		       (l_flag == 0 && f_flag == 0) ? "flpb?" : "?",
+ 		       long_options, &option_index);
+       if (c == (-1))
+         break;
+@@ -491,6 +492,9 @@
+ 	case 'p':
+ 	  p_flag = 1;
+ 	  break;
++	case 'b':
++	  bsd_flag = 1;
++	  break;
+ 	case '?':
+ 	  if (l_flag)
+ 	    print_help_chsh ();
+@@ -645,7 +649,7 @@
+       /* We can't check the password with shadow passwords enabled. We
+        * leave the checking to yppasswdd */
+       if (uid != 0 && strcmp (pwd->pw_passwd, "x") != 0 &&
+-	  strcmp (pwd->pw_passwd, hashpass ) != 0)
++	  strcmp (pwd->pw_passwd, hashpass ) != 0 && !bsd_flag)
+ 	{
+ 	  int passwdlen;
+ 	  char *sane_passwd;
+--- yp-tools-2.8/man/yppasswd.1.in	2001-12-08 22:34:43.000000000 +0100
++++ yp-tools-2.8/man/yppasswd.1.in	2005-03-11 13:19:45.024689688 +0100
+@@ -20,7 +20,7 @@
+ .SH NAME
+ yppasswd, ypchfn, ypchsh \- change your password in the NIS database
+ .SH SYNOPSIS
+-.B "yppasswd [-f] [-l] [-p] [user]"
++.B "yppasswd [-f] [-l] [-p] [-b] [user]"
+ .br
+ .B "ypchfn [user]"
+ .br
+@@ -48,6 +48,8 @@
+ .BR \-l ,
+ or your GECOS field
+ .BR \-f ,
++interact with *BSD Server
++.BR \-b ,
+ or a combination of them.
+ .B yppasswd
+ implies the
diff --git a/net-nds/yp-tools/yp-tools-2.7-r1.ebuild b/net-nds/yp-tools/yp-tools-2.8-r1.ebuild
index 690649332f14..9eda05d4fbe9 100644
--- a/net-nds/yp-tools/yp-tools-2.7-r1.ebuild
+++ b/net-nds/yp-tools/yp-tools-2.8-r1.ebuild
@@ -1,18 +1,27 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/yp-tools-2.7-r1.ebuild,v 1.15 2005/04/01 16:37:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/yp-tools-2.8-r1.ebuild,v 1.1 2005/05/03 20:47:14 eradicator Exp $
 
-DESCRIPTION="NIS Tools"
+IUSE="nls"
+
+inherit eutils
+
+DESCRIPTION="Network Information Service tools"
 HOMEPAGE="http://www.linux-nis.org/nis/"
-SRC_URI="mirror://kernel/linux/utils/net/NIS/${P}.tar.bz2"
+SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ia64"
-IUSE="nls"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-bsd.patch
+}
+
 src_compile() {
 	local myconf="--sysconfdir=/etc/yp"
 	if ! use nls