Attachment 147393 Details for Bug 193693 – dspam-merge-20140916 (IN-PROGRESS)

[patch] dspam-merge-20140916 (IN-PROGRESS)

dspam-merge-20140916.txt (text/plain), 18.50 KB, created by danny on 2014-09-17 08:18:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: danny

Created: 2014-09-17 08:18:42 UTC

Size: 18.50 KB

patch

obsolete

>diff -u -r -N -C5 dspam/Makefile dspam-merge/Makefile
>*** dspam/Makefile	Thu Sep 11 14:54:45 2014
>--- dspam-merge/Makefile	Wed Sep 17 00:51:38 2014
>***************
>*** 4,24 ****
>  # Note to committers: If don't commit a maintainer patch and as a result PKGNAME
>  # or user variables (WITH*) changes please add an entry in ${FILESDIR}/UPDATING
>  # Thanks.
>  
>  PORTNAME=	dspam
>! PORTVERSION=	3.9.0
>! PORTREVISION=	8
>  CATEGORIES=	mail
>! MASTER_SITES=	SF \
>! 		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
>  MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
>  
>  MAINTAINER=	ports@FreeBSD.org
>  COMMENT=	Bayesian spam filter
>  
>! MIN_OPTIONS_VER=	${PORTNAME}-3.9.0
>  
>  OPTIONS_DEFINE=	SYSLOG DEBUG VERBOSE_DEBUG BNR_DEBUG PREF_EXT DAEMON \
>  		CLAMAV CLAMAV_LOCAL EXTERNAL_LOOKUP \
>  		USER_HOMEDIR TRUSTED_USERS VIRT_USERS LONG_USERNAMES \
>  		LARGE_SCALE DOMAIN_SCALE NICESENDMAIL POSTFIX_MBC \
>--- 4,23 ----
>  # Note to committers: If don't commit a maintainer patch and as a result PKGNAME
>  # or user variables (WITH*) changes please add an entry in ${FILESDIR}/UPDATING
>  # Thanks.
>  
>  PORTNAME=	dspam
>! PORTVERSION=	3.10.2
>! PORTREVISION=	0
>  CATEGORIES=	mail
>! MASTER_SITES=	SF 
>  MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
>  
>  MAINTAINER=	ports@FreeBSD.org
>  COMMENT=	Bayesian spam filter
>  
>! LICENSE=	AGPLv3
>  
>  OPTIONS_DEFINE=	SYSLOG DEBUG VERBOSE_DEBUG BNR_DEBUG PREF_EXT DAEMON \
>  		CLAMAV CLAMAV_LOCAL EXTERNAL_LOOKUP \
>  		USER_HOMEDIR TRUSTED_USERS VIRT_USERS LONG_USERNAMES \
>  		LARGE_SCALE DOMAIN_SCALE NICESENDMAIL POSTFIX_MBC \
>***************
>*** 76,93 ****
>  GNU_CONFIGURE=	yes
>  CPPFLAGS+=	-I${LOCALBASE}/include
>  LDFLAGS+=	-L${LOCALBASE}/lib
>  
>  SHEBANG_FILES=	src/tools/dspam_logrotate \
>! 		src/tools/dspam_notify.pl \
>  		src/tools/dspam_train.in \
>! 		webui/cgi-bin/templates/de/strings.pl \
>  		webui/cgi-bin/templates/strings.pl \
>! 		webui/cgi-bin/templates/fr/strings.pl \
>! 		webui/cgi-bin/templates/es-es/strings.pl \
>! 		webui/cgi-bin/templates/pt-br/strings.pl \
>! 		webui/cgi-bin/*.cgi
>  
>  .ifdef(GDBS)
>  CFLAGS+=	-g -DDEBUG
>  STRIP=
>  .endif
>--- 75,90 ----
>  GNU_CONFIGURE=	yes
>  CPPFLAGS+=	-I${LOCALBASE}/include
>  LDFLAGS+=	-L${LOCALBASE}/lib
>  
>  SHEBANG_FILES=	src/tools/dspam_logrotate \
>! 		src/tools/dspam_notify.in \
>  		src/tools/dspam_train.in \
>! 		webui/cgi-bin/templates/*/strings.pl \
>  		webui/cgi-bin/templates/strings.pl \
>! 		webui/cgi-bin/*.cgi \
>! 		webui/cgi-bin/*.pl
>  
>  .ifdef(GDBS)
>  CFLAGS+=	-g -DDEBUG
>  STRIP=
>  .endif
>***************
>*** 110,146 ****
>  DSPAM_HOME?=	${_VAR_DIR}/db/dspam
>  DSPAM_HOME_OWNER?=	${DSPAM_OWNER}
>  DSPAM_HOME_GROUP?=	${DSPAM_GROUP}
>  DSPAM_HOME_MODE?=	0770
>  
>! .for s in OWNER GROUP HOME_OWNER HOME_GROUP
>! PLIST_SUB+=	DSPAM_$s=${DSPAM_$s}
>! .endfor
>! 
>! .include <bsd.port.pre.mk>
>  
>  CONFIGURE_ARGS+=	--sysconfdir=${DSPAM_ETC}
>  CONFIGURE_ARGS+=	--with-logdir=${LOG_DIR}
>  PLIST_SUB+=	LOG_DIR=${LOG_DIR}
>  
>  CONFIGURE_ARGS+=	--with-dspam-home=${DSPAM_HOME}
>  CONFIGURE_ARGS+=	--with-dspam-home-owner=${DSPAM_HOME_OWNER}
>  CONFIGURE_ARGS+=	--with-dspam-home-group=${DSPAM_HOME_GROUP}
>  CONFIGURE_ARGS+=	--with-dspam-home-mode=${DSPAM_HOME_MODE}
>! PLIST_SUB+=	DSPAM_HOME=${DSPAM_HOME}
>  
>  CONFIGURE_ARGS+=	--with-dspam-owner=${DSPAM_OWNER}
>  CONFIGURE_ARGS+=	--with-dspam-group=${DSPAM_GROUP}
>  # we set DSPAM_MODE at the end as some LDAs want specific mode
>  
>  _SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
>  		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
>  		-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g' \
>  		-e 's,%%PORTNAME%%,${PORTNAME},g' \
>  		-e 's,%%_VAR_DIR%%,${_VAR_DIR},g' \
>! 		-e '/^%%FreeBSD/D' \
>! 		-e '/^%%Tecnik%%/D'
>  
>  .if ${PORT_OPTIONS:MSYSLOG}
>  CONFIGURE_ARGS+=	--enable-syslog
>  .else
>  CONFIGURE_ARGS+=	--disable-syslog
>--- 107,152 ----
>  DSPAM_HOME?=	${_VAR_DIR}/db/dspam
>  DSPAM_HOME_OWNER?=	${DSPAM_OWNER}
>  DSPAM_HOME_GROUP?=	${DSPAM_GROUP}
>  DSPAM_HOME_MODE?=	0770
>  
>! PLIST_SUB+=	DSPAM_HOME=${DSPAM_HOME} \
>! 		DSPAM_OWNER=${DSPAM_OWNER} \
>! 		DSPAM_GROUP=${DSPAM_GROUP} \
>! 		DSPAM_MODE=${DSPAM_MODE} \
>! 		DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER} \
>! 		DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP} \
>! 		DSPAM_HOME_MODE=${DSPAM_HOME_MODE}
>  
>  CONFIGURE_ARGS+=	--sysconfdir=${DSPAM_ETC}
>  CONFIGURE_ARGS+=	--with-logdir=${LOG_DIR}
>  PLIST_SUB+=	LOG_DIR=${LOG_DIR}
>  
>  CONFIGURE_ARGS+=	--with-dspam-home=${DSPAM_HOME}
>  CONFIGURE_ARGS+=	--with-dspam-home-owner=${DSPAM_HOME_OWNER}
>  CONFIGURE_ARGS+=	--with-dspam-home-group=${DSPAM_HOME_GROUP}
>  CONFIGURE_ARGS+=	--with-dspam-home-mode=${DSPAM_HOME_MODE}
>! PLIST_SUB+=	DSPAM_HOME=${DSPAM_HOME} \
>! 		DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER} \
>! 		DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP} \
>! 		DSPAM_HOME_MODE=${DSPAM_HOME_MODE}
>  
>  CONFIGURE_ARGS+=	--with-dspam-owner=${DSPAM_OWNER}
>  CONFIGURE_ARGS+=	--with-dspam-group=${DSPAM_GROUP}
>  # we set DSPAM_MODE at the end as some LDAs want specific mode
>+ PLIST_SUB+=	DSPAM_OWNER=${DSPAM_OWNER} \
>+ 		DSPAM_GROUP=${DSPAM_GROUP} \
>+ 		DSPAM_MODE=${DSPAM_MODE} 
>  
>  _SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
>  		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
>  		-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g' \
>  		-e 's,%%PORTNAME%%,${PORTNAME},g' \
>  		-e 's,%%_VAR_DIR%%,${_VAR_DIR},g' \
>! 		-e '/^%%FreeBSD/D'
>! 
>! .include <bsd.port.options.mk>
>  
>  .if ${PORT_OPTIONS:MSYSLOG}
>  CONFIGURE_ARGS+=	--enable-syslog
>  .else
>  CONFIGURE_ARGS+=	--disable-syslog
>***************
>*** 265,277 ****
>  .endif
>  
>  .if ${PORT_OPTIONS:MEXTERNAL_LOOKUP}
>  CONFIGURE_ARGS+=	--enable-external-lookup
>  USE_OPENLDAP=	YES
>- #CPPFLAGS+=	-I${LOCALBASE}/include
>- #LDFLAGS+=	-lldap -llber
>- #CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>  .endif
>  
>  .if ${PORT_OPTIONS:MUSER_HOMEDIR}
>  CONFIGURE_ARGS+=	--enable-homedir
>  .endif
>--- 271,280 ----
>***************
>*** 436,446 ****
>  		${WRKSRC}/src/tools.pgsql_drv/purge.sql
>  	@${REINPLACE_CMD} -e "s|where date('now')-date(created_on) > 14;|where date('now')-date(created_on) > ${SIGNATURE_LIFE};|" \
>  		${WRKSRC}/src/tools.sqlite_drv/purge-2.sql
>  	@${REINPLACE_CMD} -e "s|where julianday('now')-julianday(created_on) > 14;|where julianday('now')-julianday(created_on) > ${SIGNATURE_LIFE};|" \
>  		 ${WRKSRC}/src/tools.sqlite_drv/purge-3.sql
>! 	@${REINPLACE_CMD} -e "s|%%PERL%%|${PERL}|; s|%%DSPAM_PATH%%|${PREFIX}/bin|" ${WRKSRC}/scripts/train.pl
>  
>  pre-configure:
>  .if ${PORT_OPTIONS:MVIRT_USERS} && !( defined(USE_MYSQL) || \
>  	${PORT_OPTIONS:MPGSQL} || ${PORT_OPTIONS:MHASH} )
>  	@${ECHO_CMD} "You need MySQL, POSTGRESQL or HASH for virtual users."
>--- 439,451 ----
>  		${WRKSRC}/src/tools.pgsql_drv/purge.sql
>  	@${REINPLACE_CMD} -e "s|where date('now')-date(created_on) > 14;|where date('now')-date(created_on) > ${SIGNATURE_LIFE};|" \
>  		${WRKSRC}/src/tools.sqlite_drv/purge-2.sql
>  	@${REINPLACE_CMD} -e "s|where julianday('now')-julianday(created_on) > 14;|where julianday('now')-julianday(created_on) > ${SIGNATURE_LIFE};|" \
>  		 ${WRKSRC}/src/tools.sqlite_drv/purge-3.sql
>! 	@${REINPLACE_CMD} -e "s^%%PERL%%^${PERL}^" \
>! 		${WRKSRC}/src/tools/dspam_train.in \
>! 		${WRKSRC}/src/tools/dspam_notify.in
>  
>  pre-configure:
>  .if ${PORT_OPTIONS:MVIRT_USERS} && !( defined(USE_MYSQL) || \
>  	${PORT_OPTIONS:MPGSQL} || ${PORT_OPTIONS:MHASH} )
>  	@${ECHO_CMD} "You need MySQL, POSTGRESQL or HASH for virtual users."
>***************
>*** 476,488 ****
>  
>  post-install:
>  ########
>  # stupid hack until I figure out where/how to patch
>  	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>! 	@${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/dspam.pc \
>! 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/dspam.pc
>! 	${RM} -R ${STAGEDIR}${PREFIX}/lib/pkgconfig || true
>  
>  .if ${PORT_OPTIONS:MEXAMPLES}
>  .ifdef(USE_MYSQL)
>  	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/mysql
>  	cd  ${WRKSRC}/src/tools.mysql_drv && \
>--- 481,493 ----
>  
>  post-install:
>  ########
>  # stupid hack until I figure out where/how to patch
>  	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
>! 	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/dspam.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dspam.pc
>! 	${TEST} `ls -1 ${STAGEDIR}${PREFIX}/lib/pkgconfig | wc -l` -eq 0 && \
>! 		${RM} -R ${STAGEDIR}${PREFIX}/lib/pkgconfig || true
>  
>  .if ${PORT_OPTIONS:MEXAMPLES}
>  .ifdef(USE_MYSQL)
>  	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/mysql
>  	cd  ${WRKSRC}/src/tools.mysql_drv && \
>***************
>*** 538,548 ****
>  	@cd ${WRKSRC} && ${INSTALL_DATA} ${_DOCS} ${STAGEDIR}${DOCSDIR}
>  	@cd ${WRKSRC}/doc && ${INSTALL_DATA} ${_DOCSL} ${STAGEDIR}${DOCSDIR}
>  	@cd ${FILESDIR} && ${INSTALL_DATA} UPDATING ${STAGEDIR}${DOCSDIR}/UPDATING
>  .endif
>  
>! 	@${MKDIR} -m ${DSPAM_HOME_MODE} ${STAGEDIR}${DSPAM_HOME}
>  .for _file in firstrun.txt firstspam.txt quarantinefull.txt
>  	@if ! ${TEST} -e ${WRKSRC}/txt/${_file}.sample;\
>  	then\
>  		cd ${WRKSRC}/txt && \
>  		${MV} ${_file} ${_file}.sample;\
>--- 543,553 ----
>  	@cd ${WRKSRC} && ${INSTALL_DATA} ${_DOCS} ${STAGEDIR}${DOCSDIR}
>  	@cd ${WRKSRC}/doc && ${INSTALL_DATA} ${_DOCSL} ${STAGEDIR}${DOCSDIR}
>  	@cd ${FILESDIR} && ${INSTALL_DATA} UPDATING ${STAGEDIR}${DOCSDIR}/UPDATING
>  .endif
>  
>! 	@${MKDIR} ${STAGEDIR}${DSPAM_HOME}
>  .for _file in firstrun.txt firstspam.txt quarantinefull.txt
>  	@if ! ${TEST} -e ${WRKSRC}/txt/${_file}.sample;\
>  	then\
>  		cd ${WRKSRC}/txt && \
>  		${MV} ${_file} ${_file}.sample;\
>***************
>*** 551,556 ****
>  		${INSTALL_DATA} ${_file}.sample ${STAGEDIR}${DSPAM_HOME}
>  .endfor
>  
>  	@${MKDIR} -m ${DSPAM_HOME_MODE} ${STAGEDIR}${LOG_DIR}
>  
>! .include <bsd.port.post.mk>
>--- 556,566 ----
>  		${INSTALL_DATA} ${_file}.sample ${STAGEDIR}${DSPAM_HOME}
>  .endfor
>  
>  	@${MKDIR} -m ${DSPAM_HOME_MODE} ${STAGEDIR}${LOG_DIR}
>  
>! 	@${CAT} ${WRKSRC}/README.FreeBSD
>! 	@${ECHO_CMD} "If you have set DOCS you can review this"
>! 	@${ECHO_CMD} "message in ${DOCSDIR}/README.FreeBSD"
>! 	@${ECHO_CMD}
>! 
>! .include <bsd.port.mk>
>diff -u -r -N -C5 dspam/distinfo dspam-merge/distinfo
>*** dspam/distinfo	Wed Jan 22 07:30:13 2014
>--- dspam-merge/distinfo	Tue Sep 16 18:49:54 2014
>***************
>*** 1,2 ****
>! SHA256 (dspam-3.9.0.tar.gz) = fb2b0d0e49d44e077e665041041035c3a882d858c03265dd0955664c0fa934ae
>! SIZE (dspam-3.9.0.tar.gz) = 973232
>--- 1,2 ----
>! SHA256 (dspam-3.10.2.tar.gz) = ae76569604021f35b741fb95198a1e611a8c64c3838661973a6cf360bba593a9
>! SIZE (dspam-3.10.2.tar.gz) = 1035054
>diff -u -r -N -C5 dspam/files/UPDATING dspam-merge/files/UPDATING
>*** dspam/files/UPDATING	Thu Jan 23 16:14:07 2014
>--- dspam-merge/files/UPDATING	Wed Sep 17 00:53:13 2014
>***************
>*** 15,24 ****
>--- 15,39 ----
>  also the UPGRADING enclosed in the dspam distribution. You can see it by doing
>  in the port directory:
>  make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
>  
>  ###########################################################################
>+ # dspam-3.10.2
>+ #
>+ 
>+ Bugfixes:
>+ - TODO: Wrapup of major changes since 3.9.0
>+ 
>+ Port changes:
>+ - TODO: Remember to credit for patches [1][2]
>+ - TODO: All port tweaks since last release
>+ 
>+ [1] Patch from <yds@CoolRat.org> in PR #180695
>+ [2] Patch from Radim Kolar <hsn@sendmail.cz> in PR #167289
>+ 
>+ 
>+ ###########################################################################
>  # dspam-3.9.0
>  #
>  
>  Port changes:
>  - LDAP option --> EXTERNAL_LOOKUP (following upstream changes)
>diff -u -r -N -C5 dspam/files/patch-scripts__train.pl dspam-merge/files/patch-scripts__train.pl
>*** dspam/files/patch-scripts__train.pl	Wed Jan 22 09:40:44 2014
>--- dspam-merge/files/patch-scripts__train.pl	Wed Dec 31 16:00:00 1969
>***************
>*** 1,17 ****
>- --- ./scripts/train.pl.orig	2010-01-11 23:21:58.000000000 +0200
>- +++ ./scripts/train.pl	2010-01-17 18:52:16.000000000 +0200
>- @@ -1,4 +1,4 @@
>- -#!/usr/bin/perl
>- +#!%%PERL%%
>-  
>-  # train.pl
>-  # This tool trains a corpus of messages (a directory containing a nonspam and
>- @@ -14,7 +14,7 @@
>-  use vars qw { $USER $PATH $REPORTING_WINDOW $CORPUS $TRAINING_MODE };
>-  
>-  $REPORTING_WINDOW  = 250;			# How often to summarize
>- -$PATH              = "/usr/local/dspam/bin";	# Path to dspam binaries
>- +$PATH              = "%%DSPAM_PATH%%";		# Path to dspam binaries
>-  $TRAINING_MODE     = "teft";			# Training mode
>-  
>-  ### DO NOT CONFIGURE BELOW THIS LINE ###
>--- 0 ----
>diff -u -r -N -C5 dspam/pkg-descr dspam-merge/pkg-descr
>*** dspam/pkg-descr	Wed Jan 22 07:44:51 2014
>--- dspam-merge/pkg-descr	Tue Sep 16 23:28:21 2014
>***************
>*** 2,7 ****
>  of anti-spam mechanism, and is currently effective as both a
>  server-side agent for UNIX email servers and a developer's library
>  for mail clients, other anti-spam tools, and similar projects
>  requiring drop-in spam filtering.
>  
>! WWW: http://dspam.nuclearelephant.com
>--- 2,7 ----
>  of anti-spam mechanism, and is currently effective as both a
>  server-side agent for UNIX email servers and a developer's library
>  for mail clients, other anti-spam tools, and similar projects
>  requiring drop-in spam filtering.
>  
>! WWW: http://dspam.sourceforge.net/
>diff -u -r -N -C5 dspam/pkg-plist dspam-merge/pkg-plist
>*** dspam/pkg-plist	Tue Aug  5 21:34:23 2014
>--- dspam-merge/pkg-plist	Wed Sep 17 01:03:12 2014
>***************
>*** 1,35 ****
>- %%HASH%%bin/cssstat
>- %%HASH%%bin/csscompress
>  %%HASH%%bin/cssclean
>  %%HASH%%bin/cssconvert
>  bin/dspam
>  bin/dspamc
>  bin/dspam_2sql
>  bin/dspam_admin
>  bin/dspam_clean
>  bin/dspam_crc
>  bin/dspam_dump
>  bin/dspam_logrotate
>  bin/dspam_merge
>  %%PGSQL%%bin/dspam_pg2int8
>  bin/dspam_stats
>  bin/dspam_train
>  @owner %%DSPAM_OWNER%%
>  @group %%DSPAM_GROUP%%
>- @mode 640
>  @sample etc/dspam.conf.sample
>  @mode
>- @group
>- @owner
>  include/dspam/buffer.h
>  include/dspam/config.h
>  include/dspam/config_shared.h
>  include/dspam/decode.h
>  include/dspam/diction.h
>  include/dspam/error.h
>- include/dspam/external_lookup.h
>  include/dspam/heap.h
>  include/dspam/libdspam.h
>  include/dspam/libdspam_objects.h
>  include/dspam/nodetree.h
>  include/dspam/pref.h
>--- 1,45 ----
>  %%HASH%%bin/cssclean
>+ %%HASH%%bin/csscompress
>  %%HASH%%bin/cssconvert
>+ %%HASH%%bin/cssstat
>+ @owner %%DSPAM_OWNER%%
>+ @group %%DSPAM_GROUP%%
>+ @mode %%DSPAM_MODE%%
>  bin/dspam
>+ @exec chown %%DSPAM_OWNER%%:%%DSPAM_GROUP%% %D/%F
>+ @exec chmod %%DSPAM_MODE%% %D/%F
>+ @mode
>+ @group wheel
>+ @owner root
>  bin/dspamc
>  bin/dspam_2sql
>  bin/dspam_admin
>  bin/dspam_clean
>  bin/dspam_crc
>  bin/dspam_dump
>  bin/dspam_logrotate
>  bin/dspam_merge
>+ bin/dspam_notify
>  %%PGSQL%%bin/dspam_pg2int8
>  bin/dspam_stats
>  bin/dspam_train
>+ @mode 0640
>  @owner %%DSPAM_OWNER%%
>  @group %%DSPAM_GROUP%%
>  @sample etc/dspam.conf.sample
>+ @exec chown %%DSPAM_OWNER%%:%%DSPAM_GROUP%% %D/%F
>+ @exec chmod 0640 %D/%F
>+ @group wheel
>+ @owner root
>  @mode
>  include/dspam/buffer.h
>  include/dspam/config.h
>  include/dspam/config_shared.h
>  include/dspam/decode.h
>  include/dspam/diction.h
>  include/dspam/error.h
>  include/dspam/heap.h
>  include/dspam/libdspam.h
>  include/dspam/libdspam_objects.h
>  include/dspam/nodetree.h
>  include/dspam/pref.h
>***************
>*** 39,62 ****
>  lib/libdspam.a
>  lib/libdspam.so
>  lib/libdspam.so.7
>  lib/libdspam.so.7.0.0
>  man/man1/dspam.1.gz
>  man/man1/dspam_clean.1.gz
>  man/man1/dspam_dump.1.gz
>  man/man1/dspam_merge.1.gz
>  man/man1/dspam_stats.1.gz
>  man/man1/dspam_train.1.gz
>- man/man3/libdspam.3.gz
>- man/man3/dspam_init.3.gz
>- man/man3/dspam_create.3.gz
>  man/man3/dspam_addattribute.3.gz
>  man/man3/dspam_attach.3.gz
>! man/man3/dspam_process.3.gz
>! man/man3/dspam_getsource.3.gz
>  man/man3/dspam_destroy.3.gz
>  man/man3/dspam_detach.3.gz
>  %%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.a
>  %%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.so
>  %%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.so.7
>  %%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.so.7.0.0
>  %%DYNAMIC%%%%MYSQL%%lib/dspam/libmysql_drv.a
>--- 49,76 ----
>  lib/libdspam.a
>  lib/libdspam.so
>  lib/libdspam.so.7
>  lib/libdspam.so.7.0.0
>  man/man1/dspam.1.gz
>+ man/man1/dspam_admin.1.gz
>  man/man1/dspam_clean.1.gz
>+ man/man1/dspam_crc.1.gz
>  man/man1/dspam_dump.1.gz
>+ man/man1/dspam_logrotate.1.gz
>  man/man1/dspam_merge.1.gz
>  man/man1/dspam_stats.1.gz
>  man/man1/dspam_train.1.gz
>  man/man3/dspam_addattribute.3.gz
>  man/man3/dspam_attach.3.gz
>! man/man3/dspam_clearattributes.3.gz
>! man/man3/dspam_create.3.gz
>  man/man3/dspam_destroy.3.gz
>  man/man3/dspam_detach.3.gz
>+ man/man3/dspam_getsource.3.gz
>+ man/man3/dspam_init.3.gz
>+ man/man3/dspam_process.3.gz
>+ man/man3/libdspam.3.gz
>  %%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.a
>  %%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.so
>  %%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.so.7
>  %%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.so.7.0.0
>  %%DYNAMIC%%%%MYSQL%%lib/dspam/libmysql_drv.a
>***************
>*** 74,85 ****
>  @dirrm lib/dspam
>  libdata/pkgconfig/dspam.pc
>  %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
>  %%PORTDOCS%%%%DOCSDIR%%/LICENSE
>  %%PORTDOCS%%%%DOCSDIR%%/README
>- %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES
>  %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
>  %%PORTDOCS%%%%DOCSDIR%%/courier.txt
>  %%PORTDOCS%%%%DOCSDIR%%/exim.txt
>  %%PORTDOCS%%%%DOCSDIR%%/markov.txt
>  %%PORTDOCS%%%%DOCSDIR%%/mysql_drv.txt
>  %%PORTDOCS%%%%DOCSDIR%%/pgsql_drv.txt
>--- 88,101 ----
>  @dirrm lib/dspam
>  libdata/pkgconfig/dspam.pc
>  %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
>  %%PORTDOCS%%%%DOCSDIR%%/LICENSE
>  %%PORTDOCS%%%%DOCSDIR%%/README
>  %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
>+ %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES
>+ %%PORTDOCS%%%%DOCSDIR%%/UPDATING
>+ %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
>  %%PORTDOCS%%%%DOCSDIR%%/courier.txt
>  %%PORTDOCS%%%%DOCSDIR%%/exim.txt
>  %%PORTDOCS%%%%DOCSDIR%%/markov.txt
>  %%PORTDOCS%%%%DOCSDIR%%/mysql_drv.txt
>  %%PORTDOCS%%%%DOCSDIR%%/pgsql_drv.txt
>***************
>*** 87,98 ****
>  %%PORTDOCS%%%%DOCSDIR%%/postfix.txt
>  %%PORTDOCS%%%%DOCSDIR%%/qmail.txt
>  %%PORTDOCS%%%%DOCSDIR%%/relay.txt
>  %%PORTDOCS%%%%DOCSDIR%%/sendmail.txt
>  %%PORTDOCS%%%%DOCSDIR%%/sqlite_drv.txt
>- %%PORTDOCS%%%%DOCSDIR%%/UPDATING
>- %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
>  %%PORTDOCS%%@dirrm %%DOCSDIR%%
>  %%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql
>  %%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql
>  %%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-speed.sql
>  %%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge-4.1.sql
>--- 103,112 ----
>***************
>*** 226,233 ****
>  @cwd %%DSPAM_HOME%%
>  firstrun.txt.sample
>  firstspam.txt.sample
>  quarantinefull.txt.sample
>  @cwd /
>! @dirrmtry %%LOG_DIR%%
>  @dirrm %%DSPAM_HOME%%
>  @exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%DSPAM_HOME%%
>--- 240,255 ----
>  @cwd %%DSPAM_HOME%%
>  firstrun.txt.sample
>  firstspam.txt.sample
>  quarantinefull.txt.sample
>  @cwd /
>! @owner %%DSPAM_HOME_OWNER%%
>! @group %%DSPAM_HOME_GROUP%%
>! @mode %%DSPAM_HOME_MODE%%
>  @dirrm %%DSPAM_HOME%%
>+ @mode
>  @exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%DSPAM_HOME%%
>+ @exec chmod %%DSPAM_HOME_MODE%% %%DSPAM_HOME%%
>+ @exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%LOG_DIR%%
>+ @dirrmtry %%LOG_DIR%%
>+ @group wheel
>+ @owner root

Actions: View | Diff

Attachments on bug 193693: 147393 | 147430 | 147461 | 147628 | 148490