From f6528ac86d1a9dc96170011ae98ee0160b28abda Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Wed, 4 Jul 2018 02:41:02 +0000 Subject: [PATCH] Update to attr-2.4.48. Update to acl-2.2.53. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11428 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 14 ++++++++++++++ chapter01/whatsnew.xml | 4 ++-- chapter06/acl.xml | 42 ++++++++++++----------------------------- chapter06/attr.xml | 38 +++++++++++++------------------------ general.ent | 6 +++--- lfs-latest.php | 2 +- packages.ent | 16 ++++++++-------- 7 files changed, 53 insertions(+), 69 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index ccb792048..62e0259dd 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,20 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2018-06-25 + + + [bdubbs] - Update to attr-2.4.48. Fixes + #4308. + + + [bdubbs] - Update to acl-2.2.53. Fixes + #4307. + + + + 2018-06-25 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index f192806c3..97bae5cde 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -26,9 +26,9 @@ - + diff --git a/chapter06/acl.xml b/chapter06/acl.xml index df058f721..cb5be400e 100644 --- a/chapter06/acl.xml +++ b/chapter06/acl.xml @@ -42,35 +42,18 @@ Installation of Acl - Modify the documentation directory so that it is a versioned - directory: - -sed -i -e 's|/@pkg_name@|&-@pkg_version@|' include/builddefs.in - - Fix some broken tests: - -sed -i "s:| sed.*::g" test/{sbits-restore,cp,misc}.test - - Fix a problem in the test procedures caused by changes in perl-5.26: - -sed -i 's/{(/\\{(/' test/run - - Additionally, fix a bug that causes getfacl -e - to segfault on overly long group name: - -sed -i -e "/TABS-1;/a if (x > (TABS-1)) x = (TABS-1);" \ - libacl/__acl_to_any_text.c - Prepare Acl for compilation: -./configure --prefix=/usr \ - --bindir=/bin \ - --disable-static \ - --libexecdir=/usr/lib +./configure --prefix=/usr \ + --bindir=/bin \ + --disable-static \ + --libexecdir=/usr/lib \ + --docdir=/usr/share/doc/acl-&acl-version; -./configure --prefix=/usr \ - --disable-static \ - --libexecdir=/usr/lib +./configure --prefix=/usr \ + --disable-static \ + --libexecdir=/usr/lib \ + --docdir=/usr/share/doc/acl-&acl-version; Compile the package: @@ -78,14 +61,13 @@ The Acl tests need to be run on a filesystem that supports access controls after Coreutils has been built with the - Acl libraries. If desired, return to this package and run make -j1 - tests after Coreutils has been built + Acl libraries. If desired, return to this package and run make + check after Coreutils has been built later in this chapter. Install the package: -make install install-dev install-lib -chmod -v 755 /usr/lib/libacl.so +make install The shared library needs to be moved to /lib, and as a result the diff --git a/chapter06/attr.xml b/chapter06/attr.xml index f81df844c..56c9fa848 100644 --- a/chapter06/attr.xml +++ b/chapter06/attr.xml @@ -41,44 +41,32 @@ Installation of Attr - Modify the documentation directory so that it is a versioned - directory: - -sed -i -e 's|/@pkg_name@|&-@pkg_version@|' include/builddefs.in - - Prevent installation of manual pages that were already installed by - the package: - -sed -i -e "/SUBDIRS/s|man[25]||g" man/Makefile - - Fix a problem in the test procedures caused by changes in perl-5.26: - -sed -i 's:{(:\\{(:' test/run - Prepare Attr for compilation: -./configure --prefix=/usr \ - --bindir=/bin \ - --disable-static +./configure --prefix=/usr \ + --bindir=/bin \ + --disable-static \ + --sysconfdir=/etc \ + --docdir=/usr/share/doc/attr-&attr-version; -./configure --prefix=/usr \ - --disable-static +./configure --prefix=/usr \ + --disable-static \ + --sysconfdir=/etc \ + --docdir=/usr/share/doc/attr-&attr-version; Compile the package: make The tests need to be run on a filesystem that supports extended - attributes such as the ext2, ext3, or ext4 filesystems. The tests are also - known to fail if running multiple simultaneous tests (-j option greater than - 1). To test the results, issue: + attributes such as the ext2, ext3, or ext4 filesystems. + To test the results, issue: -make -j1 tests root-tests +make check Install the package: -make install install-dev install-lib -chmod -v 755 /usr/lib/libattr.so +make install The shared library needs to be moved to /lib, and as a result the diff --git a/general.ent b/general.ent index 3dc1c9168..cfbb40e8e 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/lfs-latest.php b/lfs-latest.php index b84b31ac4..a3200f79e 100644 --- a/lfs-latest.php +++ b/lfs-latest.php @@ -234,7 +234,7 @@ if ( $package == "vim" ) $dirpath = "ftp://ftp.vim.org/pub/vim/unix"; if ( $package == "attr" || $package == "acl" ) { - return find_max( $lines, "/$package/", "/^.*$package-([\d\.-]*\d)\.src.*$/" ); + return find_max( $lines, "/$package/", "/^.*$package-([\d\.-]*\d)\.*$/" ); } if ( $package == "e2fsprogs" ) diff --git a/packages.ent b/packages.ent index e845f1f59..fc19679dd 100644 --- a/packages.ent +++ b/packages.ent @@ -6,18 +6,18 @@ Allowed deviation in SBUs : 10% Allowed deviation in disk usage : 2% --> - - - - + + + + - - - - + + + +