popt: update to 1.16

Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/popt b/config/rootfiles/common/popt
index 23371c66106cadc37c7ce9ee9fa6a85b483e42d5..9383f60ebf02c550c88d98e4c6e7c6c4ec4acb07 100644 (file)
--- 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 ee4c3f914c35ccdac3ba8b26abff8cebf04d3bff..20828de39a24bf2529c05486b4abf4c4567928ca 100644 (file)
--- 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  <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,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