upgrading package: lmtp2nntp 1.1.1 -> 1.2a5

lmtp2nntp/lmtp2nntp.conf

@@ -2,11 +2,33 @@
 ##  lmtp2nntp.conf
 ##
 
-bind          @l_prefix@/var/lmtp2nntp/lmtp2nntp.socket
-pidfile       @l_prefix@/var/lmtp2nntp/lmtp2nntp.pid
-l2spec        file(path="@l_prefix@/var/lmtp2nntp/lmtp2nntp.log")
-destination   news
-groupmode     envelope
-operationmode post
-newsgroup     *
+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=432) \
+                '
+#user            @l_musr@ #FIXME
+destination     news
+groupmode       envelope
+operationmode   post
+newsgroup       *
+
+        ### CRUCIAL GATEWAY HEADER REWRITE RULES ###
+
+# remove headers
+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'
+headerrule '550::X-Gateway:lmtp2nntp'
 

lmtp2nntp/lmtp2nntp.spec

@@ -32,12 +32,13 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [REL]
 Group:        Mail
 License:      GPL
-Version:      1.1.1
-Release:      20020315
+Version:      1.2a5
+Release:      20020612
 
 #   list of sources
 Source0:      ftp://ftp.ossp.org/pkg/tool/lmtp2nntp/lmtp2nntp-%{version}.tar.gz
 Source1:      rc.lmtp2nntp
+Source2:      lmtp2nntp.conf
 
 #   build information
 Prefix:       %{l_prefix}
@@ -83,7 +84,7 @@ AutoReqProv:  no
         %{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.conf
+        %{SOURCE lmtp2nntp.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/lmtp2nntp/lmtp2nntp.conf
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%config %{l_prefix}/etc/lmtp2nntp/*'

lmtp2nntp/rc.lmtp2nntp

@@ -7,22 +7,6 @@
     #   public (user-adjustable) options
     lmtp2nntp_enable="yes"
 
-    lmtp2nntp_nodename=""
-    lmtp2nntp_flags=""
-
-    lmtp2nntp_lmtp_bind="@l_prefix@/var/lmtp2nntp/lmtp2nntp.socket"
-    lmtp2nntp_lmtp_groupmode="envelope"
-    lmtp2nntp_lmtp_acl_connect=""
-    lmtp2nntp_lmtp_acl_mailfrom=""
-    lmtp2nntp_lmtp_acl_mailmaxsize="8388608"
-    lmtp2nntp_lmtp_acl_newsgroups="*"
-    lmtp2nntp_lmtp_timeouts="lmtp:accept=0,lmtp:read=10,lmtp:write=10"
-
-    lmtp2nntp_nntp_bind=""
-    lmtp2nntp_nntp_servers="news"
-    lmtp2nntp_nntp_operationmode="post"
-    lmtp2nntp_nntp_timeouts="nntp:connect=360,nntp:read=60,nntp:write=60"
-
     lmtp2nntp_log_level="info"
     lmtp2nntp_log_prolog="true"
     lmtp2nntp_log_epilog="true"
@@ -33,44 +17,17 @@
 %common
     #   private (not-adjustable) options
     lmtp2nntp_run_cmd="@l_prefix@/sbin/lmtp2nntp"
-    lmtp2nntp_run_uid="@l_musr@"
-    lmtp2nntp_log_file="@l_prefix@/var/lmtp2nntp/lmtp2nntp.log"
-    lmtp2nntp_pid_file="@l_prefix@/var/lmtp2nntp/lmtp2nntp.pid"
+    lmtp2nntp_run_cfg="@l_prefix@/etc/lmtp2nntp/lmtp2nntp.conf"
 
     #   determine start command
     cmd_start="$lmtp2nntp_run_cmd"
-    cmd_start="$cmd_start -P $lmtp2nntp_pid_file"
-    cmd_start="$cmd_start -u $lmtp2nntp_run_uid"
     cmd_start="$cmd_start -D"
-    if [ ".$lmtp2nntp_nodename" != . ]; then
-        cmd_start="$cmd_start -n \"$lmtp2nntp_nodename\""
-    fi
-    if [ ".$lmtp2nntp_lmtp_acl_connect" != . ]; then
-        cmd_start="$cmd_start -a \"$lmtp2nntp_lmtp_acl_connect\""
-    fi
-    if [ ".$lmtp2nntp_lmtp_acl_mailfrom" != . ]; then
-        cmd_start="$cmd_start -m \"$lmtp2nntp_lmtp_acl_mailfrom\""
-    fi
-    cmd_start="$cmd_start -b \"$lmtp2nntp_lmtp_bind\""
-    cmd_start="$cmd_start -g \"$lmtp2nntp_lmtp_groupmode\""
-    cmd_start="$cmd_start -s \"$lmtp2nntp_lmtp_acl_mailmaxsize\""
-    cmd_start="$cmd_start -t \"$lmtp2nntp_lmtp_timeouts\""
-    if [ ".$lmtp2nntp_nntp_bind" != . ]; then
-        cmd_start="$cmd_start -c \"$lmtp2nntp_nntp_bind\""
-    fi
-    cmd_start="$cmd_start -d \"$lmtp2nntp_nntp_servers\""
-    cmd_start="$cmd_start -o \"$lmtp2nntp_nntp_operationmode\""
-    cmd_start="$cmd_start -t \"$lmtp2nntp_nntp_timeouts\""
-    cmd_start="$cmd_start -l \"$lmtp2nntp_log_level:$lmtp2nntp_log_file\""
-    if [ ".$lmtp2nntp_flags" != . ]; then
-        cmd_start="$cmd_start $lmtp2nntp_flags"
-    fi
-    cmd_start="$cmd_start \"$lmtp2nntp_lmtp_acl_newsgroups\""
+    cmd_start="$cmd_start --include=$lmtp2nntp_run_cfg"
 
     #   determine stop command
     cmd_stop="$lmtp2nntp_run_cmd"
-    cmd_stop="$cmd_stop -P $lmtp2nntp_pid_file"
     cmd_stop="$cmd_stop -K"
+    cmd_stop="$cmd_stop --include=$lmtp2nntp_run_cfg"
 
 %start -p 200 -u root
     opServiceEnabled lmtp2nntp || exit 0