OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Feb-2003 13:59:49
Branch: OPENPKG_1_2_SOLID Handle: 2003021712594800
Modified files: (Branch: OPENPKG_1_2_SOLID)
openpkg-src/lmtp2nntp lmtp2nntp.conf lmtp2nntp.spec rc.lmtp2nntp
Log:
MFS: replace alpha version with release
Summary:
Revision Changes Path
1.3.4.1 +85 -31 openpkg-src/lmtp2nntp/lmtp2nntp.conf
1.33.2.1.2.2+7 -3 openpkg-src/lmtp2nntp/lmtp2nntp.spec
1.5.4.1 +7 -4 openpkg-src/lmtp2nntp/rc.lmtp2nntp
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/lmtp2nntp/lmtp2nntp.conf
============================================================================
$ cvs diff -u -r1.3 -r1.3.4.1 lmtp2nntp.conf
--- openpkg-src/lmtp2nntp/lmtp2nntp.conf 17 Dec 2002 13:23:55 -0000 1.3
+++ openpkg-src/lmtp2nntp/lmtp2nntp.conf 17 Feb 2003 12:59:48 -0000 1.3.4.1
@@ -1,35 +1,89 @@
##
-## lmtp2nntp.conf
+## lmtp2nntp.conf -- Mail to News Gateway Configuration
##
-# PID, socket and logging file
-pidfile '@l_prefix@/var/lmtp2nntp/lmtp2nntp.pid'
-bind '@l_prefix@/var/lmtp2nntp/lmtp2nntp.socket'
-l2spec ' \
- info: prefix(prefix="%%b %%d %%H:%%M:%%S <%%L> lmtp2nntp[%%P]:
",timezone=local) \
- ->
file(path="@l_prefix@/var/lmtp2nntp/lmtp2nntp.log",append=0,perm=0644) \
- '
-
-# run-time parameters
-#user @l_musr@
-destination news
-groupmode envelope
-operationmode post
-newsgroup *
-
-# header rewriting: remove headers
-headerrule '500:^(-EF|Path|Received|To|Cc|Bcc|):$1:'
-
-# header rewriting: merge values from duplicate headers and separte them with
"comma space"
-headerrule '510:^(Reply-To):$1:[${msg.header.${1}[#]}${msg.header.${1}[#+1]:+,
}]'
-
-# header rewriting: replace empty Subject with text "None"
-headerrule '520::Subject:${msg.header.Subject:-None}'
-
-# header rewriting: create Message-ID if omitted or illegal (no or more than one
'@')
-headerrule
'530::Message-ID:${msg.header.Message-ID:-@@:s/^.*@.*@.*$//:%createmessageid}'
-
-# header rewriting: append a header
-headerrule '540::Path:lmtp2nntp!not-for-mail'
-headerrule '550::X-Gateway:lmtp2nntp'
+# --- DAEMON ---
+user @l_musr@
+childsmax 3
+pidfile "@l_prefix@/var/lmtp2nntp/lmtp2nntp.pid"
+
+# --- LMTP SERVER ---
+
+# server communication on TCP socket (address:port)
+#acl 127.0.0.1/32
+#bind 127.0.0.1:24
+
+# server communication on Unix domain socket (path:permissions)
+bind "@l_prefix@/var/lmtp2nntp/lmtp2nntp.socket:660"
+
+# server communication on stdin/stdout (remove DAEMON section above)
+#bind -
+
+# server communication limits
+timeoutlmtp 0
+timeoutlmtpaccept 0
+timeoutlmtpread 10
+timeoutlmtpwrite 10
+size 8388608
+
+# ---- NNTP CLIENT ----
+
+# client communication via TCP socket
+#client 127.0.0.1
+destination 127.0.0.1:nntp
+
+# client communication limits
+timeoutnntp 30
+timeoutnntpconnect 60
+timeoutnntpread 60
+timeoutnntpwrite 60
+operationmode post
+
+# ---- GATEWAY OPERATION ----
+
+# processing mode
+groupmode envelope
+mailfrom ".*"
+nodename "gateway"
+restrictheader "X-Gateway:.*lmtp2nntp"
+newsgroup "local.test"
+
+# remove headers (using empty value)
+headerrule '500:^(-EF|Path|Received|To|Cc|Bcc|):$1:'
+
+# merge values from duplicate headers and separte them with "comma space"
+headerrule
'510:^(Reply-To):$1:[${msg.header.${1}[#]}${msg.header.${1}[#+1]:+, }]'
+
+# replace empty Subject with text "None"
+headerrule '520::Subject:${msg.header.Subject:-None}'
+
+# create Message-ID if omitted or illegal (no or more than one '@')
+headerrule
'530::Message-ID:${msg.header.Message-ID:-@@:s/^.*@.*@.*$//:%createmessageid}'
+
+# append a header to inhibit bang path addressing for mail replies
+headerrule '540::Path:lmtp2nntp!not-for-mail'
+
+# append a header to avoid message loops with news2mail gateways - see
restrictheader
+headerrule '610::X-Gateway:lmtp2nntp'
+
+# append a header to approve posting to a moderated newsgroup
+headerrule '620::Approved:[EMAIL PROTECTED]'
+
+# ---- LOGGING ----
+
+# normal operation
+l2spec 'info: prefix(prefix="%b %d %H:%M:%S <%L> lmtp2nntp[%P]: ",
timezone=local) \
+ -> buffer(size=65536) \
+ -> file(path="@l_prefix@/var/lmtp2nntp/lmtp2nntp.log",
append=1, perm=0640)'
+
+# normal and debug operation
+#l2spec 'noop -> { \
+ info: prefix(prefix="%b %d %H:%M:%S <%L> lmtp2nntp[%P]: ",
timezone=local) \
+ -> buffer(size=65536) \
+ -> file(path="@l_prefix@/var/lmtp2nntp/lmtp2nntp.log",
append=1, perm=0640); \
+ debug: prefix(prefix="%b %d %H:%M:%S <%L> lmtp2nntp[%P]: ",
timezone=local) \
+ -> file(path="@l_prefix@/var/lmtp2nntp/lmtp2nntp.debug",
append=0, perm=0640) }'
+
+# raw debug operation only
+#l2spec 'debug: fd(fd=2)'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lmtp2nntp/lmtp2nntp.spec
============================================================================
$ cvs diff -u -r1.33.2.1.2.1 -r1.33.2.1.2.2 lmtp2nntp.spec
--- openpkg-src/lmtp2nntp/lmtp2nntp.spec 18 Jan 2003 17:20:43 -0000
1.33.2.1.2.1
+++ openpkg-src/lmtp2nntp/lmtp2nntp.spec 17 Feb 2003 12:59:48 -0000
1.33.2.1.2.2
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: Mail
License: GPL
-Version: 1.2a6
-Release: 1.2.0
+Version: 1.2.0
+Release: 1.2.1
# list of sources
Source0: ftp://ftp.ossp.org/pkg/tool/lmtp2nntp/lmtp2nntp-%{version}.tar.gz
@@ -84,7 +84,11 @@
%{SOURCE rc.lmtp2nntp} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
%{l_shtool} install -c -m 644 \
-e 's;@l_prefix@;%{l_prefix};g' \
- %{SOURCE lmtp2nntp.conf}
$RPM_BUILD_ROOT%{l_prefix}/etc/lmtp2nntp/lmtp2nntp.conf
+ -e 's;@l_musr@;%{l_musr};g' \
+ -e 's;@l_mgrp@;%{l_mgrp};g' \
+ %{SOURCE lmtp2nntp.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/lmtp2nntp/
+ %{l_shtool} install -c -m 644 \
+ INSTALL $RPM_BUILD_ROOT%{l_prefix}/etc/lmtp2nntp/lmtp2nntp.info
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%config %{l_prefix}/etc/lmtp2nntp/*'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lmtp2nntp/rc.lmtp2nntp
============================================================================
$ cvs diff -u -r1.5 -r1.5.4.1 rc.lmtp2nntp
--- openpkg-src/lmtp2nntp/rc.lmtp2nntp 17 Dec 2002 13:23:55 -0000 1.5
+++ openpkg-src/lmtp2nntp/rc.lmtp2nntp 17 Feb 2003 12:59:48 -0000 1.5.4.1
@@ -6,6 +6,7 @@
%config
# public (user-adjustable) options
lmtp2nntp_enable="yes"
+ lmtp2nntp_nicelevel="20"
lmtp2nntp_log_level="info"
lmtp2nntp_log_prolog="true"
lmtp2nntp_log_epilog="true"
@@ -19,13 +20,15 @@
lmtp2nntp_run_cfg="@l_prefix@/etc/lmtp2nntp/lmtp2nntp.conf"
# determine start command
- cmd_start="$lmtp2nntp_run_cmd"
- cmd_start="$cmd_start -D"
+ cmd_start="nice -n $lmtp2nntp_nicelevel"
+ cmd_start="$cmd_start $lmtp2nntp_run_cmd"
+ cmd_start="$cmd_start --daemonize"
cmd_start="$cmd_start --include=$lmtp2nntp_run_cfg"
# determine stop command
- cmd_stop="$lmtp2nntp_run_cmd"
- cmd_stop="$cmd_stop -K"
+ cmd_stop=""
+ cmd_stop="$cmd_stop $lmtp2nntp_run_cmd"
+ cmd_stop="$cmd_stop --kill"
cmd_stop="$cmd_stop --include=$lmtp2nntp_run_cfg"
%start -p 200 -u root
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
