Changed pam files to use "include" notation instead of pam_stack. Also changed versioning scheme.

(Portage version: 2.0.51.20-r5)

4 files changed, 109 insertions, 10 deletions

diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index b5f86e68bd3f..3f56baac74b6 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d5b004fb1c539c147780c7bc7c86629e mailbase-0.00-r9.ebuild 2434
 MD5 78fc96c16b9dc1d4902c62927e664ce9 mailbase-0.00-r4.ebuild 773
 MD5 d70889cf9ee474b30325789a31c253a9 mailbase-0.00-r6.ebuild 902
 MD5 9199352cf76278406a943618dd4a54ef mailbase-0.00-r8.ebuild 2262
+MD5 ef402b7a6a1beb59a0303d7d3598ec29 mailbase-1.ebuild 2360
 MD5 f224d58950c57b4f07888966ad00cd9a mailbase-0.00-r5.ebuild 877
 MD5 a5d2b893cb09235e3c253d9d0c50f3fa mailbase-0.00-r7.ebuild 1922
 MD5 74658ac458acda202001fe3c3e4393d5 ChangeLog 5676
@@ -16,12 +14,7 @@ MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mailbase-0.00-r6 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mailbase-0.00-r7 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mailbase-0.00-r8 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mailbase-0.00-r9 0
+MD5 bf8726d789d853b300f5d703f8f21154 files/common-pamd-include 354
 MD5 df65e6e407e866c7e6721e79f731ae6a files/mailcap 2235
 MD5 a5623a262865054bd43c914e740a2e52 files/aliases 809
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCWrIjViELBEf1JB0RAt/cAJ9pkNrSi3NlBMUIBNx/ehlJAhpSkACePinp
-3sGk4ji3NFDwOcmw0KXBWW4=
-=fVDR
------END PGP SIGNATURE-----
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mailbase-1 0
diff --git a/net-mail/mailbase/files/common-pamd-include b/net-mail/mailbase/files/common-pamd-include
new file mode 100644
index 000000000000..f2d511a6020c
--- /dev/null
+++ b/net-mail/mailbase/files/common-pamd-include
@@ -0,0 +1,8 @@
+# Provided by mailbase (dont remove this line!)
+# Standard pam.d file for mail service packages.
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/files/common-pamd-include,v 1.1 2005/04/29 13:07:50 ticho Exp $
+
+auth       required     pam_nologin.so
+auth       include      system-auth
+account    include      system-auth
+session    include      system-auth
diff --git a/net-mail/mailbase/files/digest-mailbase-1 b/net-mail/mailbase/files/digest-mailbase-1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/net-mail/mailbase/files/digest-mailbase-1
diff --git a/net-mail/mailbase/mailbase-1.ebuild b/net-mail/mailbase/mailbase-1.ebuild
new file mode 100644
index 000000000000..f2a6b33c197a
--- /dev/null
+++ b/net-mail/mailbase/mailbase-1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/mailbase-1.ebuild,v 1.1 2005/04/29 13:07:50 ticho Exp $
+
+DESCRIPTION="MTA layout package"
+SRC_URI=""
+HOMEPAGE="http://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
+IUSE="pam"
+
+RDEPEND="virtual/pam"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	if use pam;
+	then
+		local filestoremove=0;
+		local lineorig=`head -n 1 ${FILESDIR}/common-pamd`
+		local lineold=""
+
+		einfo "Checking for possible file collisions..."
+
+		for i in pop pop3 pop3s pops imap imap4 imap4s imaps;
+		do
+			if [[ -e ${ROOT}/etc/pam.d/${i} ]]
+			then
+				lineold="`head -n 1 ${ROOT}/etc/pam.d/${i}`"
+
+				if [[ "${lineorig}" != "${lineold}" ]]
+				then
+					ewarn "${ROOT}/etc/pam.d/${i} exists and wasn't provided by mailbase"
+					(( filestoremove++ ))
+				fi
+			fi
+		done
+
+		if [[ filestoremove -gt 0 ]]
+		then
+			echo
+			einfo "Those files listed above have to be removed in order to"
+			einfo " install this version of mailbase."
+			echo
+			ewarn "If you edited them, remember to backup and when restoring make"
+			ewarn " sure the first line in each file is:"
+			einfo ${lineorig}
+			die "Can't be installed, files will collide"
+		else
+			einfo "... everything looks ok"
+		fi
+	fi
+}
+
+src_install() {
+	dodir /etc/mail
+	insinto /etc/mail
+	doins ${FILESDIR}/aliases
+	insinto /etc/
+	doins ${FILESDIR}/mailcap
+
+	keepdir /var/spool/mail
+	fowners root:mail /var/spool/mail
+	fperms 0775 /var/spool/mail
+	dosym /var/spool/mail /var/mail
+
+	if use pam;
+	then
+		insinto /etc/pam.d/
+
+		# pop file and its symlinks
+		newins ${FILESDIR}/common-pamd-include pop
+		dosym /etc/pam.d/pop /etc/pam.d/pop3
+		dosym /etc/pam.d/pop /etc/pam.d/pop3s
+		dosym /etc/pam.d/pop /etc/pam.d/pops
+
+		# imap file and its symlinks
+		newins ${FILESDIR}/common-pamd-include imap
+		dosym /etc/pam.d/imap /etc/pam.d/imap4
+		dosym /etc/pam.d/imap /etc/pam.d/imap4s
+		dosym /etc/pam.d/imap /etc/pam.d/imaps
+	fi
+}
+
+pkg_postinst() {
+	if [ "$(stat -c%a ${ROOT}/var/spool/mail/)" != "775" ] ; then
+		echo
+		ewarn
+		ewarn "Your ${ROOT}/var/spool/mail/ directory permissions differ from"
+		ewarn "  those which mailbase set when you first installed it (0775)."
+		ewarn "  If you did not change them on purpose, consider running:"
+		ewarn
+		echo -e "\tchmod 0775 ${ROOT}/var/spool/mail/"
+		echo
+	fi
+}