Cosmetic pam changes (#210863).

Package-Manager: portage-2.1.4.4

5 files changed, 32 insertions, 62 deletions

diff --git a/net-dialup/diald/ChangeLog b/net-dialup/diald/ChangeLog
index 0af85b0270fd..935a228ed01c 100644
--- a/net-dialup/diald/ChangeLog
+++ b/net-dialup/diald/ChangeLog
@@ -1,6 +1,11 @@
 # 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.14 2007/07/18 07:17:50 mrness Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/diald/ChangeLog,v 1.15 2008/04/13 18:16:56 mrness Exp $
+
+  13 Apr 2008; Alin Năstac <mrness@gentoo.org>
+  files/diald-1.0-gentoo.patch, files/diald-1.0-nopam.patch,
+  diald-1.0-r2.ebuild:
+  Cosmetic pam changes (#210863).
 
   18 Jul 2007; Alin Năstac <mrness@gentoo.org> -diald-1.0-r1.ebuild:
   Remove old revision.
diff --git a/net-dialup/diald/Manifest b/net-dialup/diald/Manifest
index 6695c718b741..61adb733c046 100644
--- a/net-dialup/diald/Manifest
+++ b/net-dialup/diald/Manifest
@@ -1,10 +1,20 @@
-AUX diald-1.0-gentoo.patch 3391 RMD160 3f43a6b33d82ba1a638be774a18bb94ce33e3eef SHA1 014213cad3809fbc7dd0632e24ac1b1fe42d01e3 SHA256 8895c92fbc4b5ecd1adbd55d415b8710236242186a818a9c13d4ce09efaabc93
-AUX diald-1.0-nopam.patch 3479 RMD160 514ec9aadf2384e7ad0722b32bb3ff2662ad4182 SHA1 f0d0352e02e92f968d7af8822a239887cc769ed5 SHA256 546b75702dd0d809afb8c8afd3f1924bb9149645d90f25c04818de170dda945d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX diald-1.0-gentoo.patch 2833 RMD160 5d92bc509673cd81440f8bc87250ae5ec6bb79d4 SHA1 c4cd67bedfdcc06f727e11ef85de55bf8c4531af SHA256 ace2671a8eb4a732663acf2f30f15a08109e10c0724de4d2afb2cab48f8a8c03
+AUX diald-1.0-nopam.patch 1621 RMD160 e3c9e7ab658bd9134714907e8cab237ff66f42b9 SHA1 83990b09c8059bbf0e3df7f255844390f78f0fd4 SHA256 1dd5493880a40395ea63769739fd265900f2171d1f48096070d81d44d13fdad1
 AUX diald-1.0-posix.patch 1275 RMD160 8f49099e78b12d46c093b684430c50fc45fbc464 SHA1 4bb4f2bda30e2945705e70ba79a10e364e9c5844 SHA256 fa2a3f830166783392f571b1f1b766718fd1583ae36148d5eb6acd3bbb92dc5d
 AUX diald-init 718 RMD160 7e835e49f28ac4fe651b7d51431ba037035484a2 SHA1 d6f90ef6fdd895ac3867d9114c6605eb57b2180b SHA256 ab75d007ca2304135e44ff41ce7cb461c36d20c6e4de1e0e871157f24f72c107
 AUX diald.conf 997 RMD160 35266a87972c5988cd88edc02cf008ebbc33bce5 SHA1 5c7a28bf6190170bf452b8c538f431585cfa2336 SHA256 26675832c62e6401aeb7750f1863bf0819baf054f0a9a9ef31669553acd7e484
 AUX diald.filter 4647 RMD160 bbf2e3c99d63949d62423cdee3e04838829be3ec SHA1 b23d019601eb4967ec357d339bd9bb6025dfc1be SHA256 2c1e1606e599e0532e75e0f7357044e3a32044a1c75ebfcc73e1c0caceabff9e
 DIST diald-1.0.tar.gz 199698 RMD160 e73cb2b027ea5fa96ea9c89057a27600fe3146b9 SHA1 b9ce61b57362e7240d49cf362a9dcf7f3e80653e SHA256 dd7630811006ad0f49512de9f2fa6705e50fb475c5bb12e2dde77e198a863bd0
-EBUILD diald-1.0-r2.ebuild 1436 RMD160 f9ba1a4a8e0ef460c4f25dca20abbc2eb8c30cd9 SHA1 94df67e746b3e04ffcaacabc03a4c205380728a3 SHA256 ddf68fe6e69cdcb4501b553e0adeaae111ac5e42936af61e62c483bd7eb06ff7
-MISC ChangeLog 1753 RMD160 985c90cf7b47fbd0f3ba74bdf8a35ab450b08237 SHA1 93d4ed45c110031059c540ed4ccf433da309631c SHA256 15e13419a02314592db39818a8d6b81080d747903dc7e725894d37d36acaccf4
+EBUILD diald-1.0-r2.ebuild 1495 RMD160 3b381a93f49a714d0ad404512e336609a813ad2b SHA1 84a91f726b2a714bc57ec02e7cdc6271c8d4dcbe SHA256 77824e798b20942b1981f68d16b9958a57827a85840bd225b57970c33e708d50
+MISC ChangeLog 1920 RMD160 b57e65e4f1afacbd7ad176e8237880202f988a3c SHA1 44c0d44eef15e5332b80a8bcaefe61be5278730b SHA256 75b4d64ee00388b52fcb5ff2467e36fa413b93bc96a569dda605185f7da281cb
 MISC metadata.xml 323 RMD160 ffb14eaa5cf2b73617858918b2672a5ed896035d SHA1 cbccc7ee534fdf47b8764d2b277b02ddbaf93860 SHA256 382fd265f0506a2e7555949a5795737ccd8f55f90ccf74c44b978291e4546f63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIAk5i+fWpoTWIA9ERAtWaAJ421O/jnVt0AcHtnLtj/Up4iptSSACgjiWO
+fmq8Hn9lS7ez5JQDnCDUxro=
+=vHXq
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/diald/diald-1.0-r2.ebuild b/net-dialup/diald/diald-1.0-r2.ebuild
index 0a0b11ebe1e1..b9563ac01f07 100644
--- a/net-dialup/diald/diald-1.0-r2.ebuild
+++ b/net-dialup/diald/diald-1.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.2 2007/07/17 19:38:08 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/diald/diald-1.0-r2.ebuild,v 1.3 2008/04/13 18:16:56 mrness Exp $
 
-inherit eutils autotools
+inherit eutils autotools pam
 
 DESCRIPTION="Daemon that provides on demand IP links via SLIP or PPP"
 HOMEPAGE="http://diald.sourceforge.net"
@@ -25,13 +25,13 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 	if ! use pam; then
 		epatch "${FILESDIR}/${P}-nopam.patch"
+		rm "${S}"/README.pam
 		cd "${S}"
 		eautoconf
 	fi
 }
 
 src_install() {
-	dodir /etc/pam.d
 	make \
 		DESTDIR="${D}" \
 		sysconfdir=/etc \
@@ -43,6 +43,7 @@ src_install() {
 		ROOTUID=root \
 		ROOTGRP=root \
 		install || die "make failed"
+	use pam && pamd_mimic_system diald auth account
 
 	dodir /var/cache/diald
 	mknod -m 0660 "${D}/var/cache/diald/diald.ctl" p
diff --git a/net-dialup/diald/files/diald-1.0-gentoo.patch b/net-dialup/diald/files/diald-1.0-gentoo.patch
index 541d74dc3c21..0e6f538ef76c 100644
--- a/net-dialup/diald/files/diald-1.0-gentoo.patch
+++ b/net-dialup/diald/files/diald-1.0-gentoo.patch
@@ -1,17 +1,6 @@
-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	2007-07-12 09:50:22.000000000 +0300
-+++ diald-1.0/Makefile.in	2007-07-12 09:44:14.000000000 +0300
+--- diald-1.0.orig/Makefile.in	2008-04-13 21:09:37.000000000 +0300
++++ diald-1.0/Makefile.in	2008-04-13 21:11:17.000000000 +0300
 @@ -21,9 +21,13 @@
  mandir          = @mandir@
  
@@ -27,7 +16,7 @@ diff -Nru diald-1.0.orig/Makefile.in diald-1.0/Makefile.in
  			-DDIALD_DEFS_FILE=\"@libdir@/diald/diald.defs\" \
  			-DRUN_PREFIX=\"@localstatedir@/run\"
  INSTALL         = @INSTALL@
-@@ -51,21 +55,21 @@
+@@ -51,21 +55,19 @@
  	$(INSTALL) -d $(DESTDIR)$(bindir)
  	$(INSTALL) -m 0755 bin/dctrl $(DESTDIR)$(bindir)/dctrl
  	$(INSTALL) -d $(DESTDIR)$(sbindir)
@@ -49,13 +38,12 @@ diff -Nru diald-1.0.orig/Makefile.in diald-1.0/Makefile.in
 -	$(INSTALL) -o root -g bin lib/*.gif $(DESTDIR)$(libdir)
 -	$(INSTALL) -o root -g bin -m 0644 config/diald.defs $(DESTDIR)$(libdir)/diald.defs
 -	$(INSTALL) -o root -g bin -m 0644 config/standard.filter $(DESTDIR)$(libdir)/standard.filter
+-	$(INSTALL) -d -m 0755 $(DESTDIR)/etc/pam.d
+-	$(INSTALL) -o root -g root -m 0644 config/diald.pam $(DESTDIR)/$(sysconfdir)/pam.d/diald
+-	$(INSTALL) -o root -g bin bin/connect $(DESTDIR)$(libdir)/connect
 +	$(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 root -g root -m 0644 config/diald.pam $(DESTDIR)/$(sysconfdir)/pam.d/diald
--	$(INSTALL) -o root -g bin bin/connect $(DESTDIR)$(libdir)/connect
-+	$(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 --git a/net-dialup/diald/files/diald-1.0-nopam.patch b/net-dialup/diald/files/diald-1.0-nopam.patch
index 4f21d8c849a3..7fb78b5631a2 100644
--- a/net-dialup/diald/files/diald-1.0-nopam.patch
+++ b/net-dialup/diald/files/diald-1.0-nopam.patch
@@ -38,37 +38,3 @@ diff -Nru diald-1.0.orig/doc/diald.man diald-1.0/doc/diald.man
  .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.