Attachment 77866 Details for Bug 112048 – file.diff

[patch] file.diff

file.diff (text/plain), 8.64 KB, created by Michael Scheidell on 2007-04-23 20:20:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Scheidell

Created: 2007-04-23 20:20:07 UTC

Size: 8.64 KB

patch

obsolete

>diff -bBru /var/tmp/amavisd-new ./
>diff -bBru /var/tmp/amavisd-new/Makefile ./Makefile
>--- /var/tmp/amavisd-new/Makefile       Fri Mar 30 17:52:09 2007
>+++ ./Makefile  Mon Apr 23 15:10:03 2007
>@@ -7,14 +7,12 @@
> # Based on amavisd ports makefile.
> 
> PORTNAME=      amavisd-new
>-PORTVERSION=   2.4.5
>-PORTREVISION=  2
>+PORTVERSION=   2.5.0
> PORTEPOCH=     1
> CATEGORIES=    security
> MASTER_SITES=  http://www.ijs.si/software/amavisd/ \
>                http://mirrors.catpipe.net/amavisd-new/ \
>                http://mirror.mainloop.se/amavisd/
>-DISTNAME=      ${PORTNAME}-${PORTVERSION:S/.p/-p/}
> 
> MAINTAINER=    gabor@FreeBSD.org
> COMMENT=       Performance-enhanced daemonized version of amavis-perl
>@@ -23,15 +21,14 @@
>                
>${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools \
>                
>${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 
>\
>                
>${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
>-               
>${SITE_PERL}/${PERL_ARCH}/Convert/UUlib.pm:${PORTSDIR}/converters/p5-Convert-UUlib 
>\
>-               
>${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
>-               
>${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
>+               
>p5-Convert-UUlib>=1.08,1:${PORTSDIR}/converters/p5-Convert-UUlib \
>+               
>p5-Compress-Zlib>=1.04:${PORTSDIR}/archivers/p5-Compress-Zlib \
>                
>${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
>                
>${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 
>\
>                
>${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes 
>\
>                ${SITE_PERL}/IO/Wrap.pm:${PORTSDIR}/devel/p5-IO-stringy 
>\
>-               ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
>-               ${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server
>+               
>${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6 \
>+               p5-Net-Server>=0.93:${PORTSDIR}/net/p5-Net-Server
> 
> USE_PERL5_RUN= yes
> GNU_CONFIGURE= yes
>@@ -45,8 +42,6 @@
> AMAVISQUARANTINE?=     /var/virusmails
> DAEMON?=       /usr/sbin/daemon -p
> 
>-WRKSRC=                ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.p.+//}
>-
> OPTIONS=       BDB     "Use BerkeleyDB for nanny/cache/snmp"   on \
>                SQLITE  "Use SQLite for lookups"        off \
>                MYSQL   "Use MySQL for lookups/logging/quarantine"              
>off \
>@@ -56,6 +51,7 @@
>                MILTER  "Sendmail milter support" on \
>                SPAMASSASSIN    "Use mail/p5-Mail-SpamAssassin" on \
>                P0F     "Passive operating system fingerprinting"       
>off \
>+               ALTERMIME       "Use AlterMime for 
>defanging/disclaimers" off \
>                FILE    "Use newer file(1) utility from ports"  on \
>                RAR     "RAR support with archivers/rar"        off \
>                UNRAR   "RAR support with archivers/unrar"      on \
>@@ -70,6 +66,7 @@
>                UNZOO   "ZOO support with archivers/unzoo"      off \
>                LZOP    "LZOP support with archivers/lzop"      on \
>                FREEZE  "FREEZE support with archivers/freeze"  on \
>+               P7ZIP   "P7ZIP support with archivers/p7zip"    on \
>                TNEF    "Add external tnef decoder converters/tnef"     
>off
> 
> SUB_FILES=     pkg-install pkg-deinstall pkg-message
>@@ -193,6 +190,14 @@
> RUN_DEPENDS+=  ${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
> .endif
> 
>+.if defined(WITH_P7ZIP)
>+RUN_DEPENDS+=  ${LOCALBASE}/bin/7zr:${PORTSDIR}/archivers/p7zip
>+.endif
>+
>+.if defined(WITH_ALTERMIME)
>+RUN_DEPENDS+=  ${LOCALBASE}/bin/altermime:${PORTSDIR}/mail/altermime
>+.endif
>+
> post-patch:
> .for f in amavisd.conf amavisd.conf-sample amavisd amavisd-agent 
>amavisd-nanny amavisd-release
>        @${REINPLACE_CMD} "s@'zoo'\]@['zoo','unzoo'] ]@" ${WRKSRC}/${f}
>@@ -238,6 +243,8 @@
>        ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf 
>${PREFIX}/etc/amavisd.conf-dist
>        ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-sample 
>${PREFIX}/etc/amavisd.conf-sample
>        ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-default 
>${PREFIX}/etc/amavisd.conf-default
>+       ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-custom.conf 
>${PREFIX}/etc/amavisd-custom.conf-dist
>+
> .if !exists(${PREFIX}/etc/amavisd.conf)
> #
> #  This can contain sensitive information, e.g. SQL passwords, so it 
>should be handled
>@@ -245,11 +252,17 @@
> #
>        ${INSTALL} -o root -g ${AMAVISGROUP} -m 640 
>${WRKSRC}/amavisd.conf ${PREFIX}/etc
> .endif
>+.if !exists(${PREFIX}/etc/amavisd-custom.conf)
>+       ${INSTALL} -o root -g ${AMAVISGROUP} -m 640 
>${WRKSRC}/amavisd-custom.conf ${PREFIX}/etc
>+.endif
> .if !defined(NOPORTDOCS)
>-       @${MKDIR} ${DOCSDIR}
>-.for i in AAAREADME.first INSTALL LDAP.schema LICENSE RELEASE_NOTES 
>README_FILES/*
>+       @${MKDIR} -p ${DOCSDIR}/images
>+.for i in AAAREADME.first INSTALL LDAP.schema LICENSE RELEASE_NOTES \
>+       README_FILES/README.* README_FILES/screen.css 
>README_FILES/amavisd-new-docs.html \
>+       README_FILES/TODO-SNMP-AGENT 
>        ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
> .endfor
>+       @${CP} -pr ${WRKSRC}/README_FILES/images/ ${DOCSDIR}/images
> .endif
> 
> post-install:
>diff -bBru /var/tmp/amavisd-new/distinfo ./distinfo
>--- /var/tmp/amavisd-new/distinfo       Thu Feb  1 11:46:24 2007
>+++ ./distinfo  Mon Apr 23 14:56:28 2007
>@@ -1,3 +1,3 @@
>-MD5 (amavisd-new-2.4.5.tar.gz) = eef8c03855f9e3a4c6c53c06006d77ea
>-SHA256 (amavisd-new-2.4.5.tar.gz) = 
>cfd9150878ebaf51b021935ebc19f57be1a39f55194ef5e82f589cf80823ac53
>-SIZE (amavisd-new-2.4.5.tar.gz) = 895870
>+MD5 (amavisd-new-2.5.0.tar.gz) = 990a8c78911e208afca8c43a1f7c018d
>+SHA256 (amavisd-new-2.5.0.tar.gz) = 
>d5f5238a565868b5150c2591cd06780556d2aa093355475874e6b539e7eb1116
>+SIZE (amavisd-new-2.5.0.tar.gz) = 780990
>diff -bBru /var/tmp/amavisd-new/files/pkg-message.in 
>./files/pkg-message.in
>--- /var/tmp/amavisd-new/files/pkg-message.in   Sun Oct  1 13:48:40 2006
>+++ ./files/pkg-message.in      Tue Mar 13 13:14:29 2007
>@@ -30,7 +30,8 @@
>  amavis_p0fanalyzer_flags.
> 
>  Configuration templates are available in %%PREFIX%%/etc
>- as amavisd.conf-dist, amavisd.conf-sample and amavisd.conf-default.
>+ as amavisd.conf-dist, amavisd.conf-sample, amavisd.conf-default
>+ and amavisd-custom.conf-dist.
>  Documentation is available in %%DOCSDIR%%.
> *******************************************************************
> 
>diff -bBru /var/tmp/amavisd-new/pkg-plist ./pkg-plist
>--- /var/tmp/amavisd-new/pkg-plist      Sun Sep 10 10:05:50 2006
>+++ ./pkg-plist Mon Apr 23 14:48:36 2007
>@@ -21,15 +21,52 @@
> %%PORTDOCS%%%%DOCSDIR%%/README.performance
> %%PORTDOCS%%%%DOCSDIR%%/README.policy-on-notifications
> %%PORTDOCS%%%%DOCSDIR%%/README.postfix
>+%%PORTDOCS%%%%DOCSDIR%%/README.postfix.old
>+%%PORTDOCS%%%%DOCSDIR%%/README.postfix.html
> %%PORTDOCS%%%%DOCSDIR%%/README.protocol
> %%PORTDOCS%%%%DOCSDIR%%/README.sendmail
> %%PORTDOCS%%%%DOCSDIR%%/README.sendmail-dual
> %%PORTDOCS%%%%DOCSDIR%%/README.sendmail-dual.old
> %%PORTDOCS%%%%DOCSDIR%%/README.sql
>+%%PORTDOCS%%%%DOCSDIR%%/README.sql-mysql
>+%%PORTDOCS%%%%DOCSDIR%%/README.sql-pg
> %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
> %%PORTDOCS%%%%DOCSDIR%%/amavisd-new-docs.html
> %%PORTDOCS%%%%DOCSDIR%%/TODO-SNMP-AGENT
>+%%PORTDOCS%%%%DOCSDIR%%/screen.css
>+%%PORTDOCS%%%%DOCSDIR%%/images/1.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/10.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/11.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/12.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/13.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/14.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/15.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/2.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/3.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/4.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/5.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/6.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/7.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/8.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/9.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/blank.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/caution.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/draft.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/home.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/important.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/next.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/note.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/prev.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/tip.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/toc-blank.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/toc-minus.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/toc-plus.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/up.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/warning.png
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>+@unexec if cmp -s %D/etc/amavisd-custom.conf 
>%D/etc/amavisd-custom.conf-dist; then rm -f %D/etc/amavisd-custom.conf; 
>fi
>+etc/amavisd-custom.conf-dist
> etc/amavisd.conf-default
> @unexec if cmp -s %D/etc/amavisd.conf %D/etc/amavisd.conf-dist; then rm 
>-f %D/etc/amavisd.conf; fi
> etc/amavisd.conf-dist

Actions: View | Diff

Attachments on bug 112048: 77866