Attachment #54274 for bug #86099

View | Details | Raw Unified | Return to bug 86099 | Differences between
Collapse All | Expand All




	use large-domain && myconf="${myconf} --enable-large-scale" ||\
	    myconf="${myconf} --enable-domain-scale"

	myconf="${myconf} --with-dspam-home=${HOMEDIR}"
	myconf="${myconf} --with-dspam-mode=4755"
	myconf="${myconf} --with-dspam-owner=dspam"
	myconf="${myconf} --with-dspam-group=dspam"
	myconf="${myconf} --sysconfdir=${HOMEDIR}"
	myconf="${myconf} --with-logdir=${LOGDIR}"
	use virtual-users || myconf="${myconf} --enable-homedir"

	# enables support for debugging (touch /etc/dspam/.debug to turn on)
	# optional: even MORE debugging output, use with extreme caution!

	elif use oci8 ; then
		myconf="${myconf} --with-storage-driver=ora_drv"
		myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
		use virtual-users && myconf="${myconf} --enable-virtual-users"

		# I am in no way a Oracle specialist. If someone knows
		# how to query the version of Oracle, then let me know.

		fi
	elif use sqlite3 ; then
		myconf="${myconf} --with-storage-driver=sqlite3_drv"
		use virtual-users && myconf="${myconf} --enable-virtual-users"
	elif use sqlite ; then
		myconf="${myconf} --with-storage-driver=sqlite_drv"
		use virtual-users && myconf="${myconf} --enable-virtual-users"
	else
		myconf="${myconf} --with-storage-driver=libdb4_drv"
	fi

	# open up perms on /etc/mail/dspam
	diropts -m0775 -o dspam -g dspam
	dodir ${HOMEDIR}
	keepdir ${HOMEDIR}

	# keeps dspam data in /var
	diropts -m0775 -o dspam -g dspam

	# keeps dspam log in /var/log
	diropts -m0775 -o dspam -g dspam
	dodir ${LOGDIR}
	insinto ${LOGDIR}
	touch ${T}/empty.file
	newins ${T}/empty.file system.log
	dosym ${LOGDIR}/system.log ${HOMEDIR}/system.log

	dosym ${DATADIR} ${HOMEDIR}/data

	# make install
	sed -e 's/rm -f ..mandir.\(.*\)/rm -f ${D}${mandir}\1/g' \
		-e 's/ln -s ..mandir.\(.*\) ..mandir.\(.*3\)/ln -s ${mandir}\1.gz ${D}${mandir}\2.gz/g' \
		-i Makefile
	make DESTDIR=${D} install || die
	chmod 4755 ${D}/usr/bin/dspam
	chmod 4755 ${D}/usr/bin/dspam_stats

	# documentation
	dodoc CHANGELOG LICENSE README* RELEASE.NOTES UPGRADING
	dodoc ${DISTDIR}/dspam_sa_trainer.tar.gz
	docinto doc
	dodoc doc/*.txt
	docinto gentoo
	dodoc ${FILESDIR}/README.postfix ${FILESDIR}/README.qmail
	if use mysql; then
		dodoc src/tools.mysql_drv/README
	elif use postgres ; then
		dodoc src/tools.pgsql_drv/README
	elif use oci8 ; then
		dodoc src/tools.ora_drv/README
	elif use sqlite || sqlite3 ; then
		dodoc src/tools.sqlite_drv/README
	fi
	doman man/dspam*
	dodoc ${DISTDIR}/dspam_sa_trainer.tar.gz

	# build some initial configuration data
	cp src/dspam.conf ${T}/dspam.conf
		&& cp ${HOMEDIR}/dspam.conf ${T}/dspam.conf \
		|| cp src/dspam.conf ${T}/dspam.conf

	if use cyrus; then
		sed -e 's:^#*\(UntrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/lib/cyrus/deliver %u\":gI' \
			-e 's:^\(TrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/lib/cyrus/deliver\":gI' \
			-i ${T}/dspam.conf
	elif use exim; then
		sed -e 's:^#*\(UntrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/sbin/exim -oMr spam-scanned %u\":gI' \
			-e 's:^\(TrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/sbin/exim -oMr spam-scanned %u\":gI' \
			-i ${T}/dspam.conf
	elif use maildrop; then
		sed -e 's:^#*\(UntrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/bin/maildrop -d %u\":gI' \
			-e 's:^\(TrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/bin/maildrop\":gI' \
			-i ${T}/dspam.conf
	elif use procmail; then
		sed -e 's:^#*\(UntrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/bin/procmail -d %u\":gI' \
			-e 's:^\(TrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/bin/procmail":gI' \
			-i ${T}/dspam.conf
	else
		sed -e 's:^#*\(UntrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/sbin/sendmail\":gI' \
			-e 's:^\(TrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/sbin/sendmail\":gI' \
			-i ${T}/dspam.conf
	fi
	if use mysql || use postgres; then
		if has_version sys-kernel/linux26-headers; then

			keepdir /var/run/dspam

			# We use sockets for the deamon instead of tcp port 24
			sed -e 's:^#*\(ServerDomainSocketPath[\t ]\{1,\}\).*:\1\"/var/run/dspam/dspam.sock\":gI' \
				-e 's:^#*\(ServerPID[\t ]\{1,\}\).*:\1/var/run/dspam/dspam.pid:gI' \
				-i ${T}/dspam.conf

			# dspam init script
			exeinto /etc/init.d

			-e "s:^#*\(MySQLPass[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[3]}:gI" \
			-e "s:^#*\(MySQLDb[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[4]}:gI" \
			-e "s:^#*\(MySQLCompress[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[5]}:gI" \
			-i ${T}/dspam.conf
		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
			echo "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" >> ${T}/mysql.data
		done

		newins src/tools.mysql_drv/mysql_objects-space.sql mysql_objects-space.sql
		newins src/tools.mysql_drv/mysql_objects-speed.sql mysql_objects-speed.sql
		newins src/tools.mysql_drv/mysql_objects-4.1.sql mysql_objects-4.1.sql
		newins src/tools.mysql_drv/virtual_users.sql mysql_virtual_users.sql
		newins src/tools.mysql_drv/neural.sql mysql_neural.sql
		newins src/tools.mysql_drv/purge.sql mysql_purge.sql
		newins src/tools.mysql_drv/purge-4.1.sql mysql_purge-4.1.sql

		insopts -m644 -o dspam -g dspam
		doins ${T}/pgsql.data
		newins src/tools.pgsql_drv/pgsql_objects.sql pgsql_objects.sql
		newins src/tools.pgsql_drv/virtual_users.sql pgsql_virtual_users.sql
		newins src/tools.pgsql_drv/purge.sql pgsql_purge.sql

	elif use oci8 ; then

		insopts -m644 -o dspam -g dspam
		doins ${T}/oracle.data
		newins src/tools.ora_drv/oral_objects.sql ora_objects.sql
		newins src/tools.ora_drv/virtual_users.sql ora_virtual_users.sql
		newins src/tools.ora_drv/purge.sql ora_purge.sql
	elif use sqlite || sqlite3 ; then
		insinto ${HOMEDIR}

		newins src/tools.sqlite_drv/purge.sql sqlite_purge.sql
	fi

	sed -e "s:^\(Purge.*\):###\1:g" \
		-e "s:^#\(Purge.*\):\1:g" \
		-e "s:^###\(Purge.*\):#\1:g" \
		-i ${T}/dspam.conf
	insinto ${HOMEDIR}
	insopts -m644 -o dspam -g dspam
	doins ${T}/dspam.conf

	# -> The documentation is wrong! The files need to be in ./txt
	diropts -m0775 -o dspam -g dspam
	dodir ${HOMEDIR}/txt
	keepdir ${HOMEDIR}/txt
	insinto ${HOMEDIR}/txt
	insopts -m644 -o dspam -g dspam
	doins ${S}/txt/*.txt

	# logrotation scripts
	diropts -m0755 -o dspam -g dspam
	dodir /etc/logrotate.d
	keepdir /etc/logrotate.d
	insinto /etc/logrotate.d
	insopts -m0755 -o dspam -g dspam
	newins ${FILESDIR}/logrotate.dspam dspam

	# dspam cron job
	diropts -m0755 -o dspam -g dspam
	dodir /etc/cron.daily
	keepdir /etc/cron.daily
	exeinto /etc/cron.daily
	exeopts -m0755 -o dspam -g dspam
	doexe ${FILESDIR}/dspam.cron


pkg_config () {
	if use mysql ; then
		[[ -f ${HOMEDIR}/mysql.data ]] && mv -f ${HOMEDIR}/mysql.data ${HOMEDIR}

		DSPAM_DB_DATA=( $(sed "s:^[\t ]*$:###:gI" "${ROOT}${HOMEDIR}/mysql.data") )
		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
			[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
		done
		DSPAM_MySQL_USER="${DSPAM_DB_DATA[2]}"
		DSPAM_MySQL_PWD="${DSPAM_DB_DATA[3]}"
		DSPAM_MySQL_DB="${DSPAM_DB_DATA[4]}"

		ewarn "When prompted for a password, please enter your MySQL root password"
		ewarn ""

			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_objects-speed.sql
		fi

		if use virtual-users ; then
		einfo "Creating DSPAM MySQL database for virtual users"
		/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_virtual_users.sql
		fi

		if use neural ; then
			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_neural.sql

		einfo "Creating DSPAM MySQL user \"${DSPAM_MySQL_USER}\""
		/usr/bin/mysql -u root -p -e "GRANT SELECT,INSERT,UPDATE,DELETE ON ${DSPAM_MySQL_DB}.* TO ${DSPAM_MySQL_USER}@localhost IDENTIFIED BY '${DSPAM_MySQL_PWD}';FLUSH PRIVILEGES;" -D mysql
	elif use postgres ; then
		[[ -f ${HOMEDIR}/pgsql.data ]] && mv -f ${HOMEDIR}/pgsql.data ${HOMEDIR}

		DSPAM_DB_DATA=( $(sed "s:^[\t ]*$:###:gI" "${ROOT}${HOMEDIR}/pgsql.data") )
		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
			[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""


		einfo "Creating DSPAM PostgreSQL tables"
		PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${HOMEDIR}/pgsql_objects.sql 1>/dev/null 2>&1

		if use virtual-users ; then
		einfo "Creating DSPAM PostgreSQL database for virtual users"
		PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${HOMEDIR}/pgsql_virtual_users.sql 1>/dev/null 2>&1
		fi

	elif use oci8 ; then
		[[ -f ${HOMEDIR}/oracle.data ]] && mv -f ${HOMEDIR}/oracle.data ${HOMEDIR}
		einfo "We have not enought Oracle knowledge to configure Oracle"
		einfo "automatically. If you know how, please post a message in"
		einfo "Gentoo Bugzilla."

Return to bug 86099

Lines 85-96 Link Here

(-)/usr/portage/mail-filter/dspam/dspam-3.4.1.ebuild (-56 / +49 lines)
85	use large-domain && myconf="${myconf} --enable-large-scale" \|\|\	85	use large-domain && myconf="${myconf} --enable-large-scale" \|\|\
86	myconf="${myconf} --enable-domain-scale"	86	myconf="${myconf} --enable-domain-scale"
87		87
		88	myconf="${myconf} --with-dspam-home=${HOMEDIR}"
88	myconf="${myconf} --with-dspam-mode=4755"	89	myconf="${myconf} --with-dspam-mode=4755"
89	myconf="${myconf} --with-dspam-owner=dspam"	90	myconf="${myconf} --with-dspam-owner=dspam"
90	myconf="${myconf} --with-dspam-group=dspam"	91	myconf="${myconf} --with-dspam-group=dspam"
91	myconf="${myconf} --sysconfdir=${HOMEDIR}"	92	myconf="${myconf} --sysconfdir=${HOMEDIR}"
92	myconf="${myconf} --with-logdir=${LOGDIR}"	93	myconf="${myconf} --with-logdir=${LOGDIR}"
93	use virtual-users \|\| myconf="${myconf} --with-dspam-home=${HOMEDIR}"	94	use virtual-users \|\| myconf="${myconf} --enable-homedir"
94		95
95	# enables support for debugging (touch /etc/dspam/.debug to turn on)	96	# enables support for debugging (touch /etc/dspam/.debug to turn on)
96	# optional: even MORE debugging output, use with extreme caution!	97	# optional: even MORE debugging output, use with extreme caution!
Lines 126-132 Link Here
126	elif use oci8 ; then	127	elif use oci8 ; then
127	myconf="${myconf} --with-storage-driver=ora_drv"	128	myconf="${myconf} --with-storage-driver=ora_drv"
128	myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"	129	myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
129	myconf="${myconf} --enable-virtual-users"	130	use virtual-users && myconf="${myconf} --enable-virtual-users"
130		131
131	# I am in no way a Oracle specialist. If someone knows	132	# I am in no way a Oracle specialist. If someone knows
132	# how to query the version of Oracle, then let me know.	133	# how to query the version of Oracle, then let me know.
Lines 135-144 Link Here
135	fi	136	fi
136	elif use sqlite3 ; then	137	elif use sqlite3 ; then
137	myconf="${myconf} --with-storage-driver=sqlite3_drv"	138	myconf="${myconf} --with-storage-driver=sqlite3_drv"
138	myconf="${myconf} --enable-virtual-users"	139	use virtual-users && myconf="${myconf} --enable-virtual-users"
139	elif use sqlite ; then	140	elif use sqlite ; then
140	myconf="${myconf} --with-storage-driver=sqlite_drv"	141	myconf="${myconf} --with-storage-driver=sqlite_drv"
141	myconf="${myconf} --enable-virtual-users"	142	use virtual-users && myconf="${myconf} --enable-virtual-users"
142	else	143	else
143	myconf="${myconf} --with-storage-driver=libdb4_drv"	144	myconf="${myconf} --with-storage-driver=libdb4_drv"
144	fi	145	fi
Lines 158-164 Link Here
158	# open up perms on /etc/mail/dspam	159	# open up perms on /etc/mail/dspam
159	diropts -m0775 -o dspam -g dspam	160	diropts -m0775 -o dspam -g dspam
160	dodir ${HOMEDIR}	161	dodir ${HOMEDIR}
161	keepdir ${HOMEDIR}
162		162
163	# keeps dspam data in /var	163	# keeps dspam data in /var
164	diropts -m0775 -o dspam -g dspam	164	diropts -m0775 -o dspam -g dspam
Lines 168-174 Link Here
168	# keeps dspam log in /var/log	168	# keeps dspam log in /var/log
169	diropts -m0775 -o dspam -g dspam	169	diropts -m0775 -o dspam -g dspam
170	dodir ${LOGDIR}	170	dodir ${LOGDIR}
171	keepdir ${LOGDIR}	171	insinto ${LOGDIR}
172	touch ${T}/empty.file	172	touch ${T}/empty.file
173	newins ${T}/empty.file system.log	173	newins ${T}/empty.file system.log
174	dosym ${LOGDIR}/system.log ${HOMEDIR}/system.log	174	dosym ${LOGDIR}/system.log ${HOMEDIR}/system.log
Lines 177-224 Link Here
177	dosym ${DATADIR} ${HOMEDIR}/data	177	dosym ${DATADIR} ${HOMEDIR}/data
178		178
179	# make install	179	# make install
180	sed -e 's/rm -f ..mandir.\(.*\)/rm -f ${D}${mandir}\1/g' \
181	-e 's/ln -s ..mandir.\(.\) ..mandir.\(.3\)/ln -s ${mandir}\1.gz ${D}${mandir}\2.gz/g' \
182	-i Makefile
183	make DESTDIR=${D} install \|\| die	180	make DESTDIR=${D} install \|\| die
184	chmod 4755 ${D}/usr/bin/dspam	181	chmod 4755 ${D}/usr/bin/dspam
185	chmod 4755 ${D}/usr/bin/dspam_stats	182	chmod 4755 ${D}/usr/bin/dspam_stats
186		183
187	# documentation	184	# documentation
188	dodoc CHANGELOG LICENSE README* RELEASE.NOTES UPGRADING	185	dodoc CHANGELOG LICENSE README* RELEASE.NOTES UPGRADING
		186	dodoc ${DISTDIR}/dspam_sa_trainer.tar.gz
		187	docinto doc
		188	dodoc doc/*.txt
		189	docinto gentoo
189	dodoc ${FILESDIR}/README.postfix ${FILESDIR}/README.qmail	190	dodoc ${FILESDIR}/README.postfix ${FILESDIR}/README.qmail
190	if use mysql; then
191	dodoc src/tools.mysql_drv/README
192	elif use postgres ; then
193	dodoc src/tools.pgsql_drv/README
194	elif use oci8 ; then
195	dodoc src/tools.ora_drv/README
196	elif use sqlite \|\| sqlite3 ; then
197	dodoc src/tools.sqlite_drv/README
198	fi
199	doman man/dspam*	191	doman man/dspam*
200	dodoc ${DISTDIR}/dspam_sa_trainer.tar.gz
201		192
202	# build some initial configuration data	193	# build some initial configuration data
203	[ -f ${HOMEDIR}/dspam.conf ] \	194	cp src/dspam.conf ${T}/dspam.conf
204	&& cp ${HOMEDIR}/dspam.conf ${T}/dspam.conf \
205	\|\| cp src/dspam.conf ${T}/dspam.conf
206
207	if use cyrus; then	195	if use cyrus; then
208	sed -i 's:^#\(UntrustedDeliveryAgent\)[\t ].*:\1 \"/usr/lib/cyrus/deliver %u\":gI' ${T}/dspam.conf	196	sed -e 's:^#\(UntrustedDeliveryAgent\)[\t ].*:\1 \"/usr/lib/cyrus/deliver %u\":gI' \
209	sed -i 's:^\(TrustedDeliveryAgent\)[\t ].:\1 \"/usr/lib/cyrus/deliver\":gI' ${T}/dspam.conf	197	-e 's:^\(TrustedDeliveryAgent\)[\t ].:\1 \"/usr/lib/cyrus/deliver\":gI' \
		198	-i ${T}/dspam.conf
210	elif use exim; then	199	elif use exim; then
211	sed -i 's:^#\(UntrustedDeliveryAgent\)[\t ].*:\1 \"/usr/sbin/exim -oMr spam-scanned %u\":gI' ${T}/dspam.conf	200	sed -e 's:^#\(UntrustedDeliveryAgent\)[\t ].*:\1 \"/usr/sbin/exim -oMr spam-scanned %u\":gI' \
212	sed -i 's:^\(TrustedDeliveryAgent\)[\t ].:\1 \"/usr/sbin/exim -oMr spam-scanned %u\":gI' ${T}/dspam.conf	201	-e 's:^\(TrustedDeliveryAgent\)[\t ].:\1 \"/usr/sbin/exim -oMr spam-scanned %u\":gI' \
		202	-i ${T}/dspam.conf
213	elif use maildrop; then	203	elif use maildrop; then
214	sed -i 's:^#\(UntrustedDeliveryAgent\)[\t ].*:\1 \"/usr/bin/maildrop -d %u\":gI' ${T}/dspam.conf	204	sed -e 's:^#\(UntrustedDeliveryAgent\)[\t ].*:\1 \"/usr/bin/maildrop -d %u\":gI' \
215	sed -i 's:^\(TrustedDeliveryAgent\)[\t ].:\1 \"/usr/bin/maildrop\":gI' ${T}/dspam.conf	205	-e 's:^\(TrustedDeliveryAgent\)[\t ].:\1 \"/usr/bin/maildrop\":gI' \
		206	-i ${T}/dspam.conf
216	elif use procmail; then	207	elif use procmail; then
217	sed -i 's:^#\(UntrustedDeliveryAgent\)[\t ].*:\1 \"/usr/bin/procmail -d %u\":gI' ${T}/dspam.conf	208	sed -e 's:^#\(UntrustedDeliveryAgent\)[\t ].*:\1 \"/usr/bin/procmail -d %u\":gI' \
218	sed -i 's:^\(TrustedDeliveryAgent\)[\t ].:\1 \"/usr/bin/procmail":gI' ${T}/dspam.conf	209	-e 's:^\(TrustedDeliveryAgent\)[\t ].:\1 \"/usr/bin/procmail":gI' \
		210	-i ${T}/dspam.conf
219	else	211	else
220	sed -i 's:^#\(UntrustedDeliveryAgent\)[\t ].*:\1 \"/usr/sbin/sendmail\":gI' ${T}/dspam.conf	212	sed -e 's:^#\(UntrustedDeliveryAgent\)[\t ].*:\1 \"/usr/sbin/sendmail\":gI' \
221	sed -i 's:^\(TrustedDeliveryAgent\)[\t ].:\1 \"/usr/sbin/sendmail\":gI' ${T}/dspam.conf	213	-e 's:^\(TrustedDeliveryAgent\)[\t ].:\1 \"/usr/sbin/sendmail\":gI' \
		214	-i ${T}/dspam.conf
222	fi	215	fi
223	if use mysql \|\| use postgres; then	216	if use mysql \|\| use postgres; then
224	if has_version sys-kernel/linux26-headers; then	217	if has_version sys-kernel/linux26-headers; then
Lines 228-235 Link Here
228	keepdir /var/run/dspam	221	keepdir /var/run/dspam
229		222
230	# We use sockets for the deamon instead of tcp port 24	223	# We use sockets for the deamon instead of tcp port 24
231	sed -i 's:^#\(ServerDomainSocketPath[\t ]\{1,\}\).:\1\"/var/run/dspam/dspam.sock\":gI' ${T}/dspam.conf	224	sed -e 's:^#\(ServerDomainSocketPath[\t ]\{1,\}\).:\1\"/var/run/dspam/dspam.sock\":gI' \
232	sed -i 's:^#\(ServerPID[\t ]\{1,\}\).:\1/var/run/dspam/dspam.pid:gI' ${T}/dspam.conf	225	-e 's:^#\(ServerPID[\t ]\{1,\}\).:\1/var/run/dspam/dspam.pid:gI' \
		226	-i ${T}/dspam.conf
233		227
234	# dspam init script	228	# dspam init script
235	exeinto /etc/init.d	229	exeinto /etc/init.d
Lines 265-271 Link Here
265	-e "s:^#\(MySQLPass[\t ]\{1,\}\).:\1${DSPAM_DB_DATA[3]}:gI" \	259	-e "s:^#\(MySQLPass[\t ]\{1,\}\).:\1${DSPAM_DB_DATA[3]}:gI" \
266	-e "s:^#\(MySQLDb[\t ]\{1,\}\).:\1${DSPAM_DB_DATA[4]}:gI" \	260	-e "s:^#\(MySQLDb[\t ]\{1,\}\).:\1${DSPAM_DB_DATA[4]}:gI" \
267	-e "s:^#\(MySQLCompress[\t ]\{1,\}\).:\1${DSPAM_DB_DATA[5]}:gI" \	261	-e "s:^#\(MySQLCompress[\t ]\{1,\}\).:\1${DSPAM_DB_DATA[5]}:gI" \
268	${T}/dspam.conf	262	-i ${T}/dspam.conf
269	for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do	263	for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
270	echo "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" >> ${T}/mysql.data	264	echo "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" >> ${T}/mysql.data
271	done	265	done
Lines 275-281 Link Here
275	newins src/tools.mysql_drv/mysql_objects-space.sql mysql_objects-space.sql	269	newins src/tools.mysql_drv/mysql_objects-space.sql mysql_objects-space.sql
276	newins src/tools.mysql_drv/mysql_objects-speed.sql mysql_objects-speed.sql	270	newins src/tools.mysql_drv/mysql_objects-speed.sql mysql_objects-speed.sql
277	newins src/tools.mysql_drv/mysql_objects-4.1.sql mysql_objects-4.1.sql	271	newins src/tools.mysql_drv/mysql_objects-4.1.sql mysql_objects-4.1.sql
278	newins src/tools.mysql_drv/virtual-users.sql mysql_virtual-users.sql	272	newins src/tools.mysql_drv/virtual_users.sql mysql_virtual_users.sql
279	newins src/tools.mysql_drv/neural.sql mysql_neural.sql	273	newins src/tools.mysql_drv/neural.sql mysql_neural.sql
280	newins src/tools.mysql_drv/purge.sql mysql_purge.sql	274	newins src/tools.mysql_drv/purge.sql mysql_purge.sql
281	newins src/tools.mysql_drv/purge-4.1.sql mysql_purge-4.1.sql	275	newins src/tools.mysql_drv/purge-4.1.sql mysql_purge-4.1.sql
Lines 311-317 Link Here
311	insopts -m644 -o dspam -g dspam	305	insopts -m644 -o dspam -g dspam
312	doins ${T}/pgsql.data	306	doins ${T}/pgsql.data
313	newins src/tools.pgsql_drv/pgsql_objects.sql pgsql_objects.sql	307	newins src/tools.pgsql_drv/pgsql_objects.sql pgsql_objects.sql
314	newins src/tools.pgsql_drv/virtual-users.sql pgsql_virtual-users.sql	308	newins src/tools.pgsql_drv/virtual_users.sql pgsql_virtual_users.sql
315	newins src/tools.pgsql_drv/purge.sql pgsql_purge.sql	309	newins src/tools.pgsql_drv/purge.sql pgsql_purge.sql
316		310
317	elif use oci8 ; then	311	elif use oci8 ; then
Lines 342-348 Link Here
342	insopts -m644 -o dspam -g dspam	336	insopts -m644 -o dspam -g dspam
343	doins ${T}/oracle.data	337	doins ${T}/oracle.data
344	newins src/tools.ora_drv/oral_objects.sql ora_objects.sql	338	newins src/tools.ora_drv/oral_objects.sql ora_objects.sql
345	newins src/tools.ora_drv/virtual-users.sql ora_virtual-users.sql	339	newins src/tools.ora_drv/virtual_users.sql ora_virtual_users.sql
346	newins src/tools.ora_drv/purge.sql ora_purge.sql	340	newins src/tools.ora_drv/purge.sql ora_purge.sql
347	elif use sqlite \|\| sqlite3 ; then	341	elif use sqlite \|\| sqlite3 ; then
348	insinto ${HOMEDIR}	342	insinto ${HOMEDIR}
Lines 350-358 Link Here
350	newins src/tools.sqlite_drv/purge.sql sqlite_purge.sql	344	newins src/tools.sqlite_drv/purge.sql sqlite_purge.sql
351	fi	345	fi
352		346
353	sed -i "s:^\(Purge.*\):###\1:g" ${T}/dspam.conf	347	sed -e "s:^\(Purge.*\):###\1:g" \
354	sed -i "s:^#\(Purge.*\):\1:g" ${T}/dspam.conf	348	-e "s:^#\(Purge.*\):\1:g" \
355	sed -i "s:^###\(Purge.*\):#\1:g" ${T}/dspam.conf	349	-e "s:^###\(Purge.*\):#\1:g" \
		350	-i ${T}/dspam.conf
356	insinto ${HOMEDIR}	351	insinto ${HOMEDIR}
357	insopts -m644 -o dspam -g dspam	352	insopts -m644 -o dspam -g dspam
358	doins ${T}/dspam.conf	353	doins ${T}/dspam.conf
Lines 361-367 Link Here
361	# -> The documentation is wrong! The files need to be in ./txt	356	# -> The documentation is wrong! The files need to be in ./txt
362	diropts -m0775 -o dspam -g dspam	357	diropts -m0775 -o dspam -g dspam
363	dodir ${HOMEDIR}/txt	358	dodir ${HOMEDIR}/txt
364	keepdir ${HOMEDIR}/txt
365	insinto ${HOMEDIR}/txt	359	insinto ${HOMEDIR}/txt
366	insopts -m644 -o dspam -g dspam	360	insopts -m644 -o dspam -g dspam
367	doins ${S}/txt/*.txt	361	doins ${S}/txt/*.txt
Lines 376-382 Link Here
376	# logrotation scripts	370	# logrotation scripts
377	diropts -m0755 -o dspam -g dspam	371	diropts -m0755 -o dspam -g dspam
378	dodir /etc/logrotate.d	372	dodir /etc/logrotate.d
379	keepdir /etc/logrotate.d
380	insinto /etc/logrotate.d	373	insinto /etc/logrotate.d
381	insopts -m0755 -o dspam -g dspam	374	insopts -m0755 -o dspam -g dspam
382	newins ${FILESDIR}/logrotate.dspam dspam	375	newins ${FILESDIR}/logrotate.dspam dspam
Lines 384-390 Link Here
384	# dspam cron job	377	# dspam cron job
385	diropts -m0755 -o dspam -g dspam	378	diropts -m0755 -o dspam -g dspam
386	dodir /etc/cron.daily	379	dodir /etc/cron.daily
387	keepdir /etc/cron.daily
388	exeinto /etc/cron.daily	380	exeinto /etc/cron.daily
389	exeopts -m0755 -o dspam -g dspam	381	exeopts -m0755 -o dspam -g dspam
390	doexe ${FILESDIR}/dspam.cron	382	doexe ${FILESDIR}/dspam.cron
Lines 417-431 Link Here
417		409
418	pkg_config () {	410	pkg_config () {
419	if use mysql ; then	411	if use mysql ; then
420	[[ -f ${HOMEDIR}/mysql.data ]] && mv -f ${HOMEDIR}/mysql.data ${HOMEDIR}
421
422	DSPAM_DB_DATA=( $(sed "s:^[\t ]*$:###:gI" "${ROOT}${HOMEDIR}/mysql.data") )	412	DSPAM_DB_DATA=( $(sed "s:^[\t ]*$:###:gI" "${ROOT}${HOMEDIR}/mysql.data") )
423	for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do	413	for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
424	[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""	414	[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
425	done	415	done
426	DSPAM_MySQL_USER="$DSPAM_DB_DATA[2]"	416	DSPAM_MySQL_USER="${DSPAM_DB_DATA[2]}"
427	DSPAM_MySQL_PWD="$DSPAM_DB_DATA[3]"	417	DSPAM_MySQL_PWD="${DSPAM_DB_DATA[3]}"
428	DSPAM_MySQL_DB="$DSPAM_DB_DATA[4]"	418	DSPAM_MySQL_DB="${DSPAM_DB_DATA[4]}"
429		419
430	ewarn "When prompted for a password, please enter your MySQL root password"	420	ewarn "When prompted for a password, please enter your MySQL root password"
431	ewarn ""	421	ewarn ""
Lines 451-458 Link Here
451	/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_objects-speed.sql	441	/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_objects-speed.sql
452	fi	442	fi
453		443
454	einfo "Creating DSPAM MySQL database for virtual-users users"	444	if use virtual-users ; then
455	/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_virtual-users.sql	445	einfo "Creating DSPAM MySQL database for virtual users"
		446	/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_virtual_users.sql
		447	fi
456		448
457	if use neural ; then	449	if use neural ; then
458	/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_neural.sql	450	/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_neural.sql
Lines 461-468 Link Here
461	einfo "Creating DSPAM MySQL user \"${DSPAM_MySQL_USER}\""	453	einfo "Creating DSPAM MySQL user \"${DSPAM_MySQL_USER}\""
462	/usr/bin/mysql -u root -p -e "GRANT SELECT,INSERT,UPDATE,DELETE ON ${DSPAM_MySQL_DB}.* TO ${DSPAM_MySQL_USER}@localhost IDENTIFIED BY '${DSPAM_MySQL_PWD}';FLUSH PRIVILEGES;" -D mysql	454	/usr/bin/mysql -u root -p -e "GRANT SELECT,INSERT,UPDATE,DELETE ON ${DSPAM_MySQL_DB}.* TO ${DSPAM_MySQL_USER}@localhost IDENTIFIED BY '${DSPAM_MySQL_PWD}';FLUSH PRIVILEGES;" -D mysql
463	elif use postgres ; then	455	elif use postgres ; then
464	[[ -f ${HOMEDIR}/pgsql.data ]] && mv -f ${HOMEDIR}/pgsql.data ${HOMEDIR}
465
466	DSPAM_DB_DATA=( $(sed "s:^[\t ]*$:###:gI" "${ROOT}${HOMEDIR}/pgsql.data") )	456	DSPAM_DB_DATA=( $(sed "s:^[\t ]*$:###:gI" "${ROOT}${HOMEDIR}/pgsql.data") )
467	for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do	457	for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
468	[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""	458	[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
Lines 479-488 Link Here
479		469
480	einfo "Creating DSPAM PostgreSQL tables"	470	einfo "Creating DSPAM PostgreSQL tables"
481	PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${HOMEDIR}/pgsql_objects.sql 1>/dev/null 2>&1	471	PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${HOMEDIR}/pgsql_objects.sql 1>/dev/null 2>&1
482	PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${HOMEDIR}/pgsql_virtual-users.sql 1>/dev/null 2>&1	472
		473	if use virtual-users ; then
		474	einfo "Creating DSPAM PostgreSQL database for virtual users"
		475	PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${HOMEDIR}/pgsql_virtual_users.sql 1>/dev/null 2>&1
		476	fi
483		477
484	elif use oci8 ; then	478	elif use oci8 ; then
485	[[ -f ${HOMEDIR}/oracle.data ]] && mv -f ${HOMEDIR}/oracle.data ${HOMEDIR}
486	einfo "We have not enought Oracle knowledge to configure Oracle"	479	einfo "We have not enought Oracle knowledge to configure Oracle"
487	einfo "automatically. If you know how, please post a message in"	480	einfo "automatically. If you know how, please post a message in"
488	einfo "Gentoo Bugzilla."	481	einfo "Gentoo Bugzilla."