diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
| commit | d07d53d7af1e9694d9558783841bc2df3124a90f (patch) | |
| tree | 40d68de204b29d3360efd654d3c458c9cdad3cd6 /extra/glib-networking | |
| parent | a873bdc69d24650d832933463af71dfaa96f1a8a (diff) | |
| parent | 64e290184042563a240e2d6d15c02e06703d00ee (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/obconf/PKGBUILD
community/obconf/obconf.install
community/qstardict/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
extra/cups/PKGBUILD
extra/eject/PKGBUILD
extra/emacs/PKGBUILD
extra/evilwm/PKGBUILD
extra/fbset/PKGBUILD
extra/gmpc/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gtkpod/PKGBUILD
extra/kdepim/PKGBUILD
extra/kile/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/potrace/PKGBUILD
extra/racket/PKGBUILD
extra/soundtouch/PKGBUILD
extra/wireshark/PKGBUILD
extra/xpdf/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/lib32-acl/PKGBUILD
multilib/lib32-attr/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'extra/glib-networking')
| -rw-r--r-- | extra/glib-networking/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch | 17 |
2 files changed, 26 insertions, 6 deletions
diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index c789f208b..dbc40bd10 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 124675 2011-05-23 20:43:54Z ibiru $ +# $Id: PKGBUILD 135780 2011-08-18 15:04:08Z andyrtr $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=glib-networking pkgver=2.28.7 -pkgrel=1 +pkgrel=4 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" license=('GPL2') -depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas') +depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas') makedepends=('intltool') options=('!libtool') install=glib-networking.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) -sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2 + glib-networking-2.29.9-port-gnutls3-API.patch) +sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c' + '101daf107773f84d08d7ab55a354875e2e021c3b5dd3cdc259fb544f94a8beee') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np0 -i "$srcdir/glib-networking-2.29.9-port-gnutls3-API.patch" ./configure \ - --prefix=/usr --sysconfdir=/etc \ + --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/glib-networking --disable-static make } diff --git a/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch b/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch new file mode 100644 index 000000000..19a168638 --- /dev/null +++ b/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch @@ -0,0 +1,17 @@ +Index: tls/gnutls/gtlsconnection-gnutls.c +=================================================================== +--- tls/gnutls/gtlsconnection-gnutls.c ++++ tls/gnutls/gtlsconnection-gnutls.c 2011-08-04 00:40:33.194189789 +0200 +@@ -860,9 +860,10 @@ + + if (peer_certificate) + { +- int status; ++ int verify_ret; ++ unsigned int status; + +- status = gnutls_certificate_verify_peers (gnutls->priv->session); ++ verify_ret = gnutls_certificate_verify_peers2 (gnutls->priv->session, &status); + peer_certificate_errors = g_tls_certificate_gnutls_convert_flags (status); + if (peer_certificate_errors) + { |