X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fpatch;h=64576c350e054d8194d68cebfb128515f2d103f4;hb=a8387f8d6e246ec8d84e113468bb3c4793afad9a;hp=6d7212ff97d231901706e8047fd96868ceb3e271;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=ipfire-2.x.git diff --git a/lfs/patch b/lfs/patch index 6d7212ff97..64576c350e 100644 --- a/lfs/patch +++ b/lfs/patch @@ -1,28 +1,20 @@ ############################################################################### -# This file is part of the IPCop Firewall. # # # -# IPCop is free software; you can redistribute it and/or modify # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team # +# # +# 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 2 of the License, or # +# the Free Software Foundation, either version 3 of the License, or # # (at your option) any later version. # # # -# IPCop is distributed in the hope that it will be useful, # +# 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 IPCop; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Makefiles are based on LFSMake, which is # -# Copyright (C) 2002 Rod Roard # -# # -# Modifications by: # -# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # -# - Modified Makefile for IPCop build # -# # -# $Id: patch,v 1.3.2.2 2005/02/05 15:38:15 gespinasse Exp $ +# along with this program. If not, see . # # # ############################################################################### @@ -32,25 +24,19 @@ include Config -VER = 2.5.4 +VER = 2.7.5 THISAPP = patch-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_GNU)/patch +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -# Normal build or /tools build. +# Normal build or $(TOOLS_DIR) build. # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - EXTRA_CONFIG = --prefix=/usr --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=/tools --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = endif ############################################################################### @@ -61,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ee5ae84d115f051d87fcaaef3b4ae782 +$(DL_FILE)_MD5 = e3da7940431633fb65a01b91d3b7a27a install : $(TARGET) @@ -90,9 +76,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) && CPPFLAGS=-D_GNU_SOURCE ./configure $(EXTRA_CONFIG) - cd $(DIR_APP) && make $(EXTRA_MAKE) - cd $(DIR_APP) && make $(EXTRA_INSTALL) install + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD)