From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- sys-fs/ecryptfs-utils/Manifest | 3 +- .../ecryptfs-utils-111_p20170609-r1.ebuild | 90 +++++++++++++++++++++ .../ecryptfs-utils-111_p20170609.ebuild | 94 ---------------------- .../files/ecryptfs-utils-111-musl-fix.patch | 13 +++ 4 files changed, 105 insertions(+), 95 deletions(-) create mode 100644 sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild delete mode 100644 sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609.ebuild create mode 100644 sys-fs/ecryptfs-utils/files/ecryptfs-utils-111-musl-fix.patch (limited to 'sys-fs/ecryptfs-utils') diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest index 5e7a9c3156e3..44312105cf8d 100644 --- a/sys-fs/ecryptfs-utils/Manifest +++ b/sys-fs/ecryptfs-utils/Manifest @@ -1,3 +1,4 @@ +AUX ecryptfs-utils-111-musl-fix.patch 655 BLAKE2B 36b58a963e3aa82b2eac0753f0177fc6293ea33dad78077f6c9735cbacc9f14064a4517747b72298191dd3ab8266bf15506b2947544fbe250ab1a96706aa47ae SHA512 3e69d642e650be5a94c3f1a47ee7094fd5c052d77d3298ebe96ababfe6f526963dd08d8260ca546eee271b799357ef57a51479565b646b2b428e7c8868ec469a DIST ecryptfs-utils-111_p20170609.tar.gz 1433722 BLAKE2B eeb8840e0b369d2eb420e7853629086cbf430daed2dbf3ed620f5c2489de711c9d8dc5c2b555db5d09b968df6d07da19b93ca46add3b7987d3ff1ad9f06adc69 SHA512 4788a35d68bbb6b769803754adad14d063564e6285edcec4d68df076e96c61550ab6487a1b84498e24e3f56f8c9fda6eb63a66d469d3e654834357c5e2b4c781 -EBUILD ecryptfs-utils-111_p20170609.ebuild 2152 BLAKE2B 4a30dc24bed2c2e69723d29b2d60231b0d49d00a09699e7395d588be85b5edfb23e577c35b43c9743defcf3bf6b64e85a3bb955feee822e98612c3e0459f6739 SHA512 ec7b6590397739abeb215cca0b06dfba2fb16fba72cba0e63af02b93760d528fc78f5530a880fc01cda145251c8f53d56a233f3204d2a385da7ef75ff6866ef5 +EBUILD ecryptfs-utils-111_p20170609-r1.ebuild 1894 BLAKE2B 819bd32ec8104bb3483507fa17a3015afaf20954ed01ac16b06d4f789c98d2f0e5044f9a81423c3bec69a29037600b814da723efe087e332baffb645fdfaa6ae SHA512 6a26a4bb96dd4ae43874dc7ffbdeb7063990db46c5cabbe38becd9ab9686ef3e1949131c940574b7c79f41d4aff1a85dfabf5e451b26368261d164d9441d12ef MISC metadata.xml 654 BLAKE2B 64e5132639a3fe0cd686cb0e8d48498c824541534557bfea1afceaf0f650554b05138850d9c43601c837de7d3499ac1608b5d7ff6ca6bbce02d5f617bb962f26 SHA512 47e06caf756f98d2d2f105c1e89e4e9fbb5b8a84a34969c918646b85a0004491b37bf1c86fef322e97c83f914e8ab68b0584e3e675c53c51238c0b13dd87e43c diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild new file mode 100644 index 000000000000..711644620d7c --- /dev/null +++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic linux-info pam + +MY_PN=${PN/-utils//} +DESCRIPTION="eCryptfs userspace utilities" +HOMEPAGE="https://launchpad.net/ecryptfs" +SRC_URI="https://dev.gentoo.org/~bkohler/dist/${P}.tar.gz" +S="${WORKDIR}/~${MY_PN}/${MY_PN}/trunk/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="doc gpg gtk nls openssl pam pkcs11 suid tpm" + +BDEPEND=" + >=dev-util/intltool-0.41.0 + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND=" + >=dev-libs/libgcrypt-1.2.0:0= + dev-libs/nss + >=sys-apps/keyutils-1.5.11-r1:= + sys-process/lsof + gpg? ( app-crypt/gpgme:= ) + gtk? ( x11-libs/gtk+:2 ) + openssl? ( >=dev-libs/openssl-0.9.7:= ) + pam? ( sys-libs/pam ) + pkcs11? ( + >=dev-libs/openssl-0.9.7:= + >=dev-libs/pkcs11-helper-1.04 + ) + tpm? ( app-crypt/trousers )" +DEPEND=" + ${RDEPEND} + dev-libs/glib:2 +" + +PATCHES=( + "${FILESDIR}/${PN}-111-musl-fix.patch" +) + +pkg_setup() { + CONFIG_CHECK="~ECRYPT_FS" + linux-info_pkg_setup +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-cppflags -D_FILE_OFFSET_BITS=64 + + econf \ + --enable-nss \ + --with-pamdir=$(getpam_mod_dir) \ + --disable-pywrap \ + $(use_enable doc docs) \ + $(use_enable gpg) \ + $(use_enable gtk gui) \ + $(use_enable nls) \ + $(use_enable openssl) \ + $(use_enable pam) \ + $(use_enable pkcs11 pkcs11-helper) \ + $(use_enable tpm tspi) +} + +src_install() { + emake DESTDIR="${D}" install + + use suid && fperms u+s /sbin/mount.ecryptfs_private + + find "${ED}" -name '*.la' -exec rm -f '{}' + || die +} + +pkg_postinst() { + if use suid; then + ewarn + ewarn "You have chosen to install ${PN} with the binary setuid root. This" + ewarn "means that if there are any undetected vulnerabilities in the binary," + ewarn "then local users may be able to gain root access on your machine." + ewarn + fi +} diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609.ebuild deleted file mode 100644 index a5704e9bce6f..000000000000 --- a/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python2_7 ) - -inherit flag-o-matic pam python-single-r1 linux-info autotools - -DESCRIPTION="eCryptfs userspace utilities" -HOMEPAGE="https://launchpad.net/ecryptfs" -SRC_URI="https://dev.gentoo.org/~bkohler/dist/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="doc gpg gtk nls openssl pam pkcs11 python suid tpm" - -RDEPEND=">=sys-apps/keyutils-1.5.11-r1:= - >=dev-libs/libgcrypt-1.2.0:0 - dev-libs/nss - gpg? ( app-crypt/gpgme ) - gtk? ( x11-libs/gtk+:2 ) - openssl? ( >=dev-libs/openssl-0.9.7:= ) - pam? ( sys-libs/pam ) - pkcs11? ( - >=dev-libs/openssl-0.9.7:= - >=dev-libs/pkcs11-helper-1.04 - ) - python? ( ${PYTHON_DEPS} ) - tpm? ( app-crypt/trousers )" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/gettext - >=dev-util/intltool-0.41.0 - python? ( dev-lang/swig )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - use python && python-single-r1_pkg_setup - - CONFIG_CHECK="~ECRYPT_FS" - linux-info_pkg_setup -} - -src_unpack() { - mkdir -p "${S}" || die - tar -xf "${DISTDIR}/${P}.tar.gz" --strip-components=3 -C "${S}" -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - append-cppflags -D_FILE_OFFSET_BITS=64 - - econf \ - --enable-nss \ - --with-pamdir=$(getpam_mod_dir) \ - $(use_enable doc docs) \ - $(use_enable gpg) \ - $(use_enable gtk gui) \ - $(use_enable nls) \ - $(use_enable openssl) \ - $(use_enable pam) \ - $(use_enable pkcs11 pkcs11-helper) \ - $(use_enable python pywrap) \ - $(use_enable tpm tspi) -} - -src_install() { - emake DESTDIR="${D}" install - - if use python; then - echo "ecryptfs-utils" > "${D}$(python_get_sitedir)/ecryptfs-utils.pth" || die - fi - - use suid && fperms u+s /sbin/mount.ecryptfs_private - - find "${ED}" -name '*.la' -exec rm -f '{}' + || die -} - -pkg_postinst() { - if use suid; then - ewarn - ewarn "You have chosen to install ${PN} with the binary setuid root. This" - ewarn "means that if there are any undetected vulnerabilities in the binary," - ewarn "then local users may be able to gain root access on your machine." - ewarn - fi -} diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-111-musl-fix.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-111-musl-fix.patch new file mode 100644 index 000000000000..1d6de38e8cb3 --- /dev/null +++ b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-111-musl-fix.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/715508 +https://git.alpinelinux.org/aports/tree/community/ecryptfs-utils/fix-build.patch?id=9e57b1f1197ee99b9f998472371042c42bffdc49 +--- a/src/utils/mount.ecryptfs_private.c 2016-01-22 18:04:52.000000000 +0200 ++++ b/src/utils/mount.ecryptfs_private.c 2017-01-20 08:39:31.877975729 +0200 +@@ -235,7 +235,7 @@ + * deceive other programs with a crafted /proc/self/*. See + * https://launchpad.net/bugs/1530566 for more details. + */ +- __SWORD_TYPE f_type_whitelist[] = { ++ static const uint32_t f_type_whitelist[] = { + 0x61756673 /* AUFS_SUPER_MAGIC */, + 0x9123683E /* BTRFS_SUPER_MAGIC */, + 0x00C36400 /* CEPH_SUPER_MAGIC */, -- cgit v1.2.3