[arch-commits] Commit in tarantool/repos/community-x86_64 (5 files)

Anatol Pomozov anatolik at archlinux.org
Sat Jan 26 20:22:12 UTC 2019


    Date: Saturday, January 26, 2019 @ 20:22:06
  Author: anatolik
Revision: 428190

archrelease: copy trunk to community-x86_64

Added:
  tarantool/repos/community-x86_64/PKGBUILD
    (from rev 428189, tarantool/trunk/PKGBUILD)
  tarantool/repos/community-x86_64/tarantool.sysusers
    (from rev 428189, tarantool/trunk/tarantool.sysusers)
Deleted:
  tarantool/repos/community-x86_64/PKGBUILD
  tarantool/repos/community-x86_64/libcurl-7.62.patch
  tarantool/repos/community-x86_64/tarantool.sysusers

--------------------+
 PKGBUILD           |  180 ++++++++++++++++++++++++---------------------------
 libcurl-7.62.patch |   46 -------------
 tarantool.sysusers |    4 -
 3 files changed, 90 insertions(+), 140 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-26 20:21:26 UTC (rev 428189)
+++ PKGBUILD	2019-01-26 20:22:06 UTC (rev 428190)
@@ -1,92 +0,0 @@
-# Maintainer: Anatol Pomozov <anatol.pomozov at gmail.com>
-
-pkgname=tarantool
-_commit=9a543202c93ef903b07b293463650d78002ae866
-pkgver=2.0.4.r497
-pkgrel=4
-pkgdesc='Lua application server integrated with a database management system'
-arch=(x86_64)
-url='https://www.tarantool.org'
-license=(BSD)
-depends=(readline ncurses zlib libyaml openssl libunwind curl icu)
-makedepends=(git cmake systemd)
-checkdepends=(python2-daemon python2-gevent python2-tarantool)
-source=(git+https://github.com/tarantool/tarantool.git#commit=$_commit
-        git+https://github.com/tarantool/luajit.git#branch=tarantool-1.7
-        git+https://github.com/tarantool/libyaml.git
-        git+https://github.com/tarantool/msgpuck.git
-        git+https://github.com/rtsisyk/luafun.git
-        git+https://github.com/tarantool/test-run.git
-        git+https://github.com/tarantool/small.git
-        git+https://github.com/tarantool/zstd.git
-        git+https://github.com/tarantool/luarocks.git#branch=tarantool-1.7
-        libcurl-7.62.patch
-        tarantool.sysusers)
-sha1sums=('SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          '8308459e0d3832cbdf37b8aa678fde37ed627fce'
-          '9021b3d50e45f719f0304ab529627cac69a7a149')
-
-pkgver() {
-  cd tarantool
-  git describe | sed 's/^v//; s/-/.r/; s/-.*//'
-}
-
-prepare() {
-  cd tarantool
-
-  # https://github.com/tarantool/tarantool/commit/02da15f710
-  patch -Np1 -i ../libcurl-7.62.patch
-
-  git submodule init
-  git config -f .gitmodules 'submodule.third_party/luajit.url' "$srcdir/luajit"
-  git config -f .gitmodules 'submodule.src/lib/msgpuck.url' "$srcdir/msgpuck"
-  git config -f .gitmodules 'submodule.third_party/luafun.url' "$srcdir/luafun"
-  git config -f .gitmodules 'submodule.third_party/libyaml.url' "$srcdir/libyaml"
-  git config -f .gitmodules 'submodule.third_party/zstd.url' "$srcdir/zstd"
-  git config -f .gitmodules 'submodule.test-run.url' "$srcdir/test-run"
-  git config -f .gitmodules 'submodule.src/lib/small.url' "$srcdir/small"
-  git config -f .gitmodules 'submodule.third_party/luarocks.url' "$srcdir/luarocks"
-
-  git submodule sync
-  git submodule update
-  #sed -i -e 's/coros/lock/g' test-run/lib/connpool.py
-}
-
-build() {
-  cd tarantool
-
-  # tarantool uses git submodule, handle this
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_BINDIR=/usr/bin \
-    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DENABLE_BUNDLED_LIBYAML:BOOL=OFF \
-    -DENABLE_BACKTRACE:BOOL=ON \
-    -DWITH_SYSTEMD:BOOL=ON \
-    -DENABLE_DIST:BOOL=ON
-  make
-}
-
-check() {
-  cd tarantool/test
-  ./test-run.py --suite box || true
-}
-
-package() {
-  cd tarantool
-  make install DESTDIR="$pkgdir"
-
-  install -D -m644 $srcdir/tarantool.sysusers "$pkgdir/usr/lib/sysusers.d/tarantool.conf"
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: tarantool/repos/community-x86_64/PKGBUILD (from rev 428189, tarantool/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-01-26 20:22:06 UTC (rev 428190)
@@ -0,0 +1,88 @@
+# Maintainer: Anatol Pomozov <anatol.pomozov at gmail.com>
+
+pkgname=tarantool
+_commit=dbbd93171374323cef95e2bcde9767bca77143b2
+pkgver=2.1.1.r193
+pkgrel=1
+pkgdesc='Lua application server integrated with a database management system'
+arch=(x86_64)
+url='https://www.tarantool.org'
+license=(BSD)
+depends=(readline ncurses zlib libyaml openssl libunwind curl icu)
+makedepends=(git cmake systemd)
+checkdepends=(python2-daemon python2-gevent python2-tarantool)
+source=(git+https://github.com/tarantool/tarantool.git#commit=$_commit
+        git+https://github.com/tarantool/luajit.git#branch=tarantool-1.7
+        git+https://github.com/tarantool/libyaml.git
+        git+https://github.com/tarantool/msgpuck.git
+        git+https://github.com/rtsisyk/luafun.git
+        git+https://github.com/tarantool/test-run.git
+        git+https://github.com/tarantool/small.git
+        git+https://github.com/tarantool/zstd.git
+        git+https://github.com/tarantool/luarocks.git#branch=tarantool-1.7
+        tarantool.sysusers)
+sha1sums=('SKIP'
+          'SKIP'
+          'SKIP'
+          'SKIP'
+          'SKIP'
+          'SKIP'
+          'SKIP'
+          'SKIP'
+          'SKIP'
+          '9021b3d50e45f719f0304ab529627cac69a7a149')
+
+pkgver() {
+  cd tarantool
+  git describe | sed 's/^v//; s/-/.r/; s/-.*//'
+}
+
+prepare() {
+  cd tarantool
+
+  git submodule init
+  git config -f .gitmodules 'submodule.third_party/luajit.url' "$srcdir/luajit"
+  git config -f .gitmodules 'submodule.src/lib/msgpuck.url' "$srcdir/msgpuck"
+  git config -f .gitmodules 'submodule.third_party/luafun.url' "$srcdir/luafun"
+  git config -f .gitmodules 'submodule.third_party/libyaml.url' "$srcdir/libyaml"
+  git config -f .gitmodules 'submodule.third_party/zstd.url' "$srcdir/zstd"
+  git config -f .gitmodules 'submodule.test-run.url' "$srcdir/test-run"
+  git config -f .gitmodules 'submodule.src/lib/small.url' "$srcdir/small"
+  git config -f .gitmodules 'submodule.third_party/luarocks.url' "$srcdir/luarocks"
+
+  git submodule sync
+  git submodule update
+  #sed -i -e 's/coros/lock/g' test-run/lib/connpool.py
+}
+
+build() {
+  cd tarantool
+
+  # tarantool uses git submodule, handle this
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_BINDIR=/usr/bin \
+    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DENABLE_BUNDLED_LIBYAML:BOOL=OFF \
+    -DENABLE_BACKTRACE:BOOL=ON \
+    -DWITH_SYSTEMD:BOOL=ON \
+    -DENABLE_DIST:BOOL=ON \
+    .
+  make
+}
+
+check() {
+  cd tarantool/test
+  ./test-run.py --suite box || true
+}
+
+package() {
+  cd tarantool
+  make install DESTDIR="$pkgdir"
+
+  install -D -m644 $srcdir/tarantool.sysusers "$pkgdir/usr/lib/sysusers.d/tarantool.conf"
+  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Deleted: libcurl-7.62.patch
===================================================================
--- libcurl-7.62.patch	2019-01-26 20:21:26 UTC (rev 428189)
+++ libcurl-7.62.patch	2019-01-26 20:22:06 UTC (rev 428190)
@@ -1,46 +0,0 @@
-From 02da15f7109b8bb7921eb97a751607b9dd2885b2 Mon Sep 17 00:00:00 2001
-From: Vladimir Davydov <vdavydov.dev at gmail.com>
-Date: Thu, 1 Nov 2018 13:35:24 +0300
-Subject: [PATCH] httpc: fix compilation with libcurl >= 7.62.0
-
-Starting from libcurl 7.62.0, CURL_SSL_CACERT is defined as a macro
-alias to CURLE_PEER_FAILED_VERIFICATION, see
-
-  https://github.com/curl/curl/commit/3f3b26d6feb0667714902e836af608094235fca2
-
-This breaks compilation:
-
-  httpc.c:337:7: error: duplicate case value 'CURLE_PEER_FAILED_VERIFICATION'
-          case CURLE_PEER_FAILED_VERIFICATION:
-               ^
-  httpc.c:336:7: note: previous case defined here
-          case CURLE_SSL_CACERT:
-               ^
-  curl.h:589:26: note: expanded from macro 'CURLE_SSL_CACERT'
-  #define CURLE_SSL_CACERT CURLE_PEER_FAILED_VERIFICATION
-                           ^
-
-Fix this by using CURLE_SSL_CACERT only if libcurl version is less
-than 7.62.0.
-
-Note, we can't use CURL_AT_LEAST_VERSION to check libcurl version,
-because it isn't available in libcurl shipped with CentOS 6.
----
- src/httpc.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/httpc.c b/src/httpc.c
-index 4d48a313d8..950f8b32f6 100644
---- a/src/httpc.c
-+++ b/src/httpc.c
-@@ -333,7 +333,9 @@ httpc_execute(struct httpc_request *req, double timeout)
- 			++env->stat.http_other_responses;
- 		}
- 		break;
--	case CURLE_SSL_CACERT:
-+#if LIBCURL_VERSION_NUM < 0x073e00
-+	case CURLE_SSL_CACERT: /* deprecated in libcurl 7.62.0 */
-+#endif
- 	case CURLE_PEER_FAILED_VERIFICATION:
- 		/* 495 SSL Certificate Error (nginx non-standard) */
- 		req->status = 495;

Deleted: tarantool.sysusers
===================================================================
--- tarantool.sysusers	2019-01-26 20:21:26 UTC (rev 428189)
+++ tarantool.sysusers	2019-01-26 20:22:06 UTC (rev 428190)
@@ -1,2 +0,0 @@
-g tarantool
-u tarantool - "Tarantool Server" /var/lib/tarantool

Copied: tarantool/repos/community-x86_64/tarantool.sysusers (from rev 428189, tarantool/trunk/tarantool.sysusers)
===================================================================
--- tarantool.sysusers	                        (rev 0)
+++ tarantool.sysusers	2019-01-26 20:22:06 UTC (rev 428190)
@@ -0,0 +1,2 @@
+g tarantool
+u tarantool - "Tarantool Server" /var/lib/tarantool



More information about the arch-commits mailing list