Attachment 44740 Details for Bug 69178 – mimedefang.diff

[patch] mimedefang.diff

mimedefang.diff (text/plain), 5.35 KB, created by Andrey V.Pevnev on 2004-07-17 13:20:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey V.Pevnev

Created: 2004-07-17 13:20:23 UTC

Size: 5.35 KB

patch

obsolete

>diff -ruN mimedefang.bak/Makefile mimedefang/Makefile
>--- mimedefang.bak/Makefile	Sat Jul 17 14:54:21 2004
>+++ mimedefang/Makefile	Sat Jul 17 14:55:18 2004
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	mimedefang
>-PORTVERSION=	2.43
>-PORTREVISION=	2
>+PORTVERSION=	2.44
> CATEGORIES=	mail
> MASTER_SITES=	http://www.mimedefang.org/static/
> 
>diff -ruN mimedefang.bak/distinfo mimedefang/distinfo
>--- mimedefang.bak/distinfo	Sat Jul 17 14:54:21 2004
>+++ mimedefang/distinfo	Sat Jul 17 14:57:23 2004
>@@ -1,2 +1,2 @@
>-MD5 (mimedefang-2.43.tar.gz) = 08573cd3403443d1bd1bed8778cf645e
>-SIZE (mimedefang-2.43.tar.gz) = 275595
>+MD5 (mimedefang-2.44.tar.gz) = c818e9f92d7aaf5360b5b7464b9e81c4
>+SIZE (mimedefang-2.44.tar.gz) = 277642
>diff -ruN mimedefang.bak/files/patch-Makefile.in mimedefang/files/patch-Makefile.in
>--- mimedefang.bak/files/patch-Makefile.in	Sat Jul 17 14:54:21 2004
>+++ mimedefang/files/patch-Makefile.in	Sat Jul 17 15:44:09 2004
>@@ -1,26 +1,26 @@
>---- Makefile.in.orig	Thu Jun 26 22:13:09 2003
>-+++ Makefile.in	Thu Jun 26 22:18:40 2003
>-@@ -173,9 +173,8 @@
>+--- Makefile.in.orig	Sat Jul 17 15:00:15 2004
>++++ Makefile.in	Sat Jul 17 15:43:49 2004
>+@@ -196,9 +196,8 @@
>  	-test ! -d $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ || true
>  	-test ! -d $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ && mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ && chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ || true
>  
> -	if test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter ; then \
> -		@INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1; \
> -	else \
>-+	@INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1; \
>++	@INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1;
> +	if !(test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter) ; then \
>  		@INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter || exit 1; \
>  	fi
>  
>-@@ -194,9 +193,8 @@
>+@@ -218,9 +217,8 @@
>  	if test "$(HAVE_SPAM_ASSASSIN)" = "yes" ; then \
>- 		mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin > /dev/null 2>&1 ; \
>- 		chmod 755 $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin ;\
>--		if test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf ; then \
>--			@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf.example || exit 1; \
>+ 		mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR} > /dev/null 2>&1 ; \
>+ 		chmod 755 $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR} ;\
>+-		if test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}sa-mimedefang.cf ; then \
>+-			@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf.example || exit 1; \
> -		else \
>-+		@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf.example || exit 1; \
>-+		if !(test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf) ; then \
>- 			@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf || exit 1; \
>++		@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf.example || exit 1; \
>++		if !(test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}sa-mimedefang.cf) ; then \
>+ 			@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf || exit 1; \
>  		fi \
>  	fi
>diff -ruN mimedefang.bak/files/patch-embperl.c mimedefang/files/patch-embperl.c
>--- mimedefang.bak/files/patch-embperl.c	Sat Jul 17 14:54:21 2004
>+++ mimedefang/files/patch-embperl.c	Thu Jan  1 03:00:00 1970
>@@ -1,20 +0,0 @@
>---- embperl.c.orig	Wed Jun 30 00:57:57 2004
>-+++ embperl.c	Wed Jun 30 01:01:55 2004
>-@@ -26,6 +26,9 @@
>-     char *argv[6];
>-     int argc;
>- 
>-+#ifdef SAFE_EMBED_PERL
>-+	PL_perl_destruct_level = 1;
>-+#endif
>-     if (my_perl != NULL) {
>- #ifdef SAFE_EMBED_PERL
>- 	perl_destruct(my_perl);
>-@@ -46,7 +49,6 @@
>- #ifdef PERL_SET_CONTEXT
>-     PERL_SET_CONTEXT(my_perl);
>- #endif
>--    PL_perl_destruct_level = 1;
>-     perl_construct(my_perl);
>-     if (subFilter) {
>- 	argv[0] = "";
>diff -ruN mimedefang.bak/pkg-plist mimedefang/pkg-plist
>--- mimedefang.bak/pkg-plist	Sat Jul 17 14:54:21 2004
>+++ mimedefang/pkg-plist	Sat Jul 17 15:53:15 2004
>@@ -6,8 +6,8 @@
> etc/rc.d/mimedefang.sh-dist
> @unexec if cmp -s %D/etc/mimedefang/mimedefang-filter %D/etc/mimedefang/mimedefang-filter.example; then rm -f %D/etc/mimedefang/mimedefang-filter; fi
> etc/mimedefang/mimedefang-filter.example
>-@unexec if cmp -s %D/etc/mimedefang/spamassassin/sa-mimedefang.cf %D/etc/mimedefang/spamassassin/sa-mimedefang.cf.example; then rm -f %D/etc/mimedefang/spamassassin/sa-mimedefang.cf; fi
>-etc/mimedefang/spamassassin/sa-mimedefang.cf.example
>+@unexec if cmp -s %D/etc/mimedefang/sa-mimedefang.cf %D/etc/mimedefang/sa-mimedefang.cf.example; then rm -f %D/etc/mimedefang/sa-mimedefang.cf; fi
>+etc/mimedefang/sa-mimedefang.cf.example
> %%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/README.ANOMY
> %%PORTDOCS%%%%DOCSDIR%%/README.SPAMASSASSIN

Actions: View | Diff

Attachments on bug 69178: 44740