diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-06 11:13:51 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-06 11:13:51 +0200 |
| commit | a86ff663185661ee304bb1f6d00d982102dd706d (patch) | |
| tree | 06520d9024b40745b94f02d0d3419386e6496863 /community/net6/build-fix.patch | |
| parent | ce32dcab8e4baa2afe51fd3b7a858a840372b0a5 (diff) | |
| parent | ffb692bf2696e7ebedd19bcd55ba253e21cb732d (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apitrace/PKGBUILD
community/mksh/PKGBUILD
community/net6/PKGBUILD
community/xapian-core/PKGBUILD
extra/garcon/PKGBUILD
extra/mesa/PKGBUILD
extra/scim/PKGBUILD
extra/virtuoso/PKGBUILD
extra/xfce4-appfinder/PKGBUILD
extra/xfce4-panel/PKGBUILD
extra/xfwm4/PKGBUILD
Diffstat (limited to 'community/net6/build-fix.patch')
| -rw-r--r-- | community/net6/build-fix.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/community/net6/build-fix.patch b/community/net6/build-fix.patch deleted file mode 100644 index cfe79afeb..000000000 --- a/community/net6/build-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -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; - - class dh_params: private net6::non_copyable - { -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(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() |