[gentoo-commits] gentoo-x86 commit in mail-filter/dspam/files: pgsql_createdb.py dspam.cron-r1 pgsql_purge.py digest-dspam-3.8.0-r7

[Alin Nastac (mrness)]

mrness      07/09/30 11:30:48

  Added:                pgsql_createdb.py dspam.cron-r1 pgsql_purge.py
                        digest-dspam-3.8.0-r7
  Log:
  Major dspam.cron and pkg_config redesign (#193081). Drop sqlite-2 support. Install prefs.h needed by dovecot-dspam.
  (Portage version: 2.1.3.9)

Revision  Changes    Path
1.1                  mail-filter/dspam/files/pgsql_createdb.py

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dspam/files/pgsql_createdb.py?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dspam/files/pgsql_createdb.py?rev=1.1&content-type=text/plain

Index: pgsql_createdb.py
===================================================================
#!/bin/env python

import sys, os
import psycopg2
from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT

adminuser = ''
adminpass = ''

def inputStuff(title, default = None, empty = True):
    if default is not None:
        uinput = raw_input("%s [DEFAULT %s]: " %(title, default))
    else:
        uinput = raw_input("%s: " %(title))
    if default:
        if uinput == '':
            return default
    if uinput == '' and not empty:
        print "Error: Zero length input not allowed!"
        return inputStuff(title, default, empty)
    return uinput

def main():
    global adminuser
    if len(sys.argv) == 7:
        thiscript, serverhost, serverport, adminuser, dspamuser, dspamdb, createscript = sys.argv
    elif len(sys.argv) == 8:
        thiscript, serverhost, serverport, adminuser, dspamuser, dspamdb, createscript, vuserscript = sys.argv
    else:
        print "Usage: %s server_host server_port admin_user dspam_user dspam_dbname setup_DB_script [setup_virtual_user_script]" %(sys.argv[0])
        sys.exit(1)
    env = os.environ
    dspampass = env['DSPAM_PgSQLPass']
    con = connectasadmin(serverhost, serverport, 'template1')
    con.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT) # CREATE DATABASE needs this
    cur = con.cursor()
    createDbAndUser(cur, dspamuser, dspampass, dspamdb)
    con.close()
    con = connectasadmin(serverhost, serverport, dspamdb)
    con.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT) # CREATE LANGUAGE probably needs this
    cur = con.cursor()
    createLanguage(cur)
    con.close()
    executeScript(serverhost, serverport, dspamuser, dspampass, dspamdb, createscript)
    if len(sys.argv) == 8:
        executeScript(serverhost, serverport, dspamuser, dspampass, dspamdb, vuserscript)

def createDbAndUser(cur, dspamuser, dspampass, dspamdb):
    try:
        cur.execute("""CREATE USER %s WITH PASSWORD '%s' NOCREATEDB NOCREATEUSER;""" %(dspamuser, dspampass))
        cur.execute("""CREATE DATABASE %s;""" %(dspamdb))
        cur.execute("""GRANT ALL PRIVILEGES ON DATABASE %s TO %s;""" %(dspamdb, dspamuser))
        cur.execute("""GRANT ALL PRIVILEGES ON SCHEMA public TO %s;""" %(dspamuser))
        cur.execute("""UPDATE pg_database SET datdba=(SELECT usesysid FROM pg_shadow WHERE usename='%s') WHERE datname='%s';""" %(dspamuser, dspamdb))
    except Exception, e:
        print "ERROR:", e
        sys.exit(2)

def createLanguage(cur):
    try:
        cur.execute("CREATE FUNCTION plpgsql_call_handler() RETURNS language_handler AS '$libdir/plpgsql', 'plpgsql_call_handler' LANGUAGE c;")
        cur.execute("CREATE FUNCTION plpgsql_validator(oid) RETURNS void AS '$libdir/plpgsql', 'plpgsql_validator' LANGUAGE c;")
        cur.execute("CREATE TRUSTED PROCEDURAL LANGUAGE plpgsql HANDLER plpgsql_call_handler VALIDATOR plpgsql_validator;")
    except Exception, e:
        print "ERROR:", e
        sys.exit(2)

