From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcel Lorenz <marcel.lorenz@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] popt: update to 1.16
Date: Sun, 26 Jun 2016 10:02:54 +0200
Message-ID: <1466928174-15190-1-git-send-email-marcel.lorenz@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2440434231219464231=="
List-Id: <development.lists.ipfire.org>

--===============2440434231219464231==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
 config/rootfiles/common/popt | 3 ++-
 lfs/popt                     | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/rootfiles/common/popt b/config/rootfiles/common/popt
index 23371c6..9383f60 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 ee4c3f9..20828de 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  <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,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 1.10.4
+VER        =3D 1.16
=20
 THISAPP    =3D popt-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D dd22a6873b43d00f75e1c1b7dcfd1ff7
+$(DL_FILE)_MD5 =3D 3743beefa3dd6247a73f8f7a32c14c33
=20
 install : $(TARGET)
=20
@@ -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 =3D=3D/c 0)" popt.c
 	cd $(DIR_APP) && ./configure --prefix=3D/usr --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
--=20
1.9.1


--===============2440434231219464231==--