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:   19-May-2004 17:32:04
  Branch: HEAD                             Handle: 2004051916320300

  Modified files:
    openpkg-src/apache      apache.spec

  Log:
    add mod_auth_radius and fix unpacking of mod_owa

  Summary:
    Revision    Changes     Path
    1.227       +40 -15     openpkg-src/apache/apache.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.spec
  ============================================================================
  $ cvs diff -u -r1.226 -r1.227 apache.spec
  --- openpkg-src/apache/apache.spec    12 May 2004 08:51:38 -0000      1.226
  +++ openpkg-src/apache/apache.spec    19 May 2004 15:32:03 -0000      1.227
  @@ -42,6 +42,7 @@
   %define       V_mod_macro          1.1.2
   %define       V_mod_auth_pam       1.1.1
   %define       V_mod_auth_ldap      2.4.2
  +%define       V_mod_auth_radius    1.5.7
   %define       V_mod_auth_mysql     20030510
   %define       V_mod_gzip           1.3.19.1a
   %define       V_mod_fastcgi        2.4.2
  @@ -64,7 +65,7 @@
   Group:        Web
   License:      ASF
   Version:      %{V_apache}
  -Release:      20040512
  +Release:      20040519
   
   #   package options (suexec related)
   %option       with_suexec               yes
  @@ -86,6 +87,7 @@
   
   #   package options (additionally used Apache modules; you have to know what you do)
   %option       with_mod_auth_ldap        no
  +%option       with_mod_auth_radius      no
   %option       with_mod_auth_mysql       no
   %option       with_mod_auth_pam         no
   %option       with_mod_gzip             no
  @@ -189,17 +191,18 @@
   Source12:     http://www.klomp.org/mod_roaming/mod_roaming-%{V_mod_roaming}.tar.gz
   Source13:     
http://software.tangent.org/download/mod_relocate-%{V_mod_relocate}.tar.gz
   Source14:     
http://www.muquit.com/muquit/software/mod_auth_ldap/mod_auth_ldap.tar.gz
  -Source15:     http://www.suphp.org/download/suphp-%{V_suphp}.tar.gz
  +Source15:     
ftp://ftp.freeradius.org/pub/radius/mod_auth_radius-%{V_mod_auth_radius}.tar
   Source16:     
http://osdn.dl.sourceforge.net/sourceforge/modauthmysql/mod_auth_mysql.tgz
  -Source17:     
http://www.modsecurity.org/download/mod_security-%{V_mod_security}.tar.gz
  -Source18:     
http://www.nuclearelephant.com/projects/dosevasive/mod_dosevasive.%{V_mod_dosevasive}.tar.gz
  -Source19:     http://www.sharemation.com/~dmcmahon/unix_all.tgz
  -Source20:     apache.conf
  -Source21:     apache.base
  -Source22:     apache.vhost
  -Source23:     apache.pl
  -Source24:     rc.apache
  -Source25:     apache.sh
  +Source17:     http://www.suphp.org/download/suphp-%{V_suphp}.tar.gz
  +Source18:     
http://www.modsecurity.org/download/mod_security-%{V_mod_security}.tar.gz
  +Source19:     
http://www.nuclearelephant.com/projects/dosevasive/mod_dosevasive.%{V_mod_dosevasive}.tar.gz
  +Source20:     http://www.sharemation.com/~dmcmahon/unix_all.tgz
  +Source21:     apache.conf
  +Source22:     apache.base
  +Source23:     apache.vhost
  +Source24:     apache.pl
  +Source25:     rc.apache
  +Source26:     apache.sh
   Patch0:       apache.patch
   Patch1:       apache.patch.modowa
   
  @@ -383,6 +386,11 @@
           url       = http://sourceforge.net/projects/modauthmysql/
           regex     = release_id=\d+[^\d]+(\d+)
       }
  +    prog apache:mod_auth_radius = {
  +        version   = %{V_mod_auth_radius}
  +        url       = ftp://ftp.freeradius.org/pub/radius/
  +        regex     = mod_auth_radius-(__VER__)\.tar
  +    }
       prog apache:mod_dav = {
           version   = %{V_mod_dav}
           url       = http://www.webdav.org/mod_dav/
  @@ -502,21 +510,26 @@
   %if "%{with_mod_relocate}" == "yes"
       %setup -q -T -D -a 13
   %endif
  +%if "%{with_mod_auth_ldap}" == "yes"
       %setup -q -T -D -a 14
  -%if "%{with_suphp}" == "yes"
  +%endif
  +%if "%{with_mod_auth_radius}" == "yes"
       %setup -q -T -D -a 15
   %endif
   %if "%{with_mod_auth_mysql}" == "yes"
       %setup -q -T -D -a 16
   %endif
  -%if "%{with_mod_security}" == "yes"
  +%if "%{with_suphp}" == "yes"
       %setup -q -T -D -a 17
   %endif
  -%if "%{with_mod_dosevasive}" == "yes"
  +%if "%{with_mod_security}" == "yes"
       %setup -q -T -D -a 18
   %endif
  -%if "%{with_mod_owa}" == "yes"
  +%if "%{with_mod_dosevasive}" == "yes"
       %setup -q -T -D -a 19
  +%endif
  +%if "%{with_mod_owa}" == "yes"
  +    %setup -q -T -D -a 20
       sed <%{PATCH apache.patch.modowa} \
           -e "s;@l_oracle_cflags@;`%{l_prefix}/etc/rc --query oracle_cflags`;g" |\
           %{l_patch} -p0
  @@ -850,6 +863,15 @@
       ) || exit $?
   %endif
   
  +    #   optionally prepare mod_auth_radius
  +%if "%{with_mod_auth_radius}" == "yes"
  +    ( cd mod_auth_radius-%{V_mod_auth_radius}
  +      sed -e 's;#endif DEBUG_RADIUS;#endif;' \
  +          <mod_auth_radius.c \
  +          >../apache_%{V_apache}/src/modules/extra/mod_auth_radius.c
  +    ) || exit $?
  +%endif
  +
       #   optionally prepare mod_auth_mysql
   %if "%{with_mod_auth_mysql}" == "yes"
       %{l_shtool} install -c -m 644 \
  @@ -1055,6 +1077,9 @@
   %if "%{with_mod_auth_ldap}" == "yes"
             --activate-module=src/modules/extra/mod_auth_ldap.o \
   %endif
  +%if "%{with_mod_auth_radius}" == "yes"
  +          --activate-module=src/modules/extra/mod_auth_radius.c \
  +%endif
   %if "%{with_mod_auth_mysql}" == "yes"
             --activate-module=src/modules/extra/mod_auth_mysql.o \
   %endif
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to