From bdc9b55c978e3939e16252e66e83950cbecbf77c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Jan 2023 05:54:04 +0000 Subject: gentoo auto-resync : 15:01:2023 - 05:54:04 --- dev-util/Manifest.gz | Bin 68403 -> 68404 bytes dev-util/diffoscope/Manifest | 7 +- dev-util/diffoscope/diffoscope-230.ebuild | 120 ------------- dev-util/diffoscope/diffoscope-231-r1.ebuild | 124 -------------- dev-util/diffoscope/diffoscope-232.ebuild | 120 +++++++++++++ .../diffoscope/files/diffoscope-231-pypdf.patch | 190 --------------------- dev-util/schroot/Manifest | 3 +- .../files/schroot-1.6.13-resize-reserve.patch | 103 +++++++++++ dev-util/schroot/schroot-1.6.13_p2-r1.ebuild | 155 +++++++++++++++++ dev-util/schroot/schroot-1.6.13_p2.ebuild | 152 ----------------- 10 files changed, 382 insertions(+), 592 deletions(-) delete mode 100644 dev-util/diffoscope/diffoscope-230.ebuild delete mode 100644 dev-util/diffoscope/diffoscope-231-r1.ebuild create mode 100644 dev-util/diffoscope/diffoscope-232.ebuild delete mode 100644 dev-util/diffoscope/files/diffoscope-231-pypdf.patch create mode 100644 dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch create mode 100644 dev-util/schroot/schroot-1.6.13_p2-r1.ebuild delete mode 100644 dev-util/schroot/schroot-1.6.13_p2.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 587571028344..0734100b379b 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest index 536dc60ad89c..f84c183384df 100644 --- a/dev-util/diffoscope/Manifest +++ b/dev-util/diffoscope/Manifest @@ -1,8 +1,5 @@ -AUX diffoscope-231-pypdf.patch 5947 BLAKE2B 98ccfdcb3d7d62e34eac7dd59ba455996c7621f8a9ef3023c90969a42d69c3589af4db2d571e6c2d063cf44dc97f95d2872f8095b4b56e75d5350bf2e1b6e4ea SHA512 37cdcc4ecd7788f39e26f7e0581f81642ea2dd77560ff8423914f9f41e4cb121b5175a0fb660c93fb483dc94215eebcb3f22e5ab6398a3dd29158af128c4d074 DIST diffoscope-229.tar.gz 3164192 BLAKE2B bee9fa1561ddcfde98cfa44cd6d66a28c636dbc7f3ec1f4895e91dfd3b66c039b68d53be0528b94c112552069886c3c81de4d9b9bc9038d183afdc9fdde6ddb9 SHA512 825c9c33f3088ba082ea3b998594445987558ee62b8b1fbfcded9b72a739faaa73908f8753b8772b3b1a8a43dbcfd52978265a18bdd92605defcd174884ccb23 -DIST diffoscope-230.tar.gz 3164600 BLAKE2B f5ad44ff36d07fc5724895e661e0946b292146d004e97159fef1cb58ff38669702a3990740e4ea34300a9b48aeb10263aeb6bb332da3ec987c355ed5b910fedd SHA512 e025e5f95ae2fb9de466b886c58a44f64e0f654fb049bf9f035209fe7ca1fd0ccc14a382b17085c13bc9f2be0d368482d57a071a577cb87628ae7eb0060158ad -DIST diffoscope-231.tar.gz 3164686 BLAKE2B 5fe1546f63a047def4d1c9acc94360085be87460de1c106381532d937d1ad16be64749b9021caa7980a61a0dfd822ed7163e0f52bb0cab0520962b84bb184650 SHA512 544510de0790fc8f0c62030bc557f923bad6d5c39b7364e9944ebcf9bc5c1ecf2b9ecc91cf9142e54a23b1f004f53e96ed5b6f2f4637fa76cebd2ed7d0e4721d +DIST diffoscope-232.tar.gz 3164825 BLAKE2B a65ff66881cf67cdfd32eb1e14bf654c152447799415f686d774f30f7d3ec61b5de8f1caf4b3551312be7f2ab93187ea145b6bf96c7790cc3792221d621cdeb3 SHA512 7b8ae407e4e1b3c5085fa26f9477b75e3918a99b2d60498a7d939f06a3018bc5f6ca417d041a39dc769ef897a189c0dfdf6d35851b945c3e28b16f290bddb630 EBUILD diffoscope-229.ebuild 3567 BLAKE2B f072f377fa06316742810be8de7ef0d24f94448e2a0626aba507b5af54ab8915833aa4ebde7668c3cac05437a9db198e4849ae7558f0413a2a72856bca8ede89 SHA512 963c4d3a4ca14b360a8f062eacbdf82f1c30d59f4a0bd47eba11761007fe1e5227a15635a66d9e75150c72aa14da0d7782bcc64987feecc01f32d614998f150f -EBUILD diffoscope-230.ebuild 3569 BLAKE2B 343395758faca6878ecd1f1036f58ab0dd2dbd95eb75f5db542405ad72dabc31d0e61a3e586db2f9be6244c5141b9133ac3a66348a913092a4f75005fa85548d SHA512 7ef0004c568a590b146484f46a6242a4d1ca2c107476ecedce8731e118c1bc2709526ae8f0902b06278dbb95a7f94ba0e5456fb681ef476ce9e934ebf6301c18 -EBUILD diffoscope-231-r1.ebuild 3618 BLAKE2B eba8221d51067117d2a3e2e9c4759db7053afbfe6a398a3b36fc8d75c10c7f74dd87a712aeb761cf7316b97bcdb37d1bdfd44e9da9e5567caaa70787b3e4a7c2 SHA512 8a8d1a405e059dab75037379d2347989d82a80c52c05e7751ac64c3562b137e634ac438a7cb2d855cfff25e6e18ba673c7b0766a6546ab55e37d0a9953d6bf25 +EBUILD diffoscope-232.ebuild 3568 BLAKE2B 992460e5ac2d0f8d781d3fc45ee55e915c7223d75297a3dc6f70577d0ab5d3165492da4ef2ff03ed8ed20af712eab4b3bac122acfa143c34c10d738bd6e4b831 SHA512 c209475acf363cecc9be96f5fe437e2f0250d186279969c0e4ea7a0eeaded8683a53ca4a2b5c615762e2699392ba557f48ae567cf0205de85a92c41e74e10063 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5 diff --git a/dev-util/diffoscope/diffoscope-230.ebuild b/dev-util/diffoscope/diffoscope-230.ebuild deleted file mode 100644 index 04f039551ffb..000000000000 --- a/dev-util/diffoscope/diffoscope-230.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="ncurses" -inherit distutils-r1 - -DESCRIPTION="Will try to get to the bottom of what makes files or directories different" -HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86" -IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file -find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma -mono opendocument pascal pdf postscript R rpm sqlite squashfs -ssh tar test tcpdump zip zlib zstd" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/python-magic[${PYTHON_USEDEP}] - dev-python/libarchive-c[${PYTHON_USEDEP}] - dev-python/distro[${PYTHON_USEDEP}] - dev-python/tlsh[${PYTHON_USEDEP}] - acl? ( sys-apps/acl ) - binutils? ( sys-devel/binutils ) - bzip2? ( app-arch/bzip2 ) - libcaca? ( media-libs/libcaca ) - colord? ( x11-misc/colord ) - cpio? ( app-arch/cpio ) - diff? ( sys-apps/diffutils ) - docx? ( app-text/docx2txt ) - dtc? ( sys-apps/dtc ) - e2fsprogs? ( sys-fs/e2fsprogs ) - file? ( sys-apps/file ) - find? ( sys-apps/findutils ) - gettext? ( sys-devel/gettext ) - gif? ( media-libs/giflib ) - gpg? ( app-crypt/gnupg ) - haskell? ( dev-lang/ghc ) - hdf5? ( sci-libs/hdf5 ) - hex? ( app-editors/vim-core ) - imagemagick? ( media-gfx/imagemagick ) - iso? ( app-cdr/cdrtools ) - java? ( virtual/jdk ) - llvm? ( sys-devel/llvm ) - lzma? ( app-arch/xz-utils ) - mono? ( dev-lang/mono ) - opendocument? ( app-text/odt2txt ) - pascal? ( dev-lang/fpc ) - pdf? ( - app-text/pdftk - app-text/poppler - dev-python/PyPDF2[${PYTHON_USEDEP}] - ) - postscript? ( app-text/ghostscript-gpl ) - R? ( dev-lang/R ) - rpm? ( app-arch/rpm ) - sqlite? ( dev-db/sqlite:3 ) - squashfs? ( sys-fs/squashfs-tools ) - ssh? ( net-misc/openssh ) - tar? ( app-arch/tar ) - tcpdump? ( net-analyzer/tcpdump ) - zip? ( app-arch/unzip ) - zlib? ( app-arch/gzip ) - zstd? ( app-arch/zstd ) -" -# Presence of filemagic's magic.py breaks imports -# of dev-python/python-magic: bug #716482 -RDEPEND+=" !dev-python/filemagic" - -# pull in optional tools for tests: -# img2txt: bug #797688 -# docx2txt: bug #797688 -BDEPEND=" - test? ( - app-text/docx2txt - app-text/html2text - media-libs/libcaca - virtual/imagemagick-tools[jpeg] - ) -" - -EPYTEST_DESELECT=( - # Test seems to use different tarball - tests/test_presenters.py::test_text_proper_indentation - - # Needs triage - tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found - tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode - tests/comparators/test_gif.py::test_has_visuals - - # img2txt based failures, bug #797688 - tests/comparators/test_ico_image.py::test_diff - tests/comparators/test_ico_image.py::test_diff_meta - tests/comparators/test_ico_image.py::test_diff_meta2 - tests/comparators/test_ico_image.py::test_has_visuals - tests/comparators/test_jpeg_image.py::test_diff - tests/comparators/test_jpeg_image.py::test_compare_non_existing - tests/comparators/test_jpeg_image.py::test_diff_meta - tests/comparators/test_jpeg_image.py::test_has_visuals - - # docx2txt based falures, bug #797688 - tests/comparators/test_docx.py::test_diff - - # Formatting - tests/test_source.py::test_code_is_black_clean - - # Fails on ZFS - tests/test_main.py::test_non_unicode_filename - - # Fails on (unreleased) LLVM 16 with minor difference - tests/comparators/test_macho.py::test_llvm_diff -) - -distutils_enable_tests pytest diff --git a/dev-util/diffoscope/diffoscope-231-r1.ebuild b/dev-util/diffoscope/diffoscope-231-r1.ebuild deleted file mode 100644 index 4703fb6293f4..000000000000 --- a/dev-util/diffoscope/diffoscope-231-r1.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="ncurses" -inherit distutils-r1 - -DESCRIPTION="Will try to get to the bottom of what makes files or directories different" -HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86" -IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file -find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma -mono opendocument pascal pdf postscript R rpm sqlite squashfs -ssh tar test tcpdump zip zlib zstd" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/python-magic[${PYTHON_USEDEP}] - dev-python/libarchive-c[${PYTHON_USEDEP}] - dev-python/distro[${PYTHON_USEDEP}] - dev-python/tlsh[${PYTHON_USEDEP}] - acl? ( sys-apps/acl ) - binutils? ( sys-devel/binutils ) - bzip2? ( app-arch/bzip2 ) - libcaca? ( media-libs/libcaca ) - colord? ( x11-misc/colord ) - cpio? ( app-arch/cpio ) - diff? ( sys-apps/diffutils ) - docx? ( app-text/docx2txt ) - dtc? ( sys-apps/dtc ) - e2fsprogs? ( sys-fs/e2fsprogs ) - file? ( sys-apps/file ) - find? ( sys-apps/findutils ) - gettext? ( sys-devel/gettext ) - gif? ( media-libs/giflib ) - gpg? ( app-crypt/gnupg ) - haskell? ( dev-lang/ghc ) - hdf5? ( sci-libs/hdf5 ) - hex? ( app-editors/vim-core ) - imagemagick? ( media-gfx/imagemagick ) - iso? ( app-cdr/cdrtools ) - java? ( virtual/jdk ) - llvm? ( sys-devel/llvm ) - lzma? ( app-arch/xz-utils ) - mono? ( dev-lang/mono ) - opendocument? ( app-text/odt2txt ) - pascal? ( dev-lang/fpc ) - pdf? ( - app-text/pdftk - app-text/poppler - dev-python/pypdf[${PYTHON_USEDEP}] - ) - postscript? ( app-text/ghostscript-gpl ) - R? ( dev-lang/R ) - rpm? ( app-arch/rpm ) - sqlite? ( dev-db/sqlite:3 ) - squashfs? ( sys-fs/squashfs-tools ) - ssh? ( net-misc/openssh ) - tar? ( app-arch/tar ) - tcpdump? ( net-analyzer/tcpdump ) - zip? ( app-arch/unzip ) - zlib? ( app-arch/gzip ) - zstd? ( app-arch/zstd ) -" -# Presence of filemagic's magic.py breaks imports -# of dev-python/python-magic: bug #716482 -RDEPEND+=" !dev-python/filemagic" - -# pull in optional tools for tests: -# img2txt: bug #797688 -# docx2txt: bug #797688 -BDEPEND=" - test? ( - app-text/docx2txt - app-text/html2text - media-libs/libcaca - virtual/imagemagick-tools[jpeg] - ) -" - -EPYTEST_DESELECT=( - # Test seems to use different tarball - tests/test_presenters.py::test_text_proper_indentation - - # Needs triage - tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found - tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode - tests/comparators/test_gif.py::test_has_visuals - - # img2txt based failures, bug #797688 - tests/comparators/test_ico_image.py::test_diff - tests/comparators/test_ico_image.py::test_diff_meta - tests/comparators/test_ico_image.py::test_diff_meta2 - tests/comparators/test_ico_image.py::test_has_visuals - tests/comparators/test_jpeg_image.py::test_diff - tests/comparators/test_jpeg_image.py::test_compare_non_existing - tests/comparators/test_jpeg_image.py::test_diff_meta - tests/comparators/test_jpeg_image.py::test_has_visuals - - # docx2txt based falures, bug #797688 - tests/comparators/test_docx.py::test_diff - - # Formatting - tests/test_source.py::test_code_is_black_clean - - # Fails on ZFS - tests/test_main.py::test_non_unicode_filename - - # Fails on (unreleased) LLVM 16 with minor difference - tests/comparators/test_macho.py::test_llvm_diff -) - -PATCHES=( - "${FILESDIR}"/${PN}-231-pypdf.patch -) - -distutils_enable_tests pytest diff --git a/dev-util/diffoscope/diffoscope-232.ebuild b/dev-util/diffoscope/diffoscope-232.ebuild new file mode 100644 index 000000000000..a69e36d1c939 --- /dev/null +++ b/dev-util/diffoscope/diffoscope-232.ebuild @@ -0,0 +1,120 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="ncurses" +inherit distutils-r1 + +DESCRIPTION="Will try to get to the bottom of what makes files or directories different" +HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86" +IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file +find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma +mono opendocument pascal pdf postscript R rpm sqlite squashfs +ssh tar test tcpdump zip zlib zstd" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-python/python-magic[${PYTHON_USEDEP}] + dev-python/libarchive-c[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/tlsh[${PYTHON_USEDEP}] + acl? ( sys-apps/acl ) + binutils? ( sys-devel/binutils ) + bzip2? ( app-arch/bzip2 ) + libcaca? ( media-libs/libcaca ) + colord? ( x11-misc/colord ) + cpio? ( app-arch/cpio ) + diff? ( sys-apps/diffutils ) + docx? ( app-text/docx2txt ) + dtc? ( sys-apps/dtc ) + e2fsprogs? ( sys-fs/e2fsprogs ) + file? ( sys-apps/file ) + find? ( sys-apps/findutils ) + gettext? ( sys-devel/gettext ) + gif? ( media-libs/giflib ) + gpg? ( app-crypt/gnupg ) + haskell? ( dev-lang/ghc ) + hdf5? ( sci-libs/hdf5 ) + hex? ( app-editors/vim-core ) + imagemagick? ( media-gfx/imagemagick ) + iso? ( app-cdr/cdrtools ) + java? ( virtual/jdk ) + llvm? ( sys-devel/llvm ) + lzma? ( app-arch/xz-utils ) + mono? ( dev-lang/mono ) + opendocument? ( app-text/odt2txt ) + pascal? ( dev-lang/fpc ) + pdf? ( + app-text/pdftk + app-text/poppler + dev-python/pypdf[${PYTHON_USEDEP}] + ) + postscript? ( app-text/ghostscript-gpl ) + R? ( dev-lang/R ) + rpm? ( app-arch/rpm ) + sqlite? ( dev-db/sqlite:3 ) + squashfs? ( sys-fs/squashfs-tools ) + ssh? ( net-misc/openssh ) + tar? ( app-arch/tar ) + tcpdump? ( net-analyzer/tcpdump ) + zip? ( app-arch/unzip ) + zlib? ( app-arch/gzip ) + zstd? ( app-arch/zstd ) +" +# Presence of filemagic's magic.py breaks imports +# of dev-python/python-magic: bug #716482 +RDEPEND+=" !dev-python/filemagic" + +# pull in optional tools for tests: +# img2txt: bug #797688 +# docx2txt: bug #797688 +BDEPEND=" + test? ( + app-text/docx2txt + app-text/html2text + media-libs/libcaca + virtual/imagemagick-tools[jpeg] + ) +" + +EPYTEST_DESELECT=( + # Test seems to use different tarball + tests/test_presenters.py::test_text_proper_indentation + + # Needs triage + tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found + tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode + tests/comparators/test_gif.py::test_has_visuals + + # img2txt based failures, bug #797688 + tests/comparators/test_ico_image.py::test_diff + tests/comparators/test_ico_image.py::test_diff_meta + tests/comparators/test_ico_image.py::test_diff_meta2 + tests/comparators/test_ico_image.py::test_has_visuals + tests/comparators/test_jpeg_image.py::test_diff + tests/comparators/test_jpeg_image.py::test_compare_non_existing + tests/comparators/test_jpeg_image.py::test_diff_meta + tests/comparators/test_jpeg_image.py::test_has_visuals + + # docx2txt based falures, bug #797688 + tests/comparators/test_docx.py::test_diff + + # Formatting + tests/test_source.py::test_code_is_black_clean + + # Fails on ZFS + tests/test_main.py::test_non_unicode_filename + + # Fails on (unreleased) LLVM 16 with minor difference + tests/comparators/test_macho.py::test_llvm_diff +) + +distutils_enable_tests pytest diff --git a/dev-util/diffoscope/files/diffoscope-231-pypdf.patch b/dev-util/diffoscope/files/diffoscope-231-pypdf.patch deleted file mode 100644 index 4376e03f668c..000000000000 --- a/dev-util/diffoscope/files/diffoscope-231-pypdf.patch +++ /dev/null @@ -1,190 +0,0 @@ -https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/6aed2e5320b5d412f0f81a36dd493ae4bd7c3ff4 -https://bugs.gentoo.org/889250 - -From 6aed2e5320b5d412f0f81a36dd493ae4bd7c3ff4 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Mon, 9 Jan 2023 04:05:09 +0000 -Subject: [PATCH] Support PyPDF version 3. - -pypdf upstream has renamed the package from PyPDF2 to pypdf. This patch -supporst the new pypdf version while keeping compatibility for older PyPDF2, -adjusting to API changes. - -Signed-off-by: Chris Lamb ---- a/diffoscope.egg-info/requires.txt -+++ b/diffoscope.egg-info/requires.txt -@@ -11,7 +11,7 @@ binwalk - defusedxml - guestfs - jsondiff --pypdf2 -+pypdf - python-debian - pyxattr - rpm-python ---- a/diffoscope/comparators/pdf.py -+++ b/diffoscope/comparators/pdf.py -@@ -34,17 +34,23 @@ from .utils.command import Command - logger = logging.getLogger(__name__) - - try: -- import PyPDF2 -+ try: -+ import pypdf -+ except ImportError: -+ import PyPDF2 - - try: -- # PyPDF 2.x -- from PyPDF2.errors import PdfReadError -+ from pypdf.errors import PdfReadError - except ImportError: -- # PyPDF 1.x -- from PyPDF2.utils import PdfReadError -+ try: -+ # PyPDF 2.x -+ from PyPDF2.errors import PdfReadError -+ except ImportError: -+ # PyPDF 1.x -+ from PyPDF2.utils import PdfReadError - - except ImportError: # noqa -- python_module_missing("PyPDF2") -+ python_module_missing("pypdf") - PyPDF2 = None - - -@@ -68,10 +74,10 @@ class PdfFile(File): - xs = [] - - if PyPDF2 is None: -- pkg = get_package_provider("pypdf2") -+ pkg = get_package_provider("pypdf") - infix = f" from the '{pkg}' package " if pkg else " " - self.add_comment( -- f"Installing the 'PyPDF2' Python module{infix}may produce a better output." -+ f"Installing the 'pypdf' Python module{infix}may produce a better output." - ) - else: - difference = Difference.from_text( -@@ -119,7 +125,7 @@ class PdfFile(File): - - return "\n".join(xs) - except PdfReadError as e: -- msg = f"Could not extract PyPDF2 metadata from {os.path.basename(file.name)}: {e}" -+ msg = f"Could not extract pypdf metadata from {os.path.basename(file.name)}: {e}" - self.add_comment(msg) - logger.error(msg) - return "" -@@ -142,7 +148,7 @@ class PdfFile(File): - - return "\n".join(xs) - except PdfReadError as e: -- msg = f"Could not extract PyPDF2 annotations from {os.path.basename(file.name)}: {e}" -+ msg = f"Could not extract pypdf annotations from {os.path.basename(file.name)}: {e}" - file.add_comment(msg) - logger.error(msg) - return "" ---- a/setup.py -+++ b/setup.py -@@ -66,7 +66,7 @@ setup( - "guestfs", - "jsondiff", - "python-debian", -- "pypdf2", -+ "pypdf", - "pyxattr", - "rpm-python", - "tlsh", ---- a/tests/comparators/test_pdf.py -+++ b/tests/comparators/test_pdf.py -@@ -70,7 +70,7 @@ def differences_metadata(pdf1, pdf1a): - - - @skip_unless_tools_exist("pdftotext") --@skip_unless_module_exists("PyPDF2") -+@skip_unless_module_exists("pypdf") - def test_metadata(differences_metadata): - assert_diff(differences_metadata[0], "pdf_metadata_expected_diff") - -@@ -81,7 +81,7 @@ def differences_annotations(pdf3, pdf4): - - - @skip_unless_tools_exist("pdftotext") --@skip_unless_module_exists("PyPDF2") -+@skip_unless_module_exists("pypdf") - def test_annotations(differences_annotations): - with open("tests/data/pdf_annotations_expected_diff", "w") as f: - f.write(differences_annotations[0].unified_diff) ---- a/diffoscope/comparators/pdf.py -+++ b/diffoscope/comparators/pdf.py -@@ -38,6 +38,7 @@ try: - import pypdf - except ImportError: - import PyPDF2 -+ pypdf = PyPDF2 - - try: - from pypdf.errors import PdfReadError -@@ -51,7 +52,7 @@ try: - - except ImportError: # noqa - python_module_missing("pypdf") -- PyPDF2 = None -+ pypdf = None - - - class Pdftotext(Command): -@@ -73,7 +74,7 @@ class PdfFile(File): - def compare_details(self, other, source=None): - xs = [] - -- if PyPDF2 is None: -+ if pypdf is None: - pkg = get_package_provider("pypdf") - infix = f" from the '{pkg}' package " if pkg else " " - self.add_comment( -@@ -113,7 +114,7 @@ class PdfFile(File): - - def dump_pypdf2_metadata(self, file): - try: -- pdf = PyPDF2.PdfFileReader(file.path) -+ pdf = pypdf.PdfReader(file.path) - document_info = pdf.getDocumentInfo() - - if document_info is None: -@@ -133,10 +133,10 @@ class PdfFile(File): - - def dump_pypdf2_annotations(self, file): - try: -- pdf = PyPDF2.PdfFileReader(file.path) -+ pdf = pypdf.PdfReader(file.path) - - xs = [] -- for x in range(pdf.getNumPages()): -+ for x in range(len(pdf.pages)): - page = pdf.getPage(x) - - try: ---- a/diffoscope/comparators/pdf.py -+++ b/diffoscope/comparators/pdf.py -@@ -115,7 +115,7 @@ class PdfFile(File): - def dump_pypdf2_metadata(self, file): - try: - pdf = pypdf.PdfReader(file.path) -- document_info = pdf.getDocumentInfo() -+ document_info = pdf.metadata - - if document_info is None: - return "" ---- a/diffoscope/comparators/pdf.py -+++ b/diffoscope/comparators/pdf.py -@@ -137,7 +137,7 @@ class PdfFile(File): - - xs = [] - for x in range(len(pdf.pages)): -- page = pdf.getPage(x) -+ page = pdf.pages[x] - - try: - for annot in page["/Annots"]: diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest index 02bfeb8c2df5..11e08b6313aa 100644 --- a/dev-util/schroot/Manifest +++ b/dev-util/schroot/Manifest @@ -1,5 +1,6 @@ AUX 06zfscloneopts 1467 BLAKE2B e515b70b7d105470a8b32ecd8f2d88446f039424a132215bb149e7716429efc7b726630de9bda9ff0cf197a8ba777ce2f0e14da1709fd89a9f50e88713dc3b1d SHA512 4026af077ebbb2aa4e123af1cffa5125e5b420ac79a13f7c1a510bd6d57dc4e5c439470396ffdf0701ce7a4009044a415bed6a460cf829364b3c48cd71edd37f AUX 11gentoo 1992 BLAKE2B 61e4396196b7c6b4695567f74c6f17fe24ab0152a8e57da136ecefa16d30e3127b94c701bc9ba0b923fa0d3aa5ab87811aed64c656d0aa475a37dbb884082749 SHA512 98f549edae1326840f04058442c07fc8e2af70811393c106bea84426c51eea36378b6a863352cc0b2aab8efd8e81b0e70c4d10bdaeda5f2a17f51fbb3ca9abf3 +AUX schroot-1.6.13-resize-reserve.patch 2766 BLAKE2B 3bd967cb362091310dfae0c593f4f9e2a86ff80e36a2b6cd99e342ede2b086f73066551b401e8e438bdf3179ee00a52e881d5d1f37ef1ceaf08c3179dc17a5f4 SHA512 557d0d7582794c7c9bd96df5c24e3f22c8656fef2e43a116538ba204e33f64400d08802e1e4f85d9308f51bdea4435fe83392f105018c60612de7726d34c93af AUX schroot-1.6.13_p2-build-fixes.patch 3505 BLAKE2B cd5aaf9cab438e0c42999cf49f65a99d4edd2fc8832d8875ded58b44c037972a67d061a01122409bbd25ae3cd1fd52deb8f2ea0a68e64941cd23e6393be358ba SHA512 1c1dc159ee088633b0b98ba6a271de76937a08e7dd2e665e4a43016b05cc009c764c01a783672383205a93efebac189b8d43614b94267d57588af5cf53393494 AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2be6d0cc0aa3e5dfae6dcd4eefc2e152eab60611e2369db6159a444344adcff6954fd8c1e828f698 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98 AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15 @@ -7,5 +8,5 @@ AUX schroot.tmpfilesd 91 BLAKE2B f731cf3cb0037ec35f8144d2667f3a12fbfcef088454d16 AUX schroot_prompt.sh 73 BLAKE2B d833a51c7a36ba45b672e1b7adc1e371c3641b53c74530abe7c21c4d3d590b59aef4ff86f33db5e4feef500e74aee9566cddaffba67c3798e202605c7fb90c22 SHA512 403145790845a1fcc49991c76c1bf76c5e38a6e86d8fa150690289f34660d7b02acb91e8ac24335975285437176e0d4f8d91a643a173962a9578938e7f0f4b48 DIST schroot-1.6.13.tar.gz 687581 BLAKE2B 5054407e545f39258df7598dbc233a836f6a86a02b4d0f3368109fd3edaea543fde6f81cfc6fedcdd6124490a3d5bc4d3a7e113ebe5ba2cfe7ec2c204f9cd0f4 SHA512 a250a02eb2384f1c27a9ff6479b77647a7a19b96b3b4e9d63e32a5dabe6ef3a3b1e2efaf98ddd9db93ded50fc93595ce545b0f0247c4a9e481349adafe806c2d DIST schroot_1.6.13-2.debian.tar.xz 110752 BLAKE2B 77c877e13541968ffd4edaa04c1a846e9deb19a3670088c19cdf3a217acfc2521d2b8d8dec7b8e6188b107f793af6152d5724fd596a9c62f6c9b57f2c30d57b0 SHA512 8fd7e7f95131285ec49bda3d9ccc6ba025976009c382998ef183142d2e3e288b7936e2c8ec6532870b601f62b460d577920d9a801b789f0d1bf7ee31b45356c3 -EBUILD schroot-1.6.13_p2.ebuild 3630 BLAKE2B e5e54b23d4559af795d0ba51f4702c00dd138eae59c9370d51ccce0f67c486aa8adccee2f1dfe1217c47f16ee14961d179d774351000194f0c8036d59c68f3e1 SHA512 86676e9ef136597808ebbb76ea84fc0300cc3ad7211f31a872ac717118a08a2d457ea47377795b7e52b8c9a790a44d80976df54270499e4d1786340ac90925ae +EBUILD schroot-1.6.13_p2-r1.ebuild 3730 BLAKE2B 41ad64f2b56026764c9b391c5d9e50cbe7e4239448de86da309c2eb99376c3a0366acf11a48fb1ce100b72a8b6b39f838a0e816feec9cd171eaa2c4eecd21914 SHA512 17b79d575e27f7523a955e15b7a1fce0c5282f1bd392e7d57ffd24548e34ebd403fa92654c6b06e48f910971f196027afa9c11b380a16d2bd0e1eca500a6d842 MISC metadata.xml 616 BLAKE2B ec6e30d14cf7b8a9b8bfbe68be7d4f044d3ad8c84edea4c98b997426dcf1a29d87d2ef74968184b2aab28b68925687fd04a319f5dec0a594d586b2a7a10d7818 SHA512 18118a20b8c4f02926d27bca2a394611512bb7c353720b092ef79036691c3de24febb29d96b36171158d31534ed1dc994f2e4952517438ff550fb95cfad9dc4c diff --git a/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch b/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch new file mode 100644 index 000000000000..da798f3b4761 --- /dev/null +++ b/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch @@ -0,0 +1,103 @@ +From 6d7a762d6d630548ed558e0de8ddf04f3b0a69fc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= +Date: Sat, 14 Jan 2023 22:53:20 +0100 +Subject: [PATCH] sbuild-util: use resize instead of reserve + +Using reserved but uninitialized space is invalid, and, additionally, +reserve is not required to allocate memory or change the buffer size at +all. +--- + sbuild/sbuild-util.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/sbuild/sbuild-util.cc b/sbuild/sbuild-util.cc +index b89068a7..b6af7e89 100644 +--- a/sbuild/sbuild-util.cc ++++ b/sbuild/sbuild-util.cc +@@ -624,17 +624,17 @@ void + sbuild::passwd::query_uid (uid_t uid) + { + buffer_type::size_type size = 1 << 7; +- buffer.reserve(size); ++ buffer.resize(size); + int error; + + ::passwd *pwd_result; + + while ((error = getpwuid_r(uid, this, +- &buffer[0], buffer.capacity(), ++ &buffer[0], buffer.size(), + &pwd_result)) == ERANGE) + { + size <<= 1; +- buffer.reserve(size); ++ buffer.resize(size); + } + + if (pwd_result) +@@ -647,17 +647,17 @@ void + sbuild::passwd::query_name (const char *name) + { + buffer_type::size_type size = 1 << 8; +- buffer.reserve(size); ++ buffer.resize(size); + int error; + + ::passwd *pwd_result; + + while ((error = getpwnam_r(name, this, +- &buffer[0], buffer.capacity(), ++ &buffer[0], buffer.size(), + &pwd_result)) == ERANGE) + { + size <<= 1; +- buffer.reserve(size); ++ buffer.resize(size); + } + + if (pwd_result) +@@ -733,17 +733,17 @@ void + sbuild::group::query_gid (gid_t gid) + { + buffer_type::size_type size = 1 << 7; +- buffer.reserve(size); ++ buffer.resize(size); + int error; + + ::group *grp_result; + + while ((error = getgrgid_r(gid, this, +- &buffer[0], buffer.capacity(), ++ &buffer[0], buffer.size(), + &grp_result)) == ERANGE) + { + size <<= 1; +- buffer.reserve(size); ++ buffer.resize(size); + } + + if (grp_result) +@@ -756,17 +756,17 @@ void + sbuild::group::query_name (const char *name) + { + buffer_type::size_type size = 1 << 8; +- buffer.reserve(size); ++ buffer.resize(size); + int error; + + ::group *grp_result; + + while ((error = getgrnam_r(name, this, +- &buffer[0], buffer.capacity(), ++ &buffer[0], buffer.size(), + &grp_result)) == ERANGE) + { + size <<= 1; +- buffer.reserve(size); ++ buffer.resize(size); + } + + if (grp_result) +-- +2.30.2 + diff --git a/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild b/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild new file mode 100644 index 000000000000..839f9adc48f4 --- /dev/null +++ b/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 cmake pam tmpfiles + +MY_P=${PN}_${PV/_p/-} + +DESCRIPTION="Utility to execute commands in a chroot environment" +HOMEPAGE="https://codeberg.org/shelter/reschroot" +SRC_URI="https://codeberg.org/shelter/reschroot/archive/release/re${P/%_p*}.tar.gz -> ${P/%_p*}.tar.gz + mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.debian.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" +IUSE="btrfs +dchroot debug doc lvm nls pam test zfs" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + dev-libs/boost:= + >=sys-apps/util-linux-2.16 + btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) + lvm? ( sys-fs/lvm2 ) + pam? ( sys-libs/pam ) + zfs? ( sys-fs/zfs ) +" + +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + sys-apps/groff + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) + nls? ( + >=app-text/po4a-0.40 + sys-devel/gettext + ) + test? ( >=dev-util/cppunit-1.10.0 ) +" +RDEPEND="${COMMON_DEPEND} + sys-apps/debianutils + dchroot? ( !sys-apps/dchroot ) + nls? ( virtual/libintl ) +" + +S="${WORKDIR}/re${PN}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.13_p2-build-fixes.patch + + # https://codeberg.org/shelter/reschroot/pulls/6 + "${FILESDIR}"/${PN}-1.6.13-resize-reserve.patch +) + +src_unpack() { + unpack "${P/%_p*}".tar.gz + cd "${S}" + unpack ${MY_P}.debian.tar.xz +} + +src_prepare() { + sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die + eapply "${S}"/debian/patches/*.patch + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -Dbtrfs-snapshot=$(usex btrfs) + -Ddchroot=$(usex dchroot) + -Ddchroot-dsa=$(usex dchroot) + -Ddebug=$(usex debug) + -Ddoxygen=$(usex doc) + -Dlvm-snapshot=$(usex lvm) + -Dnls=$(usex nls) + -Dpam=$(usex pam) + -Dtest=$(usex test) + -Dzfs-snapshot=$(usex zfs) + -Dbash_completion_dir="$(get_bashcompdir)" + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var" + -DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount" + -DBoost_NO_BOOST_CMAKE=ON # https://bugs.gentoo.org/791712 and https://bugs.gentoo.org/752120 + ) + if ! use nls; then + mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile all $(usev doc) +} + +src_test() { + if [[ ${EUID} -ne 0 ]]; then + ewarn "Disabling tests because you are not root" + return 0 + fi + # -j1 to prevent race between test/setup-test-data and test/cleanup-test-data + cmake_src_test -j1 +} + +src_install() { + cmake_src_install + + # debian-stype PS1 for chroot + # checks for /etc/debian_chroot file, which is created by schroot + insinto /etc/bash/bashrc.d + doins "${FILESDIR}/schroot_prompt.sh" + + # gentoo /var/tmp/portage handler + # e.g. portage.base.tmpdir=/var/tmp/portage in config file + # will use a subdirectory of hosts $PORTAGE_TMPDIR + exeinto /etc/schroot/setup.d + doexe "${FILESDIR}/11gentoo" + + # support for zfs clone options. + # zfs.clone.options=com.sun:auto-snapshot=false + if use zfs; then + exeinto /etc/schroot/setup.d + doexe "${FILESDIR}/06zfscloneopts" + fi + + keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}} + + docinto contrib/setup.d + dodoc contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh + + newdoc debian/schroot.NEWS NEWS.debian + + newinitd "${FILESDIR}"/schroot.initd schroot + newconfd "${FILESDIR}"/schroot.confd schroot + newtmpfiles "${FILESDIR}"/schroot.tmpfilesd schroot.conf + + if use doc; then + docinto html/sbuild + dodoc "${BUILD_DIR}"/doc/sbuild/html/* + docinto html/schroot + dodoc "${BUILD_DIR}"/doc/schroot/html/* + fi + + if use pam; then + rm -f "${ED}"/etc/pam.d/schroot + pamd_mimic_system schroot auth account session + fi +} + +pkg_postinst() { + tmpfiles_process ${PN}.conf +} diff --git a/dev-util/schroot/schroot-1.6.13_p2.ebuild b/dev-util/schroot/schroot-1.6.13_p2.ebuild deleted file mode 100644 index dedc047eec42..000000000000 --- a/dev-util/schroot/schroot-1.6.13_p2.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 cmake pam tmpfiles - -MY_P=${PN}_${PV/_p/-} - -DESCRIPTION="Utility to execute commands in a chroot environment" -HOMEPAGE="https://codeberg.org/shelter/reschroot" -SRC_URI="https://codeberg.org/shelter/reschroot/archive/release/re${P/%_p*}.tar.gz -> ${P/%_p*}.tar.gz - mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.debian.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" -IUSE="btrfs +dchroot debug doc lvm nls pam test zfs" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-libs/boost:= - >=sys-apps/util-linux-2.16 - btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) - lvm? ( sys-fs/lvm2 ) - pam? ( sys-libs/pam ) - zfs? ( sys-fs/zfs ) -" - -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - sys-apps/groff - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - nls? ( - >=app-text/po4a-0.40 - sys-devel/gettext - ) - test? ( >=dev-util/cppunit-1.10.0 ) -" -RDEPEND="${COMMON_DEPEND} - sys-apps/debianutils - dchroot? ( !sys-apps/dchroot ) - nls? ( virtual/libintl ) -" - -S="${WORKDIR}/re${PN}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.13_p2-build-fixes.patch -) - -src_unpack() { - unpack "${P/%_p*}".tar.gz - cd "${S}" - unpack ${MY_P}.debian.tar.xz -} - -src_prepare() { - sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die - eapply "${S}"/debian/patches/*.patch - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -Dbtrfs-snapshot=$(usex btrfs) - -Ddchroot=$(usex dchroot) - -Ddchroot-dsa=$(usex dchroot) - -Ddebug=$(usex debug) - -Ddoxygen=$(usex doc) - -Dlvm-snapshot=$(usex lvm) - -Dnls=$(usex nls) - -Dpam=$(usex pam) - -Dtest=$(usex test) - -Dzfs-snapshot=$(usex zfs) - -Dbash_completion_dir="$(get_bashcompdir)" - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var" - -DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount" - -DBoost_NO_BOOST_CMAKE=ON # https://bugs.gentoo.org/791712 and https://bugs.gentoo.org/752120 - ) - if ! use nls; then - mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile all $(usev doc) -} - -src_test() { - if [[ ${EUID} -ne 0 ]]; then - ewarn "Disabling tests because you are not root" - return 0 - fi - # -j1 to prevent race between test/setup-test-data and test/cleanup-test-data - cmake_src_test -j1 -} - -src_install() { - cmake_src_install - - # debian-stype PS1 for chroot - # checks for /etc/debian_chroot file, which is created by schroot - insinto /etc/bash/bashrc.d - doins "${FILESDIR}/schroot_prompt.sh" - - # gentoo /var/tmp/portage handler - # e.g. portage.base.tmpdir=/var/tmp/portage in config file - # will use a subdirectory of hosts $PORTAGE_TMPDIR - exeinto /etc/schroot/setup.d - doexe "${FILESDIR}/11gentoo" - - # support for zfs clone options. - # zfs.clone.options=com.sun:auto-snapshot=false - if use zfs; then - exeinto /etc/schroot/setup.d - doexe "${FILESDIR}/06zfscloneopts" - fi - - keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}} - - docinto contrib/setup.d - dodoc contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh - - newdoc debian/schroot.NEWS NEWS.debian - - newinitd "${FILESDIR}"/schroot.initd schroot - newconfd "${FILESDIR}"/schroot.confd schroot - newtmpfiles "${FILESDIR}"/schroot.tmpfilesd schroot.conf - - if use doc; then - docinto html/sbuild - dodoc "${BUILD_DIR}"/doc/sbuild/html/* - docinto html/schroot - dodoc "${BUILD_DIR}"/doc/schroot/html/* - fi - - if use pam; then - rm -f "${ED}"/etc/pam.d/schroot - pamd_mimic_system schroot auth account session - fi -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf -} -- cgit v1.2.3