[arch-commits] Commit in curl/repos (10 files)

Christian Hesse eworm at archlinux.org
Thu Feb 23 21:10:21 UTC 2017


    Date: Thursday, February 23, 2017 @ 21:10:20
  Author: eworm
Revision: 289468

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  curl/repos/staging-i686/PKGBUILD
    (from rev 289467, curl/trunk/PKGBUILD)
  curl/repos/staging-i686/curlbuild.h
    (from rev 289467, curl/trunk/curlbuild.h)
  curl/repos/staging-x86_64/PKGBUILD
    (from rev 289467, curl/trunk/PKGBUILD)
  curl/repos/staging-x86_64/curlbuild.h
    (from rev 289467, curl/trunk/curlbuild.h)
Deleted:
  curl/repos/staging-i686/0001-vtls-s-SSLEAY-OPENSSL.patch
  curl/repos/staging-i686/PKGBUILD
  curl/repos/staging-i686/curlbuild.h
  curl/repos/staging-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch
  curl/repos/staging-x86_64/PKGBUILD
  curl/repos/staging-x86_64/curlbuild.h

-------------------------------------------------+
 /PKGBUILD                                       |  118 ++++++++++++++++++++++
 /curlbuild.h                                    |   18 +++
 staging-i686/0001-vtls-s-SSLEAY-OPENSSL.patch   |   39 -------
 staging-i686/PKGBUILD                           |   67 ------------
 staging-i686/curlbuild.h                        |    9 -
 staging-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch |   39 -------
 staging-x86_64/PKGBUILD                         |   67 ------------
 staging-x86_64/curlbuild.h                      |    9 -
 8 files changed, 136 insertions(+), 230 deletions(-)

Deleted: staging-i686/0001-vtls-s-SSLEAY-OPENSSL.patch
===================================================================
--- staging-i686/0001-vtls-s-SSLEAY-OPENSSL.patch	2017-02-23 21:10:15 UTC (rev 289467)
+++ staging-i686/0001-vtls-s-SSLEAY-OPENSSL.patch	2017-02-23 21:10:20 UTC (rev 289468)
@@ -1,39 +0,0 @@
-From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel at haxx.se>
-Date: Mon, 26 Dec 2016 00:06:33 +0100
-Subject: vtls: s/SSLEAY/OPENSSL
-
-Fixed an old leftover use of the USE_SSLEAY define which would make a
-socket get removed from the applications sockets to monitor when the
-multi_socket API was used, leading to timeouts.
-
-Bug: #1174
----
- lib/vtls/vtls.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
-index b808e1c..707f24b 100644
---- a/lib/vtls/vtls.c
-+++ b/lib/vtls/vtls.c
-@@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy *data)
-   curlssl_close_all(data);
- }
- 
--#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
-+#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
-     defined(USE_DARWINSSL) || defined(USE_NSS)
- /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */
- int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks,
-@@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata *conn,
-   (void)numsocks;
-   return GETSOCK_BLANK;
- }
--/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
-+/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
- #endif
- 
- void Curl_ssl_close(struct connectdata *conn, int sockindex)
--- 
-cgit v1.1
-

Deleted: staging-i686/PKGBUILD
===================================================================
--- staging-i686/PKGBUILD	2017-02-23 21:10:15 UTC (rev 289467)
+++ staging-i686/PKGBUILD	2017-02-23 21:10:20 UTC (rev 289468)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=curl
-pkgver=7.52.1
-pkgrel=3
-pkgdesc="An URL retrieval utility and library"
-arch=('i686' 'x86_64')
-url="https://curl.haxx.se"
-license=('MIT')
-depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl')
-provides=('libcurl.so')
-options=('strip' 'debug')
-source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        'curlbuild.h'
-        '0001-vtls-s-SSLEAY-OPENSSL.patch')
-sha512sums=('414c3daa2754172f6fb645b3669d15f621fd248488d88666312963275c19c70d2b0c3b3bcb8d8aa8db6d504a59cb846dd2003ec38080d06caba6dfa8eb2d52ed'
-            'SKIP'
-            '4e71366c3faaab76a6e438fcc484fb1ce16b2ae84eefa176879cf164e8fb0b04e4a355384e66a1137e9641e95041ee573553b43da98ec92820696d7256beb4f5'
-            'fb094c61e63a2de9e573c7bcf79d5af04dbaaf136eb0da84c4ddb81a233505c8f20d4761e7f518b8859e176206bd35b252476d00e45291e3e626e43e4dac4a6d')
-validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
-              '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg (old key)
-
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 -i "$srcdir/0001-vtls-s-SSLEAY-OPENSSL.patch"
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure \
-      --prefix=/usr \
-      --mandir=/usr/share/man \
-      --disable-ldap \
-      --disable-ldaps \
-      --enable-ipv6 \
-      --enable-manual \
-      --enable-versioned-symbols \
-      --enable-threaded-resolver \
-      --with-gssapi \
-      --with-random=/dev/urandom \
-      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  local wordsize=$(cpp -include 'bits/wordsize.h' <<<'__WORDSIZE' | sed '$!d')
-  local _curlbuild=curlbuild-$wordsize.h
-
-  # license
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
-  # devel
-  mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
-  install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
-}

