From 989a31e20cbc97b37227b513b5b584e0ec94f38c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 30 Nov 2010 15:38:32 +0100 Subject: [PATCH] Add acl support for samba and rsync. --- config/rootfiles/common/acl | 67 ++++++++++++++++++++++ config/rootfiles/common/attr | 33 +++++++++++ config/rootfiles/core/43/filelists/acl | 1 + lfs/acl | 79 ++++++++++++++++++++++++++ lfs/attr | 10 +--- lfs/rsync | 4 +- lfs/samba | 2 +- make.sh | 1 + 8 files changed, 187 insertions(+), 10 deletions(-) create mode 100644 config/rootfiles/common/acl create mode 120000 config/rootfiles/core/43/filelists/acl create mode 100644 lfs/acl diff --git a/config/rootfiles/common/acl b/config/rootfiles/common/acl new file mode 100644 index 0000000000..630e4c756e --- /dev/null +++ b/config/rootfiles/common/acl @@ -0,0 +1,67 @@ +usr/bin/chacl +usr/bin/getfacl +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/PORTING +#usr/share/doc/acl/README +#usr/share/locale/de/LC_MESSAGES/acl.mo +#usr/share/locale/es/LC_MESSAGES/acl.mo +#usr/share/locale/fr/LC_MESSAGES/acl.mo +#usr/share/locale/gl/LC_MESSAGES/acl.mo +#usr/share/locale/pl/LC_MESSAGES/acl.mo +#usr/share/locale/sv/LC_MESSAGES/acl.mo diff --git a/config/rootfiles/common/attr b/config/rootfiles/common/attr index 60da05e44c..1d9cfc05b7 100644 --- a/config/rootfiles/common/attr +++ b/config/rootfiles/common/attr @@ -1,13 +1,46 @@ usr/bin/attr usr/bin/getfattr usr/bin/setfattr +#usr/include/attr +#usr/include/attr/attributes.h +#usr/include/attr/error_context.h +#usr/include/attr/libattr.h +#usr/include/attr/xattr.h +#usr/lib/libattr.a #usr/lib/libattr.la usr/lib/libattr.so usr/lib/libattr.so.1 usr/lib/libattr.so.1.1.0 +#usr/libexec +#usr/libexec/libattr.a +#usr/libexec/libattr.la +usr/libexec/libattr.so #usr/man/man1/attr.1 #usr/man/man1/getfattr.1 #usr/man/man1/setfattr.1 +#usr/man/man2 +#usr/man/man2/fgetxattr.2 +#usr/man/man2/flistxattr.2 +#usr/man/man2/fremovexattr.2 +#usr/man/man2/fsetxattr.2 +#usr/man/man2/getxattr.2 +#usr/man/man2/lgetxattr.2 +#usr/man/man2/listxattr.2 +#usr/man/man2/llistxattr.2 +#usr/man/man2/lremovexattr.2 +#usr/man/man2/lsetxattr.2 +#usr/man/man2/removexattr.2 +#usr/man/man2/setxattr.2 +#usr/man/man3/attr_get.3 +#usr/man/man3/attr_getf.3 +#usr/man/man3/attr_list.3 +#usr/man/man3/attr_listf.3 +#usr/man/man3/attr_multi.3 +#usr/man/man3/attr_multif.3 +#usr/man/man3/attr_remove.3 +#usr/man/man3/attr_removef.3 +#usr/man/man3/attr_set.3 +#usr/man/man3/attr_setf.3 #usr/man/man5/attr.5 #usr/share/doc/attr #usr/share/doc/attr/CHANGES.gz diff --git a/config/rootfiles/core/43/filelists/acl b/config/rootfiles/core/43/filelists/acl new file mode 120000 index 0000000000..d819f9c480 --- /dev/null +++ b/config/rootfiles/core/43/filelists/acl @@ -0,0 +1 @@ +../../../common/acl \ No newline at end of file diff --git a/lfs/acl b/lfs/acl new file mode 100644 index 0000000000..047ff5edf0 --- /dev/null +++ b/lfs/acl @@ -0,0 +1,79 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2010 IPFire Team # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.2.47 + +THISAPP = acl-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 09c8b9684695527e8f237364afb7811f + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure + cd $(DIR_APP) && make + cd $(DIR_APP) && make install + cd $(DIR_APP) && make install-lib + cd $(DIR_APP) && make install-dev + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/attr b/lfs/attr index a7c0ab8a3f..2794ad69f5 100644 --- a/lfs/attr +++ b/lfs/attr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team # # # # 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 # @@ -73,11 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure cd $(DIR_APP) && make cd $(DIR_APP) && make install - # Install libattr - cp $(DIR_APP)/libattr/.libs/libattr.so* /usr/lib - cp $(DIR_APP)/libattr/libattr.la /usr/lib - # Install includes -# -mkdir /usr/include/attr -# cp -f $(DIR_APP)/include/*.h /usr/include/attr + cd $(DIR_APP) && make install-lib + cd $(DIR_APP) && make install-dev @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/rsync b/lfs/rsync index 38a2a9f7f3..a68e191afd 100644 --- a/lfs/rsync +++ b/lfs/rsync @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team # # # # 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 # @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = rsync -PAK_VER = 4 +PAK_VER = 5 DEPS = "" diff --git a/lfs/samba b/lfs/samba index 8a354d85df..2740ac50f2 100644 --- a/lfs/samba +++ b/lfs/samba @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 31 +PAK_VER = 32 DEPS = "cups" diff --git a/make.sh b/make.sh index a519f405f6..4d49eaaf3a 100755 --- a/make.sh +++ b/make.sh @@ -432,6 +432,7 @@ buildipfire() { ipfiremake slang ipfiremake newt ipfiremake attr + ipfiremake acl ipfiremake libcap ipfiremake pciutils ipfiremake usbutils -- 2.39.2