[PATCH] Revert "gdbm: update to 1.13"

[PATCH] Revert "gdbm: update to 1.13"

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 1929 bytes --]

This reverts commit dc539daf8823ef97c931f12b514453c25e867c45.

With "gdbm-Update to 1.13", 'php 5.3.27' failed to build.

Best,
Matthias
---
 lfs/gdbm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lfs/gdbm b/lfs/gdbm
index 82957c652..4db986cf5 100644
--- a/lfs/gdbm
+++ b/lfs/gdbm
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2017  IPFire Team  <info(a)ipfire.org>                          #
+# 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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.13
+VER        = 1.8.3
 
 THISAPP    = gdbm-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8929dcda2a8de3fd2367bdbf66769376
+$(DL_FILE)_MD5 = 1d1b1d5c0245b1c00aff92da751e9aa1
 
 install : $(TARGET)
 
@@ -70,8 +70,9 @@ $(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=$(PREFIX) --disable-nls --disable-static --enable-libgdbm-compat
+	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make BINOWN=root BINGRP=root install
+	cd $(DIR_APP) && make BINOWN=root BINGRP=root install-compat
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-- 
2.11.0

Re: [PATCH] Revert "gdbm: update to 1.13"

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2667 bytes --]

Marcel, could you have a look at why this happened and why this wasn't detected
before the patch was submitted?

Probably it's not anything major, but we of course need the entire distribution
to build from source.

Best,
-Michael

On Wed, 2017-04-19 at 15:26 +0200, Matthias Fischer wrote:
> This reverts commit dc539daf8823ef97c931f12b514453c25e867c45.
> 
> With "gdbm-Update to 1.13", 'php 5.3.27' failed to build.
> 
> Best,
> Matthias
> ---
>  lfs/gdbm | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/lfs/gdbm b/lfs/gdbm
> index 82957c652..4db986cf5 100644
> --- a/lfs/gdbm
> +++ b/lfs/gdbm
> @@ -1,7 +1,7 @@
>  #############################################################################
> ##
>  #                                                                            
>  #
>  # IPFire.org - A linux based
> firewall                                         #
> -# Copyright (C) 2017  IPFire Team  <info(a)ipfire.org>                         
>  #
> +# 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        #
> @@ -24,7 +24,7 @@
>  
>  include Config
>  
> -VER        = 1.13
> +VER        = 1.8.3
>  
>  THISAPP    = gdbm-$(VER)
>  DL_FILE    = $(THISAPP).tar.gz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = 8929dcda2a8de3fd2367bdbf66769376
> +$(DL_FILE)_MD5 = 1d1b1d5c0245b1c00aff92da751e9aa1
>  
>  install : $(TARGET)
>  
> @@ -70,8 +70,9 @@ $(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=$(PREFIX) --disable-nls --
> disable-static --enable-libgdbm-compat
> +	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
>  	cd $(DIR_APP) && make $(MAKETUNING)
>  	cd $(DIR_APP) && make BINOWN=root BINGRP=root install
> +	cd $(DIR_APP) && make BINOWN=root BINGRP=root install-compat
>  	@rm -rf $(DIR_APP)
>  	@$(POSTBUILD)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]