From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcel Lorenz <lorenz.marcel@web.de>
To: development@lists.ipfire.org
Subject: [PATCH] gdbm: update to version 1.11
Date: Thu, 18 Feb 2016 07:40:56 +0100
Message-ID: <1455777656-8670-1-git-send-email-lorenz.marcel@web.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5919734018496226494=="
List-Id: <development.lists.ipfire.org>

--===============5919734018496226494==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Python 2.7.11 need this update, no dbm.so build with current
The lfs file is prepared for tools build. Thie need for later perl 5.22.1 upd=
ate.
---
 config/rootfiles/common/gdbm | 20 ++++++++++++--------
 lfs/gdbm                     | 22 +++++++++++++++++-----
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/config/rootfiles/common/gdbm b/config/rootfiles/common/gdbm
index 90bc8e8..0768e62 100644
--- a/config/rootfiles/common/gdbm
+++ b/config/rootfiles/common/gdbm
@@ -1,15 +1,19 @@
+#usr/bin/gdbm_dump
+#usr/bin/gdbm_load
+#usr/bin/gdbmtool
 #usr/include/dbm.h
 #usr/include/gdbm.h
 #usr/include/ndbm.h
-#usr/info/gdbm.info
-#usr/lib/libgdbm.a
 #usr/lib/libgdbm.la
 usr/lib/libgdbm.so
-usr/lib/libgdbm.so.3
-usr/lib/libgdbm.so.3.0.0
-#usr/lib/libgdbm_compat.a
+usr/lib/libgdbm.so.4
+usr/lib/libgdbm.so.4.0.0
 #usr/lib/libgdbm_compat.la
 usr/lib/libgdbm_compat.so
-usr/lib/libgdbm_compat.so.3
-usr/lib/libgdbm_compat.so.3.0.0
-#usr/man/man3/gdbm.3
+usr/lib/libgdbm_compat.so.4
+usr/lib/libgdbm_compat.so.4.0.0
+#usr/share/info/gdbm.info
+#usr/share/man/man1/gdbm_dump.1
+#usr/share/man/man1/gdbm_load.1
+#usr/share/man/man1/gdbmtool.1
+#usr/share/man/man3/gdbm.3
\ No newline at end of file
diff --git a/lfs/gdbm b/lfs/gdbm
index 4db986c..1051975 100644
--- a/lfs/gdbm
+++ b/lfs/gdbm
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                    =
  #
+# Copyright (C) 2015  IPFire Team  <info(a)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,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 1.8.3
+VER        =3D 1.11
=20
 THISAPP    =3D gdbm-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -32,6 +32,16 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
=20
+# Normal build or /tools build.
+#
+ifeq "$(ROOT)" ""
+	PREFIX =3D /usr
+	TARGET =3D $(DIR_INFO)/$(THISAPP)
+else
+	PREFIX =3D /tools
+	TARGET =3D $(DIR_INFO)/$(THISAPP)-tools
+endif
+
 ############################################################################=
###
 # Top-level Rules
 ############################################################################=
###
@@ -40,7 +50,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 1d1b1d5c0245b1c00aff92da751e9aa1
+$(DL_FILE)_MD5 =3D 72c832680cf0999caedbe5b265c8c1bd
=20
 install : $(TARGET)
=20
@@ -50,6 +60,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
=20
 md5 : $(subst %,%_MD5,$(objects))
=20
+dist:=20
+	@$(PAK)
+
 ############################################################################=
###
 # Downloading, checking, md5sum
 ############################################################################=
###
@@ -70,9 +83,8 @@ $(subst %,%_MD5,$(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=3D/usr --disable-nls
+	cd $(DIR_APP) && ./configure --prefix=3D$(PREFIX) --disable-nls --disable-s=
tatic --enable-libgdbm-compat
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make BINOWN=3Droot BINGRP=3Droot install
-	cd $(DIR_APP) && make BINOWN=3Droot BINGRP=3Droot install-compat
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--=20
1.9.1


--===============5919734018496226494==--