upg man-pages python
This commit is contained in:
parent
50ac102607
commit
b81cb4bbb4
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=man-pages
|
||||
#_commit=324e1d8289644e5159d43a04945df0841c45b966 # 2022-10-09 = 6.00 release
|
||||
pkgver=6.05.01
|
||||
pkgver=6.06
|
||||
_posixver=2017-a
|
||||
pkgrel=02
|
||||
pkgdesc="Linux man pages"
|
||||
|
|
@ -49,6 +49,7 @@ package() {
|
|||
|
||||
# posix pages have a custom license
|
||||
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||
install -m644 "${srcdir}"/$pkgname-$pkgver/LICENSES/* "${pkgdir}/usr/share/licenses/${pkgname}"/
|
||||
install -m644 "${srcdir}"/$pkgname-posix-${_posixver%-*}/POSIX-COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/POSIX-COPYRIGHT"
|
||||
}
|
||||
|
||||
|
|
@ -56,16 +57,30 @@ package() {
|
|||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('GPL' 'custom')
|
||||
license=(BSD-2-Clause
|
||||
BSD-3-Clause
|
||||
BSD-4.3TAHOE
|
||||
BSD-4-Clause-UC
|
||||
GPL-1.0-or-later
|
||||
GPL-2.0-only
|
||||
GPL-2.0-or-later
|
||||
LicenseRef-Public-Domain
|
||||
LicenseRef-UltraPermissive
|
||||
Linux-man-pages-1-para
|
||||
Linux-man-pages-copyleft
|
||||
Linux-man-pages-copyleft-2-para
|
||||
Linux-man-pages-copyleft-var
|
||||
MIT
|
||||
Spencer-94)
|
||||
|
||||
validpgpkeys=(E522595B52EDA4E6BFCCCB5E856199113A35CE5E # Michael Kerrisk (Linux man-pages maintainer) <mtk.manpages@gmail.com>
|
||||
A9348594CE31283A826FBDD8D57633D441E25BB5) # Alejandro Colomar Andres <alx.manpages@gmail.com>
|
||||
|
||||
sha256sums=(b96ab6b44a688c91d1b572e52fece519e1cfd2bb4c33fe7014fc3fd1ef3f9cae # man-pages-6.05.01.tar.xz
|
||||
1e739ff2fc5db345e898e72a56ff3bafab1fa3a46ca393d0b55fb4b8872d3bbd # man-pages-6.05.01.tar.sign
|
||||
sha256sums=(bd6f89cf26d2262567dac41d2640fc3667f240cb658079530141e372c8581928 # man-pages-6.06.tar.xz
|
||||
2195ab4fc0a25a4a6a7466528965e4e60b4a56ce839b7a25474abdb1b89ef536 # man-pages-6.06.tar.sign
|
||||
ce67bb25b5048b20dad772e405a83f4bc70faf051afa289361c81f9660318bc3 # man-pages-posix-2017-a.tar.xz
|
||||
a754077b66853702059a7ae8ff520fadf42ab7484da6df991207343e8b7c5eff # man-pages-posix-2017-a.tar.sign
|
||||
3495f725670759f71460c8f44e870e2767101fe9bb87f7e7aade082ae9304e16) # sha256sums
|
||||
07f357300beb2554c2f98e55dc57437e7dbf67917792b7cd426c9ad220c28bd1) # sha256sums
|
||||
|
||||
## 9bdce2e51a14eb87f8738f33558a7646be462bde5342fefef2a81b1662a64b43 man-pages-6.05.01-02-x86_64.pkg.tar.lz
|
||||
## 50b66dd9309739732ca8b73c2eb754a14cfbffe61043a413270f630dfdab556a man-pages-6.06-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +1,33 @@
|
|||
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
|
||||
|
||||
pkgname=man-pages
|
||||
pkgver=6.05.01
|
||||
pkgver=6.06
|
||||
_posixver=2017-a
|
||||
pkgrel=2
|
||||
pkgdesc="Linux man pages"
|
||||
arch=('any')
|
||||
license=('GPL' 'custom')
|
||||
license=(BSD-2-Clause
|
||||
BSD-3-Clause
|
||||
BSD-4.3TAHOE
|
||||
BSD-4-Clause-UC
|
||||
GPL-1.0-or-later
|
||||
GPL-2.0-only
|
||||
GPL-2.0-or-later
|
||||
LicenseRef-Public-Domain
|
||||
LicenseRef-UltraPermissive
|
||||
Linux-man-pages-1-para
|
||||
Linux-man-pages-copyleft
|
||||
Linux-man-pages-copyleft-2-para
|
||||
Linux-man-pages-copyleft-var
|
||||
MIT
|
||||
Spencer-94)
|
||||
url="https://www.kernel.org/doc/man-pages/"
|
||||
makedepends=('man2html' 'git')
|
||||
# https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/
|
||||
source=(https://www.kernel.org/pub/linux/docs/man-pages/$pkgname-$pkgver.tar.{xz,sign}
|
||||
https://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/$pkgname-posix-${_posixver}.tar.{xz,sign})
|
||||
# https://www.kernel.org/pub/linux/docs/man-pages/sha256sums.asc
|
||||
sha256sums=('b96ab6b44a688c91d1b572e52fece519e1cfd2bb4c33fe7014fc3fd1ef3f9cae'
|
||||
sha256sums=('bd6f89cf26d2262567dac41d2640fc3667f240cb658079530141e372c8581928'
|
||||
'SKIP'
|
||||
'ce67bb25b5048b20dad772e405a83f4bc70faf051afa289361c81f9660318bc3'
|
||||
'SKIP')
|
||||
|
|
@ -48,5 +62,6 @@ package() {
|
|||
|
||||
# posix pages have a custom license
|
||||
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||
install -m644 "${srcdir}"/$pkgname-$pkgver/LICENSES/* "${pkgdir}/usr/share/licenses/${pkgname}"/
|
||||
install -m644 "${srcdir}"/$pkgname-posix-${_posixver%-*}/POSIX-COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/POSIX-COPYRIGHT"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
shopt -s extglob
|
||||
pkgbase=python
|
||||
pkgname=(python python-tests)
|
||||
pkgver=3.11.7
|
||||
pkgver=3.11.8
|
||||
pkgrel=01
|
||||
_pybasever=${pkgver%.*}
|
||||
pkgdesc="The Python programming language - ipv6 disabled "
|
||||
|
|
@ -17,16 +17,14 @@ depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'libxcrypt' 'openssl' 'zlib' '
|
|||
makedepends=('tk' 'sqlite' 'bluez-libs' 'mpdecimal' 'llvm' 'gdb' 'xorg-server-xvfb' 'ttf-font')
|
||||
#options=('debug') ## uncomment this to have the debug pkg produced
|
||||
source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc}
|
||||
python-expat-2.6.patch::https://github.com/python/cpython/pull/115289.patch
|
||||
EXTERNALLY-MANAGED)
|
||||
# https://github.com/python/cpython/commit/178a238f25ab8aff7689d7a09d66dc1583ecd6cb.patch)
|
||||
|
||||
prepare() {
|
||||
cd Python-${pkgver}
|
||||
|
||||
# # test fails due to unhandled warning: https://github.com/python/cpython/issues/108569
|
||||
# patch -Np1 -i ../$pkgbase-3.11.5-raw_fstring.patch
|
||||
# $pkgbase-3.11.5-raw_fstring.patch::https://github.com/python/cpython/commit/ed749be3aab081ce4e5d54e0273b96bdea02983f.patch
|
||||
|
||||
patch -Np1 -i ../python-expat-2.6.patch
|
||||
# FS#23997
|
||||
sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
|
||||
|
||||
|
|
@ -162,10 +160,11 @@ validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D' # Ned Deily (Python re
|
|||
'E3FF2839C048B25C084DEBE9B26995E310250568' # Łukasz Langa (GPG langa.pl) <lukasz@langa.pl>
|
||||
'A035C8C19219BA821ECEA86B64E628F8D684696D') # Pablo Galindo Salgado <pablogsal@gmail.com>
|
||||
|
||||
sha256sums=(18e1aa7e66ff3a58423d59ed22815a6954e53342122c45df20c96877c062b9b7 # Python-3.11.7.tar.xz
|
||||
2d741e834c68971e6b53f9afdfb29d2016b2016dcb50977a5941ee1e3f3d9496 # Python-3.11.7.tar.xz.asc
|
||||
sha256sums=(9e06008c8901924395bc1da303eac567a729ae012baa182ab39269f650383bb3 # Python-3.11.8.tar.xz
|
||||
8919230598fb4da5a0383a68ce09256df97f25c4efe717f70d197c2f786359a3 # Python-3.11.8.tar.xz.asc
|
||||
e2f9a36df0442f34b838db4f261c8be9daf18f81679f800282bf5a5f0d8a9eb7 # python-expat-2.6.patch
|
||||
c07b94bf7dcbe7be5ba0cee29971a005a5be65002cbfb59c5a8f661fa92aa82f) # EXTERNALLY-MANAGED
|
||||
|
||||
## e2a3a3514e5e0f4c1bae10fddda16fa2cb5838494f08e9bdcf9661c89e2ed939 python-3.11.7-01-x86_64.pkg.tar.lz
|
||||
## f63dc1e3383e1c1da12ff79a0e146d5f99d98c4167c7b302ad1fac9fce794ef9 python-tests-3.11.7-01-x86_64.pkg.tar.lz
|
||||
## 808a58e4157aa4cb14e868670eb5d7e7924b830f1bdd3ceaf3b385e2b0dc793f python-3.11.8-01-x86_64.pkg.tar.lz
|
||||
## 2b4addccb4eb31cb8e3e7ac7c755ec568db9c28c193fbbd7bcefe4fbc534e5f3 python-tests-3.11.8-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ shopt -s extglob
|
|||
|
||||
pkgbase=python
|
||||
pkgname=(python python-tests)
|
||||
pkgver=3.11.7
|
||||
pkgver=3.11.8
|
||||
pkgrel=1
|
||||
_pybasever=${pkgver%.*}
|
||||
pkgdesc="The Python programming language"
|
||||
|
|
@ -19,9 +19,11 @@ url="https://www.python.org/"
|
|||
depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'libxcrypt' 'openssl' 'zlib' 'tzdata')
|
||||
makedepends=('tk' 'sqlite' 'bluez-libs' 'mpdecimal' 'llvm' 'gdb' 'xorg-server-xvfb' 'ttf-font')
|
||||
source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc}
|
||||
python-expat-2.6.patch::https://github.com/python/cpython/pull/115289.patch
|
||||
EXTERNALLY-MANAGED)
|
||||
sha512sums=('11e06f2ffe1f66888cb5b4e9f607de815294d6863a77eda6ec6d7c724ef158df9f51881f4a956d4a6fa973c2fb6fd031d495e3496e9b0bb53793fb1cc8434c63'
|
||||
sha512sums=('434e727fa370def348838fd84acb69b4d309cfb03f61bf5069150164e9ca005637ac01dfbf997f445607d4e28d02c8bed0858b36589240ccadaa4c14c19f2320'
|
||||
'SKIP'
|
||||
'0868854a6b2647706a3c98443fbacf275fe31f85c7cb78301db46e395c17cac9a02512cf0db40b981eae9ffe9d9d5fc8e0a83635adb0e2545ca134d9830cd1e0'
|
||||
'62a6fbfbaeaa3ba7c54e109d9c3b7f67e73bb21986da4c1fcc5d28cca83d71e0fcae28e1fc70ee8ddce7dea8cd0b64e18d1031dae3a2eae5eaa379c53efd53a0')
|
||||
validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D' # Ned Deily (Python release signing key) <nad@python.org>
|
||||
'E3FF2839C048B25C084DEBE9B26995E310250568' # Łukasz Langa (GPG langa.pl) <lukasz@langa.pl>
|
||||
|
|
@ -29,6 +31,7 @@ validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D' # Ned Deily (Python re
|
|||
|
||||
prepare() {
|
||||
cd Python-${pkgver}
|
||||
patch -Np1 -i ../python-expat-2.6.patch
|
||||
|
||||
# FS#23997
|
||||
sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
|
||||
|
|
|
|||
|
|
@ -7,5 +7,6 @@ gdb
|
|||
xorg-server-xvfb
|
||||
ttf-liberation
|
||||
libglvnd
|
||||
graphite
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,108 @@
|
|||
From f2eebf3c38eae77765247791576b437ec25ccfe2 Mon Sep 17 00:00:00 2001
|
||||
From: Serhiy Storchaka <storchaka@gmail.com>
|
||||
Date: Sun, 11 Feb 2024 12:08:39 +0200
|
||||
Subject: [PATCH] gh-115133: Fix tests for XMLPullParser with Expat 2.6.0
|
||||
(GH-115164)
|
||||
|
||||
Feeding the parser by too small chunks defers parsing to prevent
|
||||
CVE-2023-52425. Future versions of Expat may be more reactive.
|
||||
(cherry picked from commit 4a08e7b3431cd32a0daf22a33421cd3035343dc4)
|
||||
|
||||
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
|
||||
---
|
||||
Lib/test/test_xml_etree.py | 58 ++++++++++++-------
|
||||
...-02-08-14-21-28.gh-issue-115133.ycl4ko.rst | 2 +
|
||||
2 files changed, 38 insertions(+), 22 deletions(-)
|
||||
create mode 100644 Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst
|
||||
|
||||
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
|
||||
index 267982a8233c92..fa03f381fac92a 100644
|
||||
--- a/Lib/test/test_xml_etree.py
|
||||
+++ b/Lib/test/test_xml_etree.py
|
||||
@@ -13,6 +13,7 @@
|
||||
import operator
|
||||
import os
|
||||
import pickle
|
||||
+import pyexpat
|
||||
import sys
|
||||
import textwrap
|
||||
import types
|
||||
@@ -120,6 +121,10 @@
|
||||
</foo>
|
||||
"""
|
||||
|
||||
+fails_with_expat_2_6_0 = (unittest.expectedFailure
|
||||
+ if pyexpat.version_info >= (2, 6, 0) else
|
||||
+ lambda test: test)
|
||||
+
|
||||
def checkwarnings(*filters, quiet=False):
|
||||
def decorator(test):
|
||||
def newtest(*args, **kwargs):
|
||||
@@ -1400,28 +1405,37 @@ def assert_event_tags(self, parser, expected, max_events=None):
|
||||
self.assertEqual([(action, elem.tag) for action, elem in events],
|
||||
expected)
|
||||
|
||||
- def test_simple_xml(self):
|
||||
- for chunk_size in (None, 1, 5):
|
||||
- with self.subTest(chunk_size=chunk_size):
|
||||
- parser = ET.XMLPullParser()
|
||||
- self.assert_event_tags(parser, [])
|
||||
- self._feed(parser, "<!-- comment -->\n", chunk_size)
|
||||
- self.assert_event_tags(parser, [])
|
||||
- self._feed(parser,
|
||||
- "<root>\n <element key='value'>text</element",
|
||||
- chunk_size)
|
||||
- self.assert_event_tags(parser, [])
|
||||
- self._feed(parser, ">\n", chunk_size)
|
||||
- self.assert_event_tags(parser, [('end', 'element')])
|
||||
- self._feed(parser, "<element>text</element>tail\n", chunk_size)
|
||||
- self._feed(parser, "<empty-element/>\n", chunk_size)
|
||||
- self.assert_event_tags(parser, [
|
||||
- ('end', 'element'),
|
||||
- ('end', 'empty-element'),
|
||||
- ])
|
||||
- self._feed(parser, "</root>\n", chunk_size)
|
||||
- self.assert_event_tags(parser, [('end', 'root')])
|
||||
- self.assertIsNone(parser.close())
|
||||
+ def test_simple_xml(self, chunk_size=None):
|
||||
+ parser = ET.XMLPullParser()
|
||||
+ self.assert_event_tags(parser, [])
|
||||
+ self._feed(parser, "<!-- comment -->\n", chunk_size)
|
||||
+ self.assert_event_tags(parser, [])
|
||||
+ self._feed(parser,
|
||||
+ "<root>\n <element key='value'>text</element",
|
||||
+ chunk_size)
|
||||
+ self.assert_event_tags(parser, [])
|
||||
+ self._feed(parser, ">\n", chunk_size)
|
||||
+ self.assert_event_tags(parser, [('end', 'element')])
|
||||
+ self._feed(parser, "<element>text</element>tail\n", chunk_size)
|
||||
+ self._feed(parser, "<empty-element/>\n", chunk_size)
|
||||
+ self.assert_event_tags(parser, [
|
||||
+ ('end', 'element'),
|
||||
+ ('end', 'empty-element'),
|
||||
+ ])
|
||||
+ self._feed(parser, "</root>\n", chunk_size)
|
||||
+ self.assert_event_tags(parser, [('end', 'root')])
|
||||
+ self.assertIsNone(parser.close())
|
||||
+
|
||||
+ @fails_with_expat_2_6_0
|
||||
+ def test_simple_xml_chunk_1(self):
|
||||
+ self.test_simple_xml(chunk_size=1)
|
||||
+
|
||||
+ @fails_with_expat_2_6_0
|
||||
+ def test_simple_xml_chunk_5(self):
|
||||
+ self.test_simple_xml(chunk_size=5)
|
||||
+
|
||||
+ def test_simple_xml_chunk_22(self):
|
||||
+ self.test_simple_xml(chunk_size=22)
|
||||
|
||||
def test_feed_while_iterating(self):
|
||||
parser = ET.XMLPullParser()
|
||||
diff --git a/Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst b/Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst
|
||||
new file mode 100644
|
||||
index 00000000000000..6f1015235cc25d
|
||||
--- /dev/null
|
||||
+++ b/Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst
|
||||
@@ -0,0 +1,2 @@
|
||||
+Fix tests for :class:`~xml.etree.ElementTree.XMLPullParser` with Expat
|
||||
+2.6.0.
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
|
||||
real 31m0.142s
|
||||
user 30m48.877s
|
||||
sys 1m4.399s
|
||||
real 26m36.857s
|
||||
user 26m30.969s
|
||||
sys 0m55.385s
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue