From 30c7d03ef886dbda32c89ffa21b5a523340d6b22 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 18 Jun 2018 23:35:15 -0400 Subject: [PATCH] sys-apps/acl: version bump to 2.2.53 Closes: https://bugs.gentoo.org/490916 --- profiles/package.mask | 5 - sys-apps/acl/Manifest | 1 + ...acl-2.2.52-r2.ebuild => acl-2.2.53.ebuild} | 32 +-- .../acl/files/acl-2.2.52-xattr_header.patch | 201 ------------------ 4 files changed, 8 insertions(+), 231 deletions(-) rename sys-apps/acl/{acl-2.2.52-r2.ebuild => acl-2.2.53.ebuild} (56%) delete mode 100644 sys-apps/acl/files/acl-2.2.52-xattr_header.patch diff --git a/profiles/package.mask b/profiles/package.mask index 4d9b131d2707..492919fa13d0 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -531,11 +531,6 @@ sys-libs/uclibc # mpv >= 0.28.0 requires currently masked ffmpeg >= 4.0. >=media-video/mpv-0.28.0 -# Lars Wendler (10 Jan 2018) -# Mask followup bugfixes for =sys-apps/attr-2.4.48 as well until proper -# testing has been conducted. -=sys-apps/acl-2.2.52-r2 - # Matthias Maier (26 Dec 2017) # gcc depends on mpfr and this version changes soname. Spare users with # FEATURES=-preserve-libs from completely frying their system. diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest index 2f67ab6e8d34..83b57f7e451b 100644 --- a/sys-apps/acl/Manifest +++ b/sys-apps/acl/Manifest @@ -1 +1,2 @@ DIST acl-2.2.52.src.tar.gz 386604 BLAKE2B e8b7b555cec93f84579aac846ce64235e356d73770844e88898564d1742fcf3d7c314511f0321aefbad33bdd85800406102178e8ab6414bc9c883891442d3188 SHA512 59973199d371cd0b2368e95bc829a1b47f04e808a174fefba4c6854e766158bd19a71d9dbcc8d6fdc1573a1f971cdda39c453f7fa243bce02c1ab97c6e7c72e7 +DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716 diff --git a/sys-apps/acl/acl-2.2.52-r2.ebuild b/sys-apps/acl/acl-2.2.53.ebuild similarity index 56% rename from sys-apps/acl/acl-2.2.52-r2.ebuild rename to sys-apps/acl/acl-2.2.53.ebuild index 4bc0d2945f1c..0d59f681b465 100644 --- a/sys-apps/acl/acl-2.2.52-r2.ebuild +++ b/sys-apps/acl/acl-2.2.53.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="6" -inherit eutils libtool ltprune toolchain-funcs multilib-minimal +inherit libtool ltprune toolchain-funcs multilib-minimal DESCRIPTION="access control list utilities, libraries and headers" HOMEPAGE="https://savannah.nongnu.org/projects/acl" -SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.src.tar.gz" +SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" @@ -20,41 +20,23 @@ RDEPEND=" DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" -PATCHES=( - "${FILESDIR}/${P}-xattr_header.patch" -) - src_prepare() { default - - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \ - include/builddefs.in \ - || die - strip-linguas po elibtoolize #580792 - - # same as https://savannah.nongnu.org/bugs/index.php?39736 - multilib_copy_sources } multilib_src_configure() { - unset PLATFORM #184564 - export OPTIMIZER=${CFLAGS} - export DEBUG=-DNDEBUG - local myeconfargs=( --bindir="${EPREFIX}"/bin - --enable-shared $(use_enable static-libs static) + $(use_enable static-libs static) --libexecdir="${EPREFIX}"/usr/$(get_libdir) - $(use_enable nls gettext) + $(use_enable nls) ) - econf "${myeconfargs[@]}" + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_install() { - emake DIST_ROOT="${D}" install install-dev install-lib + default # move shared libs to / gen_usr_ldscript -a acl diff --git a/sys-apps/acl/files/acl-2.2.52-xattr_header.patch b/sys-apps/acl/files/acl-2.2.52-xattr_header.patch deleted file mode 100644 index 052941f92c82..000000000000 --- a/sys-apps/acl/files/acl-2.2.52-xattr_header.patch +++ /dev/null @@ -1,201 +0,0 @@ -Backported from: -http://git.savannah.nongnu.org/cgit/acl.git/commit/?id=79f563779b9b9ba89cc2352d70e3cdf27acff513 - ---- acl-2.2.52/libacl/acl_delete_def_file.c -+++ acl-2.2.52/libacl/acl_delete_def_file.c -@@ -20,11 +20,11 @@ - */ - - #include --#include -+#include - #include "byteorder.h" - #include "acl_ea.h" - #include "config.h" -- -+#include "libacl.h" - - /* 23.4.8 */ - int ---- acl-2.2.52/libacl/acl_extended_fd.c -+++ acl-2.2.52/libacl/acl_extended_fd.c -@@ -20,13 +20,12 @@ - */ - - #include --#include -+#include - #include "libacl.h" - - #include "byteorder.h" - #include "acl_ea.h" - -- - int - acl_extended_fd(int fd) - { ---- acl-2.2.52/libacl/__acl_extended_file.c -+++ acl-2.2.52/libacl/__acl_extended_file.c -@@ -20,14 +20,13 @@ - */ - - #include --#include -+#include - #include "libacl.h" - - #include "byteorder.h" - #include "acl_ea.h" - #include "__acl_extended_file.h" - -- - int - __acl_extended_file(const char *path_p, - ssize_t (*fun)(const char *, const char *, ---- acl-2.2.52/libacl/acl_extended_file.c -+++ acl-2.2.52/libacl/acl_extended_file.c -@@ -20,7 +20,7 @@ - */ - - #include --#include -+#include - #include "libacl.h" - - #include "__acl_extended_file.h" ---- acl-2.2.52/libacl/acl_extended_file_nofollow.c -+++ acl-2.2.52/libacl/acl_extended_file_nofollow.c -@@ -20,7 +20,7 @@ - */ - - #include --#include -+#include - #include "libacl.h" - - #include "__acl_extended_file.h" ---- acl-2.2.52/libacl/acl_get_fd.c -+++ acl-2.2.52/libacl/acl_get_fd.c -@@ -23,7 +23,7 @@ - #include - #include - #include --#include -+#include - #include - #include "libacl.h" - #include "__acl_from_xattr.h" -@@ -31,7 +31,6 @@ - #include "byteorder.h" - #include "acl_ea.h" - -- - /* 23.4.15 */ - acl_t - acl_get_fd(int fd) ---- acl-2.2.52/libacl/acl_get_file.c -+++ acl-2.2.52/libacl/acl_get_file.c -@@ -23,7 +23,7 @@ - #include - #include - #include --#include -+#include - #include - #include "libacl.h" - #include "__acl_from_xattr.h" -@@ -31,7 +31,6 @@ - #include "byteorder.h" - #include "acl_ea.h" - -- - /* 23.4.16 */ - acl_t - acl_get_file(const char *path_p, acl_type_t type) ---- acl-2.2.52/libacl/acl_set_fd.c -+++ acl-2.2.52/libacl/acl_set_fd.c -@@ -20,7 +20,7 @@ - */ - - #include --#include -+#include - #include "libacl.h" - #include "__acl_to_xattr.h" - ---- acl-2.2.52/libacl/acl_set_file.c -+++ acl-2.2.52/libacl/acl_set_file.c -@@ -22,7 +22,7 @@ - #include - #include - #include --#include -+#include - #include "libacl.h" - #include "__acl_to_xattr.h" - ---- acl-2.2.52/libacl/libacl.h -+++ acl-2.2.52/libacl/libacl.h -@@ -17,8 +17,13 @@ - - #include - #include -+#include - #include "libobj.h" - -+#ifndef ENOATTR -+# define ENOATTR ENODATA -+#endif -+ - typedef unsigned int permset_t; - - #define ACL_PERM_NONE (0x0000) ---- acl-2.2.52/m4/package_attrdev.m4 -+++ acl-2.2.52/m4/package_attrdev.m4 -@@ -12,17 +12,6 @@ - dnl - dnl You should have received a copy of the GNU General Public License - dnl along with this program. If not, see . --AC_DEFUN([AC_PACKAGE_NEED_ATTR_XATTR_H], -- [ AC_CHECK_HEADERS([attr/xattr.h]) -- if test "$ac_cv_header_attr_xattr_h" != "yes"; then -- echo -- echo 'FATAL ERROR: attr/xattr.h does not exist.' -- echo 'Install the extended attributes (attr) development package.' -- echo 'Alternatively, run "make install-dev" from the attr source.' -- exit 1 -- fi -- ]) -- - AC_DEFUN([AC_PACKAGE_NEED_ATTR_ERROR_H], - [ AC_CHECK_HEADERS([attr/error_context.h]) - if test "$ac_cv_header_attr_error_context_h" != "yes"; then ---- acl-2.2.52/configure -+++ acl-2.2.52/configure -@@ -12416,26 +12416,6 @@ - fi - - -- for ac_header in attr/xattr.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default" --if test "x$ac_cv_header_attr_xattr_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_ATTR_XATTR_H 1 --_ACEOF -- --fi -- --done -- -- if test "$ac_cv_header_attr_xattr_h" != "yes"; then -- echo -- echo 'FATAL ERROR: attr/xattr.h does not exist.' -- echo 'Install the extended attributes (attr) development package.' -- echo 'Alternatively, run "make install-dev" from the attr source.' -- exit 1 -- fi -- - for ac_header in attr/error_context.h - do : - ac_fn_c_check_header_mongrel "$LINENO" "attr/error_context.h" "ac_cv_header_attr_error_context_h" "$ac_includes_default" -- 2.26.2