OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Apr-2004 14:07:49
Branch: HEAD Handle: 2004041413074900
Added files:
openpkg-src/apache apache.patch.modowa
Modified files:
openpkg-src/apache apache.spec
Log:
first cut for Oracle PL/SQL gateway support using mod_owa
Summary:
Revision Changes Path
1.1 +40 -0 openpkg-src/apache/apache.patch.modowa
1.219 +31 -1 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch.modowa
============================================================================
$ cvs diff -u -r0 -r1.1 apache.patch.modowa
--- /dev/null 2004-04-14 14:07:49.000000000 +0200
+++ apache.patch.modowa 2004-04-14 14:07:49.000000000 +0200
@@ -0,0 +1,40 @@
+Files modowa.orig/src/.Makefile.tmpl.swp and modowa/src/.Makefile.tmpl.swp differ
+diff -Nur modowa.orig/src/Makefile.libdir modowa/src/Makefile.libdir
+--- modowa.orig/src/Makefile.libdir 1970-01-01 01:00:00.000000000 +0100
++++ modowa/src/Makefile.libdir 2004-04-14 11:17:13.000000000 +0200
+@@ -0,0 +1,4 @@
++##
++## Makefile.libdir
++##
++
+diff -Nur modowa.orig/src/Makefile.tmpl modowa/src/Makefile.tmpl
+--- modowa.orig/src/Makefile.tmpl 1970-01-01 01:00:00.000000000 +0100
++++ modowa/src/Makefile.tmpl 2004-04-14 12:49:13.000000000 +0200
+@@ -0,0 +1,27 @@
++##
++## Makefile.tmpl
++##
++
++LIB=libowa.$(LIBEXT)
++EXTRA_INCLUDES=-I. @l_oracle_cflags@
++
++OBJS=modowa.o owacache.o owadoc.o owafile.o owahand.o owanls.o owaplsql.o owasql.o
owautil.o
++
++all: lib
++
++lib: $(LIB)
++
++libowa.a: $(OBJS)
++ rm -f $@
++ ar cr $@ $(OBJS)
++ $(RANLIB) $@
++
++.c.o:
++ $(CC) -c $(INCLUDES) $(CFLAGS) $<
++
++clean:
++ rm -f $(LIB) $(OBJS)
++
++distclean: clean
++ rm -f Makefile
++
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.218 -r1.219 apache.spec
--- openpkg-src/apache/apache.spec 1 Apr 2004 14:30:54 -0000 1.218
+++ openpkg-src/apache/apache.spec 14 Apr 2004 12:07:49 -0000 1.219
@@ -64,7 +64,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20040401
+Release: 20040414
# package options (suexec related)
%option with_suexec yes
@@ -92,6 +92,7 @@
%option with_mod_fastcgi no
%option with_mod_throttle no
%option with_mod_access_referer no
+%option with_mod_owa no
%option with_mod_roaming no
%option with_mod_relocate no
%option with_mod_security no
@@ -191,6 +192,7 @@
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
@@ -198,6 +200,7 @@
Source24: rc.apache
Source25: apache.sh
Patch0: apache.patch
+Patch1: apache.patch.modowa
# build information
Prefix: %{l_prefix}
@@ -212,6 +215,10 @@
BuildPreReq: perl
PreReq: perl
%endif
+%if "%{with_mod_owa}" == "yes"
+BuildPreReq: oracle
+PreReq: oracle
+%endif
%if "%{with_mod_php}" == "yes"
BuildPreReq: gcc, sed, flex, bison
%if "%{with_mod_php_mysql}" == "yes"
@@ -503,6 +510,12 @@
%if "%{with_mod_dosevasive}" == "yes"
%setup -q -T -D -a 18
%endif
+%if "%{with_mod_owa}" == "yes"
+ %setup -q -T -D -a 19
+ sed <%{PATCH apache.patch.modowa} \
+ -e "s;@l_oracle_cflags@;`%{l_prefix}/etc/rc --query oracle_cflags`;g" |\
+ %{l_patch} -p0
+%endif
%build
# prepare environment
@@ -875,6 +888,15 @@
) || exit $?
%endif
+ # optionally prepare mod_owa
+%if "%{with_mod_owa}" == "yes"
+ ( cd modowa
+ mkdir ../apache_%{V_apache}/src/modules/owa/
+ cp src/*.{c,h} src/Makefile.{libdir,tmpl} \
+ ../apache_%{V_apache}/src/modules/owa/
+ ) || exit $?
+%endif
+
# optionally prepare mod_relocate
%if "%{with_mod_relocate}" == "yes"
( cd mod_relocate-%{V_mod_relocate}
@@ -948,6 +970,11 @@
ldflags="$ldflags %{l_ldflags mysql}"
libs="$libs -lmysqlclient"
%endif
+%if "%{with_mod_owa}" == "yes"
+ cflags="$cflags `%{l_prefix}/etc/rc --query oracle_cflags`"
+ ldflags="$ldflags `%{l_prefix}/etc/rc --query oracle_ldflags`"
+ libs="$libs `%{l_prefix}/etc/rc --query oracle_libs`"
+%endif
%if "%{with_gdbm_ndbm}" == "yes"
cflags="$cflags %{l_cppflags}"
ldflags="$ldflags %{l_ldflags}"
@@ -1038,6 +1065,9 @@
%endif
%if "%{with_mod_access_referer}" == "yes"
--activate-module=src/modules/extra/mod_access_referer.o \
+%endif
+%if "%{with_mod_owa}" == "yes"
+ --activate-module=src/modules/owa/libowa.a \
%endif
%if "%{with_mod_roaming}" == "yes"
--activate-module=src/modules/extra/mod_roaming.o \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