def executeScript(serverhost, serverport, dspamuser, dspampass, dspamdb, script):
    try:
        if len(serverport) > 0:
            con = psycopg2.connect(host=serverhost, port=int(serverport), database=dspamdb, user=dspamuser, password=dspampass)
        else:
            con = psycopg2.connect(host=serverhost, database=dspamdb, user=dspamuser, password=dspampass)
        con.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT) # Needed for plpgsql
        cur = con.cursor()
    except Exception, e:
        print "ERROR: ",e
        sys.exit(3)
    try:
        f = open(script, 'r')
        script = f.read()
        f.close()
    except Exception, e:
        print "ERROR: ",e
        sys.exit(4)
    try:
        cur.execute(script)
    except Exception, e:
        print "ERROR: ",e
        sys.exit(5)
    con.close()
    
def connectasadmin(serverhost, serverport, db):
    global adminuser, adminpass
    notconnected = 1
    while(notconnected):
        try:    
            if len(serverport) > 0:
                con = psycopg2.connect(host=serverhost, port=int(serverport), database=db, user=adminuser, password=adminpass)
            else:
                con = psycopg2.connect(host=serverhost, database=db, user=adminuser, password=adminpass)
            notconnected = 0
        except psycopg2.OperationalError, e:
            if 'no password' in e[0]:
                adminpass = inputStuff('Password')
            else:
                print e
                sys.exit(2)
        except Exception, e:
            print e
            sys.exit(2)
    return con

if __name__ == '__main__':
    main()



1.1                  mail-filter/dspam/files/dspam.cron-r1

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dspam/files/dspam.cron-r1?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dspam/files/dspam.cron-r1?rev=1.1&content-type=text/plain

Index: dspam.cron-r1
===================================================================
#!/bin/sh
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
#
# Remove old signatures and unimportant tokens from the DSPAM database.
# Purge old log entries in user logs.
#

#
# Parse optional command line parameters
#
for foo in $@
do
	case "${foo}" in
		--logdays=*) LOGROTATE_AGE="${foo#--logdays=}";;
		--sigdays=*) SIGNATURE_AGE="${foo#--sigdays=}";;
		--without-sql-purge) USE_SQL_PURGE=false;;
		*)
			echo "usage: $0 [--logdays=no_of_days] [--sigdays=no_of_days] [--without-sql-purge]"
			exit 1
			;;
	esac
done

#
# Parameters
#
[ -z "${LOGROTATE_AGE}" ] && LOGROTATE_AGE=30 # Delete log entries older than $LOGROTATE_AGE days
[ -z "${SIGNATURE_AGE}" ] && SIGNATURE_AGE=30 # Delete signatures older than $SIGNATURE_AGE days
[ -z "${USE_SQL_PURGE}" ] && USE_SQL_PURGE=true # Run sql purge scripts

#
# Function to run dspam_clean
#
run_dspam_clean() {
	if [ ! -e "/usr/bin/dspam_clean" ]
	then
		echo "Can not run DSPAM clean application:"
		echo "  /usr/bin/dspam_clean does not exist"
		return 1
	else
		/usr/bin/dspam_clean -s${SIGNATURE_AGE} -p${SIGNATURE_AGE} -u${SIGNATURE_AGE},${SIGNATURE_AGE},${SIGNATURE_AGE},${SIGNATURE_AGE} >/dev/null 2>&1
		return $?
	fi
}


#
# Function to check if we have all needed tools
#
check_for_tools() {
	local myrc=0
	for foo in awk cut sed getent
	do
		if ! which ${foo} >/dev/null 2>&1
		then
			echo "Command ${foo} not found!"
			myrc=1
		fi
	done
	return ${myrc}
}


