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                      Date:   06-Feb-2003 12:26:57
  Branch: HEAD                             Handle: 2003020611265600

  Added files:
    openpkg-src/apache      apache.pl
  Modified files:
    openpkg-src/apache      apache.base apache.spec

  Log:
    add more mod_perl support

  Summary:
    Revision    Changes     Path
    1.6         +15 -0      openpkg-src/apache/apache.base
    1.1         +16 -0      openpkg-src/apache/apache.pl
    1.111       +7  -2      openpkg-src/apache/apache.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.base
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 apache.base
  --- openpkg-src/apache/apache.base    29 Nov 2002 12:55:13 -0000      1.5
  +++ openpkg-src/apache/apache.base    6 Feb 2003 11:26:56 -0000       1.6
  @@ -215,6 +215,21 @@
       </Directory>
   </IfModule>
   
  +#   mod_perl support
  +<IfModule mod_perl.c>
  +    #   default initializations
  +    PerlRequire "@l_prefix@/etc/apache/apache.pl"
  +
  +    #   activate standard Perl CGI support
  +    PerlModule Apache::Registry
  +    PerlModule Apache::PerlRun
  +    <Files ~ "\.pl$">
  +        SetHandler  perl-script
  +        PerlHandler Apache::PerlRun
  +        Options     +ExecCGI
  +    </Files>
  +</IfModule>
  +
   #   PHP4 support
   <IfModule mod_php4.c>
       AddType application/x-httpd-php .php
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.pl
  ============================================================================
  $ cvs diff -u -r0 -r1.1 apache.pl
  --- /dev/null 2003-02-06 12:26:56.000000000 +0100
  +++ apache.pl 2003-02-06 12:26:56.000000000 +0100
  @@ -0,0 +1,16 @@
  +##
  +##  apache.pl -- Apache Perl/mod_perl Startup Script
  +##
  +
  +$ENV{MOD_PERL} or die "you are not running mod_perl";
  +
  +#   strict run-time environment
  +use strict;
  +
  +#   extended module search path
  +use lib qw();
  +
  +#   detailed error messages
  +use Carp();
  +$SIG{__WARN__} = \&Carp::cluck;
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.spec
  ============================================================================
  $ cvs diff -u -r1.110 -r1.111 apache.spec
  --- openpkg-src/apache/apache.spec    6 Feb 2003 09:53:56 -0000       1.110
  +++ openpkg-src/apache/apache.spec    6 Feb 2003 11:26:56 -0000       1.111
  @@ -165,7 +165,8 @@
   Source20:     apache.conf
   Source21:     apache.base
   Source22:     apache.vhost
  -Source23:     rc.apache
  +Source23:     apache.pl
  +Source24:     rc.apache
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -755,9 +756,13 @@
         rm -rf $RPM_BUILD_ROOT%{l_prefix}/cgi/test-cgi
       )
   
  -    #   optionally cleanup for mod_perl
   %if "%{with_mod_perl}" == "yes"
  +    #   cleanup for mod_perl
       rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/perl
  +    #   provide mod_perl init script
  +    %{l_shtool} install -c -m 644 \
  +        %{SOURCE apache.pl} \
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/apache/
   %endif
   
       #   optionally make PHP happy
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to