Added libcap2 and attr

diff --git a/lfs/libcap b/lfs/attr
similarity index 75%
rename from lfs/libcap
rename to lfs/attr
index 914845e974b811d49e298a393bc944f7fa53cdf7..91b050b29d626476f3264d320b118bf985906e31 100644 (file)
--- a/lfs/libcap
+++ b/lfs/attr
@@ -24,13 +24,14 @@
 
 include Config
 
-VER        = 1.10
+PKG_NAME   = attr
+VER        = 2.4.41
 
-THISAPP    = libcap-$(VER)
+THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+
+TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -38,31 +39,13 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 
 objects = $(DL_FILE)
 
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 2c09eea823f67cfdde96177a959bc39b
-
 install : $(TARGET)
 
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
 download : $(objects)
 
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
 $(objects) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
 ###############################################################################
 # Installation Details
 ###############################################################################
@@ -70,10 +53,15 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : 
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-syscall.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-shared.patch
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/bin --enable-shared
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
-       chmod +x /lib/libcap.so.*
+
+       install -v -m0755 $(DIR_APP)/libattr/.libs/libattr.so.1.1.0 /lib
+       ln -vsf libattr.so.1.1.0 /lib/libattr.so.1
+       ln -vsf libattr.so.1.1.0 /lib/libattr.so
+       install -v -d /usr/include/attr
+       install -v -m0644 $(DIR_APP)/include/xattr.h /usr/include/attr/
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/libcap2 b/lfs/libcap2
new file mode 100644 (file)
index 0000000..ec8c11d
--- /dev/null
+++ b/lfs/libcap2
@@ -0,0 +1,60 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+PKG_NAME   = libcap
+VER        = 2.10
+
+THISAPP    = $(PKG_NAME)-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
+TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+install : $(TARGET)
+
+download : $(objects)
+
+$(objects) :
+       @$(LOAD)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : 
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && sed 's/--static//' -i.orig progs/Makefile
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index a62728442e622b6afb30a80193cab064983f821e..6af979a7624c0eb330900ec729e1c00024187ab0 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -116,6 +116,10 @@ base_build() {
        ipfire_make perl
        ipfire_make readline
        ipfire_make zlib
+       ipfire_make gettext
+       ipfire_make make
+       ipfire_make attr
+       ipfire_make libcap2
        ipfire_make autoconf
        ipfire_make automake
        ipfire_make bash
@@ -126,7 +130,6 @@ base_build() {
        ipfire_make flex
        ipfire_make grub
        ipfire_make gawk
-       ipfire_make gettext
        ipfire_make grep
        ipfire_make groff
        ipfire_make gzip
@@ -134,7 +137,6 @@ base_build() {
        ipfire_make iproute2
        ipfire_make kbd
        ipfire_make less
-       ipfire_make make
        ipfire_make man-db
        ipfire_make module-init-tools
        ipfire_make patch