diff options
| -rw-r--r-- | net-dialup/diald/ChangeLog | 9 | ||||
| -rw-r--r-- | net-dialup/diald/diald-1.0-r2.ebuild | 9 | ||||
| -rw-r--r-- | net-dialup/diald/files/diald-1.0-gentoo.patch | 24 | ||||
| -rw-r--r-- | net-dialup/diald/files/diald-1.0-nopam.patch | 34 |
4 files changed, 18 insertions, 58 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/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. |