OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Jul-2008 18:23:36
Branch: HEAD Handle: 2008070417233600
Added files:
openpkg-src/apache-openid
apache-openid.patch
Modified files:
openpkg-src/apache-openid
apache-openid.conf apache-openid.spec
Log:
finish packaging
Summary:
Revision Changes Path
1.2 +3 -10 openpkg-src/apache-openid/apache-openid.conf
1.1 +12 -0 openpkg-src/apache-openid/apache-openid.patch
1.2 +5 -5 openpkg-src/apache-openid/apache-openid.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache-openid/apache-openid.conf
============================================================================
$ cvs diff -u -r1.1 -r1.2 apache-openid.conf
--- openpkg-src/apache-openid/apache-openid.conf 4 Jul 2008 14:51:30
-0000 1.1
+++ openpkg-src/apache-openid/apache-openid.conf 4 Jul 2008 16:23:36
-0000 1.2
@@ -4,14 +4,7 @@
LoadModule authopenid_module @l_prefix@/libexec/apache/mod_auth_openid.so
-AuthOpenIDEnabled off
-AuthOpenIDDBLocation
@l_prefix@/var/apache-openid/mod_auth_openid.db
-AuthOpenIDTrusted ^http://openid\.example\.com/server$
^http://openid\.example\.org/$
-AuthOpenIDDistrusted ^http://hacker\.example\.com
^http://openid\.microsoft\.com$
-AuthOpenIDUseCookie off
-AuthOpenIDServerName http://example.com
-AuthOpenIDTrustRoot http://example.com
-AuthOpenIDCookieName example_openid_auth
-AuthOpenIDLoginPage /login.html
-AuthOpenIDCookieLifespan 3600
+<Location />
+ AuthOpenIDDBLocation
@l_prefix@/var/apache-openid/mod_auth_openid.db
+</Location>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache-openid/apache-openid.patch
============================================================================
$ cvs diff -u -r0 -r1.1 apache-openid.patch
--- /dev/null 2008-07-04 18:22:47 +0200
+++ apache-openid.patch 2008-07-04 18:23:36 +0200
@@ -0,0 +1,12 @@
+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 @@
+
+ mod_auth_openid.la: libmodauthopenid.la
+ ${APXS} -c -o $@ $< ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${OPKELE_LIBS} \
+- ${SQLITE3_CFLAGS} ${PCRE_LIBS} ${CURL_LIBS}
++ ${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:
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache-openid/apache-openid.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 apache-openid.spec
--- openpkg-src/apache-openid/apache-openid.spec 4 Jul 2008 14:51:30
-0000 1.1
+++ openpkg-src/apache-openid/apache-openid.spec 4 Jul 2008 16:23:36
-0000 1.2
@@ -21,8 +21,6 @@
## SUCH DAMAGE.
##
-# FIXME: rse: DSO still has obscure unresolved symbol "_ZNSsC1ERKSs"
-
# package information
Name: apache-openid
Summary: Apache Extension: OpenID Authentication
@@ -39,14 +37,15 @@
# list of sources
Source0:
http://butterfat.net/releases/mod_auth_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
PreReq: OpenPKG, openpkg >= 20060823, apache
-BuildPreReq: libopkele, sqlite, pcre, curl
-PreReq: libopkele, sqlite, pcre, curl
+BuildPreReq: libopkele, sqlite, pcre, curl, tidy
+PreReq: libopkele, sqlite, pcre, curl, tidy
AutoReq: no
AutoReqProv: no
@@ -62,13 +61,14 @@
%prep
%setup -q -n mod_auth_openid-%{version}
+ %patch -p0
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
- LIBS="-lopkele -lsqlite3 -lstdc++" \
+ LIBS="-lopkele -lsqlite3 -ltidy -lcrypto -lstdc++" \
AUTOCONF="true" \
ACLOCAL="true" \
AUTOHEADER="true" \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
