Attachment #81794 for bug #97957

Lines 1-6 Link Here

(-)ChangeLog.old (+5 lines)
1	# ChangeLog for mail-mta/qmail-ldap	1	# ChangeLog for mail-mta/qmail-ldap
2	# $Header $	2	# $Header $
3		3
		4	09 mar 2006; Ed Cates <ed@ed-n-cresta.net>
		5	Falador on the forums pointed out that Gentoo 2006.0 does not have the
		6	qmail system users by default. I've updated the ebuild to add them,
		7	using the old Gentoo System IDs.
		8
4	07 Mar 2006; Ed Cates <ed@ed-n-cresta.net>	9	07 Mar 2006; Ed Cates <ed@ed-n-cresta.net>
5	qmail-ldap-1.0.3-r6.ebuild	10	qmail-ldap-1.0.3-r6.ebuild
6	Updated to use qmail-ldap-20060201 patch	11	Updated to use qmail-ldap-20060201 patch




# Where the rules for tcpserver will be kept:
TCPRULES_DIR=/etc/tcprules.d

if use vmail ; then
    # Set up this way so we can get $VMAILUSER during
	# pkg_config without having to pass more environtment
	# variables.  This text will appear in the "comment"
	# field for $VMAILUSER in /etc/passwd
	vmailgecos="Virtual Mail user for qmail-ldap"
fi

pkg_setup() {

	! use readvars && [[ -z $LDAPFLAGS ]] && [[ -z $VMAILUSER ]] \
		&& [[ -z $VDOMAINS ]] && explain_vars
}

explain_vars() {
	echo ""
	ewarn "This ebuild comes with some environment variables you can set"

	exit 1
}

! use readvars && [[ -z $LDAPFLAGS ]] && [[ -z $VMAILUSER ]] \
	&& [[ -z $VDOMAINS ]] && explain_vars
