Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org --- config/rootfiles/packages/aarch64/libtalloc | 14 ++++ config/rootfiles/packages/armv5tel/libtalloc | 14 ++++ config/rootfiles/packages/i586/libtalloc | 14 ++++ config/rootfiles/packages/x86_64/libtalloc | 14 ++++ lfs/freeradius | 4 +- lfs/libtalloc | 84 ++++++++++++++++++++ make.sh | 1 + 7 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 config/rootfiles/packages/aarch64/libtalloc create mode 100644 config/rootfiles/packages/armv5tel/libtalloc create mode 100644 config/rootfiles/packages/i586/libtalloc create mode 100644 config/rootfiles/packages/x86_64/libtalloc create mode 100644 lfs/libtalloc
diff --git a/config/rootfiles/packages/aarch64/libtalloc b/config/rootfiles/packages/aarch64/libtalloc new file mode 100644 index 000000000..2e8a0e654 --- /dev/null +++ b/config/rootfiles/packages/aarch64/libtalloc @@ -0,0 +1,14 @@ +#usr/local/include/pytalloc.h +#usr/local/include/talloc.h +#usr/local/lib/libpytalloc-util.cpython-38-aarch64-linux-gnu.so +#usr/local/lib/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2 +#usr/local/lib/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2.3.1 +usr/local/lib/libtalloc.so +usr/local/lib/libtalloc.so.2 +usr/local/lib/libtalloc.so.2.3.1 +#usr/local/lib/pkgconfig +#usr/local/lib/pkgconfig/pytalloc-util.cpython-38-aarch64-linux-gnu.pc +#usr/local/lib/pkgconfig/talloc.pc +#usr/local/lib/python3.8 +#usr/local/lib/python3.8/site-packages +#usr/local/lib/python3.8/site-packages/talloc.cpython-38-aarch64-linux-gnu.so diff --git a/config/rootfiles/packages/armv5tel/libtalloc b/config/rootfiles/packages/armv5tel/libtalloc new file mode 100644 index 000000000..0b7e96b54 --- /dev/null +++ b/config/rootfiles/packages/armv5tel/libtalloc @@ -0,0 +1,14 @@ +#usr/local/include/pytalloc.h +#usr/local/include/talloc.h +#usr/local/lib/libpytalloc-util.cpython-38-arm-linux-gnu.so +#usr/local/lib/libpytalloc-util.cpython-38-arm-linux-gnu.so.2 +#usr/local/lib/libpytalloc-util.cpython-38-arm-linux-gnu.so.2.3.1 +usr/local/lib/libtalloc.so +usr/local/lib/libtalloc.so.2 +usr/local/lib/libtalloc.so.2.3.1 +#usr/local/lib/pkgconfig +#usr/local/lib/pkgconfig/pytalloc-util.cpython-38-arm-linux-gnu.pc +#usr/local/lib/pkgconfig/talloc.pc +#usr/local/lib/python3.8 +#usr/local/lib/python3.8/site-packages +#usr/local/lib/python3.8/site-packages/talloc.cpython-38-arm-linux-gnu.so diff --git a/config/rootfiles/packages/i586/libtalloc b/config/rootfiles/packages/i586/libtalloc new file mode 100644 index 000000000..145a3b7f1 --- /dev/null +++ b/config/rootfiles/packages/i586/libtalloc @@ -0,0 +1,14 @@ +#usr/local/include/pytalloc.h +#usr/local/include/talloc.h +#usr/local/lib/libpytalloc-util.cpython-38-i386-linux-gnu.so +#usr/local/lib/libpytalloc-util.cpython-38-i386-linux-gnu.so.2 +#usr/local/lib/libpytalloc-util.cpython-38-i386-linux-gnu.so.2.3.1 +usr/local/lib/libtalloc.so +usr/local/lib/libtalloc.so.2 +usr/local/lib/libtalloc.so.2.3.1 +#usr/local/lib/pkgconfig +#usr/local/lib/pkgconfig/pytalloc-util.cpython-38-i386-linux-gnu.pc +#usr/local/lib/pkgconfig/talloc.pc +#usr/local/lib/python3.8 +#usr/local/lib/python3.8/site-packages +#usr/local/lib/python3.8/site-packages/talloc.cpython-38-i386-linux-gnu.so diff --git a/config/rootfiles/packages/x86_64/libtalloc b/config/rootfiles/packages/x86_64/libtalloc new file mode 100644 index 000000000..3a03933c9 --- /dev/null +++ b/config/rootfiles/packages/x86_64/libtalloc @@ -0,0 +1,14 @@ +#usr/local/include/pytalloc.h +#usr/local/include/talloc.h +#usr/local/lib/libpytalloc-util.cpython-38-x86_64-linux-gnu.so +#usr/local/lib/libpytalloc-util.cpython-38-x86_64-linux-gnu.so.2 +#usr/local/lib/libpytalloc-util.cpython-38-x86_64-linux-gnu.so.2.3.1 +usr/local/lib/libtalloc.so +usr/local/lib/libtalloc.so.2 +usr/local/lib/libtalloc.so.2.3.1 +#usr/local/lib/pkgconfig +#usr/local/lib/pkgconfig/pytalloc-util.cpython-38-x86_64-linux-gnu.pc +#usr/local/lib/pkgconfig/talloc.pc +#usr/local/lib/python3.8 +#usr/local/lib/python3.8/site-packages +#usr/local/lib/python3.8/site-packages/talloc.cpython-38-x86_64-linux-gnu.so diff --git a/lfs/freeradius b/lfs/freeradius index 3453d8e4d..08cf946c6 100644 --- a/lfs/freeradius +++ b/lfs/freeradius @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = freeradius -PAK_VER = 10 +PAK_VER = 11
-DEPS = samba +DEPS = libtalloc
ifeq "$(BUILD_ARCH)" "armv5tel" LDFLAGS += -latomic diff --git a/lfs/libtalloc b/lfs/libtalloc new file mode 100644 index 000000000..098290d7f --- /dev/null +++ b/lfs/libtalloc @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 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 # +# 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 + +VER = 2.3.1 + +THISAPP = talloc-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libtalloc +PAK_VER = 1 + +DEPS = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = ce40593428c0de6b85946189dcc37b5e + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + $(PAK) + +############################################################################### +# 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 zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 2dd92c4d7..83cf974d9 100755 --- a/make.sh +++ b/make.sh @@ -1621,6 +1621,7 @@ buildipfire() { lfsmake2 libpciaccess lfsmake2 libyajl lfsmake2 libvirt + lfsmake2 libtalloc lfsmake2 freeradius lfsmake2 perl-common-sense lfsmake2 perl-inotify2