Attachment 68225 Details for Bug 100349 – file.diff

[patch] file.diff

file.diff (text/plain), 9.08 KB, created by Yoshisato YANAGISAWA on 2006-07-15 16:30:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yoshisato YANAGISAWA

Created: 2006-07-15 16:30:19 UTC

Size: 9.08 KB

patch

obsolete

>diff -ruN dkfilter.bak/Makefile dkfilter/Makefile
>--- dkfilter.bak/Makefile	Wed Jan 25 20:41:46 2006
>+++ dkfilter/Makefile	Sat Jul 15 23:29:04 2006
>@@ -6,12 +6,11 @@
> #
> 
> PORTNAME=	dkfilter
>-PORTVERSION=	0.8
>-PORTREVISION=	2
>+PORTVERSION=	0.10
>+PORTREVISION=	1
> CATEGORIES=	mail
> MASTER_SITES=	http://jason.long.name/dkfilter/
>-DISTNAME=	${PORTNAME}
>-EXTRACT_SUFX=	.tgz
>+EXTRACT_SUFX=	.tar.gz
> 
> MAINTAINER=	yanagisawa@csg.is.titech.ac.jp
> COMMENT=	Domainkeys filter for Postfix
>@@ -20,11 +19,12 @@
> 		${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
> 		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
> 		${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
>+		${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \
> 		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
> RUN_DEPENDS=	${BUILD_DEPENDS}
> 
> GNU_CONFIGURE=	yes
>-USE_RC_SUBR=	dkfilter_in.sh dkfilter_out.sh
>+USE_RC_SUBR=	dkfilter_in dkfilter_out
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
>diff -ruN dkfilter.bak/distinfo dkfilter/distinfo
>--- dkfilter.bak/distinfo	Sun Nov 13 05:18:42 2005
>+++ dkfilter/distinfo	Sat Jul 15 23:12:18 2006
>@@ -1,3 +1,3 @@
>-MD5 (dkfilter.tgz) = ab0bab68dc09d3a86acccd1115b4c28a
>-SHA256 (dkfilter.tgz) = 7113453ab611f322513fb980d5e50026435934d60e863511ac1e7e3a87400742
>-SIZE (dkfilter.tgz) = 76885
>+MD5 (dkfilter-0.10.tar.gz) = fb1b6aea79f55066693e090f9c9b4c86
>+SHA256 (dkfilter-0.10.tar.gz) = 2faa41b01ed8efc86ac948e04b3ff6e22bce2be394ab64d77b157474e2557822
>+SIZE (dkfilter-0.10.tar.gz) = 78267
>diff -ruN dkfilter.bak/files/dkfilter_in.in dkfilter/files/dkfilter_in.in
>--- dkfilter.bak/files/dkfilter_in.in	Thu Jan  1 09:00:00 1970
>+++ dkfilter/files/dkfilter_in.in	Sat Jul 15 23:03:40 2006
>@@ -0,0 +1,57 @@
>+#!/bin/sh
>+# $FreeBSD: ports/mail/dkfilter/files/dkfilter_in.sh.in,v 1.3 2006/02/20 20:47:10 dougb Exp $
>+#
>+
>+# PROVIDE: dkfilter_in
>+# REQUIRE: LOGIN
>+# BEFORE: mail
>+# KEYWORD: shutdown
>+
>+#
>+# Add the following lines to /etc/rc.conf to enable dkfilter.in:
>+#
>+# dkfilter_in_enable="YES"
>+#
>+
>+. %%RC_SUBR%%
>+
>+name=dkfilter_in
>+rcvar=`set_rcvar`
>+
>+# set defaults
>+
>+dkfilter_in_enable=${dkfilter_in_enable:-"NO"}
>+dkfilter_in_flags=${dkfilter_in_flags:-"127.0.0.1:10025 127.0.0.1:10026"}
>+dkfilter_in_pidfile=${dkfilter_in_pidfile:-"/var/run/dkfilter_in.pid"}
>+dkfilter_in_user=${dkfilter_in_user:-"dkfilter"}
>+
>+start_cmd="dkfilter_in_start"
>+stop_cmd="dkfilter_in_stop"
>+
>+dkfilter_in_start()
>+{
>+	if [ -f ${dkfilter_in_pidfile} ]; then
>+		echo "${name} already running?"
>+		exit 1
>+	fi
>+	touch ${dkfilter_in_pidfile}
>+	chown ${dkfilter_in_user} ${dkfilter_in_pidfile}
>+	su -m ${dkfilter_in_user} -c "daemon -p ${dkfilter_in_pidfile} \
>+		%%PREFIX%%/bin/dkfilter.in ${dkfilter_in_flags}" \
>+		> /dev/null 2>&1
>+	echo "Starting ${name}"
>+}
>+
>+dkfilter_in_stop()
>+{
>+	if [ ! -f ${dkfilter_in_pidfile} ]; then
>+		echo "${name} not running?"
>+		exit 1
>+	fi
>+	kill `cat ${dkfilter_in_pidfile}`
>+	rm -f ${dkfilter_in_pidfile}
>+	echo "Stopping ${name}"
>+}
>+
>+load_rc_config $name
>+run_rc_command "$1"
>diff -ruN dkfilter.bak/files/dkfilter_in.sh.in dkfilter/files/dkfilter_in.sh.in
>--- dkfilter.bak/files/dkfilter_in.sh.in	Tue Feb 21 05:47:10 2006
>+++ dkfilter/files/dkfilter_in.sh.in	Thu Jan  1 09:00:00 1970
>@@ -1,57 +0,0 @@
>-#!/bin/sh
>-# $FreeBSD: ports/mail/dkfilter/files/dkfilter_in.sh.in,v 1.3 2006/02/20 20:47:10 dougb Exp $
>-#
>-
>-# PROVIDE: dkfilter_in
>-# REQUIRE: LOGIN
>-# BEFORE: mail
>-# KEYWORD: shutdown
>-
>-#
>-# Add the following lines to /etc/rc.conf to enable dkfilter.in:
>-#
>-# dkfilter_in_enable="YES"
>-#
>-
>-. %%RC_SUBR%%
>-
>-name=dkfilter_in
>-rcvar=`set_rcvar`
>-
>-# set defaults
>-
>-dkfilter_in_enable=${dkfilter_in_enable:-"NO"}
>-dkfilter_in_flags=${dkfilter_in_flags:-"127.0.0.1:10025 127.0.0.1:10026"}
>-dkfilter_in_pidfile=${dkfilter_in_pidfile:-"/var/run/dkfilter_in.pid"}
>-dkfilter_in_user=${dkfilter_in_user:-"dkfilter"}
>-
>-start_cmd="dkfilter_in_start"
>-stop_cmd="dkfilter_in_stop"
>-
>-dkfilter_in_start()
>-{
>-	if [ -f ${dkfilter_in_pidfile} ]; then
>-		echo "${name} already running?"
>-		exit 1
>-	fi
>-	touch ${dkfilter_in_pidfile}
>-	chown ${dkfilter_in_user} ${dkfilter_in_pidfile}
>-	su -m ${dkfilter_in_user} -c "daemon -p ${dkfilter_in_pidfile} \
>-		%%PREFIX%%/bin/dkfilter.in ${dkfilter_in_flags}" \
>-		> /dev/null 2>&1
>-	echo "Starting ${name}"
>-}
>-
>-dkfilter_in_stop()
>-{
>-	if [ ! -f ${dkfilter_in_pidfile} ]; then
>-		echo "${name} not running?"
>-		exit 1
>-	fi
>-	kill `cat ${dkfilter_in_pidfile}`
>-	rm -f ${dkfilter_in_pidfile}
>-	echo "Stopping ${name}"
>-}
>-
>-load_rc_config $name
>-run_rc_command "$1"
>diff -ruN dkfilter.bak/files/dkfilter_out.in dkfilter/files/dkfilter_out.in
>--- dkfilter.bak/files/dkfilter_out.in	Thu Jan  1 09:00:00 1970
>+++ dkfilter/files/dkfilter_out.in	Sat Jul 15 23:03:40 2006
>@@ -0,0 +1,63 @@
>+#!/bin/sh
>+# $FreeBSD: ports/mail/dkfilter/files/dkfilter_out.sh.in,v 1.3 2006/02/20 20:47:10 dougb Exp $
>+#
>+
>+# PROVIDE: dkfilter_out
>+# REQUIRE: LOGIN
>+# BEFORE: mail
>+# KEYWORD: shutdown
>+
>+#
>+# Add the following lines to /etc/rc.conf to enable dkfilter.out:
>+#
>+# dkfilter_out_enable="YES"
>+#
>+# Before you enable dkfilter.out, you also need to make your domainkey to
>+# set it to DNS and configurate dkfilter_flags.
>+#
>+
>+. %%RC_SUBR%%
>+
>+name="dkfilter_out"
>+rcvar=`set_rcvar`
>+
>+# set defaults
>+
>+dkfilter_out_enable=${dkfilter_out_enable:-"NO"}
>+dkfilter_out_flags=${dkfilter_out_flags:-" --header \
>+	--keyfile=%%PREFIX%%/etc/dkfilter/private.key \
>+	--selector=selector1 --domain=example.org --method=nofws \
>+	127.0.0.1:10027 127.0.0.1:10028"}
>+dkfilter_out_pidfile=${dkfilter_out_pidfile:-"/var/run/dkfilter_out.pid"}
>+dkfilter_out_user=${dkfilter_out_user:-"dkfilter"}
>+
>+start_cmd="dkfilter_out_start"
>+stop_cmd="dkfilter_out_stop"
>+
>+dkfilter_out_start()
>+{
>+	if [ -f ${dkfilter_out_pidfile} ]; then
>+		echo "${name} already running?"
>+		exit 1
>+	fi 
>+	touch ${dkfilter_out_pidfile}
>+	chown ${dkfilter_out_user} ${dkfilter_out_pidfile}
>+	su -m ${dkfilter_out_user} -c "daemon -p ${dkfilter_out_pidfile} \
>+		%%PREFIX%%/bin/dkfilter.out ${dkfilter_out_flags}" \
>+		> /dev/null 2>&1
>+	echo "Starting ${name}."
>+}
>+
>+dkfilter_out_stop()
>+{
>+	if [ ! -f ${dkfilter_out_pidfile} ]; then
>+		echo "${name} not running?"
>+		exit 1
>+	fi
>+	kill `cat ${dkfilter_out_pidfile}`
>+	rm -f ${dkfilter_out_pidfile}
>+	echo "Stopping ${name}"
>+}
>+
>+load_rc_config $name
>+run_rc_command "$1"
>diff -ruN dkfilter.bak/files/dkfilter_out.sh.in dkfilter/files/dkfilter_out.sh.in
>--- dkfilter.bak/files/dkfilter_out.sh.in	Tue Feb 21 05:47:10 2006
>+++ dkfilter/files/dkfilter_out.sh.in	Thu Jan  1 09:00:00 1970
>@@ -1,63 +0,0 @@
>-#!/bin/sh
>-# $FreeBSD: ports/mail/dkfilter/files/dkfilter_out.sh.in,v 1.3 2006/02/20 20:47:10 dougb Exp $
>-#
>-
>-# PROVIDE: dkfilter_out
>-# REQUIRE: LOGIN
>-# BEFORE: mail
>-# KEYWORD: shutdown
>-
>-#
>-# Add the following lines to /etc/rc.conf to enable dkfilter.out:
>-#
>-# dkfilter_out_enable="YES"
>-#
>-# Before you enable dkfilter.out, you also need to make your domainkey to
>-# set it to DNS and configurate dkfilter_flags.
>-#
>-
>-. %%RC_SUBR%%
>-
>-name="dkfilter_out"
>-rcvar=`set_rcvar`
>-
>-# set defaults
>-
>-dkfilter_out_enable=${dkfilter_out_enable:-"NO"}
>-dkfilter_out_flags=${dkfilter_out_flags:-" --header \
>-	--keyfile=%%PREFIX%%/etc/dkfilter/private.key \
>-	--selector=selector1 --domain=example.org --method=nofws \
>-	127.0.0.1:10027 127.0.0.1:10028"}
>-dkfilter_out_pidfile=${dkfilter_out_pidfile:-"/var/run/dkfilter_out.pid"}
>-dkfilter_out_user=${dkfilter_out_user:-"dkfilter"}
>-
>-start_cmd="dkfilter_out_start"
>-stop_cmd="dkfilter_out_stop"
>-
>-dkfilter_out_start()
>-{
>-	if [ -f ${dkfilter_out_pidfile} ]; then
>-		echo "${name} already running?"
>-		exit 1
>-	fi 
>-	touch ${dkfilter_out_pidfile}
>-	chown ${dkfilter_out_user} ${dkfilter_out_pidfile}
>-	su -m ${dkfilter_out_user} -c "daemon -p ${dkfilter_out_pidfile} \
>-		%%PREFIX%%/bin/dkfilter.out ${dkfilter_out_flags}" \
>-		> /dev/null 2>&1
>-	echo "Starting ${name}."
>-}
>-
>-dkfilter_out_stop()
>-{
>-	if [ ! -f ${dkfilter_out_pidfile} ]; then
>-		echo "${name} not running?"
>-		exit 1
>-	fi
>-	kill `cat ${dkfilter_out_pidfile}`
>-	rm -f ${dkfilter_out_pidfile}
>-	echo "Stopping ${name}"
>-}
>-
>-load_rc_config $name
>-run_rc_command "$1"
>diff -ruN dkfilter.bak/files/patch-lib__Mail__DomainKeys__Signature.pm dkfilter/files/patch-lib__Mail__DomainKeys__Signature.pm
>--- dkfilter.bak/files/patch-lib__Mail__DomainKeys__Signature.pm	Sun Nov 13 05:18:42 2005
>+++ dkfilter/files/patch-lib__Mail__DomainKeys__Signature.pm	Sat Jul 15 23:41:54 2006
>@@ -1,5 +1,5 @@
> --- lib/Mail/DomainKeys/Signature.pm.orig	Wed Jun 22 00:43:53 2005
>-+++ lib/Mail/DomainKeys/Signature.pm	Sat Nov 12 01:49:56 2005
>++++ lib/Mail/DomainKeys/Signature.pm	Sat Jul 15 23:40:22 2006
> @@ -78,14 +78,15 @@
>  	$self->algorithm and
>  		$text .= "a=" . $self->algorithm . "; ";
>diff -ruN dkfilter.bak/pkg-plist dkfilter/pkg-plist
>--- dkfilter.bak/pkg-plist	Sat Nov  5 12:57:27 2005
>+++ dkfilter/pkg-plist	Sun Jul 16 00:14:36 2006
>@@ -9,7 +9,9 @@
> lib/Mail/DomainKeys/Signature.pm
> lib/Mail/DomainKeys.pm
> lib/DKMessage.pm
>-bin/auto_responder.pl
>+lib/MySmtpProxyServer.pm
>+lib/MySmtpServer.pm
>+bin/dk_responder.pl
> bin/dkverify.pl
> bin/dkfilter.in
> bin/dkfilter.out
>@@ -18,3 +20,4 @@
> @dirrm lib/Mail
> @dirrm lib/MSDW/SMTP
> @dirrm lib/MSDW
>+

Actions: View | Diff

Attachments on bug 100349: 68225