Attachment #50889 for bug #77449

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

Lines 5-10 Link Here

(-)dspam/Makefile (-8 / +13 lines)
5	# $FreeBSD: ports/mail/dspam/Makefile,v 1.32 2005/02/09 15:52:35 vs Exp $	5	# $FreeBSD: ports/mail/dspam/Makefile,v 1.32 2005/02/09 15:52:35 vs Exp $
6	#	6	#
7		7
		8	# Note to commiters: If don't commit a maintainer patch and as a result PKGNAME
		9	# or user variables (WITH*) changes please and an entry in ${FILESDIR}/UPDATING and
		10	# modify UPD_LINE_NO=(no_of_added_lines-1) in this Makefile
		11	# else the port will be broken. Thanks.
		12
8	PORTNAME= dspam	13	PORTNAME= dspam
9	PORTVERSION= ${PORTVER_MAJ}${SNAP_DATE}	14	PORTVERSION= ${PORTVER_MAJ}${SNAP_DATE}
10	PORTREVISION= 0	15	PORTREVISION= 0
Lines 15-24 Link Here
15	COMMENT= Bayesian spam filter - stable maintenance version	20	COMMENT= Bayesian spam filter - stable maintenance version
16		21
17	PORTVER_MAJ= 3.2.6	22	PORTVER_MAJ= 3.2.6
18	#SNAP_DATE= .20041229.1945	23	SNAP_DATE= .20050128.1500
19		24
20	.ifdef(SNAP_DATE)	25	.ifdef(SNAP_DATE)
21	DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz
22	WRKSRC= ${WRKDIR}/dspam-cvs-stable${SNAP_DATE}	26	WRKSRC= ${WRKDIR}/dspam-cvs-stable${SNAP_DATE}
23	.endif	27	.endif
24		28
Lines 28-34 Link Here
28	NO_CHECKSUM= yes	32	NO_CHECKSUM= yes
29	. ifdef(SNAP_DATE)	33	. ifdef(SNAP_DATE)
30	DISTFILES= snapshot-stable.tar.gz	34	DISTFILES= snapshot-stable.tar.gz
31	FETCH_BEFORE_ARGS= -o ${DISTDIR}/${PORTNAME}-${PORTVERSION}.tar.gz	35	FETCH_BEFORE_ARGS= -v -o ${DISTDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
32	. endif	36	. endif
33	.endif	37	.endif
34		38
Lines 57-63 Link Here
57	OPTIONS+= MYSQL50 "Use MySQL 5.0.x as back-end" off	61	OPTIONS+= MYSQL50 "Use MySQL 5.0.x as back-end" off
58	OPTIONS+= MYSQL_COMPRESS "Compress dspam <--> MySQL" off	62	OPTIONS+= MYSQL_COMPRESS "Compress dspam <--> MySQL" off
59	OPTIONS+= POSTGRESQL "Use PostgreSQL as back-end" off	63	OPTIONS+= POSTGRESQL "Use PostgreSQL as back-end" off
60	OPTIONS+= ORACLE "Use Oracle as back-end (BROKEN)" off	64	#OPTIONS+= ORACLE "Use Oracle as back-end (BROKEN)" off
61	OPTIONS+= BDB4 "Use BDB4 as back-end (not recomanded)" off	65	OPTIONS+= BDB4 "Use BDB4 as back-end (not recomanded)" off
62	OPTIONS+= SQLITE2 "Use SQLite v2.x as back-end" on	66	OPTIONS+= SQLITE2 "Use SQLite v2.x as back-end" on
63	OPTIONS+= VIRT_USERS "Enable virtual users (needs SQL back-end)" off	67	OPTIONS+= VIRT_USERS "Enable virtual users (needs SQL back-end)" off
Lines 80-86 Link Here
80		84
81	OPTIONS+= CGI "Install CGI (pulls in apache)" off	85	OPTIONS+= CGI "Install CGI (pulls in apache)" off
82		86
83	USE_GNOME= pkgconfig
84	USE_LIBTOOL_VER=15	87	USE_LIBTOOL_VER=15
85	USE_REINPLACE= yes	88	USE_REINPLACE= yes
86	INSTALLS_SHLIB= yes	89	INSTALLS_SHLIB= yes
Lines 94-100 Link Here
94		97
95	PKGMESSAGE= ${WRKSRC}/README.FreeBSD	98	PKGMESSAGE= ${WRKSRC}/README.FreeBSD
96		99
97	UPD_LINE_NO= 13	100	UPD_LINE_NO= 9
98		101
99	CONFLICTS= dspam-2* dspam-devel-[0-9]*	102	CONFLICTS= dspam-2* dspam-devel-[0-9]*
100		103
Lines 188-194 Link Here
188	CONFIGURE_ARGS+= --disable-trusted-user-security	191	CONFIGURE_ARGS+= --disable-trusted-user-security
189	.endif	192	.endif
190		193
191	DBDRV_TOTAL_COUNT= oooooooo # 8	194	DBDRV_TOTAL_COUNT= ooooooo # 7
192	DBDRV_COUNT= ${DBDRV_TOTAL_COUNT}	195	DBDRV_COUNT= ${DBDRV_TOTAL_COUNT}
193		196
194	.ifdef(WITH_MYSQL40)	197	.ifdef(WITH_MYSQL40)
Lines 411-416 Link Here
411	.endif	414	.endif
412		415
413	pre-extract:	416	pre-extract:
		417	@${ECHO_CMD} ""
414	@${ECHO_CMD} "Define vars below before make-ing if you need:"	418	@${ECHO_CMD} "Define vars below before make-ing if you need:"
415	@${ECHO_CMD} ""	419	@${ECHO_CMD} ""
416	@${ECHO_CMD} "SIGNATURE_LIFE=${SIGNATURE_LIFE} (default 15)"	420	@${ECHO_CMD} "SIGNATURE_LIFE=${SIGNATURE_LIFE} (default 15)"
Lines 433-439 Link Here
433	.for old_opt in MAILDROP PROCMAIL TRAD_BAYES ALT_BAYES SPAM_SUBJ \	437	.for old_opt in MAILDROP PROCMAIL TRAD_BAYES ALT_BAYES SPAM_SUBJ \
434	USER_LOGGING SYSTEM_LOGGING WEBMAIL OPT_IN SAT PARSE_TO_HEADERS \	438	USER_LOGGING SYSTEM_LOGGING WEBMAIL OPT_IN SAT PARSE_TO_HEADERS \
435	BROKEN_MTA BROKEN_ERR_CODES SIGNATURE_HEADERS SIGNATURE_ATACH \	439	BROKEN_MTA BROKEN_ERR_CODES SIGNATURE_HEADERS SIGNATURE_ATACH \
436	HOMEDIR_DOT SIGNATURE_LIFE SQLITE QUARANTINE_AGENT WHITELIST	440	HOMEDIR_DOT SIGNATURE_LIFE SQLITE QUARANTINE_AGENT WHITELIST \
		441	POSTGRESQL73 POSTGRESQL74 ORACLE
437	. if defined(WITH_${old_opt}) \|\| defined(WITHOUT_${old_opt})	442	. if defined(WITH_${old_opt}) \|\| defined(WITHOUT_${old_opt})
438	@${ECHO_CMD} ""	443	@${ECHO_CMD} ""
439	@${ECHO_CMD} "******************************************************************"	444	@${ECHO_CMD} "******************************************************************"

Lines 1-2 Link Here

(-)dspam/distinfo (-2 / +2 lines)
1	MD5 (dspam-3.2.6.tar.gz) = aad53b4542076840e2a0e1fd43e48ebb	1	MD5 (dspam-3.2.6.20050128.1500.tar.gz) = 4dac582a3e38a19a5c6120a43b49f51e
2	SIZE (dspam-3.2.6.tar.gz) = 621074	2	SIZE (dspam-3.2.6.20050128.1500.tar.gz) = 621415

Lines 1-3 Link Here

(-)dspam/files/UPDATING (+15 lines)
		1	# $FreeBSD$
		2	#
		3	# for each PKGNAME or user option change an entry should be added in this file
		4	# each entry
		5
1	This file documents some of the problems you may encounter when	6	This file documents some of the problems you may encounter when
2	upgrading dspam port. I will try my best to minimize these disruptions,	7	upgrading dspam port. I will try my best to minimize these disruptions,
3	but sometimes they are unavoidable.	8	but sometimes they are unavoidable.
Lines 9-14 Link Here
9	also the UPGRADING enclosed in the dspam distribution. You can see it by doing	14	also the UPGRADING enclosed in the dspam distribution. You can see it by doing
10	in the port directory:	15	in the port directory:
11	make extract; more `find . -type f -maxdepth 2 -name UPGRADING`	16	make extract; more `find . -type f -maxdepth 2 -name UPGRADING`
		17
		18	#############################################################################
		19	# dspam-3.2.6.20050128.1500
		20	#
		21
		22	- disable ORACLE DB back-end; it's unmaintained and hasn't work on FreeBSD
		23	- (added post-factum) Fix mysql/neural-combination
		24	- (added post-factum) change POSTGRESQL* to POSTGRESQL because of "Split the
		25	postgresql ports into a server and a client part"
		26
12		27
13	#############################################################################	28	#############################################################################
14	# dspam-3.2.6	29	# dspam-3.2.6




*** dspam.c	Fri Jan 28 14:33:46 2005
--- dspam.c.orig	Fri Jan 28 14:33:40 2005
***************
*** 2748,2757 ****
      free(SIG.data);
    nt_destroy (inoc_users);
    nt_destroy (classify_users);
!   if (CTX)
      dspam_destroy (CTX);
    return result;
- 
  }
  
  int
--- 2748,2760 ----
      free(SIG.data);
    nt_destroy (inoc_users);
    nt_destroy (classify_users);
!   if (CTX) {
!     if (CTX->signature == &SIG) {
!       CTX->signature = NULL;
!      }
      dspam_destroy (CTX);
+   }
    return result;
  }
  
  int

Return to bug 77449

Lines 1-28 Link Here

(-)dspam/files/patch-dspam.c (-28 lines)
1	*** dspam.c Fri Jan 28 14:33:46 2005
2	--- dspam.c.orig Fri Jan 28 14:33:40 2005
3	***************
4	* 2748,2757 **
5	free(SIG.data);
6	nt_destroy (inoc_users);
7	nt_destroy (classify_users);
8	! if (CTX)
9	dspam_destroy (CTX);
10	return result;
11	-
12	}
13
14	int
15	--- 2748,2760 ----
16	free(SIG.data);
17	nt_destroy (inoc_users);
18	nt_destroy (classify_users);
19	! if (CTX) {
20	! if (CTX->signature == &SIG) {
21	! CTX->signature = NULL;
22	! }
23	dspam_destroy (CTX);
24	+ }
25	return result;
26	}
27
28	int