Copied: curl/repos/staging-i686/PKGBUILD (from rev 289467, curl/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2017-02-23 21:10:20 UTC (rev 289468)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=curl
+pkgver=7.53.0
+pkgrel=2
+pkgdesc="An URL retrieval utility and library"
+arch=('i686' 'x86_64')
+url="https://curl.haxx.se"
+license=('MIT')
+depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl')
+provides=('libcurl.so')
+options=('strip' 'debug')
+source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+        'curlbuild.h')
+sha512sums=('abfcca6938adc975f5062465d0d8a1d80d89c91377eca38337fcf3b1ee11a542ab6c795938d64ae0c442b9a8a65704bd5a4b423be88dd92f7e3bb263fb86fabe'
+            'SKIP'
+            '4e71366c3faaab76a6e438fcc484fb1ce16b2ae84eefa176879cf164e8fb0b04e4a355384e66a1137e9641e95041ee573553b43da98ec92820696d7256beb4f5')
+validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
+              '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg (old key)
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+      --prefix=/usr \
+      --mandir=/usr/share/man \
+      --disable-ldap \
+      --disable-ldaps \
+      --enable-ipv6 \
+      --enable-manual \
+      --enable-versioned-symbols \
+      --enable-threaded-resolver \
+      --with-gssapi \
+      --with-random=/dev/urandom \
+      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  local wordsize=$(cpp -include 'bits/wordsize.h' <<<'__WORDSIZE' | sed '$!d')
+  local _curlbuild=curlbuild-$wordsize.h
+
+  # license
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+  # devel
+  mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
+  install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
+}

Deleted: staging-i686/curlbuild.h
===================================================================
--- staging-i686/curlbuild.h	2017-02-23 21:10:15 UTC (rev 289467)
+++ staging-i686/curlbuild.h	2017-02-23 21:10:20 UTC (rev 289468)
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "curlbuild-32.h"
-#elif __WORDSIZE == 64
-#include "curlbuild-64.h"
-#else
-#error "Unknown word size"
-#endif

Copied: curl/repos/staging-i686/curlbuild.h (from rev 289467, curl/trunk/curlbuild.h)
===================================================================
--- staging-i686/curlbuild.h	                        (rev 0)
+++ staging-i686/curlbuild.h	2017-02-23 21:10:20 UTC (rev 289468)
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "curlbuild-32.h"
+#elif __WORDSIZE == 64
+#include "curlbuild-64.h"
+#else
+#error "Unknown word size"
+#endif

Deleted: staging-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch
===================================================================
--- staging-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch	2017-02-23 21:10:15 UTC (rev 289467)
+++ staging-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch	2017-02-23 21:10:20 UTC (rev 289468)
@@ -1,39 +0,0 @@
-From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel at haxx.se>
-Date: Mon, 26 Dec 2016 00:06:33 +0100
-Subject: vtls: s/SSLEAY/OPENSSL
-
-Fixed an old leftover use of the USE_SSLEAY define which would make a
-socket get removed from the applications sockets to monitor when the
-multi_socket API was used, leading to timeouts.
-
-Bug: #1174
----
- lib/vtls/vtls.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
-index b808e1c..707f24b 100644
---- a/lib/vtls/vtls.c
-+++ b/lib/vtls/vtls.c
-@@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy *data)
-   curlssl_close_all(data);
- }
- 
--#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
-+#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
-     defined(USE_DARWINSSL) || defined(USE_NSS)
- /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */
- int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks,
-@@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata *conn,
-   (void)numsocks;
-   return GETSOCK_BLANK;
- }
--/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
-+/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
- #endif
- 
- void Curl_ssl_close(struct connectdata *conn, int sockindex)
--- 
-cgit v1.1
-