pkg_setup() {
	# Gentoo 2006.0 doesn't have qmail system users by default
	#   Thanks to Falador on the forums for pointing this out!

	# These apparently need to be here because the qmail code checks for some
	# 	of these while compiling.  Yay! :-P
	einfo "Creating users and groups for qmail system users if necessary ..."
		enewgroup qmail 201
		enewgroup nofiles 200
		enewuser alias 200 /bin/true /var/qmail/alias nofiles "-cSystem account for qmail alias"
		enewuser qmaild 201 /bin/true /var/qmail nofiles "-cSystem account for qmail"
		enewuser qmaill 202 /bin/true /var/qmail nofiles "-cSystem account for qmail"
		enewuser qmailp 203 /bin/true /var/qmail nofiles "-cSystem account for qmail"
		enewuser qmailq 204 /bin/true /var/qmail qmail "-cSystem account for qmail queue"
		enewuser qmailr 205 /bin/true /var/qmail qmail "-cSystem account for qmail"
		enewuser qmails 206 /bin/true /var/qmail qmail "-cSystem account for qmail"
}
src_unpack() {




		# What user/group name to use for the virtual user:
		[ -z "${VMAILUSER}" ] && VMAILUSER="vmail"
		

		# What user/group name to use for the virtual user:
		[ -z "${VMAILUSER}" ] && VMAILUSER="vmail"

		# The home directory for $VMAILUSER.  All user mail
		# will be kept in a subdirectory of $VMAILHOME

		einfo "Modifying qmail-ldap to work with virtual mail accounts" 
		sed -i -e 's/"homeDirectory"/"notreallyahomeDirectory"/' ${S}/qmail-ldap.h

		echo "11184" > ${WORKDIR}/ldapuid
		echo "2110" > ${WORKDIR}/ldapgid
		echo "${VMAILHOME}" > ${WORKDIR}/ldapmessagestore

		if [  -n "${VDOMAINS}" ] ; then
		
			EPATCH_SINGLE_MSG="Applying patch to allow vpopmail-style virtual domains" \

	use spp && doins ${FILESDIR}/control/smtpplugins
	newins ${FILESDIR}/dot_qmail defaultdelivery
	use ssl && doins ${FILESDIR}/${PVR}/servercert.cnf
	if use vmail; then
		doins ${WORKDIR}/ldapuid
		doins ${WORKDIR}/ldapgid
		doins ${WORKDIR}/ldapmessagestore
	fi

	einfo "Adding qmail.schema to OpenLDAP's schema directory"
	diropts -o root -g root -m 0755

		eerror "You may have already moved them, but please check."
		echo
	fi

	# Gentoo 2006.0 doesn't have qmail system users by default
	#	Thanks to Falador on the forums for pointing this out!
	einfo "Creating users and groups for qmail system users if necessary ..."
		enewgroup qmail 201
		enewgroup nofiles 200
		enewuser alias 200 /bin/true /var/qmail/alias nofiles "-cSystem account for qmail alias"
		enewuser qmaild 201 /bin/true /var/qmail nofiles "-cSystem account for qmail"
		enewuser qmaill 202 /bin/true /var/qmail nofiles "-cSystem account for qmail"
		enewuser qmailp 203 /bin/true /var/qmail nofiles "-cSystem account for qmail"
		enewuser qmailq 204 /bin/true /var/qmail qmail "-cSystem account for qmail queue"
		enewuser qmailr 205 /bin/true /var/qmail qmail "-cSystem account for qmail"
		enewuser qmails 206 /bin/true /var/qmail qmail "-cSystem account for qmail"
		
	if use vmail ; then
		einfo "Creating user and group for ${VMAILUSER} account ..."
		enewgroup ${VMAILUSER}  2110
		enewuser "${VMAILUSER}" 11184 /bin/bash "${VMAILHOME}" "${VMAILUSER}" "-cVirtual Mail user for qmail-ldap"
		diropts -m0770 -o ${VMAILUSER} -g ${VMAILUSER}
		keepdir ${VMAILHOME}
	fi

		if ! use notlsbeforeauth ; then
			einfo "Enabling STARTTLS before SMTP AUTH"
			no_relay_string="${no_relay_string},SMTPAUTH=\"TLSREQUIRED\""
		#else
		#	ewarn "Enabling SMTP AUTH **WITHOUT** STARTTLS"
		#	no_relay_string="${no_relay_string},SMTPAUTH=\"\""
		fi
	else
		ewarn "Enabling SMTP AUTH **WITHOUT** STARTTLS"

	[ ! -f ${ROOT}var/qmail/control/ldaprebind ] && \
		einfo "Allowing qmail-ldap to rebind to the LDAP server (allows for stricter ACLs on passwords)" && \
		echo "1" > ${ROOT}var/qmail/control/ldaprebind
	if use vmail ; then
		local `bzgrep ^VMAILUSER /var/db/pkg/${CATEGORY}/${PF}/environment.bz2`
		varray=( `egetent passwd ${VMAILUSER} |awk -F : {'print $3" "$4" "$6'}` )
		
		[ ! -f ${ROOT}var/qmail/control/ldapuid ] && \
			einfo "Setting ${VMAILUSER}'s uid in ${ROOT}var/qmail/control/ldapuid"
			echo "${varray[0]}" > ${ROOT}var/qmail/control/ldapuid 
		[ ! -f ${ROOT}var/qmail/control/ldapgid ] && \
			einfo "Setting ${VMAILUSER}'s gid in ${ROOT}var/qmail/control/ldapgid"
			echo "${varray[1]}" > ${ROOT}var/qmail/control/ldapgid
		[ ! -f ${ROOT}var/qmail/control/ldapmessagestore ] && \
			einfo "Setting ${VMAILUSER}'s home directory in ${ROOT}var/qmail/control/ldapmessagestore"
			echo "${varray[2]}" > ${ROOT}var/qmail/control/ldapmessagestore
	fi
}

Lines 1-3 Link Here

(-)files/digest-qmail-ldap-1.03-r6.old (-1 / +1 lines)
1	MD5 2f6ba8c2c4ab7eb5cdf74603086174a7 qmail-1.03-ldap-1.03-20060201-spp-0.41.diff 13197	1	MD5 dd73e3b5edfbccbc5621667b5d0cc3b0 qmail-1.03-ldap-1.03-20060201-spp-0.41.diff 13195
2	MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668	2	MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668
3	MD5 55fa135415ee011f3f4234d7d52a3565 qmail-ldap-1.03-20060201.patch.gz 270788	3	MD5 55fa135415ee011f3f4234d7d52a3565 qmail-ldap-1.03-20060201.patch.gz 270788

Return to bug 97957

Lines 1-4 Link Here

