/[gentoo-x86]/eclass/mysql.eclass
Gentoo

Diff of /eclass/mysql.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.51 Revision 1.124
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2009 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.51 2006/12/29 20:34:02 vivo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.124 2010/01/31 03:05:54 robbat2 Exp $
4 4
5# @ECLASS: mysql.eclass
6# @MAINTAINER:
5# Author: Francesco Riosa <vivo@gentoo.org> 7# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
8# Maintainers: MySQL Team <mysql-bugs@gentoo.org>
6# Maintainer: Luca Longinotti <chtekk@gentoo.org> 9# - Luca Longinotti <chtekk@gentoo.org>
10# - Robin H. Johnson <robbat2@gentoo.org>
11# @BLURB: This eclass provides most of the functions for mysql ebuilds
12# @DESCRIPTION:
13# The mysql.eclass provides almost all the code to build the mysql ebuilds
14# including the src_unpack, src_prepare, src_configure, src_compile,
15# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
16# phase hooks.
7 17
8# Both MYSQL_VERSION_ID and MYSQL_PATCHSET_REV must be set in the ebuild too 18WANT_AUTOCONF="latest"
9# Note that MYSQL_VERSION_ID must be empty !!! 19WANT_AUTOMAKE="latest"
10 20
21inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator
22
23case "${EAPI:-0}" in
24 2)
25 EXPORT_FUNCTIONS pkg_setup \
26 src_unpack src_prepare \
27 src_configure src_compile \
28 src_install \
29 pkg_preinst pkg_postinst \
30 pkg_config pkg_postrm
31 IUSE_DEFAULT_ON='+'
32 ;;
33 0 | 1)
34 EXPORT_FUNCTIONS pkg_setup \
35 src_unpack \
36 src_compile \
37 src_install \
38 pkg_preinst pkg_postinst \
39 pkg_config pkg_postrm
40 ;;
41 *)
42 die "Unsupported EAPI: ${EAPI}" ;;
43esac
44
45# Shorten the path because the socket path length must be shorter than 107 chars
46# and we will run a mysql server during test phase
47S="${WORKDIR}/mysql"
48
49[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
50if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
51 EGIT_PROJECT=mysql-extras
52 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
53 inherit git
54fi
55
56# @ECLASS-VARIABLE: MYSQL_VERSION_ID
57# @DESCRIPTION:
11# MYSQL_VERSION_ID will be: 58# MYSQL_VERSION_ID will be:
12# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] 59# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
13# This is an important part, because many of the choices the MySQL ebuild will do 60# This is an important part, because many of the choices the MySQL ebuild will do
14# depend on this variable. 61# depend on this variable.
15# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803" 62# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
63# We also strip off upstream's trailing letter that they use to respin tarballs
16 64
17if [[ -z "${MYSQL_VERSION_ID}" ]] ; then 65MYSQL_VERSION_ID=""
66tpv="${PV%[a-z]}"
18 tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" 67tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
19 for vatom in 0 1 2 3 ; do 68for vatom in 0 1 2 3 ; do
20 # pad to length 2 69 # pad to length 2
21 tpv[${vatom}]="00${tpv[${vatom}]}" 70 tpv[${vatom}]="00${tpv[${vatom}]}"
22 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}" 71 MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
23 done 72done
24 # strip leading "0" (otherwise it's considered an octal number by BASH) 73# strip leading "0" (otherwise it's considered an octal number by BASH)
25 MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} 74MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
75
76# @ECLASS-VARIABLE: MYSQL_COMMUNITY_FEATURES
77# @DESCRIPTION:
78# Specifiy if community features are available. Possible values are 1 (yes)
79# and 0 (no).
80# Community features are available in mysql-community
81# AND in the re-merged mysql-5.0.82 and newer
82if [ "${PN}" == "mysql-community" ]; then
83 MYSQL_COMMUNITY_FEATURES=1
84elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
85 MYSQL_COMMUNITY_FEATURES=1
86elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
87 MYSQL_COMMUNITY_FEATURES=1
88elif [ "${PV#5.4}" != "${PV}" ]; then
89 MYSQL_COMMUNITY_FEATURES=1
90else
91 MYSQL_COMMUNITY_FEATURES=0
26fi 92fi
27 93
28inherit eutils flag-o-matic gnuconfig autotools mysql_fx 94# @ECLASS-VARIABLE: XTRADB_VER
95# @DESCRIPTION:
96# Version of the XTRADB storage engine
97XTRADB_VER="${XTRADB_VER}"
98
99# @ECLASS-VARIABLE: PERCONA_VER
100# @DESCRIPTION:
101# Designation by PERCONA for a MySQL version to apply an XTRADB release
102PERCONA_VER="${PERCONA_VER}"
29 103
30# Be warned, *DEPEND are version-dependant 104# Be warned, *DEPEND are version-dependant
105# These are used for both runtime and compiletime
31DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 106DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
32 userland_GNU? ( sys-process/procps ) 107 userland_GNU? ( sys-process/procps )
33 >=sys-apps/sed-4 108 >=sys-apps/sed-4
34 >=sys-apps/texinfo-4.7-r1 109 >=sys-apps/texinfo-4.7-r1
35 >=sys-libs/readline-4.1 110 >=sys-libs/readline-4.1
36 >=sys-libs/zlib-1.2.3" 111 >=sys-libs/zlib-1.2.3"
37 112
38# LEAVE THE SURROUNDING SPACES THERE 113# Having different flavours at the same time is not a good idea
39MYSQL_MUTUALLY_EXCLUSIVE=" !dev-db/mysql !dev-db/mysql-community " 114for i in "" "-community" ; do
40DEPEND="${DEPEND} ${MYSQL_MUTUALLY_EXCLUSIVE/ !${CATEGORY}\/${PN} /}" 115 [[ "${i}" == ${PN#mysql} ]] ||
116 DEPEND="${DEPEND} !dev-db/mysql${i}"
117done
41 118
119RDEPEND="${DEPEND}
120 !minimal? ( dev-db/mysql-init-scripts )
121 selinux? ( sec-policy/selinux-mysql )"
122
123# compile-time-only
42mysql_version_is_at_least "5.01.00.00" \ 124mysql_version_is_at_least "5.1" \
43|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 125|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
44 126
45RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )" 127# compile-time-only
128mysql_version_is_at_least "5.1.12" \
129&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
46 130
47# dev-perl/DBD-mysql is needed by some scripts installed by MySQL 131# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
48PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" 132PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
49 133
50# Shorten the path because the socket path length must be shorter than 107 chars 134# For other stuff to bring us in
51# and we will run a mysql server during test phase 135PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})"
52S="${WORKDIR}/mysql" # BitKeeper ebuilds
53 136
54# Define $MY_FIXED_PV for MySQL patchsets 137# Work out the default SERVER_URI correctly
55MY_FIXED_PV="${PV/_alpha/}" 138if [ -z "${SERVER_URI}" ]; then
56#MY_FIXED_PV="${MY_FIXED_PV/_beta/}" 139 # The community build is on the mirrors
57#MY_FIXED_PV="${MY_FIXED_PV/_rc/}" 140 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
58 141 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
59MY_P="${P/_/-}" 142 # The (old) enterprise source is on the primary site only
60MY_P="${MY_P/-alpha/-bk-}" # BitKeeper ebuilds 143 elif [ "${PN}" == "mysql" ]; then
61MY_P="${MY_P/-community/}" 144 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
145 fi
146fi
62 147
63# Define correct SRC_URIs 148# Define correct SRC_URIs
64SRC_URI="${BASE_URI}/${MY_P}${MYSQL_RERELEASE}.tar.gz" 149SRC_URI="${SERVER_URI}"
65if [[ -n "${MYSQL_PATCHSET_REV}" ]] ; then 150
66 MYSQL_PATCHSET_FILENAME="${PN}-patchset-${MY_FIXED_PV}-r${MYSQL_PATCHSET_REV}.tar.bz2" 151# Gentoo patches to MySQL
67 # We add the Gentoo mirror here, as we only use primaryuri for the MySQL tarball 152[[ ${MY_EXTRAS_VER} != live ]] \
68 SRC_URI="${SRC_URI} http://g3nt8.org/patches/${MYSQL_PATCHSET_FILENAME}" 153&& SRC_URI="${SRC_URI}
69fi 154 mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
155 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
156 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
157
158# PBXT engine
159mysql_version_is_at_least "5.1.12" \
160&& [[ -n "${PBXT_VERSION}" ]] \
161&& PBXT_P="pbxt-${PBXT_VERSION}" \
162&& PBXT_SRC_URI="mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
163&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
164
165# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
166mysql_version_is_at_least "5.1.26" \
167&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
168&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
169&& XTRADB_SRC_URI="http://www.percona.com/${PN}/xtradb/${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
170&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI} )"
70 171
71DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." 172DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
72HOMEPAGE="http://www.mysql.com/" 173HOMEPAGE="http://www.mysql.com/"
174LICENSE="GPL-2"
73SLOT="0" 175SLOT="0"
74LICENSE="GPL-2"
75IUSE="big-tables debug embedded minimal perl selinux srvdir ssl static" 176IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static"
76RESTRICT="confcache"
77 177
78mysql_version_is_at_least "4.01.00.00" \ 178mysql_version_is_at_least "4.1" \
79&& IUSE="${IUSE} latin1" 179&& IUSE="${IUSE} latin1"
80 180
81mysql_version_is_at_least "4.01.03.00" \ 181mysql_version_is_at_least "4.1.3" \
82&& IUSE="${IUSE} cluster extraengine" 182&& IUSE="${IUSE} cluster extraengine"
83 183
84mysql_version_is_at_least "5.00.00.00" \ 184mysql_version_is_at_least "5.0" \
85|| IUSE="${IUSE} raid" 185|| IUSE="${IUSE} raid"
86 186
87mysql_version_is_at_least "5.00.18.00" \ 187mysql_version_is_at_least "5.0.18" \
88&& IUSE="${IUSE} max-idx-128" 188&& IUSE="${IUSE} max-idx-128"
89 189
90mysql_version_is_at_least "5.01.00.00" \ 190mysql_version_is_at_least "5.1" \
91&& IUSE="${IUSE} innodb"
92
93mysql_version_is_at_least "5.01.00.00" \
94|| IUSE="${IUSE} berkdb" 191|| IUSE="${IUSE} berkdb"
95 192
96EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \ 193mysql_version_is_at_least "5.1.12" \
97 pkg_postinst pkg_config pkg_postrm 194&& [[ -n "${PBXT_VERSION}" ]] \
195&& IUSE="${IUSE} pbxt"
196
197mysql_version_is_at_least "5.1.26" \
198&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
199&& IUSE="${IUSE} xtradb"
200
201[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
202&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
98 203
99# 204#
100# HELPER FUNCTIONS: 205# HELPER FUNCTIONS:
101# 206#
102 207
103bitkeeper_fetch() { 208# @FUNCTION: mysql_disable_test
104 209# @DESCRIPTION:
105 local tpv=( ${PV//[-._]/ } ) 210# Helper function to disable specific tests.
106 local reposuf="${tpv[0]}.${tpv[1]}"
107 useq "cluster" && reposuf="${reposuf}-ndb"
108 local repo_uri="bk://mysql.bkbits.net/mysql-${reposuf}"
109 ## -- ebk_store_dir: bitkeeper sources store directory
110 local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
111 ## -- ebk_fetch_cmd: bitkeeper fetch command
112 # always fetch the latest revision, use -r<revision> if a specified revision is wanted
113 # hint: does not work
114 local ebk_fetch_cmd="sfioball"
115 ## -- ebk_update_cmd: bitkeeper update command
116 local ebk_update_cmd="update"
117
118 #addread "/etc/bitkeeper"
119 addwrite "${ebk_store_dir}"
120
121 if [[ ! -d "${ebk_store_dir}" ]]; then
122 debug-print "${FUNCNAME}: initial checkout. creating bitkeeper directory"
123 mkdir -p "${ebk_store_dir}" || die "${EBK}: can't mkdir ${ebk_store_dir}."
124 fi
125
126 pushd "${ebk_store_dir}" || die "${EBK}: can't chdir to ${ebk_store_dir}"
127
128 local wc_path=mysql-${reposuf}
129
130 if [[ ! -d "${wc_path}" ]]; then
131 local options="-r+"
132 # first check out
133 einfo "bitkeeper check out start -->"
134 einfo " repository: ${repo_uri}"
135 ${ebk_fetch_cmd} ${options} "${repo_uri}" ${wc_path} \
136 || die "${EBK}: can't fetch from ${repo_uri}."
137 else
138 if [[ ! -d "${wc_path}/BK" ]]; then
139 popd
140 die "Look like ${wc_path} is not a bitkeeper path."
141 fi
142
143 # update working copy
144 einfo "bitkeeper update start -->"
145 einfo " repository: ${repo_uri}"
146
147 ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \
148 || die "BK: can't update from ${repo_uri} to ${wc_path}."
149
150 fi
151
152 einfo " working copy: ${wc_path}"
153 cd "${wc_path}"
154 rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: can't export to ${S}."
155
156 echo
157 popd
158
159}
160
161mysql_disable_test() { 211mysql_disable_test() {
162 local testname="${1}" ; shift 212 local testname="${1}" ; shift
163 local reason="${@}" 213 local reason="${@}"
164 local mysql_disable_file="${S}/mysql-test/t/disabled.def" 214 local mysql_disable_file="${S}/mysql-test/t/disabled.def"
165 echo ${testname} : ${reason} >> "${mysql_disable_file}" 215 echo ${testname} : ${reason} >> "${mysql_disable_file}"
166 ewarn "test \"${testname}\" disabled because: \"${reason}\"" 216 ewarn "test '${testname}' disabled: '${reason}'"
167} 217}
168 218
219# @FUNCTION: mysql_init_vars
220# @DESCRIPTION:
169# void mysql_init_vars() 221# void mysql_init_vars()
170#
171# Initialize global variables 222# Initialize global variables
172# 2005-11-19 <vivo@gentoo.org> 223# 2005-11-19 <vivo@gentoo.org>
173
174mysql_init_vars() { 224mysql_init_vars() {
175 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"} 225 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"}
176 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"} 226 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"}
177 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} 227 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
178 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"} 228 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
179 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"} 229 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
180 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"} 230 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
181 231
182 if [[ -z "${DATADIR}" ]] ; then 232 if [[ -z "${MY_DATADIR}" ]] ; then
183 DATADIR="" 233 MY_DATADIR=""
184 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 234 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
185 DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 235 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
186 | sed -ne '/datadir/s|^--datadir=||p' \ 236 | sed -ne '/datadir/s|^--datadir=||p' \
187 | tail -n1` 237 | tail -n1`
188 if [[ -z "${DATADIR}" ]] ; then 238 if [[ -z "${MY_DATADIR}" ]] ; then
189 if useq "srvdir" ; then
190 DATADIR="${ROOT}/srv/localhost/mysql/datadir"
191 else
192 DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 239 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
193 | sed -e 's/.*=\s*//'` 240 | sed -e 's/.*=\s*//' \
194 fi 241 | tail -n1`
195 fi 242 fi
196 fi 243 fi
197 if [[ -z "${DATADIR}" ]] ; then 244 if [[ -z "${MY_DATADIR}" ]] ; then
198 if useq "srvdir" ; then
199 DATADIR="${ROOT}/srv/localhost/mysql/datadir"
200 else
201 DATADIR="${MY_LOCALSTATEDIR}" 245 MY_DATADIR="${MY_LOCALSTATEDIR}"
202 fi
203 einfo "Using default DATADIR" 246 einfo "Using default MY_DATADIR"
204 fi 247 fi
205 elog "MySQL DATADIR is ${DATADIR}" 248 elog "MySQL MY_DATADIR is ${MY_DATADIR}"
206 249
207 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then 250 if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
208 if [[ -e "${DATADIR}" ]] ; then 251 if [[ -e "${MY_DATADIR}" ]] ; then
209 elog "Previous datadir found, it's YOUR job to change" 252 # If you get this and you're wondering about it, see bug #207636
210 elog "ownership and take care of it" 253 elog "MySQL datadir found in ${MY_DATADIR}"
254 elog "A new one will not be created."
211 PREVIOUS_DATADIR="yes" 255 PREVIOUS_DATADIR="yes"
212 else 256 else
213 PREVIOUS_DATADIR="no" 257 PREVIOUS_DATADIR="no"
214 fi 258 fi
215 export PREVIOUS_DATADIR 259 export PREVIOUS_DATADIR
216 fi 260 fi
261 else
262 if [[ ${EBUILD_PHASE} == "config" ]]; then
263 local new_MY_DATADIR
264 new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
265 | sed -ne '/datadir/s|^--datadir=||p' \
266 | tail -n1`
267
268 if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
269 ewarn "MySQL MY_DATADIR has changed"
270 ewarn "from ${MY_DATADIR}"
271 ewarn "to ${new_MY_DATADIR}"
272 MY_DATADIR="${new_MY_DATADIR}"
273 fi
217 fi 274 fi
275 fi
276
277 MY_SOURCEDIR=${SERVER_URI##*/}
278 MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
218 279
219 export MY_SHAREDSTATEDIR MY_SYSCONFDIR 280 export MY_SHAREDSTATEDIR MY_SYSCONFDIR
220 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR 281 export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
221 export MY_INCLUDEDIR 282 export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
222 export DATADIR
223} 283}
224 284
225configure_minimal() { 285configure_minimal() {
226 # These are things we exclude from a minimal build, please 286 # These are things we exclude from a minimal build, please
227 # note that the server actually does get built and installed, 287 # note that the server actually does get built and installed,
228 # but we then delete it before packaging. 288 # but we then delete it before packaging.
229 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication" 289 local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
230 290
231 for i in ${minimal_exclude_list} ; do 291 for i in ${minimal_exclude_list} ; do
232 myconf="${myconf} --without-${i}" 292 myconf="${myconf} --without-${i}"
233 done 293 done
234 myconf="${myconf} --with-extra-charsets=none" 294 myconf="${myconf} --with-extra-charsets=none"
235 myconf="${myconf} --enable-local-infile" 295 myconf="${myconf} --enable-local-infile"
236 296
237 if useq "static" ; then 297 if use static ; then
238 myconf="${myconf} --with-client-ldflags=-all-static" 298 myconf="${myconf} --with-client-ldflags=-all-static"
239 myconf="${myconf} --disable-shared" 299 myconf="${myconf} --disable-shared --with-pic"
240 else 300 else
241 myconf="${myconf} --enable-shared --enable-static" 301 myconf="${myconf} --enable-shared --enable-static"
242 fi 302 fi
243 303
244 if mysql_version_is_at_least "4.01.00.00" && ! useq "latin1" ; then 304 if mysql_version_is_at_least "4.1" && ! use latin1 ; then
245 myconf="${myconf} --with-charset=utf8" 305 myconf="${myconf} --with-charset=utf8"
246 myconf="${myconf} --with-collation=utf8_general_ci" 306 myconf="${myconf} --with-collation=utf8_general_ci"
247 else 307 else
248 myconf="${myconf} --with-charset=latin1" 308 myconf="${myconf} --with-charset=latin1"
249 myconf="${myconf} --with-collation=latin1_swedish_ci" 309 myconf="${myconf} --with-collation=latin1_swedish_ci"
257 myconf="${myconf} --with-mysqld-user=mysql" 317 myconf="${myconf} --with-mysqld-user=mysql"
258 myconf="${myconf} --with-server" 318 myconf="${myconf} --with-server"
259 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock" 319 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock"
260 myconf="${myconf} --without-libwrap" 320 myconf="${myconf} --without-libwrap"
261 321
262 if useq "static" ; then 322 if use static ; then
263 myconf="${myconf} --with-mysqld-ldflags=-all-static" 323 myconf="${myconf} --with-mysqld-ldflags=-all-static"
264 myconf="${myconf} --with-client-ldflags=-all-static" 324 myconf="${myconf} --with-client-ldflags=-all-static"
265 myconf="${myconf} --disable-shared" 325 myconf="${myconf} --disable-shared --with-pic"
266 else 326 else
267 myconf="${myconf} --enable-shared --enable-static" 327 myconf="${myconf} --enable-shared --enable-static"
268 fi 328 fi
269 329
270 if useq "debug" ; then 330 if use debug ; then
271 myconf="${myconf} --with-debug=full" 331 myconf="${myconf} --with-debug=full"
272 else 332 else
273 myconf="${myconf} --without-debug" 333 myconf="${myconf} --without-debug"
274 mysql_version_is_at_least "4.1.3" \ 334 mysql_version_is_at_least "4.1.3" \
275 && useq "cluster" \ 335 && use cluster \
276 && myconf="${myconf} --without-ndb-debug" 336 && myconf="${myconf} --without-ndb-debug"
277 fi 337 fi
278 338
339 if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
340 ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
341 ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
342 ewarn "You MUST file bugs without these variables set."
343 myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
344 myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
279 if mysql_version_is_at_least "4.1" && ! useq "latin1" ; then 345 elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
280 myconf="${myconf} --with-charset=utf8" 346 myconf="${myconf} --with-charset=utf8"
281 myconf="${myconf} --with-collation=utf8_general_ci" 347 myconf="${myconf} --with-collation=utf8_general_ci"
282 else 348 else
283 myconf="${myconf} --with-charset=latin1" 349 myconf="${myconf} --with-charset=latin1"
284 myconf="${myconf} --with-collation=latin1_swedish_ci" 350 myconf="${myconf} --with-collation=latin1_swedish_ci"
285 fi 351 fi
286 352
287 if useq "embedded" ; then 353 if use embedded ; then
288 myconf="${myconf} --with-embedded-privilege-control" 354 myconf="${myconf} --with-embedded-privilege-control"
289 myconf="${myconf} --with-embedded-server" 355 myconf="${myconf} --with-embedded-server"
290 else 356 else
291 myconf="${myconf} --without-embedded-privilege-control" 357 myconf="${myconf} --without-embedded-privilege-control"
292 myconf="${myconf} --without-embedded-server" 358 myconf="${myconf} --without-embedded-server"
300 myconf="${myconf} --with-extra-tools" 366 myconf="${myconf} --with-extra-tools"
301 myconf="${myconf} --with-innodb" 367 myconf="${myconf} --with-innodb"
302 myconf="${myconf} --without-readline" 368 myconf="${myconf} --without-readline"
303 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)" 369 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
304 370
305 if useq "ssl" ; then
306 # --with-vio is not needed anymore, it's on by default and 371 # --with-vio is not needed anymore, it's on by default and
307 # has been removed from configure 372 # has been removed from configure
373 if use ssl ; then
308 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio" 374 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
375 fi
376
377 if mysql_version_is_at_least "5.1.11" ; then
378 myconf="${myconf} $(use_with ssl)"
379 else
380 myconf="${myconf} $(use_with ssl openssl)"
381 fi
382
309 if mysql_version_is_at_least "5.0.6" ; then 383 if mysql_version_is_at_least "5.0.60" ; then
310 # myconf="${myconf} --with-yassl" 384 if use berkdb ; then
385 elog "Berkeley DB support was disabled due to build failures"
386 elog "on multiple arches, go to a version earlier than 5.0.60"
387 elog "if you want it again. Gentoo bug #224067."
388 fi
311 myconf="${myconf} --with-openssl" 389 myconf="${myconf} --without-berkeley-db"
390 elif use berkdb ; then
391 # The following fix is due to a bug with bdb on SPARC's. See:
392 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
393 # It comes down to non-64-bit safety problems.
394 if use alpha || use amd64 || use hppa || use mips || use sparc ; then
395 elog "Berkeley DB support was disabled due to compatibility issues on this arch"
396 myconf="${myconf} --without-berkeley-db"
312 else 397 else
313 myconf="${myconf} --with-openssl" 398 myconf="${myconf} --with-berkeley-db=./bdb"
314 fi
315 else
316 myconf="${myconf} --without-openssl"
317 fi 399 fi
318 400 else
319 # The following fix is due to a bug with bdb on SPARC's. See:
320 # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
321 # It comes down to non-64-bit safety problems.
322 if useq "sparc" || useq "alpha" || useq "hppa" || useq "mips" || useq "amd64" ; then
323 elog "Berkeley DB support was disabled due to incompatible arch"
324 myconf="${myconf} --without-berkeley-db" 401 myconf="${myconf} --without-berkeley-db"
325 else
326 if useq "berkdb" ; then
327 myconf="${myconf} --with-berkeley-db=./bdb"
328 else
329 myconf="${myconf} --without-berkeley-db"
330 fi
331 fi 402 fi
332 403
333 if mysql_version_is_at_least "4.1.3" ; then 404 if mysql_version_is_at_least "4.1.3" ; then
334 myconf="${myconf} --with-geometry" 405 myconf="${myconf} --with-geometry"
335 myconf="${myconf} $(use_with cluster ndbcluster)" 406 myconf="${myconf} $(use_with cluster ndbcluster)"
336 fi 407 fi
337 408
338 if mysql_version_is_at_least "4.1.3" && useq "extraengine" ; then 409 if mysql_version_is_at_least "4.1.3" && use extraengine ; then
339 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html 410 # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
340 myconf="${myconf} --with-archive-storage-engine" 411 myconf="${myconf} --with-archive-storage-engine"
341 412
342 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html 413 # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
343 myconf="${myconf} --with-csv-storage-engine" 414 myconf="${myconf} --with-csv-storage-engine"
353 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" 424 elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
354 myconf="${myconf} --with-federated-storage-engine" 425 myconf="${myconf} --with-federated-storage-engine"
355 fi 426 fi
356 fi 427 fi
357 428
429 if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
430 myconf="${myconf} `use_enable community community-features`"
431 if use community; then
432 myconf="${myconf} `use_enable profiling`"
433 else
434 myconf="${myconf} --disable-profiling"
435 fi
436 fi
437
358 mysql_version_is_at_least "5.0.18" \ 438 mysql_version_is_at_least "5.0.18" \
359 && useq "max-idx-128" \ 439 && use max-idx-128 \
360 && myconf="${myconf} --with-max-indexes=128" 440 && myconf="${myconf} --with-max-indexes=128"
361} 441}
362 442
363configure_51() { 443configure_51() {
364 # TODO: !!!! readd --without-readline 444 # TODO: !!!! readd --without-readline
369 myconf="${myconf} --with-geometry" 449 myconf="${myconf} --with-geometry"
370 myconf="${myconf} --with-readline" 450 myconf="${myconf} --with-readline"
371 myconf="${myconf} --with-row-based-replication" 451 myconf="${myconf} --with-row-based-replication"
372 myconf="${myconf} --with-zlib=/usr/$(get_libdir)" 452 myconf="${myconf} --with-zlib=/usr/$(get_libdir)"
373 myconf="${myconf} --without-pstack" 453 myconf="${myconf} --without-pstack"
374 useq "max-idx-128" && myconf="${myconf} --with-max-indexes=128" 454 use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
375 455
376 # 5.1 introduces a new way to manage storage engines (plugins) 456 # 5.1 introduces a new way to manage storage engines (plugins)
377 # like configuration=none 457 # like configuration=none
378 local plugins="csv,myisam,myisammrg,heap" 458 local plugins="csv,myisam,myisammrg,heap"
379 if useq "extraengine" ; then 459 if use extraengine ; then
380 # like configuration=max-no-ndb, archive and example removed in 5.1.11 460 # like configuration=max-no-ndb, archive and example removed in 5.1.11
381 plugins="${plugins},archive,blackhole,example,federated,ftexample,partition" 461 plugins="${plugins},archive,blackhole,example,federated,partition"
382 462
383 elog "Before using the Federated storage engine, please be sure to read" 463 elog "Before using the Federated storage engine, please be sure to read"
384 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" 464 elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
385 fi 465 fi
386 466
387 if useq "innodb" ; then 467 # Upstream specifically requests that InnoDB always be built.
388 plugins="${plugins},innobase" 468 plugins="${plugins},innobase"
389 fi
390 469
391 # like configuration=max-no-ndb 470 # like configuration=max-no-ndb
392 if useq "cluster" ; then 471 if use cluster ; then
393 plugins="${plugins},ndbcluster" 472 plugins="${plugins},ndbcluster"
394 myconf="${myconf} --with-ndb-binlog" 473 myconf="${myconf} --with-ndb-binlog"
395 fi 474 fi
396 475
476 if mysql_version_is_at_least "5.2" ; then
477 plugins="${plugins},falcon"
478 fi
479
397 myconf="${myconf} --with-plugins=${plugins}" 480 myconf="${myconf} --with-plugins=${plugins}"
398} 481}
399 482
400pbxt_src_compile() { 483pbxt_src_configure() {
401 mysql_init_vars 484 mysql_init_vars
402 485
403 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 486 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
404 487
405 einfo "Reconfiguring dir '${PWD}'" 488 einfo "Reconfiguring dir '${PWD}'"
406 AT_GNUCONF_UPDATE="yes" eautoreconf 489 AT_GNUCONF_UPDATE="yes" eautoreconf
407 490
408 local myconf 491 local myconf=""
409 myconf="${myconf} --with-mysql=${S}"
410 mkdir -p ${T}/lib
411 myconf="${myconf} --libdir=${D}/${MY_LIBDIR}" 492 myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}"
412 useq "debug" && myconf="${myconf} --with-debug=full" 493 use debug && myconf="${myconf} --with-debug=full"
413 # TODO is safe/needed to use econf here ? 494 # TODO: is it safe/needed to use econf here ?
414 ./configure ${myconf} || die "problem configuring pbxt storage engine" 495 ./configure ${myconf} || die "Problem configuring PBXT storage engine"
496}
497
498pbxt_src_compile() {
499 # Be backwards compatible for now
500 if [[ $EAPI != 2 ]]; then
501 pbxt_src_configure
502 fi
415 # TODO is safe/needed to use emake here ? 503 # TODO: is it safe/needed to use emake here ?
416 make || die "problem making pbxt storage engine (${myconf})" 504 make || die "Problem making PBXT storage engine (${myconf})"
417 505
418 popd 506 popd
419 # TODO: modify test suite 507 # TODO: modify test suite for PBXT
420} 508}
421 509
422pbxt_src_install() { 510pbxt_src_install() {
423 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null 511 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
424 make install || die "failed pbxt install" 512 make install || die "Failed to install PBXT"
425 popd 513 popd
426} 514}
427 515
428# 516#
429# EBUILD FUNCTIONS 517# EBUILD FUNCTIONS
430# 518#
431 519# @FUNCTION: mysql_pkg_setup
520# @DESCRIPTION:
521# Perform some basic tests and tasks during pkg_setup phase:
522# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
523# check for conflicting use flags
524# create new user and group for mysql
525# warn about deprecated features
432mysql_pkg_setup() { 526mysql_pkg_setup() {
433 enewgroup mysql 60 || die "problem adding 'mysql' group" 527 if hasq test ${FEATURES} ; then
434 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" 528 if ! use minimal ; then
435 529 if [[ $UID -eq 0 ]]; then
530 eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
531 fi
532 fi
533 fi
534
436 # Check for USE flag problems in pkg_setup 535 # Check for USE flag problems in pkg_setup
437 if useq "static" && useq "ssl" ; then 536 if use static && use ssl ; then
438 eerror "MySQL does not support being built statically with SSL support enabled!" 537 eerror "MySQL does not support being built statically with SSL support enabled!"
439 die "MySQL does not support being built statically with SSL support enabled!" 538 die "MySQL does not support being built statically with SSL support enabled!"
440 fi 539 fi
441 540
442 if ! mysql_version_is_at_least "5.0" \ 541 if ! mysql_version_is_at_least "5.0" \
443 && useq "raid" \ 542 && use raid \
444 && useq "static" ; then 543 && use static ; then
445 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically" 544 eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically"
446 eerror "with RAID support enabled." 545 eerror "with RAID support enabled."
447 die "USE flags 'raid' and 'static' conflict!" 546 die "USE flags 'raid' and 'static' conflict!"
448 fi 547 fi
449 548
450 if mysql_version_is_at_least "4.1.3" \ 549 if mysql_version_is_at_least "4.1.3" \
451 && ( useq "cluster" || useq "extraengine" ) \ 550 && ( use cluster || use extraengine ) \
452 && useq "minimal" ; then 551 && use minimal ; then
453 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 552 eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
454 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!" 553 die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
455 fi 554 fi
456 555
556 # This should come after all of the die statements
557 enewgroup mysql 60 || die "problem adding 'mysql' group"
558 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
559
457 mysql_check_version_range "4.0 to 5.0.99.99" \ 560 mysql_check_version_range "4.0 to 5.0.99.99" \
458 && useq "berkdb" \ 561 && use berkdb \
459 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 562 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
460} 563}
461 564
565# @FUNCTION: mysql_src_unpack
566# @DESCRIPTION:
567# Unpack the source code and call mysql_src_prepare for EAPI < 2.
462mysql_src_unpack() { 568mysql_src_unpack() {
463 # Initialize the proper variables first 569 # Initialize the proper variables first
464 mysql_init_vars 570 mysql_init_vars
465 571
466 unpack ${A} 572 unpack ${A}
573 # Grab the patches
574 [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
467 575
468 mv -f "${WORKDIR}/${MY_P}${MYSQL_RERELEASE}" "${S}" 576 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
577
578 # Be backwards compatible for now
579 case ${EAPI:-0} in
580 2) : ;;
581 0 | 1) mysql_src_prepare ;;
582 esac
583}
584
585# @FUNCTION: mysql_src_prepare
586# @DESCRIPTION:
587# Apply patches to the source code and remove unneeded bundled libs.
588mysql_src_prepare() {
469 cd "${S}" 589 cd "${S}"
470 590
471 # Apply the patches for this MySQL version 591 # Apply the patches for this MySQL version
472 if [[ -d "${WORKDIR}/${MY_FIXED_PV}" ]] ; then 592 EPATCH_SUFFIX="patch"
473 EPATCH_SOURCE="${WORKDIR}/${MY_FIXED_PV}" EPATCH_SUFFIX="patch" epatch 593 mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
474 fi 594 # Clean out old items
595 rm -f "${EPATCH_SOURCE}"/*
596 # Now link in right patches
597 mysql_mv_patches
598 # And apply
599 epatch
475 600
476 # Additional checks, remove bundled zlib 601 # Additional checks, remove bundled zlib
477 rm -f "${S}/zlib/"*.[ch] 602 rm -f "${S}/zlib/"*.[ch]
478 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" 603 sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
479 rm -f "scripts/mysqlbug" 604 rm -f "scripts/mysqlbug"
480 605
481 # Make charsets install in the right place 606 # Make charsets install in the right place
482 find . -name 'Makefile.am' \ 607 find . -name 'Makefile.am' \
483 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; 608 -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
484 609
485 # Manage mysqlmanager
486 mysql_version_is_at_least "5.00.15.00" \
487 && sed -i -e "s!@GENTOO_EXT@!!g" \
488 -e "s!@GENTOO_SOCK_PATH@!var/run/mysqld!g" \
489 "${S}/server-tools/instance-manager/Makefile.am"
490
491 if mysql_version_is_at_least "4.01.00.00" ; then 610 if mysql_version_is_at_least "4.1" ; then
492 # Remove what needs to be recreated, so we're sure it's actually done 611 # Remove what needs to be recreated, so we're sure it's actually done
612 einfo "Cleaning up old buildscript files"
493 find . -name Makefile \ 613 find . -name Makefile \
494 -o -name Makefile.in \ 614 -o -name Makefile.in \
495 -o -name configure \ 615 -o -name configure \
496 -exec rm -f {} \; 616 -exec rm -f {} \;
497 rm -f "ltmain.sh" 617 rm -f "ltmain.sh"
498 rm -f "scripts/mysqlbug" 618 rm -f "scripts/mysqlbug"
499 fi 619 fi
500 620
501 local rebuilddirlist d 621 local rebuilddirlist d
502 622
623 if mysql_version_is_at_least "5.1.26" && use xtradb ; then
624 einfo "Replacing InnoDB with Percona XtraDB"
625 pushd "${S}"/storage
626 i="innobase"
627 o="${WORKDIR}/storage-${i}.mysql-upstream"
628 # Have we been here already?
629 [ -h "${i}" ] && rm -f "${i}"
630 # Or maybe we haven't
631 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
632 ln -s "${WORKDIR}/${XTRADB_P}" "${i}"
633 popd
634 fi
635
503 if mysql_version_is_at_least "5.1.12" ; then 636 if mysql_version_is_at_least "5.1.12" ; then
637 einfo "Updating innobase cmake"
504 rebuilddirlist="." 638 rebuilddirlist="."
505 # TODO IMPO! Check this with a cmake expert 639 # TODO: check this with a cmake expert
506 useq "innodb" \
507 && cmake \ 640 cmake \
508 -DCMAKE_C_COMPILER=$(which $(tc-getCC)) \ 641 -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
509 -DCMAKE_CXX_COMPILER=$(which $(tc-getCC)) \ 642 -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
510 "storage/innobase" 643 "storage/innobase"
511 else 644 else
512 rebuilddirlist=". innobase" 645 rebuilddirlist=". innobase"
513 fi 646 fi
514 647
518 AT_GNUCONF_UPDATE="yes" eautoreconf 651 AT_GNUCONF_UPDATE="yes" eautoreconf
519 popd &>/dev/null 652 popd &>/dev/null
520 done 653 done
521 654
522 if mysql_check_version_range "4.1 to 5.0.99.99" \ 655 if mysql_check_version_range "4.1 to 5.0.99.99" \
523 && useq "berkdb" ; then 656 && use berkdb ; then
657 einfo "Fixing up berkdb buildsystem"
524 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 658 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
659 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
660 || die "Could not copy libtool.m4 to bdb/dist/"
661 #These files exist only with libtool-2*, and need to be included.
662 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
663 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
664 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
665 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
666 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
667 fi
525 pushd "bdb/dist" \ 668 pushd "bdb/dist" &>/dev/null
526 && sh s_all \ 669 sh s_all \
527 || die "Failed bdb reconfigure" \ 670 || die "Failed bdb reconfigure"
528 &>/dev/null
529 popd &>/dev/null 671 popd &>/dev/null
530 fi 672 fi
531} 673}
532 674
675# @FUNCTION: mysql_src_configure
676# @DESCRIPTION:
677# Configure mysql to build the code for Gentoo respecting the use flags.
533mysql_src_compile() { 678mysql_src_configure() {
534 # Make sure the vars are correctly initialized 679 # Make sure the vars are correctly initialized
535 mysql_init_vars 680 mysql_init_vars
536 681
537 # $myconf is modified by the configure_* functions 682 # $myconf is modified by the configure_* functions
538 local myconf="" 683 local myconf=""
539 684
540 if useq "minimal" ; then 685 if use minimal ; then
541 configure_minimal 686 configure_minimal
542 else 687 else
543 configure_common 688 configure_common
544 if mysql_version_is_at_least "5.1.10" ; then 689 if mysql_version_is_at_least "5.1.10" ; then
545 configure_51 690 configure_51
552 filter-flags "-O" "-O[01]" 697 filter-flags "-O" "-O[01]"
553 698
554 # glib-2.3.2_pre fix, bug #16496 699 # glib-2.3.2_pre fix, bug #16496
555 append-flags "-DHAVE_ERRNO_AS_DEFINE=1" 700 append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
556 701
702 # As discovered by bug #246652, doing a double-level of SSP causes NDB to
703 # fail badly during cluster startup.
704 if [[ $(gcc-major-version) -lt 4 ]]; then
705 filter-flags "-fstack-protector-all"
706 fi
707
557 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" 708 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
558 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 709 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
559 mysql_version_is_at_least "5.0" \ 710 mysql_version_is_at_least "5.0" \
560 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 711 && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
561 export CXXFLAGS 712 export CXXFLAGS
713
714 # bug #283926, with GCC4.4, this is required to get correct behavior.
715 append-flags -fno-strict-aliasing
562 716
563 econf \ 717 econf \
564 --libexecdir="/usr/sbin" \ 718 --libexecdir="/usr/sbin" \
565 --sysconfdir="${MY_SYSCONFDIR}" \ 719 --sysconfdir="${MY_SYSCONFDIR}" \
566 --localstatedir="${MY_LOCALSTATEDIR}" \ 720 --localstatedir="${MY_LOCALSTATEDIR}" \
577 # TODO: Move this before autoreconf !!! 731 # TODO: Move this before autoreconf !!!
578 find . -type f -name Makefile -print0 \ 732 find . -type f -name Makefile -print0 \
579 | xargs -0 -n100 sed -i \ 733 | xargs -0 -n100 sed -i \
580 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' 734 -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
581 735
736 if [[ $EAPI == 2 ]]; then
737 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_configure
738 fi
739}
740
741# @FUNCTION: mysql_src_compile
742# @DESCRIPTION:
743# Compile the mysql code.
744mysql_src_compile() {
745 # Be backwards compatible for now
746 case ${EAPI:-0} in
747 2) : ;;
748 0 | 1) mysql_src_configure ;;
749 esac
750
582 emake || die "emake failed" 751 emake || die "emake failed"
583}
584 752
753 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile
754}
755
756# @FUNCTION: mysql_src_install
757# @DESCRIPTION:
758# Install mysql.
585mysql_src_install() { 759mysql_src_install() {
586 # Make sure the vars are correctly initialized 760 # Make sure the vars are correctly initialized
587 mysql_init_vars 761 mysql_init_vars
588 762
589 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed" 763 emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die "emake install failed"
590 764
591 insinto "${MY_INCLUDEDIR}" 765 mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install
592 doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
593 766
594 # Convenience links 767 # Convenience links
768 einfo "Making Convenience links for mysqlcheck multi-call binary"
595 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" 769 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
596 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 770 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
597 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 771 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
598 772
599 # Various junk (my-*.cnf moved elsewhere) 773 # Various junk (my-*.cnf moved elsewhere)
774 einfo "Removing duplicate /usr/share/mysql files"
600 rm -Rf "${D}/usr/share/info" 775 rm -Rf "${D}/usr/share/info"
601 for removeme in "mysql-log-rotate" mysql.server* \ 776 for removeme in "mysql-log-rotate" mysql.server* \
602 binary-configure* my-*.cnf mi_test_all* 777 binary-configure* my-*.cnf mi_test_all*
603 do 778 do
604 rm -f "${D}"/usr/share/mysql/${removeme} 779 rm -f "${D}"/usr/share/mysql/${removeme}
605 done 780 done
606 781
607 # Clean up stuff for a minimal build 782 # Clean up stuff for a minimal build
608 if useq "minimal" ; then 783 if use minimal ; then
784 einfo "Remove all extra content for minimal build"
609 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 785 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
610 rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam} 786 rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
611 rm -f "${D}/usr/sbin/mysqld" 787 rm -f "${D}/usr/sbin/mysqld"
612 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 788 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
613 fi 789 fi
616 if mysql_version_is_at_least "4.1" ; then 792 if mysql_version_is_at_least "4.1" ; then
617 mysql_mycnf_version="4.1" 793 mysql_mycnf_version="4.1"
618 else 794 else
619 mysql_mycnf_version="4.0" 795 mysql_mycnf_version="4.0"
620 fi 796 fi
797 einfo "Building default my.cnf"
621 insinto "${MY_SYSCONFDIR}" 798 insinto "${MY_SYSCONFDIR}"
622 doins "scripts/mysqlaccess.conf" 799 doins scripts/mysqlaccess.conf
623 sed -e "s!@DATADIR@!${DATADIR}!g" \ 800 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
624 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \ 801 "${FILESDIR}/my.cnf-${mysql_mycnf_version}" \
625 > "${TMPDIR}/my.cnf.ok" 802 > "${TMPDIR}/my.cnf.ok"
626 if mysql_version_is_at_least "4.1" && useq "latin1" ; then 803 if mysql_version_is_at_least "4.1" && use latin1 ; then
627 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok" 804 sed -e "s|utf8|latin1|g" -i "${TMPDIR}/my.cnf.ok"
628 fi 805 fi
629 newins "${TMPDIR}/my.cnf.ok" my.cnf 806 newins "${TMPDIR}/my.cnf.ok" my.cnf
630 807
631 insinto "/etc/conf.d"
632 newins "${FILESDIR}/mysql.conf.d" "mysql"
633 mysql_version_is_at_least "5.00.11.00" \
634 && newins "${FILESDIR}/mysqlmanager.conf.d" "mysqlmanager"
635
636 # Minimal builds don't have the MySQL server 808 # Minimal builds don't have the MySQL server
637 if ! useq "minimal" ; then 809 if ! use minimal ; then
638 exeinto "/etc/init.d" 810 einfo "Creating initial directories"
639 newexe "${FILESDIR}/mysql.rc6" "mysql"
640 mysql_version_is_at_least "5.00.11.00" \
641 && newexe "${FILESDIR}/mysqlmanager.rc6" "mysqlmanager"
642
643 insinto "/etc/logrotate.d"
644 newins "${FILESDIR}/logrotate.mysql" "mysql"
645
646 # Empty directories ... 811 # Empty directories ...
647 diropts "-m0750" 812 diropts "-m0750"
648 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 813 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
649 dodir "${DATADIR}" 814 dodir "${MY_DATADIR}"
650 keepdir "${DATADIR}" 815 keepdir "${MY_DATADIR}"
651 chown -R mysql:mysql "${D}/${DATADIR}" 816 chown -R mysql:mysql "${D}/${MY_DATADIR}"
652 fi 817 fi
653 818
654 diropts "-m0755" 819 diropts "-m0755"
655 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 820 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
656 dodir "${folder}" 821 dodir "${folder}"
658 chown -R mysql:mysql "${D}/${folder}" 823 chown -R mysql:mysql "${D}/${folder}"
659 done 824 done
660 fi 825 fi
661 826
662 # Docs 827 # Docs
828 einfo "Installing docs"
663 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE 829 dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
830 doinfo "${S}"/Docs/mysql.info
664 831
665 # Minimal builds don't have the MySQL server 832 # Minimal builds don't have the MySQL server
666 if ! useq "minimal" ; then 833 if ! use minimal ; then
834 einfo "Including support files and sample configurations"
835 docinto "support-files"
836 for script in \
837 "${S}"/support-files/my-*.cnf \
838 "${S}"/support-files/magic \
839 "${S}"/support-files/ndb-config-2-node.ini
840 do
841 dodoc "${script}"
842 done
843
844 docinto "scripts"
845 for script in "${S}"/scripts/mysql* ; do
846 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
847 done
848
849 fi
850
851 mysql_lib_symlinks "${D}"
852}
853
854# @FUNCTION: mysql_pkg_preinst
855# @DESCRIPTION:
856# Create the user and groups for mysql - die if that fails.
857mysql_pkg_preinst() {
858 enewgroup mysql 60 || die "problem adding 'mysql' group"
859 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
860}
861
862# @FUNCTION: mysql_pkg_postinst
863# @DESCRIPTION:
864# Run post-installation tasks:
865# create the dir for logfiles if non-existant
866# touch the logfiles and secure them
867# install scripts
868# issue required steps for optional features
869# issue deprecation warnings
870mysql_pkg_postinst() {
871 # Make sure the vars are correctly initialized
872 mysql_init_vars
873
874 # Check FEATURES="collision-protect" before removing this
875 [[ -d "${ROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
876
877 # Secure the logfiles
878 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
879 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
880 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
881
882 # Minimal builds don't have the MySQL server
883 if ! use minimal ; then
667 docinto "support-files" 884 docinto "support-files"
668 for script in \ 885 for script in \
669 support-files/my-*.cnf \ 886 support-files/my-*.cnf \
670 support-files/magic \ 887 support-files/magic \
671 support-files/ndb-config-2-node.ini 888 support-files/ndb-config-2-node.ini
675 892
676 docinto "scripts" 893 docinto "scripts"
677 for script in scripts/mysql* ; do 894 for script in scripts/mysql* ; do
678 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 895 [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
679 done 896 done
680 fi
681 897
682 ROOT="${D}" mysql_lib_symlinks
683}
684
685mysql_pkg_preinst() {
686 enewgroup mysql 60 || die "problem adding 'mysql' group"
687 enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
688}
689
690mysql_pkg_postinst() {
691 # Make sure the vars are correctly initialized
692 mysql_init_vars
693
694 # Check FEATURES="collision-protect" before removing this
695 [[ -d "${ROOT}/var/log/mysql" ]] \
696 || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
697
698 # Secure the logfiles
699 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
700 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
701 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
702
703 if ! useq "minimal" ; then
704 # Your friendly public service announcement ...
705 einfo 898 einfo
706 elog "You might want to run:" 899 elog "You might want to run:"
707 elog "\"emerge --config =${CATEGORY}/${PF}\"" 900 elog "\"emerge --config =${CATEGORY}/${PF}\""
708 elog "if this is a new install." 901 elog "if this is a new install."
709 einfo 902 einfo
710 mysql_version_is_at_least "5.01.00.00" \
711 || elog "InnoDB is *not* optional as of MySQL-4.0.24, at the request of upstream."
712 fi 903 fi
904
905 if mysql_version_is_at_least "5.1.12" && use pbxt ; then
906 # TODO: explain it better
907 elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
908 elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
909 elog "if, after that, you cannot start the MySQL server,"
910 elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
911 elog "use the MySQL upgrade script to restore the table"
912 elog "or execute the following SQL command:"
913 elog " CREATE TABLE IF NOT EXISTS plugin ("
914 elog " name char(64) binary DEFAULT '' NOT NULL,"
915 elog " dl char(128) DEFAULT '' NOT NULL,"
916 elog " PRIMARY KEY (name)"
917 elog " ) CHARACTER SET utf8 COLLATE utf8_bin;"
918 fi
919
713 mysql_check_version_range "4.0 to 5.0.99.99" \ 920 mysql_check_version_range "4.0 to 5.0.99.99" \
714 && useq "berkdb" \ 921 && use berkdb \
715 && elog "Berkeley DB support is deprecated and will be removed in future versions!" 922 && elog "Berkeley DB support is deprecated and will be removed in future versions!"
716} 923}
717 924
925# @FUNCTION: mysql_pkg_config
926# @DESCRIPTION:
927# Configure mysql environment.
718mysql_pkg_config() { 928mysql_pkg_config() {
929 local old_MY_DATADIR="${MY_DATADIR}"
930
719 # Make sure the vars are correctly initialized 931 # Make sure the vars are correctly initialized
720 mysql_init_vars 932 mysql_init_vars
721 933
722 [[ -z "${DATADIR}" ]] && die "Sorry, unable to find DATADIR" 934 [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
723 935
724 if built_with_use ${CATEGORY}/${PN} minimal ; then 936 if built_with_use ${CATEGORY}/${PN} minimal ; then
725 die "Minimal builds do NOT include the MySQL server" 937 die "Minimal builds do NOT include the MySQL server"
938 fi
939
940 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
941 local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
942 local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
943
944 if [[ -d "${old_MY_DATADIR_s}" ]]; then
945 if [[ -d "${MY_DATADIR_s}" ]]; then
946 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
947 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
948 else
949 elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
950 mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
951 || die "Moving MY_DATADIR failed"
952 fi
953 else
954 ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
955 if [[ -d "${MY_DATADIR_s}" ]]; then
956 ewarn "Attempting to use ${MY_DATADIR_s}"
957 else
958 eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
959 die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
960 fi
961 fi
726 fi 962 fi
727 963
728 local pwd1="a" 964 local pwd1="a"
729 local pwd2="b" 965 local pwd2="b"
730 local maxtry=5 966 local maxtry=5
731 967
732 if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then 968 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
733 ewarn "You have already a MySQL database in place." 969 ewarn "You have already a MySQL database in place."
734 ewarn "(${ROOT}/${DATADIR}/*)" 970 ewarn "(${ROOT}/${MY_DATADIR}/*)"
735 ewarn "Please rename or delete it if you wish to replace it." 971 ewarn "Please rename or delete it if you wish to replace it."
736 die "MySQL database already exists!" 972 die "MySQL database already exists!"
737 fi 973 fi
974
975 # Bug #213475 - MySQL _will_ object strenously if your machine is named
976 # localhost. Also causes weird failures.
977 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
738 978
739 einfo "Creating the mysql database and setting proper" 979 einfo "Creating the mysql database and setting proper"
740 einfo "permissions on it ..." 980 einfo "permissions on it ..."
741 981
742 einfo "Insert a password for the mysql 'root' user" 982 einfo "Insert a password for the mysql 'root' user"
758 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 998 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
759 || touch "${TMPDIR}/fill_help_tables.sql" 999 || touch "${TMPDIR}/fill_help_tables.sql"
760 help_tables="${TMPDIR}/fill_help_tables.sql" 1000 help_tables="${TMPDIR}/fill_help_tables.sql"
761 1001
762 pushd "${TMPDIR}" &>/dev/null 1002 pushd "${TMPDIR}" &>/dev/null
763 "${ROOT}/usr/bin/mysql_install_db" | grep -B5 -A999 -i "ERROR" 1003 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
1004 if [ $? -ne 0 ]; then
1005 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
1006 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
1007 fi
764 popd &>/dev/null 1008 popd &>/dev/null
765 [[ -f "${ROOT}/${DATADIR}/mysql/user.frm" ]] \ 1009 [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
766 || die "MySQL databases not installed" 1010 || die "MySQL databases not installed"
767 chown -R mysql:mysql "${ROOT}/${DATADIR}" 2> /dev/null 1011 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
768 chmod 0750 "${ROOT}/${DATADIR}" 2> /dev/null 1012 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
769 1013
770 if mysql_version_is_at_least "4.1.3" ; then 1014 if mysql_version_is_at_least "4.1.3" ; then
771 options="--skip-ndbcluster" 1015 options="--skip-ndbcluster"
772 1016
773 # Filling timezones, see 1017 # Filling timezones, see
784 local mysqld="${ROOT}/usr/sbin/mysqld \ 1028 local mysqld="${ROOT}/usr/sbin/mysqld \
785 ${options} \ 1029 ${options} \
786 --user=mysql \ 1030 --user=mysql \
787 --skip-grant-tables \ 1031 --skip-grant-tables \
788 --basedir=${ROOT}/usr \ 1032 --basedir=${ROOT}/usr \
789 --datadir=${ROOT}/${DATADIR} \ 1033 --datadir=${ROOT}/${MY_DATADIR} \
790 --skip-innodb \ 1034 --skip-innodb \
791 --skip-bdb \ 1035 --skip-bdb \
792 --skip-networking \ 1036 --skip-networking \
793 --max_allowed_packet=8M \ 1037 --max_allowed_packet=8M \
794 --net_buffer_length=16K \ 1038 --net_buffer_length=16K \
823 einfo "Stopping the server ..." 1067 einfo "Stopping the server ..."
824 wait %1 1068 wait %1
825 einfo "Done" 1069 einfo "Done"
826} 1070}
827 1071
1072# @FUNCTION: mysql_pkg_postrm
1073# @DESCRIPTION:
1074# Remove mysql symlinks.
828mysql_pkg_postrm() { 1075mysql_pkg_postrm() {
829 : #mysql_lib_symlinks 1076 : # mysql_lib_symlinks "${D}"
830} 1077}

Legend:
Removed from v.1.51  
changed lines
  Added in v.1.124

  ViewVC Help
Powered by ViewVC 1.1.20