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:
Revision Changes 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.spec 11 Jun 2003 10:18:20 -0000 1.138
+++ openpkg-src/apache/apache.spec 27 Jun 2003 09:16:04 -0000 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_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_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_macro no
# package options (additionally used Apache modules; you have to know what you do)
-%option with_mod_auth_ldap no
-%option with_mod_auth_pam no
-%option with_mod_gzip no
-%option with_mod_fastcgi no
-%option with_mod_throttle no
-%option with_mod_access_referer no
-%option with_mod_roaming no
-%option with_mod_relocate no
+%option with_mod_auth_ldap no
+%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_openssl no
-%option with_mod_php_openldap no
-%option with_mod_php_mm no
-%option with_mod_php_pcre no
-%option with_mod_php_ftp no
-%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_gettext no
-%option with_mod_php_imap no
-%option with_mod_php_xml no
-%option with_mod_php_dom no
-%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_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_openssl no
+%option with_mod_php_openldap no
+%option with_mod_php_openldapsasl no
+%option with_mod_php_mm no
+%option with_mod_php_pcre no
+%option with_mod_php_ftp no
+%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_gettext no
+%option with_mod_php_imap no
+%option with_mod_php_xml no
+%option with_mod_php_dom no
+%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
# package options (optional PHP3 specific settings; requires "with_mod_php3")
-%option with_mod_php3_ftp no
-%option with_mod_php3_gd no
-%option with_mod_php3_jpeg no
-%option with_mod_php3_mysql no
-%option with_mod_php3_openssl no
-%option with_mod_php3_zlib no
+%option with_mod_php3_ftp no
+%option with_mod_php3_gd no
+%option with_mod_php3_jpeg no
+%option with_mod_php3_mysql no
+%option with_mod_php3_openssl no
+%option with_mod_php3_zlib no
# package options (braindead ones only)
-%option with_gdbm_ndbm no
+%option with_gdbm_ndbm no
# fixing implicit inter-module dependencies and correlations
%if "%{with_mod_php}" == "yes"
@@ -135,31 +136,31 @@
%if "%{with_mod_ssl}" == "yes"
%undefine with_mod_php_openssl
%undefine with_mod_php_mm
-%define with_mod_php_openssl yes
-%define with_mod_php_mm yes
+%define with_mod_php_openssl yes
+%define with_mod_php_mm yes
%endif
%if "%{with_mod_php_freetype}" == "yes"
%undefine with_mod_php_gd
-%define with_mod_php_gd yes
+%define with_mod_php_gd yes
%endif
%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_pdflib}" == "yes" ||
"%{with_mod_php_gd}" == "yes" || "%{with_mod_php_dom}" == "yes"
%undefine with_mod_php_zlib
-%define with_mod_php_zlib yes
+%define with_mod_php_zlib yes
%endif
%endif
%if "%{with_mod_php3}" == "yes"
%if "%{with_mod_ssl}" == "yes"
%undefine with_mod_php3_openssl
-%define with_mod_php3_openssl yes
+%define with_mod_php3_openssl yes
%endif
%if "%{with_mod_php3_mysql}" == "yes"
%undefine with_mod_php3_zlib
-%define with_mod_php3_zlib yes
+%define with_mod_php3_zlib yes
%endif
%endif
%if "%{with_mod_php_gdbm}" == "yes"
%undefine with_gdbm_ndbm
-%define with_gdbm_ndbm yes
+%define with_gdbm_ndbm yes
%endif
# list of sources
@@ -224,6 +225,11 @@
%if "%{with_mod_php_openldap}" == "yes"
BuildPreReq: openldap, openssl
%endif
+%if "%{with_mod_php_openldapsasl}" == "yes"
+BuildPreReq: openldap::with_sasl = yes
+%else
+BuildPreReq: openldap::with_sasl = no
+%endif
%if "%{with_mod_php_mm}" == "yes"
BuildPreReq: mm
%endif
@@ -436,7 +442,7 @@
%if "%{with_mod_php_gettext}" == "yes"
LIBS="$LIBS -liconv"
%endif
-%if "%{with_mod_php_openldap}" == "yes"
+%if "%{with_mod_php_openldap}" == "yes" && "%{with_mod_php_openldapsasl}" == "yes"
LIBS="$LIBS -lsasl2"
%endif
%if "%{with_mod_php_imap}" == "yes"
@@ -837,6 +843,8 @@
%if "%{with_mod_php}" == "yes"
%{l_shtool} install -c -m 644 /dev/null \
$RPM_BUILD_ROOT%{l_prefix}/etc/apache/php.ini
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/php
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/php/build
%endif
# create default configuration
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5033 -r1.5034 news.txt
--- openpkg-web/news.txt 27 Jun 2003 08:55:54 -0000 1.5033
+++ openpkg-web/news.txt 27 Jun 2003 09:16:03 -0000 1.5034
@@ -1,3 +1,4 @@
+27-Jun-2003: Upgraded package: P<apache-1.3.27-20030627>
27-Jun-2003: Upgraded package: P<kerberos-1.2.8-20030627>
27-Jun-2003: Upgraded package: P<tinyca-0.4.7-20030627>
27-Jun-2003: Upgraded package: P<perl-parse-20030627-20030627>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