#
# Function to read dspam.conf parameters
#
read_dspam_params() {
	local PARAMETER VALUE
	for PARAMETER in $@ ; do
		VALUE=$(awk "BEGIN { IGNORECASE=1; } \$1==\"${PARAMETER}\" { print \$2; exit; }" "${DSPAM_CONFIGDIR}/dspam.conf")
		[[ $? == 0 ]] || return 1
		eval ${PARAMETER}=\"${VALUE}\"
	done
	return 0
}


#
# Function to clean DSPAM MySQL data
#
clean_mysql_drv() {
	#
	# MySQL
	#
	if	${USE_SQL_PURGE} && \
		read_dspam_params MySQLServer MySQLPort MySQLUser MySQLPass MySQLDb MySQLCompress && \
		[ -n "${MySQLServer}" -a -n "${MySQLUser}" -a -n "${MySQLDb}" ]
	then
		if [ ! -e "/usr/bin/mysql_config" ]
		then
			echo "Can not run MySQL purge script:"
			echo "  /usr/bin/mysql_config does not exist"
			return 1
		fi
		DSPAM_MySQL_PURGE_SQL=
		DSPAM_MySQL_VER=$(/usr/bin/mysql_config --version | sed "s:[^0-9.]*::g")
		DSPAM_MySQL_MAJOR=$(echo "${DSPAM_MySQL_VER}" | cut -d. -f1)
		DSPAM_MySQL_MINOR=$(echo "${DSPAM_MySQL_VER}" | cut -d. -f2)
		DSPAM_MySQL_MICRO=$(echo "${DSPAM_MySQL_VER}" | cut -d. -f3)
		DSPAM_MySQL_INT=$(($DSPAM_MySQL_MAJOR * 65536 + $DSPAM_MySQL_MINOR * 256 + $DSPAM_MySQL_MICRO))

		# For MySQL >= 4.1 use the new purge script
		if [ "${DSPAM_MySQL_INT}" -ge "262400" ]
		then
			if [ -f "${DSPAM_CONFIGDIR}/config/mysql_purge-4.1-optimized.sql" -o -f "${DSPAM_CONFIGDIR}/mysql_purge-4.1-optimized.sql" ]
			then
				# See: http://securitydot.net/txt/id/32/type/articles/
				[ -f "${DSPAM_CONFIGDIR}/config/mysql_purge-4.1-optimized.sql" ] && DSPAM_MySQL_PURGE_SQL="${DSPAM_CONFIGDIR}/config/mysql_purge-4.1-optimized.sql"
				[ -f "${DSPAM_CONFIGDIR}/mysql_purge-4.1-optimized.sql" ] && DSPAM_MySQL_PURGE_SQL="${DSPAM_CONFIGDIR}/mysql_purge-4.1-optimized.sql"
			else
				[ -f "${DSPAM_CONFIGDIR}/config/mysql_purge-4.1.sql" ] && DSPAM_MySQL_PURGE_SQL="${DSPAM_CONFIGDIR}/config/mysql_purge-4.1.sql"
				[ -f "${DSPAM_CONFIGDIR}/mysql_purge-4.1.sql" ] && DSPAM_MySQL_PURGE_SQL="${DSPAM_CONFIGDIR}/mysql_purge-4.1.sql"
			fi
		else
			[ -f "${DSPAM_CONFIGDIR}/config/mysql_purge.sql" ] && DSPAM_MySQL_PURGE_SQL="${DSPAM_CONFIGDIR}/config/mysql_purge.sql"
			[ -f "${DSPAM_CONFIGDIR}/mysql_purge.sql" ] && DSPAM_MySQL_PURGE_SQL="${DSPAM_CONFIGDIR}/mysql_purge.sql"
		fi

		if [ -z "${DSPAM_MySQL_PURGE_SQL}" ]
		then
			echo "Can not run MySQL purge script:"
			echo "  No mysql_purge SQL script found"
			return 1
		fi

		if [ ! -e "/usr/bin/mysql" ]
		then
			echo "Can not run MySQL purge script:"
			echo "  /usr/bin/mysql does not exist"
			return 1
		fi

		# Construct mysql command line
		DSPAM_MySQL_CMD="/usr/bin/mysql --silent --user=${MySQLUser}"
		[ -S "${MySQLServer}" ] &&
			DSPAM_MySQL_CMD="${DSPAM_MySQL_CMD} --socket=${MySQLServer}" ||
			DSPAM_MySQL_CMD="${DSPAM_MySQL_CMD} --host=${MySQLServer}"
		[ -n "${MySQLPort}" ] &&
			DSPAM_MySQL_CMD="${DSPAM_MySQL_CMD} --port=${MySQLPort}"
		[ "${MySQLCompress}" == "true" ] &&
			DSPAM_MySQL_CMD="${DSPAM_MySQL_CMD} --compress"

		# Run the MySQL purge script
		MYSQL_PWD="${MySQLPass}" ${DSPAM_MySQL_CMD} ${MySQLDb} < ${DSPAM_MySQL_PURGE_SQL} >/dev/null
		_RC=$?
		if [ ${_RC} != 0 ]
		then
			echo "MySQL purge script returned error code ${_RC}"
		fi

		return 0
	fi
}


