From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 2/2] New package: lmdb 0.9.24 - required for knot 3.0.0
Date: Thu, 17 Sep 2020 16:03:05 +0100
Message-ID: <BD186539-E604-4957-9E17-2110EC4E8C2F@ipfire.org>
In-Reply-To: <20200913150439.1397-2-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7219251901095315242=="
List-Id: <development.lists.ipfire.org>

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

Hi,

> On 13 Sep 2020, at 16:04, Matthias Fischer <matthias.fischer(a)ipfire.org> =
wrote:
>=20
> Lightning Memory-mapped Database from symas.
>=20
> For details see:
> https://symas.com/lmdb/
>=20
> In contrast to the information from the knot documentation
> (see: https://www.knot-dns.cz/docs/3.0/html/requirements.html#required-libr=
aries),
> this library is no longer included.
>=20
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
> config/rootfiles/common/lmdb | 10 +++++
> lfs/lmdb                     | 83 ++++++++++++++++++++++++++++++++++++
> make.sh                      |  1 +
> 3 files changed, 94 insertions(+)
> create mode 100644 config/rootfiles/common/lmdb
> create mode 100644 lfs/lmdb
>=20
> diff --git a/config/rootfiles/common/lmdb b/config/rootfiles/common/lmdb
> new file mode 100644
> index 000000000..a65849b9e
> --- /dev/null
> +++ b/config/rootfiles/common/lmdb
> @@ -0,0 +1,10 @@
> +#usr/bin/mdb_copy
> +#usr/bin/mdb_dump
> +#usr/bin/mdb_load
> +#usr/bin/mdb_stat
> +#usr/include/lmdb.h
> +usr/lib/liblmdb.so

Hmm, this isn=E2=80=99t great that they are not versioning the library.

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> +#usr/share/man/man1/mdb_copy.1
> +#usr/share/man/man1/mdb_dump.1
> +#usr/share/man/man1/mdb_load.1
> +#usr/share/man/man1/mdb_stat.1
> diff --git a/lfs/lmdb b/lfs/lmdb
> new file mode 100644
> index 000000000..1f496cd61
> --- /dev/null
> +++ b/lfs/lmdb
> @@ -0,0 +1,83 @@
> +##########################################################################=
#####
> +#                                                                         =
    #
> +# IPFire.org - A linux based firewall                                     =
    #
> +# Copyright (C) 2007-2020  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    =
    #
> +# 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        =3D 0.9.24
> +
> +THISAPP    =3D lmdb-LMDB_$(VER)
> +DL_FILE    =3D $(THISAPP).tar.gz
> +DL_FROM    =3D $(URL_IPFIRE)
> +DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
> +TARGET     =3D $(DIR_INFO)/$(THISAPP)
> +
> +##########################################################################=
#####
> +# Top-level Rules
> +##########################################################################=
#####
> +
> +objects =3D $(DL_FILE)
> +
> +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
> +
> +$(DL_FILE)_MD5 =3D c3e3474daf4a59685d154cc7fc5c99ad
> +
> +install : $(TARGET)
> +
> +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> +
> +download :$(patsubst %,$(DIR_DL)/%,$(objects))
> +
> +md5 : $(subst %,%_MD5,$(objects))
> +
> +dist:=20
> +	@$(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 axf $(DIR_DL)/$(DL_FILE)
> +
> +	cd $(DIR_APP)/libraries/liblmdb && make $(MAKETUNING)
> +	cd $(DIR_APP)/libraries/liblmdb && sed -i 's| liblmdb.a||' Makefile
> +	cd $(DIR_APP)/libraries/liblmdb && make prefix=3D/usr install
> +
> +	@rm -rf $(DIR_APP)
> +	@$(POSTBUILD)
> +
> diff --git a/make.sh b/make.sh
> index 4a9dd3cb6..27a9bf768 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1632,6 +1632,7 @@ buildipfire() {
>   lfsmake2 dehydrated
>   lfsmake2 shairport-sync
>   lfsmake2 borgbackup
> +  lfsmake2 lmdb
>   lfsmake2 knot
>   lfsmake2 spectre-meltdown-checker
>   lfsmake2 zabbix_agentd
> --=20
> 2.18.0
>=20


--===============7219251901095315242==--