Attachment 84240 Details for Bug 120201 – file.diff

[patch] file.diff

file.diff (text/plain), 8.83 KB, created by fmysh on 2008-02-01 11:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fmysh

Created: 2008-02-01 11:30:03 UTC

Size: 8.83 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/japanese/p5-Mail-SpamAssassin/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- Makefile	14 Jan 2008 12:37:18 -0000	1.4
>+++ Makefile	1 Feb 2008 06:34:42 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	Mail-SpamAssassin
>-PORTVERSION=	3.2.3
>+PORTVERSION=	3.2.4
> CATEGORIES=	japanese mail perl5
> MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
> 		${PATCH_SITES}
>@@ -18,7 +18,8 @@
> EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
> 
> PATCH_SITES=	http://spamassassin.jp/download/sa${PORTVERSION:R}/:JA
>-PATCHFILES=	spamassassin-3.2.3-ja-test1.patch:JA
>+PATCHFILES=	spamassassin-${PORTVERSION}-ja-${PATCHLEVEL}.patch:JA
>+PATCHLEVEL=	test1
> PATCH_DIST_STRIP=	-p1
> 
> MAINTAINER=	fmysh@iijmio-mail.jp
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/japanese/p5-Mail-SpamAssassin/distinfo,v
>retrieving revision 1.2
>diff -u -r1.2 distinfo
>--- distinfo	14 Jan 2008 12:37:18 -0000	1.2
>+++ distinfo	24 Jan 2008 11:51:10 -0000
>@@ -1,12 +1,12 @@
>-MD5 (ja-spamassassin/Mail-SpamAssassin-3.2.3.tar.gz) = 2e356b70b9458b44a828c19f6e816521
>-SHA256 (ja-spamassassin/Mail-SpamAssassin-3.2.3.tar.gz) = 2bf7635555dea4912512a32c7c567094ef264770b86029c49f653e97352efad8
>-SIZE (ja-spamassassin/Mail-SpamAssassin-3.2.3.tar.gz) = 1202082
>+MD5 (ja-spamassassin/Mail-SpamAssassin-3.2.4.tar.gz) = 81ec227d4d63aba08563ee868af9fbeb
>+SHA256 (ja-spamassassin/Mail-SpamAssassin-3.2.4.tar.gz) = 20f9c64d75210da5018d21585f6474868966cf1c09cb68d9fb0a3635aa17dccb
>+SIZE (ja-spamassassin/Mail-SpamAssassin-3.2.4.tar.gz) = 1219161
> MD5 (ja-spamassassin/tokenizer.pre) = e8e787b76ab94805c7472a90f860cc0a
> SHA256 (ja-spamassassin/tokenizer.pre) = 9f8e30a8449fd13d571427ea30a252b4b275f153bde5345c50427a7aee3c90e0
> SIZE (ja-spamassassin/tokenizer.pre) = 163
>-MD5 (ja-spamassassin/spamassassin-3.2.3-ja-test1.txt) = ec19409451e9c850c8d7ccfd3d83a873
>-SHA256 (ja-spamassassin/spamassassin-3.2.3-ja-test1.txt) = cc08cde62b1d86c2a2b80666c95f80668bf250f634694eaaa8f14515fecfbeb2
>-SIZE (ja-spamassassin/spamassassin-3.2.3-ja-test1.txt) = 8476
>-MD5 (ja-spamassassin/spamassassin-3.2.3-ja-test1.patch) = 7a18557a8becd468da9a5ea6e39dc439
>-SHA256 (ja-spamassassin/spamassassin-3.2.3-ja-test1.patch) = 857cd382fa542841d1b290c2826a4bdf2912efd66e91f04752926e4bbcebce83
>-SIZE (ja-spamassassin/spamassassin-3.2.3-ja-test1.patch) = 33377
>+MD5 (ja-spamassassin/spamassassin-3.2.4-ja-test1.txt) = 06c8b7919f2f9c8288dcad5d2aea73fa
>+SHA256 (ja-spamassassin/spamassassin-3.2.4-ja-test1.txt) = 5e082ce16d3a827b207a15c10738b34eba9ca00b66e008776767a4c0d5a5c08c
>+SIZE (ja-spamassassin/spamassassin-3.2.4-ja-test1.txt) = 9086
>+MD5 (ja-spamassassin/spamassassin-3.2.4-ja-test1.patch) = e80cafaec258fb3dd73f4e369a716944
>+SHA256 (ja-spamassassin/spamassassin-3.2.4-ja-test1.patch) = 4afeac19c1e409f41322f10153aba5bddddfb27f210f922d8ce3cded7f5a236a
>+SIZE (ja-spamassassin/spamassassin-3.2.4-ja-test1.patch) = 33377
>Index: pkg-deinstall
>===================================================================
>RCS file: /home/ncvs/ports/japanese/p5-Mail-SpamAssassin/pkg-deinstall,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-deinstall
>--- pkg-deinstall	14 Jan 2008 12:37:18 -0000	1.2
>+++ pkg-deinstall	1 Feb 2008 11:12:36 -0000
>@@ -3,27 +3,15 @@
> if [ "$2" != "POST-DEINSTALL" ]; then
>     exit 0
> fi
>+
> if [ -d /var/db/spamassassin ]; then
>-	echo "To delete /var/db/spamassassin, use 'rm -rf /var/db/spamassassin'"
>+        echo "To delete /var/db/spamassassin, use 'rm -rf /var/db/spamassassin'"
> fi
> 
> USER=spamd
>-GROUP=${USER}
> 
> if pw usershow "${USER}" 2>/dev/null 1>&2; then
>-	if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
>-		echo "To delete ${USER} user permanently, use 'rmuser ${USER}'"
>-	else
>-		pw userdel ${USER}
>-	fi
>-fi
>-
>-if pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
>-	if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
>-		echo "To delete the ${GROUP} group permanently, use 'pw groupdel ${GROUP}'."
>-	else
>-		pw groupdel ${GROUP}
>-	fi
>+	echo "To delete ${USER} user permanently, use 'rmuser ${USER}'"
> fi
> 
> exit 0
>Index: pkg-install
>===================================================================
>RCS file: /home/ncvs/ports/japanese/p5-Mail-SpamAssassin/pkg-install,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-install
>--- pkg-install	7 Sep 2007 04:27:13 -0000	1.1
>+++ pkg-install	24 Jan 2008 19:05:30 -0000
>@@ -1,4 +1,45 @@
> #!/bin/sh
>+PKG_PREFIX=${PKG_PREFIX:-/usr/local}
>+
>+ask() {
>+        local question default answer
>+
>+        question=$1
>+        default=$2
>+        if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
>+                read -t120 -p "${question} [${default}]? " answer
>+        fi
>+        echo ${answer:-${default}}
>+}
>+
>+yesno() {
>+        local question default answer
>+
>+        question=$1
>+        default=$2
>+        while :; do
>+                answer=$(ask "${question}" "${default}")
>+                case "${answer}" in
>+                [Yy]*)  return 0;;
>+                [Nn]*)  return 1;;
>+                esac
>+                echo "Please answer yes or no."
>+        done
>+}
>+
>+if [ "$2" = "POST-INSTALL" ];then
>+
>+   if yesno "Do you wish to run sa-update to fetch new rules" "N";then
>+       ${PKG_PREFIX}/bin/sa-update
>+   fi
>+   grep '^load.*Rule2XSBody' ${PKG_PREFIX}/etc/mail/spamassassin/v320.pre > /dev/null
>+   if [ $? -eq 0 ];then
>+     if yesno "Do you with to compile rules with re2c (will take a long time)" "N";then
>+       ${PKG_PREFIX}/bin/sa-compile
>+     fi
>+   fi
>+   exit 0
>+fi  # post-install
> 
> if [ "$2" != "PRE-INSTALL" ]; then
>     exit 0
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/japanese/p5-Mail-SpamAssassin/pkg-plist,v
>retrieving revision 1.3
>diff -u -r1.3 pkg-plist
>--- pkg-plist	14 Jan 2008 12:37:18 -0000	1.3
>+++ pkg-plist	24 Jan 2008 19:01:16 -0000
>@@ -6,19 +6,14 @@
> bin/spamassassin
> bin/spamc
> bin/spamd
>-lib/libspamc.so
>-lib/libspamc.so.0
>-%%SSL%%lib/libsslspamc.so
>-%%SSL%%lib/libsslspamc.so.0
>-include/libspamc.h
> @unexec rm -rf %D/etc/mail/spamassassin/sa-update-keys || true
>+@unexec if cmp -s %B/tokenizer.pre.sample %B/tokenizer.pre; then rm -f %B/tokenizer.pre; fi
>+etc/mail/spamassassin/tokenizer.pre.sample
>+@exec [ -f %B/tokenizer.pre ] || cp %B/%f %B/tokenizer.pre
> etc/mail/spamassassin/local.cf.sample
> @unexec if cmp -s %B/init.pre.sample %B/init.pre; then rm -f %B/init.pre; fi
> etc/mail/spamassassin/init.pre.sample
> @exec [ -f %B/init.pre ] || cp %B/%f %B/init.pre
>-@unexec if cmp -s %B/tokenizer.pre.sample %B/tokenizer.pre; then rm -f %B/tokenizer.pre; fi
>-etc/mail/spamassassin/tokenizer.pre.sample
>-@exec [ -f %B/tokenizer.pre ] || cp %B/%f %B/tokenizer.pre
> @unexec if cmp -s %B/v310.pre.sample %B/v310.pre; then rm -f %B/v310.pre; fi
> etc/mail/spamassassin/v310.pre.sample
> @exec [ -f %B/v310.pre ] || cp %B/%f %B/v310.pre
>@@ -28,6 +23,11 @@
> @unexec if cmp -s %B/v320.pre.sample %B/v320.pre; then rm -f %B/v320.pre; fi
> etc/mail/spamassassin/v320.pre.sample
> @exec [ -f %B/v320.pre ] || cp %B/%f %B/v320.pre
>+include/libspamc.h
>+lib/libspamc.so
>+lib/libspamc.so.0
>+%%SSL%%lib/libsslspamc.so
>+%%SSL%%lib/libsslspamc.so.0
> %%SITE_PERL%%/Mail/SpamAssassin.pm
> %%SITE_PERL%%/Mail/SpamAssassin/AICache.pm
> %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm
>@@ -71,8 +71,8 @@
> %%SITE_PERL%%/Mail/SpamAssassin/PerMsgStatus.pm
> %%SITE_PERL%%/Mail/SpamAssassin/PersistentAddrList.pm
> %%SITE_PERL%%/Mail/SpamAssassin/Plugin.pm
>-%%SITE_PERL%%/Mail/SpamAssassin/Plugin/AWL.pm
> %%SITE_PERL%%/Mail/SpamAssassin/Plugin/ASN.pm
>+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/AWL.pm
> %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AccessDB.pm
> %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AntiVirus.pm
> %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
>@@ -94,8 +94,8 @@
> %%SITE_PERL%%/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
> %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Pyzor.pm
> %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Razor2.pm
>-%%SITE_PERL%%/Mail/SpamAssassin/Plugin/RelayEval.pm
> %%SITE_PERL%%/Mail/SpamAssassin/Plugin/RelayCountry.pm
>+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/RelayEval.pm
> %%SITE_PERL%%/Mail/SpamAssassin/Plugin/ReplaceTags.pm
> %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
> %%SITE_PERL%%/Mail/SpamAssassin/Plugin/SPF.pm
>@@ -180,13 +180,12 @@
> @unexec rmdir /var/lib/spamassassin 2>/dev/null  || true
> @unexec rmdir /var/lib 2>/dev/null || true
> @unexec rmdir /var/db/spamassassin || true
>-@unexec rmdir /var/db || true
> @dirrm %%DATADIR%%
> @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
> @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
> @dirrm %%SITE_PERL%%/Mail/SpamAssassin/Util
> @dirrm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer
>-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Plugin
>+@dirrmtry %%SITE_PERL%%/Mail/SpamAssassin/Plugin
> @dirrm %%SITE_PERL%%/Mail/SpamAssassin/Message/Metadata
> @dirrm %%SITE_PERL%%/Mail/SpamAssassin/Message
> @dirrm %%SITE_PERL%%/Mail/SpamAssassin/Logger

Actions: View | Diff

Attachments on bug 120201: 84240