Deleted: staging-x86_64/PKGBUILD
===================================================================
--- staging-x86_64/PKGBUILD	2017-02-23 21:10:15 UTC (rev 289467)
+++ staging-x86_64/PKGBUILD	2017-02-23 21:10:20 UTC (rev 289468)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=curl
-pkgver=7.52.1
-pkgrel=3
-pkgdesc="An URL retrieval utility and library"
-arch=('i686' 'x86_64')
-url="https://curl.haxx.se"
-license=('MIT')
-depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl')
-provides=('libcurl.so')
-options=('strip' 'debug')
-source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        'curlbuild.h'
-        '0001-vtls-s-SSLEAY-OPENSSL.patch')
-sha512sums=('414c3daa2754172f6fb645b3669d15f621fd248488d88666312963275c19c70d2b0c3b3bcb8d8aa8db6d504a59cb846dd2003ec38080d06caba6dfa8eb2d52ed'
-            'SKIP'
-            '4e71366c3faaab76a6e438fcc484fb1ce16b2ae84eefa176879cf164e8fb0b04e4a355384e66a1137e9641e95041ee573553b43da98ec92820696d7256beb4f5'
-            'fb094c61e63a2de9e573c7bcf79d5af04dbaaf136eb0da84c4ddb81a233505c8f20d4761e7f518b8859e176206bd35b252476d00e45291e3e626e43e4dac4a6d')
-validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
-              '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg (old key)
-
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 -i "$srcdir/0001-vtls-s-SSLEAY-OPENSSL.patch"
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure \
-      --prefix=/usr \
-      --mandir=/usr/share/man \
-      --disable-ldap \
-      --disable-ldaps \
-      --enable-ipv6 \
-      --enable-manual \
-      --enable-versioned-symbols \
-      --enable-threaded-resolver \
-      --with-gssapi \
-      --with-random=/dev/urandom \
-      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  local wordsize=$(cpp -include 'bits/wordsize.h' <<<'__WORDSIZE' | sed '$!d')
-  local _curlbuild=curlbuild-$wordsize.h
-
-  # license
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
-  # devel
-  mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
-  install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
-}

Copied: curl/repos/staging-x86_64/PKGBUILD (from rev 289467, curl/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2017-02-23 21:10:20 UTC (rev 289468)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=curl
+pkgver=7.53.0
+pkgrel=2
+pkgdesc="An URL retrieval utility and library"
+arch=('i686' 'x86_64')
+url="https://curl.haxx.se"
+license=('MIT')
+depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl')
+provides=('libcurl.so')
+options=('strip' 'debug')
+source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+        'curlbuild.h')
+sha512sums=('abfcca6938adc975f5062465d0d8a1d80d89c91377eca38337fcf3b1ee11a542ab6c795938d64ae0c442b9a8a65704bd5a4b423be88dd92f7e3bb263fb86fabe'
+            'SKIP'
+            '4e71366c3faaab76a6e438fcc484fb1ce16b2ae84eefa176879cf164e8fb0b04e4a355384e66a1137e9641e95041ee573553b43da98ec92820696d7256beb4f5')
+validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
+              '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg (old key)
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+      --prefix=/usr \
+      --mandir=/usr/share/man \
+      --disable-ldap \
+      --disable-ldaps \
+      --enable-ipv6 \
+      --enable-manual \
+      --enable-versioned-symbols \
+      --enable-threaded-resolver \
+      --with-gssapi \
+      --with-random=/dev/urandom \
+      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  local wordsize=$(cpp -include 'bits/wordsize.h' <<<'__WORDSIZE' | sed '$!d')
+  local _curlbuild=curlbuild-$wordsize.h
+
+  # license
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+  # devel
+  mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
+  install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
+}

Deleted: staging-x86_64/curlbuild.h
===================================================================
--- staging-x86_64/curlbuild.h	2017-02-23 21:10:15 UTC (rev 289467)
+++ staging-x86_64/curlbuild.h	2017-02-23 21:10:20 UTC (rev 289468)
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "curlbuild-32.h"
-#elif __WORDSIZE == 64
-#include "curlbuild-64.h"
-#else
-#error "Unknown word size"
-#endif

Copied: curl/repos/staging-x86_64/curlbuild.h (from rev 289467, curl/trunk/curlbuild.h)
===================================================================
--- staging-x86_64/curlbuild.h	                        (rev 0)
+++ staging-x86_64/curlbuild.h	2017-02-23 21:10:20 UTC (rev 289468)
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "curlbuild-32.h"
+#elif __WORDSIZE == 64
+#include "curlbuild-64.h"
+#else
+#error "Unknown word size"
+#endif



More information about the arch-commits mailing list