[PATCH] sed: update to 4.3

[PATCH] sed: update to 4.3

[Marcel Lorenz]

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

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
 lfs/sed | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lfs/sed b/lfs/sed
index 77eba0b..8f85a54 100644
--- a/lfs/sed
+++ b/lfs/sed
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2016  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2016  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,10 +24,10 @@
 
 include Config
 
-VER        = 4.2.2
+VER        = 4.3
 
 THISAPP    = sed-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
@@ -53,7 +53,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4111de4faa3b9848a0686b2f260c5056
+$(DL_FILE)_MD5 = 1957fe58dffa4a4106c1f1d7cc8dee18
 
 install : $(TARGET)
 
@@ -82,7 +82,9 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && sed -i 's/usr/tools/' build-aux/help2man
+	cd $(DIR_APP) && sed -i 's/panic-tests.sh//' Makefile.in
 	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
-- 
2.9.3

Re: [PATCH] sed: update to 4.3

[Michael Tremer]

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

On Tue, 2017-06-06 at 10:53 +0200, Marcel Lorenz wrote:
> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
> ---
>  lfs/sed | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/lfs/sed b/lfs/sed
> index 77eba0b..8f85a54 100644
> --- a/lfs/sed
> +++ b/lfs/sed
> @@ -1,7 +1,7 @@
>  #############################################################################
> ##
>  #                                                                            
>  #
>  # IPFire.org - A linux based
> firewall                                         #
> -# Copyright (C) 2016  Michael Tremer & Christian
> Schmidt                      #
> +# Copyright (C) 2016  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,10 +24,10 @@
>  
>  include Config
>  
> -VER        = 4.2.2
> +VER        = 4.3
>  
>  THISAPP    = sed-$(VER)
> -DL_FILE    = $(THISAPP).tar.gz
> +DL_FILE    = $(THISAPP).tar.xz
>  DL_FROM    = $(URL_IPFIRE)
>  DIR_APP    = $(DIR_SRC)/$(THISAPP)
>  
> @@ -53,7 +53,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = 4111de4faa3b9848a0686b2f260c5056
> +$(DL_FILE)_MD5 = 1957fe58dffa4a4106c1f1d7cc8dee18
>  
>  install : $(TARGET)
>  
> @@ -82,7 +82,9 @@ $(subst %,%_MD5,$(objects)) :
>  
>  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	@$(PREBUILD)
> -	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> +	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
> +	cd $(DIR_APP) && sed -i 's/usr/tools/' build-aux/help2man
> +	cd $(DIR_APP) && sed -i 's/panic-tests.sh//' Makefile.in

We do not run tests, so these lines do not do anything for us.

>  	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
>  	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
>  	cd $(DIR_APP) && make $(EXTRA_INSTALL) install

-Michael

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