[arch-commits] Commit in lib32-curl/repos/multilib-x86_64 (6 files)
Daniel Wallace
dwallace at nymeria.archlinux.org
Mon Aug 19 01:44:53 UTC 2013
Date: Monday, August 19, 2013 @ 03:44:52
Author: dwallace
Revision: 95944
archrelease: copy trunk to multilib-x86_64
Added:
lib32-curl/repos/multilib-x86_64/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
(from rev 95943, lib32-curl/trunk/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch)
lib32-curl/repos/multilib-x86_64/PKGBUILD
(from rev 95943, lib32-curl/trunk/PKGBUILD)
lib32-curl/repos/multilib-x86_64/curlbuild.h
(from rev 95943, lib32-curl/trunk/curlbuild.h)
Deleted:
lib32-curl/repos/multilib-x86_64/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
lib32-curl/repos/multilib-x86_64/PKGBUILD
lib32-curl/repos/multilib-x86_64/curlbuild.h
-----------------------------------------------------------------+
0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch | 78 ++---
PKGBUILD | 134 +++++-----
curlbuild.h | 18 -
3 files changed, 115 insertions(+), 115 deletions(-)
Deleted: 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
===================================================================
--- 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch 2013-08-19 01:44:28 UTC (rev 95943)
+++ 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch 2013-08-19 01:44:52 UTC (rev 95944)
@@ -1,39 +0,0 @@
-From da3fc1ee91de656a30f3a12de394bcba55119872 Mon Sep 17 00:00:00 2001
-From: Linus Nielsen Feltzing <linus at haxx.se>
-Date: Sun, 10 Feb 2013 22:57:58 +0100
-Subject: [PATCH] Fix NULL pointer reference when closing an unused multi
- handle.
-
----
- lib/multi.c | 8 +++++---
- tests/data/Makefile.am | 1 +
- tests/data/test1508 | 31 +++++++++++++++++++++++++++++
- tests/libtest/Makefile.inc | 6 +++++-
- tests/libtest/lib1508.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 91 insertions(+), 4 deletions(-)
- create mode 100644 tests/data/test1508
- create mode 100644 tests/libtest/lib1508.c
-
-diff --git a/lib/multi.c b/lib/multi.c
-index fa0afb9..706df23 100644
---- a/lib/multi.c
-+++ b/lib/multi.c
-@@ -1773,10 +1773,12 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
- /* Close all the connections in the connection cache */
- close_all_connections(multi);
-
-- multi->closure_handle->dns.hostcache = multi->hostcache;
-- Curl_hostcache_clean(multi->closure_handle);
-+ if(multi->closure_handle) {
-+ multi->closure_handle->dns.hostcache = multi->hostcache;
-+ Curl_hostcache_clean(multi->closure_handle);
-
-- Curl_close(multi->closure_handle);
-+ Curl_close(multi->closure_handle);
-+ }
- multi->closure_handle = NULL;
-
- Curl_hash_destroy(multi->sockhash);
---
-1.8.1.3
-
Copied: lib32-curl/repos/multilib-x86_64/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch (from rev 95943, lib32-curl/trunk/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch)
===================================================================
--- 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch (rev 0)
+++ 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch 2013-08-19 01:44:52 UTC (rev 95944)
@@ -0,0 +1,39 @@
+From da3fc1ee91de656a30f3a12de394bcba55119872 Mon Sep 17 00:00:00 2001
+From: Linus Nielsen Feltzing <linus at haxx.se>
+Date: Sun, 10 Feb 2013 22:57:58 +0100
+Subject: [PATCH] Fix NULL pointer reference when closing an unused multi
+ handle.
+
+---
+ lib/multi.c | 8 +++++---
+ tests/data/Makefile.am | 1 +
+ tests/data/test1508 | 31 +++++++++++++++++++++++++++++
+ tests/libtest/Makefile.inc | 6 +++++-
+ tests/libtest/lib1508.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 91 insertions(+), 4 deletions(-)
+ create mode 100644 tests/data/test1508
+ create mode 100644 tests/libtest/lib1508.c
+
+diff --git a/lib/multi.c b/lib/multi.c
+index fa0afb9..706df23 100644
+--- a/lib/multi.c
++++ b/lib/multi.c
+@@ -1773,10 +1773,12 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
+ /* Close all the connections in the connection cache */
+ close_all_connections(multi);
+
+- multi->closure_handle->dns.hostcache = multi->hostcache;
+- Curl_hostcache_clean(multi->closure_handle);
++ if(multi->closure_handle) {
++ multi->closure_handle->dns.hostcache = multi->hostcache;
++ Curl_hostcache_clean(multi->closure_handle);
+
+- Curl_close(multi->closure_handle);
++ Curl_close(multi->closure_handle);
++ }
+ multi->closure_handle = NULL;
+
+ Curl_hash_destroy(multi->sockhash);
+--
+1.8.1.3
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-08-19 01:44:28 UTC (rev 95943)
+++ PKGBUILD 2013-08-19 01:44:52 UTC (rev 95944)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Daniel Wallace <danielwallace at aur.archlinux.org>
-# Contributor: 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=lib32-curl
-_pkgname=curl
-pkgver=7.31.0
-pkgrel=1
-pkgdesc="An URL retrieval utility and library (32-bit)"
-arch=('x86_64')
-url="http://curl.haxx.se"
-license=('MIT')
-depends=('lib32-libssh2' "${_pkgname}")
-options=('!libtool')
-source=("http://curl.haxx.se/download/$_pkgname-$pkgver.tar.gz"{,.asc})
-md5sums=('6f26843f7e3a2fb06e02f68a55efe8c7'
- 'SKIP')
-
-build() {
- cd "$_pkgname-$pkgver"
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- # workaround to avoid error during ./configure
-
- #CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
- #CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
-
- ./configure \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --disable-dependency-tracking \
- --disable-ldap \
- --disable-ldaps \
- --enable-ipv6 \
- --enable-manual \
- --enable-versioned-symbols \
- --enable-threaded-resolver \
- --without-libidn \
- --with-random=/dev/urandom \
- --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
- --libdir=/usr/lib32
-
- make
-}
-
-package() {
- cd "$_pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- rm -rf "${pkgdir}"/usr/{share,bin}
-
- # license
- install -d "$pkgdir/usr/share/licenses"
- ln -s "$_pkgname" "$pkgdir/usr/share/licenses/$pkgname"
-
- # devel
- find "${pkgdir}/usr/include/curl" -type f -not -name curlbuild.h -delete
- mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/$_pkgname/curlbuild-32.h"
-}
Copied: lib32-curl/repos/multilib-x86_64/PKGBUILD (from rev 95943, lib32-curl/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-08-19 01:44:52 UTC (rev 95944)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Daniel Wallace <danielwallace at aur.archlinux.org>
+# Contributor: 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=lib32-curl
+_pkgname=curl
+pkgver=7.32.0
+pkgrel=1
+pkgdesc="An URL retrieval utility and library (32-bit)"
+arch=('x86_64')
+url="http://curl.haxx.se"
+license=('MIT')
+depends=('lib32-libssh2' "${_pkgname}")
+options=('!libtool')
+source=("http://curl.haxx.se/download/$_pkgname-$pkgver.tar.gz"{,.asc})
+md5sums=('f77cf3cb59cf2bfe686b80338323fd40'
+ 'SKIP')
+
+build() {
+ cd "$_pkgname-$pkgver"
+
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ # workaround to avoid error during ./configure
+
+ #CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
+ #CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --disable-dependency-tracking \
+ --disable-ldap \
+ --disable-ldaps \
+ --enable-ipv6 \
+ --enable-manual \
+ --enable-versioned-symbols \
+ --enable-threaded-resolver \
+ --without-libidn \
+ --with-random=/dev/urandom \
+ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
+ --libdir=/usr/lib32
+
+ make
+}
+
+package() {
+ cd "$_pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ rm -rf "${pkgdir}"/usr/{share,bin}
+
+ # license
+ install -d "$pkgdir/usr/share/licenses"
+ ln -s "$_pkgname" "$pkgdir/usr/share/licenses/$pkgname"
+
+ # devel
+ find "${pkgdir}/usr/include/curl" -type f -not -name curlbuild.h -delete
+ mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/$_pkgname/curlbuild-32.h"
+}
Deleted: curlbuild.h
===================================================================
--- curlbuild.h 2013-08-19 01:44:28 UTC (rev 95943)
+++ curlbuild.h 2013-08-19 01:44:52 UTC (rev 95944)
@@ -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: lib32-curl/repos/multilib-x86_64/curlbuild.h (from rev 95943, lib32-curl/trunk/curlbuild.h)
===================================================================
--- curlbuild.h (rev 0)
+++ curlbuild.h 2013-08-19 01:44:52 UTC (rev 95944)
@@ -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