New revision with bug 78256 fixed.

Package-Manager: portage-2.0.51-r15

6 files changed, 133 insertions, 7 deletions

diff --git a/net-mail/cmd5checkpw/ChangeLog b/net-mail/cmd5checkpw/ChangeLog
index cba667438eac..c6215d654ee7 100644
--- a/net-mail/cmd5checkpw/ChangeLog
+++ b/net-mail/cmd5checkpw/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/cmd5checkpw
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cmd5checkpw/ChangeLog,v 1.15 2004/07/01 22:29:36 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cmd5checkpw/ChangeLog,v 1.16 2005/02/13 12:22:39 hansmi Exp $
+
+*cmd5checkpw-0.22-r2 (13 Feb 2005)
+
+  13 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> +files/euid.diff,
+  +cmd5checkpw-0.22-r2.ebuild:
+  Drop the effective UID too, see bug 78256.
+
+*cmd5checkpw-0.22-r2 (13 Feb 2005)
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   cmd5checkpw-0.22-r1.ebuild:
diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
index c78dfc96dc47..0e423ee7eb19 100644
--- a/net-mail/cmd5checkpw/Manifest
+++ b/net-mail/cmd5checkpw/Manifest
@@ -1,5 +1,8 @@
-MD5 7ddb02a26ba7af269e89f7ba9762a5c1 ChangeLog 1777
-MD5 42d1fb53de9b6c9e94bad507335656c3 cmd5checkpw-0.22-r1.ebuild 1403
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 ad1486139852e253c71bccd1c53083ba files/digest-cmd5checkpw-0.22-r1 67
+MD5 4ad94d95d424ced613c6678489571c25 ChangeLog 1994
+MD5 aacd8f2db592426a19a8f21256399c34 cmd5checkpw-0.22-r1.ebuild 1399
+MD5 7f7496c7cf3b68506e3a53b90e9ad7cc cmd5checkpw-0.22-r2.ebuild 1517
+MD5 ad1486139852e253c71bccd1c53083ba files/digest-cmd5checkpw-0.22-r2 67
+MD5 970ef1c2abdda72f534516f43e89f20a files/euid.diff 931
 MD5 a3bc1c985b3e114b9e1a4b9a8b7810da files/poppasswd 84
+MD5 ad1486139852e253c71bccd1c53083ba files/digest-cmd5checkpw-0.22-r1 67
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.22-r1.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.22-r1.ebuild
index f5bb986a1660..12c90ad7853b 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.22-r1.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.22-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cmd5checkpw/cmd5checkpw-0.22-r1.ebuild,v 1.14 2004/07/01 22:29:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cmd5checkpw/cmd5checkpw-0.22-r1.ebuild,v 1.15 2005/02/13 12:22:39 hansmi Exp $
 
 inherit eutils gcc
 
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.22-r2.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.22-r2.ebuild
new file mode 100644
index 000000000000..08b2605f1cd8
--- /dev/null
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.22-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cmd5checkpw/cmd5checkpw-0.22-r2.ebuild,v 1.1 2005/02/13 12:22:39 hansmi Exp $
+
+inherit eutils gcc
+
+DESCRIPTION="A checkpassword compatible authentication program that used CRAM-MD5 authentication mode."
+SRC_URI="http://members.elysium.pl/brush/cmd5checkpw/dist/${P}.tar.gz"
+HOMEPAGE="http://members.elysium.pl/brush/cmd5checkpw/"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+douser() {
+	enewuser cmd5checkpw 212 /bin/false /dev/null bin
+}
+
+pkg_preinst() {
+	douser
+}
+
+pkg_setup() {
+	douser
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	epatch ${FILESDIR}/euid.diff || die 'Applying euid.diff failed'
+}
+
+src_compile() {
+	cp Makefile Makefile.orig
+	sed \
+		-e "s:-c -g -Wall -O3:${CFLAGS}:" \
+		-e "s:cp cmd5checkpw /bin/:cp cmd5checkpw \${D}/bin/:" \
+		-e "s:cp cmd5checkpw.8 /usr/man/man8/:cp cmd5checkpw.8 \${D}/usr/share/man/man8/:" \
+		< Makefile.orig > Makefile
+	cd ${S}
+	echo "$(gcc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(gcc-getCC) ${LDFLAGS}" > conf-ld
+	make || die
+}
+
+src_install() {
+	dodir /etc /bin /usr/share/man/man8
+	insinto /etc
+	doins ${FILESDIR}/poppasswd
+	make install
+	fowners cmd5checkpw /etc/poppasswd /bin/cmd5checkpw
+	fperms 400 /etc/poppasswd
+	fperms u+s /bin/cmd5checkpw
+}
+
+pkg_postinst() {
+	chmod 400 ${ROOT}/etc/poppasswd
+	chown cmd5checkpw ${ROOT}/etc/poppasswd
+}
diff --git a/net-mail/cmd5checkpw/files/digest-cmd5checkpw-0.22-r2 b/net-mail/cmd5checkpw/files/digest-cmd5checkpw-0.22-r2
new file mode 100644
index 000000000000..53de5a450fbb
--- /dev/null
+++ b/net-mail/cmd5checkpw/files/digest-cmd5checkpw-0.22-r2
@@ -0,0 +1 @@
+MD5 40092caf3608cbc8bd23220b2b28cb52 cmd5checkpw-0.22.tar.gz 24323
diff --git a/net-mail/cmd5checkpw/files/euid.diff b/net-mail/cmd5checkpw/files/euid.diff
new file mode 100644
index 000000000000..6f5ad4f89bdf
--- /dev/null
+++ b/net-mail/cmd5checkpw/files/euid.diff
@@ -0,0 +1,51 @@
+--- main.c-orig	2004-11-23 11:34:05.757230992 +0100
++++ main.c	2004-11-23 11:55:46.117546176 +0100
+@@ -6,6 +6,10 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ 
++#include <sys/types.h>
++#include <unistd.h>
++
++
+ #define LINE_MAX 256
+ #define SMTP_PASSWD_FILE "/etc/poppasswd"
+ char up[513];
+@@ -22,10 +26,26 @@
+    unsigned char h;
+    FILE *fp;
+    int j;
+-
++   uid_t uid;
++   gid_t gid;
+    char *linepnt;
+ 
+    if ((fp = fopen(SMTP_PASSWD_FILE, "rt")) == NULL) _exit(2);
++
++   uid = getuid();
++   gid = getgid();
++
++   if (gid != getegid()) {
++   	if (setegid(gid))
++		_exit(2);
++   }
++
++
++   if (uid && (uid != geteuid())) {
++   	if (seteuid(uid))
++		_exit(2);
++   }
++
+    while (fgets(line, LINE_MAX, fp) != NULL) {
+          if ((linepnt = strchr(line, '\n')) != NULL) {
+ 	 *linepnt = 0;
+@@ -38,7 +58,8 @@
+ 	 break;
+       }
+    }   
+-   fclose(fp);
++   
++   if (EOF == fclose(fp)) _exit(2);
+ 
+    if (!found_user) return(1);
+