(-)Manifest.old (-3 / +3 lines)
1	MD5 98eef7933928139796633f2c2eb2242b ChangeLog 6230	1	MD5 f3e7a3441fb85000b96d1257dc92f50c ChangeLog 6457
2	MD5 fd098ab9ede9c74f209bf16e168ab185 files/1.03-r5/conf-common 2328	2	MD5 fd098ab9ede9c74f209bf16e168ab185 files/1.03-r5/conf-common 2328
3	MD5 596c31eed1e948682630056cf46dd5fc files/1.03-r5/conf-pop3d 1271	3	MD5 596c31eed1e948682630056cf46dd5fc files/1.03-r5/conf-pop3d 1271
4	MD5 52892cdf994815c6767ffbafc49df454 files/1.03-r5/conf-qmqpd 465	4	MD5 52892cdf994815c6767ffbafc49df454 files/1.03-r5/conf-qmqpd 465
Lines 53-59 Link Here
53	MD5 5749d97cc782c24eb876804095500505 files/control/Makefile 487	53	MD5 5749d97cc782c24eb876804095500505 files/control/Makefile 487
54	MD5 deff0413b2173ad217eca5bc5c7d7408 files/control/smtpplugins 648	54	MD5 deff0413b2173ad217eca5bc5c7d7408 files/control/smtpplugins 648
55	MD5 1b11b4377782dc992c67e39043a20210 files/digest-qmail-ldap-1.03-r5 229	55	MD5 1b11b4377782dc992c67e39043a20210 files/digest-qmail-ldap-1.03-r5 229
56	MD5 207c7a38d7c9e6a054fd52b1cfb895d1 files/digest-qmail-ldap-1.03-r6 227	56	MD5 98364989dcf951549fa4a59532f4daa0 files/digest-qmail-ldap-1.03-r6 227
57	MD5 b4f71781143dbefb10e0943eb8d446d6 files/dirmaker 110	57	MD5 b4f71781143dbefb10e0943eb8d446d6 files/dirmaker 110
58	MD5 c378c5845848ee31d70f0d05cbcf86be files/dot_qmail 12	58	MD5 c378c5845848ee31d70f0d05cbcf86be files/dot_qmail 12
59	MD5 0452985e25c0b8c14d9405c10600a06b files/qmail-config-system 1087	59	MD5 0452985e25c0b8c14d9405c10600a06b files/qmail-config-system 1087
Lines 68-71 Link Here
68	MD5 9709a485d0c2187a4e22faa276bd2c76 files/tcprules/tcp.smtp.sample 1837	68	MD5 9709a485d0c2187a4e22faa276bd2c76 files/tcprules/tcp.smtp.sample 1837
69	MD5 c07e4481988f254eed6c443fe156f2ca metadata.xml 487	69	MD5 c07e4481988f254eed6c443fe156f2ca metadata.xml 487
70	MD5 dc2c75f0d62603303366b549b275ce4a qmail-ldap-1.03-r5.ebuild 19593	70	MD5 dc2c75f0d62603303366b549b275ce4a qmail-ldap-1.03-r5.ebuild 19593
71	MD5 4c3ac56e6d3a7d0b960e384498afd6e7 qmail-ldap-1.03-r6.ebuild 23283	71	MD5 6f198fceac9ea0a21966fc331ef4b3cd qmail-ldap-1.03-r6.ebuild 25337

Lines 40-59 Link Here

