New version

(Portage version: 2.0.51.22-r2)

7 files changed, 205 insertions, 16 deletions

diff --git a/net-mail/cmd5checkpw/ChangeLog b/net-mail/cmd5checkpw/ChangeLog
index c74b8e880759..887a70a85a76 100644
--- a/net-mail/cmd5checkpw/ChangeLog
+++ b/net-mail/cmd5checkpw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/cmd5checkpw
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cmd5checkpw/ChangeLog,v 1.29 2005/06/17 21:05:21 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cmd5checkpw/ChangeLog,v 1.30 2005/08/06 20:09:37 hansmi Exp $
+
+*cmd5checkpw-0.30 (06 Aug 2005)
+
+  06 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> +files/euid_030.diff,
+  +files/reloc.diff, metadata.xml, +cmd5checkpw-0.30.ebuild:
+  Changed herd to qmail, added new version 0.30 from bug 100886.
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
   cmd5checkpw-0.22-r3.ebuild:
diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
index f912bfed0d43..e0641eb8fcff 100644
--- a/net-mail/cmd5checkpw/Manifest
+++ b/net-mail/cmd5checkpw/Manifest
@@ -1,20 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 975305081089e4c4dda289f84a3e6c8d cmd5checkpw-0.22-r3.ebuild 1563
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 b65c92614ce11b79c20c4ce803b75fee cmd5checkpw-0.22-r2.ebuild 1518
+MD5 7df733d43f5875dfc63bae636203b8cb metadata.xml 158
 MD5 fcc34cfedfe48bd4c367a1fd462bc4ec ChangeLog 3591
 MD5 9df8118aec8e5b80a5bbf88591a716fd cmd5checkpw-0.22-r1.ebuild 1408
-MD5 ad1486139852e253c71bccd1c53083ba files/digest-cmd5checkpw-0.22-r1 67
+MD5 5797c4c8febaac63db990acebcaeec34 cmd5checkpw-0.30.ebuild 1907
+MD5 b65c92614ce11b79c20c4ce803b75fee cmd5checkpw-0.22-r2.ebuild 1518
 MD5 ad1486139852e253c71bccd1c53083ba files/digest-cmd5checkpw-0.22-r2 67
+MD5 dde2b0fecf3e098fd141366e1e325928 files/euid_030.diff 1107
+MD5 ad37d318fdac4d640e6ee7117a765410 files/reloc.diff 2330
 MD5 970ef1c2abdda72f534516f43e89f20a files/euid.diff 931
-MD5 a3bc1c985b3e114b9e1a4b9a8b7810da files/poppasswd 84
 MD5 ad1486139852e253c71bccd1c53083ba files/digest-cmd5checkpw-0.22-r3 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzHg1gIKl8Uu19MoRAiULAJ96Jffp3x75ef+PPCpEpCit6QclcwCggs/A
-JcUvomqvXNhhOxMQeWCVsM4=
-=Obkf
------END PGP SIGNATURE-----
+MD5 a3bc1c985b3e114b9e1a4b9a8b7810da files/poppasswd 84
+MD5 ad1486139852e253c71bccd1c53083ba files/digest-cmd5checkpw-0.22-r1 67
+MD5 f06d212bf2d9d0028a1d87879b438a8e files/digest-cmd5checkpw-0.30 67
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30.ebuild
new file mode 100644
index 000000000000..5a6c915306df
--- /dev/null
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30.ebuild
@@ -0,0 +1,76 @@
+# 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.30.ebuild,v 1.1 2005/08/06 20:09:37 hansmi Exp $
+
+inherit eutils toolchain-funcs fixheadtails
+
+MY_VER="030"
+
+DESCRIPTION="A checkpassword compatible authentication program that used CRAM-MD5 authentication mode."
+SRC_URI="http://www.fehcom.de/qmail/auth/${PN}-${MY_VER}_tgz.bin"
+HOMEPAGE="http://www.fehcom.de/qmail/smtpauth.html"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+douser() {
+	enewuser cmd5checkpw 212 /bin/false /dev/null bin
+}
+
+pkg_preinst() {
+	douser
+}
+
+pkg_setup() {
+	douser
+	echo
+	ewarn "this version is in NO WAY COMPATIBLE with cmd5checkpw-0.2x"
+	ewarn "it actually receives the authentication credentials"
+	ewarn "in a different order then the old implementation"
+	ewarn "see bug #100693 for details"
+	ewarn "this version IS needed by >=qmail-1.03-r16"
+	echo
+}
+
+src_unpack() {
+	tar -xzf "${DISTDIR}/${PN}-${MY_VER}_tgz.bin" -C "${WORKDIR}"
+	cd "${S}"
+	epatch ${FILESDIR}/euid_${MY_VER}.diff || die
+	epatch ${FILESDIR}/reloc.diff || die
+	ht_fix_file ${S}/Makefile
+}
+
+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/:" \
+		-e "/^LDFLAGS/ a LDFLAGS+='-Wl,-z,now'" \
+		< Makefile.orig > Makefile
+	cd ${S}
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	make || die
+}
+
+src_install() {
+	dodir /etc /bin /usr/share/man/man8
+	insinto /etc
+	doins ${FILESDIR}/poppasswd
+	exeinto /bin
+	doexe cmd5checkpw
+	doman cmd5checkpw.8
+	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.30 b/net-mail/cmd5checkpw/files/digest-cmd5checkpw-0.30
new file mode 100644
index 000000000000..f61f2c294634
--- /dev/null
+++ b/net-mail/cmd5checkpw/files/digest-cmd5checkpw-0.30
@@ -0,0 +1 @@
+MD5 d59aaccd1b52fedec5c99cfe1d301372 cmd5checkpw-030_tgz.bin 25812
diff --git a/net-mail/cmd5checkpw/files/euid_030.diff b/net-mail/cmd5checkpw/files/euid_030.diff
new file mode 100644
index 000000000000..12fa9ecc2e5d
--- /dev/null
+++ b/net-mail/cmd5checkpw/files/euid_030.diff
@@ -0,0 +1,49 @@
+diff -upr cmd5checkpw-0.30.orig/main.c cmd5checkpw-0.30/main.c
+--- cmd5checkpw-0.30.orig/main.c	2003-09-18 16:34:01.000000000 +0300
++++ cmd5checkpw-0.30/main.c	2005-07-31 13:19:25.000000000 +0300
+@@ -5,6 +5,7 @@
+ #include <pwd.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/types.h>
+ 
+ #define LINE_MAX 256
+ #define SASLUSERFILE "/var/qmail/users/authuser"
+@@ -23,10 +24,26 @@ int doit(unsigned char *testlogin, unsig
+    unsigned char h;
+    FILE *fp;
+    int j;
+-
++   uid_t uid;
++   gid_t gid;
+    char *linepnt;
+ 
+    if ((fp = fopen(SASLUSERFILE, READONLY)) == 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;
+@@ -39,7 +56,8 @@ int doit(unsigned char *testlogin, unsig
+ 	 break;
+       }
+    }   
+-   fclose(fp);
++
++   if (EOF == fclose(fp)) _exit(2);
+ 
+    if (!found_user) return(1);
+ 
diff --git a/net-mail/cmd5checkpw/files/reloc.diff b/net-mail/cmd5checkpw/files/reloc.diff
new file mode 100644
index 000000000000..7472436bf469
--- /dev/null
+++ b/net-mail/cmd5checkpw/files/reloc.diff
@@ -0,0 +1,63 @@
+diff -upr cmd5checkpw-0.30.orig/Makefile cmd5checkpw-0.30/Makefile
+--- cmd5checkpw-0.30.orig/Makefile	2003-09-18 16:34:01.000000000 +0300
++++ cmd5checkpw-0.30/Makefile	2005-07-31 14:41:16.000000000 +0300
+@@ -14,7 +14,7 @@ CFLAGS=-c -g -Wall -O3
+ LD=gcc
+ LDFLAGS=-g -o ${TARGET}
+ 
+-default: main man cmd5checkpw
++default: cmd5checkpw
+ 
+ main: cmd5checkpw.c conf-qmail
+ 	sed s}QMAILHOME}"`head -1 conf-qmail`"}g cmd5checkpw.c > main.c
+diff -upr cmd5checkpw-0.30.orig/cmd5checkpw.8 cmd5checkpw-0.30/cmd5checkpw.8
+--- cmd5checkpw-0.30.orig/cmd5checkpw.8	2003-09-18 16:34:01.000000000 +0300
++++ cmd5checkpw-0.30/cmd5checkpw.8	2005-07-31 14:43:20.000000000 +0300
+@@ -26,7 +26,7 @@ and a cram-md5 challenge terminated by \
+ .B cmd5checkpw
+ recalcuates a MD5 digest using the provided plain challenge
+ and the passwords from
+-.IR /var/qmail/users/authuser 
++.IR /etc/poppasswd 
+ and compares it with response (2nd parameter). If they are the same
+ then
+ .B cmd5checkpw
+@@ -50,7 +50,7 @@ exits 111.
+ 
+ .B cmd5checkpw 
+ additionally compares the supplied password with the password in the 
+-.IR /var/qmail/user/authuser 
++.IR /etc/poppasswd 
+ file. Thus it can be used as a plain-text checkpassword
+ for PLAIN & LOGIN authtype (but we recommend using a crypted version for
+ security reasons). To use it, simply provide it with clear text password
+@@ -68,7 +68,7 @@ interface.
+ Before invoking
+ .BR subprogram ,
+ .B cmd5checkpw
+-does not set up anything. Just because users from  /var/qmail/user/authuser does not
++does not set up anything. Just because users from /etc/poppasswd does not
+ have to exist in the system so setting their uid,gid etc is not possible.
+ 
+ Other
+@@ -78,7 +78,7 @@ These effects must be documented;
+ applications will differ in their requirements.
+ 
+ .SH "FILES"
+-.IR /var/qmail/users/authuser 
++.IR /etc/poppasswd 
+ - this file contains pairs of logins and clear text passwords
+ separated by ":". It looks like this:
+ 
+diff -upr cmd5checkpw-0.30.orig/main.c cmd5checkpw-0.30/main.c
+--- cmd5checkpw-0.30.orig/main.c	2003-09-18 16:34:01.000000000 +0300
++++ cmd5checkpw-0.30/main.c	2005-07-31 14:43:36.000000000 +0300
+@@ -7,7 +7,7 @@
+ #include <unistd.h>
+ 
+ #define LINE_MAX 256
+-#define SASLUSERFILE "/var/qmail/users/authuser"
++#define SASLUSERFILE "/etc/poppasswd"
+ #define READONLY "r"
+ char up[513];
+ int uplen;
diff --git a/net-mail/cmd5checkpw/metadata.xml b/net-mail/cmd5checkpw/metadata.xml
index 51f94e3fbe0e..210ce3ffc25e 100644
--- a/net-mail/cmd5checkpw/metadata.xml
+++ b/net-mail/cmd5checkpw/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<herd>qmail</herd>
 </pkgmetadata>