Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=0e983db2a7a526fddba50cff32da13dd1fd067ea
commit 0e983db2a7a526fddba50cff32da13dd1fd067ea Author: CSÉCSY László <[EMAIL PROTECTED]> Date: Sat Sep 20 11:31:57 2008 +0200 amavisd-new-2.6.1-2solaria1-i686 backport of 2c2003cf19042058c378f4c38c3d837966e67a40 to make it work ok by vmiklos@ diff --git a/source/network-extra/amavisd-new/20-userconf b/source/network-extra/amavisd-new/20-userconf index 6abd344..6b05cd4 100644 --- a/source/network-extra/amavisd-new/20-userconf +++ b/source/network-extra/amavisd-new/20-userconf @@ -85,7 +85,7 @@ $helpers_home = "$MYHOME/helpers"; # (defaults to $MYHOME) # Run the daemon in the specified chroot jail if nonempty: #$daemon_chroot_dir = $MYHOME; # (default is undef, meaning: do not chroot) -$pid_file = "/var/run/amavisd.pid"; # (default is "$MYHOME/amavisd.pid") +$pid_file = "/var/lock/amavis/amavisd.pid"; # (default is "$MYHOME/amavisd.pid") $lock_file = "/var/lock/amavis/amavisd.lock"; # (default is "$MYHOME/amavisd.lock") # set environment variables if you want (no defaults): diff --git a/source/network-extra/amavisd-new/FrugalBuild b/source/network-extra/amavisd-new/FrugalBuild index 9b219a5..157f4ab 100644 --- a/source/network-extra/amavisd-new/FrugalBuild +++ b/source/network-extra/amavisd-new/FrugalBuild @@ -4,7 +4,7 @@ pkgname=amavisd-new pkgver=2.6.1 -pkgrel=1 +pkgrel=2solaria1 pkgdesc="Amavisd-new is a high-performance interface between mailer (MTA) and content checkers" url="http://www.ijs.si/software/amavisd/"; depends=('perl-archive-zip' 'perl-berkeleydb' 'perl-convert-tnef'\ @@ -19,8 +19,8 @@ source=($url/amavisd-new-$pkgver.tar.gz 10-amavisconf 20-userconf \ rc.amavisd-new amavisconf README.Frugalware) sha1sums=('51e3e3d9c2aaa33f6a41a84092c82adb94e2a806' \ '648421546adab952f6ace5834c269f8a80256b84' \ - '019e9ff54de600b5bc68e4c810a17befe1b0e16f' \ - 'abbe37aedba303f48e7827841e9e84dc2bb02ca7' \ + '6c3ddac1c01b4cba1a0ee3c162814bd98a570ecd' \ + 'aeffbffab4dfa54e06e8d42df88401b3cbcfcbc1' \ '0817540bbce13a5ac1861d1e82dcbcf740f977e8' \ '3a89c9bc33ef4d9b7c91dfc42cd7b82634f46805') diff --git a/source/network-extra/amavisd-new/rc.amavisd-new b/source/network-extra/amavisd-new/rc.amavisd-new index df5dc32..fca9eb4 100644 --- a/source/network-extra/amavisd-new/rc.amavisd-new +++ b/source/network-extra/amavisd-new/rc.amavisd-new @@ -11,7 +11,7 @@ . /etc/rc.d/rc.functions prog="/usr/sbin/amavisd" -pid_file="/var/run/amavisd.pid" +pid_file="/var/lock/amavis/amavisd.pid" confdir="/etc/amavis" cmd_opts="" @@ -31,7 +31,6 @@ if [ "$1" = "stop" ]; then fi stop "$stopamavisd" kill -TERM `cat $pid_file` - rm $pid_file ok $? elif [ "$1" = "restart" ]; then "$0" stop @@ -54,7 +53,7 @@ else # start exit 0 fi get_params - $prog $PARAMS $opts + $prog $PARAMS $opts 2>>/dev/null start "$startamavisd" ok $? fi _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
