From: Marcel Lorenz Date: Sun, 26 Jun 2016 08:02:54 +0000 (+0200) Subject: popt: update to 1.16 X-Git-Tag: v2.19-core104~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c11dfb92959d60cb73092c8a740c7eabe03a09e0;p=ipfire-2.x.git popt: update to 1.16 Signed-off-by: Marcel Lorenz Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/common/popt b/config/rootfiles/common/popt index 23371c6610..9383f60ebf 100644 --- a/config/rootfiles/common/popt +++ b/config/rootfiles/common/popt @@ -4,4 +4,5 @@ usr/lib/libpopt.so usr/lib/libpopt.so.0 usr/lib/libpopt.so.0.0.0 -#usr/man/man3/popt.3 +#usr/lib/pkgconfig/popt.pc +#usr/share/man/man3/popt.3 diff --git a/lfs/popt b/lfs/popt index ee4c3f914c..20828de39a 100644 --- a/lfs/popt +++ b/lfs/popt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2016 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.10.4 +VER = 1.16 THISAPP = popt-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = dd22a6873b43d00f75e1c1b7dcfd1ff7 +$(DL_FILE)_MD5 = 3743beefa3dd6247a73f8f7a32c14c33 install : $(TARGET) @@ -70,7 +70,6 @@ $(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) && sed -i -e "/*origOptString ==/c 0)" popt.c cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install