Re: [CVS] OpenPKG: openpkg-src/apache/ apache.spec
On Wed, Nov 21, 2007, Ralf S. Engelschall wrote: > Package aria2 broke the tracking. Now fixed. Thanks for fixing. -cs __ OpenPKG http://openpkg.org Developer Communication List openpkg-dev@openpkg.org
Re: [CVS] OpenPKG: openpkg-src/apache/ apache.spec
On Wed, Nov 21, 2007, Christoph Schug wrote: > On Wed, Nov 21, 2007, Ralf S. Engelschall wrote: > > > On Wed, Nov 21, 2007, Gunnar Wrobel wrote: > > > > > [...] > > > What is the best method to build the package on the OpenPKG server > > > with the options? > > > > > > Something like "opd bu -D "with_mod_authn_alias yes"? > > > > opd bu -f -D with_mod_authn_alias[=yes] > > BTW, Ralf, can you take care of the version tracker which is broken > since several days now. I already sent you a mail in private but maybe > it got stuck somewhere in your mail filter (which is known to happen > from time to time ;-) Yes, seems to got filtered somewhere. Package aria2 broke the tracking. Now fixed. Ralf S. Engelschall [EMAIL PROTECTED] www.engelschall.com __ OpenPKG http://openpkg.org Developer Communication List openpkg-dev@openpkg.org
Re: [CVS] OpenPKG: openpkg-src/apache/ apache.spec
On Wed, Nov 21, 2007, Ralf S. Engelschall wrote: > On Wed, Nov 21, 2007, Gunnar Wrobel wrote: > > > [...] > > What is the best method to build the package on the OpenPKG server > > with the options? > > > > Something like "opd bu -D "with_mod_authn_alias yes"? > > opd bu -f -D with_mod_authn_alias[=yes] BTW, Ralf, can you take care of the version tracker which is broken since several days now. I already sent you a mail in private but maybe it got stuck somewhere in your mail filter (which is known to happen from time to time ;-) Thanks in advance, -cs __ OpenPKG http://openpkg.org Developer Communication List openpkg-dev@openpkg.org
Re: [CVS] OpenPKG: openpkg-src/apache/ apache.spec
"Ralf S. Engelschall" <[EMAIL PROTECTED]> writes: > On Wed, Nov 21, 2007, Gunnar Wrobel wrote: > >> [...] >> What is the best method to build the package on the OpenPKG server >> with the options? >> >> Something like "opd bu -D "with_mod_authn_alias yes"? > > opd bu -f -D with_mod_authn_alias[=yes] Thanks! > >Ralf S. Engelschall >[EMAIL PROTECTED] >www.engelschall.com > > __ > OpenPKG http://openpkg.org > Developer Communication List openpkg-dev@openpkg.org -- __ http://kdab.com ___ http://kolab-konsortium.com _ [EMAIL PROTECTED] Kolab work is funded in part by KDAB and the Kolab Konsortium http://www.pardus.de _ http://gunnarwrobel.de _ E-mail : [EMAIL PROTECTED] Dr. Gunnar Wrobel Tel. : +49 40 432 72335 Bundesstrasse 29 Fax: +49 40 432 70855D-20146 Hamburg >> Mail at ease - Rent a kolab groupware server at [EMAIL PROTECTED] << __ OpenPKG http://openpkg.org Developer Communication List openpkg-dev@openpkg.org
Re: [CVS] OpenPKG: openpkg-src/apache/ apache.spec
On Wed, Nov 21, 2007, Gunnar Wrobel wrote: > [...] > What is the best method to build the package on the OpenPKG server > with the options? > > Something like "opd bu -D "with_mod_authn_alias yes"? opd bu -f -D with_mod_authn_alias[=yes] Ralf S. Engelschall [EMAIL PROTECTED] www.engelschall.com __ OpenPKG http://openpkg.org Developer Communication List openpkg-dev@openpkg.org
Re: [CVS] OpenPKG: openpkg-src/apache/ apache.spec
"Christoph Schug" <[EMAIL PROTECTED]> writes:
> OpenPKG CVS Repository
> http://cvs.openpkg.org/
>
>
> Server: cvs.openpkg.org Name: Christoph Schug
> Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
> Module: openpkg-src Date: 21-Nov-2007 11:01:35
> Branch: HEAD Handle: 2007112110013400
>
> Modified files:
> openpkg-src/apache apache.spec
>
> Log:
> fix line break
>
> Summary:
> RevisionChanges Path
> 1.429 +1 -1 openpkg-src/apache/apache.spec
>
>
> patch -p0 <<'@@ .'
> Index: openpkg-src/apache/apache.spec
>
> $ cvs diff -u -r1.428 -r1.429 apache.spec
> --- openpkg-src/apache/apache.spec 21 Nov 2007 09:50:25 - 1.428
> +++ openpkg-src/apache/apache.spec 21 Nov 2007 10:01:34 - 1.429
> @@ -215,7 +215,7 @@
>--enable-file-cache \
>%endif
>%if "%{with_mod_authn_alias}" == "yes"
> ---enable-authn-alias
> +--enable-authn-alias \
Thanks for the fix!
What is the best method to build the package on the OpenPKG server
with the options?
Something like "opd bu -D "with_mod_authn_alias yes"?
Cheers,
Gunnar
--
__ http://kdab.com ___ http://kolab-konsortium.com _
[EMAIL PROTECTED] Kolab work is funded in part by KDAB and the Kolab Konsortium
http://www.pardus.de _ http://gunnarwrobel.de _
E-mail : [EMAIL PROTECTED] Dr. Gunnar Wrobel
Tel. : +49 40 432 72335 Bundesstrasse 29
Fax: +49 40 432 70855D-20146 Hamburg
>> Mail at ease - Rent a kolab groupware server at [EMAIL PROTECTED] <<
__
OpenPKG http://openpkg.org
Developer Communication List openpkg-dev@openpkg.org
Re: [CVS] OpenPKG: openpkg-src/apache/ apache.spec
On Mon, Jun 21, 2004, Thomas Lotterer wrote:
> [...]
> beautify printenv output
> [...]
> +# beautify printenv output
> +%{l_shtool} subst \
> +-e 's;"\\n";"\\n";g' \
> +apache_%{V_apache}/cgi-bin/printenv
> +
> [...]
Err... no! printenv reads:
| #!/usr/opkg/bin/perl
| ##
| ## printenv -- demo CGI program which just prints its environment
| ##
|
| print "Content-type: text/plain\n\n";
| foreach $var (sort(keys(%ENV))) {
| $val = $ENV{$var};
| $val =~ s|\n|\\n|g;
| $val =~ s|"|\\"|g;
| print "${var}=\"${val}\"\n";
| }
It outputs text/plain and not text/html. If it renders incorrectly in a
browser, the browser is broken. But we certainly don't want to include a
HTML tag in a plain text output...
Ralf S. Engelschall
[EMAIL PROTECTED]
www.engelschall.com
__
The OpenPKG Projectwww.openpkg.org
Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 21-Apr-2004 19:48:38
Branch: HEAD Handle: 2004042118483700
Modified files:
openpkg-src/apache apache.spec
Log:
Add with_mod_php_mcrypt option for libmcrypt support in PHP.
Submitted by: Steffen Weinreich <[EMAIL PROTECTED]>
Summary:
RevisionChanges Path
1.224 +9 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.223 -r1.224 apache.spec
--- openpkg-src/apache/apache.spec20 Apr 2004 09:47:49 - 1.223
+++ openpkg-src/apache/apache.spec21 Apr 2004 17:48:37 - 1.224
@@ -64,7 +64,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040420
+Release: 20040421
# package options (suexec related)
%option with_suexec yes
@@ -127,6 +127,7 @@
%option with_mod_php_transsid no
%option with_mod_php_curl no
%option with_mod_php_mhashno
+%option with_mod_php_mcrypt no
%option with_mod_php_wddx no
%option with_mod_php_gdbm no
%option with_mod_php_versioning no
@@ -304,6 +305,10 @@
BuildPreReq: mhash
PreReq: mhash
%endif
+%if "%{with_mod_php_mcrypt}" == "yes"
+BuildPreReq: libmcrypt
+PreReq: libmcrypt
+%endif
%if "%{with_mod_php_gdbm}" == "yes"
BuildPreReq: gdbm
PreReq: gdbm
@@ -752,6 +757,9 @@
%endif
%if "%{with_mod_php_mhash}" == "yes"
--with-mhash=%{l_prefix} \
+%endif
+%if "%{with_mod_php_mcrypt}" == "yes"
+ --with-mcrypt=%{l_prefix} \
%endif
%if "%{with_mod_php_curl}" == "yes"
--with-curl=%{l_prefix} \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Apr-2004 11:47:49 Branch: HEAD Handle: 2004042010474900 Modified files: openpkg-src/apache apache.spec Log: correct and reduce pear comment for clarity (note != not) Summary: RevisionChanges Path 1.223 +1 -2 openpkg-src/apache/apache.spec patch -p0 <<'@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.222 -r1.223 apache.spec --- openpkg-src/apache/apache.spec20 Apr 2004 08:39:34 - 1.222 +++ openpkg-src/apache/apache.spec20 Apr 2004 09:47:49 - 1.223 @@ -99,8 +99,7 @@ %option with_mod_dosevasive no # package options (optional PHP4 specific settings; requires "with_mod_php") -# please not the lack of an PEAR option since PEAR is to be provided by -# the 'php' package +# please note the lack of an PEAR option since PEAR is provided by the 'php' package %option with_mod_php_calendar no %option with_mod_php_mysqlno %option with_mod_php_pgsqlno @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 20-Apr-2004 10:39:34
Branch: HEAD Handle: 2004042009393400
Modified files:
openpkg-src/apache apache.spec
Log:
With mod_php enabled, provide the module itself only and skip the
rest; PEAR is to be provided by 'php' package
Summary:
RevisionChanges Path
1.222 +4 -8 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.221 -r1.222 apache.spec
--- openpkg-src/apache/apache.spec16 Apr 2004 07:20:41 - 1.221
+++ openpkg-src/apache/apache.spec20 Apr 2004 08:39:34 - 1.222
@@ -64,7 +64,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040416
+Release: 20040420
# package options (suexec related)
%option with_suexec yes
@@ -99,6 +99,8 @@
%option with_mod_dosevasive no
# package options (optional PHP4 specific settings; requires "with_mod_php")
+# please not the lack of an PEAR option since PEAR is to be provided by
+# the 'php' package
%option with_mod_php_calendar no
%option with_mod_php_mysqlno
%option with_mod_php_pgsqlno
@@ -133,7 +135,6 @@
%option with_mod_php_odbc no
%option with_mod_php_mbregex no
%option with_mod_php_mbstring no
-%option with_mod_php_pear no
%option with_mod_php_exif no
%option with_mod_php_iconvno
%option with_mod_php_sendmail no
@@ -774,13 +775,8 @@
%if "%{with_mod_php_iconv}" == "yes"
--with-iconv=%{l_prefix} \
%endif
-%if "%{with_mod_php_pear}" == "yes"
- --enable-cli \
- --with-pear \
-%else
--disable-cli \
--without-pear \
-%endif
--disable-shared \
--enable-inline-optimization \
--enable-track-vars
@@ -1134,7 +1130,7 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/php
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/php/build
rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/php >/dev/null 2>&1 || true
-rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/php-config
+rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/{php-config,phpextdist,phpize}
%endif
# optionally install suPHP wrapper binary
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 16-Apr-2004 09:20:41
Branch: HEAD Handle: 2004041608204100
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.29 20040414 -> 20040416
Summary:
RevisionChanges Path
1.221 +2 -2 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.220 -r1.221 apache.spec
--- openpkg-src/apache/apache.spec14 Apr 2004 12:16:34 - 1.220
+++ openpkg-src/apache/apache.spec16 Apr 2004 07:20:41 - 1.221
@@ -36,7 +36,7 @@
%define V_apache 1.3.29
%define V_mod_ssl2.8.16-1.3.29
%define V_mod_perl 1.29
-%define V_mod_php4.3.5
+%define V_mod_php4.3.6
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -64,7 +64,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040414
+Release: 20040416
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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:16:36
Branch: HEAD Handle: 2004041413163400
Modified files:
openpkg-src/apache apache.spec
Log:
cosmetics
Summary:
RevisionChanges Path
1.220 +4 -3 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.219 -r1.220 apache.spec
--- openpkg-src/apache/apache.spec14 Apr 2004 12:07:49 - 1.219
+++ openpkg-src/apache/apache.spec14 Apr 2004 12:16:34 - 1.220
@@ -981,7 +981,8 @@
libs="$libs -lndbm -lgdbm"
%endif
%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
- # workaround Oracle inter-library depencency by explicitly linking in all
libraries
+ # workaround Oracle inter-library depencency by explicitly
+ # linking in all libraries
ldflags="$ldflags `%{l_prefix}/etc/rc --query oracle_ldflags`"
libs="$libs `%{l_prefix}/etc/rc --query oracle_libs`"
%endif
@@ -1049,10 +1050,10 @@
--activate-module=src/modules/extra/mod_auth_pam.o \
%endif
%if "%{with_mod_auth_ldap}" == "yes"
- --activate-module=src/modules/extra/mod_auth_ldap.c \
+ --activate-module=src/modules/extra/mod_auth_ldap.o \
%endif
%if "%{with_mod_auth_mysql}" == "yes"
- --activate-module=src/modules/extra/mod_auth_mysql.c \
+ --activate-module=src/modules/extra/mod_auth_mysql.o \
%endif
%if "%{with_mod_gzip}" == "yes"
--activate-module=src/modules/extra/mod_gzip.o \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 01-Apr-2004 16:30:55
Branch: HEAD Handle: 2004040115305400
Modified files:
openpkg-src/apache apache.spec
Log:
add support for Oracle under Linux and still support Oracle under
Solaris
Summary:
RevisionChanges Path
1.218 +8 -3 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.217 -r1.218 apache.spec
--- openpkg-src/apache/apache.spec1 Apr 2004 13:35:51 - 1.217
+++ openpkg-src/apache/apache.spec1 Apr 2004 14:30:54 - 1.218
@@ -616,9 +616,14 @@
%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
ORACLE_HOME="`%{l_prefix}/etc/rc --query oracle_home`"
export ORACLE_HOME
- %{l_shtool} subst \
- -e 's;OCI8_DIR/lib;OCI8_DIR/lib32;' \
- configure
+ oracle_libdir="`%{l_prefix}/etc/rc --query oracle_libdir`"
+ case "$oracle_libdir" in
+ */lib32 )
+ %{l_shtool} subst \
+ -e 's;OCI8_DIR/lib;OCI8_DIR/lib32;' \
+ configure
+ ;;
+ esac
%endif
%if "%{with_mod_php_sendmail}" == "yes"
PROG_SENDMAIL="%{l_prefix}/sbin/sendmail" \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 01-Apr-2004 15:35:52
Branch: HEAD Handle: 2004040114355100
Modified files:
openpkg-src/apache apache.spec
Log:
fixed debug option
Summary:
RevisionChanges Path
1.217 +5 -5 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.216 -r1.217 apache.spec
--- openpkg-src/apache/apache.spec27 Mar 2004 07:33:12 - 1.216
+++ openpkg-src/apache/apache.spec1 Apr 2004 13:35:51 - 1.217
@@ -64,7 +64,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040327
+Release: 20040401
# package options (suexec related)
%option with_suexec yes
@@ -586,13 +586,13 @@
( cd php-%{V_mod_php}
CC="%{l_cc}"; export CC
%if "%{with_debug}" == "yes"
- CFLAGS="%{l_cflags -O} %{l_cppflags}"; export CFLAGS
- CPPFLAGS="%{l_cflags -O} %{l_cppflags}"; export CPPFLAGS
- LDFLAGS="%{l_cflags -O} %{l_ldflags}"; export LDFLAGS
-%else
CFLAGS="%{l_cflags} -g %{l_cppflags}"; export CFLAGS
CPPFLAGS="%{l_cflags} -g %{l_cppflags}"; export CPPFLAGS
LDFLAGS="%{l_cflags} -g %{l_ldflags}"; export LDFLAGS
+%else
+ CFLAGS="%{l_cflags -O} %{l_cppflags}"; export CFLAGS
+ CPPFLAGS="%{l_cflags -O} %{l_cppflags}"; export CPPFLAGS
+ LDFLAGS="%{l_cflags -O} %{l_ldflags}"; export LDFLAGS
%endif
LIBS=""; export LIBS
%if "%{with_mod_ssl}" == "yes"
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 27-Mar-2004 08:33:13
Branch: HEAD Handle: 2004032707331200
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.29 20040324 -> 20040327
Summary:
RevisionChanges Path
1.216 +2 -2 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.215 -r1.216 apache.spec
--- openpkg-src/apache/apache.spec24 Mar 2004 07:57:01 - 1.215
+++ openpkg-src/apache/apache.spec27 Mar 2004 07:33:12 - 1.216
@@ -36,7 +36,7 @@
%define V_apache 1.3.29
%define V_mod_ssl2.8.16-1.3.29
%define V_mod_perl 1.29
-%define V_mod_php4.3.4
+%define V_mod_php4.3.5
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -64,7 +64,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040324
+Release: 20040327
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 24-Mar-2004 08:57:02
Branch: HEAD Handle: 2004032407570100
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.29 20040311 -> 20040324
Summary:
RevisionChanges Path
1.215 +2 -2 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.214 -r1.215 apache.spec
--- openpkg-src/apache/apache.spec11 Mar 2004 12:34:37 - 1.214
+++ openpkg-src/apache/apache.spec24 Mar 2004 07:57:01 - 1.215
@@ -49,7 +49,7 @@
%define V_mod_access_referer 1.0.2
%define V_mod_roaming1.0.2
%define V_mod_relocate 1.0
-%define V_mod_security 1.7.5
+%define V_mod_security 1.7.6
%define V_mod_dosevasive 1.9
%define V_suphp 0.5.1
@@ -64,7 +64,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040311
+Release: 20040324
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 24-Feb-2004 20:13:27
Branch: HEAD Handle: 2004022419132700
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.29 20040221 -> 20040224
Summary:
RevisionChanges Path
1.213 +2 -2 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.212 -r1.213 apache.spec
--- openpkg-src/apache/apache.spec21 Feb 2004 18:55:04 - 1.212
+++ openpkg-src/apache/apache.spec24 Feb 2004 19:13:27 - 1.213
@@ -51,7 +51,7 @@
%define V_mod_relocate 1.0
%define V_mod_security 1.7.5
%define V_mod_dosevasive 1.9
-%define V_suphp 0.5
+%define V_suphp 0.5.1
# package information
Name: apache
@@ -64,7 +64,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040221
+Release: 20040224
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 21-Feb-2004 19:55:04
Branch: HEAD Handle: 2004022118550400
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.29 20040212 -> 20040221
Summary:
RevisionChanges Path
1.212 +2 -2 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.211 -r1.212 apache.spec
--- openpkg-src/apache/apache.spec12 Feb 2004 19:05:19 - 1.211
+++ openpkg-src/apache/apache.spec21 Feb 2004 18:55:04 - 1.212
@@ -49,7 +49,7 @@
%define V_mod_access_referer 1.0.2
%define V_mod_roaming1.0.2
%define V_mod_relocate 1.0
-%define V_mod_security 1.7.4
+%define V_mod_security 1.7.5
%define V_mod_dosevasive 1.9
%define V_suphp 0.5
@@ -64,7 +64,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040212
+Release: 20040221
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 12-Feb-2004 20:05:19 Branch: HEAD Handle: 2004021219051900 Modified files: openpkg-src/apache apache.spec Log: ops, do not enable addon modules by default Summary: RevisionChanges Path 1.211 +2 -2 openpkg-src/apache/apache.spec patch -p0 <<'@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.210 -r1.211 apache.spec --- openpkg-src/apache/apache.spec12 Feb 2004 19:03:47 - 1.210 +++ openpkg-src/apache/apache.spec12 Feb 2004 19:05:19 - 1.211 @@ -94,8 +94,8 @@ %option with_mod_access_referer no %option with_mod_roaming no %option with_mod_relocate no -%option with_mod_security yes -%option with_mod_dosevasive yes +%option with_mod_security no +%option with_mod_dosevasive no # package options (optional PHP4 specific settings; requires "with_mod_php") %option with_mod_php_calendar no @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 12-Feb-2004 20:03:47
Branch: HEAD Handle: 2004021219034700
Modified files:
openpkg-src/apache apache.spec
Log:
- add optional support for mod_security
- add optional support for mod_dosevasive
- fix PHP's MTA dependency again
Submitted by: Julien TOUCHE <[EMAIL PROTECTED]>
Summary:
RevisionChanges Path
1.210 +42 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.209 -r1.210 apache.spec
--- openpkg-src/apache/apache.spec12 Feb 2004 08:20:25 - 1.209
+++ openpkg-src/apache/apache.spec12 Feb 2004 19:03:47 - 1.210
@@ -49,6 +49,8 @@
%define V_mod_access_referer 1.0.2
%define V_mod_roaming1.0.2
%define V_mod_relocate 1.0
+%define V_mod_security 1.7.4
+%define V_mod_dosevasive 1.9
%define V_suphp 0.5
# package information
@@ -92,6 +94,8 @@
%option with_mod_access_referer no
%option with_mod_roaming no
%option with_mod_relocate no
+%option with_mod_security yes
+%option with_mod_dosevasive yes
# package options (optional PHP4 specific settings; requires "with_mod_php")
%option with_mod_php_calendar no
@@ -185,6 +189,8 @@
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
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
Source20: apache.conf
Source21: apache.base
Source22: apache.vhost
@@ -208,7 +214,6 @@
%endif
%if "%{with_mod_php}" == "yes"
BuildPreReq: gcc, sed, flex, bison
-PreReq: MTA
%if "%{with_mod_php_mysql}" == "yes"
BuildPreReq: mysql
PreReq: mysql
@@ -423,6 +428,16 @@
url = http://www.suphp.org/Download.html
regex = suphp-(__VER__).tar.gz
}
+prog apache:mod_security = {
+version = %{V_mod_security}
+url = http://www.modsecurity.org/download/
+regex = mod_security-(__VER__).tar.gz
+}
+prog apache:mod_dosevasive = {
+version = %{V_mod_dosevasive}
+url = http://www.nuclearelephant.com/projects/dosevasive/
+regex = mod_dosevasive.(__VER__).tar.gz
+}
%prep
# unpack Apache distribution
@@ -482,6 +497,12 @@
%if "%{with_mod_auth_mysql}" == "yes"
%setup -q -T -D -a 16
%endif
+%if "%{with_mod_security}" == "yes"
+%setup -q -T -D -a 17
+%endif
+%if "%{with_mod_dosevasive}" == "yes"
+%setup -q -T -D -a 18
+%endif
%build
# prepare environment
@@ -873,6 +894,20 @@
) || exit $?
%endif
+# optionally prepare mod_security
+%if "%{with_mod_security}" == "yes"
+( cd mod_security-%{V_mod_security}/apache1
+ cp mod_security.c ../../apache_%{V_apache}/src/modules/extra/
+) || exit $?
+%endif
+
+# optionally prepare mod_dosevasive
+%if "%{with_mod_dosevasive}" == "yes"
+( cd mod_dosevasive
+ cp mod_dosevasive.c ../apache_%{V_apache}/src/modules/extra/
+) || exit $?
+%endif
+
# configure Apache
( cd apache_%{V_apache}
%if "%{with_debug}" == "yes"
@@ -1007,6 +1042,12 @@
%endif
%if "%{with_suphp}" == "yes"
--activate-module=src/modules/extra/mod_suphp.o \
+%endif
+%if "%{with_mod_security}" == "yes"
+ --activate-module=src/modules/extra/mod_security.o \
+%endif
+%if "%{with_mod_dosevasive}" == "yes"
+ --activate-module=src/modules/extra/mod_dosevasive.o \
%endif
--enable-module=so
%{l_make} %{l_mflags -O} build-quiet
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 12-Feb-2004 09:20:26
Branch: HEAD Handle: 2004021208202500
Modified files:
openpkg-src/apache apache.spec
Log:
be smart and do not require an MTA for a scripting language by
default; also remove obsolete patching part
Summary:
RevisionChanges Path
1.209 +11 -6 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.208 -r1.209 apache.spec
--- openpkg-src/apache/apache.spec7 Feb 2004 17:53:24 - 1.208
+++ openpkg-src/apache/apache.spec12 Feb 2004 08:20:25 - 1.209
@@ -62,7 +62,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040207
+Release: 20040212
# package options (suexec related)
%option with_suexec yes
@@ -131,6 +131,7 @@
%option with_mod_php_pear no
%option with_mod_php_exif no
%option with_mod_php_iconvno
+%option with_mod_php_sendmail no
# package options (braindead ones only)
%option with_gdbm_ndbmyes
@@ -310,6 +311,10 @@
BuildPreReq: libiconv
PreReq: libiconv
%endif
+%if "%{with_mod_php_sendmail}" == "yes"
+BuildPreReq: MTA
+PreReq: MTA
+%endif
%endif
%if "%{with_mod_auth_ldap}" == "yes"
BuildPreReq: openldap, openssl
@@ -594,7 +599,11 @@
-e 's;OCI8_DIR/lib;OCI8_DIR/lib32;' \
configure
%endif
- PROG_SENDMAIL="%{l_prefix}/sbin/sendmail"
+%if "%{with_mod_php_sendmail}" == "yes"
+ PROG_SENDMAIL="%{l_prefix}/sbin/sendmail" \
+%else
+ PROG_SENDMAIL="`%{l_shtool} path false`" \
+%endif
export PROG_SENDMAIL
./configure \
--prefix=%{l_prefix} \
@@ -737,10 +746,6 @@
--enable-inline-optimization \
--enable-track-vars
%{l_make} %{l_mflags}
- %{l_shtool} subst \
- -e "s;^\\(EXTENSION_DIR = \\)\\(%{l_prefix}\\);\\1$RPM_BUILD_ROOT\\2;" \
- -e "s;^\\(PEAR_INSTALLDIR = \\)\\(%{l_prefix}\\);\\1$RPM_BUILD_ROOT\\2;" \
- config_vars.mk
%{l_make} %{l_mflags} install \
INSTALL_ROOT=$RPM_BUILD_ROOT
) || exit $?
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 05-Feb-2004 21:54:19
Branch: HEAD Handle: 2004020520541602
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
resolve conflict with php package
Summary:
RevisionChanges Path
1.206 +2 -1 openpkg-src/apache/apache.spec
1.8437 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.205 -r1.206 apache.spec
--- openpkg-src/apache/apache.spec3 Feb 2004 19:59:34 - 1.205
+++ openpkg-src/apache/apache.spec5 Feb 2004 20:54:18 - 1.206
@@ -62,7 +62,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040203
+Release: 20040205
# package options (suexec related)
%option with_suexec yes
@@ -1052,6 +1052,7 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/php
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/php/build
rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/php >/dev/null 2>&1 || true
+rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/php-config
%endif
# optionally install suPHP wrapper binary
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.8436 -r1.8437 news.txt
--- openpkg-web/news.txt 5 Feb 2004 20:26:40 - 1.8436
+++ openpkg-web/news.txt 5 Feb 2004 20:54:16 - 1.8437
@@ -1,3 +1,4 @@
+05-Feb-2004: Upgraded package: P
05-Feb-2004: Upgraded package: P
05-Feb-2004: Upgraded package: P
05-Feb-2004: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 02-Feb-2004 23:50:27
Branch: HEAD Handle: 2004020222502402
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
fix once again this ugly unversioned mod_auth_ldap stuff; it happend
again that some proxy cache gave us an outdated version; this time,
not only correct it but do not let it happen again by *always*
unpacking this stuff, whether needed or not, just to see it failing
Summary:
RevisionChanges Path
1.204 +1 -3 openpkg-src/apache/apache.spec
1.8415 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.203 -r1.204 apache.spec
--- openpkg-src/apache/apache.spec30 Jan 2004 09:25:20 - 1.203
+++ openpkg-src/apache/apache.spec2 Feb 2004 22:50:26 - 1.204
@@ -61,7 +61,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040130
+Release: 20040202
# package options (suexec related)
%option with_suexec yes
@@ -395,9 +395,7 @@
%if "%{with_mod_relocate}" == "yes"
%setup13 -q -T -D -a 13
%endif
-%if "%{with_mod_auth_ldap}" == "yes"
%setup14 -q -T -D -a 14
-%endif
%if "%{with_suphp}" == "yes"
%setup15 -q -T -D -a 15
%endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.8414 -r1.8415 news.txt
--- openpkg-web/news.txt 2 Feb 2004 21:32:33 - 1.8414
+++ openpkg-web/news.txt 2 Feb 2004 22:50:24 - 1.8415
@@ -1,3 +1,4 @@
+02-Feb-2004: Upgraded package: P
02-Feb-2004: Upgraded package: P
02-Feb-2004: Upgraded package: P
02-Feb-2004: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 30-Jan-2004 10:25:20
Branch: HEAD Handle: 2004013009251802
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
go the OpenPKG independence way and use own ndbm compatiblity provided
by gdbm. This might break existing installations due to gdbm_ndbm not
being file format compatible to vendor ndbm. Existing ndbm files must
be rebuild or applications must explicitly use vendor ndbm (if
available) by being build with no gdbm_ndbm.
Summary:
RevisionChanges Path
1.203 +2 -2 openpkg-src/apache/apache.spec
1.8371 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.202 -r1.203 apache.spec
--- openpkg-src/apache/apache.spec27 Jan 2004 12:32:23 - 1.202
+++ openpkg-src/apache/apache.spec30 Jan 2004 09:25:20 - 1.203
@@ -61,7 +61,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040127
+Release: 20040130
# package options (suexec related)
%option with_suexec yes
@@ -132,7 +132,7 @@
%option with_mod_php_iconvno
# package options (braindead ones only)
-%option with_gdbm_ndbmno
+%option with_gdbm_ndbmyes
%option with_shared_core no
%option with_shared_chain no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.8370 -r1.8371 news.txt
--- openpkg-web/news.txt 30 Jan 2004 09:24:54 - 1.8370
+++ openpkg-web/news.txt 30 Jan 2004 09:25:18 - 1.8371
@@ -1,3 +1,4 @@
+30-Jan-2004: Upgraded package: P
30-Jan-2004: Upgraded package: P
30-Jan-2004: Upgraded package: P
29-Jan-2004: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 27-Jan-2004 13:32:24
Branch: HEAD Handle: 2004012712322201
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
get Apache/mod_php running with the OCI8 API provided by
oracle-barebone
Summary:
RevisionChanges Path
1.202 +6 -1 openpkg-src/apache/apache.spec
1.8326 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.201 -r1.202 apache.spec
--- openpkg-src/apache/apache.spec24 Jan 2004 13:15:56 - 1.201
+++ openpkg-src/apache/apache.spec27 Jan 2004 12:32:23 - 1.202
@@ -61,7 +61,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040124
+Release: 20040127
# package options (suexec related)
%option with_suexec yes
@@ -517,6 +517,9 @@
%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
ORACLE_HOME="`%{l_prefix}/etc/rc --query oracle_home`"
export ORACLE_HOME
+ %{l_shtool} subst \
+ -e 's;OCI8_DIR/lib;OCI8_DIR/lib32;' \
+ configure
%endif
PROG_SENDMAIL="%{l_prefix}/sbin/sendmail"
export PROG_SENDMAIL
@@ -597,6 +600,7 @@
%endif
%if "%{with_mod_php_oci8}" == "yes"
--with-oci8 \
+ --enable-sigchld \
%endif
%if "%{with_mod_php_gettext}" == "yes"
--with-gettext=%{l_prefix} \
@@ -833,6 +837,7 @@
%endif
%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
# workaround Oracle inter-library depencency by explicitly linking in all
libraries
+ ldflags="$ldflags `%{l_prefix}/etc/rc --query oracle_ldflags`"
libs="$libs `%{l_prefix}/etc/rc --query oracle_libs`"
%endif
%if "%{with_suphp}" == "yes"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.8325 -r1.8326 news.txt
--- openpkg-web/news.txt 27 Jan 2004 11:48:58 - 1.8325
+++ openpkg-web/news.txt 27 Jan 2004 12:32:22 - 1.8326
@@ -1,3 +1,4 @@
+27-Jan-2004: Upgraded package: P
27-Jan-2004: Upgraded package: P
27-Jan-2004: Upgraded package: P
27-Jan-2004: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 24-Jan-2004 13:52:23
Branch: HEAD Handle: 2004012412522101
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
Add libiconv support to mod_php.
Submitted by: Stuart Bingë <[EMAIL PROTECTED]>
Summary:
RevisionChanges Path
1.200 +9 -1 openpkg-src/apache/apache.spec
1.8192 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.199 -r1.200 apache.spec
--- openpkg-src/apache/apache.spec23 Jan 2004 13:07:27 - 1.199
+++ openpkg-src/apache/apache.spec24 Jan 2004 12:52:22 - 1.200
@@ -62,7 +62,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040121
+Release: 20040124
# package options (suexec related)
%option with_suexec yes
@@ -131,6 +131,7 @@
%option with_mod_php_mbstring no
%option with_mod_php_pear no
%option with_mod_php_exif no
+%option with_mod_php_iconvno
# package options (optional PHP3 specific settings; requires "with_mod_php3")
%option with_mod_php3_ftp no
@@ -328,6 +329,10 @@
BuildPreReq: unixodbc
PreReq: unixodbc
%endif
+%if "%{with_mod_php_iconv}" == "yes"
+BuildPreReq: libiconv
+PreReq: libiconv
+%endif
%endif
%if "%{with_mod_php3}" == "yes"
BuildPreReq: make, bison, flex
@@ -690,6 +695,9 @@
%endif
%if "%{with_mod_php_exif}" == "yes"
--with-exif \
+%endif
+%if "%{with_mod_php_iconv}" == "yes"
+ --with-iconv=%{l_prefix} \
%endif
%if "%{with_mod_php_pear}" == "yes"
--enable-cli \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.8191 -r1.8192 news.txt
--- openpkg-web/news.txt 24 Jan 2004 11:57:01 - 1.8191
+++ openpkg-web/news.txt 24 Jan 2004 12:52:21 - 1.8192
@@ -1,3 +1,4 @@
+24-Jan-2004: Upgraded package: P
24-Jan-2004: Upgraded package: P
24-Jan-2004: Upgraded package: P
24-Jan-2004: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 21-Jan-2004 16:03:53
Branch: HEAD Handle: 2004012115035300
Modified files:
openpkg-src/apache apache.spec
Log:
make people happy and add EXIF support, too
Summary:
RevisionChanges Path
1.198 +4 -0 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.197 -r1.198 apache.spec
--- openpkg-src/apache/apache.spec20 Jan 2004 23:59:33 - 1.197
+++ openpkg-src/apache/apache.spec21 Jan 2004 15:03:53 - 1.198
@@ -130,6 +130,7 @@
%option with_mod_php_mbregex no
%option with_mod_php_mbstring no
%option with_mod_php_pear no
+%option with_mod_php_exif no
# package options (optional PHP3 specific settings; requires "with_mod_php3")
%option with_mod_php3_ftp no
@@ -686,6 +687,9 @@
%endif
%if "%{with_mod_php_snmp}" == "yes"
--with-snmp=%{l_prefix} \
+%endif
+%if "%{with_mod_php_exif}" == "yes"
+ --with-exif \
%endif
%if "%{with_mod_php_pear}" == "yes"
--enable-cli \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-src/cups/ cups....
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 21-Jan-2004 00:59:40
Branch: HEAD Handle: 2004012023593109
Modified files:
openpkg-src/apache apache.spec
openpkg-src/cupscups.spec
openpkg-src/etherealethereal.spec
openpkg-src/kolab kolab.spec
openpkg-src/meta-rdbms meta-rdbms.spec
openpkg-src/mysql mysql.spec
openpkg-src/mysql3 mysql3.spec
openpkg-src/mysql41 mysql41.spec
openpkg-src/perl-dbiperl-dbi.spec
openpkg-src/php php.spec
openpkg-src/php3php3.spec
openpkg-src/php5php5.spec
openpkg-src/postfix postfix.spec
openpkg-src/rt rt.spec
openpkg-src/sendmailsendmail.spec
openpkg-web news.txt
Log:
cleanup consistency of options by renaming some of them
Summary:
RevisionChanges Path
1.197 +20 -20 openpkg-src/apache/apache.spec
1.13+4 -4 openpkg-src/cups/cups.spec
1.29+4 -4 openpkg-src/ethereal/ethereal.spec
1.8 +2 -2 openpkg-src/kolab/kolab.spec
1.4 +3 -3 openpkg-src/meta-rdbms/meta-rdbms.spec
1.86+7 -7 openpkg-src/mysql/mysql.spec
1.25+7 -7 openpkg-src/mysql3/mysql3.spec
1.3 +7 -7 openpkg-src/mysql41/mysql41.spec
1.83+9 -9 openpkg-src/perl-dbi/perl-dbi.spec
1.70+10 -10 openpkg-src/php/php.spec
1.4 +10 -10 openpkg-src/php3/php3.spec
1.3 +10 -10 openpkg-src/php5/php5.spec
1.187 +6 -6 openpkg-src/postfix/postfix.spec
1.115 +10 -10 openpkg-src/rt/rt.spec
1.104 +4 -4 openpkg-src/sendmail/sendmail.spec
1.8152 +15 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.196 -r1.197 apache.spec
--- openpkg-src/apache/apache.spec12 Jan 2004 18:34:38 - 1.196
+++ openpkg-src/apache/apache.spec20 Jan 2004 23:59:33 - 1.197
@@ -62,7 +62,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040112
+Release: 20040121
# package options (suexec related)
%option with_suexec yes
@@ -99,12 +99,12 @@
%option with_mod_php_mysqlno
%option with_mod_php_pgsqlno
%option with_mod_php_gd no
-%option with_mod_php_db no
+%option with_mod_php_bdb no
%option with_mod_php_debugno
%option with_mod_php_pdflib no
%option with_mod_php_zlib no
%option with_mod_php_bzip2no
-%option with_mod_php_openssl no
+%option with_mod_php_ssl no
%option with_mod_php_openldap no
%option with_mod_php_openldapsasl no
%option with_mod_php_mm no
@@ -126,7 +126,7 @@
%option with_mod_php_gdbm no
%option with_mod_php_versioning no
%option with_mod_php_snmp no
-%option with_mod_php_unixodbc no
+%option with_mod_php_odbc no
%option with_mod_php_mbregex no
%option with_mod_php_mbstring no
%option with_mod_php_pear no
@@ -136,7 +136,7 @@
%option with_mod_php3_gd no
%option with_mod_php3_jpegno
%option with_mod_php3_mysql no
-%option with_mod_php3_openssl no
+%option with_mod_php3_ssl no
%option with_mod_php3_zlibno
# package options (braindead ones only)
@@ -153,9 +153,9 @@
%{error:build-time options 'with_mod_php' and 'with_mod_php3' conflict}
%endif
%if "%{with_mod_ssl}" == "yes"
-%undefine with_mod_php_openssl
+%undefine with_mod_php_ssl
%undefine with_mod_php_mm
-%define with_mod_php_openssl yes
+%define with_mod_php_ssl yes
%define with_mod_php_mm yes
%endif
%if "%{with_mod_php_freetype}" == "yes"
@@ -167,14 +167,14 @@
%define with_mod_php_zlib yes
%endif
%if "%{with_mod_php_pgsql}" == "yes"
-%undefine with_mod_php_openssl
-%define with_mod_php_openssl yes
+%undefine with_mod_php_ssl
+%define with_mod_php_ssl yes
%endif
%endif
%if "%{with_mod_php3}" == "yes"
%if "%{with_mod_ssl}" == "yes"
-%undefine with
[CVS] OpenPKG: openpkg-src/apache/ apache.spec rc.apache openpkg-web/ ...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 12-Jan-2004 19:34:38
Branch: HEAD Handle: 2004011218343602
Modified files:
openpkg-src/apache apache.spec rc.apache
openpkg-web news.txt
Log:
fixed rc script
Summary:
RevisionChanges Path
1.196 +1 -1 openpkg-src/apache/apache.spec
1.17+21 -10 openpkg-src/apache/rc.apache
1.8066 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.195 -r1.196 apache.spec
--- openpkg-src/apache/apache.spec10 Jan 2004 19:17:15 - 1.195
+++ openpkg-src/apache/apache.spec12 Jan 2004 18:34:38 - 1.196
@@ -62,7 +62,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040110
+Release: 20040112
# package options (suexec related)
%option with_suexec yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/rc.apache
$ cvs diff -u -r1.16 -r1.17 rc.apache
--- openpkg-src/apache/rc.apache 29 Dec 2003 08:54:54 - 1.16
+++ openpkg-src/apache/rc.apache 12 Jan 2004 18:34:38 - 1.17
@@ -19,15 +19,17 @@
apache_err_complevel="9"
%common
-. @l_prefix@/etc/apache/apache.sh
+apache_pidfile="@l_prefix@/var/apache/run/apache.pid"
+apache_signal () {
+[ -f $apache_pidfile ] && kill -$1 `cat $apache_pidfile`
+}
%status -u @l_susr@ -o
apache_usable="no"
apache_active="no"
-@l_prefix@/sbin/apachectl configtest 2>/dev/null && apache_usable="yes"
-( eval `grep "^PIDFILE=" @l_prefix@/sbin/apachectl`
- [ ".$PIDFILE" != . -a -f "$PIDFILE" ] && kill -0 `cat $PIDFILE`
-) && apache_active="yes"
+@l_prefix@/sbin/apache -t 2>/dev/null && apache_usable="yes"
+rcService apache enable yes && \
+apache_signal 0 && apache_active="yes"
echo "apache_enable=\"$apache_enable\""
echo "apache_usable=\"$apache_usable\""
echo "apache_active=\"$apache_active\""
@@ -35,18 +37,27 @@
%start -u @l_susr@
rcService apache enable yes || exit 0
rcService apache active yes && exit 0
-@l_prefix@/sbin/apachectl start
+( [ -e @l_prefix@/etc/apache/apache.sh ] && \
+ . @l_prefix@/etc/apache/apache.sh
+ @l_prefix@/sbin/apache
+) || return $?
%stop -u @l_susr@
rcService apache enable yes || exit 0
rcService apache active no && exit 0
-@l_prefix@/sbin/apachectl stop
+apache_signal TERM
sleep 2
+rm -f $apache_pidfile >/dev/null 2>&1 || true
%restart -u @l_susr@
rcService apache enable yes || exit 0
rcService apache active no && exit 0
-@l_prefix@/sbin/apachectl restart
+rc apache stop start
+
+%reload -u @l_susr@
+rcService apache enable yes || exit 0
+rcService apache active no && exit 0
+apache_signal HUP
%daily -u @l_susr@
rcService apache enable yes || exit 0
@@ -57,7 +68,7 @@
-n ${apache_log_numfiles} -s ${apache_log_minsize} -d \
-z ${apache_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${apache_log_prolog}" \
--E "${apache_log_epilog} && rc apache restart" \
+-E "${apache_log_epilog} && rc apache reload" \
$apache_log_files
fi
@@ -67,7 +78,7 @@
-n ${apache_err_numfiles} -s ${apache_err_minsize} -d \
-z ${apache_err_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${apache_err_prolog}" \
--E "${apache_err_epilog} && rc apache restart" \
+-E "${apache_err_epilog} && rc apache reload" \
$apache_err_files
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.8065 -r1.8066 news.txt
--- openpkg-web/news.txt 12 Jan 2004 15:09:14 - 1.8065
+++ openpkg-web/news.txt 12 Jan 2004 18:34:36 - 1.8066
@@ -1,3 +1,4 @@
+12-Jan-2004: Upgraded package: P
12-Jan-2004: Upgraded package: P
12-Jan-2004: Upgraded package: P
12-Jan-2004: Upgraded package: P
@@ .
__
The OpenPKG Project
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 09-Jan-2004 17:19:30
Branch: HEAD Handle: 2004010916192900
Modified files:
openpkg-src/apache apache.spec
Log:
adopted file path changes introduced by freetype-20031107
Summary:
RevisionChanges Path
1.194 +6 -0 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.193 -r1.194 apache.spec
--- openpkg-src/apache/apache.spec9 Jan 2004 14:11:20 - 1.193
+++ openpkg-src/apache/apache.spec9 Jan 2004 16:19:29 - 1.194
@@ -403,6 +403,12 @@
%endif
%if "%{with_mod_php}" == "yes"
%setup3 -q -T -D -a 3
+( cd php-%{V_mod_php}
+ %{l_shtool} subst \
+ -e 's;\(/include\)/freetype2;\1;' \
+ configure \
+ ext/gd/config.m4
+) || exit $?
%endif
%if "%{with_mod_dav}" == "yes"
%setup4 -q -T -D -a 4
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 09-Jan-2004 15:11:20
Branch: HEAD Handle: 2004010914111802
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
gd 2.0.16 dropped gdFreeFontCache() used by PHP 4.3.4 in favor of
gdFontCacheShutdown(). gd 2.0.20 re-introduces gdFreeFontCache() as a
wrapper function for backwards compatibility with applications such as
PHP (with gd and freetype support enabled).
Summary:
RevisionChanges Path
1.193 +3 -3 openpkg-src/apache/apache.spec
1.8032 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.192 -r1.193 apache.spec
--- openpkg-src/apache/apache.spec6 Jan 2004 20:25:55 - 1.192
+++ openpkg-src/apache/apache.spec9 Jan 2004 14:11:20 - 1.193
@@ -62,7 +62,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040106
+Release: 20040109
# package options (suexec related)
%option with_suexec yes
@@ -239,8 +239,8 @@
PreReq: postgresql, openssl
%endif
%if "%{with_mod_php_gd}" == "yes"
-BuildPreReq: gd, jpeg, png
-PreReq: gd, jpeg, png
+BuildPreReq: gd >= 2.0.20, jpeg, png
+PreReq: gd >= 2.0.20, jpeg, png
%endif
%if "%{with_mod_php_db}" == "yes"
BuildPreReq: db
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.8031 -r1.8032 news.txt
--- openpkg-web/news.txt 9 Jan 2004 11:33:46 - 1.8031
+++ openpkg-web/news.txt 9 Jan 2004 14:11:18 - 1.8032
@@ -1,3 +1,4 @@
+09-Jan-2004: Upgraded package: P
09-Jan-2004: Upgraded package: P
09-Jan-2004: Upgraded package: P
09-Jan-2004: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 06-Jan-2004 21:25:55
Branch: HEAD Handle: 2004010620255302
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
fix mod_auth_ldap building by including a newer vendor tarball
Summary:
RevisionChanges Path
1.192 +1 -1 openpkg-src/apache/apache.spec
1.7989 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.191 -r1.192 apache.spec
--- openpkg-src/apache/apache.spec31 Dec 2003 11:56:57 - 1.191
+++ openpkg-src/apache/apache.spec6 Jan 2004 20:25:55 - 1.192
@@ -62,7 +62,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20031231
+Release: 20040106
# package options (suexec related)
%option with_suexec yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.7988 -r1.7989 news.txt
--- openpkg-web/news.txt 6 Jan 2004 13:51:13 - 1.7988
+++ openpkg-web/news.txt 6 Jan 2004 20:25:53 - 1.7989
@@ -1,3 +1,4 @@
+06-Jan-2004: Upgraded package: P
06-Jan-2004: New package: P
06-Jan-2004: Upgraded package: P
06-Jan-2004: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 31-Dec-2003 12:56:57
Branch: HEAD Handle: 2003123111565700
Modified files:
openpkg-src/apache apache.spec
Log:
workaround Oracle inter-library depencency by explicitly linking in
all libraries
Summary:
RevisionChanges Path
1.191 +5 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.190 -r1.191 apache.spec
--- openpkg-src/apache/apache.spec29 Dec 2003 08:54:54 - 1.190
+++ openpkg-src/apache/apache.spec31 Dec 2003 11:56:57 - 1.191
@@ -62,7 +62,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20031229
+Release: 20031231
# package options (suexec related)
%option with_suexec yes
@@ -907,6 +907,10 @@
cflags="$cflags %{l_cppflags}"
ldflags="$ldflags %{l_ldflags}"
libs="$libs -lndbm -lgdbm"
+%endif
+%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
+ # workaround Oracle inter-library depencency by explicitly linking in all
libraries
+ libs="$libs `%{l_prefix}/etc/rc --query oracle_libs`"
%endif
%if "%{with_suphp}" == "yes"
cflags="$cflags -DPATH_TO_SUPHP='\"%{l_prefix}/sbin/suphp\"'"
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 17-Dec-2003 17:01:10
Branch: HEAD Handle: 2003121716010603
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
Use more correct installation method.
Submitted by: Stuart Bingë <[EMAIL PROTECTED]>
Summary:
RevisionChanges Path
1.188 +2 -2 openpkg-src/apache/apache.spec
1.7801 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.187 -r1.188 apache.spec
--- openpkg-src/apache/apache.spec28 Nov 2003 13:53:16 - 1.187
+++ openpkg-src/apache/apache.spec17 Dec 2003 16:01:09 - 1.188
@@ -61,7 +61,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20031128
+Release: 20031217
# package options (suexec related)
%option with_suexec yes
@@ -688,7 +688,7 @@
-e "s;^\\(PEAR_INSTALLDIR = \\)\\(%{l_prefix}\\);\\1$RPM_BUILD_ROOT\\2;" \
config_vars.mk
%{l_make} %{l_mflags} install \
- prefix=$RPM_BUILD_ROOT%{l_prefix}
+ INSTALL_ROOT=$RPM_BUILD_ROOT
) || exit $?
%endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.7800 -r1.7801 news.txt
--- openpkg-web/news.txt 17 Dec 2003 14:19:41 - 1.7800
+++ openpkg-web/news.txt 17 Dec 2003 16:01:06 - 1.7801
@@ -1,3 +1,4 @@
+17-Dec-2003: Upgraded package: P
17-Dec-2003: Upgraded package: P
17-Dec-2003: Upgraded package: P
17-Dec-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Nov-2003 14:53:16
Branch: HEAD Handle: 2003112813531600
Modified files:
openpkg-src/apache apache.spec
Log:
Remove redundant conditional for mod_auth_ldap
Summary:
RevisionChanges Path
1.187 +0 -2 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.186 -r1.187 apache.spec
--- openpkg-src/apache/apache.spec28 Nov 2003 11:57:31 - 1.186
+++ openpkg-src/apache/apache.spec28 Nov 2003 13:53:16 - 1.187
@@ -874,13 +874,11 @@
cflags="$cflags %{l_cppflags}"
ldflags="$ldflags %{l_ldflags}"
libs="$libs -lldap -llber -lssl -lcrypto"
-%if "%{with_mod_auth_ldap}" == "yes"
case "%{l_platform -t}" in
*-sunos* )
libs="$libs -lresolv"
;;
esac
-%endif
%endif
%if "%{with_gdbm_ndbm}" == "yes"
cflags="$cflags %{l_cppflags}"
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Nov-2003 12:57:31
Branch: HEAD Handle: 2003112811573100
Modified files:
openpkg-src/apache apache.spec
Log:
repair broken mod_auth_ldap link logic, and update it to 2.4.2
Summary:
RevisionChanges Path
1.186 +10 -3 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.185 -r1.186 apache.spec
--- openpkg-src/apache/apache.spec27 Nov 2003 16:59:42 - 1.185
+++ openpkg-src/apache/apache.spec28 Nov 2003 11:57:31 - 1.186
@@ -42,7 +42,7 @@
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
%define V_mod_auth_pam 1.1.1
-%define V_mod_auth_ldap 2.4.1
+%define V_mod_auth_ldap 2.4.2
%define V_mod_gzip 1.3.19.1a
%define V_mod_fastcgi2.4.2
%define V_mod_throttle 312
@@ -61,7 +61,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20031127
+Release: 20031128
# package options (suexec related)
%option with_suexec yes
@@ -787,7 +787,7 @@
# optionally prepare mod_auth_ldap
%if "%{with_mod_auth_ldap}" == "yes"
-( cd modauthldap
+( cd mod_auth_ldap
cp mod_auth_ldap.c ../apache_%{V_apache}/src/modules/extra/
) || exit $?
%endif
@@ -874,6 +874,13 @@
cflags="$cflags %{l_cppflags}"
ldflags="$ldflags %{l_ldflags}"
libs="$libs -lldap -llber -lssl -lcrypto"
+%if "%{with_mod_auth_ldap}" == "yes"
+ case "%{l_platform -t}" in
+ *-sunos* )
+ libs="$libs -lresolv"
+ ;;
+ esac
+%endif
%endif
%if "%{with_gdbm_ndbm}" == "yes"
cflags="$cflags %{l_cppflags}"
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 27-Nov-2003 17:59:43
Branch: HEAD Handle: 2003112716594200
Modified files:
openpkg-src/apache apache.spec
Log:
use same permissions as used already for suexec to be consistent
Summary:
RevisionChanges Path
1.185 +1 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.184 -r1.185 apache.spec
--- openpkg-src/apache/apache.spec27 Nov 2003 13:27:32 - 1.184
+++ openpkg-src/apache/apache.spec27 Nov 2003 16:59:42 - 1.185
@@ -1053,7 +1053,7 @@
'%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/sbin/suexec' \
%endif
%if "%{with_suphp}" == "yes"
-'%attr(4711,%{l_susr},%{l_mgrp}) %{l_prefix}/sbin/suphp' \
+'%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/sbin/suphp' \
%endif
'%config %{l_prefix}/etc/apache/*' \
%if "%{with_mod_ssl}" == "yes"
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 27-Nov-2003 14:27:32
Branch: HEAD Handle: 2003112713273200
Modified files:
openpkg-src/apache apache.spec
Log:
be more flexible for make sure empty lib/php does not exist
Summary:
RevisionChanges Path
1.184 +3 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.183 -r1.184 apache.spec
--- openpkg-src/apache/apache.spec27 Nov 2003 12:06:38 - 1.183
+++ openpkg-src/apache/apache.spec27 Nov 2003 13:27:32 - 1.184
@@ -71,6 +71,7 @@
# package options (suphp related)
%option with_suphpno
%option with_suphp_caller %{l_nusr}
+%option with_suphp_phpcgi %{l_prefix}/cgi/php
# package options (additionally used Apache modules; can be enabled without
thinking)
%option with_mod_ssl no
@@ -843,7 +844,7 @@
--prefix=%{l_prefix} \
--with-apxs="" \
--with-apache-user=%{with_suphp_caller} \
- --with-php=%{l_prefix}/cgi/php \
+ --with-php=%{with_suphp_phpcgi} \
--with-logfile=%{l_prefix}/var/apache/log/suphp.log
%{l_make} %{l_mflags -O}
) || exit $?
@@ -1010,6 +1011,7 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/apache/php.ini
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/php
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/php/build
+rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/php >/dev/null 2>&1 || true
%endif
# optionally install suPHP wrapper binary
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 26-Nov-2003 08:32:54
Branch: HEAD Handle: 2003112607325301
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
fix this nasty workaround until PR#290 (PEAR packages) is addressed
Summary:
RevisionChanges Path
1.182 +3 -2 openpkg-src/apache/apache.spec
1.7538 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.181 -r1.182 apache.spec
--- openpkg-src/apache/apache.spec25 Nov 2003 14:31:51 - 1.181
+++ openpkg-src/apache/apache.spec26 Nov 2003 07:32:54 - 1.182
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20031125
+Release: 20031126
# package options (suexec related)
%option with_suexec yes
@@ -656,10 +656,11 @@
%if "%{with_mod_php_snmp}" == "yes"
--with-snmp=%{l_prefix} \
%endif
- --disable-cli \
%if "%{with_mod_php_pear}" == "yes"
+ --enable-cli \
--with-pear \
%else
+ --disable-cli \
--without-pear \
%endif
--disable-shared \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.7537 -r1.7538 news.txt
--- openpkg-web/news.txt 25 Nov 2003 19:32:18 - 1.7537
+++ openpkg-web/news.txt 26 Nov 2003 07:32:53 - 1.7538
@@ -1,3 +1,4 @@
+26-Nov-2003: Upgraded package: P
25-Nov-2003: Upgraded package: P
25-Nov-2003: Upgraded package: P
25-Nov-2003: New package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 25-Nov-2003 15:31:51
Branch: HEAD Handle: 2003112514314902
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
with_mod_php_pear is a requirement for Kolab/Horde, so give it a try
Summary:
RevisionChanges Path
1.181 +6 -1 openpkg-src/apache/apache.spec
1.7531 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.180 -r1.181 apache.spec
--- openpkg-src/apache/apache.spec24 Nov 2003 08:45:39 - 1.180
+++ openpkg-src/apache/apache.spec25 Nov 2003 14:31:51 - 1.181
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20031124
+Release: 20031125
# package options (suexec related)
%option with_suexec yes
@@ -121,6 +121,7 @@
%option with_mod_php_unixodbc no
%option with_mod_php_mbregex no
%option with_mod_php_mbstring no
+%option with_mod_php_pear no
# package options (optional PHP3 specific settings; requires "with_mod_php3")
%option with_mod_php3_ftp no
@@ -656,7 +657,11 @@
--with-snmp=%{l_prefix} \
%endif
--disable-cli \
+%if "%{with_mod_php_pear}" == "yes"
+ --with-pear \
+%else
--without-pear \
+%endif
--disable-shared \
--enable-inline-optimization \
--enable-track-vars
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.7530 -r1.7531 news.txt
--- openpkg-web/news.txt 25 Nov 2003 13:37:03 - 1.7530
+++ openpkg-web/news.txt 25 Nov 2003 14:31:49 - 1.7531
@@ -1,3 +1,4 @@
+25-Nov-2003: Upgraded package: P
25-Nov-2003: Upgraded package: P
25-Nov-2003: Upgraded package: P
25-Nov-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Oct-2003 17:14:00
Branch: HEAD Handle: 2003102816135703
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
added PHP multi-byte regex/string support
Summary:
RevisionChanges Path
1.177 +8 -0 openpkg-src/apache/apache.spec
1.7205 +0 -26 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.176 -r1.177 apache.spec
--- openpkg-src/apache/apache.spec28 Oct 2003 10:47:24 - 1.176
+++ openpkg-src/apache/apache.spec28 Oct 2003 16:14:00 - 1.177
@@ -119,6 +119,8 @@
%option with_mod_php_versioning no
%option with_mod_php_snmp no
%option with_mod_php_unixodbc no
+%option with_mod_php_mbregex no
+%option with_mod_php_mbstring no
# package options (optional PHP3 specific settings; requires "with_mod_php3")
%option with_mod_php3_ftp no
@@ -534,6 +536,12 @@
--prefix=%{l_prefix} \
--with-apache=../apache_%{V_apache} \
--with-config-file-path=%{l_prefix}/etc/apache \
+%if "%{with_mod_php_mbregex}" == "yes"
+ --enable-mbregex \
+%endif
+%if "%{with_mod_php_mbstring}" == "yes"
+ --enable-mbstring \
+%endif
%if "%{with_mod_php_calendar}" == "yes"
--enable-calendar \
%endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.7204 -r1.7205 news.txt
--- openpkg-web/news.txt 28 Oct 2003 15:27:08 - 1.7204
+++ openpkg-web/news.txt 28 Oct 2003 16:13:57 - 1.7205
@@ -1,30 +1,4 @@
-28-Oct-2003: Upgraded package: P
-28-Oct-2003: Upgraded package: P
-28-Oct-2003: Upgraded package: P
-28-Oct-2003: Upgraded package: P
28-Oct-2003: Upgraded package: P
-28-Oct-2003: Upgraded package: P
-28-Oct-2003: Upgraded package: P
-28-Oct-2003: Upgraded package: P
-27-Oct-2003: Upgraded package: P
-27-Oct-2003: Upgraded package: P
-27-Oct-2003: Upgraded package: P
-27-Oct-2003: Upgraded package: P
-27-Oct-2003: Upgraded package: P
-27-Oct-2003: Upgraded package: P
-27-Oct-2003: Upgraded package: P
-27-Oct-2003: Upgraded package: P
-27-Oct-2003: Upgraded package: P
-27-Oct-2003: New package: P
-27-Oct-2003: Upgraded package: P
-27-Oct-2003: Upgraded package: P
-27-Oct-2003: Upgraded package: P
-<<< news.txt
-27-Oct-2003: Upgraded package: P
-===
-27-Oct-2003: New package: P
-27-Oct-2003: Upgraded package: P
->>> 1.7183
27-Oct-2003: Upgraded package: P
27-Oct-2003: Upgraded package: P
27-Oct-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 09-Oct-2003 10:31:24
Branch: HEAD Handle: 2003100909312201
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
fix XML (Expat based) support. Now you especially you can build with
both mod_dav and mod_php (with XML support enabled)
Summary:
RevisionChanges Path
1.175 +8 -4 openpkg-src/apache/apache.spec
1.6928 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.174 -r1.175 apache.spec
--- openpkg-src/apache/apache.spec8 Oct 2003 07:17:00 - 1.174
+++ openpkg-src/apache/apache.spec9 Oct 2003 08:31:23 - 1.175
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20031008
+Release: 20031009
# package options (suexec related)
%option with_suexec yes
@@ -282,7 +282,7 @@
BuildPreReq: imap, openssl
PreReq: imap, openssl
%endif
-%if "%{with_mod_php_xml}" == "yes"
+%if "%{with_mod_dav}" == "yes" || "%{with_mod_php_xml}" == "yes"
BuildPreReq: expat
PreReq: expat
%endif
@@ -610,7 +610,10 @@
--with-imap-ssl=%{l_prefix} \
%endif
%if "%{with_mod_php_xml}" == "yes"
- --with-xml=%{l_prefix} \
+ --enable-xml \
+ --with-expat-dir=%{l_prefix} \
+%else
+ --disable-xml \
%endif
%if "%{with_mod_php_dom}" == "yes"
--with-dom=%{l_prefix} \
@@ -721,7 +724,8 @@
%endif
LDFLAGS="%{l_cflags -O}" \
./configure \
- --with-apache=../apache_%{V_apache}
+ --with-apache=../apache_%{V_apache} \
+ --with-expat=%{l_prefix}
%{l_make} %{l_mflags}
%{l_make} %{l_mflags} install
) || exit $?
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6927 -r1.6928 news.txt
--- openpkg-web/news.txt 9 Oct 2003 08:28:56 - 1.6927
+++ openpkg-web/news.txt 9 Oct 2003 08:31:22 - 1.6928
@@ -1,3 +1,4 @@
+09-Oct-2003: Upgraded package: P
09-Oct-2003: Upgraded package: P
09-Oct-2003: Upgraded package: P
08-Oct-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 07-Oct-2003 12:49:00
Branch: HEAD Handle: 2003100711485801
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
add optional debugging support
Summary:
RevisionChanges Path
1.172 +31 -1 openpkg-src/apache/apache.spec
1.6898 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.171 -r1.172 apache.spec
--- openpkg-src/apache/apache.spec2 Oct 2003 18:32:32 - 1.171
+++ openpkg-src/apache/apache.spec7 Oct 2003 10:48:59 - 1.172
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20031002
+Release: 20031007
# package options (suexec related)
%option with_suexec yes
@@ -133,6 +133,9 @@
%option with_shared_core no
%option with_shared_chain no
+# package options (debugging)
+%option with_debugno
+
# fixing implicit inter-module dependencies and correlations
%if "%{with_mod_php}" == "yes"
%if "%{with_mod_php3}" == "yes"
@@ -427,7 +430,11 @@
%if "%{with_mod_php}" == "yes" || "%{with_mod_php3}" == "yes" || "%{with_mod_dav}"
== "yes"
( cd apache_%{V_apache}
CC="%{l_cc}" \
+%if "%{with_debug}" == "yes"
+ CFLAGS="%{l_cflags} -g" \
+%else
CFLAGS="%{l_cflags -O}" \
+%endif
./configure \
%if "%{with_mod_ssl}" == "yes"
--enable-rule=EAPI \
@@ -486,9 +493,15 @@
%if "%{with_mod_php}" == "yes"
( cd php-%{V_mod_php}
CC="%{l_cc}"; export CC
+%if "%{with_debug}" == "yes"
CFLAGS="%{l_cflags -O} %{l_cppflags}"; export CFLAGS
CPPFLAGS="%{l_cflags -O} %{l_cppflags}"; export CPPFLAGS
LDFLAGS="%{l_cflags -O} %{l_ldflags}"; export LDFLAGS
+%else
+ CFLAGS="%{l_cflags} -g %{l_cppflags}"; export CFLAGS
+ CPPFLAGS="%{l_cflags} -g %{l_cppflags}"; export CPPFLAGS
+ LDFLAGS="%{l_cflags} -g %{l_ldflags}"; export LDFLAGS
+%endif
LIBS=""; export LIBS
%if "%{with_mod_ssl}" == "yes"
CFLAGS="$CFLAGS -DEAPI"
@@ -690,11 +703,19 @@
%if "%{with_mod_dav}" == "yes"
( cd mod_dav-%{V_mod_dav}
CC="%{l_cc}" \
+%if "%{with_debug}" == "yes"
+%if "%{with_mod_ssl}" == "yes"
+ CFLAGS="%{l_cflags} -g" \
+%else
+ CFLAGS="%{l_cflags} -g -DEAPI" \
+%endif
+%else
%if "%{with_mod_ssl}" == "yes"
CFLAGS="%{l_cflags -O}" \
%else
CFLAGS="%{l_cflags -O} -DEAPI" \
%endif
+%endif
LDFLAGS="%{l_cflags -O}" \
./configure \
--with-apache=../apache_%{V_apache}
@@ -777,7 +798,11 @@
# configure Apache
( cd apache_%{V_apache}
+%if "%{with_debug}" == "yes"
+ cflags="%{l_cflags} -g"
+%else
cflags="%{l_cflags -O}"
+%endif
ldflags=""
libs=""
%if "%{with_mod_auth_pam}" == "yes"
@@ -819,6 +844,9 @@
--libexecdir=%{l_prefix}/lib/apache \
--datadir=%{l_prefix}/share/apache \
--localstatedir=%{l_prefix}/var/apache \
+%if "%{with_debug}" == "yes"
+ --without-execstrip \
+%endif
%if "%{with_suexec}" == "yes"
--enable-suexec \
--suexec-caller=%{with_suexec_caller} \
@@ -944,8 +972,10 @@
%{SOURCE rc.apache} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
# strip installation binaries
+%if "%{with_debug}" != "yes"
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* 2>/dev/null || true
+%endif
# determine installation tree files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6897 -r1.6898 news.txt
--- openpkg-web/news.txt 7 Oct 2003 09:51:54 - 1.6897
+++ openpkg-web/news.txt 7 Oct 2003 10:48:58 - 1.6898
@@ -1,3 +1,4 @@
+07-Oct-2003: Upgraded package: P
07-Oct-2003: Upgraded package: P
07-Oct-2003: Upgraded package: P
07-Oct-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 02-Oct-2003 20:32:33
Branch: HEAD Handle: 2003100219323002
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
move to now fixed %{error} macro
Summary:
RevisionChanges Path
1.171 +4 -4 openpkg-src/apache/apache.spec
1.6821 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.170 -r1.171 apache.spec
--- openpkg-src/apache/apache.spec22 Sep 2003 11:45:29 - 1.170
+++ openpkg-src/apache/apache.spec2 Oct 2003 18:32:32 - 1.171
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030922
+Release: 20031002
# package options (suexec related)
%option with_suexec yes
@@ -136,7 +136,7 @@
# fixing implicit inter-module dependencies and correlations
%if "%{with_mod_php}" == "yes"
%if "%{with_mod_php3}" == "yes"
-RPM ERROR: with_mod_php conflicts with with_mod_php3
+%{error:build-time options 'with_mod_php' and 'with_mod_php3' conflict}
%endif
%if "%{with_mod_ssl}" == "yes"
%undefine with_mod_php_openssl
@@ -199,8 +199,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030718
-PreReq: OpenPKG, openpkg >= 20030718
+BuildPreReq: OpenPKG, openpkg >= 20030927
+PreReq: OpenPKG, openpkg >= 20030927
%if "%{with_mod_ssl}" == "yes"
BuildPreReq: openssl, mm
PreReq: openssl, mm
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6820 -r1.6821 news.txt
--- openpkg-web/news.txt 2 Oct 2003 18:30:45 - 1.6820
+++ openpkg-web/news.txt 2 Oct 2003 18:32:30 - 1.6821
@@ -1,3 +1,4 @@
+02-Oct-2003: Upgraded package: P
02-Oct-2003: Upgraded package: P
02-Oct-2003: Upgraded package: P
02-Oct-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 16-Sep-2003 11:35:27
Branch: HEAD Handle: 2003091610352501
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
add optional UnixODBC support to mod_php
Summary:
RevisionChanges Path
1.169 +9 -1 openpkg-src/apache/apache.spec
1.6581 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.168 -r1.169 apache.spec
--- openpkg-src/apache/apache.spec10 Sep 2003 12:04:14 - 1.168
+++ openpkg-src/apache/apache.spec16 Sep 2003 09:35:26 - 1.169
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030910
+Release: 20030916
# package options (suexec related)
%option with_suexec yes
@@ -118,6 +118,7 @@
%option with_mod_php_gdbm no
%option with_mod_php_versioning no
%option with_mod_php_snmp no
+%option with_mod_php_unixodbc no
# package options (optional PHP3 specific settings; requires "with_mod_php3")
%option with_mod_php3_ftp no
@@ -305,6 +306,10 @@
BuildPreReq: snmp
PreReq: snmp
%endif
+%if "%{with_mod_php_unixodbc}" == "yes"
+BuildPreReq: unixodbc
+PreReq: unixodbc
+%endif
%endif
%if "%{with_mod_php3}" == "yes"
BuildPreReq: make, bison, flex
@@ -616,6 +621,9 @@
%endif
%if "%{with_mod_php_versioning}" == "yes"
--enable-versioning \
+%endif
+%if "%{with_mod_php_unixodbc}" == "yes"
+ --with-unixODBC=%{l_prefix} \
%endif
%if "%{with_mod_php_snmp}" == "yes"
--with-snmp=%{l_prefix} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6580 -r1.6581 news.txt
--- openpkg-web/news.txt 16 Sep 2003 09:33:47 - 1.6580
+++ openpkg-web/news.txt 16 Sep 2003 09:35:25 - 1.6581
@@ -1,3 +1,4 @@
+16-Sep-2003: Upgraded package: P
16-Sep-2003: Upgraded package: P
16-Sep-2003: Upgraded package: P
16-Sep-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 04-Sep-2003 23:14:38
Branch: HEAD Handle: 2003090422143602
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
add SNMP support to mod_php
Summary:
RevisionChanges Path
1.167 +9 -1 openpkg-src/apache/apache.spec
1.6406 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.166 -r1.167 apache.spec
--- openpkg-src/apache/apache.spec30 Aug 2003 07:48:17 - 1.166
+++ openpkg-src/apache/apache.spec4 Sep 2003 21:14:38 - 1.167
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030830
+Release: 20030904
# package options (suexec related)
%option with_suexec yes
@@ -117,6 +117,7 @@
%option with_mod_php_wddx no
%option with_mod_php_gdbm no
%option with_mod_php_versioning no
+%option with_mod_php_snmp no
# package options (optional PHP3 specific settings; requires "with_mod_php3")
%option with_mod_php3_ftp no
@@ -300,6 +301,10 @@
%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
BuildPreReq: ORACLE
%endif
+%if "%{with_mod_php_snmp}" == "yes"
+BuildPreReq: snmp
+PreReq: snmp
+%endif
%endif
%if "%{with_mod_php3}" == "yes"
BuildPreReq: make, bison, flex
@@ -611,6 +616,9 @@
%endif
%if "%{with_mod_php_versioning}" == "yes"
--enable-versioning \
+%endif
+%if "%{with_mod_php_snmp}" == "yes"
+ --with-snmp=%{l_prefix} \
%endif
--disable-cli \
--without-pear \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6405 -r1.6406 news.txt
--- openpkg-web/news.txt 4 Sep 2003 21:13:35 - 1.6405
+++ openpkg-web/news.txt 4 Sep 2003 21:14:36 - 1.6406
@@ -1,3 +1,4 @@
+04-Sep-2003: Upgraded package: P
04-Sep-2003: Upgraded package: P
04-Sep-2003: Upgraded package: P
04-Sep-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 12-Aug-2003 08:14:15
Branch: HEAD Handle: 2003081207141301
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
introduced shared core/chain options to resolve DSO problems on
Solaris (mod_coldfusion)
Summary:
RevisionChanges Path
1.163 +15 -1 openpkg-src/apache/apache.spec
1.6131 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.162 -r1.163 apache.spec
--- openpkg-src/apache/apache.spec31 Jul 2003 10:00:20 - 1.162
+++ openpkg-src/apache/apache.spec12 Aug 2003 06:14:14 - 1.163
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030731
+Release: 20030812
# package options (suexec related)
%option with_suexec yes
@@ -128,6 +128,8 @@
# package options (braindead ones only)
%option with_gdbm_ndbmno
+%option with_shared_core no
+%option with_shared_chain no
# fixing implicit inter-module dependencies and correlations
%if "%{with_mod_php}" == "yes"
@@ -421,6 +423,12 @@
%if "%{with_mod_ssl}" == "yes"
--enable-rule=EAPI \
%endif
+%if "%{with_shared_core}" == "yes"
+ --enable-rule=SHARED_CORE \
+%endif
+%if "%{with_shared_chain}" == "yes"
+ --enable-rule=SHARED_CHAIN \
+%endif
--target=apache \
--with-layout=GNU \
--prefix=%{l_prefix} \
@@ -820,6 +828,12 @@
--enable-rule=EXPAT \
%else
--disable-rule=EXPAT \
+%endif
+%if "%{with_shared_core}" == "yes"
+ --enable-rule=SHARED_CORE \
+%endif
+%if "%{with_shared_chain}" == "yes"
+ --enable-rule=SHARED_CHAIN \
%endif
%if "%{with_mod_layout}" == "yes"
--activate-module=src/modules/layout/liblayout.a \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6130 -r1.6131 news.txt
--- openpkg-web/news.txt 11 Aug 2003 18:59:11 - 1.6130
+++ openpkg-web/news.txt 12 Aug 2003 06:14:13 - 1.6131
@@ -1,3 +1,4 @@
+12-Aug-2003: Upgraded package: P
11-Aug-2003: Upgraded package: P
11-Aug-2003: Upgraded package: P
11-Aug-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 12-Aug-2003 15:14:33
Branch: HEAD Handle: 2003081214143200
Modified files:
openpkg-src/apache apache.spec
Log:
forced sendmail path
Summary:
RevisionChanges Path
1.164 +3 -0 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.163 -r1.164 apache.spec
--- openpkg-src/apache/apache.spec12 Aug 2003 06:14:14 - 1.163
+++ openpkg-src/apache/apache.spec12 Aug 2003 13:14:32 - 1.164
@@ -210,6 +210,7 @@
%endif
%if "%{with_mod_php}" == "yes"
BuildPreReq: gcc, sed, flex, bison
+PreReq: MTA
%if "%{with_mod_php_mysql}" == "yes"
BuildPreReq: mysql
PreReq: mysql
@@ -503,6 +504,8 @@
ORACLE_HOME="`%{l_prefix}/etc/rc --query oracle_home`"
export ORACLE_HOME
%endif
+ PROG_SENDMAIL="%{l_prefix}/sbin/sendmail"
+ export PROG_SENDMAIL
./configure \
--prefix=%{l_prefix} \
--with-apache=../apache_%{V_apache} \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-src/exim/ exim....
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 17-Jul-2003 20:29:56
Branch: HEAD Handle: 2003071719295005
Modified files:
openpkg-src/apache apache.spec
openpkg-src/eximexim.spec
openpkg-src/gnupg gnupg.spec
openpkg-src/jitterbug jitterbug.spec
openpkg-src/powerdnspowerdns.spec
openpkg-src/screen screen.spec
openpkg-src/sudosudo.spec
openpkg-src/traceroute traceroute.spec
openpkg-src/xterm xterm.spec
openpkg-web news.txt
Log:
fix PR#205, use variable %{l_susr} not constant root
Summary:
RevisionChanges Path
1.152 +1 -1 openpkg-src/apache/apache.spec
1.47+1 -1 openpkg-src/exim/exim.spec
1.36+4 -4 openpkg-src/gnupg/gnupg.spec
1.33+4 -4 openpkg-src/jitterbug/jitterbug.spec
1.24+1 -1 openpkg-src/powerdns/powerdns.spec
1.29+1 -1 openpkg-src/screen/screen.spec
1.49+3 -3 openpkg-src/sudo/sudo.spec
1.13+4 -4 openpkg-src/traceroute/traceroute.spec
1.53+4 -4 openpkg-src/xterm/xterm.spec
1.5618 +4 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.151 -r1.152 apache.spec
--- openpkg-src/apache/apache.spec17 Jul 2003 15:32:27 - 1.151
+++ openpkg-src/apache/apache.spec17 Jul 2003 18:29:51 - 1.152
@@ -919,7 +919,7 @@
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
%if "%{with_suexec}" == "yes"
-'%attr(4755,root,%{l_mgrp}) %{l_prefix}/sbin/suexec' \
+'%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/sbin/suexec' \
%endif
'%config %{l_prefix}/etc/apache/*' \
%if "%{with_mod_ssl}" == "yes"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/exim/exim.spec
$ cvs diff -u -r1.46 -r1.47 exim.spec
--- openpkg-src/exim/exim.spec17 Jul 2003 15:32:38 - 1.46
+++ openpkg-src/exim/exim.spec17 Jul 2003 18:29:51 - 1.47
@@ -178,7 +178,7 @@
%{l_files_std} \
'%not %dir %{l_prefix}/etc/fsl' \
'%config %{l_prefix}/etc/fsl/fsl.exim' \
- '%attr(4755,root,%{l_mgrp}) %{l_prefix}/bin/exim'
+ '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/exim'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gnupg/gnupg.spec
$ cvs diff -u -r1.35 -r1.36 gnupg.spec
--- openpkg-src/gnupg/gnupg.spec 8 Jul 2003 14:39:50 - 1.35
+++ openpkg-src/gnupg/gnupg.spec 17 Jul 2003 18:29:52 - 1.36
@@ -33,7 +33,7 @@
Group:Cryptography
License: GPL
Version: 1.2.2
-Release: 20030707
+Release: 20030717
# package options
%option with_idea no
@@ -45,8 +45,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, make
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20030717, make
+PreReq: OpenPKG, openpkg >= 20030717
BuildPreReq: zlib
PreReq: zlib
AutoReq: no
@@ -88,7 +88,7 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
-'%attr(4755,root,%{l_mgrp}) %{l_prefix}/bin/gpg'
+'%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jitterbug/jitterbug.spec
$ cvs diff -u -r1.32 -r1.33 jitterbug.spec
--- openpkg-src/jitterbug/jitterbug.spec 9 Jul 2003 14:59:36 - 1.32
+++ openpkg-src/jitterbug/jitterbug.spec 17 Jul 2003 18:29:53 - 1.33
@@ -33,7 +33,7 @@
Group:Database
License: GPL
Version: 1.6.2.3
-Release: 20030709
+Release: 20030717
# list of sources
Source0: ossp-jitterbug-%{version}.tar.gz
@@ -42,8 +42,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103
-PreReq: OpenPKG, openpkg >= 20030103, MTA, apache, gzip
+BuildPreReq: OpenPKG,
[CVS] OpenPKG: openpkg-src/apache/ apache.spec rc.apache openpkg-web/ ...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 17-Jul-2003 14:49:51
Branch: HEAD Handle: 2003071713494902
Modified files:
openpkg-src/apache apache.spec rc.apache
openpkg-web news.txt
Log:
%status
Summary:
RevisionChanges Path
1.150 +3 -3 openpkg-src/apache/apache.spec
1.10+11 -0 openpkg-src/apache/rc.apache
1.5613 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.149 -r1.150 apache.spec
--- openpkg-src/apache/apache.spec15 Jul 2003 10:43:50 - 1.149
+++ openpkg-src/apache/apache.spec17 Jul 2003 12:49:51 - 1.150
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030715
+Release: 20030717
# package options (suexec related)
%option with_suexec yes
@@ -196,8 +196,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030710
-PreReq: OpenPKG, openpkg >= 20030710
+BuildPreReq: OpenPKG, openpkg >= 20030716
+PreReq: OpenPKG, openpkg >= 20030716
%if "%{with_mod_ssl}" == "yes"
BuildPreReq: openssl, mm
PreReq: openssl, mm
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/rc.apache
$ cvs diff -u -r1.9 -r1.10 rc.apache
--- openpkg-src/apache/rc.apache 10 Jul 2003 07:50:14 - 1.9
+++ openpkg-src/apache/rc.apache 17 Jul 2003 12:49:51 - 1.10
@@ -18,6 +18,17 @@
apache_err_rotprolog="true"
apache_err_rotepilog="true"
+%status -p 200 -u @l_susr@ -o
+apache_usable="no"
+apache_active="no"
+@l_prefix@/sbin/apachectl configtest 2>/dev/null && apache_usable="yes"
+( eval `grep "^PIDFILE=" @l_prefix@/sbin/apachectl`
+ [ ".$PIDFILE" != . -a -f "$PIDFILE" ] && kill -0 `cat $PIDFILE`
+) && apache_active="yes"
+echo "apache_enable=\"$apache_enable\""
+echo "apache_usable=\"$apache_usable\""
+echo "apache_active=\"$apache_active\""
+
%start -p 200 -u @l_susr@
opServiceEnabled apache || exit 0
@l_prefix@/sbin/apachectl start
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5612 -r1.5613 news.txt
--- openpkg-web/news.txt 17 Jul 2003 12:21:40 - 1.5612
+++ openpkg-web/news.txt 17 Jul 2003 12:49:49 - 1.5613
@@ -1,3 +1,4 @@
+17-Jul-2003: Upgraded package: P
17-Jul-2003: Upgraded package: P
17-Jul-2003: Upgraded package: P
17-Jul-2003: New package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 15-Jul-2003 12:43:51
Branch: HEAD Handle: 2003071511434802
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
add PostgreSQL support for PHP
Summary:
RevisionChanges Path
1.149 +15 -1 openpkg-src/apache/apache.spec
1.5574 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.148 -r1.149 apache.spec
--- openpkg-src/apache/apache.spec10 Jul 2003 07:50:14 - 1.148
+++ openpkg-src/apache/apache.spec15 Jul 2003 10:43:50 - 1.149
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030710
+Release: 20030715
# package options (suexec related)
%option with_suexec yes
@@ -89,6 +89,7 @@
# package options (optional PHP4 specific settings; requires "with_mod_php")
%option with_mod_php_calendar no
%option with_mod_php_mysqlno
+%option with_mod_php_pgsqlno
%option with_mod_php_gd no
%option with_mod_php_db no
%option with_mod_php_debugno
@@ -147,6 +148,10 @@
%undefine with_mod_php_zlib
%define with_mod_php_zlib yes
%endif
+%if "%{with_mod_php_pgsql}" == "yes"
+%undefine with_mod_php_openssl
+%define with_mod_php_openssl yes
+%endif
%endif
%if "%{with_mod_php3}" == "yes"
%if "%{with_mod_ssl}" == "yes"
@@ -207,6 +212,10 @@
BuildPreReq: mysql
PreReq: mysql
%endif
+%if "%{with_mod_php_pgsql}" == "yes"
+BuildPreReq: postgresql, openssl
+PreReq: postgresql, openssl
+%endif
%if "%{with_mod_php_gd}" == "yes"
BuildPreReq: gd, jpeg, png
PreReq: gd, jpeg, png
@@ -497,6 +506,11 @@
--with-mysql=%{l_prefix} \
%else
--without-mysql \
+%endif
+%if "%{with_mod_php_pgsql}" == "yes"
+ --with-pgsql=%{l_prefix} \
+%else
+ --without-pgsql \
%endif
%if "%{with_mod_php_gd}" == "yes"
--with-gd=%{l_prefix} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5573 -r1.5574 news.txt
--- openpkg-web/news.txt 15 Jul 2003 10:43:08 - 1.5573
+++ openpkg-web/news.txt 15 Jul 2003 10:43:48 - 1.5574
@@ -1,3 +1,4 @@
+15-Jul-2003: Upgraded package: P
15-Jul-2003: Upgraded package: P
15-Jul-2003: Upgraded package: P
15-Jul-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 09-Jul-2003 11:09:01
Branch: HEAD Handle: 2003070910085901
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
fix path to LD_SHLIB in apxs
Summary:
RevisionChanges Path
1.147 +2 -1 openpkg-src/apache/apache.spec
1.5461 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.146 -r1.147 apache.spec
--- openpkg-src/apache/apache.spec8 Jul 2003 14:38:36 - 1.146
+++ openpkg-src/apache/apache.spec9 Jul 2003 09:09:00 - 1.147
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030707
+Release: 20030709
# package options (suexec related)
%option with_suexec yes
@@ -766,6 +766,7 @@
CFLAGS="$cflags" \
LDFLAGS="$ldflags" \
LIBS="$libs" \
+ LD_SHLIB="%{l_cc}" \
%if "%{with_mod_ssl}" == "yes"
EAPI_MM="%{l_prefix}" \
SSL_BASE="%{l_prefix}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5460 -r1.5461 news.txt
--- openpkg-web/news.txt 9 Jul 2003 08:23:37 - 1.5460
+++ openpkg-web/news.txt 9 Jul 2003 09:08:59 - 1.5461
@@ -1,3 +1,4 @@
+09-Jul-2003: Upgraded package: P
09-Jul-2003: Upgraded package: P
09-Jul-2003: Upgraded package: P
09-Jul-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 07-Jul-2003 10:17:04
Branch: HEAD Handle: 2003070709170201
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
add libraries to PreReq
Summary:
RevisionChanges Path
1.145 +30 -1 openpkg-src/apache/apache.spec
1.5296 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.144 -r1.145 apache.spec
--- openpkg-src/apache/apache.spec4 Jul 2003 14:00:08 - 1.144
+++ openpkg-src/apache/apache.spec7 Jul 2003 08:17:03 - 1.145
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030704
+Release: 20030707
# package options (suexec related)
%option with_suexec yes
@@ -195,6 +195,7 @@
PreReq: OpenPKG, openpkg >= 20030103
%if "%{with_mod_ssl}" == "yes"
BuildPreReq: openssl, mm
+PreReq: openssl, mm
%endif
%if "%{with_mod_perl}" == "yes"
BuildPreReq: perl
@@ -204,65 +205,86 @@
BuildPreReq: gcc, sed, flex, bison
%if "%{with_mod_php_mysql}" == "yes"
BuildPreReq: mysql
+PreReq: mysql
%endif
%if "%{with_mod_php_gd}" == "yes"
BuildPreReq: gd, jpeg, png
+PreReq: gd, jpeg, png
%endif
%if "%{with_mod_php_db}" == "yes"
BuildPreReq: db
+PreReq: db
%endif
%if "%{with_mod_php_pdflib}" == "yes"
BuildPreReq: pdflib, jpeg, png
+PreReq: pdflib, jpeg, png
%endif
%if "%{with_mod_php_zlib}" == "yes"
BuildPreReq: zlib
+PreReq: zlib
%endif
%if "%{with_mod_php_bzip2}" == "yes"
BuildPreReq: bzip2
+PreReq: bzip2
%endif
%if "%{with_mod_php_openssl}" == "yes"
BuildPreReq: openssl
+PreReq: openssl
%endif
%if "%{with_mod_php_openldap}" == "yes"
BuildPreReq: openldap, openssl
+PreReq: openldap, openssl
%if "%{with_mod_php_openldapsasl}" == "yes"
BuildPreReq: openldap::with_sasl = yes
+PreReq: openldap::with_sasl = yes
%else
BuildPreReq: openldap::with_sasl = no
+PreReq: openldap::with_sasl = no
%endif
%endif
%if "%{with_mod_php_mm}" == "yes"
BuildPreReq: mm
+PreReq: mm
%endif
%if "%{with_mod_php_pcre}" == "yes"
BuildPreReq: pcre
+PreReq: pcre
%endif
%if "%{with_mod_php_java}" == "yes"
BuildPreReq: j2se
+PreReq: j2se
%endif
%if "%{with_mod_php_freetype}" == "yes"
BuildPreReq: freetype
+PreReq: freetype
%endif
%if "%{with_mod_php_gettext}" == "yes"
BuildPreReq: gettext, libiconv
+PreReq: gettext, libiconv
%endif
%if "%{with_mod_php_imap}" == "yes"
BuildPreReq: imap, openssl
+PreReq: imap, openssl
%endif
%if "%{with_mod_php_xml}" == "yes"
BuildPreReq: expat
+PreReq: expat
%endif
%if "%{with_mod_php_dom}" == "yes"
BuildPreReq: libxml, libxslt
+PreReq: libxml, libxslt
%endif
%if "%{with_mod_php_curl}" == "yes"
BuildPreReq: curl
+PreReq: curl
%endif
%if "%{with_mod_php_mhash}" == "yes"
BuildPreReq: mhash
+PreReq: mhash
%endif
%if "%{with_mod_php_gdbm}" == "yes"
BuildPreReq: gdbm
+PreReq: gdbm
%endif
%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
BuildPreReq: ORACLE
@@ -272,22 +294,28 @@
BuildPreReq: make, bison, flex
%if "%{with_mod_php3_gd}" == "yes"
BuildPreReq: gd
+PreReq: gd
%endif
%if "%{with_mod_php3_jpeg}" == "yes"
BuildPreReq: jpeg
+PreReq: jpeg
%endif
%if "%{with_mod_php3_mysql}" == "yes"
BuildPreReq: mysql
+PreReq: mysql
%endif
%if "%{with_mod_php3_openssl}" == "yes"
BuildPreReq: openssl
+PreReq: openssl
%endif
%if "%{with_mod_php3_zlib}" == "yes"
BuildPreReq: zlib
+PreReq: zlib
%endif
%endif
%if "%{with_mod_auth_ldap}" == "yes"
BuildPreReq: openldap, openssl
+PreReq: openldap, openssl
%endif
%if "%{with_mod_auth_pam}" == "yes"
BuildPreReq: PAM
@@ -295,6 +323,7 @@
%endif
%if "%{with_gdbm_ndbm}" == "yes"
BuildPreReq: gdbm, gdbm::with_ndbm = yes
+PreReq: gdbm, gdbm::with_ndbm = yes
%endif
AutoReq: no
AutoReqProv: no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5295 -r1.5
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 04-Jul-2003 16:00:09
Branch: HEAD Handle: 2003070415000404
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
mysql3 is a 'faked' package for mysql (and not an 'alternative'
package as our definition states), so configure it and use it this way
Summary:
RevisionChanges Path
1.144 +3 -3 openpkg-src/apache/apache.spec
1.5251 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.143 -r1.144 apache.spec
--- openpkg-src/apache/apache.spec3 Jul 2003 17:38:20 - 1.143
+++ openpkg-src/apache/apache.spec4 Jul 2003 14:00:08 - 1.144
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030703
+Release: 20030704
# package options (suexec related)
%option with_suexec yes
@@ -203,7 +203,7 @@
%if "%{with_mod_php}" == "yes"
BuildPreReq: gcc, sed, flex, bison
%if "%{with_mod_php_mysql}" == "yes"
-BuildPreReq: MYSQL
+BuildPreReq: mysql
%endif
%if "%{with_mod_php_gd}" == "yes"
BuildPreReq: gd, jpeg, png
@@ -277,7 +277,7 @@
BuildPreReq: jpeg
%endif
%if "%{with_mod_php3_mysql}" == "yes"
-BuildPreReq: MYSQL
+BuildPreReq: mysql
%endif
%if "%{with_mod_php3_openssl}" == "yes"
BuildPreReq: openssl
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5250 -r1.5251 news.txt
--- openpkg-web/news.txt 4 Jul 2003 13:59:42 - 1.5250
+++ openpkg-web/news.txt 4 Jul 2003 14:00:04 - 1.5251
@@ -1,3 +1,4 @@
+04-Jul-2003: Upgraded package: P
04-Jul-2003: Upgraded package: P
04-Jul-2003: Upgraded package: P
04-Jul-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 02-Jul-2003 09:49:21
Branch: HEAD Handle: 2003070208492001
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
fix handling of with_mod_php_wddx option
Summary:
RevisionChanges Path
1.142 +2 -2 openpkg-src/apache/apache.spec
1.5145 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.141 -r1.142 apache.spec
--- openpkg-src/apache/apache.spec1 Jul 2003 10:13:38 - 1.141
+++ openpkg-src/apache/apache.spec2 Jul 2003 07:49:21 - 1.142
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030701
+Release: 20030702
# package options (suexec related)
%option with_suexec yes
@@ -539,7 +539,7 @@
--with-dom-xslt=%{l_prefix} \
--with-dom-exslt=%{l_prefix} \
%endif
-%if "%{with_mod_php_dom}" == "yes"
+%if "%{with_mod_php_wddx}" == "yes"
--enable-wddx \
%endif
%if "%{with_mod_php_bc}" == "yes"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5144 -r1.5145 news.txt
--- openpkg-web/news.txt 2 Jul 2003 07:48:24 - 1.5144
+++ openpkg-web/news.txt 2 Jul 2003 07:49:20 - 1.5145
@@ -1,3 +1,4 @@
+02-Jul-2003: Upgraded package: P
02-Jul-2003: Upgraded package: P
02-Jul-2003: Upgraded package: P
02-Jul-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec php.patch openpkg-web/ ...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 01-Jul-2003 12:13:38
Branch: HEAD Handle: 200307033701
Added files:
openpkg-src/apache php.patch
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
php oci8 driver: don't use OCI_SHARED_MODE by default
Summary:
RevisionChanges Path
1.141 +4 -2 openpkg-src/apache/apache.spec
1.2 +10 -0 openpkg-src/apache/php.patch
1.5116 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.140 -r1.141 apache.spec
--- openpkg-src/apache/apache.spec27 Jun 2003 09:24:04 - 1.140
+++ openpkg-src/apache/apache.spec1 Jul 2003 10:13:38 - 1.141
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030627
+Release: 20030701
# package options (suexec related)
%option with_suexec yes
@@ -186,6 +186,7 @@
Source23: apache.pl
Source24: rc.apache
Patch0: apache.patch
+Patch1: php.patch
# build information
Prefix: %{l_prefix}
@@ -312,7 +313,7 @@
%prep
# unpack Apache distribution
%setup0 -q -c
-%patch -p0
+%patch0 -p0
# unpack optional extension modules
%if "%{with_mod_ssl}" == "yes"
@@ -323,6 +324,7 @@
%endif
%if "%{with_mod_php}" == "yes"
%setup3 -q -T -D -a 3
+%patch1 -p0
%endif
%if "%{with_mod_dav}" == "yes"
%setup4 -q -T -D -a 4
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/php.patch
$ cvs diff -u -r0 -r1.2 php.patch
--- /dev/null 2003-07-01 12:13:38.0 +0200
+++ php.patch 2003-07-01 12:13:38.0 +0200
@@ -0,0 +1,10 @@
+--- php-4.3.2/ext/oci8/config.m4.dist2003-07-01 09:55:33.0 +0200
php-4.3.2/ext/oci8/config.m4 2003-07-01 0:56:01.0 +0200
+@@ -100,7 +100,6 @@
+ PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
+ PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
+ AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
+- AC_DEFINE(HAVE_OCI8_SHARED_MODE,1,[ ])
+
+ dnl These functions are only available in version >= 9.2
+ PHP_CHECK_LIBRARY(clntsh, OCIEnvNlsCreate,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5115 -r1.5116 news.txt
--- openpkg-web/news.txt 1 Jul 2003 10:13:03 - 1.5115
+++ openpkg-web/news.txt 1 Jul 2003 10:13:37 - 1.5116
@@ -1,3 +1,4 @@
+01-Jul-2003: Upgraded package: P
01-Jul-2003: Upgraded package: P
01-Jul-2003: Upgraded package: P
01-Jul-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Jun-2003 11:24:05
Branch: HEAD Handle: 2003062710240400
Modified files:
openpkg-src/apache apache.spec
Log:
only include sasl dependencies when building with php_openldap at all
Summary:
RevisionChanges Path
1.140 +1 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.139 -r1.140 apache.spec
--- openpkg-src/apache/apache.spec27 Jun 2003 09:16:04 - 1.139
+++ openpkg-src/apache/apache.spec27 Jun 2003 09:24:04 - 1.140
@@ -224,11 +224,11 @@
%endif
%if "%{with_mod_php_openldap}" == "yes"
BuildPreReq: openldap, openssl
-%endif
%if "%{with_mod_php_openldapsasl}" == "yes"
BuildPreReq: openldap::with_sasl = yes
%else
BuildPreReq: openldap::with_sasl = no
+%endif
%endif
%if "%{with_mod_php_mm}" == "yes"
BuildPreReq: mm
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 27-Jun-2003 11:16:05
Branch: HEAD Handle: 2003062710160301
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
drop php include/build files, they are part of the php package. add
option with_mod_php_openldapsasl to select SASL bindings for openldap.
Yes, that's a hack.
Summary:
RevisionChanges Path
1.139 +70 -62 openpkg-src/apache/apache.spec
1.5034 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.138 -r1.139 apache.spec
--- openpkg-src/apache/apache.spec11 Jun 2003 10:18:20 - 1.138
+++ openpkg-src/apache/apache.spec27 Jun 2003 09:16:04 - 1.139
@@ -60,72 +60,73 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030611
+Release: 20030627
# package options (suexec related)
-%option with_suexec yes
-%option with_suexec_caller %{l_nusr}
-%option with_suexec_userdir public_html
+%option with_suexec yes
+%option with_suexec_caller%{l_nusr}
+%option with_suexec_userdir public_html
# package options (additionally used Apache modules; can be enabled without
thinking)
-%option with_mod_sslno
-%option with_mod_perl no
-%option with_mod_phpno
-%option with_mod_php3 no
-%option with_mod_davno
-%option with_mod_layout no
-%option with_mod_macro no
+%option with_mod_ssl no
+%option with_mod_perl no
+%option with_mod_php no
+%option with_mod_php3 no
+%option with_mod_dav no
+%option with_mod_layout no
+%option with_mod_macrono
# package options (additionally used Apache modules; you have to know what you do)
-%option with_mod_auth_ldap no
-%option with_mod_auth_pam no
-%option with_mod_gzip no
-%option with_mod_fastcgino
-%option with_mod_throttle no
-%option with_mod_access_referer no
-%option with_mod_roamingno
-%option with_mod_relocate no
+%option with_mod_auth_ldapno
+%option with_mod_auth_pam no
+%option with_mod_gzip no
+%option with_mod_fastcgi no
+%option with_mod_throttle no
+%option with_mod_access_referer no
+%option with_mod_roaming no
+%option with_mod_relocate no
# package options (optional PHP4 specific settings; requires "with_mod_php")
-%option with_mod_php_calendar no
-%option with_mod_php_mysql no
-%option with_mod_php_gd no
-%option with_mod_php_db no
-%option with_mod_php_debug no
-%option with_mod_php_pdflib no
-%option with_mod_php_zlib no
-%option with_mod_php_bzip2 no
-%option with_mod_php_opensslno
-%option with_mod_php_openldap no
-%option with_mod_php_mm no
-%option with_mod_php_pcre no
-%option with_mod_php_ftpno
-%option with_mod_php_java no
-%option with_mod_php_oci7 no
-%option with_mod_php_oci8 no
-%option with_mod_php_freetype no
-%option with_mod_php_gettextno
-%option with_mod_php_imap no
-%option with_mod_php_xmlno
-%option with_mod_php_domno
-%option with_mod_php_bc no
-%option with_mod_php_transsid no
-%option with_mod_php_curl no
-%option with_mod_php_mhash no
-%option with_mod_php_wddx no
-%option with_mod_php_gdbm no
-%option with_mod_php_versioning no
+%option with_mod_php_calendar no
+%option with_mod_php_mysqlno
+%option with_mod_php_gd no
+%option with_mod_php_db no
+%option with_mod_php_debugno
+%option with_mod_php_pdflib no
+%option with_mod_php_zlib no
+%option with_mod_php_bzip2no
+%option with_mod_
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 05-Jun-2003 11:42:26
Branch: HEAD Handle: 2003060510422402
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
fix Berkeley-DB support in mod_php (especially under RedHat)
Summary:
RevisionChanges Path
1.137 +5 -2 openpkg-src/apache/apache.spec
1.4737 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.136 -r1.137 apache.spec
--- openpkg-src/apache/apache.spec4 Jun 2003 15:17:49 - 1.136
+++ openpkg-src/apache/apache.spec5 Jun 2003 09:42:26 - 1.137
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030604
+Release: 20030605
# package options (suexec related)
%option with_suexec yes
@@ -442,6 +442,9 @@
%if "%{with_mod_php_imap}" == "yes"
LIBS="$LIBS -lssl -lcrypto"
%endif
+%if "%{with_mod_php_db}" == "yes"
+ LIBS="$LIBS -ldb"
+%endif
%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
ORACLE_HOME="`%{l_prefix}/etc/rc --query oracle_home`"
export ORACLE_HOME
@@ -469,7 +472,7 @@
--with-freetype-dir=%{l_prefix} \
%endif
%if "%{with_mod_php_db}" == "yes"
- --with-db3=%{l_prefix} \
+ --with-db4=%{l_prefix} \
%endif
%if "%{with_mod_php_debug}" == "yes"
--with-debug=yes \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4736 -r1.4737 news.txt
--- openpkg-web/news.txt 5 Jun 2003 08:20:46 - 1.4736
+++ openpkg-web/news.txt 5 Jun 2003 09:42:24 - 1.4737
@@ -1,3 +1,4 @@
+05-Jun-2003: Upgraded package: P
05-Jun-2003: Upgraded package: P
05-Jun-2003: Upgraded package: P
05-Jun-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 04-Jun-2003 17:17:50
Branch: HEAD Handle: 2003060416174801
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
fix building of mod_auth_pam under GCC 3.3
Summary:
RevisionChanges Path
1.136 +3 -2 openpkg-src/apache/apache.spec
1.4725 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.135 -r1.136 apache.spec
--- openpkg-src/apache/apache.spec3 Jun 2003 15:45:40 - 1.135
+++ openpkg-src/apache/apache.spec4 Jun 2003 15:17:49 - 1.136
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030603
+Release: 20030604
# package options (suexec related)
%option with_suexec yes
@@ -643,7 +643,8 @@
# optionally prepare mod_auth_pam
%if "%{with_mod_auth_pam}" == "yes"
( cd mod_auth_pam-%{V_mod_auth_pam}
- cp mod_auth_pam.c ../apache_%{V_apache}/src/modules/extra/
+ sed -e '234N;s/\n//' -e '239N;s/\n//' ../apache_%{V_apache}/src/modules/extra/mod_auth_pam.c
)
%endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4724 -r1.4725 news.txt
--- openpkg-web/news.txt 4 Jun 2003 12:48:54 - 1.4724
+++ openpkg-web/news.txt 4 Jun 2003 15:17:48 - 1.4725
@@ -1,3 +1,4 @@
+04-Jun-2003: Upgraded package: P
04-Jun-2003: Upgraded package: P
04-Jun-2003: Upgraded package: P
04-Jun-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 03-Jun-2003 17:45:40
Branch: HEAD Handle: 2003060316453802
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
there is a single gd now
Summary:
RevisionChanges Path
1.135 +3 -3 openpkg-src/apache/apache.spec
1.4706 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.134 -r1.135 apache.spec
--- openpkg-src/apache/apache.spec29 May 2003 18:28:22 - 1.134
+++ openpkg-src/apache/apache.spec3 Jun 2003 15:45:40 - 1.135
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030529
+Release: 20030603
# package options (suexec related)
%option with_suexec yes
@@ -204,7 +204,7 @@
BuildPreReq: MYSQL
%endif
%if "%{with_mod_php_gd}" == "yes"
-BuildPreReq: GD, jpeg, png
+BuildPreReq: gd, jpeg, png
%endif
%if "%{with_mod_php_db}" == "yes"
BuildPreReq: db
@@ -264,7 +264,7 @@
%if "%{with_mod_php3}" == "yes"
BuildPreReq: make, bison, flex
%if "%{with_mod_php3_gd}" == "yes"
-BuildPreReq: GD
+BuildPreReq: gd
%endif
%if "%{with_mod_php3_jpeg}" == "yes"
BuildPreReq: jpeg
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4705 -r1.4706 news.txt
--- openpkg-web/news.txt 3 Jun 2003 15:43:50 - 1.4705
+++ openpkg-web/news.txt 3 Jun 2003 15:45:38 - 1.4706
@@ -1,3 +1,4 @@
+03-Jun-2003: Upgraded package: P
03-Jun-2003: Upgraded package: P
03-Jun-2003: Upgraded package: P
03-Jun-2003: New package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 04-Apr-2003 10:22:42
Branch: HEAD Handle: 2003040409224101
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
make apache.vhost a noreplace config
Summary:
RevisionChanges Path
1.129 +3 -2 openpkg-src/apache/apache.spec
1.3946 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.128 -r1.129 apache.spec
--- openpkg-src/apache/apache.spec28 Mar 2003 09:59:17 - 1.128
+++ openpkg-src/apache/apache.spec4 Apr 2003 08:22:42 - 1.129
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030328
+Release: 20030404
# package options (suexec related)
%option with_suexec yes
@@ -876,7 +876,8 @@
'%config %{l_prefix}/etc/apache/ssl.key/*.key' \
'%config %{l_prefix}/etc/apache/ssl.prm/*.prm' \
%endif
-'%config %attr(444,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/apache/apache.base'
+'%config %attr(444,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/apache/apache.base'
\
+'%config(noreplace) %attr(444,%{l_musr},%{l_mgrp})
%{l_prefix}/etc/apache/apache.vhost'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.3945 -r1.3946 news.txt
--- openpkg-web/news.txt 4 Apr 2003 07:31:13 - 1.3945
+++ openpkg-web/news.txt 4 Apr 2003 08:22:41 - 1.3946
@@ -1,3 +1,4 @@
+04-Apr-2003: Upgraded package: P
04-Apr-2003: Upgraded package: P
04-Apr-2003: Upgraded package: P
04-Apr-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec rc.apache openpkg-web/ ...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Mar-2003 10:59:17
Branch: HEAD Handle: 2003032809591502
Modified files:
openpkg-src/apache apache.spec rc.apache
openpkg-web news.txt
Log:
rc script clean up
Summary:
RevisionChanges Path
1.128 +4 -3 openpkg-src/apache/apache.spec
1.7 +4 -4 openpkg-src/apache/rc.apache
1.3846 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.127 -r1.128 apache.spec
--- openpkg-src/apache/apache.spec21 Mar 2003 14:31:43 - 1.127
+++ openpkg-src/apache/apache.spec28 Mar 2003 09:59:17 - 1.128
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030321
+Release: 20030328
# package options (suexec related)
%option with_suexec yes
@@ -853,8 +853,9 @@
# create run-command script
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-%{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g'\
--e 's;@l_musr@;%{l_musr};g' -e 's;@l_mgrp@;%{l_mgrp};g' \
+%{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
+-e 's;@l_susr@;%{l_susr};g' -e 's;@l_sgrp@;%{l_sgrp};g' \
+-e 's;@l_musr@;%{l_musr};g' -e 's;@l_mgrp@;%{l_mgrp};g' \
%{SOURCE rc.apache} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
# strip installation binaries
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/rc.apache
$ cvs diff -u -r1.6 -r1.7 rc.apache
--- openpkg-src/apache/rc.apache 7 Feb 2002 14:20:54 - 1.6
+++ openpkg-src/apache/rc.apache 28 Mar 2003 09:59:17 - 1.7
@@ -18,20 +18,20 @@
apache_err_rotprolog="true"
apache_err_rotepilog="true"
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
opServiceEnabled apache || exit 0
@l_prefix@/sbin/apachectl start
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
opServiceEnabled apache || exit 0
@l_prefix@/sbin/apachectl stop
sleep 2
-%restart -u root
+%restart -u @l_susr@
opServiceEnabled apache || exit 0
@l_prefix@/sbin/apachectl restart
-%daily -u root
+%daily -u @l_susr@
opServiceEnabled apache || exit 0
if [ ".$apache_log_files" != . ]; then
shtool rotate -f \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.3845 -r1.3846 news.txt
--- openpkg-web/news.txt 28 Mar 2003 09:57:52 - 1.3845
+++ openpkg-web/news.txt 28 Mar 2003 09:59:15 - 1.3846
@@ -1,3 +1,4 @@
+28-Mar-2003: Upgraded package: P
28-Mar-2003: Upgraded package: P
28-Mar-2003: Upgraded package: P
28-Mar-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Feb-2003 15:28:15
Branch: HEAD Handle: 2003022814281301
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
disable mysql support instead of falling back to embedded code
Summary:
RevisionChanges Path
1.124 +5 -1 openpkg-src/apache/apache.spec
1.3487 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.123 -r1.124 apache.spec
--- openpkg-src/apache/apache.spec18 Feb 2003 08:27:39 - 1.123
+++ openpkg-src/apache/apache.spec28 Feb 2003 14:28:14 - 1.124
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030218
+Release: 20030228
# package options (suexec related)
%option with_suexec yes
@@ -455,6 +455,8 @@
%endif
%if "%{with_mod_php_mysql}" == "yes"
--with-mysql=%{l_prefix} \
+%else
+ --without-mysql \
%endif
%if "%{with_mod_php_gd}" == "yes"
--with-gd=%{l_prefix} \
@@ -582,6 +584,8 @@
%endif
%if "%{with_mod_php3_mysql}" == "yes"
--with-mysql=%{l_prefix} \
+%else
+ --without-mysql \
%endif
%if "%{with_mod_php3_zlib}" == "yes"
--with-zlib=%{l_prefix} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.3486 -r1.3487 news.txt
--- openpkg-web/news.txt 28 Feb 2003 14:22:05 - 1.3486
+++ openpkg-web/news.txt 28 Feb 2003 14:28:13 - 1.3487
@@ -1,3 +1,4 @@
+28-Feb-2003: Upgraded package: P
28-Feb-2003: Upgraded package: P
27-Feb-2003: New package: P
27-Feb-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 12-Feb-2003 11:00:43
Branch: HEAD Handle: 2003021210004101
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
fix typo
Summary:
RevisionChanges Path
1.122 +2 -2 openpkg-src/apache/apache.spec
1.3275 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.121 -r1.122 apache.spec
--- openpkg-src/apache/apache.spec11 Feb 2003 16:25:39 - 1.121
+++ openpkg-src/apache/apache.spec12 Feb 2003 10:00:42 - 1.122
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030211
+Release: 20030212
# package options (suexec related)
%option with_suexec yes
@@ -157,7 +157,7 @@
%define with_mod_php3_zlib yes
%endif
%endif
-%if "%{with_php_gdbm}" == "yes"
+%if "%{with_mod_php_gdbm}" == "yes"
%undefine with_gdbm_ndbm
%define with_gdbm_ndbm yes
%endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.3274 -r1.3275 news.txt
--- openpkg-web/news.txt 12 Feb 2003 09:30:23 - 1.3274
+++ openpkg-web/news.txt 12 Feb 2003 10:00:41 - 1.3275
@@ -1,3 +1,4 @@
+12-Feb-2003: Upgraded package: P
12-Feb-2003: Upgraded package: P
12-Feb-2003: Upgraded package: P
12-Feb-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 11-Feb-2003 17:25:46
Branch: HEAD Handle: 2003021116252613
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
add optional GDBM based NDBM support
Summary:
RevisionChanges Path
1.121 +15 -0 openpkg-src/apache/apache.spec
1.3268 +2 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.120 -r1.121 apache.spec
--- openpkg-src/apache/apache.spec11 Feb 2003 14:25:02 - 1.120
+++ openpkg-src/apache/apache.spec11 Feb 2003 16:25:39 - 1.121
@@ -124,6 +124,9 @@
%option with_mod_php3_openssl no
%option with_mod_php3_zlib no
+# package options (braindead ones only)
+%option with_gdbm_ndbm no
+
# fixing implicit inter-module dependencies and correlations
%if "%{with_mod_php}" == "yes"
%if "%{with_mod_php3}" == "yes"
@@ -154,6 +157,10 @@
%define with_mod_php3_zlib yes
%endif
%endif
+%if "%{with_php_gdbm}" == "yes"
+%undefine with_gdbm_ndbm
+%define with_gdbm_ndbm yes
+%endif
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -279,6 +286,9 @@
BuildPreReq: PAM
PreReq: PAM
%endif
+%if "%{with_gdbm_ndbm}" == "yes"
+BuildPreReq: gdbm, gdbm::with_ndbm = yes
+%endif
AutoReq: no
AutoReqProv: no
@@ -701,6 +711,11 @@
cflags="$cflags -I%{l_prefix}/include"
ldflags="$ldflags -L%{l_prefix}/lib"
libs="$libs -lldap -llber -lssl -lcrypto"
+%endif
+%if "%{with_gdbm_ndbm}" == "yes"
+ cflags="$cflags -I%{l_prefix}/include"
+ ldflags="$ldflags -L%{l_prefix}/lib"
+ libs="$libs -lndbm -lgdbm"
%endif
CC="%{l_cc}" \
CFLAGS="$cflags" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.3267 -r1.3268 news.txt
--- openpkg-web/news.txt 11 Feb 2003 15:44:17 - 1.3267
+++ openpkg-web/news.txt 11 Feb 2003 16:25:26 - 1.3268
@@ -1,3 +1,5 @@
+11-Feb-2003: Upgraded package: P
+11-Feb-2003: Upgraded package: P
11-Feb-2003: Upgraded package: P
11-Feb-2003: Upgraded package: P
11-Feb-2003: New package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 11-Feb-2003 15:25:03
Branch: HEAD Handle: 2003021114250200
Modified files:
openpkg-src/apache apache.spec
Log:
more meat
Summary:
RevisionChanges Path
1.120 +12 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.119 -r1.120 apache.spec
--- openpkg-src/apache/apache.spec10 Feb 2003 15:07:32 - 1.119
+++ openpkg-src/apache/apache.spec11 Feb 2003 14:25:02 - 1.120
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030210
+Release: 20030211
# package options (suexec related)
%option with_suexec yes
@@ -113,6 +113,8 @@
%option with_mod_php_curl no
%option with_mod_php_mhash no
%option with_mod_php_wddx no
+%option with_mod_php_gdbm no
+%option with_mod_php_versioning no
# package options (optional PHP3 specific settings; requires "with_mod_php3")
%option with_mod_php3_ftp no
@@ -245,6 +247,9 @@
%if "%{with_mod_php_mhash}" == "yes"
BuildPreReq: mhash
%endif
+%if "%{with_mod_php_gdbm}" == "yes"
+BuildPreReq: gdbm
+%endif
%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
BuildPreReq: ORACLE
%endif
@@ -525,6 +530,12 @@
%endif
%if "%{with_mod_php_curl}" == "yes"
--with-curl=%{l_prefix} \
+%endif
+%if "%{with_mod_php_gdbm}" == "yes"
+ --with-gdbm=%{l_prefix} \
+%endif
+%if "%{with_mod_php_versioning}" == "yes"
+ --enable-versioning \
%endif
--disable-cli \
--without-pear \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 10-Feb-2003 16:07:33
Branch: HEAD Handle: 2003021015073200
Modified files:
openpkg-src/apache apache.spec
Log:
argh, damn suexec, go home ;-]
Summary:
RevisionChanges Path
1.119 +2 -0 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.118 -r1.119 apache.spec
--- openpkg-src/apache/apache.spec10 Feb 2003 15:00:19 - 1.118
+++ openpkg-src/apache/apache.spec10 Feb 2003 15:07:32 - 1.119
@@ -834,7 +834,9 @@
# determine installation tree files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
+%if "%{with_suexec}" == "yes"
'%attr(4755,root,%{l_mgrp}) %{l_prefix}/sbin/suexec' \
+%endif
'%config %{l_prefix}/etc/apache/*' \
%if "%{with_mod_ssl}" == "yes"
'%config %{l_prefix}/etc/apache/ssl.crl/*.crl' \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 10-Feb-2003 16:00:20
Branch: HEAD Handle: 2003021015001900
Modified files:
openpkg-src/apache apache.spec
Log:
'--disable-suexec' does not work, simply skip it
Summary:
RevisionChanges Path
1.118 +0 -2 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.117 -r1.118 apache.spec
--- openpkg-src/apache/apache.spec10 Feb 2003 14:54:01 - 1.117
+++ openpkg-src/apache/apache.spec10 Feb 2003 15:00:19 - 1.118
@@ -712,8 +712,6 @@
--enable-suexec \
--suexec-caller=%{with_suexec_caller} \
--suexec-userdir=%{with_suexec_userdir} \
-%else
- --disable-suexec \
%endif
--enable-module=most \
--with-perl=%{l_prefix}/bin/perl \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 10-Feb-2003 15:54:03
Branch: HEAD Handle: 2003021014540100
Modified files:
openpkg-src/apache apache.spec
Log:
add better suexec support
Summary:
RevisionChanges Path
1.117 +11 -2 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.116 -r1.117 apache.spec
--- openpkg-src/apache/apache.spec10 Feb 2003 13:07:49 - 1.116
+++ openpkg-src/apache/apache.spec10 Feb 2003 14:54:01 - 1.117
@@ -62,6 +62,11 @@
Version: %{V_apache}
Release: 20030210
+# package options (suexec related)
+%option with_suexec yes
+%option with_suexec_caller %{l_nusr}
+%option with_suexec_userdir public_html
+
# package options (additionally used Apache modules; can be enabled without
thinking)
%option with_mod_sslno
%option with_mod_perl no
@@ -703,9 +708,13 @@
--libexecdir=%{l_prefix}/lib/apache \
--datadir=%{l_prefix}/share/apache \
--localstatedir=%{l_prefix}/var/apache \
+%if "%{with_suexec}" == "yes"
--enable-suexec \
- --suexec-caller=%{l_nusr} \
- --suexec-userdir=.www \
+ --suexec-caller=%{with_suexec_caller} \
+ --suexec-userdir=%{with_suexec_userdir} \
+%else
+ --disable-suexec \
+%endif
--enable-module=most \
--with-perl=%{l_prefix}/bin/perl \
%if "%{with_mod_ssl}" == "yes"
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 10-Feb-2003 14:07:50
Branch: HEAD Handle: 2003021013074900
Modified files:
openpkg-src/apache apache.spec
Log:
add WDDX support, too
Summary:
RevisionChanges Path
1.116 +4 -0 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.115 -r1.116 apache.spec
--- openpkg-src/apache/apache.spec10 Feb 2003 10:22:02 - 1.115
+++ openpkg-src/apache/apache.spec10 Feb 2003 13:07:49 - 1.116
@@ -107,6 +107,7 @@
%option with_mod_php_transsid no
%option with_mod_php_curl no
%option with_mod_php_mhash no
+%option with_mod_php_wddx no
# package options (optional PHP3 specific settings; requires "with_mod_php3")
%option with_mod_php3_ftp no
@@ -504,6 +505,9 @@
--with-dom=%{l_prefix} \
--with-dom-xslt=%{l_prefix} \
--with-dom-exslt=%{l_prefix} \
+%endif
+%if "%{with_mod_php_dom}" == "yes"
+ --enable-wddx \
%endif
%if "%{with_mod_php_bc}" == "yes"
--enable-bcmath \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 07-Feb-2003 18:19:43
Branch: HEAD Handle: 2003020717194200
Modified files:
openpkg-src/apache apache.spec
Log:
add DOM/XSLT support; fix zlib support
Summary:
RevisionChanges Path
1.114 +11 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.113 -r1.114 apache.spec
--- openpkg-src/apache/apache.spec7 Feb 2003 16:24:44 - 1.113
+++ openpkg-src/apache/apache.spec7 Feb 2003 17:19:42 - 1.114
@@ -102,6 +102,7 @@
%option with_mod_php_gettextno
%option with_mod_php_imap no
%option with_mod_php_xmlno
+%option with_mod_php_domno
%option with_mod_php_bc no
%option with_mod_php_transsid no
%option with_mod_php_curl no
@@ -130,7 +131,7 @@
%undefine with_mod_php_gd
%define with_mod_php_gd yes
%endif
-%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_pdflib}" == "yes" ||
"%{with_mod_php_gd}" == "yes"
+%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_pdflib}" == "yes" ||
"%{with_mod_php_gd}" == "yes" || "%{with_mod_php_dom}" == "yes"
%undefine with_mod_php_zlib
%define with_mod_php_zlib yes
%endif
@@ -228,6 +229,9 @@
%if "%{with_mod_php_xml}" == "yes"
BuildPreReq: expat
%endif
+%if "%{with_mod_php_dom}" == "yes"
+BuildPreReq: libxml, libxslt
+%endif
%if "%{with_mod_php_curl}" == "yes"
BuildPreReq: curl
%endif
@@ -449,6 +453,7 @@
%endif
%if "%{with_mod_php_zlib}" == "yes"
--with-zlib=%{l_prefix} \
+ --with-zlib-dir=%{l_prefix} \
%endif
%if "%{with_mod_php_bzip2}" == "yes"
--with-bz2=%{l_prefix} \
@@ -492,6 +497,11 @@
%endif
%if "%{with_mod_php_xml}" == "yes"
--with-xml=%{l_prefix} \
+%endif
+%if "%{with_mod_php_dom}" == "yes"
+ --with-dom=%{l_prefix} \
+ --with-dom-xslt=%{l_prefix} \
+ --with-dom-exslt=%{l_prefix} \
%endif
%if "%{with_mod_php_bc}" == "yes"
--enable-bcmath \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 07-Feb-2003 17:24:44 Branch: HEAD Handle: 2003020716244400 Modified files: openpkg-src/apache apache.spec Log: fix mod_auth_pam building Summary: RevisionChanges Path 1.113 +1 -1 openpkg-src/apache/apache.spec patch -p0 <<'@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.112 -r1.113 apache.spec --- openpkg-src/apache/apache.spec7 Feb 2003 16:20:33 - 1.112 +++ openpkg-src/apache/apache.spec7 Feb 2003 16:24:44 - 1.113 @@ -41,7 +41,7 @@ %define V_mod_dav1.0.3-1.3.6 %define V_mod_layout 3.2 %define V_mod_macro 1.1.2 -%define V_mod_auth_pam 1.0a +%define V_mod_auth_pam 1.1.1 %define V_mod_auth_ldap 2.4.1 %define V_mod_gzip 1.3.19.1a %define V_mod_fastcgi2.4.0 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 07-Feb-2003 17:20:34
Branch: HEAD Handle: 2003020716203201
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
use new ORACLE/oracle package and add OCI7 support, too
Summary:
RevisionChanges Path
1.112 +12 -1 openpkg-src/apache/apache.spec
1.3229 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.111 -r1.112 apache.spec
--- openpkg-src/apache/apache.spec6 Feb 2003 11:26:56 - 1.111
+++ openpkg-src/apache/apache.spec7 Feb 2003 16:20:33 - 1.112
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030206
+Release: 20030207
# package options (additionally used Apache modules; can be enabled without
thinking)
%option with_mod_sslno
@@ -96,6 +96,7 @@
%option with_mod_php_pcre no
%option with_mod_php_ftpno
%option with_mod_php_java no
+%option with_mod_php_oci7 no
%option with_mod_php_oci8 no
%option with_mod_php_freetype no
%option with_mod_php_gettextno
@@ -233,6 +234,9 @@
%if "%{with_mod_php_mhash}" == "yes"
BuildPreReq: mhash
%endif
+%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
+BuildPreReq: ORACLE
+%endif
%endif
%if "%{with_mod_php3}" == "yes"
BuildPreReq: make, bison, flex
@@ -411,6 +415,10 @@
%if "%{with_mod_php_imap}" == "yes"
LIBS="$LIBS -lssl -lcrypto"
%endif
+%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
+ ORACLE_HOME="`%{l_prefix}/etc/rc --query oracle_home`"
+ export ORACLE_HOME
+%endif
./configure \
--prefix=%{l_prefix} \
--with-apache=../apache_%{V_apache} \
@@ -468,6 +476,9 @@
%endif
%if "%{with_mod_php_java}" == "yes"
--with-java=%{l_prefix}/libexec/j2se \
+%endif
+%if "%{with_mod_php_oci7}" == "yes"
+ --with-oracle \
%endif
%if "%{with_mod_php_oci8}" == "yes"
--with-oci8 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.3228 -r1.3229 news.txt
--- openpkg-web/news.txt 7 Feb 2003 16:13:45 - 1.3228
+++ openpkg-web/news.txt 7 Feb 2003 16:20:32 - 1.3229
@@ -1,3 +1,4 @@
+07-Feb-2003: Upgraded package: P
07-Feb-2003: Upgraded package: P
07-Feb-2003: Upgraded package: P
07-Feb-2003: New package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 06-Feb-2003 10:53:56
Branch: HEAD Handle: 2003020609535501
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
php4.3 requires to disable building of the CLI explicitely
Summary:
RevisionChanges Path
1.110 +2 -1 openpkg-src/apache/apache.spec
1.3206 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.109 -r1.110 apache.spec
--- openpkg-src/apache/apache.spec2 Feb 2003 09:17:36 - 1.109
+++ openpkg-src/apache/apache.spec6 Feb 2003 09:53:56 - 1.110
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030202
+Release: 20030206
# package options (additionally used Apache modules; can be enabled without
thinking)
%option with_mod_sslno
@@ -493,6 +493,7 @@
%if "%{with_mod_php_curl}" == "yes"
--with-curl=%{l_prefix} \
%endif
+ --disable-cli \
--without-pear \
--disable-shared \
--enable-inline-optimization \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.3205 -r1.3206 news.txt
--- openpkg-web/news.txt 6 Feb 2003 00:34:04 - 1.3205
+++ openpkg-web/news.txt 6 Feb 2003 09:53:55 - 1.3206
@@ -1,3 +1,4 @@
+06-Feb-2003: Upgraded package: P
06-Feb-2003: Upgraded package: P
05-Feb-2003: Upgraded package: P
05-Feb-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 02-Feb-2003 10:17:36
Branch: HEAD Handle: 2003020209173501
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
we already have enough stuff and this is in the (hated) PHP3 section
anyway
Summary:
RevisionChanges Path
1.109 +1 -10 openpkg-src/apache/apache.spec
1.3149 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.108 -r1.109 apache.spec
--- openpkg-src/apache/apache.spec23 Jan 2003 15:01:14 - 1.108
+++ openpkg-src/apache/apache.spec2 Feb 2003 09:17:36 - 1.109
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030123
+Release: 20030202
# package options (additionally used Apache modules; can be enabled without
thinking)
%option with_mod_sslno
@@ -542,15 +542,6 @@
%endif
--disable-shared \
--enable-track-vars
- # FIXME: the following options would also be nice to
- # be added conditionally, but the RPM 4.0.2 macro processor
- # is already at its limit and does not allow more here.
- # --enable-safe-mode
- # --with-exec-dir[=DIR]
- # --enable-magic-quotes
- # --enable-memory-limit
- # --enable-sysvsem
- # --enable-sysvshm
%{l_make} %{l_mflags}
%{l_make} %{l_mflags} install \
prefix=$RPM_BUILD_ROOT%{l_prefix}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.3148 -r1.3149 news.txt
--- openpkg-web/news.txt 2 Feb 2003 09:15:02 - 1.3148
+++ openpkg-web/news.txt 2 Feb 2003 09:17:35 - 1.3149
@@ -1,3 +1,4 @@
+02-Feb-2003: Upgraded package: P
02-Feb-2003: Upgraded package: P
02-Feb-2003: Upgraded package: P
02-Feb-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 23-Jan-2003 16:01:15
Branch: HEAD Handle: 2003012315011301
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
more precide EXPAT control
Summary:
RevisionChanges Path
1.108 +4 -1 openpkg-src/apache/apache.spec
1.3014 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.107 -r1.108 apache.spec
--- openpkg-src/apache/apache.spec19 Jan 2003 19:10:20 - 1.107
+++ openpkg-src/apache/apache.spec23 Jan 2003 15:01:14 - 1.108
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030119
+Release: 20030123
# package options (additionally used Apache modules; can be enabled without
thinking)
%option with_mod_sslno
@@ -703,6 +703,9 @@
%endif
%if "%{with_mod_dav}" == "yes"
--activate-module=src/modules/dav/libdav.a \
+ --enable-rule=EXPAT \
+%else
+ --disable-rule=EXPAT \
%endif
%if "%{with_mod_layout}" == "yes"
--activate-module=src/modules/layout/liblayout.a \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.3013 -r1.3014 news.txt
--- openpkg-web/news.txt 23 Jan 2003 14:43:57 - 1.3013
+++ openpkg-web/news.txt 23 Jan 2003 15:01:13 - 1.3014
@@ -1,3 +1,4 @@
+23-Jan-2003: Upgraded package: P
23-Jan-2003: Upgraded package: P
23-Jan-2003: Upgraded package: P
23-Jan-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Jan-2003 17:24:23
Branch: HEAD Handle: 2003011616242300
Modified files:
openpkg-src/apache apache.spec
Log:
using virtual package MYSQL
Summary:
RevisionChanges Path
1.106 +2 -2 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.105 -r1.106 apache.spec
--- openpkg-src/apache/apache.spec16 Jan 2003 14:21:21 - 1.105
+++ openpkg-src/apache/apache.spec16 Jan 2003 16:24:23 - 1.106
@@ -182,7 +182,7 @@
%if "%{with_mod_php}" == "yes"
BuildPreReq: gcc, sed, flex, bison
%if "%{with_mod_php_mysql}" == "yes"
-BuildPreReq: mysql
+BuildPreReq: MYSQL
%endif
%if "%{with_mod_php_gd}" == "yes"
BuildPreReq: GD, jpeg, png
@@ -242,7 +242,7 @@
BuildPreReq: jpeg
%endif
%if "%{with_mod_php3_mysql}" == "yes"
-BuildPreReq: mysql
+BuildPreReq: MYSQL
%endif
%if "%{with_mod_php3_openssl}" == "yes"
BuildPreReq: openssl
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 16-Jan-2003 15:21:21
Branch: HEAD Handle: 2003011614212001
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
Correct build requirements for optional PHP module.
Summary:
RevisionChanges Path
1.105 +2 -2 openpkg-src/apache/apache.spec
1.2855 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.104 -r1.105 apache.spec
--- openpkg-src/apache/apache.spec7 Jan 2003 14:21:16 - 1.104
+++ openpkg-src/apache/apache.spec16 Jan 2003 14:21:21 - 1.105
@@ -60,7 +60,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030107
+Release: 20030116
# package options (additionally used Apache modules; can be enabled without
thinking)
%option with_mod_sslno
@@ -180,7 +180,7 @@
PreReq: perl
%endif
%if "%{with_mod_php}" == "yes"
-BuildPreReq: make, bison, flex
+BuildPreReq: gcc, sed, flex, bison
%if "%{with_mod_php_mysql}" == "yes"
BuildPreReq: mysql
%endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2854 -r1.2855 news.txt
--- openpkg-web/news.txt 16 Jan 2003 13:49:58 - 1.2854
+++ openpkg-web/news.txt 16 Jan 2003 14:21:20 - 1.2855
@@ -1,3 +1,4 @@
+16-Jan-2003: Upgraded package: P
16-Jan-2003: Upgraded package: P
16-Jan-2003: Upgraded package: P
16-Jan-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec
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: 07-Jan-2003 15:21:16
Branch: HEAD Handle: 2003010714211600
Modified files:
openpkg-src/apache apache.spec
Log:
Bump the beast with C&W/IT-Ops-SSE stuff:
- add mod_auth_ldap
- add cURL and mhash support for mod_php
- add dummy php.ini
Summary:
RevisionChanges Path
1.104 +45 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.103 -r1.104 apache.spec
--- openpkg-src/apache/apache.spec7 Jan 2003 13:08:33 - 1.103
+++ openpkg-src/apache/apache.spec7 Jan 2003 14:21:16 - 1.104
@@ -42,6 +42,7 @@
%define V_mod_layout 3.2
%define V_mod_macro 1.1.2
%define V_mod_auth_pam 1.0a
+%define V_mod_auth_ldap 2.4.1
%define V_mod_gzip 1.3.19.1a
%define V_mod_fastcgi2.2.12
%define V_mod_throttle 312
@@ -71,6 +72,7 @@
%option with_mod_macro no
# package options (additionally used Apache modules; you have to know what you do)
+%option with_mod_auth_ldap no
%option with_mod_auth_pam no
%option with_mod_gzip no
%option with_mod_fastcgino
@@ -101,6 +103,8 @@
%option with_mod_php_xmlno
%option with_mod_php_bc no
%option with_mod_php_transsid no
+%option with_mod_php_curl no
+%option with_mod_php_mhash no
# package options (optional PHP3 specific settings; requires "with_mod_php3")
%option with_mod_php3_ftp no
@@ -157,6 +161,7 @@
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.php.net/distributions/php-%{V_mod_php3}.tar.gz
+Source15:
http://www.muquit.com/muquit/software/mod_auth_ldap/mod_auth_ldap.tar.gz
Source20: apache.conf
Source21: apache.base
Source22: apache.vhost
@@ -219,7 +224,13 @@
BuildPreReq: imap
%endif
%if "%{with_mod_php_xml}" == "yes"
-BuildPreReq: expat
+BuildPreReq: expat
+%endif
+%if "%{with_mod_php_curl}" == "yes"
+BuildPreReq: curl
+%endif
+%if "%{with_mod_php_mhash}" == "yes"
+BuildPreReq: mhash
%endif
%endif
%if "%{with_mod_php3}" == "yes"
@@ -240,6 +251,9 @@
BuildPreReq: zlib
%endif
%endif
+%if "%{with_mod_auth_ldap}" == "yes"
+BuildPreReq: openldap, openssl
+%endif
%if "%{with_mod_auth_pam}" == "yes"
BuildPreReq: PAM
PreReq: PAM
@@ -302,6 +316,9 @@
%if "%{with_mod_php3}" == "yes"
%setup14 -q -T -D -a 14
%endif
+%if "%{with_mod_auth_ldap}" == "yes"
+%setup15 -q -T -D -a 15
+%endif
%build
# prepare environment
@@ -470,6 +487,12 @@
%if "%{with_mod_php_transsid}" == "yes"
--enable-trans-sid \
%endif
+%if "%{with_mod_php_mhash}" == "yes"
+ --with-mhash=%{l_prefix} \
+%endif
+%if "%{with_mod_php_curl}" == "yes"
+ --with-curl=%{l_prefix} \
+%endif
--without-pear \
--disable-shared \
--enable-inline-optimization \
@@ -574,6 +597,13 @@
)
%endif
+# optionally prepare mod_auth_ldap
+%if "%{with_mod_auth_ldap}" == "yes"
+( cd modauthldap
+ cp mod_auth_ldap.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/
@@ -631,6 +661,11 @@
fi
libs="$libs -lpam"
%endif
+%if "%{with_mod_auth_ldap}" == "yes"
+ cflags="$cflags -I%{l_prefix}/include"
+ ldflags="$ldflags -L%{l_prefix}/lib"
+ libs="$libs -lldap -llber -lssl -lcrypto"
+%endif
CC="%{l_cc}" \
CFLAGS="$cflags" \
LDFLAGS="$ldflags" \
@@ -678,6 +713,9 @@
%if "%{with_mod_auth_pam}" == "yes"
--activate-module=src/modules/extra/mod_auth_pam.o \
%endif
+%if "%{with_mod_auth_ldap}" == "yes"
+ --activate-module=src/modules/extra/mod_auth_ldap.c \
+%endif
%if "%{with_mod_gzip}" == "yes"
--activate-module=src/modules/extra/mod_gzip.o \
%endif
@@ -725,6 +763,12 @@
# optionally cleanup for mod_perl
%if "%{with_mod_
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 07-Jan-2003 14:08:34
Branch: HEAD Handle: 2003010713083201
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
adjust to new IMAP world order
Summary:
RevisionChanges Path
1.103 +7 -3 openpkg-src/apache/apache.spec
1.2592 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.102 -r1.103 apache.spec
--- openpkg-src/apache/apache.spec3 Jan 2003 11:52:21 - 1.102
+++ openpkg-src/apache/apache.spec7 Jan 2003 13:08:33 - 1.103
@@ -59,7 +59,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20030103
+Release: 20030107
# package options (additionally used Apache modules; can be enabled without
thinking)
%option with_mod_sslno
@@ -216,7 +216,7 @@
BuildPreReq: gettext, libiconv
%endif
%if "%{with_mod_php_imap}" == "yes"
-BuildPreReq: c-client
+BuildPreReq: imap
%endif
%if "%{with_mod_php_xml}" == "yes"
BuildPreReq: expat
@@ -385,11 +385,14 @@
LIBS="$LIBS -lpng -lz"
%endif
%if "%{with_mod_php_gettext}" == "yes"
- LIBS="$LIBS -liconv" \
+ LIBS="$LIBS -liconv"
%endif
%if "%{with_mod_php_openldap}" == "yes"
LIBS="$LIBS -lsasl2"
%endif
+%if "%{with_mod_php_imap}" == "yes"
+ LIBS="$LIBS -lssl -lcrypto"
+%endif
./configure \
--prefix=%{l_prefix} \
--with-apache=../apache_%{V_apache} \
@@ -456,6 +459,7 @@
%endif
%if "%{with_mod_php_imap}" == "yes"
--with-imap=%{l_prefix} \
+ --with-imap-ssl=%{l_prefix} \
%endif
%if "%{with_mod_php_xml}" == "yes"
--with-xml=%{l_prefix} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2591 -r1.2592 news.txt
--- openpkg-web/news.txt 7 Jan 2003 12:52:03 - 1.2591
+++ openpkg-web/news.txt 7 Jan 2003 13:08:32 - 1.2592
@@ -1,3 +1,4 @@
+07-Jan-2003: Upgraded package: P
07-Jan-2003: New package: P
07-Jan-2003: Upgraded package: P
07-Jan-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 03-Jan-2003 12:52:22
Branch: HEAD Handle: 2003010311522001
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
upgrade to new %option world order
Summary:
RevisionChanges Path
1.102 +7 -13 openpkg-src/apache/apache.spec
1.2545 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.101 -r1.102 apache.spec
--- openpkg-src/apache/apache.spec3 Jan 2003 11:09:32 - 1.101
+++ openpkg-src/apache/apache.spec3 Jan 2003 11:52:21 - 1.102
@@ -59,9 +59,9 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20021230
+Release: 20030103
-# the additionally used Apache modules (can be enabled without thinking)
+# package options (additionally used Apache modules; can be enabled without
thinking)
%option with_mod_sslno
%option with_mod_perl no
%option with_mod_phpno
@@ -70,7 +70,7 @@
%option with_mod_layout no
%option with_mod_macro no
-# the additionally used Apache modules (you have to know what you do)
+# package options (additionally used Apache modules; you have to know what you do)
%option with_mod_auth_pam no
%option with_mod_gzip no
%option with_mod_fastcgino
@@ -79,8 +79,7 @@
%option with_mod_roamingno
%option with_mod_relocate no
-# more optional PHP4 specific settings
-# (requires "with_mod_php" set to "yes" above!)
+# package options (optional PHP4 specific settings; requires "with_mod_php")
%option with_mod_php_calendar no
%option with_mod_php_mysql no
%option with_mod_php_gd no
@@ -103,8 +102,7 @@
%option with_mod_php_bc no
%option with_mod_php_transsid no
-# more optional PHP3 specific settings
-# (requires "with_mod_php3" set to "yes" above!)
+# package options (optional PHP3 specific settings; requires "with_mod_php3")
%option with_mod_php3_ftp no
%option with_mod_php3_gdno
%option with_mod_php3_jpeg no
@@ -167,8 +165,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20021230
-PreReq: OpenPKG, openpkg >= 20021230
+BuildPreReq: OpenPKG, openpkg >= 20030103
+PreReq: OpenPKG, openpkg >= 20030103
%if "%{with_mod_ssl}" == "yes"
BuildPreReq: openssl, mm
%endif
@@ -224,7 +222,6 @@
BuildPreReq: expat
%endif
%endif
-
%if "%{with_mod_php3}" == "yes"
BuildPreReq: make, bison, flex
%if "%{with_mod_php3_gd}" == "yes"
@@ -243,7 +240,6 @@
BuildPreReq: zlib
%endif
%endif
-
%if "%{with_mod_auth_pam}" == "yes"
BuildPreReq: PAM
PreReq: PAM
@@ -261,8 +257,6 @@
volunteers are known as the Apache Group. In addition, hundreds
of users have contributed ideas, code, and documentation to the
project.
-
-%options -p25
%prep
# unpack Apache distribution
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2544 -r1.2545 news.txt
--- openpkg-web/news.txt 3 Jan 2003 11:48:33 - 1.2544
+++ openpkg-web/news.txt 3 Jan 2003 11:52:20 - 1.2545
@@ -1,3 +1,4 @@
+03-Jan-2003: Upgraded package: P
03-Jan-2003: New package: P
03-Jan-2003: New package: P
03-Jan-2003: New package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 03-Jan-2003 12:09:33
Branch: HEAD Handle: 2003010311093101
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
upgrade to new %option world order
Summary:
RevisionChanges Path
1.101 +28 -32 openpkg-src/apache/apache.spec
1.2510 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.100 -r1.101 apache.spec
--- openpkg-src/apache/apache.spec1 Jan 2003 11:00:22 - 1.100
+++ openpkg-src/apache/apache.spec3 Jan 2003 11:09:32 - 1.101
@@ -32,9 +32,34 @@
## a example of what is maximum possible with RPM and how far one can
## go with the macro mechanism. But do not try to repeat this!
-## ATTENTION: DO NOT EDIT THE FOLLOWING DEFAULTS DIRECTLY IN THIS FILE!
-## INSTEAD USE --define "with_xxx yes" ON THE COMMAND LINE. THE REASON
-## IS THAT RPM'S MACRO MECHANISM HORSES UP HORRIBLY ELSE!
+# package component versions
+%define V_apache 1.3.27
+%define V_mod_ssl2.8.12-1.3.27
+%define V_mod_perl 1.27
+%define V_mod_php4.3.0
+%define V_mod_php3 3.0.18
+%define V_mod_dav1.0.3-1.3.6
+%define V_mod_layout 3.2
+%define V_mod_macro 1.1.2
+%define V_mod_auth_pam 1.0a
+%define V_mod_gzip 1.3.19.1a
+%define V_mod_fastcgi2.2.12
+%define V_mod_throttle 312
+%define V_mod_access_referer 1.0.2
+%define V_mod_roaming1.0.2
+%define V_mod_relocate 1.0
+
+# package information
+Name: apache
+Summary: Apache HTTP Server
+URL: http://httpd.apache.org/
+Vendor: Apache Software Foundation
+Packager: The OpenPKG Project
+Distribution: OpenPKG [BASE]
+Group:Web
+License: ASF
+Version: %{V_apache}
+Release: 20021230
# the additionally used Apache modules (can be enabled without thinking)
%option with_mod_sslno
@@ -117,35 +142,6 @@
%define with_mod_php3_zlib yes
%endif
%endif
-
-# package component versions
-%define V_apache 1.3.27
-%define V_mod_ssl2.8.12-1.3.27
-%define V_mod_perl 1.27
-%define V_mod_php4.3.0
-%define V_mod_php3 3.0.18
-%define V_mod_dav1.0.3-1.3.6
-%define V_mod_layout 3.2
-%define V_mod_macro 1.1.2
-%define V_mod_auth_pam 1.0a
-%define V_mod_gzip 1.3.19.1a
-%define V_mod_fastcgi2.2.12
-%define V_mod_throttle 312
-%define V_mod_access_referer 1.0.2
-%define V_mod_roaming1.0.2
-%define V_mod_relocate 1.0
-
-# package information
-Name: apache
-Summary: Apache HTTP Server
-URL: http://httpd.apache.org/
-Vendor: Apache Software Foundation
-Packager: The OpenPKG Project
-Distribution: OpenPKG [BASE]
-Group:Web
-License: ASF
-Version: %{V_apache}
-Release: 20021230
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2509 -r1.2510 news.txt
--- openpkg-web/news.txt 3 Jan 2003 11:09:22 - 1.2509
+++ openpkg-web/news.txt 3 Jan 2003 11:09:31 - 1.2510
@@ -1,3 +1,4 @@
+03-Jan-2003: New package: P
03-Jan-2003: Upgraded package: P
03-Jan-2003: New package: P
03-Jan-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
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 openpkg-web Date: 30-Dec-2002 15:40:19
Branch: HEAD Handle: 2002123014401801
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
cleanup package by using new %option stuff
Summary:
RevisionChanges Path
1.98+59 -101openpkg-src/apache/apache.spec
1.2430 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.97 -r1.98 apache.spec
--- openpkg-src/apache/apache.spec28 Dec 2002 09:49:45 - 1.97
+++ openpkg-src/apache/apache.spec30 Dec 2002 14:40:19 - 1.98
@@ -37,80 +37,84 @@
## IS THAT RPM'S MACRO MECHANISM HORSES UP HORRIBLY ELSE!
# the additionally used Apache modules (can be enabled without thinking)
-%{!?with_mod_ssl:%define with_mod_sslno}
-%{!?with_mod_perl: %define with_mod_perl no}
-%{!?with_mod_php:%define with_mod_phpno}
-%{!?with_mod_php3: %define with_mod_php3 no}
-%{!?with_mod_dav:%define with_mod_davno}
-%{!?with_mod_layout: %define with_mod_layout no}
-%{!?with_mod_macro: %define with_mod_macro no}
+%option with_mod_sslno
+%option with_mod_perl no
+%option with_mod_phpno
+%option with_mod_php3 no
+%option with_mod_davno
+%option with_mod_layout no
+%option with_mod_macro no
# the additionally used Apache modules (you have to know what you do)
-%{!?with_mod_auth_pam: %define with_mod_auth_pam no}
-%{!?with_mod_gzip: %define with_mod_gzip no}
-%{!?with_mod_fastcgi:%define with_mod_fastcgino}
-%{!?with_mod_throttle: %define with_mod_throttle no}
-%{!?with_mod_access_referer: %define with_mod_access_referer no}
-%{!?with_mod_roaming:%define with_mod_roamingno}
-%{!?with_mod_relocate: %define with_mod_relocate no}
+%option with_mod_auth_pam no
+%option with_mod_gzip no
+%option with_mod_fastcgino
+%option with_mod_throttle no
+%option with_mod_access_referer no
+%option with_mod_roamingno
+%option with_mod_relocate no
# more optional PHP4 specific settings
# (requires "with_mod_php" set to "yes" above!)
-%{!?with_mod_php_calendar: %define with_mod_php_calendar no}
-%{!?with_mod_php_mysql: %define with_mod_php_mysql no}
-%{!?with_mod_php_gd: %define with_mod_php_gd no}
-%{!?with_mod_php_db: %define with_mod_php_db no}
-%{!?with_mod_php_debug: %define with_mod_php_debug no}
-%{!?with_mod_php_pdflib: %define with_mod_php_pdflib no}
-%{!?with_mod_php_zlib: %define with_mod_php_zlib no}
-%{!?with_mod_php_bzip2: %define with_mod_php_bzip2 no}
-%{!?with_mod_php_openssl:%define with_mod_php_opensslno}
-%{!?with_mod_php_openldap: %define with_mod_php_openldap no}
-%{!?with_mod_php_mm: %define with_mod_php_mm no}
-%{!?with_mod_php_pcre: %define with_mod_php_pcre no}
-%{!?with_mod_php_ftp:%define with_mod_php_ftpno}
-%{!?with_mod_php_java: %define with_mod_php_java no}
-%{!?with_mod_php_oci8: %define with_mod_php_oci8 no}
-%{!?with_mod_php_freetype: %define with_mod_php_freetype no}
-%{!?with_mod_php_gettext:%define with_mod_php_gettextno}
-%{!?with_mod_php_imap: %define with_mod_php_imap no}
-%{!?with_mod_php_xml:%define with_mod_php_xmlno}
-%{!?with_mod_php_bc: %define with_mod_php_bc no}
-%{!?with_mod_php_transsid: %define with_mod_php_transsid no}
+%option with_mod_php_calendar no
+%option with_mod_php_mysql no
+%option with_mod_php_gd no
+%option with_mod_php_db no
+%option with_mod_php_debug no
+%option with_mod_php_pdflib no
+%option with_mod_php_zlib no
+%option with_mod_php_bzip2 no
+%option with_mod_php_opensslno
+%option with_mod_php_openldap no
+%option with_mod_php_mm no
+%opt
[CVS] OpenPKG: openpkg-src/apache apache.spec openpkg-src/cvs cvs.spec...
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: 20-Dec-2002 20:12:14
Branch: HEAD Handle: 2002122019121004
Modified files:
openpkg-src/apache apache.spec
openpkg-src/cvs cvs.spec
openpkg-src/emacs emacs.spec
openpkg-src/gcc gcc.spec
openpkg-src/gcc33 gcc33.spec
openpkg-src/muttmutt.spec
openpkg-src/mysql mysql.spec
openpkg-src/postfix postfix.spec
Log:
finally remove backslashes from --define lines in %description to be 100%
consistent again
Summary:
RevisionChanges Path
1.96+41 -41 openpkg-src/apache/apache.spec
1.40+1 -1 openpkg-src/cvs/cvs.spec
1.26+3 -3 openpkg-src/emacs/emacs.spec
1.38+4 -4 openpkg-src/gcc/gcc.spec
1.2 +3 -3 openpkg-src/gcc33/gcc33.spec
1.38+1 -1 openpkg-src/mutt/mutt.spec
1.40+2 -2 openpkg-src/mysql/mysql.spec
1.91+2 -2 openpkg-src/postfix/postfix.spec
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.95 -r1.96 apache.spec
--- openpkg-src/apache/apache.spec29 Nov 2002 12:55:13 - 1.95
+++ openpkg-src/apache/apache.spec20 Dec 2002 19:12:10 - 1.96
@@ -264,53 +264,53 @@
project.
Options (additional modules I):
---define 'with_mod_dav %{with_mod_dav}' \
---define 'with_mod_layout %{with_mod_layout}' \
---define 'with_mod_macro%{with_mod_macro}' \
---define 'with_mod_perl %{with_mod_perl}' \
---define 'with_mod_php %{with_mod_php}' \
---define 'with_mod_php3 %{with_mod_php3}' \
---define 'with_mod_ssl %{with_mod_ssl}' \
+--define 'with_mod_dav %{with_mod_dav}'
+--define 'with_mod_layout %{with_mod_layout}'
+--define 'with_mod_macro%{with_mod_macro}'
+--define 'with_mod_perl %{with_mod_perl}'
+--define 'with_mod_php %{with_mod_php}'
+--define 'with_mod_php3 %{with_mod_php3}'
+--define 'with_mod_ssl %{with_mod_ssl}'
Options (additional modules II):
---define 'with_mod_access_referer %{with_mod_access_referer}' \
---define 'with_mod_auth_pam %{with_mod_auth_pam}' \
---define 'with_mod_fastcgi %{with_mod_fastcgi}' \
---define 'with_mod_gzip %{with_mod_gzip}' \
---define 'with_mod_relocate %{with_mod_relocate}' \
---define 'with_mod_roaming %{with_mod_roaming}' \
---define 'with_mod_throttle %{with_mod_throttle}' \
+--define 'with_mod_access_referer %{with_mod_access_referer}'
+--define 'with_mod_auth_pam %{with_mod_auth_pam}'
+--define 'with_mod_fastcgi %{with_mod_fastcgi}'
+--define 'with_mod_gzip %{with_mod_gzip}'
+--define 'with_mod_relocate %{with_mod_relocate}'
+--define 'with_mod_roaming %{with_mod_roaming}'
+--define 'with_mod_throttle %{with_mod_throttle}'
Options (additional extensions for mod_php):
---define 'with_mod_php_bzip2%{with_mod_php_bzip2}' \
---define 'with_mod_php_bc %{with_mod_php_bc}' \
---define 'with_mod_php_calendar %{with_mod_php_calendar}' \
---define 'with_mod_php_db %{with_mod_php_db}' \
---define 'with_mod_php_debug%{with_mod_php_debug}' \
---define 'with_mod_php_ftp %{with_mod_php_ftp}' \
---define 'with_mod_php_freetype %{with_mod_php_freetype}' \
---define 'with_mod_php_gd %{with_mod_php_gd}' \
---define 'with_mod_php_gettext %{with_mod_php_gettext}' \
---define 'with_mod_php_imap %{with_mod_php_imap}' \
---define 'with_mod_php_java %{with_mod_php_java}' \
---define 'with_mod_php_mm %{with_mod_php_mm}' \
---define 'with_mod_php_mysql%{with_mod_php_mysql}' \
---define 'with_mod_php_oci8 %{with_mod_php_oci8}' \
---define 'with_mod_php_openldap %{with_mod_php_openldap}' \
---define 'with_mod_php_openssl %{with_mod_php_openssl}' \
---define 'with_mod_php_pcre %{with_mod_php_pcre}' \
---define 'with_mod_php_pdflib %{with_mod_php_pdflib}' \
---define 'with_mod_php_transsid %{with_mod_php_transsid}' \
---defi
[CVS] OpenPKG: openpkg-src/apache apache.spec
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: 20-Nov-2002 12:20:14
Branch: HEAD Handle: 2002112011201300
Modified files:
openpkg-src/apache apache.spec
Log:
be more clear here
Summary:
RevisionChanges Path
1.93+9 -7 openpkg-src/apache/apache.spec
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.92 -r1.93 apache.spec
--- openpkg-src/apache/apache.spec20 Nov 2002 11:17:29 - 1.92
+++ openpkg-src/apache/apache.spec20 Nov 2002 11:20:13 - 1.93
@@ -574,13 +574,15 @@
%endif
--disable-shared \
--enable-track-vars
-# FIXME:
-# --enable-safe-mode
-# --with-exec-dir[=DIR]
-# --enable-magic-quotes
-# --enable-memory-limit
-# --enable-sysvsem
-# --enable-sysvshm
+ # FIXME: the following options would also be nice to
+ # be added conditionally, but the RPM 4.0.2 macro processor
+ # is already at its limit and does not allow more here.
+ # --enable-safe-mode
+ # --with-exec-dir[=DIR]
+ # --enable-magic-quotes
+ # --enable-memory-limit
+ # --enable-sysvsem
+ # --enable-sysvshm
%{l_make} %{l_mflags}
%{l_make} %{l_mflags} install \
prefix=$RPM_BUILD_ROOT%{l_prefix}
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache apache.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 20-Nov-2002 12:17:29
Branch: HEAD Handle: 2002112011172801
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
fix mod_perl support
Summary:
RevisionChanges Path
1.92+7 -9 openpkg-src/apache/apache.spec
1.2066 +1 -0 openpkg-web/news.txt
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.91 -r1.92 apache.spec
--- openpkg-src/apache/apache.spec23 Oct 2002 09:36:37 - 1.91
+++ openpkg-src/apache/apache.spec20 Nov 2002 11:17:29 - 1.92
@@ -143,7 +143,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20021023
+Release: 20021120
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -401,15 +401,15 @@
( cd mod_perl-%{V_mod_perl}
eval `%{l_prefix}/bin/perl -V:archname`
eval `%{l_prefix}/bin/perl -V:version`
+ eval `%{l_prefix}/bin/perl -V:installarchlib -V:installprivlib
-V:installsitearch -V:installsitelib`
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin
perl=$RPM_BUILD_ROOT%{l_prefix}/bin/perl
echo "#!/bin/sh" >$perl
echo "exec %{l_prefix}/bin/perl \\" >>$perl
- echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version} \\" >>$perl
- echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version}/${archname} \\"
>>$perl
- echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl \\" >>$perl
- echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version} \\" >>$perl
- echo "
-I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version}/${archname} \\" >>$perl
+ echo " -I${RPM_BUILD_ROOT}${installarchlib} \\" >>$perl
+ echo " -I${RPM_BUILD_ROOT}${installprivlib} \\" >>$perl
+ echo " -I${RPM_BUILD_ROOT}${installsitearch} \\" >>$perl
+ echo " -I${RPM_BUILD_ROOT}${installsitelib} \\" >>$perl
echo " \"\$@\"" >>$perl
chmod a+x $perl
$perl Makefile.PL \
@@ -423,9 +423,7 @@
PERL_DIRECTIVE_HANDLERS=1
%{l_make} %{l_mflags}
%{l_make} %{l_mflags} install
- mkdir $RPM_BUILD_ROOT%{l_prefix}/perl5
- mv $RPM_BUILD_ROOT%{l_prefix}/lib/* $RPM_BUILD_ROOT%{l_prefix}/perl5/
- mv $RPM_BUILD_ROOT%{l_prefix}/perl5 $RPM_BUILD_ROOT%{l_prefix}/lib/
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/man3
%{l_shtool} subst -e "s;^\\(PERL = \\).*;\\1 $perl;" \
../apache_%{V_apache}/src/modules/perl/mod_perl.config
)
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2065 -r1.2066 news.txt
--- openpkg-web/news.txt 20 Nov 2002 10:27:20 - 1.2065
+++ openpkg-web/news.txt 20 Nov 2002 11:17:28 - 1.2066
@@ -1,3 +1,4 @@
+20-Nov-2002: Upgraded package: P
20-Nov-2002: Upgraded package: P
20-Nov-2002: Upgraded package: P
20-Nov-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache apache.spec
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: 23-Oct-2002 14:20:41
Branch: OPENPKG_1_1_SOLIDHandle: 2002102313204100
Modified files: (Branch: OPENPKG_1_1_SOLID)
openpkg-src/apache apache.spec
Log:
fix typo
Summary:
RevisionChanges Path
1.81.2.4+1 -1 openpkg-src/apache/apache.spec
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.81.2.3 -r1.81.2.4 apache.spec
--- openpkg-src/apache/apache.spec23 Oct 2002 09:26:26 - 1.81.2.3
+++ openpkg-src/apache/apache.spec23 Oct 2002 12:20:41 - 1.81.2.4
@@ -307,7 +307,7 @@
--define 'with_mod_php_pdflib %{with_mod_php_pdflib}' \
--define 'with_mod_php_transsid %{with_mod_php_transsid}' \
--define 'with_mod_php_xml %{with_mod_php_xml}' \
---define 'with_mod_php_zlib %{with_mod_php_zlib}
+--define 'with_mod_php_zlib %{with_mod_php_zlib}'
Options (additional extensions for mod_php3):
--define 'with_mod_php3_ftp %{with_mod_php3_ftp}' \
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache apache.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 23-Oct-2002 11:36:37
Branch: HEAD Handle: 2002102310363601
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
upgrade to mod_ssl 2.8.12 to close XSS security bug
Summary:
RevisionChanges Path
1.91+2 -2 openpkg-src/apache/apache.spec
1.1871 +1 -0 openpkg-web/news.txt
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.90 -r1.91 apache.spec
--- openpkg-src/apache/apache.spec9 Oct 2002 09:22:50 - 1.90
+++ openpkg-src/apache/apache.spec23 Oct 2002 09:36:37 - 1.91
@@ -117,7 +117,7 @@
# package component versions
%define V_apache 1.3.27
-%define V_mod_ssl2.8.11-1.3.27
+%define V_mod_ssl2.8.12-1.3.27
%define V_mod_perl 1.27
%define V_mod_php4.2.3
%define V_mod_php3 3.0.18
@@ -143,7 +143,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20021009
+Release: 20021023
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
Index: openpkg-web/news.txt
$ cvs diff -u -r1.1870 -r1.1871 news.txt
--- openpkg-web/news.txt 23 Oct 2002 08:21:44 - 1.1870
+++ openpkg-web/news.txt 23 Oct 2002 09:36:36 - 1.1871
@@ -1,3 +1,4 @@
+23-Oct-2002: Upgraded package: P
23-Oct-2002: Upgraded package: P
23-Oct-2002: Upgraded package: P
23-Oct-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache apache.spec mod_ssl.patch
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: 23-Oct-2002 11:30:38
Branch: OPENPKG_1_0_SOLIDHandle: 2002102310303800
Added files: (Branch: OPENPKG_1_0_SOLID)
openpkg-src/apache mod_ssl.patch
Modified files: (Branch: OPENPKG_1_0_SOLID)
openpkg-src/apache apache.spec
Log:
add bugfixing patch for mod_ssl XSS problem
Summary:
RevisionChanges Path
1.16.2.8+3 -1 openpkg-src/apache/apache.spec
1.1.4.1 +17 -0 openpkg-src/apache/mod_ssl.patch
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.16.2.7 -r1.16.2.8 apache.spec
--- openpkg-src/apache/apache.spec4 Oct 2002 19:39:16 - 1.16.2.7
+++ openpkg-src/apache/apache.spec23 Oct 2002 09:30:38 - 1.16.2.8
@@ -71,13 +71,14 @@
Group:Web
License: BSD-style
Version: %{V_apache}
-Release: 1.0.5
+Release: 1.0.6
# list of sources
Source0: http://httpd.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
Patch0: apache.patch
# %if "%{mod_ssl}" == "yes"
Source1: http://www.modssl.org/source/mod_ssl-%{V_mod_ssl}-%{V_apache}.tar.gz
+Patch1: mod_ssl.patch
# %endif
# %if "%{mod_perl}" == "yes"
Source2: http://perl.apache.org/dist/mod_perl-%{V_mod_perl}.tar.gz
@@ -179,6 +180,7 @@
%patch0 -p0
%if "%{mod_ssl}" == "yes"
%setup1 -q -T -D -a 1
+%patch1 -p0
%endif
%if "%{mod_perl}" == "yes"
%setup2 -q -T -D -a 2
Index: openpkg-src/apache/mod_ssl.patch
$ cvs update -p -r1.1.4.1 mod_ssl.patch
Security bugfix for mod_ssl Cross Side Scripting (XSS) problem.
Index: mod_ssl-2.8.5-1.3.22/pkg.sslmod/ssl_engine_kernel.c
--- mod_ssl-2.8.5-1.3.22/pkg.sslmod/ssl_engine_kernel.c.orig 4 Oct 2002 13:31:09
- 1.132
+++ mod_ssl-2.8.5-1.3.22/pkg.sslmod/ssl_engine_kernel.c 10 Oct 2002 14:27:45
- 1.133
@@ -622,7 +622,8 @@
if (!ap_is_default_port(port, r))
thisport = ap_psprintf(r->pool, ":%u", port);
thisurl = ap_psprintf(r->pool, "https://%s%s/";,
- ap_get_server_name(r), thisport);
+ ap_escape_html(r->pool, ap_get_server_name(r)),
+ thisport);
ap_table_setn(r->notes, "error-notes", ap_psprintf(r->pool,
"Reason: You're speaking plain HTTP to an SSL-enabled server
port.\n"
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache apache.spec mod_ssl.patch
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: 23-Oct-2002 11:26:27
Branch: OPENPKG_1_1_SOLIDHandle: 2002102310262601
Added files: (Branch: OPENPKG_1_1_SOLID)
openpkg-src/apache mod_ssl.patch
Modified files: (Branch: OPENPKG_1_1_SOLID)
openpkg-src/apache apache.spec
Log:
add bugfixing patch for mod_ssl XSS problem
Summary:
RevisionChanges Path
1.81.2.3+3 -1 openpkg-src/apache/apache.spec
1.1.2.1 +17 -0 openpkg-src/apache/mod_ssl.patch
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.81.2.2 -r1.81.2.3 apache.spec
--- openpkg-src/apache/apache.spec4 Oct 2002 19:31:28 - 1.81.2.2
+++ openpkg-src/apache/apache.spec23 Oct 2002 09:26:26 - 1.81.2.3
@@ -143,7 +143,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 1.1.1
+Release: 1.1.2
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -167,6 +167,7 @@
Source22: apache.vhost
Source23: rc.apache
Patch0: apache.patch
+Patch1: mod_ssl.patch
# build information
Prefix: %{l_prefix}
@@ -323,6 +324,7 @@
# unpack optional extension modules
%if "%{with_mod_ssl}" == "yes"
%setup1 -q -T -D -a 1
+%patch1 -p0
%endif
%if "%{with_mod_perl}" == "yes"
%setup2 -q -T -D -a 2
Index: openpkg-src/apache/mod_ssl.patch
$ cvs update -p -r1.1.2.1 mod_ssl.patch
Security bugfix for mod_ssl Cross Side Scripting (XSS) problem.
Index: mod_ssl-2.8.10-1.3.26/pkg.sslmod/ssl_engine_kernel.c
--- mod_ssl-2.8.10-1.3.26/pkg.sslmod/ssl_engine_kernel.c.orig 4 Oct 2002 13:31:09
- 1.132
+++ mod_ssl-2.8.10-1.3.26/pkg.sslmod/ssl_engine_kernel.c 10 Oct 2002 14:27:45
- 1.133
@@ -622,7 +622,8 @@
if (!ap_is_default_port(port, r))
thisport = ap_psprintf(r->pool, ":%u", port);
thisurl = ap_psprintf(r->pool, "https://%s%s/";,
- ap_get_server_name(r), thisport);
+ ap_escape_html(r->pool, ap_get_server_name(r)),
+ thisport);
ap_table_setn(r->notes, "error-notes", ap_psprintf(r->pool,
"Reason: You're speaking plain HTTP to an SSL-enabled server
port.\n"
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache apache.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 09-Oct-2002 11:22:50
Branch: HEAD Handle: 2002100910224901
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
upgrade to j2se
Summary:
RevisionChanges Path
1.90+3 -3 openpkg-src/apache/apache.spec
1.1731 +1 -0 openpkg-web/news.txt
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.89 -r1.90 apache.spec
--- openpkg-src/apache/apache.spec5 Oct 2002 10:03:59 - 1.89
+++ openpkg-src/apache/apache.spec9 Oct 2002 09:22:50 - 1.90
@@ -143,7 +143,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20021005
+Release: 20021009
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -212,7 +212,7 @@
BuildPreReq: pcre
%endif
%if "%{with_mod_php_java}" == "yes"
-BuildPreReq: jdk-sun
+BuildPreReq: j2se
%endif
%if "%{with_mod_php_freetype}" == "yes"
BuildPreReq: freetype
@@ -507,7 +507,7 @@
--enable-ftp \
%endif
%if "%{with_mod_php_java}" == "yes"
- --with-java=%{l_prefix}/libexec/jdk-sun \
+ --with-java=%{l_prefix}/libexec/j2se \
%endif
%if "%{with_mod_php_oci8}" == "yes"
--with-oci8 \
Index: openpkg-web/news.txt
$ cvs diff -u -r1.1730 -r1.1731 news.txt
--- openpkg-web/news.txt 9 Oct 2002 09:18:46 - 1.1730
+++ openpkg-web/news.txt 9 Oct 2002 09:22:49 - 1.1731
@@ -1,3 +1,4 @@
+09-Oct-2002: Upgraded package: P
09-Oct-2002: Upgraded package: P
09-Oct-2002: Upgraded package: P
09-Oct-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache apache.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 04-Oct-2002 16:06:23
Branch: HEAD Handle: 2002100415062201
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
Apache 1.3.27 + mod_ssl 2.8.11
Summary:
RevisionChanges Path
1.88+3 -3 openpkg-src/apache/apache.spec
1.1697 +1 -0 openpkg-web/news.txt
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.87 -r1.88 apache.spec
--- openpkg-src/apache/apache.spec18 Sep 2002 08:22:27 - 1.87
+++ openpkg-src/apache/apache.spec4 Oct 2002 14:06:23 - 1.88
@@ -116,8 +116,8 @@
%endif
# package component versions
-%define V_apache 1.3.26
-%define V_mod_ssl2.8.10-1.3.26
+%define V_apache 1.3.27
+%define V_mod_ssl2.8.11-1.3.27
%define V_mod_perl 1.27
%define V_mod_php4.2.3
%define V_mod_php3 3.0.18
@@ -143,7 +143,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20020918
+Release: 20021004
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
Index: openpkg-web/news.txt
$ cvs diff -u -r1.1696 -r1.1697 news.txt
--- openpkg-web/news.txt 4 Oct 2002 13:58:34 - 1.1696
+++ openpkg-web/news.txt 4 Oct 2002 14:06:22 - 1.1697
@@ -1,3 +1,4 @@
+04-Oct-2002: Upgraded package: P
04-Oct-2002: Upgraded package: P
04-Oct-2002: Upgraded package: P
04-Oct-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache apache.spec
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: 18-Sep-2002 10:22:27
Branch: HEAD Handle: 2002091809222700
Modified files:
openpkg-src/apache apache.spec
Log:
fix logic
Summary:
RevisionChanges Path
1.87+2 -2 openpkg-src/apache/apache.spec
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.86 -r1.87 apache.spec
--- openpkg-src/apache/apache.spec18 Sep 2002 08:12:20 - 1.86
+++ openpkg-src/apache/apache.spec18 Sep 2002 08:22:27 - 1.87
@@ -685,11 +685,11 @@
libs=""
%if "%{with_mod_auth_pam}" == "yes"
pam_incdir=`%{l_prefix}/etc/rc --query pam_incdir`
- if [ ".$pam_incdir" != "./usr/include" -o ".$pam_incdir" != "./include" ];
then
+ if [ ".$pam_incdir" != "./usr/include" -a ".$pam_incdir" != "./include" ];
then
cflags="$cflags -I$pam_incdir"
fi
pam_libdir=`%{l_prefix}/etc/rc --query pam_libdir`
- if [ ".$pam_libdir" != "./usr/lib" -o ".$pam_libdir" != "./lib" ]; then
+ if [ ".$pam_libdir" != "./usr/lib" -a ".$pam_libdir" != "./lib" ]; then
ldflags="$ldflags -L$pam_libdir"
fi
libs="$libs -lpam"
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache apache.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 18-Sep-2002 10:12:21
Branch: HEAD Handle: 2002091809122000
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
workaround for brain-dead Solaris which has a /lib -> /usr/lib symlink
Summary:
RevisionChanges Path
1.86+3 -3 openpkg-src/apache/apache.spec
1.1571 +1 -0 openpkg-web/news.txt
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.85 -r1.86 apache.spec
--- openpkg-src/apache/apache.spec16 Sep 2002 11:51:47 - 1.85
+++ openpkg-src/apache/apache.spec18 Sep 2002 08:12:20 - 1.86
@@ -143,7 +143,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20020916
+Release: 20020918
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -685,11 +685,11 @@
libs=""
%if "%{with_mod_auth_pam}" == "yes"
pam_incdir=`%{l_prefix}/etc/rc --query pam_incdir`
- if [ ".$pam_incdir" != "./usr/include" ]; then
+ if [ ".$pam_incdir" != "./usr/include" -o ".$pam_incdir" != "./include" ];
then
cflags="$cflags -I$pam_incdir"
fi
pam_libdir=`%{l_prefix}/etc/rc --query pam_libdir`
- if [ ".$pam_libdir" != "./usr/lib" ]; then
+ if [ ".$pam_libdir" != "./usr/lib" -o ".$pam_libdir" != "./lib" ]; then
ldflags="$ldflags -L$pam_libdir"
fi
libs="$libs -lpam"
Index: openpkg-web/news.txt
$ cvs diff -u -r1.1570 -r1.1571 news.txt
--- openpkg-web/news.txt 18 Sep 2002 07:12:16 - 1.1570
+++ openpkg-web/news.txt 18 Sep 2002 08:12:20 - 1.1571
@@ -1,3 +1,4 @@
+18-Sep-2002: Upgraded package: P
18-Sep-2002: Upgraded package: P
17-Sep-2002: Upgraded package: P
17-Sep-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache apache.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 13-Sep-2002 13:24:47
Branch: HEAD Handle: 2002091312244600
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
fix dependencies inside PHP
Summary:
RevisionChanges Path
1.84+13 -14 openpkg-src/apache/apache.spec
1.1539 +1 -0 openpkg-web/news.txt
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.83 -r1.84 apache.spec
--- openpkg-src/apache/apache.spec7 Sep 2002 07:06:52 - 1.83
+++ openpkg-src/apache/apache.spec13 Sep 2002 11:24:46 - 1.84
@@ -143,7 +143,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20020907
+Release: 20020913
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -434,23 +434,22 @@
# optionally prepare mod_php
%if "%{with_mod_php}" == "yes"
( cd php-%{V_mod_php}
- CC="%{l_cc}" \
+ CC="%{l_cc}"; export CC
+ CFLAGS="%{l_cflags -O} -I%{l_prefix}/include"; export CFLAGS
+ CPPFLAGS="%{l_cflags -O} -I%{l_prefix}/include"; export CPPFLAGS
+ LDFLAGS="%{l_cflags -O} -L%{l_prefix}/lib"; export LDFLAGS
+ LIBS=""; export LIBS
%if "%{with_mod_ssl}" == "yes"
- CFLAGS="%{l_cflags -O} -I%{l_prefix}/include -DEAPI" \
-%else
- CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
-%endif
- CPPFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
- LDFLAGS="%{l_cflags -O} -L%{l_prefix}/lib" \
-%if "%{with_mod_php_gd}" == "yes" && "%{with_mod_php_gettext}" == "yes"
- LIBS="-lpng -lz -liconv" \
-%else
-%if "%{with_mod_php_gd}" == "yes"
- LIBS="-lpng -lz" \
+ CFLAGS="$CFLAGS -DEAPI"
+%endif
+%if "%{with_mod_php_gd}" == "yes"
+ LIBS="$LIBS -lpng -lz"
%endif
%if "%{with_mod_php_gettext}" == "yes"
- LIBS="-liconv" \
+ LIBS="$LIBS -liconv" \
%endif
+%if "%{with_mod_php_openldap}" == "yes"
+ LIBS="$LIBS -lsasl2"
%endif
./configure \
--prefix=%{l_prefix} \
Index: openpkg-web/news.txt
$ cvs diff -u -r1.1538 -r1.1539 news.txt
--- openpkg-web/news.txt 13 Sep 2002 11:14:29 - 1.1538
+++ openpkg-web/news.txt 13 Sep 2002 11:24:46 - 1.1539
@@ -1,3 +1,4 @@
+13-Sep-2002: Upgraded package: P
13-Sep-2002: Upgraded package: P
13-Sep-2002: Upgraded package: P
13-Sep-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache apache.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 07-Sep-2002 09:06:52
Branch: HEAD Handle: 2002090708065101
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
upgrade to PHP 4.2.3
Summary:
RevisionChanges Path
1.83+2 -2 openpkg-src/apache/apache.spec
1.1496 +1 -0 openpkg-web/news.txt
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.82 -r1.83 apache.spec
--- openpkg-src/apache/apache.spec29 Aug 2002 14:15:22 - 1.82
+++ openpkg-src/apache/apache.spec7 Sep 2002 07:06:52 - 1.83
@@ -119,7 +119,7 @@
%define V_apache 1.3.26
%define V_mod_ssl2.8.10-1.3.26
%define V_mod_perl 1.27
-%define V_mod_php4.2.2
+%define V_mod_php4.2.3
%define V_mod_php3 3.0.18
%define V_mod_dav1.0.3-1.3.6
%define V_mod_layout 3.2
@@ -143,7 +143,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20020829
+Release: 20020907
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
Index: openpkg-web/news.txt
$ cvs diff -u -r1.1495 -r1.1496 news.txt
--- openpkg-web/news.txt 7 Sep 2002 07:06:27 - 1.1495
+++ openpkg-web/news.txt 7 Sep 2002 07:06:51 - 1.1496
@@ -1,3 +1,4 @@
+07-Sep-2002: Upgraded package: P
07-Sep-2002: Upgraded package: P
07-Sep-2002: Upgraded package: P
06-Sep-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache apache.spec openpkg-web news.txt
OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 29-Aug-2002 16:15:23
Branch: HEAD Handle: 2002082915152101
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
fix mod_php+gd+zlib situation (inter-dependencies)
Summary:
RevisionChanges Path
1.82+13 -13 openpkg-src/apache/apache.spec
1.1439 +1 -0 openpkg-web/news.txt
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.81 -r1.82 apache.spec
--- openpkg-src/apache/apache.spec26 Aug 2002 09:39:21 - 1.81
+++ openpkg-src/apache/apache.spec29 Aug 2002 14:15:22 - 1.82
@@ -96,22 +96,22 @@
exit 1
%endif
%if "%{with_mod_ssl}" == "yes"
-%define with_mod_php_openssl yes
-%define with_mod_php_mm yes
-%endif
-%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_pdflib}" == "yes"
-%define with_mod_php_zlibyes
+%define with_mod_php_openssl yes
+%define with_mod_php_mmyes
%endif
%if "%{with_mod_php_freetype}" == "yes"
-%define with_mod_php_gd yes
+%define with_mod_php_gdyes
+%endif
+%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_pdflib}" == "yes" ||
"%{with_mod_php_gd}" == "yes"
+%define with_mod_php_zlib yes
%endif
%endif
%if "%{with_mod_php3}" == "yes"
%if "%{with_mod_ssl}" == "yes"
-%define with_mod_php3_openssl yes
+%define with_mod_php3_openssl yes
%endif
%if "%{with_mod_php3_mysql}" == "yes"
-%define with_mod_php3_zlibyes
+%define with_mod_php3_zlib yes
%endif
%endif
@@ -143,7 +143,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20020801
+Release: 20020829
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -272,7 +272,7 @@
--define 'with_mod_perl %{with_mod_perl}' \
--define 'with_mod_php %{with_mod_php}' \
--define 'with_mod_php3 %{with_mod_php3}' \
---define 'with_mod_ssl %{with_mod_ssl}'
+--define 'with_mod_ssl %{with_mod_ssl}' \
Options (additional modules II):
--define 'with_mod_access_referer %{with_mod_access_referer}' \
@@ -282,7 +282,7 @@
--define 'with_mod_relocate %{with_mod_relocate}' \
--define 'with_mod_roaming %{with_mod_roaming}' \
--define 'with_mod_throttle %{with_mod_throttle}' \
---define 'with_mod_zmod %{with_mod_zmod}'
+--define 'with_mod_zmod %{with_mod_zmod}' \
Options (additional extensions for mod_php):
--define 'with_mod_php_bzip2%{with_mod_php_bzip2}' \
@@ -305,7 +305,7 @@
--define 'with_mod_php_pdflib %{with_mod_php_pdflib}' \
--define 'with_mod_php_transsid %{with_mod_php_transsid}' \
--define 'with_mod_php_xml %{with_mod_php_xml}' \
---define 'with_mod_php_zlib %{with_mod_php_zlib}
+--define 'with_mod_php_zlib %{with_mod_php_zlib}' \
Options (additional extensions for mod_php3):
--define 'with_mod_php3_ftp %{with_mod_php3_ftp}' \
@@ -313,7 +313,7 @@
--define 'with_mod_php3_jpeg%{with_mod_php3_jpeg}' \
--define 'with_mod_php3_mysql %{with_mod_php3_mysql}' \
--define 'with_mod_php3_openssl %{with_mod_php3_openssl}' \
---define 'with_mod_php3_zlib%{with_mod_php3_zlib}'
+--define 'with_mod_php3_zlib%{with_mod_php3_zlib}' \
%prep
# unpack Apache distribution
Index: openpkg-web/news.txt
$ cvs diff -u -r1.1438 -r1.1439 news.txt
--- openpkg-web/news.txt 29 Aug 2002 13:17:47 - 1.1438
+++ openpkg-web/news.txt 29 Aug 2002 14:15:21 - 1.1439
@@ -1,3 +1,4 @@
+29-Aug-2002: Upgraded package: P
29-Aug-2002: Upgraded package: P
29-Aug-2002: Upgraded package: P
29-Aug-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache apache.spec
OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Aug-2002 15:29:45
Branch: HEAD Handle: 2002080114294500
Modified files:
openpkg-src/apache apache.spec
Log:
some more changes on Thomas's request
Summary:
RevisionChanges Path
1.79+6 -2 openpkg-src/apache/apache.spec
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.78 -r1.79 apache.spec
--- openpkg-src/apache/apache.spec1 Aug 2002 13:17:02 - 1.78
+++ openpkg-src/apache/apache.spec1 Aug 2002 13:29:45 - 1.79
@@ -185,13 +185,13 @@
BuildPreReq: mysql
%endif
%if "%{with_mod_php_gd}" == "yes"
-BuildPreReq: GD
+BuildPreReq: GD, jpeg, png
%endif
%if "%{with_mod_php_db}" == "yes"
BuildPreReq: db
%endif
%if "%{with_mod_php_pdflib}" == "yes"
-BuildPreReq: pdflib
+BuildPreReq: pdflib, jpeg, png
%endif
%if "%{with_mod_php_zlib}" == "yes"
BuildPreReq: zlib
@@ -465,6 +465,8 @@
%endif
%if "%{with_mod_php_gd}" == "yes"
--with-gd=%{l_prefix} \
+ --with-jpeg-dir=%{l_prefix} \
+ --with-png-dir=%{l_prefix} \
%endif
%if "%{with_mod_php_freetype}" == "yes"
--enable-gd-imgstrttf \
@@ -487,6 +489,8 @@
%endif
%if "%{with_mod_php_pdflib}" == "yes"
--with-pdflib=%{l_prefix} \
+ --with-jpeg-dir=%{l_prefix} \
+ --with-png-dir=%{l_prefix} \
%endif
%if "%{with_mod_php_openssl}" == "yes" || "%{with_mod_php_openldap}" == "yes"
--with-openssl=%{l_prefix} \
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache apache.spec
OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Aug-2002 15:17:03
Branch: HEAD Handle: 2002080114170200
Modified files:
openpkg-src/apache apache.spec
Log:
fixed decription of options
Summary:
RevisionChanges Path
1.78+1 -0 openpkg-src/apache/apache.spec
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.77 -r1.78 apache.spec
--- openpkg-src/apache/apache.spec1 Aug 2002 12:52:40 - 1.77
+++ openpkg-src/apache/apache.spec1 Aug 2002 13:17:02 - 1.78
@@ -291,6 +291,7 @@
--define 'with_mod_php_db %{with_mod_php_db}' \
--define 'with_mod_php_debug%{with_mod_php_debug}' \
--define 'with_mod_php_ftp %{with_mod_php_ftp}' \
+--define 'with_mod_php_freetype %{with_mod_php_freetype}' \
--define 'with_mod_php_gd %{with_mod_php_gd}' \
--define 'with_mod_php_gettext %{with_mod_php_gettext}' \
--define 'with_mod_php_imap %{with_mod_php_imap}' \
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
