libtalloc: Update to version 2.4.2 plus moved before cifs-utils

- Update from version 2.4.1 to 2.4.2
- Update of rootfile
- Moved to before cifs-utils in make.sh as now a required dependency for cifs-utils
- The last changelog is recorded in the sourcde tarball is from 2007 and I have been
   unable to find anywhere where the changes can be identified. So updated on the
   principle of having the latest version and both samba and cifs-utils now require it.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/packages/libtalloc b/config/rootfiles/packages/libtalloc
index 6e131085fd4a36fe9d3a9cdef78e40edd4287c29..448ad0fc02060ff0faef137b3d28a1858aaf3fb4 100644 (file)
--- a/config/rootfiles/packages/libtalloc
+++ b/config/rootfiles/packages/libtalloc
@@ -1,5 +1,5 @@
 #usr/include/talloc.h
 #usr/lib/libtalloc.so
 usr/lib/libtalloc.so.2
-usr/lib/libtalloc.so.2.4.1
+usr/lib/libtalloc.so.2.4.2
 #usr/lib/pkgconfig/talloc.pc

diff --git a/lfs/libtalloc b/lfs/libtalloc
index 9bb3f05c06fe6c1a1e5b88757d41f54775b08b12..27c509a27fc7b3901e7637e1e96e17073f2c355f 100644 (file)
--- a/lfs/libtalloc
+++ b/lfs/libtalloc
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = Samba talloc Library
 
-VER        = 2.4.1
+VER        = 2.4.2
 
 THISAPP    = talloc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libtalloc
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       =
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = a7913b25930c77da53c17c2e0d71386402b1059f93c751084037c5068a035bd543c2d7e24a2d8dc989bb4eea13fa1a3c7a362e4d6c14af0b2030fbfb2f513801
+$(DL_FILE)_BLAKE2 = 1f836d6b11e096e399ad7b99ad4abd3c140e75ee307695659c35b89eca600de247e5432bce523a299334f20ca2dad4c726b783a94c546b67fe25b2b7199b2915
 
 install : $(TARGET)
 
@@ -81,7 +81,9 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-python
+       cd $(DIR_APP) && ./configure \
+                               --prefix=/usr \
+                               --disable-python
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/make.sh b/make.sh
index 3a76e6366fc9087950448b89b0894179a43f10a0..04aff025dc77863f2d4027cebce12c2809f880d0 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1802,6 +1802,7 @@ build_system() {
        lfsmake2 cups-pdf
        lfsmake2 foomatic
        lfsmake2 hplip
+       lfsmake2 libtalloc
        lfsmake2 cifs-utils
        lfsmake2 krb5
        lfsmake2 rpcsvc-proto
@@ -2034,7 +2035,6 @@ build_system() {
        lfsmake2 libpciaccess
        lfsmake2 libyajl
        lfsmake2 libvirt
-       lfsmake2 libtalloc
        lfsmake2 freeradius
        lfsmake2 perl-common-sense
        lfsmake2 perl-inotify2