ports/77449: [MAINT-UPD] mail/dspam: update to 3.2.6 snapshot 20050128.1500
Ion-Mihai IOnut Tetcu
itetcu at people.tecnik93.com
Sun Feb 13 12:50:26 UTC 2005
>Number: 77449
>Category: ports
>Synopsis: [MAINT-UPD] mail/dspam: update to 3.2.6 snapshot 20050128.1500
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Feb 13 12:50:18 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Ion-Mihai "IOnut" Tetcu
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD 5.3-STABLE #0: Thu Feb 10 17:38:05 EET 2005
>Description:
Update to 20050128.1500 snapshot
- disable ORACLE DB back-end; it's unmaintained and hasn't work on FreeBSD
- drop USE_GNOME as per PH 6.6
- drop merged up-stream files/patch-dspam.c
- kinldy ask non-maintainer-approved commits to be logged in files/UPDATING if they contain user-visible changes
( like the change of POSTGRESQL* to POSTGRESQL because of "Split the postgresql ports into a server and a client part" )
>How-To-Repeat:
apply attached path
please don't forget to delete files/patch-dspam.c
>Fix:
--- dspam-3.2.6_to_20050128.1500.diff begins here ---
diff -urN dspam.cvs/Makefile dspam/Makefile
--- dspam.cvs/Makefile Wed Feb 9 22:24:29 2005
+++ dspam/Makefile Sun Feb 13 14:20:16 2005
@@ -5,6 +5,11 @@
# $FreeBSD: ports/mail/dspam/Makefile,v 1.32 2005/02/09 15:52:35 vs Exp $
#
+# Note to commiters: If don't commit a maintainer patch and as a result PKGNAME
+# or user variables (WITH*) changes please and an entry in ${FILESDIR}/UPDATING and
+# modify UPD_LINE_NO=(no_of_added_lines-1) in this Makefile
+# else the port will be broken. Thanks.
+
PORTNAME= dspam
PORTVERSION= ${PORTVER_MAJ}${SNAP_DATE}
PORTREVISION= 0
@@ -15,10 +20,9 @@
COMMENT= Bayesian spam filter - stable maintenance version
PORTVER_MAJ= 3.2.6
-#SNAP_DATE= .20041229.1945
+SNAP_DATE= .20050128.1500
.ifdef(SNAP_DATE)
-DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz
WRKSRC= ${WRKDIR}/dspam-cvs-stable${SNAP_DATE}
.endif
@@ -28,7 +32,7 @@
NO_CHECKSUM= yes
. ifdef(SNAP_DATE)
DISTFILES= snapshot-stable.tar.gz
-FETCH_BEFORE_ARGS= -o ${DISTDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
+FETCH_BEFORE_ARGS= -v -o ${DISTDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
. endif
.endif
@@ -57,7 +61,7 @@
OPTIONS+= MYSQL50 "Use MySQL 5.0.x as back-end" off
OPTIONS+= MYSQL_COMPRESS "Compress dspam <--> MySQL" off
OPTIONS+= POSTGRESQL "Use PostgreSQL as back-end" off
-OPTIONS+= ORACLE "Use Oracle as back-end (BROKEN)" off
+#OPTIONS+= ORACLE "Use Oracle as back-end (BROKEN)" off
OPTIONS+= BDB4 "Use BDB4 as back-end (not recomanded)" off
OPTIONS+= SQLITE2 "Use SQLite v2.x as back-end" on
OPTIONS+= VIRT_USERS "Enable virtual users (needs SQL back-end)" off
@@ -80,7 +84,6 @@
OPTIONS+= CGI "Install CGI (pulls in apache)" off
-USE_GNOME= pkgconfig
USE_LIBTOOL_VER=15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
@@ -94,7 +97,7 @@
PKGMESSAGE= ${WRKSRC}/README.FreeBSD
-UPD_LINE_NO= 13
+UPD_LINE_NO= 9
CONFLICTS= dspam-2* dspam-devel-[0-9]*
@@ -188,7 +191,7 @@
CONFIGURE_ARGS+= --disable-trusted-user-security
.endif
-DBDRV_TOTAL_COUNT= oooooooo # 8
+DBDRV_TOTAL_COUNT= ooooooo # 7
DBDRV_COUNT= ${DBDRV_TOTAL_COUNT}
.ifdef(WITH_MYSQL40)
@@ -411,6 +414,7 @@
.endif
pre-extract:
+ @${ECHO_CMD} ""
@${ECHO_CMD} "Define vars below before make-ing if you need:"
@${ECHO_CMD} ""
@${ECHO_CMD} "SIGNATURE_LIFE=${SIGNATURE_LIFE} (default 15)"
@@ -433,7 +437,8 @@
.for old_opt in MAILDROP PROCMAIL TRAD_BAYES ALT_BAYES SPAM_SUBJ \
USER_LOGGING SYSTEM_LOGGING WEBMAIL OPT_IN SAT PARSE_TO_HEADERS \
BROKEN_MTA BROKEN_ERR_CODES SIGNATURE_HEADERS SIGNATURE_ATACH \
- HOMEDIR_DOT SIGNATURE_LIFE SQLITE QUARANTINE_AGENT WHITELIST
+ HOMEDIR_DOT SIGNATURE_LIFE SQLITE QUARANTINE_AGENT WHITELIST \
+ POSTGRESQL73 POSTGRESQL74 ORACLE
. if defined(WITH_${old_opt}) || defined(WITHOUT_${old_opt})
@${ECHO_CMD} ""
@${ECHO_CMD} "******************************************************************"
diff -urN dspam.cvs/distinfo dspam/distinfo
--- dspam.cvs/distinfo Sat Jan 29 21:40:43 2005
+++ dspam/distinfo Sun Feb 13 13:35:46 2005
@@ -1,2 +1,2 @@
-MD5 (dspam-3.2.6.tar.gz) = aad53b4542076840e2a0e1fd43e48ebb
-SIZE (dspam-3.2.6.tar.gz) = 621074
+MD5 (dspam-3.2.6.20050128.1500.tar.gz) = 4dac582a3e38a19a5c6120a43b49f51e
+SIZE (dspam-3.2.6.20050128.1500.tar.gz) = 621415
diff -urN dspam.cvs/files/UPDATING dspam/files/UPDATING
--- dspam.cvs/files/UPDATING Sat Jan 29 21:40:44 2005
+++ dspam/files/UPDATING Sun Feb 13 14:18:49 2005
@@ -1,3 +1,8 @@
+# $FreeBSD$
+#
+# for each PKGNAME or user option change an entry should be added in this file
+# each entry
+
This file documents some of the problems you may encounter when
upgrading dspam port. I will try my best to minimize these disruptions,
but sometimes they are unavoidable.
@@ -9,6 +14,16 @@
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.2.6.20050128.1500
+#
+
+- disable ORACLE DB back-end; it's unmaintained and hasn't work on FreeBSD
+- (added post-factum) Fix mysql/neural-combination
+- (added post-factum) change POSTGRESQL* to POSTGRESQL because of "Split the
+postgresql ports into a server and a client part"
+
#############################################################################
# dspam-3.2.6
diff -urN dspam.cvs/files/patch-dspam.c dspam/files/patch-dspam.c
--- dspam.cvs/files/patch-dspam.c Sat Jan 29 19:34:37 2005
+++ dspam/files/patch-dspam.c Thu Jan 1 02:00:00 1970
@@ -1,28 +0,0 @@
-*** 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
--- dspam-3.2.6_to_20050128.1500.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list