[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/milter-dk/ milter-dk.spec rc.milter-dk
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2006-12-30 12:38:54
Message-ID: 20061230123854.3474D1B5047 () master ! openpkg ! org
[Download RAW message or body]

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src                      Date:   30-Dec-2006 13:38:53
  Branch: HEAD                             Handle: 2006123012385300

  Modified files:
    openpkg-src/milter-dk   milter-dk.spec rc.milter-dk

  Log:
    fix socket ownership and permissions again to allow Postfix to talk to
    this MILTER

  Summary:
    Revision    Changes     Path
    1.2         +2  -2      openpkg-src/milter-dk/milter-dk.spec
    1.4         +13 -11     openpkg-src/milter-dk/rc.milter-dk
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/milter-dk/milter-dk.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 milter-dk.spec
  --- openpkg-src/milter-dk/milter-dk.spec	30 Dec 2006 10:03:55 -0000	1.1
  +++ openpkg-src/milter-dk/milter-dk.spec	30 Dec 2006 12:38:53 -0000	1.2
  @@ -102,8 +102,8 @@
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%config %{l_prefix}/etc/fsl/*' \
  -        '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/milter-dk/*' \
  -        '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/milter-dk'
  +        '%attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/milter-dk/*' \
  +        '%attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/milter-dk'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/milter-dk/rc.milter-dk
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 rc.milter-dk
  --- openpkg-src/milter-dk/rc.milter-dk	30 Dec 2006 11:22:11 -0000	1.3
  +++ openpkg-src/milter-dk/rc.milter-dk	30 Dec 2006 12:38:53 -0000	1.4
  @@ -22,7 +22,7 @@
           [ -f $milter_dk_pidfile ] && kill -$1 `cat $milter_dk_pidfile`
       }
   
  -%status -u @l_rusr@ -o
  +%status -u @l_susr@ -o
       milter_dk_usable="unknown"
       milter_dk_active="no"
       rcService milter-dk enable yes && \
  @@ -31,18 +31,20 @@
       echo "milter_dk_usable=\"$milter_dk_usable\""
       echo "milter_dk_active=\"$milter_dk_active\""
   
  -%start -u @l_rusr@
  +%start -u @l_susr@
       rcService milter-dk enable yes || exit 0
       rcService milter-dk active yes && exit 0
       rm -f $milter_dk_socket >/dev/null 2>&2 || true
  -    export DK_TMPDIR=$milter_dk_tmpdir
  -    @l_prefix@/sbin/dk-filter \
  -         -l -u $milter_dk_user \
  -         -p local:$milter_dk_socket \
  -         -P $milter_dk_pidfile \
  -         $milter_dk_flags
  +    ( umask 002
  +      export DK_TMPDIR="$milter_dk_tmpdir"
  +      @l_prefix@/sbin/dk-filter \
  +           -l -u $milter_dk_user \
  +           -p local:$milter_dk_socket \
  +           -P $milter_dk_pidfile \
  +           $milter_dk_flags
  +    ) || exit $?
   
  -%stop -u @l_rusr@
  +%stop -u @l_susr@
       rcService milter-dk enable yes || exit 0
       rcService milter-dk active no  && exit 0
       milter_dk_signal TERM
  @@ -50,12 +52,12 @@
       rm -f $milter_dk_pidfile >/dev/null 2>&1 || true
       rm -f $milter_dk_socket  >/dev/null 2>&1 || true
   
  -%restart -u @l_rusr@
  +%restart -u @l_susr@
       rcService milter-dk enable yes || exit 0
       rcService milter-dk active no  && exit 0
       rc milter-dk stop start
   
  -%daily -u @l_rusr@
  +%daily -u @l_susr@
       rcService milter-dk enable yes || exit 0
       shtool rotate -f \
           -n $milter_dk_numfiles -s $milter_dk_minsize -d \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

[prev in list] [next in list] [prev in thread] [next in thread]