Date: Sunday, July 9, 2017 @ 21:52:12 Author: jgc Revision: 299930 archrelease: copy trunk to extra-i686, extra-x86_64
Added: libxml2/repos/extra-i686/PKGBUILD (from rev 299929, libxml2/trunk/PKGBUILD) libxml2/repos/extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch (from rev 299929, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch) libxml2/repos/extra-x86_64/PKGBUILD (from rev 299929, libxml2/trunk/PKGBUILD) libxml2/repos/extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch (from rev 299929, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch) Deleted: libxml2/repos/extra-i686/PKGBUILD libxml2/repos/extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch libxml2/repos/extra-x86_64/PKGBUILD libxml2/repos/extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch -----------------------------------------------------+ /PKGBUILD | 128 +++++++++++ /libxml2-2.9.4-remove-pyverify_fd.patch | 204 ++++++++++++++++++ extra-i686/PKGBUILD | 64 ----- extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch | 102 --------- extra-x86_64/PKGBUILD | 64 ----- extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch | 102 --------- 6 files changed, 332 insertions(+), 332 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-07-09 21:51:46 UTC (rev 299929) +++ extra-i686/PKGBUILD 2017-07-09 21:52:12 UTC (rev 299930) @@ -1,64 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Maintainer: Tom Gundersen <t...@jklm.no> -# Contributor: John Proctor <jproc...@prium.net> - -pkgname=libxml2 -pkgver=2.9.4+16+g07418011 -pkgrel=2 -pkgdesc="XML parsing library, version 2" -arch=(i686 x86_64) -license=('MIT') -depends=('zlib' 'readline' 'ncurses' 'xz' 'icu') -options=(!makeflags) -makedepends=('python2' 'python' 'git') -url="http://www.xmlsoft.org/" -_commit=074180119fc90d5fd04ef9e8a5ee1910d6f9ad8e # master -source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit - https://www.w3.org/XML/Test/xmlts20080827.tar.gz - libxml2-2.9.4-remove-pyverify_fd.patch) -sha256sums=('SKIP' - '96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7' - 'c201b0d6364a7b9df58ce40a5fc506e58945a3fbb834af9c1193a35665789d60') - -pkgver() { - cd $pkgname - git describe --long | sed -e 's/-/+/g' -e 's/^v//' -} - -prepare() { - mkdir build-py3 - mkdir build-py2 - mv xmlconf build-py2/ - cd $pkgname - patch -Np1 -i ../libxml2-2.9.4-remove-pyverify_fd.patch - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd build-py2 - ../$pkgname/configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python2 --with-icu - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool - make - - cd ../build-py3 - ../$pkgname/configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python --with-icu - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool - PYTHONHASHSEED=0 make -} - -check() { - cd build-py2 - make check -} - -package() { - cd build-py2 - find doc -type f -exec chmod 0644 {} \; - - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" - - cd ../build-py3/python - PYTHONHASHSEED=0 make DESTDIR="${pkgdir}" install -} Copied: libxml2/repos/extra-i686/PKGBUILD (from rev 299929, libxml2/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-07-09 21:52:12 UTC (rev 299930) @@ -0,0 +1,64 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Maintainer: Tom Gundersen <t...@jklm.no> +# Contributor: John Proctor <jproc...@prium.net> + +pkgname=libxml2 +pkgver=2.9.4+96+gfb56f80e +pkgrel=1 +pkgdesc="XML parsing library, version 2" +arch=(i686 x86_64) +license=('MIT') +depends=('zlib' 'readline' 'ncurses' 'xz' 'icu') +options=(!makeflags) +makedepends=('python2' 'python' 'git') +url="http://www.xmlsoft.org/" +_commit=fb56f80eeffde4b79a49667c3f0727181d57aeb3 # master +source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit + https://www.w3.org/XML/Test/xmlts20080827.tar.gz + libxml2-2.9.4-remove-pyverify_fd.patch) +sha256sums=('SKIP' + '96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7' + 'c201b0d6364a7b9df58ce40a5fc506e58945a3fbb834af9c1193a35665789d60') + +pkgver() { + cd $pkgname + git describe --long | sed -e 's/-/+/g' -e 's/^v//' +} + +prepare() { + mkdir build-py3 + mkdir build-py2 + mv xmlconf build-py2/ + cd $pkgname + patch -Np1 -i ../libxml2-2.9.4-remove-pyverify_fd.patch + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd build-py2 + ../$pkgname/configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python2 --with-icu + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool + make + + cd ../build-py3 + ../$pkgname/configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python --with-icu + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool + PYTHONHASHSEED=0 make +} + +check() { + cd build-py2 + make check +} + +package() { + cd build-py2 + find doc -type f -exec chmod 0644 {} \; + + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + + cd ../build-py3/python + PYTHONHASHSEED=0 make DESTDIR="${pkgdir}" install +} Deleted: extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch =================================================================== --- extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch 2017-07-09 21:51:46 UTC (rev 299929) +++ extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch 2017-07-09 21:52:12 UTC (rev 299930) @@ -1,102 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> -<head> -<title>rpms/libxml2.git - libxml2</title> -<meta name='generator' content='cgit v0.12'/> -<meta name='robots' content='index, nofollow'/> -<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/> -<link rel='shortcut icon' href='/favicon.ico'/> -<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/rpms/libxml2.git/atom/libxml2-2.9.4-remove-pyverify_fd.patch?h=master' type='application/atom+xml'/> -<link rel='vcs-git' href='https://src.fedoraproject.org/git/rpms/libxml2.git' title='rpms/libxml2.git Git repository'/> -</head> -<body> -<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script> -<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script> - -<script> - var base = 'https://apps.fedoraproject.org/'; - var tokens = window.location.href.split('/'); - var repo = null; - if (tokens.length > 5 && tokens[4] == 'rpms' && tokens[5] != '') { - repo = tokens[5].split('.')[0]; - } - fedmenu({ - 'url': base + 'js/data.js', - 'mimeType': 'application/javascript', - 'position': 'bottom-right', - 'package': repo, - }); -</script> -<div id='cgit'><table id='header'> -<tr> -<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td> -<td class='main'><a href='/cgit/'>index</a> : <a title='rpms/libxml2.git' href='/cgit/rpms/libxml2.git/'>rpms/libxml2.git</a></td><td class='form'><form method='get' action=''> -<select name='h' onchange='this.form.submit();'> -<option value='f10'>f10</option> -<option value='f11'>f11</option> -<option value='f12'>f12</option> -<option value='f13'>f13</option> -<option value='f14'>f14</option> -<option value='f15'>f15</option> -<option value='f16'>f16</option> -<option value='f17'>f17</option> -<option value='f18'>f18</option> -<option value='f19'>f19</option> -<option value='f20'>f20</option> -<option value='f21'>f21</option> -<option value='f22'>f22</option> -<option value='f23'>f23</option> -<option value='f24'>f24</option> -<option value='f25'>f25</option> -<option value='f7'>f7</option> -<option value='f8'>f8</option> -<option value='f9'>f9</option> -<option value='master' selected='selected'>master</option> -</select> <input type='submit' name='' value='switch'/></form></td></tr> -<tr><td class='sub'>libxml2</td><td class='sub right'>Jesse Keating</td></tr></table> -<table class='tabs'><tr><td> -<a href='/cgit/rpms/libxml2.git/'>summary</a><a href='/cgit/rpms/libxml2.git/refs/'>refs</a><a href='/cgit/rpms/libxml2.git/log/libxml2-2.9.4-remove-pyverify_fd.patch'>log</a><a class='active' href='/cgit/rpms/libxml2.git/tree/libxml2-2.9.4-remove-pyverify_fd.patch'>tree</a><a href='/cgit/rpms/libxml2.git/commit/libxml2-2.9.4-remove-pyverify_fd.patch'>commit</a><a href='/cgit/rpms/libxml2.git/diff/libxml2-2.9.4-remove-pyverify_fd.patch'>diff</a><a href='/cgit/rpms/libxml2.git/stats/libxml2-2.9.4-remove-pyverify_fd.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/rpms/libxml2.git/log/libxml2-2.9.4-remove-pyverify_fd.patch'> -<select name='qt'> -<option value='grep'>log msg</option> -<option value='author'>author</option> -<option value='committer'>committer</option> -<option value='range'>range</option> -</select> -<input class='txt' type='text' size='10' name='q' value=''/> -<input type='submit' value='search'/> -</form> -</td></tr></table> -<div class='path'>path: <a href='/cgit/rpms/libxml2.git/tree/'>root</a>/<a href='/cgit/rpms/libxml2.git/tree/libxml2-2.9.4-remove-pyverify_fd.patch'>libxml2-2.9.4-remove-pyverify_fd.patch</a></div><div class='content'>blob: d05d4cb60f3af1503d3c308c3e131e0f483abc92 (<a href='/cgit/rpms/libxml2.git/plain/libxml2-2.9.4-remove-pyverify_fd.patch'>plain</a>) -<table summary='blob content' class='blob'> -<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> -<a id='n2' href='#n2'>2</a> -<a id='n3' href='#n3'>3</a> -<a id='n4' href='#n4'>4</a> -<a id='n5' href='#n5'>5</a> -<a id='n6' href='#n6'>6</a> -<a id='n7' href='#n7'>7</a> -<a id='n8' href='#n8'>8</a> -<a id='n9' href='#n9'>9</a> -<a id='n10' href='#n10'>10</a> -<a id='n11' href='#n11'>11</a> -<a id='n12' href='#n12'>12</a> -</pre></td> -<td class='lines'><pre><code>diff -Nur libxml2-2.9.4.orig/python/types.c libxml2-2.9.4/python/types.c ---- libxml2-2.9.4.orig/python/types.c 2016-02-09 03:17:33.000000000 -0700 -+++ libxml2-2.9.4/python/types.c 2016-12-21 12:34:06.755650986 -0700 -@@ -31,8 +31,6 @@ - const char *mode; - - fd = PyObject_AsFileDescriptor(f); -- if (!_PyVerify_fd(fd)) -- return(NULL); - /* - * Get the flags on the fd to understand how it was opened - */ -</code></pre></td></tr></table> -</div> <!-- class=content --> -<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v0.12</a> at 2017-01-23 15:15:48 (GMT)</div> -</div> <!-- id=cgit --> -</body> -</html> Copied: libxml2/repos/extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch (from rev 299929, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch) =================================================================== --- extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch (rev 0) +++ extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch 2017-07-09 21:52:12 UTC (rev 299930) @@ -0,0 +1,102 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> +<head> +<title>rpms/libxml2.git - libxml2</title> +<meta name='generator' content='cgit v0.12'/> +<meta name='robots' content='index, nofollow'/> +<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/> +<link rel='shortcut icon' href='/favicon.ico'/> +<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/rpms/libxml2.git/atom/libxml2-2.9.4-remove-pyverify_fd.patch?h=master' type='application/atom+xml'/> +<link rel='vcs-git' href='https://src.fedoraproject.org/git/rpms/libxml2.git' title='rpms/libxml2.git Git repository'/> +</head> +<body> +<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script> +<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script> + +<script> + var base = 'https://apps.fedoraproject.org/'; + var tokens = window.location.href.split('/'); + var repo = null; + if (tokens.length > 5 && tokens[4] == 'rpms' && tokens[5] != '') { + repo = tokens[5].split('.')[0]; + } + fedmenu({ + 'url': base + 'js/data.js', + 'mimeType': 'application/javascript', + 'position': 'bottom-right', + 'package': repo, + }); +</script> +<div id='cgit'><table id='header'> +<tr> +<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td> +<td class='main'><a href='/cgit/'>index</a> : <a title='rpms/libxml2.git' href='/cgit/rpms/libxml2.git/'>rpms/libxml2.git</a></td><td class='form'><form method='get' action=''> +<select name='h' onchange='this.form.submit();'> +<option value='f10'>f10</option> +<option value='f11'>f11</option> +<option value='f12'>f12</option> +<option value='f13'>f13</option> +<option value='f14'>f14</option> +<option value='f15'>f15</option> +<option value='f16'>f16</option> +<option value='f17'>f17</option> +<option value='f18'>f18</option> +<option value='f19'>f19</option> +<option value='f20'>f20</option> +<option value='f21'>f21</option> +<option value='f22'>f22</option> +<option value='f23'>f23</option> +<option value='f24'>f24</option> +<option value='f25'>f25</option> +<option value='f7'>f7</option> +<option value='f8'>f8</option> +<option value='f9'>f9</option> +<option value='master' selected='selected'>master</option> +</select> <input type='submit' name='' value='switch'/></form></td></tr> +<tr><td class='sub'>libxml2</td><td class='sub right'>Jesse Keating</td></tr></table> +<table class='tabs'><tr><td> +<a href='/cgit/rpms/libxml2.git/'>summary</a><a href='/cgit/rpms/libxml2.git/refs/'>refs</a><a href='/cgit/rpms/libxml2.git/log/libxml2-2.9.4-remove-pyverify_fd.patch'>log</a><a class='active' href='/cgit/rpms/libxml2.git/tree/libxml2-2.9.4-remove-pyverify_fd.patch'>tree</a><a href='/cgit/rpms/libxml2.git/commit/libxml2-2.9.4-remove-pyverify_fd.patch'>commit</a><a href='/cgit/rpms/libxml2.git/diff/libxml2-2.9.4-remove-pyverify_fd.patch'>diff</a><a href='/cgit/rpms/libxml2.git/stats/libxml2-2.9.4-remove-pyverify_fd.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/rpms/libxml2.git/log/libxml2-2.9.4-remove-pyverify_fd.patch'> +<select name='qt'> +<option value='grep'>log msg</option> +<option value='author'>author</option> +<option value='committer'>committer</option> +<option value='range'>range</option> +</select> +<input class='txt' type='text' size='10' name='q' value=''/> +<input type='submit' value='search'/> +</form> +</td></tr></table> +<div class='path'>path: <a href='/cgit/rpms/libxml2.git/tree/'>root</a>/<a href='/cgit/rpms/libxml2.git/tree/libxml2-2.9.4-remove-pyverify_fd.patch'>libxml2-2.9.4-remove-pyverify_fd.patch</a></div><div class='content'>blob: d05d4cb60f3af1503d3c308c3e131e0f483abc92 (<a href='/cgit/rpms/libxml2.git/plain/libxml2-2.9.4-remove-pyverify_fd.patch'>plain</a>) +<table summary='blob content' class='blob'> +<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> +<a id='n2' href='#n2'>2</a> +<a id='n3' href='#n3'>3</a> +<a id='n4' href='#n4'>4</a> +<a id='n5' href='#n5'>5</a> +<a id='n6' href='#n6'>6</a> +<a id='n7' href='#n7'>7</a> +<a id='n8' href='#n8'>8</a> +<a id='n9' href='#n9'>9</a> +<a id='n10' href='#n10'>10</a> +<a id='n11' href='#n11'>11</a> +<a id='n12' href='#n12'>12</a> +</pre></td> +<td class='lines'><pre><code>diff -Nur libxml2-2.9.4.orig/python/types.c libxml2-2.9.4/python/types.c +--- libxml2-2.9.4.orig/python/types.c 2016-02-09 03:17:33.000000000 -0700 ++++ libxml2-2.9.4/python/types.c 2016-12-21 12:34:06.755650986 -0700 +@@ -31,8 +31,6 @@ + const char *mode; + + fd = PyObject_AsFileDescriptor(f); +- if (!_PyVerify_fd(fd)) +- return(NULL); + /* + * Get the flags on the fd to understand how it was opened + */ +</code></pre></td></tr></table> +</div> <!-- class=content --> +<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v0.12</a> at 2017-01-23 15:15:48 (GMT)</div> +</div> <!-- id=cgit --> +</body> +</html> Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2017-07-09 21:51:46 UTC (rev 299929) +++ extra-x86_64/PKGBUILD 2017-07-09 21:52:12 UTC (rev 299930) @@ -1,64 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Maintainer: Tom Gundersen <t...@jklm.no> -# Contributor: John Proctor <jproc...@prium.net> - -pkgname=libxml2 -pkgver=2.9.4+16+g07418011 -pkgrel=2 -pkgdesc="XML parsing library, version 2" -arch=(i686 x86_64) -license=('MIT') -depends=('zlib' 'readline' 'ncurses' 'xz' 'icu') -options=(!makeflags) -makedepends=('python2' 'python' 'git') -url="http://www.xmlsoft.org/" -_commit=074180119fc90d5fd04ef9e8a5ee1910d6f9ad8e # master -source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit - https://www.w3.org/XML/Test/xmlts20080827.tar.gz - libxml2-2.9.4-remove-pyverify_fd.patch) -sha256sums=('SKIP' - '96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7' - 'c201b0d6364a7b9df58ce40a5fc506e58945a3fbb834af9c1193a35665789d60') - -pkgver() { - cd $pkgname - git describe --long | sed -e 's/-/+/g' -e 's/^v//' -} - -prepare() { - mkdir build-py3 - mkdir build-py2 - mv xmlconf build-py2/ - cd $pkgname - patch -Np1 -i ../libxml2-2.9.4-remove-pyverify_fd.patch - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd build-py2 - ../$pkgname/configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python2 --with-icu - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool - make - - cd ../build-py3 - ../$pkgname/configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python --with-icu - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool - PYTHONHASHSEED=0 make -} - -check() { - cd build-py2 - make check -} - -package() { - cd build-py2 - find doc -type f -exec chmod 0644 {} \; - - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" - - cd ../build-py3/python - PYTHONHASHSEED=0 make DESTDIR="${pkgdir}" install -} Copied: libxml2/repos/extra-x86_64/PKGBUILD (from rev 299929, libxml2/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-07-09 21:52:12 UTC (rev 299930) @@ -0,0 +1,64 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Maintainer: Tom Gundersen <t...@jklm.no> +# Contributor: John Proctor <jproc...@prium.net> + +pkgname=libxml2 +pkgver=2.9.4+96+gfb56f80e +pkgrel=1 +pkgdesc="XML parsing library, version 2" +arch=(i686 x86_64) +license=('MIT') +depends=('zlib' 'readline' 'ncurses' 'xz' 'icu') +options=(!makeflags) +makedepends=('python2' 'python' 'git') +url="http://www.xmlsoft.org/" +_commit=fb56f80eeffde4b79a49667c3f0727181d57aeb3 # master +source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit + https://www.w3.org/XML/Test/xmlts20080827.tar.gz + libxml2-2.9.4-remove-pyverify_fd.patch) +sha256sums=('SKIP' + '96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7' + 'c201b0d6364a7b9df58ce40a5fc506e58945a3fbb834af9c1193a35665789d60') + +pkgver() { + cd $pkgname + git describe --long | sed -e 's/-/+/g' -e 's/^v//' +} + +prepare() { + mkdir build-py3 + mkdir build-py2 + mv xmlconf build-py2/ + cd $pkgname + patch -Np1 -i ../libxml2-2.9.4-remove-pyverify_fd.patch + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd build-py2 + ../$pkgname/configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python2 --with-icu + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool + make + + cd ../build-py3 + ../$pkgname/configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python --with-icu + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool + PYTHONHASHSEED=0 make +} + +check() { + cd build-py2 + make check +} + +package() { + cd build-py2 + find doc -type f -exec chmod 0644 {} \; + + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + + cd ../build-py3/python + PYTHONHASHSEED=0 make DESTDIR="${pkgdir}" install +} Deleted: extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch =================================================================== --- extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch 2017-07-09 21:51:46 UTC (rev 299929) +++ extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch 2017-07-09 21:52:12 UTC (rev 299930) @@ -1,102 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> -<head> -<title>rpms/libxml2.git - libxml2</title> -<meta name='generator' content='cgit v0.12'/> -<meta name='robots' content='index, nofollow'/> -<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/> -<link rel='shortcut icon' href='/favicon.ico'/> -<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/rpms/libxml2.git/atom/libxml2-2.9.4-remove-pyverify_fd.patch?h=master' type='application/atom+xml'/> -<link rel='vcs-git' href='https://src.fedoraproject.org/git/rpms/libxml2.git' title='rpms/libxml2.git Git repository'/> -</head> -<body> -<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script> -<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script> - -<script> - var base = 'https://apps.fedoraproject.org/'; - var tokens = window.location.href.split('/'); - var repo = null; - if (tokens.length > 5 && tokens[4] == 'rpms' && tokens[5] != '') { - repo = tokens[5].split('.')[0]; - } - fedmenu({ - 'url': base + 'js/data.js', - 'mimeType': 'application/javascript', - 'position': 'bottom-right', - 'package': repo, - }); -</script> -<div id='cgit'><table id='header'> -<tr> -<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td> -<td class='main'><a href='/cgit/'>index</a> : <a title='rpms/libxml2.git' href='/cgit/rpms/libxml2.git/'>rpms/libxml2.git</a></td><td class='form'><form method='get' action=''> -<select name='h' onchange='this.form.submit();'> -<option value='f10'>f10</option> -<option value='f11'>f11</option> -<option value='f12'>f12</option> -<option value='f13'>f13</option> -<option value='f14'>f14</option> -<option value='f15'>f15</option> -<option value='f16'>f16</option> -<option value='f17'>f17</option> -<option value='f18'>f18</option> -<option value='f19'>f19</option> -<option value='f20'>f20</option> -<option value='f21'>f21</option> -<option value='f22'>f22</option> -<option value='f23'>f23</option> -<option value='f24'>f24</option> -<option value='f25'>f25</option> -<option value='f7'>f7</option> -<option value='f8'>f8</option> -<option value='f9'>f9</option> -<option value='master' selected='selected'>master</option> -</select> <input type='submit' name='' value='switch'/></form></td></tr> -<tr><td class='sub'>libxml2</td><td class='sub right'>Jesse Keating</td></tr></table> -<table class='tabs'><tr><td> -<a href='/cgit/rpms/libxml2.git/'>summary</a><a href='/cgit/rpms/libxml2.git/refs/'>refs</a><a href='/cgit/rpms/libxml2.git/log/libxml2-2.9.4-remove-pyverify_fd.patch'>log</a><a class='active' href='/cgit/rpms/libxml2.git/tree/libxml2-2.9.4-remove-pyverify_fd.patch'>tree</a><a href='/cgit/rpms/libxml2.git/commit/libxml2-2.9.4-remove-pyverify_fd.patch'>commit</a><a href='/cgit/rpms/libxml2.git/diff/libxml2-2.9.4-remove-pyverify_fd.patch'>diff</a><a href='/cgit/rpms/libxml2.git/stats/libxml2-2.9.4-remove-pyverify_fd.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/rpms/libxml2.git/log/libxml2-2.9.4-remove-pyverify_fd.patch'> -<select name='qt'> -<option value='grep'>log msg</option> -<option value='author'>author</option> -<option value='committer'>committer</option> -<option value='range'>range</option> -</select> -<input class='txt' type='text' size='10' name='q' value=''/> -<input type='submit' value='search'/> -</form> -</td></tr></table> -<div class='path'>path: <a href='/cgit/rpms/libxml2.git/tree/'>root</a>/<a href='/cgit/rpms/libxml2.git/tree/libxml2-2.9.4-remove-pyverify_fd.patch'>libxml2-2.9.4-remove-pyverify_fd.patch</a></div><div class='content'>blob: d05d4cb60f3af1503d3c308c3e131e0f483abc92 (<a href='/cgit/rpms/libxml2.git/plain/libxml2-2.9.4-remove-pyverify_fd.patch'>plain</a>) -<table summary='blob content' class='blob'> -<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> -<a id='n2' href='#n2'>2</a> -<a id='n3' href='#n3'>3</a> -<a id='n4' href='#n4'>4</a> -<a id='n5' href='#n5'>5</a> -<a id='n6' href='#n6'>6</a> -<a id='n7' href='#n7'>7</a> -<a id='n8' href='#n8'>8</a> -<a id='n9' href='#n9'>9</a> -<a id='n10' href='#n10'>10</a> -<a id='n11' href='#n11'>11</a> -<a id='n12' href='#n12'>12</a> -</pre></td> -<td class='lines'><pre><code>diff -Nur libxml2-2.9.4.orig/python/types.c libxml2-2.9.4/python/types.c ---- libxml2-2.9.4.orig/python/types.c 2016-02-09 03:17:33.000000000 -0700 -+++ libxml2-2.9.4/python/types.c 2016-12-21 12:34:06.755650986 -0700 -@@ -31,8 +31,6 @@ - const char *mode; - - fd = PyObject_AsFileDescriptor(f); -- if (!_PyVerify_fd(fd)) -- return(NULL); - /* - * Get the flags on the fd to understand how it was opened - */ -</code></pre></td></tr></table> -</div> <!-- class=content --> -<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v0.12</a> at 2017-01-23 15:15:48 (GMT)</div> -</div> <!-- id=cgit --> -</body> -</html> Copied: libxml2/repos/extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch (from rev 299929, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch) =================================================================== --- extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch (rev 0) +++ extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch 2017-07-09 21:52:12 UTC (rev 299930) @@ -0,0 +1,102 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> +<head> +<title>rpms/libxml2.git - libxml2</title> +<meta name='generator' content='cgit v0.12'/> +<meta name='robots' content='index, nofollow'/> +<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/> +<link rel='shortcut icon' href='/favicon.ico'/> +<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/rpms/libxml2.git/atom/libxml2-2.9.4-remove-pyverify_fd.patch?h=master' type='application/atom+xml'/> +<link rel='vcs-git' href='https://src.fedoraproject.org/git/rpms/libxml2.git' title='rpms/libxml2.git Git repository'/> +</head> +<body> +<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script> +<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script> + +<script> + var base = 'https://apps.fedoraproject.org/'; + var tokens = window.location.href.split('/'); + var repo = null; + if (tokens.length > 5 && tokens[4] == 'rpms' && tokens[5] != '') { + repo = tokens[5].split('.')[0]; + } + fedmenu({ + 'url': base + 'js/data.js', + 'mimeType': 'application/javascript', + 'position': 'bottom-right', + 'package': repo, + }); +</script> +<div id='cgit'><table id='header'> +<tr> +<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td> +<td class='main'><a href='/cgit/'>index</a> : <a title='rpms/libxml2.git' href='/cgit/rpms/libxml2.git/'>rpms/libxml2.git</a></td><td class='form'><form method='get' action=''> +<select name='h' onchange='this.form.submit();'> +<option value='f10'>f10</option> +<option value='f11'>f11</option> +<option value='f12'>f12</option> +<option value='f13'>f13</option> +<option value='f14'>f14</option> +<option value='f15'>f15</option> +<option value='f16'>f16</option> +<option value='f17'>f17</option> +<option value='f18'>f18</option> +<option value='f19'>f19</option> +<option value='f20'>f20</option> +<option value='f21'>f21</option> +<option value='f22'>f22</option> +<option value='f23'>f23</option> +<option value='f24'>f24</option> +<option value='f25'>f25</option> +<option value='f7'>f7</option> +<option value='f8'>f8</option> +<option value='f9'>f9</option> +<option value='master' selected='selected'>master</option> +</select> <input type='submit' name='' value='switch'/></form></td></tr> +<tr><td class='sub'>libxml2</td><td class='sub right'>Jesse Keating</td></tr></table> +<table class='tabs'><tr><td> +<a href='/cgit/rpms/libxml2.git/'>summary</a><a href='/cgit/rpms/libxml2.git/refs/'>refs</a><a href='/cgit/rpms/libxml2.git/log/libxml2-2.9.4-remove-pyverify_fd.patch'>log</a><a class='active' href='/cgit/rpms/libxml2.git/tree/libxml2-2.9.4-remove-pyverify_fd.patch'>tree</a><a href='/cgit/rpms/libxml2.git/commit/libxml2-2.9.4-remove-pyverify_fd.patch'>commit</a><a href='/cgit/rpms/libxml2.git/diff/libxml2-2.9.4-remove-pyverify_fd.patch'>diff</a><a href='/cgit/rpms/libxml2.git/stats/libxml2-2.9.4-remove-pyverify_fd.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/rpms/libxml2.git/log/libxml2-2.9.4-remove-pyverify_fd.patch'> +<select name='qt'> +<option value='grep'>log msg</option> +<option value='author'>author</option> +<option value='committer'>committer</option> +<option value='range'>range</option> +</select> +<input class='txt' type='text' size='10' name='q' value=''/> +<input type='submit' value='search'/> +</form> +</td></tr></table> +<div class='path'>path: <a href='/cgit/rpms/libxml2.git/tree/'>root</a>/<a href='/cgit/rpms/libxml2.git/tree/libxml2-2.9.4-remove-pyverify_fd.patch'>libxml2-2.9.4-remove-pyverify_fd.patch</a></div><div class='content'>blob: d05d4cb60f3af1503d3c308c3e131e0f483abc92 (<a href='/cgit/rpms/libxml2.git/plain/libxml2-2.9.4-remove-pyverify_fd.patch'>plain</a>) +<table summary='blob content' class='blob'> +<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> +<a id='n2' href='#n2'>2</a> +<a id='n3' href='#n3'>3</a> +<a id='n4' href='#n4'>4</a> +<a id='n5' href='#n5'>5</a> +<a id='n6' href='#n6'>6</a> +<a id='n7' href='#n7'>7</a> +<a id='n8' href='#n8'>8</a> +<a id='n9' href='#n9'>9</a> +<a id='n10' href='#n10'>10</a> +<a id='n11' href='#n11'>11</a> +<a id='n12' href='#n12'>12</a> +</pre></td> +<td class='lines'><pre><code>diff -Nur libxml2-2.9.4.orig/python/types.c libxml2-2.9.4/python/types.c +--- libxml2-2.9.4.orig/python/types.c 2016-02-09 03:17:33.000000000 -0700 ++++ libxml2-2.9.4/python/types.c 2016-12-21 12:34:06.755650986 -0700 +@@ -31,8 +31,6 @@ + const char *mode; + + fd = PyObject_AsFileDescriptor(f); +- if (!_PyVerify_fd(fd)) +- return(NULL); + /* + * Get the flags on the fd to understand how it was opened + */ +</code></pre></td></tr></table> +</div> <!-- class=content --> +<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v0.12</a> at 2017-01-23 15:15:48 (GMT)</div> +</div> <!-- id=cgit --> +</body> +</html>