Add pam USE flag and update /etc/pam.d/diald file (#185016). Add ~amd64 keyword.

Package-Manager: portage-2.1.2.7

6 files changed, 180 insertions, 15 deletions

diff --git a/net-dialup/diald/ChangeLog b/net-dialup/diald/ChangeLog
index 2f8e86c9a76d..2ad62569bc5b 100644
--- a/net-dialup/diald/ChangeLog
+++ b/net-dialup/diald/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/diald
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/diald/ChangeLog,v 1.11 2007/04/14 09:22:04 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/diald/ChangeLog,v 1.12 2007/07/12 07:36:27 mrness Exp $
+
+*diald-1.0-r2 (12 Jul 2007)
+
+  12 Jul 2007; Alin Năstac <mrness@gentoo.org>
+  files/diald-1.0-gentoo.patch, +files/diald-1.0-nopam.patch,
+  +diald-1.0-r2.ebuild:
+  Add pam USE flag and update /etc/pam.d/diald file (#185016). Add ~amd64
+  keyword.
 
   14 Apr 2007; Alin Năstac <mrness@gentoo.org>
   files/diald-1.0-gentoo.patch:
diff --git a/net-dialup/diald/Manifest b/net-dialup/diald/Manifest
index 7858059d9425..c7d53688ac0a 100644
--- a/net-dialup/diald/Manifest
+++ b/net-dialup/diald/Manifest
@@ -1,10 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX diald-1.0-gentoo.patch 2936 RMD160 1f92961f021d5f63722a14f04fdb85450d948988 SHA1 51d24c3af53c0da1ddf3c551fd81714398d4afec SHA256 bf22858006d412751ce73032d18e620d47b95189671d6ed6ea12cc9aeb5bf874
-MD5 12500b1086a231c043bd9ed395b37870 files/diald-1.0-gentoo.patch 2936
-RMD160 1f92961f021d5f63722a14f04fdb85450d948988 files/diald-1.0-gentoo.patch 2936
-SHA256 bf22858006d412751ce73032d18e620d47b95189671d6ed6ea12cc9aeb5bf874 files/diald-1.0-gentoo.patch 2936
+AUX diald-1.0-gentoo.patch 3391 RMD160 3f43a6b33d82ba1a638be774a18bb94ce33e3eef SHA1 014213cad3809fbc7dd0632e24ac1b1fe42d01e3 SHA256 8895c92fbc4b5ecd1adbd55d415b8710236242186a818a9c13d4ce09efaabc93
+MD5 4c0159f506fcc7ff3fe9bf16bfc3e4fd files/diald-1.0-gentoo.patch 3391
+RMD160 3f43a6b33d82ba1a638be774a18bb94ce33e3eef files/diald-1.0-gentoo.patch 3391
+SHA256 8895c92fbc4b5ecd1adbd55d415b8710236242186a818a9c13d4ce09efaabc93 files/diald-1.0-gentoo.patch 3391
+AUX diald-1.0-nopam.patch 3479 RMD160 514ec9aadf2384e7ad0722b32bb3ff2662ad4182 SHA1 f0d0352e02e92f968d7af8822a239887cc769ed5 SHA256 546b75702dd0d809afb8c8afd3f1924bb9149645d90f25c04818de170dda945d
+MD5 34142d1c4c4a81a77eea50845098cdaa files/diald-1.0-nopam.patch 3479
+RMD160 514ec9aadf2384e7ad0722b32bb3ff2662ad4182 files/diald-1.0-nopam.patch 3479
+SHA256 546b75702dd0d809afb8c8afd3f1924bb9149645d90f25c04818de170dda945d files/diald-1.0-nopam.patch 3479
 AUX diald-1.0-posix.patch 1275 RMD160 8f49099e78b12d46c093b684430c50fc45fbc464 SHA1 4bb4f2bda30e2945705e70ba79a10e364e9c5844 SHA256 fa2a3f830166783392f571b1f1b766718fd1583ae36148d5eb6acd3bbb92dc5d
 MD5 0127b65125f67e58214d76bafba02d0f files/diald-1.0-posix.patch 1275
 RMD160 8f49099e78b12d46c093b684430c50fc45fbc464 files/diald-1.0-posix.patch 1275
@@ -26,10 +30,14 @@ EBUILD diald-1.0-r1.ebuild 1559 RMD160 dc2332caedbedbf38738ddb8851369e9b8b375b1
 MD5 e0162e7090ef548c4c57e31c20934e5a diald-1.0-r1.ebuild 1559
 RMD160 dc2332caedbedbf38738ddb8851369e9b8b375b1 diald-1.0-r1.ebuild 1559
 SHA256 53a867bd30a5d2fae1ddac3ca87af631cb3dcb02654d33f3a35aa609a7cd6590 diald-1.0-r1.ebuild 1559
-MISC ChangeLog 1308 RMD160 38d243341b4a76a08fa664734ee19262a426906e SHA1 94a62b6382b5089c83d19e14dd6c42488ebc0cdb SHA256 1ba9409a194a01c0cd5c122527d4c66d8b3aa55da61bf62bd660ae99b9c900a8
-MD5 6771e374dfe90c93f01179af9b5d5270 ChangeLog 1308
-RMD160 38d243341b4a76a08fa664734ee19262a426906e ChangeLog 1308
-SHA256 1ba9409a194a01c0cd5c122527d4c66d8b3aa55da61bf62bd660ae99b9c900a8 ChangeLog 1308
+EBUILD diald-1.0-r2.ebuild 1438 RMD160 52d708823386ca0c3091a92d57bb709a248ac8a1 SHA1 16f89ab368dffbff4e1d7b176b2916af2606a111 SHA256 bd463d390ecf5097b8d91bac6846ec6b94bf6e6f6dbf4ee8906ad6cd6c8698f7
+MD5 84ee2cb426b40736f6d46ee7a9a68e7c diald-1.0-r2.ebuild 1438
+RMD160 52d708823386ca0c3091a92d57bb709a248ac8a1 diald-1.0-r2.ebuild 1438
+SHA256 bd463d390ecf5097b8d91bac6846ec6b94bf6e6f6dbf4ee8906ad6cd6c8698f7 diald-1.0-r2.ebuild 1438
+MISC ChangeLog 1557 RMD160 3f8d1d9f4f56554369512fc2e8c84e66cf8ff0c3 SHA1 74145a566133898cc60b855b76b5897286a190bd SHA256 7b66948c173c89d0ae0190988f2064190f9d6344a836d69cc10887b8687b6c5b
+MD5 bcfb15ce9f5770c110b62fd6fef5b8ee ChangeLog 1557
+RMD160 3f8d1d9f4f56554369512fc2e8c84e66cf8ff0c3 ChangeLog 1557
+SHA256 7b66948c173c89d0ae0190988f2064190f9d6344a836d69cc10887b8687b6c5b ChangeLog 1557
 MISC metadata.xml 323 RMD160 ffb14eaa5cf2b73617858918b2672a5ed896035d SHA1 cbccc7ee534fdf47b8764d2b277b02ddbaf93860 SHA256 382fd265f0506a2e7555949a5795737ccd8f55f90ccf74c44b978291e4546f63
 MD5 3609884142a6835c4c2e032d8d0664eb metadata.xml 323
 RMD160 ffb14eaa5cf2b73617858918b2672a5ed896035d metadata.xml 323
@@ -37,10 +45,13 @@ SHA256 382fd265f0506a2e7555949a5795737ccd8f55f90ccf74c44b978291e4546f63 metadata
 MD5 cfe197b10a5d9792a11247dbe9867a04 files/digest-diald-1.0-r1 229
 RMD160 6a76d4dc5de704d430f090e763a7e3affa76a1b5 files/digest-diald-1.0-r1 229
 SHA256 62859507ed0a337ab2b398469b6d3cf3b39b97d7f5340fd6bda25f883c29e1d7 files/digest-diald-1.0-r1 229
+MD5 cfe197b10a5d9792a11247dbe9867a04 files/digest-diald-1.0-r2 229
+RMD160 6a76d4dc5de704d430f090e763a7e3affa76a1b5 files/digest-diald-1.0-r2 229
+SHA256 62859507ed0a337ab2b398469b6d3cf3b39b97d7f5340fd6bda25f883c29e1d7 files/digest-diald-1.0-r2 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGIJ1CJnxX6mF440QRAr1ZAKCYrspvk9thLPS/qpQB4Gn35bmgmgCg/SG7
-VZbafxQnsxQzEZwI4ChGHT0=
-=TyND
+iD8DBQFGldoEVSA5X31g7/gRAhnBAJ9eX1a62staIp4Mhn/wdD8LbSw2NQCeJhQp
+sxmcU2P0rNzZoJ/lT/Mghm4=
+=wEKh
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/diald/diald-1.0-r2.ebuild b/net-dialup/diald/diald-1.0-r2.ebuild
new file mode 100644
index 000000000000..1873c4fba63b
--- /dev/null
+++ b/net-dialup/diald/diald-1.0-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/diald/diald-1.0-r2.ebuild,v 1.1 2007/07/12 07:36:27 mrness Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Daemon that provides on demand IP links via SLIP or PPP"
+HOMEPAGE="http://diald.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~x86"
+IUSE="pam"
+
+DEPEND="pam? ( sys-libs/pam )
+	sys-apps/tcp-wrappers"
+RDEPEND="${DEPEND}
+	net-dialup/ppp"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-posix.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	if ! use pam; then
+		epatch "${FILESDIR}/${P}-nopam.patch"
+		cd "${S}"
+		eautoconf
+	fi
+}
+
+src_install() {
+	dodir /etc/pam.d
+	make \
+		DESTDIR="${D}" \
+		sysconfdir=/etc \
+		bindir=/usr/bin \
+		sbindir=/usr/sbin \
+		mandir=/usr/share/man \
+		libdir=/usr/lib/diald \
+		BINGRP=root \
+		ROOTUID=root \
+		ROOTGRP=root \
+		install || die "make failed"
+
+	dodir /var/cache/diald
+	mknod -m 0660 "${D}/var/cache/diald/diald.ctl" p
+
+	dodoc BUGS CHANGES LICENSE NOTES README* \
+		THANKS TODO TODO.budget doc/diald-faq.txt
+	docinto setup ; cp -pPR setup/* "${D}/usr/share/doc/${PF}/setup"
+	docinto contrib ; cp -pPR contrib/* "${D}/usr/share/doc/${PF}/contrib"
+	prepalldocs
+
+	insinto /etc/diald ; doins "${FILESDIR}"/{diald.conf,diald.filter}
+	newinitd "${FILESDIR}/diald-init" diald
+}
diff --git a/net-dialup/diald/files/diald-1.0-gentoo.patch b/net-dialup/diald/files/diald-1.0-gentoo.patch
index d932fd1888cc..541d74dc3c21 100644
--- a/net-dialup/diald/files/diald-1.0-gentoo.patch
+++ b/net-dialup/diald/files/diald-1.0-gentoo.patch
@@ -1,6 +1,17 @@
+diff -Nru diald-1.0.orig/config/diald.pam diald-1.0/config/diald.pam
+--- diald-1.0.orig/config/diald.pam	1999-10-12 00:29:43.000000000 +0300
++++ diald-1.0/config/diald.pam	2007-07-12 09:52:13.000000000 +0300
+@@ -1,4 +1,4 @@
+ #%PAM-1.0
+-auth       required	pam_nologin.so
+-auth       required	pam_pwdb.so shadow
+-account    required	pam_pwdb.so
++auth       required    pam_nologin.so
++auth       include     system-auth
++account    include     system-auth
 diff -Nru diald-1.0.orig/Makefile.in diald-1.0/Makefile.in
---- diald-1.0.orig/Makefile.in	2001-06-16 14:16:04.000000000 +0300
-+++ diald-1.0/Makefile.in	2005-09-19 23:40:47.855662256 +0300
+--- diald-1.0.orig/Makefile.in	2007-07-12 09:50:22.000000000 +0300
++++ diald-1.0/Makefile.in	2007-07-12 09:44:14.000000000 +0300
 @@ -21,9 +21,13 @@
  mandir          = @mandir@
  
diff --git a/net-dialup/diald/files/diald-1.0-nopam.patch b/net-dialup/diald/files/diald-1.0-nopam.patch
new file mode 100644
index 000000000000..4f21d8c849a3
--- /dev/null
+++ b/net-dialup/diald/files/diald-1.0-nopam.patch
@@ -0,0 +1,74 @@
+diff -Nru diald-1.0.orig/configure.in diald-1.0/configure.in
+--- diald-1.0.orig/configure.in	2001-06-16 19:01:25.000000000 +0300
++++ diald-1.0/configure.in	2007-07-12 09:56:35.000000000 +0300
+@@ -10,7 +10,6 @@
+ dnl Checks for libraries.
+ AC_CHECK_LIB(dl, dlsym)
+ AC_CHECK_LIB(nsl, nis_add)
+-AC_CHECK_LIB(pam, pam_start)
+ AC_CHECK_LIB(wrap, request_init)
+ AC_CHECK_LIB(util, openpty)
+ 
+diff -Nru diald-1.0.orig/doc/diald-control.man diald-1.0/doc/diald-control.man
+--- diald-1.0.orig/doc/diald-control.man	2001-06-15 18:38:20.000000000 +0300
++++ diald-1.0/doc/diald-control.man	2007-07-12 09:55:59.000000000 +0300
+@@ -65,10 +65,6 @@
+ TCP connections.
+ If \fI<method>\fR is "simple" then a single following
+ string specifies the name of the privileges to request.
+-If \fI<method>\fR is "pam" then the two following strings specify
+-the UNIX username and password to be authenticated using PAM
+-(Pluggable Authentication Modules). Privileges are then given
+-according to group membership.
+ .TP
+ .B block
+ Block diald from making outgoing calls until a unblock command is issued.
+diff -Nru diald-1.0.orig/doc/diald.man diald-1.0/doc/diald.man
+--- diald-1.0.orig/doc/diald.man	2001-06-15 18:38:20.000000000 +0300
++++ diald-1.0/doc/diald.man	2007-07-12 09:54:37.000000000 +0300
+@@ -184,11 +184,6 @@
+ (very simple...) for TCP monitor connections.
+ 
+ .TP
+-.B authpam \fI<file>\fR
+-Specifies the name of a file to be used for PAM authentication
+-(not so simple...) for TCP monitor connections.
+-
+-.TP
+ .B scheduler \fI<class>\fR
+ Set diald's scheduling class. Valid choices for systems that
+ support POSIX scheduling classes are:
+diff -Nru diald-1.0.orig/Makefile.in diald-1.0/Makefile.in
+--- diald-1.0.orig/Makefile.in	2007-07-12 09:44:14.000000000 +0300
++++ diald-1.0/Makefile.in	2007-07-12 09:54:11.000000000 +0300
+@@ -67,8 +67,6 @@
+ 	$(INSTALL) -o $(ROOTUID) -g $(BINGRP) lib/*.gif $(DESTDIR)$(libdir)
+ 	$(INSTALL) -o $(ROOTUID) -g $(BINGRP) -m 0644 config/diald.defs $(DESTDIR)$(libdir)/diald.defs
+ 	$(INSTALL) -o $(ROOTUID) -g $(BINGRP) -m 0644 config/standard.filter $(DESTDIR)$(libdir)/standard.filter
+-	$(INSTALL) -d -m 0755 $(DESTDIR)/etc/pam.d
+-	$(INSTALL) -o $(ROOTUID) -g $(ROOTGRP) -m 0644 config/diald.pam $(DESTDIR)/$(sysconfdir)/pam.d/diald
+ 	$(INSTALL) -o $(ROOTUID) -g $(BINGRP) bin/connect $(DESTDIR)$(libdir)/connect
+ 
+ clean:
+diff -Nru diald-1.0.orig/README.pam diald-1.0/README.pam
+--- diald-1.0.orig/README.pam	1999-10-12 00:29:41.000000000 +0300
++++ diald-1.0/README.pam	1970-01-01 02:00:00.000000000 +0200
+@@ -1,18 +0,0 @@
+-      Pluggable Authentication Modules (PAM)
+-      ======================================
+-      
+-Full authentication based on UNIX user names and user groups and login 
+-passwords is now supported on monitor links. This is of most importance
+-to TCP monitor links which were previously very weakly protected.
+-
+-To use PAM authentication, you need to inform diald of the location of the 
+-group security permissions file with the "authpam" configuration option. An
+-example security file is provided in "config/auth.pam".
+-
+-
+-*NOTE* In common with many other network password authentication systems,
+-the password is transmitted over the network in unencrypted plain text
+-format. The implications are that if your physical network is not secure, it
+-is possible for intruders to intercept your passwords. The risk can be
+-minimised by using the tcp_wrappers capability to restrict access to
+-machines on the local area network only.
diff --git a/net-dialup/diald/files/digest-diald-1.0-r2 b/net-dialup/diald/files/digest-diald-1.0-r2
new file mode 100644
index 000000000000..878db57d4da3
--- /dev/null
+++ b/net-dialup/diald/files/digest-diald-1.0-r2
@@ -0,0 +1,3 @@
+MD5 84a5aa3b8d1f12dd9e77f2b43b3d159a diald-1.0.tar.gz 199698
+RMD160 e73cb2b027ea5fa96ea9c89057a27600fe3146b9 diald-1.0.tar.gz 199698
+SHA256 dd7630811006ad0f49512de9f2fa6705e50fb475c5bb12e2dde77e198a863bd0 diald-1.0.tar.gz 199698