diff options
author | 2008-01-31 12:20:14 +0000 | |
---|---|---|
committer | 2008-01-31 12:20:14 +0000 | |
commit | 0aa57b6a8c65fba1d5b15f59895b3393b09a2def (patch) | |
tree | 4219958f028e4daf89cae6ea9aebc335ed3158ee /mail-filter | |
parent | dev-perl/Filesys-Df: CL tweak (diff) | |
download | sunrise-reviewed-0aa57b6a8c65fba1d5b15f59895b3393b09a2def.tar.gz sunrise-reviewed-0aa57b6a8c65fba1d5b15f59895b3393b09a2def.tar.bz2 sunrise-reviewed-0aa57b6a8c65fba1d5b15f59895b3393b09a2def.zip |
mail-filter/MailScanner: Mailscanner-mta is no longer needed
svn path=/sunrise/; revision=5571
Diffstat (limited to 'mail-filter')
-rw-r--r-- | mail-filter/MailScanner/ChangeLog | 4 | ||||
-rw-r--r-- | mail-filter/MailScanner/MailScanner-4.57.6.1.ebuild | 321 | ||||
-rw-r--r-- | mail-filter/MailScanner/MailScanner-4.66.5.3.ebuild | 86 | ||||
-rw-r--r-- | mail-filter/MailScanner/Manifest | 10 | ||||
-rw-r--r-- | mail-filter/MailScanner/files/confd.mailscanner-mta | 42 | ||||
-rw-r--r-- | mail-filter/MailScanner/files/initd.mailscanner | 9 | ||||
-rw-r--r-- | mail-filter/MailScanner/files/initd.mailscanner-mta | 263 |
7 files changed, 44 insertions, 691 deletions
diff --git a/mail-filter/MailScanner/ChangeLog b/mail-filter/MailScanner/ChangeLog index 40896ca0d..43af483bf 100644 --- a/mail-filter/MailScanner/ChangeLog +++ b/mail-filter/MailScanner/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 31 Jan 2008; Markus Ullmann <jokey@gentoo.org> -confd.mailscanner-mta, + initd.mailscanner, -initd.mailscanner-mta, MailScanner-4.66.5.3: + Mailscanner-mta is no longer needed + 27 Jan 2008; Markus Ullmann <jokey@gentoo.org> Manifest: Version bump -- try me first before killing old version diff --git a/mail-filter/MailScanner/MailScanner-4.57.6.1.ebuild b/mail-filter/MailScanner/MailScanner-4.57.6.1.ebuild deleted file mode 100644 index b677ddbd8..000000000 --- a/mail-filter/MailScanner/MailScanner-4.57.6.1.ebuild +++ /dev/null @@ -1,321 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils versionator - -MY_PV=$(get_version_component_range 1-3 ) -MY_PVR=$(replace_version_separator 3 '-' ) - -DESCRIPTION="Free Anti-Virus and Anti-Spam Filter" -HOMEPAGE="http://www.mailscanner.info/" -SRC_URI="http://www.mailscanner.info/files/4/tar/${PN}-install-${MY_PVR}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="bitdefender clamav doc exim f-prot postfix spamassassin" - -DEPEND="dev-lang/perl" -RDEPEND="${DEPEND} - dev-perl/Archive-Zip - dev-perl/Compress-Zlib - dev-perl/Convert-BinHex - dev-perl/Convert-TNEF - dev-perl/DBD-SQLite - dev-perl/DBI - >=dev-perl/HTML-Parser-3.45 - dev-perl/HTML-Tagset - dev-perl/IO-stringy - >=dev-perl/MIME-tools-5.417 - dev-perl/MailTools - dev-perl/Net-CIDR - dev-perl/Net-DNS - dev-perl/TimeDate - dev-perl/Sys-Hostname-Long - >=net-mail/tnef-1.4.3 - virtual/perl-File-Spec - virtual/perl-File-Temp - virtual/perl-Getopt-Long - >=virtual/perl-Sys-Syslog-0.18 - >=virtual/perl-MIME-Base64-3.05 - virtual/cron - postfix? ( mail-mta/postfix ) - exim? ( !postfix? ( mail-mta/exim ) ) - !postfix? ( !exim? ( mail-mta/sendmail ) ) - bitdefender? ( app-antivirus/bitdefender-console ) - clamav? ( >=app-antivirus/clamav-0.88.4 ) - f-prot? ( app-antivirus/f-prot ) - spamassassin? ( >=mail-filter/spamassassin-3.1.5 )" - -S="${WORKDIR}/${PN}-${MY_PV}" -BASE="/usr" - -src_unpack() { - unpack ${A} - unpack ./${PN}-install-${MY_PV}/perl-tar/${PN}-${MY_PVR}.tar.gz -} - -src_compile() { - # setup MTA - if use postfix ; then - RUNASUSER='postfix' - RUNASGROUP='postfix' - INQUEUE='/var/spool/postfix.in/deferred' - OUTQUEUE='/var/spool/postfix/incoming' - MTA='postfix' - SENDMAIL='/usr/lib/sendmail' - SENDMAIL2='/usr/lib/sendmail' - elif use exim ; then - RUNASUSER='mail' - RUNASGROUP='mail' - INQUEUE='/var/spool/exim.in/input' - OUTQUEUE='/var/spool/exim/input' - MTA='exim' - SENDMAIL='/usr/sbin/exim -oMr MailScanner' - SENDMAIL2='/usr/sbin/exim -C /etc/exim/exim_out.conf -oMr MailScanner' - else - # use sendmail as default, but we should add more as needed - # RUNASUSER='mail' - # RUNASGROUP='mail' - INQUEUE='/var/spool/mqueue.in' - OUTQUEUE='/var/spool/mqueue' - MTA='sendmail' - SENDMAIL='/usr/lib/sendmail' - SENDMAIL2='/usr/lib/sendmail' - fi - - # update init script parameters for selected MTA - sed \ - -e "s|^\(MTA=\).*|\1${MTA}|g" \ - "${FILESDIR}/confd.mailscanner-mta" > "${S}/confd.mailscanner-mta" - - # setup virus scanner(s) - VIRUS_SCANNERS="" - use bitdefender && VIRUS_SCANNERS="bitdefender ${VIRUS_SCANNERS}" - use clamav && VIRUS_SCANNERS="clamav ${VIRUS_SCANNERS}" - use f-prot && VIRUS_SCANNERS="f-prot ${VIRUS_SCANNERS}" - - if [ "$VIRUS_SCANNERS" == "" ]; then - VIRUS_SCANNERS="none" - VIRUS_SCANNING="no" - else - VIRUS_SCANNING="yes" - fi - - sed -i \ - -e "s/^\(Virus Scanning[ \t]*=\).*/\1 ${VIRUS_SCANNING}/" \ - -e "s/^\(Virus Scanners[ \t]*=\).*/\1 ${VIRUS_SCANNERS}/" \ - "${S}/etc/MailScanner.conf" - - # setup spamassassin - if use spamassassin ; then - sed -i \ - -e "s/^\(Use SpamAssassin[ \t]*=\).*$/\1 yes/" \ - "${S}/etc/MailScanner.conf" - else - sed -i \ - -e "s/^\(Use SpamAssassin[ \t]*=\).*$/\1 no/" \ - "${S}/etc/MailScanner.conf" - fi - - # update bin files - sed -i \ - -e "s#msbindir=/opt/MailScanner/bin#msbindir=/usr/sbin#g" \ - -e "s#config=/opt/MailScanner/etc/MailScanner.conf#config=/etc/MailScanner/MailScanner.conf#g" \ - "${S}/bin/check_mailscanner" - sed -i \ - -e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \ - "${S}/bin/update_virus_scanners" - sed -i \ - -e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \ - -e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#g" \ - "${S}/bin/MailScanner" - - # update cron files - sed -i \ - -e "s#/opt/MailScanner/bin/check_mailscanner#/usr/sbin/check_MailScanner#g" \ - "${S}/bin/cron/check_MailScanner.cron" - sed -i \ - -e "s#/etc/sysconfig/MailScanner#/etc/conf.d/mailscanner#g" \ - -e "s#/opt/MailScanner/bin/update_virus_scanners#/usr/sbin/update_virus_scanners#g" \ - "${S}/bin/cron/update_virus_scanners.cron" - - # Determine some things that may need to be changed in conf file - # (need to arrive at sensible replacement for yoursite) - YOURSITE=`dnsdomainname | sed -e "s/\./-/g"` - BASEBIN="${BASE}/sbin" - - # ClamAV requires some specific changes to MailScanner.conf - # when mailscanner is running as root (i.e. sendmail) - if use clamav ; then - if [ "$MTA" == "sendmail" ] ; then - WORKGRP="clamav" - WORKPERM="0640" - else - WORKGRP="" - WORKPERM="0600" - fi - else - WORKGRP="" - WORKPERM="0600" - fi - - # update conf files - sed -i \ - -e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \ - -e "s#/opt/MailScanner/bin#$BASEBIN#g" \ - -e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#g" \ - -e "s#^\(Run As User[ \t]*=\).*#\1 $RUNASUSER#" \ - -e "s#^\(Run As Group[ \t]*=\).*#\1 $RUNASGROUP#" \ - -e "s#^\(Incoming Queue Dir[ \t]*=\).*#\1 $INQUEUE#" \ - -e "s#^\(Outgoing Queue Dir[ \t]*=\).*#\1 $OUTQUEUE#" \ - -e "s#^\(MTA[ \t]*=\).*#\1 $MTA#" \ - -e "s/^#\(TNEF.*internal\)$/\1/" \ - -e "s/^\(TNEF.*0000\)$/#\1/" \ - -e "s#^\(PID file[ \t]=\).*#\1 /var/run/mailscanner.pid#" \ - -e "s#^\(%org-name%\)[ \t]*=.*#\1 = ${YOURSITE}#" \ - -e "s#^\(Sendmail[ \t]*=\).*#\1 ${SENDMAIL}#" \ - -e "s#^\(Sendmail2[ \t]*=\).*#\1 ${SENDMAIL2}#" \ - -e "s#^\(Incoming Work Group[ \t]*=\).*#\1 ${WORKGRP}#" \ - -e "s#^\(Incoming Work Permissions[ \t]*=\).*#\1 ${WORKPERM}#" \ - "${S}/etc/MailScanner.conf" - - # net-mail/clamav net-mail/f-prot package compatibility - sed -i \ - -e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#" \ - -e 's#^\(clamav\t.*/usr\)/local$#\1#' \ - -e 's#^\(f-prot.*\)/usr/local/f-prot$#\1/opt/f-prot#' \ - "${S}/etc/virus.scanners.conf" - - # update lib files - sed -i \ - -e "s#/opt/MailScanner/bin#$BASEBIN#g" \ - -e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \ - -e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#g" \ - "${S}/lib/MailScanner/ConfigDefs.pl" - sed -i \ - -e "s#/etc/MailScanner#/etc/MailScanner#g" \ - "${S}/lib/MailScanner/CustomConfig.pm" - - # finally, change MailScanner.conf into MailScanner.conf.sample - cp "${S}/etc/MailScanner.conf" "${S}/etc/MailScanner.conf.${MY_PV}" - mv "${S}/etc/MailScanner.conf" "${S}/etc/MailScanner.conf.sample" - -} - -src_install() { - exeinto ${BASE}/sbin - #newexe bin/check_mailscanner.linux check_MailScanner - newexe bin/check_mailscanner check_MailScanner - doexe bin/df2mbox - doexe bin/MailScanner - doexe bin/update_virus_scanners - doexe bin/upgrade_MailScanner_conf - newexe bin/Sophos.install.linux Sophos.install - - insinto /etc/MailScanner - doins etc/*.conf - doins etc/mailscanner.conf.with.mcp - doins etc/MailScanner.conf.${MY_PV} - doins etc/MailScanner.conf.sample - - insinto /etc/MailScanner/rules - doins etc/rules/* - insinto /etc/MailScanner/mcp - doins etc/mcp/* - - for i in $(ls etc/reports/) - do - if [ $i != "cat" ] - then - insinto /etc/MailScanner/reports/$i - doins etc/reports/$i/* - fi - done - - insinto ${BASE}/lib/MailScanner - doins lib/*.prf - - exeinto ${BASE}/lib/MailScanner - doexe lib/*-wrapper - doexe lib/*-autoupdate - doexe lib/*-autoupdate.old - doexe lib/*.pm - - exeinto ${BASE}/lib/MailScanner/MailScanner - doexe lib/MailScanner/*.pm - doexe lib/MailScanner/*.pl - - insinto ${BASE}/lib/MailScanner/MailScanner - doins lib/MailScanner/*.txt - - exeinto ${BASE}/lib/MailScanner/MailScanner/CustomFunctions - doexe lib/MailScanner/CustomFunctions/MyExample.pm - - newinitd "${FILESDIR}"/initd.mailscanner MailScanner - newinitd "${FILESDIR}"/initd.mailscanner-mta MailScanner-mta - newconfd "${FILESDIR}"/confd.mailscanner MailScanner - newconfd "${S}/confd.mailscanner-mta" MailScanner-mta - - #Set up cron jobs - exeinto /etc/cron.hourly - newexe "${S}/bin/cron/check_MailScanner.cron" check_MailScanner - newexe "${S}/bin/cron/update_virus_scanners.cron" update_virus_scanners - - exeinto /etc/cron.daily - newexe "${S}/bin/cron/clean.quarantine.cron" clean.quarantine - - if use doc ; then - dodir /usr/share/doc/${PF}/html - cp -r docs/* "${D}usr/share/doc/${PF}/html" - fi - - dodoc notes.txt docs/QuickInstall.txt docs/README.sql-logging - - keepdir /var/spool/MailScanner/incoming - keepdir /var/spool/MailScanner/quarantine - keepdir /var/spool/MailScanner/spamassassin - keepdir /var/spool/MailScanner/archive - keepdir ${BASE}/var - - if use postfix ; then - chown -R postfix:postfix "${D}/var/spool/MailScanner/" - elif use exim ; then - chown -R mail:mail "${D}/var/spool/MailScanner/" - else - keepdir /var/spool/mqueue.in - fi -} - -pkg_postinst() { - if [ -n "`grep -xE "[[:space:]]*provide[[:space:]]+(.*[[:space:]]+)*mta([[:space:]]+.*)*" /etc/init.d/${MTA}`" ]; then - ewarn - ewarn "Warning: your mta service startup script /etc/init.d/${MTA}" - ewarn "seems to provide 'mta', this may give problems with /etc/init.d/MailScanner-mta." - ewarn - ewarn "The Installation is *NOT* Completed Yet, You still need Filesystem::Df" - ewarn "Please use emerge g-cpan and run the following command" - ewarn - ewarn " # g-cpan -i Filesys::Df " - ewarn - - echo - fi - elog "Remove the line containing 'provide mta' from your MTA's init script" - elog "and take care that using etc-update will not insert this line after" - elog "re-emerging / updating your mta!" - elog "The related bug in bugs.gentoo.org is #46897" - echo - - if [ -f "/etc/MailScanner/MailScanner.conf" ]; then - einfo "Upgrading the MailScanner.conf file" - cp /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.pre_upgrade.${MY_PV} - /usr/sbin/upgrade_MailScanner_conf \ - /etc/MailScanner/MailScanner.conf.pre_upgrade.${MY_PV} \ - /etc/MailScanner/MailScanner.conf.${MY_PV} \ - > /etc/MailScanner/MailScanner.conf 2> /dev/null - else - cp /etc/MailScanner/MailScanner.conf.sample /etc/MailScanner/MailScanner.conf - fi -} diff --git a/mail-filter/MailScanner/MailScanner-4.66.5.3.ebuild b/mail-filter/MailScanner/MailScanner-4.66.5.3.ebuild index 879a2a4a5..e52d4e00d 100644 --- a/mail-filter/MailScanner/MailScanner-4.66.5.3.ebuild +++ b/mail-filter/MailScanner/MailScanner-4.66.5.3.ebuild @@ -33,6 +33,7 @@ RDEPEND="${DEPEND} dev-perl/Net-DNS dev-perl/TimeDate dev-perl/Sys-Hostname-Long + dev-perl/Filesys-Df >=net-mail/tnef-1.4.3 virtual/perl-File-Spec virtual/perl-File-Temp @@ -83,11 +84,6 @@ src_unpack() { SENDMAIL2='/usr/lib/sendmail' fi - # update init script parameters for selected MTA - sed \ - -e "s|^\(MTA=\).*|\1${MTA}|g" \ - "${FILESDIR}/confd.mailscanner-mta" > "${S}/confd.mailscanner-mta" - # setup virus scanner(s) VIRUS_SCANNERS="" use bitdefender && VIRUS_SCANNERS="bitdefender ${VIRUS_SCANNERS}" @@ -206,51 +202,49 @@ src_unpack() { src_install() { exeinto ${BASE}/sbin - doexe bin/MailScanner - newexe bin/check_mailscanner check_MailScanner - doexe bin/d2mbox bin/df2mbox - doexe bin/update_virus_scanners - doexe bin/upgrade_MailScanner_conf - doexe bin/update_bad_phishing_sites bin/update_phishing_sites - newexe bin/Sophos.install.linux Sophos.install - - insinto /etc/MailScanner - doins etc/*.conf - doins etc/mailscanner.conf.with.mcp - doins etc/MailScanner.conf.${MY_PV} - doins etc/MailScanner.conf.sample - - insinto /etc/MailScanner/rules - doins etc/rules/* - insinto /etc/MailScanner/mcp - doins etc/mcp/* + doexe bin/MailScanner + newexe bin/check_mailscanner check_MailScanner + doexe bin/d2mbox bin/df2mbox + doexe bin/update_virus_scanners + doexe bin/upgrade_MailScanner_conf + doexe bin/update_bad_phishing_sites bin/update_phishing_sites + newexe bin/Sophos.install.linux Sophos.install + + insinto /etc/MailScanner + doins etc/*.conf + doins etc/mailscanner.conf.with.mcp + doins etc/MailScanner.conf.${MY_PV} + doins etc/MailScanner.conf.sample + + insinto /etc/MailScanner/rules + doins etc/rules/* + insinto /etc/MailScanner/mcp + doins etc/mcp/* insinto /etc/MailScanner doins -r etc/reports - insinto ${BASE}/$(get_libdir)/MailScanner - doins lib/*.prf + insinto ${BASE}/$(get_libdir)/MailScanner + doins lib/*.prf exeinto ${BASE}/$(get_libdir)/MailScanner - doexe lib/*-wrapper - doexe lib/*-autoupdate - doexe lib/*-autoupdate.old - doexe lib/*.pm + doexe lib/*-wrapper + doexe lib/*-autoupdate + doexe lib/*-autoupdate.old + doexe lib/*.pm - exeinto ${BASE}/$(get_libdir)/MailScanner/MailScanner - doexe lib/MailScanner/*.pm - doexe lib/MailScanner/*.pl + exeinto ${BASE}/$(get_libdir)/MailScanner/MailScanner + doexe lib/MailScanner/*.pm + doexe lib/MailScanner/*.pl - insinto ${BASE}/$(get_libdir)/MailScanner/MailScanner - doins lib/MailScanner/*.txt + insinto ${BASE}/$(get_libdir)/MailScanner/MailScanner + doins lib/MailScanner/*.txt - exeinto ${BASE}/$(get_libdir)/MailScanner/MailScanner/CustomFunctions - doexe lib/MailScanner/CustomFunctions/MyExample.pm + exeinto ${BASE}/$(get_libdir)/MailScanner/MailScanner/CustomFunctions + doexe lib/MailScanner/CustomFunctions/MyExample.pm newinitd "${FILESDIR}"/initd.mailscanner MailScanner - newinitd "${FILESDIR}"/initd.mailscanner-mta MailScanner-mta newconfd "${FILESDIR}"/confd.mailscanner MailScanner - newconfd "${S}"/confd.mailscanner-mta MailScanner-mta #Set up cron jobs exeinto /etc/cron.hourly @@ -282,18 +276,10 @@ src_install() { } pkg_postinst() { - if [ -n "`grep -xE "[[:space:]]*provide[[:space:]]+(.*[[:space:]]+)*mta([[:space:]]+.*)*" /etc/init.d/${MTA}`" ]; then - ewarn - ewarn "Warning: your mta service startup script /etc/init.d/${MTA}" - ewarn "seems to provide 'mta', this may give problems with /etc/init.d/MailScanner-mta." - ewarn - ewarn "The Installation is *NOT* Completed Yet, You still need Filesystem::Df" - ewarn "Please use emerge g-cpan and run the following command" - ewarn - ewarn " # g-cpan -i Filesys::Df " - ewarn - - echo + if use postfix; then + elog "Note that postfix 2.4 now supports HOLD of messages" + elog "and reinjection without second postfix instance" + elog "Inbound path is now ${ROOT}var/spool/postfix/hold" fi if [ -f "/etc/MailScanner/MailScanner.conf" ]; then diff --git a/mail-filter/MailScanner/Manifest b/mail-filter/MailScanner/Manifest index 91f830440..9b4e66a6f 100644 --- a/mail-filter/MailScanner/Manifest +++ b/mail-filter/MailScanner/Manifest @@ -1,10 +1,6 @@ AUX confd.mailscanner 147 RMD160 2472095d115d136498f93a6dca3ce540e335222f SHA1 377447317cf1354b4e377912d18a459b12f7a8d6 SHA256 d0ef32a53c83a2c2938d970f30b3765676fe4669b2ec98407c39ca070cd24bbb -AUX confd.mailscanner-mta 967 RMD160 f904b49b7ab3c8b988365f16e7629a14d044cb25 SHA1 4e89cf82d0ee76d37f1dd33e8f94c4ee768a86a7 SHA256 e94062c47a7c6f584809223ba3ee760beace1fda878154a6def06dc08a9ab878 -AUX initd.mailscanner 1033 RMD160 bd76c4a6fb1ad24c69c0938f851d791779fd4745 SHA1 8cf8da446e9633211097a9f1f466a52f6ca00add SHA256 c4dd01839ef574e4c6acbab02bafadfe36991531de384ea895917aae618d2413 -AUX initd.mailscanner-mta 5768 RMD160 f1135b2a2d20bdf5c71117b65a721519c7bd1cfb SHA1 99a559c81dc24da63ad1be6f05c8506976a36877 SHA256 c14193071b0f1343f666a09adaff4b67ee6ee4afb223650bf63d6052bed386ec -DIST MailScanner-install-4.57.6-1.tar.gz 7051901 RMD160 db7823fcbdb2974e29281518d011fbf84ff338e1 SHA1 d7e2ad6732a9a1055809754e1d3503a4c86f0dad SHA256 52cbacb22c6a82fc39b2aef89b74774e504bb8d4baf5530c225369b08ee52754 +AUX initd.mailscanner 756 RMD160 f75589025bbe9e7a3bc2f10a4a5eadab11f8d36a SHA1 cb4c505b3c9f4f993b656b6c96c6992ae00be5e0 SHA256 ba63aec0dae9c820b533d467c3325ada70a4b73761bed2207d10814f82f31b65 DIST MailScanner-install-4.66.5-3.tar.gz 8129467 RMD160 cf7054c78f79058f90df80cfcb3c0c22a973ff92 SHA1 df7d4cadcebdf0091087faf74a7087463767b09d SHA256 c1b62b291c0b95e85f2d90cf7d100d083ee06ad45993d4acbf415ccc08d3b099 -EBUILD MailScanner-4.57.6.1.ebuild 9649 RMD160 1a656b2f7d334a4e7e5c88d48474a3268182ad85 SHA1 d8ec8ef057b10f24fb674d61820aba158c36b26c SHA256 77fc0eb1e1245ab2e1c07ccdc4c33a92a2cf51a5facc620c3aacb21a25b382d7 -EBUILD MailScanner-4.66.5.3.ebuild 9355 RMD160 f90322c5e32b15deac54b3ce4614db9b720a55a5 SHA1 c977b8c39721e5bc67f6153f9eb0b39be3515014 SHA256 8ee4a0088ab32c8425d6e79dbcf24aa184c6e8ccd1f0c66afe11799c9670efa1 -MISC ChangeLog 1149 RMD160 e65ece80fda0f7e657c0cd0ed0e7d43470aea7b1 SHA1 7eabaabddb092ceeb06e21f333fa581148033f38 SHA256 e01bcd7e75778bae583aca7c2e30bf28e5f54d636995a66b582e852fd4d24429 +EBUILD MailScanner-4.66.5.3.ebuild 8793 RMD160 59006059577a37ea2a696d9041e2eb24e77056ea SHA1 01a52f6b540b3aca84752eee7c6ed642e61223ce SHA256 c446340b26d6c213e59887d25b2595f0cf07f6868c6e59255ab7033ca436d7fc +MISC ChangeLog 1328 RMD160 17d6738780213ffabe34072472129c401f94e3e6 SHA1 b544b344edceb883d36c5d8c9c73a926f2996a79 SHA256 de727a2e275b07b23676fe1e67c00d49c68657566d112b686b07100487f584dc MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/mail-filter/MailScanner/files/confd.mailscanner-mta b/mail-filter/MailScanner/files/confd.mailscanner-mta deleted file mode 100644 index 6c8cfdb29..000000000 --- a/mail-filter/MailScanner/files/confd.mailscanner-mta +++ /dev/null @@ -1,42 +0,0 @@ -# -# Put in here all the settings for your particular mail system so that -# MailScanner's init.d script can run it all for you. -# - -# -# Are you running Postfix, Sendmail or Exim? -# -MTA=sendmail -#MTA=sendmail -#MTA=postfix -#MTA=exim - -KILL_OPTS="" # add -9/-15/your favorite evil SIG level here - -# -# Sendmail Settings -# -SENDMAIL=/usr/sbin/sendmail -QUEUETIME=15m -INQDIR=/var/spool/mqueue.in -INPID=/var/run/sendmail.in.pid -OUTPID=/var/run/sendmail.out.pid -SMPID=/var/run/sm-client.pid -MSPUSER=smmsp # User for mail submission queue runner -MSPGROUP=smmsp # Group for mail submission queue runner - -# -# Postfix settings -# -POSTFIX=/usr/sbin/postfix -POSTFIXINCF=/etc/postfix.in # Directory containing incoming configuration -POSTFIXOUTCF=/etc/postfix # Directory containing outgoing configuration - -# -# Exim settings -# -EXIM=/usr/sbin/exim -EXIMINCF=/etc/exim/exim.conf # Incoming configuration file -EXIMSENDCF=/etc/exim/exim_out.conf # Outgoing configuration file - - diff --git a/mail-filter/MailScanner/files/initd.mailscanner b/mail-filter/MailScanner/files/initd.mailscanner index 1b6e80415..3883ee99d 100644 --- a/mail-filter/MailScanner/files/initd.mailscanner +++ b/mail-filter/MailScanner/files/initd.mailscanner @@ -3,15 +3,12 @@ opts="${opts} reload" depend() { - need net MailScanner-mta + need net mta use logger dns } start() { ebegin "Starting MailScanner" -# /sbin/start-stop-daemon --quiet \ -# --start --startas /usr/sbin/check_MailScanner \ -# --pidfile /var/run/mailscanner.pid /usr/sbin/check_MailScanner >/dev/null RETVAL=$? [ ${RETVAL} -eq 0 ] && touch /var/lock/subsys/MailScanner @@ -21,10 +18,8 @@ start() { stop() { ebegin "Stopping MailScanner" -# start-stop-daemon -o --quiet --stop --pidfile /var/run/mailscanner.pid killall -15 MailScanner RETVAL=$? -# [ -f /var/run/mailscanner.pid ] && rm /var/run/mailscanner.pid [ ${RETVAL} -eq 0 ] && rm -f /var/lock/subsys/MailScanner [ ${RETVAL} -eq 0 ] && touch /var/lock/subsys/MailScanner.off eend ${RETVAL} @@ -47,5 +42,3 @@ restart() { sleep ${RESTART_DELAY} svc_start } - - diff --git a/mail-filter/MailScanner/files/initd.mailscanner-mta b/mail-filter/MailScanner/files/initd.mailscanner-mta deleted file mode 100644 index 3ead2fe95..000000000 --- a/mail-filter/MailScanner/files/initd.mailscanner-mta +++ /dev/null @@ -1,263 +0,0 @@ -#!/sbin/runscript -# Tis init script takes care of starting the MTA processes for use -# with MailScanner. - -opts="${opts} status reload startin startout stopin stopout restartin restartout" - -checkmta() { - ebegin "checking MTA availability for MailScanner" - if [ ${MTA} = 'sendmail' ]; then - if [ -f ${SENDMAIL} ]; then - eend 0 - return - else - echo "Cannot find sendmail, check /etc/conf.d/MailScanner-mta" - eend 1 - exit - fi - elif [ ${MTA} = "postfix" ]; then - if test -x ${POSTFIX} -a -f ${POSTFIXINCF}/main.cf \ - -a -f ${POSTFIXOUTCF}/main.cf ; then - eend 0 - return - else - echo "Cannot find postfix and/or postfix configuration files," - echo "Check /etc/conf.d/MailScanner-mta" - eend 1 - exit - fi - elif [ ${MTA} = "exim" ]; then - if test -x ${EXIM} -a -f ${EXIMINCF} -a -f ${EXIMSENDCF}; then - eend 0 - return - else - echo "Cannot find exim and/or exim configuration files," - echo "Check /etc/conf.d/MailScanner-mta" - eend 1 - exit - fi - else - echo "Invalid MTA in /etc/conf.d/MailScanner-mta" - eend 1 - exit - fi -} -aliasesetc() { - /usr/bin/newaliases > /dev/null 2>&1 - retval=$? - if test -x /usr/bin/make -a -f /etc/mail/Makefile ; then - make -C /etc/mail -s - let retval+=$? - else - for i in virtusertable access domaintable mailertable ; do - if [ -f /etc/mail/$i ] ; then - makemap hash /etc/mail/$i < /etc/mail/$i - let retval+=$? - fi - done - fi - return ${retval} -} - -startinreal () { - if [ ${MTA} = "sendmail" ]; then - ( cd /var/spool/mqueue.in; rm -f xf*) - aliasesetc - ${SENDMAIL} -bd -OPrivacyOptions=noetrn \ - -ODeliveryMode=queueonly \ - -OQueueDirectory=${INQDIR} \ - -OPidFile=${INPID} - retval=$? - touch ${SMPID} - chown ${MSPUSER}:${MSPGROUP} ${SMPID} 2> /dev/null - ${SENDMAIL} -L sm-msp-queue -Ac -q15m -OPidFile=${SMPID} 2> /dev/null - let retval+=$? - return ${retval} - elif [ ${MTA} = "postfix" ]; then - ${POSTFIX} -c ${POSTFIXINCF} start 2> /dev/null - return $? - elif [ ${MTA} = "exim" ]; then - ${EXIM} -c ${EXIMINCF} start 2> /dev/null - return $? - fi -} - -startoutreal() { - if [ ${MTA} = "sendmail" ]; then - ${SENDMAIL} $([ -n "${QUEUETIME}" ] && echo -q${QUEUETIME}) \ - -OPidFile=${OUTPID} - return $? - elif [ ${MTA} = "postfix" ]; then - ${POSTFIX} -c ${POSTFIXOUTCF} start 2> /dev/null - return $? - elif [ ${MTA} = "exim" ]; then - ${EXIM} -c ${EXIMSENDCF} -q15m 2> /dev/null - return $? - fi -} - -stopinreal() { - if [ ${MTA} = "sendmail" ]; then - kill ${KILL_OPTS} `head -n 1 ${INPID}` 2> /dev/null - retval=$? - kill ${KILL_OPTS} `head -n 1 ${SMPID}` 2> /dev/null - let retval+=$? - return ${retval} - elif [ ${MTA} = "postfix" ]; then - ${POSTFIX} -c ${POSTFIXINCF} stop 2> /dev/null - return $? - fi -} - -stopoutreal() { - if [ ${MTA} = "sendmail" ]; then - kill ${KILL_OPTS} `head -n 1 ${OUTPID}` 2> /dev/null - return $? - elif [ ${MTA} = "postfix" ]; then - ${POSTFIX} -c ${POSTFIXOUTCF} stop 2> /dev/null - return $? - fi -} - - - - -depend() { - need net - use logger dns - provide mta -} - -start() { - checkmta - ebegin "Starting incoming ${MTA}" - startinreal - retval=$? - eend ${retval} - if [ ${retval} -gt 0 ]; then - exit - fi - ebegin "Starting outgoing ${MTA}" - startoutreal - retval=$? - eend ${retval} - if [ ${retval} -gt 0 ]; then - echo "Will attempt to stop incoming ${MTA}" - stopinreal - fi -} - -stop() { - checkmta - if [ ${MTA} = "exim" ]; then - ebegin "Stopping exim" - killall ${KILL_OPTS} exim - eend $? - else - ebegin "Stopping incoming ${MTA}" - stopinreal - eend $? - ebegin "Stopping outgoing ${MTA}" - stopoutreal - eend $? - fi -} - -startin() { - checkmta - ebegin "Starting incoming ${MTA}" - startinreal - eend $? -} - -startout() { - checkmta - ebegin "Starting outgoing ${MTA}" - startoutreal - eend $? -} - -stopin() { - checkmta - if [ ${MTA} = "exim" ]; then - ebegin "Stopping incoming exim" - echo "It is not possible to stop only the incoming exim."; - echo "Please use the stop option, then use startin or startout to restart" - echo "the incoming or outgoing process." - eend 1 - else - ebegin "Stopping incoming ${MTA}" - stopinreal - eend $? - fi -} - -stopout() { - checkmta - if [ ${MTA} = "exim" ]; then - ebegin "Stopping outgoing exim" - echo "It is not possible to stop only the outgoing exim."; - echo "Please use the stop option, then use startin or startout to restart" - echo "the incoming or outgoing process." - eend 1 - else - ebegin "Stopping outgoing ${MTA}" - stopoutreal - eend $? - fi -} - -restartin() { - stopin - startin -} - -restartout() { - stopout - startout -} - -status() { - if [ ${MTA} = 'sendmail' ]; then - ebegin "Incoming Sendmail status" - pid=`head -n 1 ${INPID}` - alive=`ps ax | awk '{ print $1 }' | grep '^'$pid'$'` - if [ -z "${alive}" ]; then eend 1; else eend 0; fi - ebegin "Client submission Sendmail status" - pid=`head -n 1 ${SMPID}` - alive=`ps ax | awk '{ print $1 }' | grep '^'$pid'$'` - if [ -z "${alive}" ]; then eend 1; else eend 0; fi - ebegin "Outgoing Sendmail status" - pid=`head -n 1 ${OUTPID}` - alive=`ps ax | awk '{ print $1 }' | grep '^'$pid'$'` - if [ -z "${alive}" ]; then eend 1; else eend 0; fi - elif [ ${MTA} = 'postfix' ]; then - echo "Sorry: status is not supported for postfix" - elif [ ${MTA} = 'exim' ]; then - echo "Sorry: status is not supported for exim" - else - echo "Invalid MTA in /etc/conf.d/MailScanner-mta" - exit - fi - -} - -reload() { - if [ ${MTA} = 'sendmail' ]; then - ebegin "Reloading Sendmail configuration" - aliasesetc - eend $? - elif [ ${MTA} = 'postfix' ]; then - ebegin "Reloading Incoming Postfix" - ${POSTFIX} -c ${POSTFIXINCF} reload > /dev/null - eend $? - ebegin "Reloading Outgoing Postfix" - ${POSTFIX} -c ${POSTFIXOUTCF} reload > /dev/null - eend $? - elif [ ${MTA} = 'exim' ]; then - echo "Sorry: reload is not supported for exim" - else - echo "Invalid MTA in /etc/conf.d/MailScanner-mta" - exit - fi -} |