OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 06-Feb-2003 16:48:06
Branch: HEAD Handle: 2003020615480005
Modified files:
openpkg-re/vcheck vc.lmtp2nntp
openpkg-src/lmtp2nntp lmtp2nntp.conf lmtp2nntp.spec rc.lmtp2nntp
openpkg-web news.txt
Log:
upgrading package: lmtp2nntp 1.2a7 -> 1.2a8
Summary:
Revision Changes Path
1.3 +2 -2 openpkg-re/vcheck/vc.lmtp2nntp
1.4 +83 -31 openpkg-src/lmtp2nntp/lmtp2nntp.conf
1.35 +7 -3 openpkg-src/lmtp2nntp/lmtp2nntp.spec
1.6 +2 -2 openpkg-src/lmtp2nntp/rc.lmtp2nntp
1.3211 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.lmtp2nntp
============================================================================
$ cvs diff -u -r1.2 -r1.3 vc.lmtp2nntp
--- openpkg-re/vcheck/vc.lmtp2nntp 30 Mar 2002 09:17:47 -0000 1.2
+++ openpkg-re/vcheck/vc.lmtp2nntp 6 Feb 2003 15:48:00 -0000 1.3
@@ -2,8 +2,8 @@
}
prog lmtp2nntp = {
- version = 1.1.1
+ version = 1.2a8
url = ftp://ftp.ossp.org/pkg/tool/lmtp2nntp/
- regex = lmtp2nntp-(\d+\.\d+\.\d+)\.tar\.gz
+ regex = lmtp2nntp-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lmtp2nntp/lmtp2nntp.conf
============================================================================
$ cvs diff -u -r1.3 -r1.4 lmtp2nntp.conf
--- openpkg-src/lmtp2nntp/lmtp2nntp.conf 17 Dec 2002 13:23:55 -0000 1.3
+++ openpkg-src/lmtp2nntp/lmtp2nntp.conf 6 Feb 2003 15:48:05 -0000 1.4
@@ -1,35 +1,87 @@
##
-## 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 10
+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 "Cc: j\.doe@example\.org"
+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
+headerrule '540::Path:lmtp2nntp!not-for-mail'
+
+# append a header
+headerrule '610::X-Gateway:lmtp2nntp'
+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.34 -r1.35 lmtp2nntp.spec
--- openpkg-src/lmtp2nntp/lmtp2nntp.spec 4 Feb 2003 15:15:42 -0000 1.34
+++ openpkg-src/lmtp2nntp/lmtp2nntp.spec 6 Feb 2003 15:48:05 -0000 1.35
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: Mail
License: GPL
-Version: 1.2a7
-Release: 20030204
+Version: 1.2a8
+Release: 20030206
# 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.6 rc.lmtp2nntp
--- openpkg-src/lmtp2nntp/rc.lmtp2nntp 17 Dec 2002 13:23:55 -0000 1.5
+++ openpkg-src/lmtp2nntp/rc.lmtp2nntp 6 Feb 2003 15:48:05 -0000 1.6
@@ -20,12 +20,12 @@
# determine start command
cmd_start="$lmtp2nntp_run_cmd"
- cmd_start="$cmd_start -D"
+ 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 --kill"
cmd_stop="$cmd_stop --include=$lmtp2nntp_run_cfg"
%start -p 200 -u root
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3210 -r1.3211 news.txt
--- openpkg-web/news.txt 6 Feb 2003 15:41:56 -0000 1.3210
+++ openpkg-web/news.txt 6 Feb 2003 15:48:02 -0000 1.3211
@@ -1,3 +1,4 @@
+06-Feb-2003: Upgraded package: P<lmtp2nntp-1.2a8-20030206>
06-Feb-2003: Upgraded package: P<iozone-3.156-20030206>
06-Feb-2003: New package: P<sio-0.9.0-20030206>
06-Feb-2003: Upgraded package: P<sam2p-0.42-20030206>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
