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

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   02-Apr-2003 15:05:47
  Branch: HEAD                             Handle: 2003040214054501

  Added files:
    openpkg-src/rt          rt.patch
  Modified files:
    openpkg-src/rt          rt.spec rtapache.conf
    openpkg-web             news.txt

  Log:
    fix CanonicalizeEmailAddress, configure MTA aliases, make apache
    listen on localhost only

  Summary:
    Revision    Changes     Path
    1.1         +11 -0      openpkg-src/rt/rt.patch
    1.37        +31 -1      openpkg-src/rt/rt.spec
    1.5         +1  -0      openpkg-src/rt/rtapache.conf
    1.3927      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/rt/rt.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1 rt.patch
  --- /dev/null 2003-04-02 15:05:47.000000000 +0200
  +++ rt.patch  2003-04-02 15:05:47.000000000 +0200
  @@ -0,0 +1,11 @@
  +--- lib/RT/User_Overlay.pm.dist      Wed Apr  2 14:44:58 2003
  ++++ lib/RT/User_Overlay.pm   Wed Apr  2 14:45:17 2003
  +@@ -541,7 +541,7 @@
  +     # coming from a subdomain as coming from second level domain
  +     # foo.com
  +     if ($RT::CanonicalizeEmailAddressMatch && $RT::CanonicalizeEmailAddressReplace 
) {
  +-        $email =~ 
s/\$RT::CanonicalizeEmailAddressMatch/$RT::CanonicalizeEmailAddressReplace/gi;
  ++        $email =~ 
s/$RT::CanonicalizeEmailAddressMatch/$RT::CanonicalizeEmailAddressReplace/gi;
  +     }
  +     return ($email);
  + }
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/rt/rt.spec
  ============================================================================
  $ cvs diff -u -r1.36 -r1.37 rt.spec
  --- openpkg-src/rt/rt.spec    1 Apr 2003 11:26:54 -0000       1.36
  +++ openpkg-src/rt/rt.spec    2 Apr 2003 13:05:46 -0000       1.37
  @@ -47,7 +47,7 @@
   Group:        Database
   License:      GPL
   Version:      %{V_here}
  -Release:      20030401
  +Release:      20030402
   
   #   list of sources
   Source0:      
http://www.cpan.org/modules/by-module/Log/Log-Dispatch-%{V_log_dispatch}.tar.gz
  @@ -69,6 +69,7 @@
   Source16:     rtapache.conf
   Source17:     config.layout
   Source18:     rt-mailgate.sh
  +Patch0:       rt.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -105,6 +106,9 @@
       %setup -q -T -D -a 8
       %setup -q -T -D -a 9
       %setup -q -T -D -a 10
  +    ( cd rt-%{V_real}
  +      %patch0 -p0
  +    ) || exit $?
       %{l_shtool} install -c -m 0644 \
           -e 's;@l_prefix@;%{l_prefix};' \
           %{SOURCE config.layout} rt-%{V_real}/.
  @@ -390,6 +394,20 @@
       rm -rf $RPM_BUILD_ROOT
   
   %post
  +    if [ $1 -eq 1 ]; then
  +        #   activate in MTA configuration
  +        mta_aliases_file=`%{l_prefix}/etc/rc --query mta_aliases_file`
  +        mta_aliases_update=`%{l_prefix}/etc/rc --query mta_aliases_update`
  +        if [ ".$mta_aliases_file" != . ]; then
  +            (
  +              echo "rt:              \"|%{l_prefix}/bin/rt-mailgate --action 
correspond --queue general --url http://127.0.0.1:8380/\"";
  +              echo "rt-comment:      \"|%{l_prefix}/bin/rt-mailgate --action 
comment --queue general --url http://127.0.0.1:8380/\"";
  +            ) | %{l_rpmtool} config -a -i "%{l_prefix}:%{name}" $mta_aliases_file
  +        fi
  +        if [ ".$mta_aliases_update" != . ]; then
  +            eval $mta_aliases_update
  +        fi
  +    fi
       ( echo "To complete installation of the RT package please check the"
         echo "file '$RPM_INSTALL_PREFIX/etc/rt/RT_SiteConfig.pm'. In particular"
         echo "you have to assign a password to the RT database user."
  @@ -406,7 +424,19 @@
   
   %preun
       if [ $1 -eq 0 ]; then
  +        #   stop perhaps still running server
           $RPM_INSTALL_PREFIX/etc/rc rt stop
  +
  +        #   deactivate in MTA configuration
  +        mta_aliases_file=`%{l_prefix}/etc/rc --query mta_aliases_file`
  +        mta_aliases_update=`%{l_prefix}/etc/rc --query mta_aliases_update`
  +        if [ ".$mta_aliases_file" != . ]; then
  +            %{l_rpmtool} config -r -i "%{l_prefix}:%{name}" $mta_aliases_file
  +        fi
  +        if [ ".$mta_aliases_update" != . ]; then
  +            eval $mta_aliases_update
  +        fi
  +
           rm -f $RPM_INSTALL_PREFIX/var/rt/mason-session/*
           rm -rf $RPM_INSTALL_PREFIX/var/rt/mason-data/*/*
           rm -f $RPM_INSTALL_PREFIX/var/rt/log/*
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/rt/rtapache.conf
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 rtapache.conf
  --- openpkg-src/rt/rtapache.conf      27 Mar 2003 11:07:48 -0000      1.4
  +++ openpkg-src/rt/rtapache.conf      2 Apr 2003 13:05:46 -0000       1.5
  @@ -11,6 +11,7 @@
   User                   @l_rusr@
   Group                  @l_rgrp@
   Port                   8380
  +Listen                 127.0.0.1:8380
   
   #   runtime files
   PidFile           @l_prefix@/var/rt/run/apache.pid
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.3926 -r1.3927 news.txt
  --- openpkg-web/news.txt      2 Apr 2003 12:39:26 -0000       1.3926
  +++ openpkg-web/news.txt      2 Apr 2003 13:05:45 -0000       1.3927
  @@ -1,3 +1,4 @@
  +02-Apr-2003: Upgraded package: P<rt-3.0.0-20030402>
   02-Apr-2003: Upgraded package: P<perl-xml-20030402-20030402>
   02-Apr-2003: Upgraded package: P<perl-www-20030402-20030402>
   02-Apr-2003: Upgraded package: P<webalizer-2.01.10-20030402>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to