(-)qmail-ldap-1.03-r6.ebuild.old (-29 / +53 lines)
40	# Where the rules for tcpserver will be kept:	40	# Where the rules for tcpserver will be kept:
41	TCPRULES_DIR=/etc/tcprules.d	41	TCPRULES_DIR=/etc/tcprules.d
42		42
43	if use vmail ; then
44	# Set up this way so we can get $VMAILUSER during
45	# pkg_config without having to pass more environtment
46	# variables. This text will appear in the "comment"
47	# field for $VMAILUSER in /etc/passwd
48	vmailgecos="Virtual Mail user for qmail-ldap"
49	fi
50
51	pkg_setup() {
52
53	! use readvars && [[ -z $LDAPFLAGS ]] && [[ -z $VMAILUSER ]] \
54	&& [[ -z $VDOMAINS ]] && explain_vars
55	}
56
57	explain_vars() {	43	explain_vars() {
58	echo ""	44	echo ""
59	ewarn "This ebuild comes with some environment variables you can set"	45	ewarn "This ebuild comes with some environment variables you can set"
Lines 132-137 Link Here
132	exit 1	118	exit 1
133	}	119	}
134		120
		121	! use readvars && [[ -z $LDAPFLAGS ]] && [[ -z $VMAILUSER ]] \
		122	&& [[ -z $VDOMAINS ]] && explain_vars
		123	pkg_setup() {
		124	# Gentoo 2006.0 doesn't have qmail system users by default
		125	# Thanks to Falador on the forums for pointing this out!
		126
		127	# These apparently need to be here because the qmail code checks for some
		128	# of these while compiling. Yay! :-P
		129	einfo "Creating users and groups for qmail system users if necessary ..."
		130	enewgroup qmail 201
		131	enewgroup nofiles 200
		132	enewuser alias 200 /bin/true /var/qmail/alias nofiles "-cSystem account for qmail alias"
		133	enewuser qmaild 201 /bin/true /var/qmail nofiles "-cSystem account for qmail"
		134	enewuser qmaill 202 /bin/true /var/qmail nofiles "-cSystem account for qmail"
		135	enewuser qmailp 203 /bin/true /var/qmail nofiles "-cSystem account for qmail"
		136	enewuser qmailq 204 /bin/true /var/qmail qmail "-cSystem account for qmail queue"
		137	enewuser qmailr 205 /bin/true /var/qmail qmail "-cSystem account for qmail"
		138	enewuser qmails 206 /bin/true /var/qmail qmail "-cSystem account for qmail"
		139	}
