Update acl to latst version from linux from scratch The library will be in /usr/lib and now with the correct rootfile :) Th older acl patches from me are deprecatet.
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org
--- config/rootfiles/common/acl | 90 ++++++++++++++++++++++----------------------- lfs/acl | 17 +++++---- 2 files changed, 53 insertions(+), 54 deletions(-)
diff --git a/config/rootfiles/common/acl b/config/rootfiles/common/acl index 630e4c7..a217714 100644 --- a/config/rootfiles/common/acl +++ b/config/rootfiles/common/acl @@ -4,59 +4,14 @@ usr/bin/setfacl #usr/include/acl #usr/include/acl/libacl.h #usr/include/sys/acl.h -#usr/lib/libacl.a #usr/lib/libacl.la usr/lib/libacl.so usr/lib/libacl.so.1 usr/lib/libacl.so.1.1.0 -#usr/libexec/libacl.a -#usr/libexec/libacl.la -usr/libexec/libacl.so -#usr/man/man1/chacl.1 -#usr/man/man1/getfacl.1 -#usr/man/man1/setfacl.1 -#usr/man/man3/acl_add_perm.3 -#usr/man/man3/acl_calc_mask.3 -#usr/man/man3/acl_check.3 -#usr/man/man3/acl_clear_perms.3 -#usr/man/man3/acl_cmp.3 -#usr/man/man3/acl_copy_entry.3 -#usr/man/man3/acl_copy_ext.3 -#usr/man/man3/acl_copy_int.3 -#usr/man/man3/acl_create_entry.3 -#usr/man/man3/acl_delete_def_file.3 -#usr/man/man3/acl_delete_entry.3 -#usr/man/man3/acl_delete_perm.3 -#usr/man/man3/acl_dup.3 -#usr/man/man3/acl_entries.3 -#usr/man/man3/acl_equiv_mode.3 -#usr/man/man3/acl_error.3 -#usr/man/man3/acl_extended_fd.3 -#usr/man/man3/acl_extended_file.3 -#usr/man/man3/acl_free.3 -#usr/man/man3/acl_from_mode.3 -#usr/man/man3/acl_from_text.3 -#usr/man/man3/acl_get_entry.3 -#usr/man/man3/acl_get_fd.3 -#usr/man/man3/acl_get_file.3 -#usr/man/man3/acl_get_perm.3 -#usr/man/man3/acl_get_permset.3 -#usr/man/man3/acl_get_qualifier.3 -#usr/man/man3/acl_get_tag_type.3 -#usr/man/man3/acl_init.3 -#usr/man/man3/acl_set_fd.3 -#usr/man/man3/acl_set_file.3 -#usr/man/man3/acl_set_permset.3 -#usr/man/man3/acl_set_qualifier.3 -#usr/man/man3/acl_set_tag_type.3 -#usr/man/man3/acl_size.3 -#usr/man/man3/acl_to_any_text.3 -#usr/man/man3/acl_to_text.3 -#usr/man/man3/acl_valid.3 -#usr/man/man5/acl.5 #usr/share/doc/acl #usr/share/doc/acl/CHANGES.gz #usr/share/doc/acl/COPYING +#usr/share/doc/acl/COPYING.LGPL #usr/share/doc/acl/PORTING #usr/share/doc/acl/README #usr/share/locale/de/LC_MESSAGES/acl.mo @@ -65,3 +20,46 @@ usr/libexec/libacl.so #usr/share/locale/gl/LC_MESSAGES/acl.mo #usr/share/locale/pl/LC_MESSAGES/acl.mo #usr/share/locale/sv/LC_MESSAGES/acl.mo +#usr/share/man/man1/chacl.1 +#usr/share/man/man1/getfacl.1 +#usr/share/man/man1/setfacl.1 +#usr/share/man/man3/acl_add_perm.3 +#usr/share/man/man3/acl_calc_mask.3 +#usr/share/man/man3/acl_check.3 +#usr/share/man/man3/acl_clear_perms.3 +#usr/share/man/man3/acl_cmp.3 +#usr/share/man/man3/acl_copy_entry.3 +#usr/share/man/man3/acl_copy_ext.3 +#usr/share/man/man3/acl_copy_int.3 +#usr/share/man/man3/acl_create_entry.3 +#usr/share/man/man3/acl_delete_def_file.3 +#usr/share/man/man3/acl_delete_entry.3 +#usr/share/man/man3/acl_delete_perm.3 +#usr/share/man/man3/acl_dup.3 +#usr/share/man/man3/acl_entries.3 +#usr/share/man/man3/acl_equiv_mode.3 +#usr/share/man/man3/acl_error.3 +#usr/share/man/man3/acl_extended_fd.3 +#usr/share/man/man3/acl_extended_file.3 +#usr/share/man/man3/acl_extended_file_nofollow.3 +#usr/share/man/man3/acl_free.3 +#usr/share/man/man3/acl_from_mode.3 +#usr/share/man/man3/acl_from_text.3 +#usr/share/man/man3/acl_get_entry.3 +#usr/share/man/man3/acl_get_fd.3 +#usr/share/man/man3/acl_get_file.3 +#usr/share/man/man3/acl_get_perm.3 +#usr/share/man/man3/acl_get_permset.3 +#usr/share/man/man3/acl_get_qualifier.3 +#usr/share/man/man3/acl_get_tag_type.3 +#usr/share/man/man3/acl_init.3 +#usr/share/man/man3/acl_set_fd.3 +#usr/share/man/man3/acl_set_file.3 +#usr/share/man/man3/acl_set_permset.3 +#usr/share/man/man3/acl_set_qualifier.3 +#usr/share/man/man3/acl_set_tag_type.3 +#usr/share/man/man3/acl_size.3 +#usr/share/man/man3/acl_to_any_text.3 +#usr/share/man/man3/acl_to_text.3 +#usr/share/man/man3/acl_valid.3 +#usr/share/man/man5/acl.5 diff --git a/lfs/acl b/lfs/acl index 047ff5e..de3ac49 100644 --- a/lfs/acl +++ b/lfs/acl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,13 +24,13 @@
include Config
-VER = 2.2.47 +VER = 2.2.52
THISAPP = acl-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).src.tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) +DIR_APP = $(DIR_SRC)/acl-2.2.52 +TARGET = $(DIR_INFO)/acl-2.2.52
############################################################################### # Top-level Rules @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 09c8b9684695527e8f237364afb7811f +$(DL_FILE)_MD5 = a61415312426e9c2212bd7dc7929abda
install : $(TARGET)
@@ -69,11 +69,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib --disable-static cd $(DIR_APP) && make cd $(DIR_APP) && make install cd $(DIR_APP) && make install-lib cd $(DIR_APP) && make install-dev + chmod -v 755 /usr/lib/libacl.so @rm -rf $(DIR_APP) @$(POSTBUILD)