#
# Function to clean DSPAM PostgreSQL data
#
clean_pgsql_drv() {
	#
	# PostgreSQL
	#
	if	${USE_SQL_PURGE} && \
		read_dspam_params PgSQLServer PgSQLPort PgSQLUser PgSQLPass PgSQLDb && \
		[ -n "${PgSQLServer}" -a -n "${PgSQLUser}" -a -n "${PgSQLDb}" ]
	then
		DSPAM_PgSQL_PURGE_SQL=""
		[ -f "${DSPAM_CONFIGDIR}/config/pgsql_purge.sql" ] && DSPAM_PgSQL_PURGE_SQL="${DSPAM_CONFIGDIR}/config/pgsql_purge.sql"
		[ -f "${DSPAM_CONFIGDIR}/pgsql_purge.sql" ] && DSPAM_PgSQL_PURGE_SQL="${DSPAM_CONFIGDIR}/pgsql_purge.sql"

		if [ -z "${DSPAM_PgSQL_PURGE_SQL}" ]
		then
			echo "Can not run PostgreSQL purge script:"
			echo "  No pgsql_purge SQL script found"
			return 1
		fi

		if [ -e "/usr/bin/psql" ]
		then
			# Construct psql command line
			DSPAM_PgSQL_CMD="/usr/bin/psql -q -U ${PgSQLUser} -h ${PgSQLServer} -d ${PgSQLDb}"
			[ -n "${PgSQLPort}" ] &&
				DSPAM_PgSQL_CMD="${DSPAM_PgSQL_CMD} -p ${PgSQLPort}"

			# Run the PostgreSQL purge script
			PGUSER="${PgSQLUser}" PGPASSWORD="${PgSQLPass}" ${DSPAM_PgSQL_CMD} -f "${DSPAM_PgSQL_PURGE_SQL}" >/dev/null
		else
			# Run the pgsql_purge.py script
			PGUSER="${PgSQLUser}" PGPASSWORD="${PgSQLPass}" "${DSPAM_CONFIGDIR}/pgsql_purge.py" "${PgSQLServer}" "${PgSQLPort}" "${PgSQLDb}" "${DSPAM_PgSQL_PURGE_SQL}"
		fi

		_RC=$?
		if [ ${_RC} != 0 ]
		then
			echo "PostgreSQL purge script returned error code ${_RC}"
		fi

		return 0
	fi
}


#
# Function to clean DSPAM Hash data
#
clean_hash_drv() {
	#
	# Hash
	#
	if [ -d "${DSPAM_HOMEDIR}/data" ]
	then
		find ${DSPAM_HOMEDIR}/data/ -maxdepth 4 -mindepth 1 -type f -name "*.css" | while read name
		do
			/usr/bin/csscompress "${name}" 1>/dev/null 2>&1
			/usr/bin/cssclean "${name}" 1>/dev/null 2>&1
			# chown dspam:dspam "${name}"
		done
		find ${DSPAM_HOMEDIR}/data/ -maxdepth 4 -mindepth 1 -type d -name "*.sig" | while read name
		do
			find "${name}" -maxdepth 1 -mindepth 1 -type f -mtime +${SIGNATURE_AGE} -name "*.sig" -exec /bin/rm "{}" ";"
		done
		return 0
	else
		return 1
	fi
}


