diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-24 11:07:35 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-24 11:07:35 -0300 |
| commit | 8d32e471d53634b308adf93007922a6ccbd2b830 (patch) | |
| tree | 606fdcd5508936ffdfc7cf510a16b7324c2792e2 /community/net6 | |
| parent | 4c9d76f582ae64854e30113e7f7dc621af3db820 (diff) | |
| parent | 1e1e4927b05d9b242bfe83794e3a98ab2c8f79ef (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/augeas/PKGBUILD
community/chmsee/PKGBUILD
community/cupsddk/PKGBUILD
community/optipng/PKGBUILD
community/pcb/PKGBUILD
community/taglib-rcc/PKGBUILD
community/wmctrl/PKGBUILD
extra/c-ares/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
Diffstat (limited to 'community/net6')
| -rw-r--r-- | community/net6/PKGBUILD | 9 | ||||
| -rw-r--r-- | community/net6/build-fix.patch | 29 |
2 files changed, 24 insertions, 14 deletions
diff --git a/community/net6/PKGBUILD b/community/net6/PKGBUILD index 8d38ad92a..31aa03d18 100644 --- a/community/net6/PKGBUILD +++ b/community/net6/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 54475 2011-08-18 15:08:16Z bluewind $ -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# $Id: PKGBUILD 59157 2011-11-21 12:41:35Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> @@ -15,11 +16,11 @@ options=('!libtool') source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz build-fix.patch) md5sums=('506776416d8aea2b9ea13a81f9145383' - '18ac67590d6bce0a0a4a6a21af8da429') + 'a200e6f132839782e3e5cfdf438e79d3') build() { cd ${srcdir}/$pkgname-$pkgver - patch -Rp1 <$srcdir/build-fix.patch + patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr make make DESTDIR=${pkgdir} install diff --git a/community/net6/build-fix.patch b/community/net6/build-fix.patch index 7e932bce6..cfe79afeb 100644 --- a/community/net6/build-fix.patch +++ b/community/net6/build-fix.patch @@ -1,24 +1,33 @@ -diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp net6-1.3.12/inc/encrypt.hpp ---- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp 2011-08-09 00:19:29.000000000 +0400 -+++ net6-1.3.12/inc/encrypt.hpp 2009-11-15 16:02:46.000000000 +0300 +diff -wbBur net6-1.3.12/inc/encrypt.hpp net6-1.3.12.my/inc/encrypt.hpp +--- net6-1.3.12/inc/encrypt.hpp 2009-11-15 16:02:46.000000000 +0300 ++++ net6-1.3.12.my/inc/encrypt.hpp 2011-11-21 16:39:32.000000000 +0400 @@ -34,7 +34,7 @@ typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t; typedef gnutls_transport_ptr gnutls_transport_ptr_t; typedef gnutls_dh_params gnutls_dh_params_t; --//typedef gnutls_connection_end gnutls_connection_end_t; -+typedef gnutls_connection_end gnutls_connection_end_t; +-typedef gnutls_connection_end gnutls_connection_end_t; ++//typedef gnutls_connection_end gnutls_connection_end_t; class dh_params: private net6::non_copyable { -diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp net6-1.3.12/src/encrypt.cpp ---- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp 2011-08-09 00:20:12.000000000 +0400 -+++ net6-1.3.12/src/encrypt.cpp 2009-11-15 16:02:46.000000000 +0300 +diff -wbBur net6-1.3.12/src/encrypt.cpp net6-1.3.12.my/src/encrypt.cpp +--- net6-1.3.12/src/encrypt.cpp 2009-11-15 16:02:46.000000000 +0300 ++++ net6-1.3.12.my/src/encrypt.cpp 2011-11-21 16:39:49.000000000 +0400 @@ -25,7 +25,7 @@ { const unsigned int DH_BITS = 1024; -- net6::gnutls_session_t create_session(gnutls_connection_end_t end) -+ net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end) +- net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end) ++ net6::gnutls_session_t create_session(gnutls_connection_end_t end) { net6::gnutls_session_t session; gnutls_init(&session, end); +@@ -201,8 +201,6 @@ + net6_unix_send_func + ); + #endif +- +- gnutls_transport_set_lowat(session, 0); + } + + net6::tcp_encrypted_socket_base::~tcp_encrypted_socket_base() |