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

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-re/vcheck/ vc.apache openpkg-src/apache/ apache...
From:       "Christoph Schug" <cs () openpkg ! org>
Date:       2003-12-29 8:12:05
[Download RAW message or body]

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

  Server: cvs.openpkg.org                  Name:   Christoph Schug
  Root:   /e/openpkg/cvs                   Email:  cs@openpkg.org
  Module: openpkg-src openpkg-web openpkg$ Date:   29-Dec-2003 09:12:05
  Branch: HEAD                             Handle: 2003122908120202

  Modified files:
    openpkg-re/vcheck       vc.apache
    openpkg-src/apache      apache.spec
    openpkg-web             news.txt

  Log:
    added support for mod_auth_mysql

  Summary:
    Revision    Changes     Path
    1.43        +5  -0      openpkg-re/vcheck/vc.apache
    1.189       +26 -1      openpkg-src/apache/apache.spec
    1.7906      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-re/vcheck/vc.apache
  ============================================================================
  $ cvs diff -u -r1.42 -r1.43 vc.apache
  --- openpkg-re/vcheck/vc.apache	24 Nov 2003 08:45:36 -0000	1.42
  +++ openpkg-re/vcheck/vc.apache	29 Dec 2003 08:12:02 -0000	1.43
  @@ -11,6 +11,11 @@
     url       = http://prdownloads.sourceforge.net/accessreferer/
     regex     = mod_access_referer-(__VER__)\.tar\.gz
   }
  +prog apache:mod_auth_mysql = {
  +  version   = 20030510
  +  url       = http://sourceforge.net/projects/modauthmysql/
  +  regex     = release_id=\d+[^\d]+(\d+)
  +}
   prog apache:mod_dav = {
     version   = 1.0.3-1.3.6
     url       = http://www.webdav.org/mod_dav/
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.spec
  ============================================================================
  $ cvs diff -u -r1.188 -r1.189 apache.spec
  --- openpkg-src/apache/apache.spec	17 Dec 2003 16:01:09 -0000	1.188
  +++ openpkg-src/apache/apache.spec	29 Dec 2003 08:12:04 -0000	1.189
  @@ -43,6 +43,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_mysql     20030510
   %define       V_mod_gzip           1.3.19.1a
   %define       V_mod_fastcgi        2.4.2
   %define       V_mod_throttle       312
  @@ -61,7 +62,7 @@
   Group:        Web
   License:      ASF
   Version:      %{V_apache}
  -Release:      20031217
  +Release:      20031229
   
   #   package options (suexec related)
   %option       with_suexec               yes
  @@ -84,6 +85,7 @@
   
   #   package options (additionally used Apache modules; you have to know what you do)
   %option       with_mod_auth_ldap        no
  +%option       with_mod_auth_mysql       no
   %option       with_mod_auth_pam         no
   %option       with_mod_gzip             no
   %option       with_mod_fastcgi          no
  @@ -202,6 +204,7 @@
   Source14:     http://www.php.net/distributions/php-%{V_mod_php3}.tar.gz
   Source15:     http://www.muquit.com/muquit/software/mod_auth_ldap/mod_auth_ldap.tar.gz
   Source16:     http://www.suphp.org/download/suphp-%{V_suphp}.tar.gz
  +Source17:     http://osdn.dl.sourceforge.net/sourceforge/modauthmysql/mod_auth_mysql.tgz
   Source20:     apache.conf
   Source21:     apache.base
   Source22:     apache.vhost
  @@ -352,6 +355,10 @@
   BuildPreReq:  openldap, openssl
   PreReq:       openldap, openssl
   %endif
  +%if "%{with_mod_auth_mysql}" == "yes"
  +BuildPreReq:  mysql
  +PreReq:       mysql
  +%endif
   %if "%{with_mod_auth_pam}" == "yes"
   BuildPreReq:  PAM
   PreReq:       PAM
  @@ -429,6 +436,9 @@
   %if "%{with_mod_auth_ldap}" == "yes"
       %setup15 -q -T -D -a 15
   %endif
  +%if "%{with_mod_auth_mysql}" == "yes"
  +    %setup17 -q -T -D -a 17
  +%endif
   %if "%{with_suphp}" == "yes"
       %setup16 -q -T -D -a 16
       %patch1 -p0
  @@ -792,6 +802,13 @@
       ) || exit $?
   %endif
   
  +    #   optionally prepare mod_auth_mysql
  +%if "%{with_mod_auth_mysql}" == "yes"
  +    %{l_shtool} install -c -m 644 \
  +        -e 's;^[ 	]*MYSQL_LIB=.*$;;' \
  +        mod_auth_mysql/mod_auth_mysql.c \
  +        apache_%{V_apache}/src/modules/extra/
  +%endif
       #   optionally prepare mod_gzip
   %if "%{with_mod_gzip}" == "yes"
       cp %{SOURCE mod_gzip.c} apache_%{V_apache}/src/modules/extra/
  @@ -880,6 +897,11 @@
                 ;;
         esac
   %endif
  +%if "%{with_mod_auth_mysql}" == "yes"
  +      cflags="$cflags %{l_cppflags} -DAPACHE1"
  +      ldflags="$ldflags %{l_ldflags mysql}"
  +      libs="$libs -lmysqlclient"
  +%endif
   %if "%{with_gdbm_ndbm}" == "yes"
         cflags="$cflags %{l_cppflags}"
         ldflags="$ldflags %{l_ldflags}"
  @@ -953,6 +975,9 @@
   %endif
   %if "%{with_mod_auth_ldap}" == "yes"
             --activate-module=src/modules/extra/mod_auth_ldap.c \
  +%endif
  +%if "%{with_mod_auth_mysql}" == "yes"
  +          --activate-module=src/modules/extra/mod_auth_mysql.c \
   %endif
   %if "%{with_mod_gzip}" == "yes"
             --activate-module=src/modules/extra/mod_gzip.o \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7905 -r1.7906 news.txt
  --- openpkg-web/news.txt	28 Dec 2003 12:47:18 -0000	1.7905
  +++ openpkg-web/news.txt	29 Dec 2003 08:12:02 -0000	1.7906
  @@ -1,3 +1,4 @@
  +29-Dec-2003: Upgraded package: P<apache-1.3.29-20031229>
   28-Dec-2003: Upgraded package: P<xine-ui-0.9.23-20031228>
   28-Dec-2003: Upgraded package: P<wine-20031118-20031228>
   28-Dec-2003: Upgraded package: P<abiword-2.1.0-20031228>
  @@ .
______________________________________________________________________
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]