Date: Friday, January 8, 2016 @ 09:58:09 Author: idevolder Revision: 155714
archrelease: copy trunk to community-i686, community-x86_64 Added: php-mongodb/repos/community-i686/PKGBUILD (from rev 155713, php-mongodb/trunk/PKGBUILD) php-mongodb/repos/community-i686/mongodb.ini (from rev 155713, php-mongodb/trunk/mongodb.ini) php-mongodb/repos/community-i686/php-mongodb.install (from rev 155713, php-mongodb/trunk/php-mongodb.install) php-mongodb/repos/community-x86_64/PKGBUILD (from rev 155713, php-mongodb/trunk/PKGBUILD) php-mongodb/repos/community-x86_64/mongodb.ini (from rev 155713, php-mongodb/trunk/mongodb.ini) php-mongodb/repos/community-x86_64/php-mongodb.install (from rev 155713, php-mongodb/trunk/php-mongodb.install) Deleted: php-mongodb/repos/community-i686/PKGBUILD php-mongodb/repos/community-i686/mongodb.ini php-mongodb/repos/community-i686/php7-i686.patch php-mongodb/repos/community-x86_64/PKGBUILD php-mongodb/repos/community-x86_64/mongodb.ini php-mongodb/repos/community-x86_64/php7-i686.patch --------------------------------------+ /PKGBUILD | 70 +++++++++++++++++++++++++++++++++ /mongodb.ini | 4 + community-i686/PKGBUILD | 41 ------------------- community-i686/mongodb.ini | 2 community-i686/php-mongodb.install | 12 +++++ community-i686/php7-i686.patch | 40 ------------------ community-x86_64/PKGBUILD | 41 ------------------- community-x86_64/mongodb.ini | 2 community-x86_64/php-mongodb.install | 12 +++++ community-x86_64/php7-i686.patch | 40 ------------------ 10 files changed, 98 insertions(+), 166 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-01-08 08:57:56 UTC (rev 155713) +++ community-i686/PKGBUILD 2016-01-08 08:58:09 UTC (rev 155714) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com > -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Martin Striz < ms AT martinstriz DOT cz > -# Contributor: Jarek Sedlacek <jareksedla...@gmail.com> - -pkgname=php-mongodb -pkgver=1.1.1 -pkgrel=1 -pkgdesc="MongoDB driver for PHP" -arch=("i686" "x86_64") -url="http://mongodb.github.io/mongo-php-driver" -license=("Apache") -depends=('php' 'libmongoc') -makedepends=('re2c') -backup=("etc/php/conf.d/mongodb.ini") -source=( - "http://pecl.php.net/get/mongodb-$pkgver.tgz" - "mongodb.ini" - "php7-i686.patch" -) -sha256sums=('0899b00435edf143ddc0ededd8027013c86bf59214d63ae1f3c7be0eaae11ceb' - '242b9ffea6bd84f813c7fc2a767eaa89f83577c5ff10ff36aecec2ca308ff72b' - 'cc1925bc6f6c92d13494823d354cf340c6cc1486b4e0e711af2219739ac4270b') - -prepare() { - cd mongodb-$pkgver - patch -p1 -i ../php7-i686.patch -} - -build() { - cd mongodb-$pkgver - phpize - ./configure --prefix=/usr --with-libbson --with-libmongoc -} - -package() { - cd mongodb-$pkgver - make INSTALL_ROOT="$pkgdir" install - install -Dm644 "$srcdir/mongodb.ini" "$pkgdir/etc/php/conf.d/mongodb.ini" -} Copied: php-mongodb/repos/community-i686/PKGBUILD (from rev 155713, php-mongodb/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-01-08 08:58:09 UTC (rev 155714) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com > +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Martin Striz < ms AT martinstriz DOT cz > +# Contributor: Jarek Sedlacek <jareksedla...@gmail.com> + +pkgname=php-mongodb +pkgver=1.1.2 +pkgrel=2 +pkgdesc="MongoDB driver for PHP" +arch=("i686" "x86_64") +url="http://mongodb.github.io/mongo-php-driver" +license=("Apache") +depends=('php' 'libmongoc') +makedepends=('re2c') +backup=("etc/php/conf.d/mongodb.ini") +install=php-mongodb.install +source=( + "http://pecl.php.net/get/mongodb-$pkgver.tgz" + "mongodb.ini" +) +sha256sums=('4cb80002dfb6be0805457ef0c9f4e91fd03c2e54baedac958ad1e498c741484d' + '242b9ffea6bd84f813c7fc2a767eaa89f83577c5ff10ff36aecec2ca308ff72b') + +build() { + cd mongodb-$pkgver + phpize + ./configure --prefix=/usr --with-libbson --with-libmongoc +} + +package() { + cd mongodb-$pkgver + make INSTALL_ROOT="$pkgdir" install + install -Dm644 "$srcdir/mongodb.ini" "$pkgdir/etc/php/conf.d/mongodb.ini" +} Deleted: community-i686/mongodb.ini =================================================================== --- community-i686/mongodb.ini 2016-01-08 08:57:56 UTC (rev 155713) +++ community-i686/mongodb.ini 2016-01-08 08:58:09 UTC (rev 155714) @@ -1,2 +0,0 @@ -; Tell PHP to load the MongoDB Extension on startup -extension=mongodb.so Copied: php-mongodb/repos/community-i686/mongodb.ini (from rev 155713, php-mongodb/trunk/mongodb.ini) =================================================================== --- community-i686/mongodb.ini (rev 0) +++ community-i686/mongodb.ini 2016-01-08 08:58:09 UTC (rev 155714) @@ -0,0 +1,2 @@ +; Tell PHP to load the MongoDB Extension on startup +extension=mongodb.so Copied: php-mongodb/repos/community-i686/php-mongodb.install (from rev 155713, php-mongodb/trunk/php-mongodb.install) =================================================================== --- community-i686/php-mongodb.install (rev 0) +++ community-i686/php-mongodb.install 2016-01-08 08:58:09 UTC (rev 155714) @@ -0,0 +1,12 @@ +post_install() { + warning +} + +post_upgrade() { + warning +} + +warning() { + printf "WARNING:\nWhen moving from 'php-mongo' to 'php-mongodb' keep into mind the extension's api is not compatible\n\n" + return 0 +} Deleted: community-i686/php7-i686.patch =================================================================== --- community-i686/php7-i686.patch 2016-01-08 08:57:56 UTC (rev 155713) +++ community-i686/php7-i686.patch 2016-01-08 08:58:09 UTC (rev 155714) @@ -1,40 +0,0 @@ -diff --git a/phongo_compat.h b/phongo_compat.h -index da4aed1..adbf21c 100644 ---- a/phongo_compat.h -+++ b/phongo_compat.h -@@ -99,7 +99,8 @@ - int tmp_len; \ - mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \ - tmp_len = spprintf(&tmp, 0, "%lld", value); \ -- add_index_stringl(zval, index, tmp, tmp_len, 0); \ -+ ADD_INDEX_STRINGL(zval, index, tmp, tmp_len); \ -+ efree(tmp); \ - } else { \ - add_index_long(zval, index, val); \ - } -@@ -109,7 +110,8 @@ - int tmp_len; \ - mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \ - tmp_len = spprintf(&tmp, 0, "%lld", value); \ -- add_assoc_stringl(zval, key, tmp, tmp_len, 0); \ -+ ADD_ASSOC_STRINGL(zval, key, tmp, tmp_len); \ -+ efree(tmp); \ - } else { \ - add_assoc_long(zval, key, value); \ - } -@@ -167,6 +167,7 @@ - # define ADD_ASSOC_ZVAL(_zv, _key, _value) add_assoc_zval(_zv, _key, _value); - # define ADD_ASSOC_NULL_EX(_zv, _key) add_assoc_null_ex(_zv, ZEND_STRL(_key)); - # define ADD_ASSOC_BOOL_EX(_zv, _key, _value) add_assoc_bool_ex(_zv, ZEND_STRL(_key), _value); -+# define ADD_INDEX_STRINGL(_zv, _ind, _value, _len) add_index_stringl(_zv, _ind, _value, _len); - # define phongo_free_object_arg zend_object - # define phongo_zpp_char_len size_t - # define ZEND_HASH_APPLY_COUNT(ht) (ht)->u.v.nApplyCount -@@ -193,6 +194,7 @@ - # define ADD_ASSOC_ZVAL(_zv, _key, _value) add_assoc_zval(_zv, _key, _value); - # define ADD_ASSOC_NULL_EX(_zv, _key) add_assoc_null_ex(_zv, ZEND_STRS(_key)); - # define ADD_ASSOC_BOOL_EX(_zv, _key, _value) add_assoc_bool_ex(_zv, ZEND_STRS(_key), _value); -+# define ADD_INDEX_STRINGL(_zv, _ind, _value, _len) add_index_stringl(_zv, _ind, _value, _len, 0); - # define Z_PHPDATE_P(object) zend_object_store_get_object(object TSRMLS_CC) - # define Z_ISUNDEF(x) !x - # define phongo_free_object_arg void Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-01-08 08:57:56 UTC (rev 155713) +++ community-x86_64/PKGBUILD 2016-01-08 08:58:09 UTC (rev 155714) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com > -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Martin Striz < ms AT martinstriz DOT cz > -# Contributor: Jarek Sedlacek <jareksedla...@gmail.com> - -pkgname=php-mongodb -pkgver=1.1.1 -pkgrel=1 -pkgdesc="MongoDB driver for PHP" -arch=("i686" "x86_64") -url="http://mongodb.github.io/mongo-php-driver" -license=("Apache") -depends=('php' 'libmongoc') -makedepends=('re2c') -backup=("etc/php/conf.d/mongodb.ini") -source=( - "http://pecl.php.net/get/mongodb-$pkgver.tgz" - "mongodb.ini" - "php7-i686.patch" -) -sha256sums=('0899b00435edf143ddc0ededd8027013c86bf59214d63ae1f3c7be0eaae11ceb' - '242b9ffea6bd84f813c7fc2a767eaa89f83577c5ff10ff36aecec2ca308ff72b' - 'cc1925bc6f6c92d13494823d354cf340c6cc1486b4e0e711af2219739ac4270b') - -prepare() { - cd mongodb-$pkgver - patch -p1 -i ../php7-i686.patch -} - -build() { - cd mongodb-$pkgver - phpize - ./configure --prefix=/usr --with-libbson --with-libmongoc -} - -package() { - cd mongodb-$pkgver - make INSTALL_ROOT="$pkgdir" install - install -Dm644 "$srcdir/mongodb.ini" "$pkgdir/etc/php/conf.d/mongodb.ini" -} Copied: php-mongodb/repos/community-x86_64/PKGBUILD (from rev 155713, php-mongodb/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-01-08 08:58:09 UTC (rev 155714) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com > +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Martin Striz < ms AT martinstriz DOT cz > +# Contributor: Jarek Sedlacek <jareksedla...@gmail.com> + +pkgname=php-mongodb +pkgver=1.1.2 +pkgrel=2 +pkgdesc="MongoDB driver for PHP" +arch=("i686" "x86_64") +url="http://mongodb.github.io/mongo-php-driver" +license=("Apache") +depends=('php' 'libmongoc') +makedepends=('re2c') +backup=("etc/php/conf.d/mongodb.ini") +install=php-mongodb.install +source=( + "http://pecl.php.net/get/mongodb-$pkgver.tgz" + "mongodb.ini" +) +sha256sums=('4cb80002dfb6be0805457ef0c9f4e91fd03c2e54baedac958ad1e498c741484d' + '242b9ffea6bd84f813c7fc2a767eaa89f83577c5ff10ff36aecec2ca308ff72b') + +build() { + cd mongodb-$pkgver + phpize + ./configure --prefix=/usr --with-libbson --with-libmongoc +} + +package() { + cd mongodb-$pkgver + make INSTALL_ROOT="$pkgdir" install + install -Dm644 "$srcdir/mongodb.ini" "$pkgdir/etc/php/conf.d/mongodb.ini" +} Deleted: community-x86_64/mongodb.ini =================================================================== --- community-x86_64/mongodb.ini 2016-01-08 08:57:56 UTC (rev 155713) +++ community-x86_64/mongodb.ini 2016-01-08 08:58:09 UTC (rev 155714) @@ -1,2 +0,0 @@ -; Tell PHP to load the MongoDB Extension on startup -extension=mongodb.so Copied: php-mongodb/repos/community-x86_64/mongodb.ini (from rev 155713, php-mongodb/trunk/mongodb.ini) =================================================================== --- community-x86_64/mongodb.ini (rev 0) +++ community-x86_64/mongodb.ini 2016-01-08 08:58:09 UTC (rev 155714) @@ -0,0 +1,2 @@ +; Tell PHP to load the MongoDB Extension on startup +extension=mongodb.so Copied: php-mongodb/repos/community-x86_64/php-mongodb.install (from rev 155713, php-mongodb/trunk/php-mongodb.install) =================================================================== --- community-x86_64/php-mongodb.install (rev 0) +++ community-x86_64/php-mongodb.install 2016-01-08 08:58:09 UTC (rev 155714) @@ -0,0 +1,12 @@ +post_install() { + warning +} + +post_upgrade() { + warning +} + +warning() { + printf "WARNING:\nWhen moving from 'php-mongo' to 'php-mongodb' keep into mind the extension's api is not compatible\n\n" + return 0 +} Deleted: community-x86_64/php7-i686.patch =================================================================== --- community-x86_64/php7-i686.patch 2016-01-08 08:57:56 UTC (rev 155713) +++ community-x86_64/php7-i686.patch 2016-01-08 08:58:09 UTC (rev 155714) @@ -1,40 +0,0 @@ -diff --git a/phongo_compat.h b/phongo_compat.h -index da4aed1..adbf21c 100644 ---- a/phongo_compat.h -+++ b/phongo_compat.h -@@ -99,7 +99,8 @@ - int tmp_len; \ - mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \ - tmp_len = spprintf(&tmp, 0, "%lld", value); \ -- add_index_stringl(zval, index, tmp, tmp_len, 0); \ -+ ADD_INDEX_STRINGL(zval, index, tmp, tmp_len); \ -+ efree(tmp); \ - } else { \ - add_index_long(zval, index, val); \ - } -@@ -109,7 +110,8 @@ - int tmp_len; \ - mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \ - tmp_len = spprintf(&tmp, 0, "%lld", value); \ -- add_assoc_stringl(zval, key, tmp, tmp_len, 0); \ -+ ADD_ASSOC_STRINGL(zval, key, tmp, tmp_len); \ -+ efree(tmp); \ - } else { \ - add_assoc_long(zval, key, value); \ - } -@@ -167,6 +167,7 @@ - # define ADD_ASSOC_ZVAL(_zv, _key, _value) add_assoc_zval(_zv, _key, _value); - # define ADD_ASSOC_NULL_EX(_zv, _key) add_assoc_null_ex(_zv, ZEND_STRL(_key)); - # define ADD_ASSOC_BOOL_EX(_zv, _key, _value) add_assoc_bool_ex(_zv, ZEND_STRL(_key), _value); -+# define ADD_INDEX_STRINGL(_zv, _ind, _value, _len) add_index_stringl(_zv, _ind, _value, _len); - # define phongo_free_object_arg zend_object - # define phongo_zpp_char_len size_t - # define ZEND_HASH_APPLY_COUNT(ht) (ht)->u.v.nApplyCount -@@ -193,6 +194,7 @@ - # define ADD_ASSOC_ZVAL(_zv, _key, _value) add_assoc_zval(_zv, _key, _value); - # define ADD_ASSOC_NULL_EX(_zv, _key) add_assoc_null_ex(_zv, ZEND_STRS(_key)); - # define ADD_ASSOC_BOOL_EX(_zv, _key, _value) add_assoc_bool_ex(_zv, ZEND_STRS(_key), _value); -+# define ADD_INDEX_STRINGL(_zv, _ind, _value, _len) add_index_stringl(_zv, _ind, _value, _len, 0); - # define Z_PHPDATE_P(object) zend_object_store_get_object(object TSRMLS_CC) - # define Z_ISUNDEF(x) !x - # define phongo_free_object_arg void