135	src_unpack() {	140	src_unpack() {
136		141
137		142
Lines 142-147 Link Here
142		147
143	# What user/group name to use for the virtual user:	148	# What user/group name to use for the virtual user:
144	[ -z "${VMAILUSER}" ] && VMAILUSER="vmail"	149	[ -z "${VMAILUSER}" ] && VMAILUSER="vmail"
		150
		151
		152	# What user/group name to use for the virtual user:
		153	[ -z "${VMAILUSER}" ] && VMAILUSER="vmail"
145		154
146	# The home directory for $VMAILUSER. All user mail	155	# The home directory for $VMAILUSER. All user mail
147	# will be kept in a subdirectory of $VMAILHOME	156	# will be kept in a subdirectory of $VMAILHOME
Lines 267-276 Link Here
267	einfo "Modifying qmail-ldap to work with virtual mail accounts"	276	einfo "Modifying qmail-ldap to work with virtual mail accounts"
268	sed -i -e 's/"homeDirectory"/"notreallyahomeDirectory"/' ${S}/qmail-ldap.h	277	sed -i -e 's/"homeDirectory"/"notreallyahomeDirectory"/' ${S}/qmail-ldap.h
269		278
270	echo "11184" > ${WORKDIR}/ldapuid
271	echo "2110" > ${WORKDIR}/ldapgid
272	echo "${VMAILHOME}" > ${WORKDIR}/ldapmessagestore
273
274	if [ -n "${VDOMAINS}" ] ; then	279	if [ -n "${VDOMAINS}" ] ; then
275		280
276	EPATCH_SINGLE_MSG="Applying patch to allow vpopmail-style virtual domains" \	281	EPATCH_SINGLE_MSG="Applying patch to allow vpopmail-style virtual domains" \
Lines 444-454 Link Here
444	use spp && doins ${FILESDIR}/control/smtpplugins	449	use spp && doins ${FILESDIR}/control/smtpplugins
445	newins ${FILESDIR}/dot_qmail defaultdelivery	450	newins ${FILESDIR}/dot_qmail defaultdelivery
446	use ssl && doins ${FILESDIR}/${PVR}/servercert.cnf	451	use ssl && doins ${FILESDIR}/${PVR}/servercert.cnf
447	if use vmail; then
448	doins ${WORKDIR}/ldapuid
449	doins ${WORKDIR}/ldapgid
450	doins ${WORKDIR}/ldapmessagestore
451	fi
452		452
453	einfo "Adding qmail.schema to OpenLDAP's schema directory"	453	einfo "Adding qmail.schema to OpenLDAP's schema directory"
454	diropts -o root -g root -m 0755	454	diropts -o root -g root -m 0755
Lines 566-575 Link Here
566	eerror "You may have already moved them, but please check."	566	eerror "You may have already moved them, but please check."
567	echo	567	echo
568	fi	568	fi
569		569
		570	# Gentoo 2006.0 doesn't have qmail system users by default
		571	# Thanks to Falador on the forums for pointing this out!
		572	einfo "Creating users and groups for qmail system users if necessary ..."
		573	enewgroup qmail 201
		574	enewgroup nofiles 200
		575	enewuser alias 200 /bin/true /var/qmail/alias nofiles "-cSystem account for qmail alias"
		576	enewuser qmaild 201 /bin/true /var/qmail nofiles "-cSystem account for qmail"
		577	enewuser qmaill 202 /bin/true /var/qmail nofiles "-cSystem account for qmail"
		578	enewuser qmailp 203 /bin/true /var/qmail nofiles "-cSystem account for qmail"
		579	enewuser qmailq 204 /bin/true /var/qmail qmail "-cSystem account for qmail queue"
		580	enewuser qmailr 205 /bin/true /var/qmail qmail "-cSystem account for qmail"
		581	enewuser qmails 206 /bin/true /var/qmail qmail "-cSystem account for qmail"
		582
570	if use vmail ; then	583	if use vmail ; then
		584	einfo "Creating user and group for ${VMAILUSER} account ..."
571	enewgroup ${VMAILUSER} 2110	585	enewgroup ${VMAILUSER} 2110
572	enewuser "${VMAILUSER}" 11184 /bin/bash "${VMAILHOME}" "${VMAILUSER}" "-c${vmailgecos}"	586	enewuser "${VMAILUSER}" 11184 /bin/bash "${VMAILHOME}" "${VMAILUSER}" "-cVirtual Mail user for qmail-ldap"
573	diropts -m0770 -o ${VMAILUSER} -g ${VMAILUSER}	587	diropts -m0770 -o ${VMAILUSER} -g ${VMAILUSER}
574	keepdir ${VMAILHOME}	588	keepdir ${VMAILHOME}
575	fi	589	fi
Lines 605-613 Link Here
605	if ! use notlsbeforeauth ; then	619	if ! use notlsbeforeauth ; then
606	einfo "Enabling STARTTLS before SMTP AUTH"	620	einfo "Enabling STARTTLS before SMTP AUTH"
607	no_relay_string="${no_relay_string},SMTPAUTH=\"TLSREQUIRED\""	621	no_relay_string="${no_relay_string},SMTPAUTH=\"TLSREQUIRED\""
608	#else
609	# ewarn "Enabling SMTP AUTH WITHOUT STARTTLS"
610	# no_relay_string="${no_relay_string},SMTPAUTH=\"\""
611	fi	622	fi
612	else	623	else
613	ewarn "Enabling SMTP AUTH WITHOUT STARTTLS"	624	ewarn "Enabling SMTP AUTH WITHOUT STARTTLS"
Lines 681-685 Link Here
681	[ ! -f ${ROOT}var/qmail/control/ldaprebind ] && \	692	[ ! -f ${ROOT}var/qmail/control/ldaprebind ] && \
682	einfo "Allowing qmail-ldap to rebind to the LDAP server (allows for stricter ACLs on passwords)" && \	693	einfo "Allowing qmail-ldap to rebind to the LDAP server (allows for stricter ACLs on passwords)" && \
683	echo "1" > ${ROOT}var/qmail/control/ldaprebind	694	echo "1" > ${ROOT}var/qmail/control/ldaprebind
684		695	if use vmail ; then
		696	local `bzgrep ^VMAILUSER /var/db/pkg/${CATEGORY}/${PF}/environment.bz2`
		697	varray=( `egetent passwd ${VMAILUSER} \|awk -F : {'print $3" "$4" "$6'}` )
		698
		699	[ ! -f ${ROOT}var/qmail/control/ldapuid ] && \
		700	einfo "Setting ${VMAILUSER}'s uid in ${ROOT}var/qmail/control/ldapuid"
		701	echo "${varray[0]}" > ${ROOT}var/qmail/control/ldapuid
		702	[ ! -f ${ROOT}var/qmail/control/ldapgid ] && \
		703	einfo "Setting ${VMAILUSER}'s gid in ${ROOT}var/qmail/control/ldapgid"
		704	echo "${varray[1]}" > ${ROOT}var/qmail/control/ldapgid
		705	[ ! -f ${ROOT}var/qmail/control/ldapmessagestore ] && \
		706	einfo "Setting ${VMAILUSER}'s home directory in ${ROOT}var/qmail/control/ldapmessagestore"
		707	echo "${varray[2]}" > ${ROOT}var/qmail/control/ldapmessagestore
		708	fi
685	}	709	}