Attachment #389510 for bug #529506

View | Details | Raw Unified | Return to bug 529506
Collapse All | Expand All





	sed -i -e "s:nobody:dbmail:" dbmail.conf
	sed -i -e "s:nogroup:dbmail:" dbmail.conf
	sed -i -e "s:/var/run:/run/dbmail:" dbmail.conf
	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf

	insinto /etc/dbmail

	# change config path to our default and use the conf.d and init.d files from the contrib dir
	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail
	#sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail
	#sed -i -e "s:/var/run:/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail
	#newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
	#newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
	# use custom init scripts until updated in upstream contrib

	keepdir /var/lib/dbmail
	fperms 750 /var/lib/dbmail
	fowners dbmail:dbmail /var/lib/dbmail
	# create this through init-scripts instead of at install time (bug #455002)
	#keepdir /run/dbmail
	#fowners dbmail:dbmail /run/dbmail
}

pkg_postinst() {

	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
	elog "forget to rc-update del dbmail-* first)"
	echo
	elog "Changed pid directory to /run/dbmail (see"
	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
	echo
	ewarn "The database config has changed to support libzdb db URI"

Lines 8-14 Link Here

(-)dbmail.orig/files/dbmail-imapd.initd (-1 / +1 lines)
8	PROGRAM=dbmail-imapd	8	PROGRAM=dbmail-imapd
9		9
10	BIN_DIR=/usr/sbin	10	BIN_DIR=/usr/sbin
11	PID_DIR=/var/run/dbmail	11	PID_DIR=/run/dbmail
12	PID=pid	12	PID=pid
13		13
14	# Where is the dbmail.conf file located?	14	# Where is the dbmail.conf file located?

Lines 8-14 Link Here

(-)dbmail.orig/files/dbmail-lmtpd.initd (-1 / +1 lines)
8	PROGRAM=dbmail-lmtpd	8	PROGRAM=dbmail-lmtpd
9		9
10	BIN_DIR=/usr/sbin	10	BIN_DIR=/usr/sbin
11	PID_DIR=/var/run/dbmail	11	PID_DIR=/run/dbmail
12	PID=pid	12	PID=pid
13		13
14	# Where is the dbmail.conf file located?	14	# Where is the dbmail.conf file located?

Lines 8-14 Link Here

(-)dbmail.orig/files/dbmail-pop3d.initd (-1 / +1 lines)
8	PROGRAM=dbmail-pop3d	8	PROGRAM=dbmail-pop3d
9		9
10	BIN_DIR=/usr/sbin	10	BIN_DIR=/usr/sbin
11	PID_DIR=/var/run/dbmail	11	PID_DIR=/run/dbmail
12	PID=pid	12	PID=pid
13		13
14	# Where is the dbmail.conf file located?	14	# Where is the dbmail.conf file located?

Lines 8-14 Link Here

(-)dbmail.orig/files/dbmail-timsieved.initd (-1 / +1 lines)
8	PROGRAM=dbmail-timsieved	8	PROGRAM=dbmail-timsieved
9		9
10	BIN_DIR=/usr/sbin	10	BIN_DIR=/usr/sbin
11	PID_DIR=/var/run/dbmail	11	PID_DIR=/run/dbmail
12	PID=pid	12	PID=pid
13		13
14	# Where is the dbmail.conf file located?	14	# Where is the dbmail.conf file located?

Return to bug 529506

Lines 61-67 Link Here

(-)dbmail.orig/dbmail-3.2.0.ebuild (-6 / +6 lines)
61		61
62	sed -i -e "s:nobody:dbmail:" dbmail.conf	62	sed -i -e "s:nobody:dbmail:" dbmail.conf
63	sed -i -e "s:nogroup:dbmail:" dbmail.conf	63	sed -i -e "s:nogroup:dbmail:" dbmail.conf
64	sed -i -e "s:/var/run:/var/run/dbmail:" dbmail.conf	64	sed -i -e "s:/var/run:/run/dbmail:" dbmail.conf
65	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf	65	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
66		66
67	insinto /etc/dbmail	67	insinto /etc/dbmail
Lines 70-76 Link Here
70	# change config path to our default and use the conf.d and init.d files from the contrib dir	70	# change config path to our default and use the conf.d and init.d files from the contrib dir
71	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail	71	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail
72	#sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail	72	#sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail
73	#sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail	73	#sed -i -e "s:/var/run:/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail
74	#newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail	74	#newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
75	#newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail	75	#newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
76	# use custom init scripts until updated in upstream contrib	76	# use custom init scripts until updated in upstream contrib
Lines 92-100 Link Here
92	keepdir /var/lib/dbmail	92	keepdir /var/lib/dbmail
93	fperms 750 /var/lib/dbmail	93	fperms 750 /var/lib/dbmail
94	fowners dbmail:dbmail /var/lib/dbmail	94	fowners dbmail:dbmail /var/lib/dbmail
95	# create this through init-scripts instead of at installt ime (bug #455002)	95	# create this through init-scripts instead of at install time (bug #455002)
96	#keepdir /var/run/dbmail	96	#keepdir /run/dbmail
97	#fowners dbmail:dbmail /var/run/dbmail	97	#fowners dbmail:dbmail /run/dbmail
98	}	98	}
99		99
100	pkg_postinst() {	100	pkg_postinst() {
Lines 124-130 Link Here
124	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"	124	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
125	elog "forget to rc-update del dbmail-* first)"	125	elog "forget to rc-update del dbmail-* first)"
126	echo	126	echo
127	elog "Changed pid directory to /var/run/dbmail (see"	127	elog "Changed pid directory to /run/dbmail (see"
128	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"	128	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
129	echo	129	echo
130	ewarn "The database config has changed to support libzdb db URI"	130	ewarn "The database config has changed to support libzdb db URI"