OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 21-Jan-2004 00:59:40
Branch: HEAD Handle: 2004012023593109
Modified files:
openpkg-src/apache apache.spec
openpkg-src/cups cups.spec
openpkg-src/ethereal ethereal.spec
openpkg-src/kolab kolab.spec
openpkg-src/meta-rdbms meta-rdbms.spec
openpkg-src/mysql mysql.spec
openpkg-src/mysql3 mysql3.spec
openpkg-src/mysql41 mysql41.spec
openpkg-src/perl-dbi perl-dbi.spec
openpkg-src/php php.spec
openpkg-src/php3 php3.spec
openpkg-src/php5 php5.spec
openpkg-src/postfix postfix.spec
openpkg-src/rt rt.spec
openpkg-src/sendmail sendmail.spec
openpkg-web news.txt
Log:
cleanup consistency of options by renaming some of them
Summary:
Revision Changes Path
1.197 +20 -20 openpkg-src/apache/apache.spec
1.13 +4 -4 openpkg-src/cups/cups.spec
1.29 +4 -4 openpkg-src/ethereal/ethereal.spec
1.8 +2 -2 openpkg-src/kolab/kolab.spec
1.4 +3 -3 openpkg-src/meta-rdbms/meta-rdbms.spec
1.86 +7 -7 openpkg-src/mysql/mysql.spec
1.25 +7 -7 openpkg-src/mysql3/mysql3.spec
1.3 +7 -7 openpkg-src/mysql41/mysql41.spec
1.83 +9 -9 openpkg-src/perl-dbi/perl-dbi.spec
1.70 +10 -10 openpkg-src/php/php.spec
1.4 +10 -10 openpkg-src/php3/php3.spec
1.3 +10 -10 openpkg-src/php5/php5.spec
1.187 +6 -6 openpkg-src/postfix/postfix.spec
1.115 +10 -10 openpkg-src/rt/rt.spec
1.104 +4 -4 openpkg-src/sendmail/sendmail.spec
1.8152 +15 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.196 -r1.197 apache.spec
--- openpkg-src/apache/apache.spec 12 Jan 2004 18:34:38 -0000 1.196
+++ openpkg-src/apache/apache.spec 20 Jan 2004 23:59:33 -0000 1.197
@@ -62,7 +62,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20040112
+Release: 20040121
# package options (suexec related)
%option with_suexec yes
@@ -99,12 +99,12 @@
%option with_mod_php_mysql no
%option with_mod_php_pgsql no
%option with_mod_php_gd no
-%option with_mod_php_db no
+%option with_mod_php_bdb 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_ssl no
%option with_mod_php_openldap no
%option with_mod_php_openldapsasl no
%option with_mod_php_mm no
@@ -126,7 +126,7 @@
%option with_mod_php_gdbm no
%option with_mod_php_versioning no
%option with_mod_php_snmp no
-%option with_mod_php_unixodbc no
+%option with_mod_php_odbc no
%option with_mod_php_mbregex no
%option with_mod_php_mbstring no
%option with_mod_php_pear no
@@ -136,7 +136,7 @@
%option with_mod_php3_gd no
%option with_mod_php3_jpeg no
%option with_mod_php3_mysql no
-%option with_mod_php3_openssl no
+%option with_mod_php3_ssl no
%option with_mod_php3_zlib no
# package options (braindead ones only)
@@ -153,9 +153,9 @@
%{error:build-time options 'with_mod_php' and 'with_mod_php3' conflict}
%endif
%if "%{with_mod_ssl}" == "yes"
-%undefine with_mod_php_openssl
+%undefine with_mod_php_ssl
%undefine with_mod_php_mm
-%define with_mod_php_openssl yes
+%define with_mod_php_ssl yes
%define with_mod_php_mm yes
%endif
%if "%{with_mod_php_freetype}" == "yes"
@@ -167,14 +167,14 @@
%define with_mod_php_zlib yes
%endif
%if "%{with_mod_php_pgsql}" == "yes"
-%undefine with_mod_php_openssl
-%define with_mod_php_openssl yes
+%undefine with_mod_php_ssl
+%define with_mod_php_ssl yes
%endif
%endif
%if "%{with_mod_php3}" == "yes"
%if "%{with_mod_ssl}" == "yes"
-%undefine with_mod_php3_openssl
-%define with_mod_php3_openssl yes
+%undefine with_mod_php3_ssl
+%define with_mod_php3_ssl yes
%endif
%if "%{with_mod_php3_mysql}" == "yes"
%undefine with_mod_php3_zlib
@@ -241,7 +241,7 @@
BuildPreReq: gd >= 2.0.20, jpeg, png
PreReq: gd >= 2.0.20, jpeg, png
%endif
-%if "%{with_mod_php_db}" == "yes"
+%if "%{with_mod_php_bdb}" == "yes"
BuildPreReq: db
PreReq: db
%endif
@@ -257,7 +257,7 @@
BuildPreReq: bzip2
PreReq: bzip2
%endif
-%if "%{with_mod_php_openssl}" == "yes"
+%if "%{with_mod_php_ssl}" == "yes"
BuildPreReq: openssl
PreReq: openssl
%endif
@@ -323,7 +323,7 @@
BuildPreReq: snmp
PreReq: snmp
%endif
-%if "%{with_mod_php_unixodbc}" == "yes"
+%if "%{with_mod_php_odbc}" == "yes"
BuildPreReq: unixodbc
PreReq: unixodbc
%endif
@@ -342,7 +342,7 @@
BuildPreReq: mysql
PreReq: mysql
%endif
-%if "%{with_mod_php3_openssl}" == "yes"
+%if "%{with_mod_php3_ssl}" == "yes"
BuildPreReq: openssl
PreReq: openssl
%endif
@@ -555,7 +555,7 @@
%if "%{with_mod_php_imap}" == "yes"
LIBS="$LIBS -lssl -lcrypto"
%endif
-%if "%{with_mod_php_db}" == "yes"
+%if "%{with_mod_php_bdb}" == "yes"
LIBS="$LIBS -ldb"
%endif
%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
@@ -597,7 +597,7 @@
--enable-gd-native-ttf \
--with-freetype-dir=%{l_prefix} \
%endif
-%if "%{with_mod_php_db}" == "yes"
+%if "%{with_mod_php_bdb}" == "yes"
--with-db4=%{l_prefix} \
%endif
%if "%{with_mod_php_debug}" == "yes"
@@ -617,7 +617,7 @@
--with-jpeg-dir=%{l_prefix} \
--with-png-dir=%{l_prefix} \
%endif
-%if "%{with_mod_php_openssl}" == "yes" || "%{with_mod_php_openldap}" == "yes"
+%if "%{with_mod_php_ssl}" == "yes" || "%{with_mod_php_openldap}" == "yes"
--with-openssl=%{l_prefix} \
%endif
%if "%{with_mod_php_openldap}" == "yes"
@@ -681,7 +681,7 @@
%if "%{with_mod_php_versioning}" == "yes"
--enable-versioning \
%endif
-%if "%{with_mod_php_unixodbc}" == "yes"
+%if "%{with_mod_php_odbc}" == "yes"
--with-unixODBC=%{l_prefix} \
%endif
%if "%{with_mod_php_snmp}" == "yes"
@@ -739,7 +739,7 @@
%if "%{with_mod_php3_gd}" == "yes"
--with-gd=%{l_prefix} \
%endif
-%if "%{with_mod_php3_openssl}" == "yes"
+%if "%{with_mod_php3_ssl}" == "yes"
--with-openssl=%{l_prefix} \
%endif
--disable-shared \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cups/cups.spec
============================================================================
$ cvs diff -u -r1.12 -r1.13 cups.spec
--- openpkg-src/cups/cups.spec 8 Dec 2003 15:43:25 -0000 1.12
+++ openpkg-src/cups/cups.spec 20 Jan 2004 23:59:34 -0000 1.13
@@ -33,10 +33,10 @@
Group: Print
License: GPL/LGPL with exceptions
Version: 1.1.20
-Release: 20031208
+Release: 20040121
# package options
-%option with_openssl no
+%option with_ssl no
# list of sources
Source0:
ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -51,7 +51,7 @@
PreReq: OpenPKG, openpkg >= 20030718
BuildPreReq: zlib, jpeg, png, tiff
PreReq: zlib, jpeg, png, tiff
-%if "%{with_openssl}" == "yes"
+%if "%{with_ssl}" == "yes"
BuildPreReq: openssl
PreReq: openssl
%endif
@@ -98,7 +98,7 @@
--with-cups-user=%{l_musr} \
--with-cups-group=%{l_mgrp} \
--disable-slp \
-%if "%{with_openssl}" == "yes"
+%if "%{with_ssl}" == "yes"
--enable-ssl \
--with-openssl-includes=%{l_prefix}/include/openssl \
--with-openssl-libs=%{l_prefix}/lib \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.spec
============================================================================
$ cvs diff -u -r1.28 -r1.29 ethereal.spec
--- openpkg-src/ethereal/ethereal.spec 14 Dec 2003 12:12:03 -0000 1.28
+++ openpkg-src/ethereal/ethereal.spec 20 Jan 2004 23:59:34 -0000 1.29
@@ -33,14 +33,14 @@
Group: Network
License: GPL
Version: 0.10.0a
-Release: 20031214
+Release: 20040121
# package options
%option with_zlib yes
%option with_adns yes
%option with_pcre yes
%option with_snmp yes
-%option with_openssl yes
+%option with_ssl yes
# list of sources
Source0: http://www.ethereal.com/distribution/ethereal-%{version}.tar.bz2
@@ -55,7 +55,7 @@
BuildPreReq: zlib
PreReq: zlib
%endif
-%if "%{with_openssl}" == "yes"
+%if "%{with_ssl}" == "yes"
BuildPreReq: openssl
PreReq: openssl
%endif
@@ -105,7 +105,7 @@
%else
--without-zlib \
%endif
-%if "%{with_openssl}" == "yes"
+%if "%{with_ssl}" == "yes"
--with-ssl=%{l_prefix} \
%else
--without-ssl \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kolab/kolab.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 kolab.spec
--- openpkg-src/kolab/kolab.spec 8 Dec 2003 14:16:10 -0000 1.7
+++ openpkg-src/kolab/kolab.spec 20 Jan 2004 23:59:34 -0000 1.8
@@ -37,7 +37,7 @@
Group: KDE
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20031208
+Release: 20040121
# list of sources
Source0:
http://www.erfrakon.de/projects/kolab/download/kolab-server-1.0/src/kolab-%{V_major}-%{version}.src.rpm
@@ -51,7 +51,7 @@
PreReq: sasl >= 2.1.15-20031122, sasl::with_ldap = yes, sasl::with_login = yes
PreReq: proftpd >= 1.2.9-20031031, proftpd::with_ldap = yes
PreReq: gdbm >= 1.8.3-20030213, gdbm::with_ndbm = yes
-PreReq: postfix >= 2.0.16-20031028, postfix::with_ldap = yes,
postfix::with_sasl = yes, postfix::with_tls = yes
+PreReq: postfix >= 2.0.16-20031028, postfix::with_ldap = yes,
postfix::with_sasl = yes, postfix::with_ssl = yes
PreReq: imapd >= 2.1.16-20031120, imapd::with_group = yes, imapd::with_vhost
= yes
PreReq: apache >= 1.3.29-20031124, apache::with_gdbm_ndbm = yes,
apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php =
yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes,
apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes,
apache::with_mod_php_xml = yes, apache::with_mod_php_pear = yes, apache::with_mod_ssl
= yes
AutoReq: no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/meta-rdbms/meta-rdbms.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 meta-rdbms.spec
--- openpkg-src/meta-rdbms/meta-rdbms.spec 4 Jan 2004 11:06:04 -0000 1.3
+++ openpkg-src/meta-rdbms/meta-rdbms.spec 20 Jan 2004 23:59:35 -0000 1.4
@@ -32,8 +32,8 @@
Distribution: OpenPKG [EVAL]
Group: Meta
License: -
-Version: 20040104
-Release: 20040104
+Version: 20040121
+Release: 20040121
# package options
%option with_rdbms_sqlite yes
@@ -68,7 +68,7 @@
%if "%{with_perl}" == "yes"
PreReq: perl, perl-dbi
%if "%{with_rdbms_pgsql}" == "yes"
-PreReq: perl-dbi::with_dbd_pg = yes
+PreReq: perl-dbi::with_dbd_pgsql = yes
%endif
%if "%{with_rdbms_mysql}" == "yes"
PreReq: perl-dbi::with_dbd_mysql = yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.85 -r1.86 mysql.spec
--- openpkg-src/mysql/mysql.spec 5 Jan 2004 14:10:43 -0000 1.85
+++ openpkg-src/mysql/mysql.spec 20 Jan 2004 23:59:35 -0000 1.86
@@ -39,11 +39,11 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20040105
+Release: 20040121
# package options
-%option with_berkeleydb yes
-%option with_innobase no
+%option with_bdb yes
+%option with_innodb no
# list of sources
Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-%{V_major}/mysql-%{V_mysql}.tar.gz
@@ -99,10 +99,10 @@
--with-unix-socket-path=%{l_prefix}/var/mysql/mysql.sock \
--with-mysqld-user=%{l_musr} \
--enable-thread-safe-client \
-%if "%{with_berkeleydb}" == "yes"
+%if "%{with_bdb}" == "yes"
--with-berkeley-db \
%endif
-%if "%{with_innobase}" == "no"
+%if "%{with_innodb}" == "no"
--without-innodb \
%endif
--with-named-z-libs=no \
@@ -139,7 +139,7 @@
strip $RPM_BUILD_ROOT%{l_prefix}/libexec/mysql/* 2>/dev/null || true
# determine default parameters
-%if "%{with_berkeleydb}" == "yes"
+%if "%{with_bdb}" == "yes"
l_mysql_bdb_cache_size=8M
l_mysql_bdb_log_buffer_size=32k
l_mysql_bdb_max_lock=10000
@@ -148,7 +148,7 @@
l_mysql_bdb_log_buffer_size=0
l_mysql_bdb_max_lock=0
%endif
-%if "%{with_berkeleydb}" == "yes" || "%{with_innobase}" == "yes"
+%if "%{with_bdb}" == "yes" || "%{with_innodb}" == "yes"
l_mysqld=mysqld
%else
l_mysqld=mysqld-max
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql3/mysql3.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 mysql3.spec
--- openpkg-src/mysql3/mysql3.spec 7 Oct 2003 15:43:51 -0000 1.24
+++ openpkg-src/mysql3/mysql3.spec 20 Jan 2004 23:59:36 -0000 1.25
@@ -37,11 +37,11 @@
Group: Database
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20031007
+Release: 20040121
# package options
-%option with_berkeleydb yes
-%option with_innobase no
+%option with_bdb yes
+%option with_innodb no
%option with_gemini no
# list of sources
@@ -120,10 +120,10 @@
--with-unix-socket-path=%{l_prefix}/var/mysql/mysql.sock \
--with-mysqld-user=%{l_musr} \
--enable-thread-safe-client \
-%if "%{with_berkeleydb}" == "yes"
+%if "%{with_bdb}" == "yes"
--with-berkeley-db \
%endif
-%if "%{with_innobase}" == "yes"
+%if "%{with_innodb}" == "yes"
--with-innodb \
%endif
%if "%{with_gemini}" == "yes"
@@ -162,7 +162,7 @@
strip $RPM_BUILD_ROOT%{l_prefix}/libexec/mysql/* 2>/dev/null || true
# determine default parameters
-%if "%{with_berkeleydb}" == "yes"
+%if "%{with_bdb}" == "yes"
l_mysql_bdb_cache_size=8M
l_mysql_bdb_log_buffer_size=32k
l_mysql_bdb_max_lock=10000
@@ -171,7 +171,7 @@
l_mysql_bdb_log_buffer_size=0
l_mysql_bdb_max_lock=0
%endif
-%if "%{with_berkeleydb}" == "yes" || "%{with_innobase}" == "yes" ||
"%{with_gemini}" == "yes"
+%if "%{with_bdb}" == "yes" || "%{with_innodb}" == "yes" || "%{with_gemini}" == "yes"
l_mysqld=mysqld
%else
l_mysqld=mysqld-max
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql41/mysql41.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 mysql41.spec
--- openpkg-src/mysql41/mysql41.spec 12 Jan 2004 12:10:46 -0000 1.2
+++ openpkg-src/mysql41/mysql41.spec 20 Jan 2004 23:59:36 -0000 1.3
@@ -39,11 +39,11 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20040112
+Release: 20040121
# package options
-%option with_berkeleydb yes
-%option with_innobase no
+%option with_bdb yes
+%option with_innodb no
# list of sources
Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-%{V_major}/mysql-%{V_mysql}.tar.gz
@@ -104,10 +104,10 @@
--with-unix-socket-path=%{l_prefix}/var/mysql/mysql.sock \
--with-mysqld-user=%{l_musr} \
--enable-thread-safe-client \
-%if "%{with_berkeleydb}" == "yes"
+%if "%{with_bdb}" == "yes"
--with-berkeley-db \
%endif
-%if "%{with_innobase}" == "no"
+%if "%{with_innodb}" == "no"
--without-innodb \
%endif
--with-named-z-libs=no \
@@ -144,7 +144,7 @@
strip $RPM_BUILD_ROOT%{l_prefix}/libexec/mysql/* 2>/dev/null || true
# determine default parameters
-%if "%{with_berkeleydb}" == "yes"
+%if "%{with_bdb}" == "yes"
l_mysql_bdb_cache_size=8M
l_mysql_bdb_log_buffer_size=32k
l_mysql_bdb_max_lock=10000
@@ -153,7 +153,7 @@
l_mysql_bdb_log_buffer_size=0
l_mysql_bdb_max_lock=0
%endif
-%if "%{with_berkeleydb}" == "yes" || "%{with_innobase}" == "yes"
+%if "%{with_bdb}" == "yes" || "%{with_innodb}" == "yes"
l_mysqld=mysqld
%else
l_mysqld=mysqld-max
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.spec
============================================================================
$ cvs diff -u -r1.82 -r1.83 perl-dbi.spec
--- openpkg-src/perl-dbi/perl-dbi.spec 8 Jan 2004 20:13:53 -0000 1.82
+++ openpkg-src/perl-dbi/perl-dbi.spec 20 Jan 2004 23:59:37 -0000 1.83
@@ -30,7 +30,7 @@
%define V_dbd_sprite 0.47
%define V_dbd_sqlite 0.29
%define V_dbd_mysql 2.9003
-%define V_dbd_pg 1.31
+%define V_dbd_pgsql 1.31
%define V_dbd_oracle 1.14
%define V_dbd_odbc 1.06
@@ -43,12 +43,12 @@
Distribution: OpenPKG [BASE]
Group: Language
License: GPL/Artistic
-Version: 20040108
-Release: 20040108
+Version: 20040121
+Release: 20040121
# package options
%option with_dbd_mysql no
-%option with_dbd_pg no
+%option with_dbd_pgsql no
%option with_dbd_oracle no
%option with_dbd_odbc no
@@ -59,7 +59,7 @@
Source3:
http://www.cpan.org/modules/by-module/DBD/DBD-Sprite-%{V_dbd_sprite}.tar.gz
Source4:
http://www.cpan.org/modules/by-module/DBD/DBD-SQLite-%{V_dbd_sqlite}.tar.gz
Source5:
http://www.cpan.org/modules/by-module/DBD/DBD-mysql-%{V_dbd_mysql}.tar.gz
-Source6: http://www.cpan.org/modules/by-module/DBD/DBD-Pg-%{V_dbd_pg}.tar.gz
+Source6: http://www.cpan.org/modules/by-module/DBD/DBD-Pg-%{V_dbd_pgsql}.tar.gz
Source7:
http://www.cpan.org/modules/by-module/DBD/DBD-Oracle-%{V_dbd_oracle}.tar.gz
Source8:
http://www.cpan.org/modules/by-module/DBD/DBD-ODBC-%{V_dbd_odbc}.tar.gz
Patch0: perl-dbi.patch
@@ -73,7 +73,7 @@
BuildPreReq: mysql
PreReq: mysql
%endif
-%if "%{with_dbd_pg}" == "yes"
+%if "%{with_dbd_pgsql}" == "yes"
BuildPreReq: postgresql
PreReq: postgresql
%endif
@@ -96,7 +96,7 @@
- DBD::Sprite (%{V_dbd_sprite})
- DBD::SQLite (%{V_dbd_sqlite})
- DBD::mysql (%{V_dbd_mysql}) [%{with_dbd_mysql}]
- - DBD::Pg (%{V_dbd_pg}) [%{with_dbd_pg}]
+ - DBD::Pg (%{V_dbd_pgsql}) [%{with_dbd_pgsql}]
- DBD::Oracle (%{V_dbd_oracle}) [%{with_dbd_oracle}]
- DBD::ODBC (%{V_dbd_odbc}) [%{with_dbd_odbc}]
@@ -133,9 +133,9 @@
) || exit $?
%endif
-%if "%{with_dbd_pg}" == "yes"
+%if "%{with_dbd_pgsql}" == "yes"
# build DBD::Pg
- ( cd DBD-Pg-%{V_dbd_pg}
+ ( cd DBD-Pg-%{V_dbd_pgsql}
%{l_shtool} subst -e 's;-lpq;-lpq -lssl -lcrypto -lcrypt;' Makefile.PL
POSTGRES_HOME=%{l_prefix}
export POSTGRES_HOME
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
============================================================================
$ cvs diff -u -r1.69 -r1.70 php.spec
--- openpkg-src/php/php.spec 9 Jan 2004 16:19:43 -0000 1.69
+++ openpkg-src/php/php.spec 20 Jan 2004 23:59:37 -0000 1.70
@@ -33,19 +33,19 @@
Group: Language
License: PHP
Version: 4.3.4
-Release: 20040109
+Release: 20040121
# package options
%option with_calendar no
%option with_mysql no
%option with_pgsql no
%option with_gd no
-%option with_db no
+%option with_bdb no
%option with_debug no
%option with_pdflib no
%option with_zlib no
%option with_bzip2 no
-%option with_openssl no
+%option with_ssl no
%option with_openldap no
%option with_openldapsasl no
%option with_mm no
@@ -83,8 +83,8 @@
%define with_zlib yes
%endif
%if "%{with_pgsql}" == "yes"
-%undefine with_openssl
-%define with_openssl yes
+%undefine with_ssl
+%define with_ssl yes
%endif
# list of sources
@@ -107,7 +107,7 @@
BuildPreReq: gd >= 2.0.20, jpeg, png
PreReq: gd >= 2.0.20, jpeg, png
%endif
-%if "%{with_db}" == "yes"
+%if "%{with_bdb}" == "yes"
BuildPreReq: db
PreReq: db
%endif
@@ -123,7 +123,7 @@
BuildPreReq: bzip2
PreReq: bzip2
%endif
-%if "%{with_openssl}" == "yes"
+%if "%{with_ssl}" == "yes"
BuildPreReq: openssl
PreReq: openssl
%endif
@@ -232,7 +232,7 @@
%if "%{with_imap}" == "yes"
libs="$libs -lssl -lcrypto"
%endif
-%if "%{with_db}" == "yes"
+%if "%{with_bdb}" == "yes"
libs="$libs -ldb"
%endif
%if "%{with_oci7}" == "yes" || "%{with_oci8}" == "yes"
@@ -272,7 +272,7 @@
--enable-gd-native-ttf \
--with-freetype-dir=%{l_prefix} \
%endif
-%if "%{with_db}" == "yes"
+%if "%{with_bdb}" == "yes"
--with-db4=%{l_prefix} \
%endif
%if "%{with_debug}" == "yes"
@@ -292,7 +292,7 @@
--with-jpeg-dir=%{l_prefix} \
--with-png-dir=%{l_prefix} \
%endif
-%if "%{with_openssl}" == "yes" || "%{with_openldap}" == "yes"
+%if "%{with_ssl}" == "yes" || "%{with_openldap}" == "yes"
--with-openssl=%{l_prefix} \
%endif
%if "%{with_openldap}" == "yes"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/php3/php3.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 php3.spec
--- openpkg-src/php3/php3.spec 27 Nov 2003 16:06:34 -0000 1.3
+++ openpkg-src/php3/php3.spec 20 Jan 2004 23:59:38 -0000 1.4
@@ -33,15 +33,15 @@
Group: Language
License: PHP
Version: 3.0.18
-Release: 20031127
+Release: 20040121
# package options
%option with_mysql no
%option with_pgsql no
%option with_gd no
-%option with_db no
+%option with_bdb no
%option with_zlib no
-%option with_openssl no
+%option with_ssl no
%option with_ftp no
# fixing implicit inter-module dependencies and correlations
@@ -50,8 +50,8 @@
%define with_zlib yes
%endif
%if "%{with_pgsql}" == "yes"
-%undefine with_openssl
-%define with_openssl yes
+%undefine with_ssl
+%define with_ssl yes
%endif
# list of sources
@@ -77,7 +77,7 @@
BuildPreReq: gd, jpeg, png
PreReq: gd, jpeg, png
%endif
-%if "%{with_db}" == "yes"
+%if "%{with_bdb}" == "yes"
BuildPreReq: db
PreReq: db
%endif
@@ -85,7 +85,7 @@
BuildPreReq: zlib
PreReq: zlib
%endif
-%if "%{with_openssl}" == "yes"
+%if "%{with_ssl}" == "yes"
BuildPreReq: openssl
PreReq: openssl
%endif
@@ -119,7 +119,7 @@
%if "%{with_gd}" == "yes"
libs="$libs -lpng -lz"
%endif
-%if "%{with_db}" == "yes"
+%if "%{with_bdb}" == "yes"
libs="$libs -ldb"
%endif
CC="%{l_cc}" \
@@ -147,14 +147,14 @@
--with-jpeg-dir=%{l_prefix} \
--with-png-dir=%{l_prefix} \
%endif
-%if "%{with_db}" == "yes"
+%if "%{with_bdb}" == "yes"
--with-db4=%{l_prefix} \
%endif
%if "%{with_zlib}" == "yes"
--with-zlib=%{l_prefix} \
--with-zlib-dir=%{l_prefix} \
%endif
-%if "%{with_openssl}" == "yes"
+%if "%{with_ssl}" == "yes"
--with-openssl=%{l_prefix} \
%endif
%if "%{with_ftp}" == "yes"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/php5/php5.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 php5.spec
--- openpkg-src/php5/php5.spec 22 Dec 2003 07:09:37 -0000 1.2
+++ openpkg-src/php5/php5.spec 20 Jan 2004 23:59:38 -0000 1.3
@@ -33,19 +33,19 @@
Group: Language
License: PHP
Version: 5.0.0b3
-Release: 20031222
+Release: 20040121
# package options
%option with_calendar no
%option with_mysql no
%option with_pgsql no
%option with_gd no
-%option with_db no
+%option with_bdb no
%option with_debug no
%option with_pdflib no
%option with_zlib no
%option with_bzip2 no
-%option with_openssl no
+%option with_ssl no
%option with_openldap no
%option with_openldapsasl no
%option with_mm no
@@ -84,8 +84,8 @@
%define with_zlib yes
%endif
%if "%{with_pgsql}" == "yes"
-%undefine with_openssl
-%define with_openssl yes
+%undefine with_ssl
+%define with_ssl yes
%endif
# list of sources
@@ -108,7 +108,7 @@
BuildPreReq: gd, jpeg, png
PreReq: gd, jpeg, png
%endif
-%if "%{with_db}" == "yes"
+%if "%{with_bdb}" == "yes"
BuildPreReq: db
PreReq: db
%endif
@@ -124,7 +124,7 @@
BuildPreReq: bzip2
PreReq: bzip2
%endif
-%if "%{with_openssl}" == "yes"
+%if "%{with_ssl}" == "yes"
BuildPreReq: openssl
PreReq: openssl
%endif
@@ -233,7 +233,7 @@
%if "%{with_imap}" == "yes"
libs="$libs -lssl -lcrypto"
%endif
-%if "%{with_db}" == "yes"
+%if "%{with_bdb}" == "yes"
libs="$libs -ldb"
%endif
%if "%{with_oci7}" == "yes" || "%{with_oci8}" == "yes"
@@ -275,7 +275,7 @@
--enable-gd-native-ttf \
--with-freetype-dir=%{l_prefix} \
%endif
-%if "%{with_db}" == "yes"
+%if "%{with_bdb}" == "yes"
--with-db4=%{l_prefix} \
%endif
%if "%{with_debug}" == "yes"
@@ -295,7 +295,7 @@
--with-jpeg-dir=%{l_prefix} \
--with-png-dir=%{l_prefix} \
%endif
-%if "%{with_openssl}" == "yes" || "%{with_openldap}" == "yes"
+%if "%{with_ssl}" == "yes" || "%{with_openldap}" == "yes"
--with-openssl=%{l_prefix} \
%endif
%if "%{with_openldap}" == "yes"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.spec
============================================================================
$ cvs diff -u -r1.186 -r1.187 postfix.spec
--- openpkg-src/postfix/postfix.spec 20 Jan 2004 20:05:38 -0000 1.186
+++ openpkg-src/postfix/postfix.spec 20 Jan 2004 23:59:39 -0000 1.187
@@ -39,11 +39,11 @@
Group: Mail
License: IPL
Version: %{V_postfix}
-Release: 20040120
+Release: 20040121
# package options
%option with_fsl yes
-%option with_tls no
+%option with_ssl no
%option with_sasl no
%option with_mysql no
%option with_ldap no
@@ -73,7 +73,7 @@
BuildPreReq: fsl >= 1.3.0
PreReq: fsl >= 1.3.0
%endif
-%if "%{with_tls}" == "yes"
+%if "%{with_ssl}" == "yes"
BuildPreReq: openssl
PreReq: openssl
%endif
@@ -116,14 +116,14 @@
%prep
# unpack distribution files
%setup0 -q
-%if "%{with_tls}" == "yes"
+%if "%{with_ssl}" == "yes"
%setup1 -q -T -D -a 1
%endif
%setup2 -q -T -D -a 2
%setup4 -q -T -D -a 4
# apply SSL/TLS patch
-%if "%{with_tls}" == "yes"
+%if "%{with_ssl}" == "yes"
%{l_patch} -p1 <pfixtls-%{V_tls}/pfixtls.diff
%endif
@@ -174,7 +174,7 @@
AUXLIBS="$AUXLIBS -ldl"
fi
%endif
-%if "%{with_tls}" == "yes"
+%if "%{with_ssl}" == "yes"
CCARGS="$CCARGS -DHAS_SSL"
AUXLIBS="$AUXLIBS -lssl -lcrypto"
%endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rt/rt.spec
============================================================================
$ cvs diff -u -r1.114 -r1.115 rt.spec
--- openpkg-src/rt/rt.spec 3 Jan 2004 08:48:03 -0000 1.114
+++ openpkg-src/rt/rt.spec 20 Jan 2004 23:59:39 -0000 1.115
@@ -47,23 +47,23 @@
Group: Database
License: GPL
Version: %{V_here}
-Release: 20040103
+Release: 20040121
# package options
%option with_color_primary 336699
%option with_color_secondary dddddd
%option with_db_mysql yes
-%option with_db_postgresql no
+%option with_db_pgsql no
%option with_db_oracle no
# fixing conflicting options
%if "%{with_db_oracle}" == "yes"
-%undefine with_db_postgresql
-%define with_db_postgresql no
+%undefine with_db_pgsql
+%define with_db_pgsql no
%endif
-%if "%{with_db_oracle}" == "yes" || "%{with_db_postgresql}" == "yes"
+%if "%{with_db_oracle}" == "yes" || "%{with_db_pgsql}" == "yes"
%undefine with_db_mysql
-%define with_db_mysql no
+%define with_db_mysql no
%endif
# list of sources
@@ -100,8 +100,8 @@
%if "%{with_db_mysql}" == "yes"
PreReq: mysql, perl-dbi::with_dbd_mysql = yes
%endif
-%if "%{with_db_postgresql}" == "yes"
-PreReq: postgresql, perl-dbi::with_dbd_pg = yes
+%if "%{with_db_pgsql}" == "yes"
+PreReq: postgresql, perl-dbi::with_dbd_pgsql = yes
%endif
%if "%{with_db_oracle}" == "yes"
PreReq: oracle, perl-dbi::with_dbd_oracle = yes
@@ -162,7 +162,7 @@
--with-db-user=rt \
--with-db-pass=XXX \
%endif
-%if "%{with_db_postgresql}" == "yes"
+%if "%{with_db_pgsql}" == "yes"
--with-db-dba=postgresql \
--with-db-database=rt \
--with-db-user=rt \
@@ -290,7 +290,7 @@
%if "%{with_db_mysql}" == "yes"
rt_db_dba=root
%endif
-%if "%{with_db_postgresql}" == "yes"
+%if "%{with_db_pgsql}" == "yes"
rt_db_dba=postgresql
%endif
%if "%{with_db_oracle}" == "yes"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sendmail/sendmail.spec
============================================================================
$ cvs diff -u -r1.103 -r1.104 sendmail.spec
--- openpkg-src/sendmail/sendmail.spec 19 Jan 2004 08:51:01 -0000 1.103
+++ openpkg-src/sendmail/sendmail.spec 20 Jan 2004 23:59:40 -0000 1.104
@@ -33,11 +33,11 @@
Group: Mail
License: BSD
Version: 8.12.11
-Release: 20040119
+Release: 20040121
# package options
%option with_fsl yes
-%option with_tls no
+%option with_ssl no
%option with_sasl no
%option with_milter no
%option with_ldap no
@@ -62,7 +62,7 @@
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
%endif
-%if "%{with_tls}" == "yes"
+%if "%{with_ssl}" == "yes"
BuildPreReq: openssl
PreReq: openssl
%endif
@@ -163,7 +163,7 @@
echo "APPENDDEF(\`confLIBS', \`%{l_fsl_libs} -ldb')dnl"
echo "define(\`confSTDIO_TYPE', \`portable')dnl"
echo "APPENDDEF(\`confENVDEF', \`-DDNSMAP')dnl"
-%if "%{with_tls}" == "yes"
+%if "%{with_ssl}" == "yes"
echo "APPENDDEF(\`conf_sendmail_ENVDEF', \`-DSTARTTLS')dnl"
echo "APPENDDEF(\`conf_sendmail_ENVDEF', \`-DHASURANDOMDEV')dnl"
echo "APPENDDEF(\`conf_sendmail_LIBS', \`-lssl -lcrypto')dnl"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8151 -r1.8152 news.txt
--- openpkg-web/news.txt 20 Jan 2004 20:05:36 -0000 1.8151
+++ openpkg-web/news.txt 20 Jan 2004 23:59:31 -0000 1.8152
@@ -1,3 +1,18 @@
+21-Jan-2004: Upgraded package: P<sendmail-8.12.11-20040121>
+21-Jan-2004: Upgraded package: P<rt-3.0.8-20040121>
+21-Jan-2004: Upgraded package: P<postfix-2.0.17-20040121>
+21-Jan-2004: Upgraded package: P<php5-5.0.0b3-20040121>
+21-Jan-2004: Upgraded package: P<php3-3.0.18-20040121>
+21-Jan-2004: Upgraded package: P<php-4.3.4-20040121>
+21-Jan-2004: Upgraded package: P<perl-dbi-20040121-20040121>
+21-Jan-2004: Upgraded package: P<mysql41-4.1.1-20040121>
+21-Jan-2004: Upgraded package: P<mysql3-3.23.58-20040121>
+21-Jan-2004: Upgraded package: P<mysql-4.0.17-20040121>
+21-Jan-2004: Upgraded package: P<meta-rdbms-20040121-20040121>
+21-Jan-2004: Upgraded package: P<kolab-1.0.14-20040121>
+21-Jan-2004: Upgraded package: P<ethereal-0.10.0a-20040121>
+21-Jan-2004: Upgraded package: P<cups-1.1.20-20040121>
+21-Jan-2004: Upgraded package: P<apache-1.3.29-20040121>
20-Jan-2004: Upgraded package: P<postfix-2.0.17-20040120>
20-Jan-2004: Upgraded package: P<smtpfeed-1.18-20040120>
20-Jan-2004: Upgraded package: P<openpkg-20040120-20040120>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
