diff options
| author | Roberto Oliveira <robertoguimaraes8@gmail.com> | 2017-06-20 23:40:25 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2017-06-21 08:01:06 +0000 |
| commit | 6b899d49bd1d15c8390bd53e710da0b26a36218e (patch) | |
| tree | 51083aff9d6c43f3c31c8f83a5e2742976f31e33 /testing | |
| parent | af9d2b5afe2cc2569b8061be1708606360cf1281 (diff) | |
| download | aports-6b899d49bd1d15c8390bd53e710da0b26a36218e.tar.bz2 aports-6b899d49bd1d15c8390bd53e710da0b26a36218e.tar.xz | |
testing/wmi-client: fix build adapting it to gnutls 3.5
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/wmi-client/APKBUILD | 22 | ||||
| -rw-r--r-- | testing/wmi-client/adapt-to-gnutls-3.x.patch | 37 |
2 files changed, 42 insertions, 17 deletions
diff --git a/testing/wmi-client/APKBUILD b/testing/wmi-client/APKBUILD index 0e2c75babb..808f22a68d 100644 --- a/testing/wmi-client/APKBUILD +++ b/testing/wmi-client/APKBUILD @@ -3,7 +3,7 @@ pkgname=wmi-client _pkgname="${pkgname/-*/}" pkgver=1.3.16 -pkgrel=0 +pkgrel=1 pkgdesc="DCOM/WMI client implementation" url="https://www.orvant.com/packages" arch="all !aarch64 !ppc64le" @@ -16,7 +16,8 @@ source="https://launchpad.net/~cybersec/+archive/ubuntu/chaos-ppa-v2/+files/${_p pyinclude.patch perl-support.patch musl-header-fix.patch - gnumakefile.patch" + gnumakefile.patch + adapt-to-gnutls-3.x.patch" builddir="$srcdir/$_pkgname-$pkgver" @@ -46,24 +47,11 @@ lib() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } -md5sums="ba0ebcc3d5b25cb3690672f845ce3003 wmi_1.3.16.orig.tar.bz2 -4b5b32a46e7851ef20779f85c27971b6 openvas-wmi-1.3.14.patch -9de58f9dc808e8efc6753f8c9004fdff samba-pidl.patch -c1d6acdb9f21384ea7743da0a44712a8 pyinclude.patch -67fe2896a770bb2659bd8578393ffaa2 perl-support.patch -05914b6c0255639c8d13269bb318e547 musl-header-fix.patch -eab5bfe1731480ef97b9457769b9129f gnumakefile.patch" -sha256sums="1001e0786485ba70ec5ae94b205b182f9cda50cb305d31d12c0ca2edd4c39aff wmi_1.3.16.orig.tar.bz2 -461bb9af6f0fa55e6a010a0f2f576c479d6160f49ed7e9072009fff9ea54e458 openvas-wmi-1.3.14.patch -871af9b2a952bf8b3596ecd751dabe0bce6059e46548a211708eaee4e952382e samba-pidl.patch -4f281f6eae370a8ec91caab53c6f682d6a000d816a86625d866c886dc27bd56d pyinclude.patch -5235980b4a5f4dd45a03c4ef941c6d8bf9636bb9f68c892caba2c1b09317e666 perl-support.patch -acfad8ed9a5607227a12ac814e10697fbc8695d856ce2a75e8a9e490d68e1147 musl-header-fix.patch -dc3d4e30897954f3b90c5861258c056a5625d1609dde1663ad1709e85f69df15 gnumakefile.patch" sha512sums="cd5ccf23dff59dd599ae23b4cd8d0d68f42775b2afad8e05add04d0d4054cbb8e33655323b1d87795f23a71b6c0c0e260e38f53349c77618d2421862d172a508 wmi_1.3.16.orig.tar.bz2 af97edd7d37864cddcd02c9f66beb940058138964113f2687dc5a3d62a0b0b60524a9ba7f5ecdc8b1d4f99b2fd2805086d9953556b77e8b78891e74694735293 openvas-wmi-1.3.14.patch cc0bbeb6805bb38898ced7956ed313c6cf67c11316eb2906a353fc227d1dc538fc8ce689035fee865f42e7bd13d4f74b5f12b925399f64cb22ea110da4ae9f9a samba-pidl.patch 5d2073fe0313e92c10fdaee7fd65d2d26e1a2ac1ec70955b2009c8aaad33a4944a2a8f354d416ac346cc0c43b04b1ffe95ee012cd77ddb74a7459d67f44aec4b pyinclude.patch 74f1172cf3d5297ea9be473acf0fcdaeb3e199b9922054eea427999ab571400c1817f3734a385d9c85f4dfad3a85e57ff1970df2c023e972fb6985dec8a9dbae perl-support.patch bf85fbd199398c10e389fda03a6d791633c0ebc798af5ecfe66f9d5ec519b01bd0518e42da6cf88d8d47bce196bb1ce2a561c8a77e6fca8e99f38552b7a47459 musl-header-fix.patch -afb2713a33d73c51cf4444be53e909cfa86f930dce317d4f8047fc15ad2ec2b2f8835a8cc231cd9450ffe11439483fe095f9b48ce4426cdcfbc6db3c314c11f7 gnumakefile.patch" +afb2713a33d73c51cf4444be53e909cfa86f930dce317d4f8047fc15ad2ec2b2f8835a8cc231cd9450ffe11439483fe095f9b48ce4426cdcfbc6db3c314c11f7 gnumakefile.patch +3a370702dafeeebfbf0720063808a310f77b1eb1a48d0b7c55ebff56597f4264d934413bfa96df70b3118a8e4678eba292e22c234df700e7992b50acc2831203 adapt-to-gnutls-3.x.patch" diff --git a/testing/wmi-client/adapt-to-gnutls-3.x.patch b/testing/wmi-client/adapt-to-gnutls-3.x.patch new file mode 100644 index 0000000000..098ea95550 --- /dev/null +++ b/testing/wmi-client/adapt-to-gnutls-3.x.patch @@ -0,0 +1,37 @@ +Adapt wmi-client to gnutls 3.5. + +Changes: +* Function gnutls_transport_set_lowat() was replaced by gnutls_record_check_pending() +* Function gnutls_certificate_type_set_priority() was removed because + gnutls_set_default_priority() already set the default gnutls priority. + +For more information: https://www.gnutls.org/manual/gnutls.html + +--- wmi-1.3.16/Samba/source/lib/tls/tls.c ++++ wmi-1.3.16/Samba/source/lib/tls/tls.c +@@ -505,7 +505,7 @@ + gnutls_transport_set_ptr(tls->session, (gnutls_transport_ptr)tls); + gnutls_transport_set_pull_function(tls->session, (gnutls_pull_func)tls_pull); + gnutls_transport_set_push_function(tls->session, (gnutls_push_func)tls_push); +- gnutls_transport_set_lowat(tls->session, 0); ++ gnutls_record_check_pending(tls->session); + + tls->plain_chars = plain_chars; + if (plain_chars) { +@@ -576,7 +576,6 @@ + talloc_free(cafile); + TLSCHECK(gnutls_init(&tls->session, GNUTLS_CLIENT)); + TLSCHECK(gnutls_set_default_priority(tls->session)); +- gnutls_certificate_type_set_priority(tls->session, cert_type_priority); + TLSCHECK(gnutls_credentials_set(tls->session, GNUTLS_CRD_CERTIFICATE, tls->xcred)); + + talloc_set_destructor(tls, tls_destructor); +@@ -584,7 +583,7 @@ + gnutls_transport_set_ptr(tls->session, (gnutls_transport_ptr)tls); + gnutls_transport_set_pull_function(tls->session, (gnutls_pull_func)tls_pull); + gnutls_transport_set_push_function(tls->session, (gnutls_push_func)tls_push); +- gnutls_transport_set_lowat(tls->session, 0); ++ gnutls_record_check_pending(tls->session); + tls->tls_detect = False; + + tls->output_pending = False; |