mirror of
https://github.com/MailScanner/v5.git
synced 2024-09-20 07:16:10 +08:00
Updates for 5.3.3-1 (#483)
This commit is contained in:
parent
3e0e3ec62d
commit
536f1b911f
13
Build.all
Executable file
13
Build.all
Executable file
|
@ -0,0 +1,13 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
#
|
||||||
|
# Updated: 16 May 2020
|
||||||
|
# MailScanner Team <https://www.mailscanner.info>
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# this Build.all script should be located in the base
|
||||||
|
# directory when run.
|
||||||
|
|
||||||
|
./Build.rhel
|
||||||
|
./Build.suse
|
||||||
|
./Build.debian
|
||||||
|
./Build.nix
|
15
Build.debian
15
Build.debian
|
@ -14,9 +14,16 @@ if [ ! -d 'common' ]; then
|
||||||
exit 192
|
exit 192
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MSVERSION=$(sed 's/-.*$//' VERSION)
|
if [ -z $(which fakeroot) -o -z $(which dpkg) ]; then
|
||||||
MSBUILD=$(sed 's/^.*-//' VERSION)
|
echo 'Required build packages are missing.';
|
||||||
VERSION=$(cat VERSION)
|
echo 'Install fakeroot and dpkg before continuing, Exiting ...';
|
||||||
|
echo;
|
||||||
|
exit 192
|
||||||
|
fi
|
||||||
|
|
||||||
|
VERSION=$(sed -e 's/\n//' VERSION)
|
||||||
|
MSVERSION=$(echo $VERSION | sed -e 's/-.*$//')
|
||||||
|
MSBUILD=$(echo $VERSION | sed -e 's/^.*-//')
|
||||||
MSDATE=$(date +"%a %d %B %Y %H:%M:%S %z")
|
MSDATE=$(date +"%a %d %B %Y %H:%M:%S %z")
|
||||||
|
|
||||||
if [ -z $MSVERSION -o -z $MSBUILD ]; then
|
if [ -z $MSVERSION -o -z $MSBUILD ]; then
|
||||||
|
@ -30,7 +37,7 @@ fi
|
||||||
THISCURDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
|
THISCURDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
|
||||||
|
|
||||||
# where the final file will be copied
|
# where the final file will be copied
|
||||||
FILEOUT="$HOME/msbuilds/deb";
|
FILEOUT="$HOME/msbuilds";
|
||||||
|
|
||||||
# check to see if the output directory exists
|
# check to see if the output directory exists
|
||||||
if [ ! -d "$FILEOUT" ]; then
|
if [ ! -d "$FILEOUT" ]; then
|
||||||
|
|
42
Build.nix
42
Build.nix
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Updated 2 Nov 2019
|
# Updated 16 May 2020
|
||||||
# MailScanner Team <https://www.mailscanner.info>
|
# MailScanner Team <https://www.mailscanner.info>
|
||||||
|
|
||||||
# this Build.tarball script should be located in the base
|
# this Build.tarball script should be located in the base
|
||||||
|
@ -14,39 +14,24 @@ if [ ! -d 'common' ]; then
|
||||||
exit 192
|
exit 192
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# if not set from the "Build.all" script
|
VERSION=$(sed -e 's/\n//' VERSION)
|
||||||
if [ -z "$MSVERSION" ]; then
|
MSVERSION=$(echo $VERSION | sed -e 's/-.*$//')
|
||||||
echo "Please tell me the version number (x.xx.x):"
|
MSBUILD=$(echo $VERSION | sed -e 's/^.*-//')
|
||||||
read MSVERSION
|
|
||||||
export MSVERSION
|
|
||||||
fi
|
|
||||||
|
|
||||||
# if not set from the "Build.all" script
|
if [ -z $MSVERSION -o -z $MSBUILD ]; then
|
||||||
if [ -z "$MSBUILD" ]; then
|
echo "Could not determine MailScanner version."
|
||||||
echo "And the build number (-x):"
|
echo "Unable read VERSION file"
|
||||||
read MSBUILD
|
echo;
|
||||||
export MSBUILD
|
exit 192
|
||||||
fi
|
|
||||||
|
|
||||||
# if not set from the "Build.all" script
|
|
||||||
if [ -z "$FULLMSVER" ]; then
|
|
||||||
FULLMSVER="$MSVERSION-$MSBUILD";
|
|
||||||
export FULLMSVER
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# if not set from the "Build.all" script
|
# if not set from the "Build.all" script
|
||||||
if [ -z "$DEVBASEDIR" ]; then
|
if [ -z "$DEVBASEDIR" ]; then
|
||||||
DEVBASEDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
|
DEVBASEDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
|
||||||
export DEVBASEDIR
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# version info
|
|
||||||
VERSION=$MSVERSION-$MSBUILD
|
|
||||||
export VERSION
|
|
||||||
|
|
||||||
# make some dirs
|
# make some dirs
|
||||||
mkdir -p ~/msbuilds/tar
|
mkdir -p ~/msbuilds
|
||||||
|
|
||||||
# the work directory
|
# the work directory
|
||||||
WORK="/tmp/MailScanner-$MSVERSION";
|
WORK="/tmp/MailScanner-$MSVERSION";
|
||||||
|
@ -69,7 +54,6 @@ cp -fr $DEVBASEDIR/README $WORK/
|
||||||
perl -pi -e 's/VersionNumberHere/'$MSVERSION'/;' $WORK/etc/MailScanner/MailScanner.conf
|
perl -pi -e 's/VersionNumberHere/'$MSVERSION'/;' $WORK/etc/MailScanner/MailScanner.conf
|
||||||
perl -pi -e 's/VersionNumberHere/'$MSVERSION'/;' $WORK/usr/sbin/MailScanner
|
perl -pi -e 's/VersionNumberHere/'$MSVERSION'/;' $WORK/usr/sbin/MailScanner
|
||||||
|
|
||||||
|
|
||||||
# remove svn and git and mac stuff
|
# remove svn and git and mac stuff
|
||||||
find $WORK -name '.svn' -exec rm -rf {} \;
|
find $WORK -name '.svn' -exec rm -rf {} \;
|
||||||
find $WORK -name '.git' -exec rm -rf {} \;
|
find $WORK -name '.git' -exec rm -rf {} \;
|
||||||
|
@ -88,8 +72,10 @@ chmod +x $WORK/usr/lib/MailScanner/init/*
|
||||||
|
|
||||||
# Build the MailScanner-version.tar.gz archive
|
# Build the MailScanner-version.tar.gz archive
|
||||||
cd /tmp
|
cd /tmp
|
||||||
tar czf ~/msbuilds/tar/MailScanner-${VERSION}.nix.tar.gz MailScanner-$MSVERSION
|
tar czf ~/msbuilds/MailScanner-${VERSION}.nix.tar.gz MailScanner-$MSVERSION
|
||||||
|
|
||||||
cd $DEVBASEDIR
|
cd $DEVBASEDIR
|
||||||
rm -rf $WORK
|
rm -rf $WORK
|
||||||
|
|
||||||
|
echo;
|
||||||
|
echo "Completed: $HOME/msbuilds/MailScanner-${VERSION}.nix.tar.gz";
|
17
Build.rhel
17
Build.rhel
|
@ -13,9 +13,16 @@ if [ ! -d 'rhel' ]; then
|
||||||
exit 192
|
exit 192
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MSVERSION=$(sed 's/-.*$//' VERSION)
|
if [ -z $(which rpmbuild) ]; then
|
||||||
MSBUILD=$(sed 's/^.*-//' VERSION)
|
echo 'Required rpmbuild package is missing';
|
||||||
VERSION=$(cat VERSION)
|
echo 'install rpmbuild before continuing, Exiting ...';
|
||||||
|
echo;
|
||||||
|
exit 192
|
||||||
|
fi
|
||||||
|
|
||||||
|
VERSION=$(sed -e 's/\n//' VERSION)
|
||||||
|
MSVERSION=$(echo $VERSION | sed -e 's/-.*$//')
|
||||||
|
MSBUILD=$(echo $VERSION | sed -e 's/^.*-//')
|
||||||
|
|
||||||
if [[ -z $MSVERSION || -z $MSBUILD ]]; then
|
if [[ -z $MSVERSION || -z $MSBUILD ]]; then
|
||||||
echo "Could not determine MailScanner version."
|
echo "Could not determine MailScanner version."
|
||||||
|
@ -27,10 +34,8 @@ fi
|
||||||
# directory we are in
|
# directory we are in
|
||||||
THISCURDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
|
THISCURDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
|
||||||
|
|
||||||
# if not set from the "Build.all" script
|
|
||||||
if [ -z "$RPMOUT" ]; then
|
if [ -z "$RPMOUT" ]; then
|
||||||
RPMOUT="$HOME/msbuilds/rhel";
|
RPMOUT="$HOME/msbuilds";
|
||||||
export RPMOUT;
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# setup rpm development dirs
|
# setup rpm development dirs
|
||||||
|
|
23
Build.suse
23
Build.suse
|
@ -13,9 +13,16 @@ if [ ! -d 'suse' ]; then
|
||||||
exit 192
|
exit 192
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MSVERSION=$(sed 's/-.*$//' VERSION)
|
if [ -z $(which rpmbuild) ]; then
|
||||||
MSBUILD=$(sed 's/^.*-//' VERSION)
|
echo 'Required rpmbuild package is missing';
|
||||||
VERSION=$(cat VERSION)
|
echo 'install rpmbuild before continuing, Exiting ...';
|
||||||
|
echo;
|
||||||
|
exit 192
|
||||||
|
fi
|
||||||
|
|
||||||
|
VERSION=$(sed -e 's/\n//' VERSION)
|
||||||
|
MSVERSION=$(echo $VERSION | sed -e 's/-.*$//')
|
||||||
|
MSBUILD=$(echo $VERSION | sed -e 's/^.*-//')
|
||||||
|
|
||||||
if [[ -z $MSVERSION || -z $MSBUILD ]]; then
|
if [[ -z $MSVERSION || -z $MSBUILD ]]; then
|
||||||
echo "Could not determine MailScanner version."
|
echo "Could not determine MailScanner version."
|
||||||
|
@ -27,10 +34,8 @@ fi
|
||||||
# directory we are in
|
# directory we are in
|
||||||
THISCURDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
|
THISCURDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
|
||||||
|
|
||||||
# if not set from the "Build.all" script
|
|
||||||
if [ -z "$RPMOUT" ]; then
|
if [ -z "$RPMOUT" ]; then
|
||||||
RPMOUT="$HOME/msbuilds/suse";
|
RPMOUT="$HOME/msbuilds";
|
||||||
export RPMOUT;
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# setup rpm development dirs
|
# setup rpm development dirs
|
||||||
|
@ -68,18 +73,18 @@ tar czf ~/rpmbuild/SOURCES/MailScanner-${MSVERSION}.tar.gz MailScanner-${MSVERSI
|
||||||
cd $THISCURDIR
|
cd $THISCURDIR
|
||||||
|
|
||||||
# Build the RPM and SRPMS
|
# Build the RPM and SRPMS
|
||||||
cp -f $THISCURDIR/rhel/mailscanner.spec ~/rpmbuild/SPECS/mailscanner.spec
|
cp -f $THISCURDIR/suse/mailscanner.spec ~/rpmbuild/SPECS/mailscanner.spec
|
||||||
perl -pi -e 's/__Version__/'$MSVERSION'/;' ~/rpmbuild/SPECS/mailscanner.spec
|
perl -pi -e 's/__Version__/'$MSVERSION'/;' ~/rpmbuild/SPECS/mailscanner.spec
|
||||||
perl -pi -e 's/__Release__/'$MSBUILD'/;' ~/rpmbuild/SPECS/mailscanner.spec
|
perl -pi -e 's/__Release__/'$MSBUILD'/;' ~/rpmbuild/SPECS/mailscanner.spec
|
||||||
rpmbuild -ba ~/rpmbuild/SPECS/mailscanner.spec
|
rpmbuild -ba ~/rpmbuild/SPECS/mailscanner.spec
|
||||||
|
|
||||||
# Cleanup
|
# Cleanup
|
||||||
mv ~/rpmbuild/RPMS/noarch/MailScanner-${VERSION}.rhel.noarch.rpm $RPMOUT
|
mv ~/rpmbuild/RPMS/noarch/MailScanner-${VERSION}.suse.noarch.rpm $RPMOUT
|
||||||
rm -rf $WORK
|
rm -rf $WORK
|
||||||
# Be mindful that rpmbuild may be present for other things...
|
# Be mindful that rpmbuild may be present for other things...
|
||||||
rm -f ~/rpmbuild/SOURCES/MailScanner-${MSVERSION}.tar.gz
|
rm -f ~/rpmbuild/SOURCES/MailScanner-${MSVERSION}.tar.gz
|
||||||
rm -f ~/rpmbuild/SPECS/mailscanner.spec
|
rm -f ~/rpmbuild/SPECS/mailscanner.spec
|
||||||
|
|
||||||
echo;
|
echo;
|
||||||
echo "Completed: $RPMOUT/MailScanner-${VERSION}.rhel.noarch.rpm";
|
echo "Completed: $RPMOUT/MailScanner-${VERSION}.suse.noarch.rpm";
|
||||||
|
|
||||||
|
|
6
README
6
README
|
@ -1,6 +1,6 @@
|
||||||
# Welcome to MailScanner!
|
# Welcome to MailScanner!
|
||||||
#
|
#
|
||||||
# Current version: 5.3.2-2
|
# Current version: 5.3.2-2 (5.3.3-1 pending)
|
||||||
#
|
#
|
||||||
# 25 April 2020
|
# 25 April 2020
|
||||||
# MailScanner Team <https://www.mailscanner.info>
|
# MailScanner Team <https://www.mailscanner.info>
|
||||||
|
@ -21,13 +21,13 @@
|
||||||
#
|
#
|
||||||
# Install/Update
|
# Install/Update
|
||||||
# Redhat-based
|
# Redhat-based
|
||||||
# rpm -ivh MailScanner-5.x.x-x.rhel.noarch.rpm
|
# rpm -ivh|-Uvh MailScanner-5.x.x-x.rhel.noarch.rpm
|
||||||
# /usr/sbin/ms-configure [--update]
|
# /usr/sbin/ms-configure [--update]
|
||||||
# Debian-based
|
# Debian-based
|
||||||
# dpkg -i MailScanner-5.x.x.x-x.noarch.deb
|
# dpkg -i MailScanner-5.x.x.x-x.noarch.deb
|
||||||
# /usr/sbin/ms-configure [--update]
|
# /usr/sbin/ms-configure [--update]
|
||||||
# SuSE-based
|
# SuSE-based
|
||||||
# rpm -ivh MailScanner-5.x.x.x-x.suse.noarch.rpm
|
# rpm -ivh|-Uvh MailScanner-5.x.x.x-x.suse.noarch.rpm
|
||||||
# /usr/sbin/ms-configure [--update]
|
# /usr/sbin/ms-configure [--update]
|
||||||
# Other *nix
|
# Other *nix
|
||||||
# tar -xvzf MailScanner-5.x.x-x.nix.tar.gz
|
# tar -xvzf MailScanner-5.x.x-x.nix.tar.gz
|
||||||
|
|
2
debian/DEBIAN/changelog
vendored
2
debian/DEBIAN/changelog
vendored
|
@ -1,5 +1,5 @@
|
||||||
MailScanner (DebianVersionHere) stable; urgency=low
|
MailScanner (DebianVersionHere) stable; urgency=low
|
||||||
|
|
||||||
* Maintenance release
|
* See changelog and README in /usr/share/MailScanner/doc
|
||||||
|
|
||||||
-- MailScanner Team <https://www.mailscanner.info> __Date__
|
-- MailScanner Team <https://www.mailscanner.info> __Date__
|
||||||
|
|
|
@ -40,12 +40,62 @@ based Linux distributions.
|
||||||
|
|
||||||
mkdir -p ${RPM_BUILD_ROOT}
|
mkdir -p ${RPM_BUILD_ROOT}
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/usr/sbin/
|
mkdir -p ${RPM_BUILD_ROOT}/usr/sbin/
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/etc/MailScanner/{conf.d,rules,mcp}
|
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/etc/{cron.hourly,cron.daily}
|
while read f
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/usr/share/MailScanner/reports/{hu,de,se,ca,cy+en,pt_br,fr,es,en,en_uk,cz,it,dk,nl,ro,sk}
|
do
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/{MailScanner,custom}
|
mkdir -p ${RPM_BUILD_ROOT}/etc/$f
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/usr/{lib/MailScanner/wrapper,lib/MailScanner/init,lib/MailScanner/systemd}
|
done << EOF
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/var/spool/MailScanner/{archive,incoming,quarantine,milterin,milterout}
|
MailScanner/conf.d
|
||||||
|
MailScanner/rules
|
||||||
|
MailScanner/mcp
|
||||||
|
cron.hourly
|
||||||
|
cron.daily
|
||||||
|
EOF
|
||||||
|
|
||||||
|
while read f
|
||||||
|
do
|
||||||
|
mkdir -p ${RPM_BUILD_ROOT}/usr/share/$f
|
||||||
|
done << EOF
|
||||||
|
MailScanner/reports/hu
|
||||||
|
MailScanner/reports/de
|
||||||
|
MailScanner/reports/se
|
||||||
|
MailScanner/reports/ca
|
||||||
|
MailScanner/reports/cy+en
|
||||||
|
MailScanner/reports/pt_br
|
||||||
|
MailScanner/reports/fr
|
||||||
|
MailScanner/reports/es
|
||||||
|
MailScanner/reports/en
|
||||||
|
MailScanner/reports/en_uk
|
||||||
|
MailScanner/reports/cz
|
||||||
|
MailScanner/reports/it
|
||||||
|
MailScanner/reports/dk
|
||||||
|
MailScanner/reports/nl
|
||||||
|
MailScanner/reports/ro
|
||||||
|
MailScanner/reports/sk
|
||||||
|
MailScanner/perl/MailScanner
|
||||||
|
MailScanner/perl/custom
|
||||||
|
EOF
|
||||||
|
|
||||||
|
while read f
|
||||||
|
do
|
||||||
|
mkdir -p ${RPM_BUILD_ROOT}/usr/lib/$f
|
||||||
|
done << EOF
|
||||||
|
MailScanner/wrapper
|
||||||
|
MailScanner/init
|
||||||
|
MailScanner/systemd
|
||||||
|
EOF
|
||||||
|
|
||||||
|
while read f
|
||||||
|
do
|
||||||
|
mkdir -p ${RPM_BUILD_ROOT}/var/spool/MailScanner/$f
|
||||||
|
done << EOF
|
||||||
|
archive
|
||||||
|
incoming
|
||||||
|
quarantine
|
||||||
|
milterin
|
||||||
|
milterout
|
||||||
|
EOF
|
||||||
|
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/usr/share/MailScanner/doc
|
mkdir -p ${RPM_BUILD_ROOT}/usr/share/MailScanner/doc
|
||||||
|
|
||||||
### etc
|
### etc
|
||||||
|
|
|
@ -41,12 +41,62 @@ based Linux distributions.
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT
|
mkdir -p $RPM_BUILD_ROOT
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/usr/sbin/
|
mkdir -p ${RPM_BUILD_ROOT}/usr/sbin/
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/etc/MailScanner/{conf.d,rules,mcp}
|
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/etc/{cron.hourly,cron.daily}
|
while read f
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/usr/share/MailScanner/reports/{hu,de,se,ca,cy+en,pt_br,fr,es,en,en_uk,cz,it,dk,nl,ro,sk}
|
do
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/{MailScanner,custom}
|
mkdir -p ${RPM_BUILD_ROOT}/etc/$f
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/usr/{lib/MailScanner/wrapper,lib/MailScanner/init,lib/MailScanner/systemd}
|
done << EOF
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/var/spool/MailScanner/{archive,incoming,quarantine,milterin,milterout}
|
MailScanner/conf.d
|
||||||
|
MailScanner/rules
|
||||||
|
MailScanner/mcp
|
||||||
|
cron.hourly
|
||||||
|
cron.daily
|
||||||
|
EOF
|
||||||
|
|
||||||
|
while read f
|
||||||
|
do
|
||||||
|
mkdir -p ${RPM_BUILD_ROOT}/usr/share/$f
|
||||||
|
done << EOF
|
||||||
|
MailScanner/reports/hu
|
||||||
|
MailScanner/reports/de
|
||||||
|
MailScanner/reports/se
|
||||||
|
MailScanner/reports/ca
|
||||||
|
MailScanner/reports/cy+en
|
||||||
|
MailScanner/reports/pt_br
|
||||||
|
MailScanner/reports/fr
|
||||||
|
MailScanner/reports/es
|
||||||
|
MailScanner/reports/en
|
||||||
|
MailScanner/reports/en_uk
|
||||||
|
MailScanner/reports/cz
|
||||||
|
MailScanner/reports/it
|
||||||
|
MailScanner/reports/dk
|
||||||
|
MailScanner/reports/nl
|
||||||
|
MailScanner/reports/ro
|
||||||
|
MailScanner/reports/sk
|
||||||
|
MailScanner/perl/MailScanner
|
||||||
|
MailScanner/perl/custom
|
||||||
|
EOF
|
||||||
|
|
||||||
|
while read f
|
||||||
|
do
|
||||||
|
mkdir -p ${RPM_BUILD_ROOT}/usr/lib/$f
|
||||||
|
done << EOF
|
||||||
|
MailScanner/wrapper
|
||||||
|
MailScanner/init
|
||||||
|
MailScanner/systemd
|
||||||
|
EOF
|
||||||
|
|
||||||
|
while read f
|
||||||
|
do
|
||||||
|
mkdir -p ${RPM_BUILD_ROOT}/var/spool/MailScanner/$f
|
||||||
|
done << EOF
|
||||||
|
archive
|
||||||
|
incoming
|
||||||
|
quarantine
|
||||||
|
milterin
|
||||||
|
milterout
|
||||||
|
EOF
|
||||||
|
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/usr/share/MailScanner/doc
|
mkdir -p ${RPM_BUILD_ROOT}/usr/share/MailScanner/doc
|
||||||
|
|
||||||
### etc
|
### etc
|
||||||
|
|
Loading…
Reference in a new issue