From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcel Lorenz <marcel.lorenz@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/3] kmod: update to 23
Date: Sun, 04 Sep 2016 11:14:49 +0200
Message-ID: <20160904091451.18232-2-marcel.lorenz@ipfire.org>
In-Reply-To: <20160904091451.18232-1-marcel.lorenz@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4776627203042271891=="
List-Id: <development.lists.ipfire.org>

--===============4776627203042271891==
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/kmod |  5 +++--
 lfs/kmod                     | 15 ++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/config/rootfiles/common/kmod b/config/rootfiles/common/kmod
index 14e7654..bb74986 100644
--- a/config/rootfiles/common/kmod
+++ b/config/rootfiles/common/kmod
@@ -1,4 +1,6 @@
 bin/kmod
+lib/libkmod.so.2
+lib/libkmod.so.2.3.1
 sbin/depmod
 sbin/insmod
 sbin/lsmod
@@ -8,6 +10,5 @@ sbin/rmmod
 #usr/include/libkmod.h
 #usr/lib/libkmod.la
 usr/lib/libkmod.so
-usr/lib/libkmod.so.2
-usr/lib/libkmod.so.2.2.3
 #usr/lib/pkgconfig/libkmod.pc
+usr/share/bash-completion/completions/kmod
diff --git a/lfs/kmod b/lfs/kmod
index dc2dc10..4495368 100644
--- a/lfs/kmod
+++ b/lfs/kmod
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                    =
  #
+# Copyright (C) 2007-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 13
+VER        =3D 23
=20
 THISAPP    =3D kmod-$(VER)
 DL_FILE    =3D $(THISAPP).tar.xz
@@ -32,6 +32,9 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
=20
+export zlib_CFLAGS=3D"-I/usr/include"
+export zlib_LIBS=3D"-L/usr/lib -L/usr/lib -lz"
+
 ############################################################################=
###
 # Top-level Rules
 ############################################################################=
###
@@ -40,7 +43,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D d5aba43b9370cd52f3cb35e82a1aa595
+$(DL_FILE)_MD5 =3D 3cf469f40ec2ed51f56ba45ea03793e7
=20
 install : $(TARGET)
=20
@@ -74,11 +77,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--prefix=3D/usr \
 		--bindir=3D/bin \
 		--sysconfdir=3D/etc \
-		--enable-zlib \
+		--with-rootlibdir=3D/lib \
+		--with-zlib \
 		--disable-manpages
-
-#		--libdir=3D/lib \
-
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
=20
--=20
2.9.3


--===============4776627203042271891==--