OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 25-Jul-2003 21:48:32
Branch: HEAD Handle: 2003072520483002
Modified files:
openpkg-src/smtpfeed rc.smtpfeed smtpfeed.spec
openpkg-web news.txt
Log:
correct and obey tcp wrapper usage help; address is optional, port is
mandatory; improve source addr/port control in rc file;
Summary:
Revision Changes Path
1.22 +7 -4 openpkg-src/smtpfeed/rc.smtpfeed
1.58 +1 -0 openpkg-src/smtpfeed/smtpfeed.spec
1.5817 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/smtpfeed/rc.smtpfeed
============================================================================
$ cvs diff -u -r1.21 -r1.22 rc.smtpfeed
--- openpkg-src/smtpfeed/rc.smtpfeed 24 Jul 2003 15:26:41 -0000 1.21
+++ openpkg-src/smtpfeed/rc.smtpfeed 25 Jul 2003 19:48:32 -0000 1.22
@@ -6,8 +6,10 @@
%config
smtpfeed_enable="$openpkg_rc_def"
smtpfeed_flags="-u -V"
- smtpfeed_bind_local="127.0.0.1:2525"
- smtpfeed_bind_remote="0.0.0.0"
+ smtpfeed_bind="127.0.0.1"
+ smtpfeed_port="2525"
+ smtpfeed_source_addr=""
+ smtpfeed_source_port=""
smtpfeed_hostname="localhost"
smtpfeed_timeout_connect="1m"
smtpfeed_timeout_greet="2m"
@@ -26,7 +28,8 @@
smtpfeed_args="$smtpfeed_args -t connect=${smtpfeed_timeout_connect:-1m}"
smtpfeed_args="$smtpfeed_args -t greet=${smtpfeed_timeout_greet:-2m}"
smtpfeed_args="$smtpfeed_args -t rset=${smtpfeed_timeout_rset:-2m}"
- smtpfeed_args="$smtpfeed_args -o ${smtpfeed_bind_remote:-0.0.0.0}"
+ smtpfeed_args="$smtpfeed_args ${smtpfeed_source_addr:+-o
}${smtpfeed_source_addr}"
+ smtpfeed_args="$smtpfeed_args ${smtpfeed_source_port:+-p
}${smtpfeed_source_port}"
smtpfeed_args="$smtpfeed_args -c ${smtpfeed_hostname:-localhost}"
smtpfeed_args="$smtpfeed_args -r 1 -R ${smtpfeed_maxrcpt:-100}"
smtpfeed_args="$smtpfeed_args -s ${smtpfeed_maxsize:-4194304}"
@@ -34,7 +37,7 @@
[ -f $smtpfeed_pidfile ] && kill -$1 `cat $smtpfeed_pidfile`
}
smtpfeed_start () {
- ( @l_prefix@/sbin/smtpfeedd ${smtpfeed_bind_local:-127.0.0.1:2525} \
+ ( @l_prefix@/sbin/smtpfeedd
${smtpfeed_bind}${smtpfeed_bind:+:}${smtpfeed_port:-2525} \
@l_prefix@/sbin/smtpfeed ${smtpfeed_args} \
</dev/null >/dev/null 2>&1 &
echo "$!" >${smtpfeed_pidfile}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/smtpfeed/smtpfeed.spec
============================================================================
$ cvs diff -u -r1.57 -r1.58 smtpfeed.spec
--- openpkg-src/smtpfeed/smtpfeed.spec 25 Jul 2003 06:22:44 -0000 1.57
+++ openpkg-src/smtpfeed/smtpfeed.spec 25 Jul 2003 19:48:32 -0000 1.58
@@ -65,6 +65,7 @@
%prep
%setup0 -q -c
%setup1 -q -T -D -a 1
+ %{l_shtool} subst -e 's/port program \[argv0 argv1/port argv0 \[argv1 argv2/'
smtpfeedd/smtpfeedd.c
%{l_shtool} subst \
-e 's;5\.8;5.[89];g' \
smtpfeed-%{version}/configure
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5816 -r1.5817 news.txt
--- openpkg-web/news.txt 25 Jul 2003 18:48:26 -0000 1.5816
+++ openpkg-web/news.txt 25 Jul 2003 19:48:30 -0000 1.5817
@@ -1,3 +1,4 @@
+25-Jul-2003: Upgraded package: P<uucp-1.07-20030725>
25-Jul-2003: Upgraded package: P<postgresql-7.3.4-20030725>
25-Jul-2003: Upgraded package: P<iozone-3.194-20030725>
25-Jul-2003: Upgraded package: P<gmime-2.0.9-20030725>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
