[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 21 || 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: Papache-1.3.29-20040205
05-Feb-2004: Upgraded package: Plynx-2.8.5-20040205
05-Feb-2004: Upgraded package: Pimagemagick-5.5.7.16-20040205
05-Feb-2004: Upgraded package: Pgcc34-3.4s20040204-20040205
@@ .
__
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: Papache-1.3.29-20040202
02-Feb-2004: Upgraded package: Pamd-6.0.9-20040202
02-Feb-2004: Upgraded package: Pimapd-2.2.3-20040202
02-Feb-2004: Upgraded package: Pvim-6.2.225-20040202
@@ .
__
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: Papache-1.3.29-20040130
30-Jan-2004: Upgraded package: Pgdbm-1.8.3-20040130
30-Jan-2004: Upgraded package: Pgettext-0.14.1-20040130
29-Jan-2004: Upgraded package: Pmultitail-3.0.6-20040129
@@ .
__
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: Papache-1.3.29-20040127
27-Jan-2004: Upgraded package: Pbochs-2.1-20040127
27-Jan-2004: Upgraded package: Poracle-20040127-20040127
27-Jan-2004: Upgraded package: Pvim-6.2.211-20040127
@@ .
__
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: Papache-1.3.29-20040124
24-Jan-2004: Upgraded package: Popenpkg-20040124-20040124
24-Jan-2004: Upgraded package: Pmplayer-1.0pre3-20040124
24-Jan-2004: Upgraded package: Pkde-qt-3.2.3-20040124
@@ .
__
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: Papache-1.3.29-20040109
09-Jan-2004: Upgraded package: Pfsl-1.4b1-20040109
09-Jan-2004: Upgraded package: Pless-381-20040109
09-Jan-2004: Upgraded package: Pperl-gtk-20040109-20040109
@@ .
__
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: Papache-1.3.29-20040106
06-Jan-2004: New package: Plibuuid-1.34-20040106
06-Jan-2004: Upgraded package: Psqlite-2.8.9-20040106
06-Jan-2004: Upgraded package: Pperl-sys-20040106-20040106
@@ .
__
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: Papache-1.3.29-20031217
17-Dec-2003: Upgraded package: Psnmpdx-0.2.8-20031217
17-Dec-2003: Upgraded package: Ppureftpd-1.0.17a-20031217
17-Dec-2003: Upgraded package: Ptsmc-5.1.6.2-20031217
@@ .
__
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: Papache-1.3.29-20031126
25-Nov-2003: Upgraded package: Pxmlrpcpp-0.7-20031125
25-Nov-2003: Upgraded package: Pxmlrpc++-0.7-20031125
25-Nov-2003: New package: Pxmlrpc++-0.7-20031125
@@ .
__
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: Papache-1.3.29-20031125
25-Nov-2003: Upgraded package: Pzebra-0.93b-1.2.1
25-Nov-2003: Upgraded package: Pzebra-0.93b-1.3.1
25-Nov-2003: Upgraded package: Phoneyd-0.7-20031125
@@ .
__
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: Pskey-1.1.5-20031028
-28-Oct-2003: Upgraded package: Papache-1.3.27-1.2.3
-28-Oct-2003: Upgraded package: Papache-1.3.28-1.3.1
-28-Oct-2003: Upgraded package: Papache2-2.0.48-20031028
28-Oct-2003: Upgraded package: Papache-1.3.29-20031028
-28-Oct-2003: Upgraded package: Ppostfix-2.0.16-20031028
-28-Oct-2003: Upgraded package: Pfsl-1.3.0-1.3.2
-28-Oct-2003: Upgraded package: Popenpkg-20031028-20031028
-27-Oct-2003: Upgraded package: Pdbtool-1.6-20031027
-27-Oct-2003: Upgraded package: Pcvs-1.12.2-20031027
-27-Oct-2003: Upgraded package: Pperl-tk-20031027-20031027
-27-Oct-2003: Upgraded package: Ppowerdns-2.9.12-20031027
-27-Oct-2003: Upgraded package: Pbs-0.98c8-20031027
-27-Oct-2003: Upgraded package: Pgqview-1.3.3-20031027
-27-Oct-2003: Upgraded package: Popenpkg-20031027-20031027
-27-Oct-2003: Upgraded package: Pgnutls-0.9.93-20031027
-27-Oct-2003: Upgraded package: Pgcrypt-1.1.43-20031027
-27-Oct-2003: New package: Pgpg-error-0.5-20031027
-27-Oct-2003: Upgraded package: Pvim-6.2.135-20031027
-27-Oct-2003: Upgraded package: Pxterm-1.81-20031027
-27-Oct-2003: Upgraded package: Pperl-dbi-20031027-20031027
- news.txt
-27-Oct-2003: Upgraded package: Pperl-www-20031027-20031027
-===
-27-Oct-2003: New package: Pgqview-1.3.3-20031027
-27-Oct-2003: Upgraded package: Pperl-www-20031027-20031027
- 1.7183
27-Oct-2003: Upgraded package: Pmplayer-1.0pre2-20031027
27-Oct-2003: Upgraded package: Pmonit-4.1-20031027
27-Oct-2003: Upgraded package: Pzoem-03.300-20031027
@@ .
__
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: Papache-1.3.28-20031009
09-Oct-2003: Upgraded package: Pphp-4.3.3-20031009
09-Oct-2003: Upgraded package: Popenssh-3.7.1p2-20031009
08-Oct-2003: Upgraded package: Pquagga-0.96.3-20031008
@@ .
__
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: Papache-1.3.28-20031007
07-Oct-2003: Upgraded package: Ptar-1.13.25-20031007
07-Oct-2003: Upgraded package: Pgzip-1.3.5-20031007
07-Oct-2003: Upgraded package: Pvim-6.2.106-20031007
@@ .
__
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-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: Papache-1.3.28-20031002
02-Oct-2003: Upgraded package: Pgcc-3.3.1-20031002
02-Oct-2003: Upgraded package: Pbogofilter-0.15.5.2-20031002
02-Oct-2003: Upgraded package: Psudo-1.6.7p5-20031002
@@ .
__
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: Papache-1.3.28-20030916
16-Sep-2003: Upgraded package: Psquid-2.5.4-20030916
16-Sep-2003: Upgraded package: Ppine-4.58L-20030916
16-Sep-2003: Upgraded package: Pscribus-1.1.0-20030916
@@ .
__
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: Papache-1.3.28-20030904
04-Sep-2003: Upgraded package: Pphp-4.3.3-20030904
04-Sep-2003: Upgraded package: Psnmp-5.0.8-20030904
04-Sep-2003: Upgraded package: Pp0f-2.0.1-20030904
@@ .
__
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: Papache-1.3.28-20030812
11-Aug-2003: Upgraded package: Ppython-2.3-20030811
11-Aug-2003: Upgraded package: Porbit2-2.7.6-20030811
11-Aug-2003: Upgraded package: Pntp-4.1.2-20030811
@@ .
__
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: Papache-1.3.27-20030715
15-Jul-2003: Upgraded package: Pphp-4.3.2-20030715
15-Jul-2003: Upgraded package: Pperforce-2003.1-20030715
15-Jul-2003: Upgraded package: Prdist-7.0.0a10-20030715
@@ .
__
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: Papache-1.3.27-20030709
09-Jul-2003: Upgraded package: Pxfig-3.2.4-20030709
09-Jul-2003: Upgraded package: Ptransfig-3.2.4-20030709
09-Jul-2003: Upgraded package: Psubversion-0.24.2-20030709
@@ .
__
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.5296 news.txt
--- openpkg-web/news.txt 7 Jul 2003 08:10:27 - 1.5295
+++ openpkg-web/news.txt 7 Jul 2003
[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: Papache-1.3.27-20030704
04-Jul-2003: Upgraded package: Pmysql3-3.23.57-20030704
04-Jul-2003: Upgraded package: Pmysql-4.0.13-20030704
04-Jul-2003: Upgraded package: Pjikes-1.18-20030704
@@ .
__
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: Papache-1.3.27-20030702
02-Jul-2003: Upgraded package: Pgcc32-3.2.3-20030702
02-Jul-2003: Upgraded package: Pphp-4.3.2-20030702
02-Jul-2003: Upgraded package: Ppostfix-2.0.13-20030702
@@ .
__
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
[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: Papache-1.3.27-20030605
05-Jun-2003: Upgraded package: Puvscan-4.1.6.4269-20030605
05-Jun-2003: Upgraded package: Pvim-6.2.13-20030605
05-Jun-2003: Upgraded package: Pdmalloc-5.0.2-20030605
@@ .
__
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//' mod_auth_pam.c \
+ ../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: Papache-1.3.27-20030604
04-Jun-2003: Upgraded package: Pmozilla-1.3.1-20030604
04-Jun-2003: Upgraded package: Puucp-1.07-20030604
04-Jun-2003: Upgraded package: Pimagemagick-5.5.7.8-20030604
@@ .
__
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: Papache-1.3.27-20030603
03-Jun-2003: Upgraded package: Pgd-2.0.12-20030603
03-Jun-2003: Upgraded package: Pghostscript-7.04-1.1.1
03-Jun-2003: New package: Pgcc32-3.2.3-20030603
@@ .
__
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: Papache-1.3.27-20030404
04-Apr-2003: Upgraded package: Pstrace-4.4.94-20030404
04-Apr-2003: Upgraded package: Pperl-util-20030404-20030404
04-Apr-2003: Upgraded package: Pcvsps-2.0b10-20030404
@@ .
__
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: Papache-1.3.27-20030228
28-Feb-2003: Upgraded package: Popenpkg-tool-20030228-20030228
27-Feb-2003: New package: Pnsd-1.0.2-20030227
27-Feb-2003: Upgraded package: Pmysql4-4.0.11a-20030227
@@ .
__
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: Papache-1.3.27-20030211
+11-Feb-2003: Upgraded package: Pgdbm-1.8.3-20030211
11-Feb-2003: Upgraded package: Plmtp2nntp-1.2b2-20030211
11-Feb-2003: Upgraded package: Pmysql-3.23.55-20030211
11-Feb-2003: New package: Pjikes-1.18-20030211
@@ .
__
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: Papache-1.3.27-20030207
07-Feb-2003: Upgraded package: Pperl-dbi-20030207-20030207
07-Feb-2003: Upgraded package: Poracle-20030207-20030207
07-Feb-2003: New package: Poracle-20030207-20030207
@@ .
__
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: Papache-1.3.27-20030206
06-Feb-2003: Upgraded package: Popenpkg-tool-20030206-20030206
05-Feb-2003: Upgraded package: Ppostgresql-7.3.2-20030205
05-Feb-2003: Upgraded package: Popenpkg-20030205-20030205
@@ .
__
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: Papache-1.3.27-20030202
02-Feb-2003: Upgraded package: Pmixmaster-2.9.0-20030202
02-Feb-2003: Upgraded package: Pvcg-1.30.3.17-20030202
02-Feb-2003: Upgraded package: Pguile-1.6.3-20030202
@@ .
__
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: Papache-1.3.27-20030123
23-Jan-2003: Upgraded package: Pas-gui-0.5.21-20030123
23-Jan-2003: Upgraded package: Pperl-xml-20030123-20030123
23-Jan-2003: Upgraded package: Pperl-www-20030123-20030123
@@ .
__
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: Papache-1.3.27-20030116
16-Jan-2003: Upgraded package: Pguile-1.6.1-20030116
16-Jan-2003: Upgraded package: Pas-gui-0.5.10-20030116
16-Jan-2003: Upgraded package: Pdocbook-4.2-20030116
@@ .
__
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-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: Papache-1.3.27-20030107
07-Jan-2003: New package: Pimap-2002a-20030107
07-Jan-2003: Upgraded package: Pc-client-2002a-20030107
07-Jan-2003: Upgraded package: Pmico-2.3.7-20030107
@@ .
__
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: Papache-1.3.27-20030103
03-Jan-2003: Upgraded package: Popenpkg-20030103-20030103
03-Jan-2003: New package: Popenssh-3.5p1-20030103
03-Jan-2003: Upgraded package: Popenpkg-tool-20030103-20030103
@@ .
__
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: Papache-1.3.27-20030103
03-Jan-2003: New package: Pxerces-c-2.1.0-20030103
03-Jan-2003: New package: Ptetex-1.0.7-20030103
03-Jan-2003: New package: Pxalan-c-1.4-20030103
@@ .
__
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
+%option
[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: Papache-1.3.27-20021120
20-Nov-2002: Upgraded package: Pqpopper-4.0.4-20021120
20-Nov-2002: Upgraded package: Pwhois-4.5.33-20021120
20-Nov-2002: Upgraded package: Pgcc-3.2.1-20021120
__
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: Papache-1.3.27-20021023
23-Oct-2002: Upgraded package: Popenpkg-20021023-20021023
23-Oct-2002: Upgraded package: Pcurl-7.10.1-20021023
23-Oct-2002: Upgraded package: Pgd-2.0.3-20021023
__
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: Papache-1.3.27-20021004
04-Oct-2002: Upgraded package: Popenpkg-20021004-20021004
04-Oct-2002: Upgraded package: Psysmon-0.91.13-20021004
04-Oct-2002: Upgraded package: Pmake-3.80-20021004
__
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: Papache-1.3.26-20020918
18-Sep-2002: Upgraded package: Patool-0.22.0-20020918
17-Sep-2002: Upgraded package: Pcvs-1.11.2-20020917
17-Sep-2002: Upgraded package: Prdiff-backup-0.10.1-20020917
__
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: Papache-1.3.26-20020913
13-Sep-2002: Upgraded package: Popenldap-2.1.4-20020913
13-Sep-2002: Upgraded package: Pimagemagick-5.4.9.1-20020913
13-Sep-2002: Upgraded package: Pperl-time-20020913-20020913
__
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: Papache-1.3.26-20020829
29-Aug-2002: Upgraded package: Pglib2-2.0.6-20020829
29-Aug-2002: Upgraded package: Pglib-1.2.10-20020829
29-Aug-2002: Upgraded package: Pimapd-2.1.8-20020829
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
