From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OfyPN-0008Qy-2n for garchives@archives.gentoo.org; Mon, 02 Aug 2010 17:02:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9BB4E0943 for ; Mon, 2 Aug 2010 17:02:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BE768E07F2 for ; Mon, 2 Aug 2010 16:56:43 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 339521B4268 for ; Mon, 2 Aug 2010 16:56:43 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2142) id 3A3002CE15; Mon, 2 Aug 2010 16:56:42 +0000 (UTC) From: "Matti Bickel (mabi)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mabi@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/php: php-5.2.14.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: php-5.2.14.ebuild ChangeLog X-VCS-Directories: dev-lang/php X-VCS-Committer: mabi X-VCS-Committer-Name: Matti Bickel Content-Type: text/plain; charset=utf8 Message-Id: <20100802165642.3A3002CE15@corvid.gentoo.org> Date: Mon, 2 Aug 2010 16:56:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b47dc4c8-5f94-4dc5-aa1d-bb883a15196b X-Archives-Hash: 69ae8b01134d979ba3aab95092d1ce03 mabi 10/08/02 16:56:42 Modified: ChangeLog Added: php-5.2.14.ebuild Log: version & eapi bump (Portage version: 2.1.8.3/cvs/Linux x86_64) Revision Changes Path 1.399 dev-lang/php/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/Chang= eLog?rev=3D1.399&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/Chang= eLog?rev=3D1.399&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/Chang= eLog?r1=3D1.398&r2=3D1.399 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v retrieving revision 1.398 retrieving revision 1.399 diff -u -r1.398 -r1.399 --- ChangeLog 29 Jul 2010 17:27:23 -0000 1.398 +++ ChangeLog 2 Aug 2010 16:56:41 -0000 1.399 @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/php # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.398 2010/0= 7/29 17:27:23 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.399 2010/0= 8/02 16:56:41 mabi Exp $ + +*php-5.2.14 (02 Aug 2010) + + 02 Aug 2010; Matti Bickel + +files/eblits/src_configure-v52.eblit, +php-5.2.14.ebuild: + version bump; this is a security update - see + http://www.php.net/archive/2010.php#id2010-07-22-1 for details =20 29 Jul 2010; Matti Bickel files/eblits/src_install-v1.eblit: 1.1 dev-lang/php/php-5.2.14.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5= .2.14.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5= .2.14.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: php-5.2.14.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.14.ebuild,v 1.1 2= 010/08/02 16:56:41 mabi Exp $ EAPI=3D2 PHPCONFUTILS_MISSING_DEPS=3D"adabas birdstep db2 dbmaker empress empress-= bcs esoob interbase msql oci8 sapdb solid" inherit eutils autotools flag-o-matic versionator depend.apache apache-mo= dule db-use phpconfutils php-common-r1 libtool PHP_PATCHSET=3D"" SUHOSIN_VERSION=3D"$PV-0.9.7" EXPECTED_TEST_FAILURES=3D"" KEYWORDS=3D"~amd64 ~alpha ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~= x86 ~x86-fbsd" function php_get_uri () { case "${1}" in "php-pre") echo "http://downloads.php.net/johannes/${2}" ;; "php") echo "http://www.php.net/distributions/${2}" ;; "suhosin") echo "http://download.suhosin.org/${2}" ;; "gentoo") echo "mirror://gentoo/${2}" ;; *) die "unhandled case in php_get_uri" ;; esac } PHP_MV=3D"$(get_major_version)" # alias, so we can handle different types of releases (finals, rcs, alpha= s, # betas, ...) w/o changing the whole ebuild PHP_PV=3D"${PV/_rc/RC}" PHP_RELEASE=3D"php" PHP_P=3D"${PN}-${PHP_PV}" PHP_SRC_URI=3D"$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" PHP_PATCHSET=3D"${PHP_PATCHSET:-${PR/r/}}" PHP_PATCHSET_URI=3D" $(php_get_uri gentoo "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" if [[ ${SUHOSIN_VERSION} =3D=3D *-gentoo ]]; then # in some cases we use our own suhosin patch (very recent version, # patch conflicts, etc.) SUHOSIN_TYPE=3D"gentoo" else SUHOSIN_TYPE=3D"suhosin" fi SUHOSIN_PATCH=3D"suhosin-patch-${SUHOSIN_VERSION}.patch" SUHOSIN_URI=3D"$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" SRC_URI=3D" ${PHP_SRC_URI} ${PHP_PATCHSET_URI} suhosin? ( ${SUHOSIN_URI} )" DESCRIPTION=3D"The PHP language runtime engine: CLI, CGI, Apache2 and emb= ed SAPIs." HOMEPAGE=3D"http://php.net/" LICENSE=3D"PHP-3" # We can build the following SAPIs in the given order SAPIS=3D"cli cgi embed apache2" # Gentoo-specific, common features IUSE=3D"kolab" # SAPIs and SAPI-specific USE flags (cli SAPI is default on): IUSE=3D"${IUSE} ${SAPIS/cli/+cli} concurrentmodphp threads" IUSE=3D"${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt +ctype curl curlwrappers db2 dbase dbmaker debug doc empress empress-bcs esoob exif fdftk frontbase +filter firebird flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile interbase iodbc ipv6 +json kerberos ldap ldap-sasl libedit mcve msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl +pcre pdo pic +posix postgres qdbm readline recode reflection sapdb +session sharedext sharedmem +simplexml snmp soap sockets solid spell spl sqlite ssl suhosin sybase-ct sysvipc tidy +tokenizer truetype unicode wddx xml xmlreader xmlwriter xmlrpc xpm xsl yaz zip zlib" DEPEND=3D"app-admin/php-toolkit pcre? ( >=3Ddev-libs/libpcre-7.9[unicode] ) adabas? ( >=3Ddev-db/unixODBC-1.8.13 ) apache2? ( www-servers/apache[threads=3D] ) berkdb? ( =3Dsys-libs/db-4* ) birdstep? ( >=3Ddev-db/unixODBC-1.8.13 ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( !gd-external? ( >=3Dmedia-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) ) ) crypt? ( >=3Ddev-libs/libmcrypt-2.4 ) curl? ( >=3Dnet-misc/curl-7.10.5 ) db2? ( >=3Ddev-db/unixODBC-1.8.13 ) dbmaker? ( >=3Ddev-db/unixODBC-1.8.13 ) empress? ( >=3Ddev-db/unixODBC-1.8.13 ) empress-bcs? ( >=3Ddev-db/unixODBC-1.8.13 ) esoob? ( >=3Ddev-db/unixODBC-1.8.13 ) exif? ( !gd? ( !gd-external? ( >=3Dmedia-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) ) ) fdftk? ( app-text/fdftk ) firebird? ( dev-db/firebird ) gd? ( >=3Dmedia-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) gd-external? ( media-libs/gd ) gdbm? ( >=3Dsys-libs/gdbm-1.8.0 ) gmp? ( >=3Ddev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=3Dnet-libs/c-client-2004g-r1 ) ldap? ( !oci8? ( >=3Dnet-nds/openldap-1.2.11 ) ) ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=3Dnet-nds/openldap-1.2.11 ) = ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mhash? ( app-crypt/mhash ) mssql? ( dev-db/freetds[mssql] ) mysql? ( virtual/mysql ) mysqli? ( >=3Dvirtual/mysql-4.1 ) ncurses? ( sys-libs/ncurses ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=3Ddev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sapdb? ( >=3Ddev-db/unixODBC-1.8.13 ) sharedmem? ( dev-libs/mm ) simplexml? ( >=3Ddev-libs/libxml2-2.6.8 ) snmp? ( >=3Dnet-analyzer/net-snmp-5.2 ) soap? ( >=3Ddev-libs/libxml2-2.6.8 ) solid? ( >=3Ddev-db/unixODBC-1.8.13 ) spell? ( >=3Dapp-text/aspell-0.50 ) sqlite? ( =3Ddev-db/sqlite-2* pdo? ( =3Ddev-db/sqlite-3* ) ) ssl? ( >=3Ddev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =3Dmedia-libs/freetype-2* >=3Dmedia-libs/t1lib-5.0.0 !gd? ( !gd-external? ( >=3Dmedia-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) ) ) wddx? ( >=3Ddev-libs/libxml2-2.6.8 ) xml? ( >=3Ddev-libs/libxml2-2.6.8 ) xmlrpc? ( >=3Ddev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=3Ddev-libs/libxml2-2.6.8 ) xmlwriter? ( >=3Ddev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm >=3Dmedia-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=3Ddev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta " php=3D"=3D${CATEGORY}/${PF}" RDEPEND=3D"${DEPEND} truetype? ( || ( $php[gd] $php[gd-external] ) ) cjk? ( || ( $php[gd] $php[gd-external] ) ) exif? ( || ( $php[gd] $php[gd-external] ) ) xpm? ( $php[gd] ) gd? ( $php[zlib,-gd-external] ) gd-external? ( $php[-gd] ) simplexml? ( $php[xml] ) soap? ( $php[xml] ) wddx? ( $php[xml] ) xmlrpc? ( || ( $php[xml] $php[iconv] ) ) xmlreader? ( $php[xml] ) xsl? ( $php[xml] ) ldap-sasl? ( $php[ldap,-oci8] ) suhosin? ( $php[unicode] ) adabas? ( $php[odbc] ) birdstep? ( $php[odbc] ) dbmaker? ( $php[odbc] ) empress-bcs? ( $php[empress] ) empress? ( $php[odbc] ) esoob? ( $php[odbc] ) db2? ( $php[odbc] ) sapdb? ( $php[odbc] ) solid? ( $php[odbc] ) kolab? ( $php[imap] ) oci8? ( $php[-oci8-instant-client,-ldap-sasl] ) oci8-instant-client? ( $php[-oci8] ) qdbm? ( $php[-gdbm] ) readline? ( $php[-libedit] ) recode? ( $php[-imap,-mysql,-mysqli] ) firebird? ( $php[-interbase] ) sharedmem? ( $php[-threads] ) !cli? ( !cgi? ( !apache2? ( !embed? ( $php[cli] ) ) ) ) filter? ( !dev-php${PHP_MV}/pecl-filter ) json? ( !dev-php${PHP_MV}/pecl-json ) zip? ( !dev-php${PHP_MV}/pecl-zip )" DEPEND=3D"${DEPEND} sys-devel/flex >=3Dsys-devel/m4-1.4.3 >=3Dsys-devel/libtool-1.5.18" # They are in PDEPEND because we need PHP installed first! PDEPEND=3D"doc? ( app-doc/php-docs ) suhosin? ( dev-php${PHP_MV}/suhosin ) mcve? ( dev-php${PHP_MV}/pecl-mcve ) yaz? ( dev-php${PHP_MV}/pecl-yaz )" # Portage doesn't support setting PROVIDE based on the USE flags that # have been enabled, so we have to PROVIDE everything for now and hope # for the best PROVIDE=3D"virtual/php" SLOT=3D"${PHP_MV}" S=3D"${WORKDIR}/${PHP_P}" PHP_INI_FILE=3D"php.ini" PHP_INI_UPSTREAM=3D"php.ini-dist" want_apache # eblit-core # Usage: [version] [eval] # Main eblit engine eblit-core() { [[ -z $FILESDIR ]] && FILESDIR=3D"$(dirname $EBUILD)/files" local e v func=3D$1 ver=3D$2 eval_=3D$3 for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do e=3D"${FILESDIR}/eblits/${func}${v}.eblit" if [[ -e ${e} ]] ; then . "${e}" [[ ${eval_} =3D=3D 1 ]] && eval "${func}() { eblit-run ${func} ${ver} = ; }" return 0 fi done return 1 } # eblit-include # Usage: [--skip] [version] # Includes an "eblit" -- a chunk of common code among ebuilds in a given # package so that its functions can be sourced and utilized within the # ebuild. eblit-include() { local skipable=3Dfalse r=3D0 [[ $1 =3D=3D "--skip" ]] && skipable=3Dtrue && shift [[ $1 =3D=3D pkg_* ]] && skipable=3Dtrue [[ -z $1 ]] && die "Usage: eblit-include [version]" eblit-core $1 $2 r=3D"$?" ${skipable} && return 0 [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FI= LESDIR}/eblits/" } # eblit-run-maybe # Usage: # Runs a function if it is defined in an eblit eblit-run-maybe() { [[ $(type -t "$@") =3D=3D "function" ]] && "$@" } # eblit-run # Usage: [version] # Runs a function defined in an eblit eblit-run() { eblit-include --skip common "${*:2}" eblit-include "$@" eblit-run-maybe eblit-$1-pre eblit-${PN}-$1 eblit-run-maybe eblit-$1-post } # eblit-pkg # Usage: [version] # Includes the given functions AND evals them so they're included in the = binpkgs eblit-pkg() { [[ -z $1 ]] && die "Usage: eblit-pkg [version]" eblit-core $1 $2 1 } eblit-pkg pkg_setup v1 src_prepare() { eblit-run src_prepare v1 ; } src_configure() { eblit-run src_configure v52 ; } src_compile() { eblit-run src_compile v1 ; } src_install() { eblit-run src_install v1 ; } src_test() { eblit-run src_test v1 ; } eblit-pkg pkg_postinst v1