#
# Function to clean DSPAM SQLite3 data
#
clean_sqlite3_drv() {
	#
	# SQLite3
	#
	if	${USE_SQL_PURGE}
	then
		DSPAM_SQLite3_PURGE_SQL=""
		[ -f "${DSPAM_CONFIGDIR}/config/sqlite3_purge.sql" ] && DSPAM_SQLite3_PURGE_SQL="${DSPAM_CONFIGDIR}/config/sqlite3_purge.sql"
		[ -f "${DSPAM_CONFIGDIR}/sqlite3_purge.sql" ] && DSPAM_SQLite3_PURGE_SQL="${DSPAM_CONFIGDIR}/sqlite3_purge.sql"

		if [ -z "${DSPAM_SQLite3_PURGE_SQL}" ]
		then
			echo "Can not run SQLite3 purge script:"
			echo "  No sqlite_purge SQL script found"
			return 1
		fi

		if [ ! -e "/usr/bin/sqlite3" ]
		then
			echo "Can not run SQLite3 purge script:"
			echo "  /usr/bin/sqlite3 does not exist"
			return 1
		fi

		# Run the SQLite3 purge script
		find "${DSPAM_HOMEDIR}" -name "*.sdb" -print | while read name
		do
			/usr/bin/sqlite3 "$name" < "${DSPAM_SQLite3_PURGE_SQL}" >/dev/null
		done 1>/dev/null 2>&1

		return 0
	fi

}


#
# Acquire lock file and start processing
#
DSPAM_CRON_LOCKFILE="/var/run/$(basename $0 .sh).pid"
if ( set -o noclobber; echo "$$" > "${DSPAM_CRON_LOCKFILE}") 2> /dev/null; then

	trap 'rm -f "${DSPAM_CRON_LOCKFILE}"; exit $?' INT TERM EXIT

	#
	# Check for needed tools
	#
	if ! check_for_tools
	then
		# We have not all needed tools installed. Run just the dspam_clean part.
		run_dspam_clean
		exit $?
	fi

	#
	# Try to get DSPAM config directory
	#
	DSPAM_CONFIGDIR=$(getent passwd dspam | awk -F : '{print $6}')
	if [ ! -f "${DSPAM_CONFIGDIR}/dspam.conf" ]
	then
		# Something is wrong in passwd! Check if /etc/mail/dspam exists instead.
		if [ -f /etc/mail/dspam/dspam.conf ]
		then
			DSPAM_CONFIGDIR="/etc/mail/dspam"
		fi
	fi
	if [ ! -d "${DSPAM_CONFIGDIR}" ] 
	then
		echo "Configuration directory not found!"
		exit 2
	fi

	#
	# Try to get DSPAM data home directory
	#
	if read_dspam_params Home && [ -d "${Home}" ]
	then
		DSPAM_HOMEDIR=${Home}
	else
		# Something is wrong in dspam.conf! Check if /var/spool/dspam exists instead.
		if [ -d /var/spool/dspam ]
		then
			DSPAM_HOMEDIR="/var/spool/dspam"
		fi
	fi
	if [ ! -d "${DSPAM_HOMEDIR}" ] 
	then
		echo "Home directory not found! Please fix your dspam.conf."
		exit 2
	fi

	#
	# User log purging
	#
	if [ -d "${DSPAM_CONFIGDIR}/data" ]
	then
		dspam_logrotate -a ${LOGROTATE_AGE} -d "${DSPAM_CONFIGDIR}/data" >/dev/null # 2>&1
	fi

	if [ ! -e "/usr/bin/dspam" ]
	then
		echo "Can not run DSPAM application:"
		echo "  /usr/bin/dspam does not exist"
		return 1
	fi

	#
	# Process all available storage drivers
	#
	for foo in $(/usr/bin/dspam --version 2>&1 | sed -n "s:,: :g;s:^.*\-\-with\-storage\-driver=\([^\'\]*\).*:\1:gIp")
	do
		case "${foo}" in
			hash_drv)
				clean_hash_drv
				;;
			mysql_drv)
				clean_mysql_drv
				;;
			pgsql_drv)
				clean_pgsql_drv
				;;
			sqlite3_drv)
				clean_sqlite3_drv
				;;
			*)
				echo "Unknown storage ${foo} driver"
				;;
		esac
	done

	#
	# Run the dspam_clean command
	#
	run_dspam_clean


	#
	# Release lock
	#
	/bin/rm -f "${DSPAM_CRON_LOCKFILE}"
	trap - INT TERM EXIT
