Re: [PATCH] gdbm: update to 1.13

[Michael Tremer <michael.tremer@ipfire.org>]

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

[root(a)rice-oxley ipfire-2.x]# pwclient git-am -s 1071
Applying patch #1071 using 'git am -s'
Description: gdbm: update to 1.13
Applying: gdbm: update to 1.13
fatal: corrupt patch at line 44
Patch failed at 0001 gdbm: update to 1.13
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
'git am' failed with exit status 128

On Fri, 2017-04-14 at 09:40 +0200, Marcel Lorenz wrote:
> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
> ---
>  lfs/gdbm | 19 ++++++++++++++-----
>  1 file changed, 14 insertions(+), 5 deletions(-)
> 
> diff --git a/lfs/gdbm b/lfs/gdbm
> index 4db986c..e2f7025 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) 2017  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 @@
>  
>  include Config
>  
> -VER        = 1.8.3
> +VER        = 1.13
>  
>  THISAPP    = gdbm-$(VER)
>  DL_FILE    = $(THISAPP).tar.gz
> @@ -32,6 +32,16 @@ DL_FROM    = $(URL_IPFIRE)
>  DIR_APP    = $(DIR_SRC)/$(THISAPP)
>  TARGET     = $(DIR_INFO)/$(THISAPP)
>  
>  ####################################################################
> ###########
>  # Top-level Rules
>  ####################################################################
> ###########
> @@ -40,7 +50,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = 1d1b1d5c0245b1c00aff92da751e9aa1
> +$(DL_FILE)_MD5 = 8929dcda2a8de3fd2367bdbf66769376
>  
>  install : $(TARGET)
>  
> @@ -70,9 +80,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=/usr --disable-nls
> +	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-
> nls --disable-static --enable-libgdbm-compat
>  	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 --]