From 8feb8716fd9ad21b5507407986073235446bb003 Mon Sep 17 00:00:00 2001 From: rhatto Date: Wed, 16 Sep 2009 02:23:49 +0000 Subject: amavisd-new: adding amavisd-new (thanks to x-doctor) and updating dependencies git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2241 370017ae-e619-0410-ac65-c121f96126d4 --- mail/filter/amavisd-new/Manifest | 23 ++ mail/filter/amavisd-new/amavisd-new.SlackBuild | 278 ++++++++++++++++--------- 2 files changed, 207 insertions(+), 94 deletions(-) create mode 100644 mail/filter/amavisd-new/Manifest (limited to 'mail') diff --git a/mail/filter/amavisd-new/Manifest b/mail/filter/amavisd-new/Manifest new file mode 100644 index 00000000..f9bc0183 --- /dev/null +++ b/mail/filter/amavisd-new/Manifest @@ -0,0 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +DIST amavisd-new-2.6.4.tar.gz 947596 MD5 03d31657f14cd64c1cb38786214234b4 RMD160 010dd9bf49a3c7553996c49553fd0fa84ca7bdab SHA1 993b7ca839ce038fd13f65351950f0ef03d99ff9 SHA256 40fe1b655deb934c7a655a6b5b430df268ec9ac80754b120795bc45d4ae769ef SHA512 f2293fa4b929704a219244b088dead29e90688a071c682fbffc341769332fdd304ae5f0b5368feb63c575649929eb27b0f17f323fe66e8eb6be816b24ec276d6 +MKBUILD amavisd-new.mkbuild 6740 MD5 0d918d1df1bbc336cac37b9a10b7e3b6 RMD160 6c92ea475eaa742b08f3e3dc57032983b4c702f9 SHA1 966b8036cfe5441167992f9e17d54be9deb19d66 SHA256 2329415523e2029d1342a7aa36c41dbcff8302348cc0935886c4e789441b5dd6 SHA512 7efcb2eb67f40cbbff358d6c131bd1d9a7a3cbc3565195b5140a8981758a9aa77240724ba02aca29bc99bc98102bf9beb7d9e5156078097cf36d708a69a25a76 +SLACKBUILD amavisd-new.SlackBuild 8509 MD5 c3dcb6f04146026dfac2b527c5f107dc RMD160 fec3b0b8d6cac2967c242f64bcc222c867234782 SHA1 214fd51efd02ee700c5d5901fcbbf75ff350ab48 SHA256 54ba950269fb4318492f4774c6b8d2c92c32dd58501b1b010e3e19d0fe443193 SHA512 83fc8c7da07de05879e28e2b6fcb3232461f577ace38b59f70ec064c82ff14b94b48d99047a1b9c6ea29dd563c33ac2c1a13dc699fecc5381396a881e6679868 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQIcBAEBCAAGBQJKr894AAoJEEHL93ESzgeiadMP/jZDFyVlzs51s+T9081sQdGU +muXgL9lmP8k+uvjPXX8BYOBgQnrmz4VEZmX2lQElBxrrZYiOx9bqYytbTYAHqW6d +Y9izuP6tXGLvQjQBvmloKIltLrpLG/GfmntCO8T8wimNv3y0U2XhJPYp/WW+FIfG +m03cpqTwcD2m97KSFcXUykU4q+rEXYwg9d3Mh7IHixZpH7jjmKfy9ljZ35KoWx1R +8LzuOr/fSqXb4Ee2eIVTSfnyzwg/6if+UqPqt4USMeOAJyM8HZmbBDjySrU2FlaZ +SHT+popjy/+6LoXfIF8qyFL1nFLdZNzzJQvT+10YQZ9xICDkFcjKRrwfzruvrLxi +WDTZYgbGMOw9lyERjJQDB9tH3XVKhlT+0NixZananDZY+oBdlhWyPQuMn9yCFC24 +CIS5M+yc7E0RxQng4bmLdGf79OOZddzkhYZiFWrtWu991h9v7Teudrk/7twa3vb7 ++hK5QySoKIDHvEuW/wUG8e7GuiCVpmEVOUWYI7yoKGwyNjv4iRoDpjx3wKtb9T4o +ap8uv/FDnHOqMsk4MV05Rfatde0zW7zJL4bNruJK3O9r4jb5QakexZx+eD0wRgoe +iXRCn8f7MhDVs+gyKA0Pg09ayZtpFc7rx7EcZKdk56dyYxyB+KOcyaxUKvN+7x6Z +KeUkcn83x5jfD5/LQTaK +=7LK+ +-----END PGP SIGNATURE----- diff --git a/mail/filter/amavisd-new/amavisd-new.SlackBuild b/mail/filter/amavisd-new/amavisd-new.SlackBuild index 6db36130..6f8b15a0 100755 --- a/mail/filter/amavisd-new/amavisd-new.SlackBuild +++ b/mail/filter/amavisd-new/amavisd-new.SlackBuild @@ -1,116 +1,220 @@ #!/bin/bash # -# amavisd-new.SlackBuild is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or any later version. +# amavisd-new.SlackBuild is free software; you can redistribute +# it and/or modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the License, +# or any later version. # -# amavisd-new.SlackBuild is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# amavisd-new.SlackBuild is distributed in the hope that it will +# be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place - Suite 330, Boston, MA 02111-1307, USA +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA # -# slackbuild script for amavisd-new -# by rhatto at riseup.net +# slackbuild for amavisd-new, by Silvio Rhatto +# requires: +# tested: amavisd-new-2.6.4 +# model: generic.mkSlackBuild $Rev: 808 $ # -if [ -s "slack-required" ]; then - echo Recomended and required packages for building amavisd-new are: - cat slack-required | sed -e 's/^/\t/' - if [ "$INTERACT" != "no" ]; then - echo If you dont have those installed, press Ctrl-C. Otherwise, hit ENTER. - read crap -# else -# echo Sleeping 3 seconds... -# sleep 3 - fi -fi - -CWD="`pwd`" - +# Look for slackbuildrc if [ -f ~/.slackbuildrc ]; then source ~/.slackbuildrc elif [ -f /etc/slackbuildrc ]; then source /etc/slackbuildrc fi -# default settings -PACKAGE="amavisd-new" -ARCH="noarch" -VERSION=${VERSION:=2.4.4} +# Set variables +CWD="$(pwd)" +SRC_NAME="amavisd-new" +PKG_NAME="amavisd-new" +ARCH=${ARCH:=i486} +SRC_VERSION=${VERSION:=2.6.4} +PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')" BUILD=${BUILD:=1rha} +SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME TMP=${TMP:=/tmp} -SRC_DIR=${SRC:=/tmp} +PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} +SLACKBUILD_PATH=${SLACKBUILD_PATH:="mail/filter/amavisd-new"} +PREFIX=${PREFIX:=/usr} +PKG_WORK="$TMP/$SRC_NAME" +CONF_OPTIONS=${CONF_OPTIONS:=""} +NUMJOBS=${NUMJOBS:=""} + +# Set system libraries' path and optmization flags based on $ARCH +LIBDIR="$PREFIX/lib" + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mtune=i686" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIR="$PREFIX/lib64" + LDFLAGS="-L/lib64 -L/usr/lib64" +fi -# ------- error codes for createpkg -------------- +# Set error codes (used by createpkg) ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33 ERROR_MD5=34; ERROR_CONF=35; ERROR_HELP=36 ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 -ERROR_PATCH=40 +ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 +ERROR_MANIFEST=43; -if [ "$ARCH" == "x86_64" ]; then - LIBDIR=/usr/lib64 -else - LIBDIR=/usr/lib -fi +# Clean up any leftovers of previous builds +rm -rf "$PKG_WORK" 2> /dev/null +rm -rf "$PKG" 2> /dev/null -RTOOL="wget" -PACKAGE_EXT="gz" -SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT" -URL="http://www.ijs.si/software/amavisd/$SRC" +# Create directories if necessary +mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR +mkdir -p "$PKG" || exit $ERROR_MKDIR +mkdir -p "$REPOS" || exit $ERROR_MKDIR +mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR -SRC_DIR="$SRC_DIR/$PACKAGE" -mkdir -p $SRC_DIR +# Dowload source if necessary +SRC="$SRC_NAME-$VERSION.tar.gz" +URL="http://www.ijs.si/software/amavisd/$SRC" -if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then +if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET fi -TMP="$TMP/$PACKAGE" -rm -rf $TMP -mkdir -p $TMP -cd $TMP -rm -rf package-$PACKAGE -mkdir package-$PACKAGE -cd package-$PACKAGE +# Check Manifest file +if [ -e "$CWD/Manifest" ]; then -tar xvf $SRC_DIR/$SRC || exit $ERROR_TAR -cd $PACKAGE-$VERSION + # Manifest signature checking + if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then + echo "Checking Manifest signature..." + gpg --verify $CWD/Manifest + if [ "$?" != "0" ]; then + exit $ERROR_MANIFEST + fi + fi -CWD="`pwd`" + MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`" + + for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do + + MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`" + MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`" + MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`" + + if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then + MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE" + else + MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`" + fi + + if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then + continue + fi + + echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..." + + SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`" + SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`" + + # Check source code size + if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then + echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC" + exit $ERROR_MANIFEST + else + echo "Size match." + fi + + # Check source code integrity + for ALGO in md5 rmd160 sha1 sha256 sha512; do + if [ $ALGO = "rmd160" ]; then + ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`" + else + ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`" + fi + ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`" + ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }') + if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then + echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC" + exit $ERROR_MANIFEST + else + echo "$ALGO match." + fi + done + + done -mkdir -p $TMP/package-$PACKAGE/$PACKAGE -cd $TMP/package-$PACKAGE/$PACKAGE +else + exit $ERROR_MANIFEST +fi + +# Untar +cd "$PKG_WORK" +tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR +PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`" +cd "$PKG_SRC" + +# Install +mkdir -p $PKG/etc/rc.d +mkdir -p $PKG/var/amavis/{tmp,var,db} +mkdir -p $PKG/usr/{sbin,doc,share/$PACKAGE-$VERSION} +mkdir $PKG/var/virusmails -mkdir -p etc/rc.d -mkdir -p var/amavis/{tmp,var,db} -mkdir -p usr/{sbin,doc,share/$PACKAGE-$VERSION} -mkdir var/virusmails +cp *patch $PKG/usr/share/$PACKAGE-$VERSION/ +cp amavisd $PKG/usr/sbin/ +cp amavisd-{nanny,agent,release} $PKG/usr/sbin/ -cp $CWD/*patch usr/share/$PACKAGE-$VERSION/ +cp amavisd.conf $PKG/etc/amavisd.conf.new +cp amavisd_init.sh $PKG/etc/rc.d/rc.amavisd.new -cp $CWD/amavisd usr/sbin/ -cp $CWD/amavisd-{nanny,agent,release} usr/sbin/ +chmod 755 $PKG/etc/rc.d/rc.amavisd.new +chmod 755 $PKG/usr/sbin/amavisd* -cp $CWD/amavisd.conf etc/amavisd.conf.new -cp $CWD/amavisd_init.sh etc/rc.d/rc.amavisd.new +mkdir $PKG/install -chmod 755 etc/rc.d/rc.amavisd.new -chmod 755 usr/sbin/amavisd* +# install script +echo '( chroot . /sbin/ldconfig )' > $PKG/install/doinst.sh +echo '( if ! grep -qe "^amavis:" etc/group; then echo creating group amavis... ; chroot . /usr/sbin/groupadd amavis; fi )' >> $PKG/install/doinst.sh +echo '( if ! grep -qe "^amavis:" etc/passwd; then echo creating user amavis... ; chroot . /usr/sbin/useradd amavis -g amavis; fi )' >> $PKG/install/doinst.sh +echo '( echo setting permissions on /var/amavis to amavis.amavis... )' >> $PKG/install/doinst.sh +echo '( chroot . /usr/bin/chown -R amavis.amavis /var/amavis )' >> $PKG/install/doinst.sh +echo '( chroot . /usr/bin/chmod -R 750 /var/amavis )' >> $PKG/install/doinst.sh +echo '( if [ ! -f "etc/amavisd.conf" ]; then mv etc/amavisd.conf.new etc/amavisd.conf; fi )' >> $PKG/install/doinst.sh +echo '( if [ ! -f "etc/rc.d/rc.amavisd" ]; then mv etc/rc.d/rc.amavisd.new etc/rc.d/rc.amavisd; fi )' >> $PKG/install/doinst.sh + +# Strip binaries +( cd "$PKG" + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null +) + +# Install documentation +DOCS="NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING LICENSE SIGNATURE readme.*" +mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR +for doc in $DOCS; do + if [ -f "$doc" ]; then + cp -a $doc "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" + fi +done -mkdir install -cat << EOF > install/slack-desc +# Add package description (slack-desc) +mkdir -p "$PKG/install" || exit $ERROR_MKDIR +cat << EODESC > "$PKG/install/slack-desc" # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must +# on the right side marks the last column you can put a character in. You must # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler-----------------------------------------------------| + |-----handy-ruler--------------------------------------------------| amavisd-new: amavisd-new (an interface between MTAs and content checkers) amavisd-new: amavisd-new: amavisd-new is a high-performance interface between mailer (MTA) and @@ -122,28 +226,14 @@ amavisd-new: v4, works with sendmail/milter, or with any MTA as a SMTP relay. amavisd-new: For Courier and qmail MTA integration there is a patch in the amavisd-new: distributed package. amavisd-new: -EOF - -# docs -mkdir -p usr/doc/$PACKAGE-$VERSION +EODESC -for file in AAAREADME.first INSTALL LDAP.schema LICENSE MANIFEST README_FILES RELEASE_NOTES TODO; do - cp $CWD/$file* usr/doc/$PACKAGE-$VERSION/ -done +# Build the package +cd "$PKG" +mkdir -p $REPOS/$SLACKBUILD_PATH +makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG -# install script -echo '( chroot . /sbin/ldconfig )' > /install/doinst.sh -echo '( if ! grep -qe "^amavis:" etc/group; then echo creating group amavis... ; chroot . /usr/sbin/groupadd amavis; fi )' >> install/doinst.sh -echo '( if ! grep -qe "^amavis:" etc/passwd; then echo creating user amavis... ; chroot . /usr/sbin/useradd amavis -g amavis; fi )' >> install/doinst.sh -echo '( echo setting permissions on /var/amavis to amavis.amavis... )' >> install/doinst.sh -echo '( chroot . /usr/bin/chown -R amavis.amavis /var/amavis )' >> install/doinst.sh -echo '( chroot . /usr/bin/chmod -R 750 /var/amavis )' >> install/doinst.sh -echo '( if [ ! -f "etc/amavisd.conf" ]; then mv etc/amavisd.conf.new etc/amavisd.conf; fi )' >> install/doinst.sh -echo '( if [ ! -f "etc/rc.d/rc.amavisd" ]; then mv etc/rc.d/rc.amavisd.new etc/rc.d/rc.amavisd; fi )' >> install/doinst.sh - -makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG - -if [ "$CLEANUP" == "yes" ]; then - rm -rf $TMP +# Delete source and build directories if requested +if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then + rm -rf "$PKG_WORK" "$PKG" fi - -- cgit v1.2.3