X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fpopt;h=7b5d3f962d339cb3935d3eb9c90577c30c1a69f3;hp=4fffc78a7cbb12245dae9e630cd36669cb983b04;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=41cfd9e04b1a06d242432e682ab5601f933c0e21

diff --git a/lfs/popt b/lfs/popt
index 4fffc78a7c..7b5d3f962d 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) 2007-2018  IPFire Team  <info@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.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,8 +70,7 @@ $(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) && autoreconf -f -i
+	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install