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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  r...@openpkg.org
  Module: openpkg-src                      Date:   04-Apr-2009 23:23:27
  Branch: HEAD                             Handle: 2009040422232700

  Modified files:
    openpkg-src/apache-openid
                            apache-openid.conf apache-openid.patch
                            apache-openid.spec

  Log:
    upgrading package: apache-openid 0.4 -> 20090404

  Summary:
    Revision    Changes     Path
    1.3         +11 -0      openpkg-src/apache-openid/apache-openid.conf
    1.2         +12 -7      openpkg-src/apache-openid/apache-openid.patch
    1.4         +6  -5      openpkg-src/apache-openid/apache-openid.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache-openid/apache-openid.conf
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 apache-openid.conf
  --- openpkg-src/apache-openid/apache-openid.conf      4 Jul 2008 16:23:36 
-0000       1.2
  +++ openpkg-src/apache-openid/apache-openid.conf      4 Apr 2009 21:23:27 
-0000       1.3
  @@ -6,5 +6,16 @@
   
   <Location />
       AuthOpenIDDBLocation       
@l_prefix@/var/apache-openid/mod_auth_openid.db
  +
  +    AuthOpenIDUseCookie        on
  +    AuthOpenIDCookieName       openid_sid
  +    AuthOpenIDCookieLifespan   3600
  +
  +    #AuthOpenIDTrusted         ^http://example.com/openid$ 
^http://example.org/openid$
  +    #AuthOpenIDTrustRoot       http://localhost
  +
  +    #AuthOpenIDLoginPage       /login.html
  +    #AuthOpenIDServerName      http://localhost
  +    #AuthOpenIDUserProgram     /path/to/authorization/program
   </Location>
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/apache-openid/apache-openid.patch
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 apache-openid.patch
  --- openpkg-src/apache-openid/apache-openid.patch     4 Jul 2008 16:23:36 
-0000       1.1
  +++ openpkg-src/apache-openid/apache-openid.patch     4 Apr 2009 21:23:27 
-0000       1.2
  @@ -1,12 +1,17 @@
  -Index: Makefile.in
  ---- Makefile.in.orig 2008-07-03 19:31:07 +0200
  -+++ Makefile.in      2008-07-04 18:10:37 +0200
  -@@ -492,7 +492,7 @@
  +Index: Makefile.am
  +--- Makefile.am.orig 2009-04-04 19:42:40 +0200
  ++++ Makefile.am      2009-04-04 23:03:35 +0200
  +@@ -22,4 +22,4 @@
    
    mod_auth_openid.la: libmodauthopenid.la
        ${APXS} -c -o $@ $< ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${OPKELE_LIBS} \
   -                        ${SQLITE3_CFLAGS} ${PCRE_LIBS} ${CURL_LIBS}
  +\ No newline at end of file
   +                        ${SQLITE3_CFLAGS} ${PCRE_LIBS} ${CURL_LIBS} ${LIBS}
  - # Tell versions [3.59,3.63) of GNU make to not export all variables.
  - # Otherwise a system limit (for SysV at least) may be exceeded.
  - .NOEXPORT:
  +Index: autogen.sh
  +--- autogen.sh.orig  2009-04-04 19:42:40 +0200
  ++++ autogen.sh       2009-04-04 23:04:21 +0200
  +@@ -1,2 +1,2 @@
  + #! /bin/sh
  +-libtoolize -f -c && aclocal -I ./acinclude.d && autoheader && automake -ac 
&& autoconf && ./configure "$@"
  ++libtoolize -f -c && aclocal -I ./acinclude.d && autoheader && automake -ac 
&& autoconf
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/apache-openid/apache-openid.spec
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 apache-openid.spec
  --- openpkg-src/apache-openid/apache-openid.spec      23 Feb 2009 21:20:08 
-0000      1.3
  +++ openpkg-src/apache-openid/apache-openid.spec      4 Apr 2009 21:23:27 
-0000       1.4
  @@ -31,18 +31,18 @@
   Class:        EVAL
   Group:        Web
   License:      Open Source
  -Version:      0.4
  -Release:      20090223
  +Version:      20090404
  +Release:      20090404
   
   #   list of sources
  -Source0:      
http://butterfat.net/releases/mod_auth_openid/mod_auth_openid-%{version}.tar.gz
  +Source0:      
ftp://ftp.openpkg.org/sources/CPY/apache-openid/mod_auth_openid-%{version}.tar.gz
   Source1:      apache-openid.conf
   Patch0:       apache-openid.patch
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20060823, apache, make, pkgconfig
  +BuildPreReq:  OpenPKG, openpkg >= 20060823, apache, autoconf, libtool, make, 
pkgconfig
   PreReq:       OpenPKG, openpkg >= 20060823, apache
   BuildPreReq:  libopkele, sqlite, pcre, curl, tidy
   PreReq:       libopkele, sqlite, pcre, curl, tidy
  @@ -60,10 +60,11 @@
       }
   
   %prep
  -    %setup -q -n mod_auth_openid-%{version}
  +    %setup -q -n mod_auth_openid
       %patch -p0
   
   %build
  +    ./autogen.sh >/dev/null 2>&1
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
       CPPFLAGS="%{l_cppflags}" \
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to