fi



1.1                  mail-filter/dspam/files/pgsql_purge.py

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dspam/files/pgsql_purge.py?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dspam/files/pgsql_purge.py?rev=1.1&content-type=text/plain

Index: pgsql_purge.py
===================================================================
#!/bin/env python

import sys, os
import psycopg2
from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT

def main():
    if len(sys.argv) == 5:
        thiscript, serverhost, serverport, dspamdb, purgescript = sys.argv
    else:
        print "Usage: %s server_host server_port dspam_dbname purge_script" %(sys.argv[0])
        sys.exit(1)
    try:
        env = os.environ
        dspamuser = env['PGUSER']
        dspampass = env['PGPASSWORD']
        if len(serverport) > 0:
            con = psycopg2.connect(host=serverhost, port=int(serverport), database=dspamdb, user=dspamuser, password=dspampass)
        else:
            con = psycopg2.connect(host=serverhost, database=dspamdb, user=dspamuser, password=dspampass)
        con.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT) # Needed for plpgsql
        cur = con.cursor()
    except Exception, e:
        print "ERROR: ",e
        sys.exit(2)
    try:
        f = open(purgescript, 'r')
        script = f.read()
        f.close()
    except Exception, e:
        print "ERROR: ",e
        sys.exit(3)
    try:
        cur.execute(script)
    except Exception, e:
        print "ERROR: ",e
        sys.exit(4)
    con.close()
    
if __name__ == '__main__':
    main()



1.1                  mail-filter/dspam/files/digest-dspam-3.8.0-r7

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dspam/files/digest-dspam-3.8.0-r7?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dspam/files/digest-dspam-3.8.0-r7?rev=1.1&content-type=text/plain

Index: digest-dspam-3.8.0-r7
===================================================================
MD5 1b44857a1cafe810fb321d5d6d326fe9 dspam-3.8.0-patches-20070930.tar.gz 8356
RMD160 3ea07fac355ecfbbd0569cdcb08b57ce252365e0 dspam-3.8.0-patches-20070930.tar.gz 8356
SHA256 ee22f7625445d37111aa4d8fa2f7c3cb159b96a86df29a97a01c9086c4e84e0d dspam-3.8.0-patches-20070930.tar.gz 8356
MD5 056b8c8b3ad9415a52c01b22ff1e64cf dspam-3.8.0.tar.gz 726160
RMD160 e7831e2415e30e819dd9cbc0ba3f269e113e2fb9 dspam-3.8.0.tar.gz 726160
SHA256 84a227934a7aee73516bdb82c33ee7b359e955c8cd95a1544a9a13069f79bfc7 dspam-3.8.0.tar.gz 726160
MD5 8ffe9d41e6104a4c6d19067528193145 dspam_sa_trainer.tar.gz 1230
RMD160 c3d0fca7169d23ecf9d44c850ee255b42d97d818 dspam_sa_trainer.tar.gz 1230
SHA256 8fb6b1ebe592acf00a028737ef8e174544af166768b987d29048b2319bc5a215 dspam_sa_trainer.tar.gz 1230



-- 
gentoo-commits@g.o mailing list