dragora/patches/kmod/kmod-25_lzip-0.diff

diff -urdN kmod-25.orig/Makefile.am kmod-25/Makefile.am
--- kmod-25.orig/Makefile.am	2018-01-08 22:51:26.000000000 +0100
+++ kmod-25/Makefile.am	2018-04-17 23:55:35.000000000 +0200
@@ -19,7 +19,7 @@
 	-include $(top_builddir)/config.h \
 	-I$(top_srcdir) \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	${zlib_CFLAGS}
+	${lzlib_CFLAGS} ${zlib_CFLAGS}
 
 AM_CFLAGS = $(OUR_CFLAGS)
 AM_LDFLAGS = $(OUR_LDFLAGS)
@@ -33,6 +33,8 @@
 	-e 's,@includedir\@,$(includedir),g' \
 	-e 's,@liblzma_CFLAGS\@,${liblzma_CFLAGS},g' \
 	-e 's,@liblzma_LIBS\@,${liblzma_LIBS},g' \
+	-e 's,@lzlib_CFLAGS\@,${lzlib_CFLAGS},g' \
+	-e 's,@lzlib_LIBS\@,${lzlib_LIBS},g' \
 	-e 's,@zlib_CFLAGS\@,${zlib_CFLAGS},g' \
 	-e 's,@zlib_LIBS\@,${zlib_LIBS},g' \
 	< $< > $@ || rm $@
@@ -87,7 +89,7 @@
 	${top_srcdir}/libkmod/libkmod.sym
 libkmod_libkmod_la_LIBADD = \
 	shared/libshared.la \
-	${liblzma_LIBS} ${zlib_LIBS}
+	${liblzma_LIBS} ${lzlib_LIBS} ${zlib_LIBS}
 
 noinst_LTLIBRARIES += libkmod/libkmod-internal.la
 libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES)
diff -urdN kmod-25.orig/Makefile.in kmod-25/Makefile.in
--- kmod-25.orig/Makefile.in	2018-01-09 02:26:05.000000000 +0100
+++ kmod-25/Makefile.in	2018-04-17 23:55:35.000000000 +0200
@@ -884,6 +884,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+lzlib_CFLAGS = @lzlib_CFLAGS@
+lzlib_LIBS = @lzlib_LIBS@
 zlib_CFLAGS = @zlib_CFLAGS@
 zlib_LIBS = @zlib_LIBS@
 SUBDIRS = . libkmod/docs $(am__append_1)
@@ -933,7 +935,7 @@
 	-include $(top_builddir)/config.h \
 	-I$(top_srcdir) \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	${zlib_CFLAGS}
+	${lzlib_CFLAGS} ${zlib_CFLAGS}
 
 AM_CFLAGS = $(OUR_CFLAGS)
 AM_LDFLAGS = $(OUR_LDFLAGS)
@@ -946,6 +948,8 @@
 	-e 's,@includedir\@,$(includedir),g' \
 	-e 's,@liblzma_CFLAGS\@,${liblzma_CFLAGS},g' \
 	-e 's,@liblzma_LIBS\@,${liblzma_LIBS},g' \
+	-e 's,@lzlib_CFLAGS\@,${lzlib_CFLAGS},g' \
+	-e 's,@lzlib_LIBS\@,${lzlib_LIBS},g' \
 	-e 's,@zlib_CFLAGS\@,${zlib_CFLAGS},g' \
 	-e 's,@zlib_LIBS\@,${zlib_LIBS},g' \
 	< $< > $@ || rm $@
@@ -993,7 +997,7 @@
 
 libkmod_libkmod_la_LIBADD = \
 	shared/libshared.la \
-	${liblzma_LIBS} ${zlib_LIBS}
+	${liblzma_LIBS} ${lzlib_LIBS} ${zlib_LIBS}
 
 libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES)
 libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS) \
diff -urdN kmod-25.orig/README kmod-25/README
--- kmod-25.orig/README	2017-12-07 23:05:47.000000000 +0100
+++ kmod-25/README	2018-04-17 23:55:35.000000000 +0200
@@ -51,6 +51,7 @@
 
 Optional dependencies:
 	- ZLIB library
+	- LZLIB library
 	- LZMA library
 
 Typical configuration:
diff -urdN kmod-25.orig/config.h.in kmod-25/config.h.in
--- kmod-25.orig/config.h.in	2018-01-09 02:31:04.000000000 +0100
+++ kmod-25/config.h.in	2018-04-17 23:55:35.000000000 +0200
@@ -12,6 +12,9 @@
 /* Enable Xz for modules. */
 #undef ENABLE_XZ
 
+/* Enable lzlib for modules. */
+#undef ENABLE_LZLIB
+
 /* Enable zlib for modules. */
 #undef ENABLE_ZLIB
 
diff -urdN kmod-25.orig/configure kmod-25/configure
--- kmod-25.orig/configure	2018-01-09 02:26:04.000000000 +0100
+++ kmod-25/configure	2018-04-17 23:55:35.000000000 +0200
@@ -688,6 +688,8 @@
 bashcompletiondir
 zlib_LIBS
 zlib_CFLAGS
+lzlib_LIBS
+lzlib_CFLAGS
 liblzma_LIBS
 liblzma_CFLAGS
 rootlibdir
@@ -833,6 +835,7 @@
 enable_libtool_lock
 with_rootlibdir
 with_xz
+with_lzlib
 with_zlib
 with_bashcompletiondir
 enable_experimental
@@ -863,6 +866,8 @@
 PKG_CONFIG_LIBDIR
 liblzma_CFLAGS
 liblzma_LIBS
+lzlib_CFLAGS
+lzlib_LIBS
 zlib_CFLAGS
 zlib_LIBS
 PYTHON
@@ -1532,6 +1537,7 @@
                           compiler's sysroot if not specified).
   --with-rootlibdir=DIR   rootfs directory to install shared libraries
   --with-xz               handle Xz-compressed modules [default=disabled]
+  --with-lzlib            handle lzipped modules [default=disabled]
   --with-zlib             handle gzipped modules [default=disabled]
   --with-bashcompletiondir=DIR
                           Bash completions directory
@@ -1557,6 +1563,9 @@
               C compiler flags for liblzma, overriding pkg-config
   liblzma_LIBS
               linker flags for liblzma, overriding pkg-config
+  lzlib_CFLAGS
+              C compiler flags for lzlib, overriding pkg-config
+  lzlib_LIBS  linker flags for lzlib, overriding pkg-config
   zlib_CFLAGS C compiler flags for zlib, overriding pkg-config
   zlib_LIBS   linker flags for zlib, overriding pkg-config
   PYTHON      the Python interpreter
@@ -13751,6 +13760,142 @@
 
 
 
+# Check whether --with-lzlib was given.
+if test "${with_lzlib+set}" = set; then :
+  withval=$with_lzlib;
+else
+  with_lzlib=no
+fi
+
+if test "x$with_lzlib" != "xno"; then :
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzlib" >&5
+$as_echo_n "checking for lzlib... " >&6; }
+
+if test -n "$lzlib_CFLAGS"; then
+    pkg_cv_lzlib_CFLAGS="$lzlib_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lzlib\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "lzlib") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_lzlib_CFLAGS=`$PKG_CONFIG --cflags "lzlib" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$lzlib_LIBS"; then
+    pkg_cv_lzlib_LIBS="$lzlib_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lzlib\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "lzlib") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_lzlib_LIBS=`$PKG_CONFIG --libs "lzlib" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        lzlib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lzlib" 2>&1`
+        else
+	        lzlib_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lzlib" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$lzlib_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (lzlib) were not met:
+
+$lzlib_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables lzlib_CFLAGS
+and lzlib_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables lzlib_CFLAGS
+and lzlib_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	lzlib_CFLAGS=$pkg_cv_lzlib_CFLAGS
+	lzlib_LIBS=$pkg_cv_lzlib_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+$as_echo "#define ENABLE_LZLIB 1" >>confdefs.h
+
+
+else
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: lzlib support not requested" >&5
+$as_echo "$as_me: lzlib support not requested" >&6;}
+
+fi
+
+
+  case " $with_features "  in #(
+  *" LZLIB "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : with_features already contains LZLIB"; } >&5
+  (: with_features already contains LZLIB) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+	    if test "x$with_features" != "x"; then :
+  as_fn_append with_features " "
+fi
+            if test "x$with_lzlib" = "xyes"; then :
+  as_fn_append with_features "+LZLIB"
+else
+  as_fn_append with_features "-LZLIB"
+fi
+
+   ;;
+esac
+
+
+
+
 # Check whether --with-zlib was given.
 if test "${with_zlib+set}" = set; then :
   withval=$with_zlib;
@@ -17499,7 +17644,7 @@
 	tools:			${enable_tools}
 	python bindings:	${enable_python}
 	logging:		${enable_logging}
-	compression:		xz=${with_xz}  zlib=${with_zlib}
+	compression:		xz=${with_xz}  lzlib=${with_lzlib}  zlib=${with_zlib}
 	debug:			${enable_debug}
 	coverage:		${enable_coverage}
 	doc:			${enable_gtk_doc}
@@ -17528,7 +17673,7 @@
 	tools:			${enable_tools}
 	python bindings:	${enable_python}
 	logging:		${enable_logging}
-	compression:		xz=${with_xz}  zlib=${with_zlib}
+	compression:		xz=${with_xz}  lzlib=${with_lzlib}  zlib=${with_zlib}
 	debug:			${enable_debug}
 	coverage:		${enable_coverage}
 	doc:			${enable_gtk_doc}
diff -urdN kmod-25.orig/configure.ac kmod-25/configure.ac
--- kmod-25.orig/configure.ac	2018-01-08 22:51:04.000000000 +0100
+++ kmod-25/configure.ac	2018-04-17 23:55:35.000000000 +0200
@@ -95,6 +95,17 @@
 ])
 CC_FEATURE_APPEND([with_features], [with_xz], [XZ])
 
+AC_ARG_WITH([lzlib],
+	AS_HELP_STRING([--with-lzlib], [handle lzipped modules @<:@default=disabled@:>@]),
+	[], [with_lzlib=no])
+AS_IF([test "x$with_lzlib" != "xno"], [
+	PKG_CHECK_MODULES([lzlib], [lzlib])
+	AC_DEFINE([ENABLE_LZLIB], [1], [Enable lzlib for modules.])
+], [
+	AC_MSG_NOTICE([lzlib support not requested])
+])
+CC_FEATURE_APPEND([with_features], [with_lzlib], [LZLIB])
+
 AC_ARG_WITH([zlib],
 	AS_HELP_STRING([--with-zlib], [handle gzipped modules @<:@default=disabled@:>@]),
 	[], [with_zlib=no])
@@ -297,7 +308,7 @@
 	tools:			${enable_tools}
 	python bindings:	${enable_python}
 	logging:		${enable_logging}
-	compression:		xz=${with_xz}  zlib=${with_zlib}
+	compression:		xz=${with_xz}  lzlib=${with_lzlib}  zlib=${with_zlib}
 	debug:			${enable_debug}
 	coverage:		${enable_coverage}
 	doc:			${enable_gtk_doc}
diff -urdN kmod-25.orig/libkmod/docs/Makefile.in kmod-25/libkmod/docs/Makefile.in
--- kmod-25.orig/libkmod/docs/Makefile.in	2018-01-09 02:26:05.000000000 +0100
+++ kmod-25/libkmod/docs/Makefile.in	2018-04-18 22:57:17.000000000 +0200
@@ -304,6 +304,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+lzlib_CFLAGS = @lzlib_CFLAGS@
+lzlib_LIBS = @lzlib_LIBS@
 zlib_CFLAGS = @zlib_CFLAGS@
 zlib_LIBS = @zlib_LIBS@
 AUTOMAKE_OPTIONS = 1.11
diff -urdN kmod-25.orig/libkmod/libkmod-file.c kmod-25/libkmod/libkmod-file.c
--- kmod-25.orig/libkmod/libkmod-file.c	2017-12-07 23:05:47.000000000 +0100
+++ kmod-25/libkmod/libkmod-file.c	2018-04-18 23:14:10.000000000 +0200
@@ -34,6 +34,9 @@
 #endif
 
 #include <shared/util.h>
+#ifdef ENABLE_LZLIB
+#include <lzlib.h>
+#endif
 
 #include "libkmod.h"
 #include "libkmod-internal.h"
@@ -48,6 +51,9 @@
 #ifdef ENABLE_XZ
 	bool xz_used;
 #endif
+#ifdef ENABLE_LZLIB
+	bool lz_used;
+#endif
 #ifdef ENABLE_ZLIB
 	gzFile gzf;
 #endif
@@ -169,6 +175,88 @@
 static const char magic_xz[] = {0xfd, '7', 'z', 'X', 'Z', 0};
 #endif
 
+#ifdef ENABLE_LZLIB
+#ifndef min
+  #define min(x,y) ((x) <= (y) ? (x) : (y))
+#endif
+
+static int load_lzlib(struct kmod_file *file)
+{
+	uint8_t in_buf[16384];
+	int err = 0;
+	off_t did = 0, total = 0;
+	_cleanup_free_ unsigned char *p = NULL;
+
+	struct LZ_Decoder *lzd = LZ_decompress_open();
+	if (!lzd || LZ_decompress_errno( lzd ) != LZ_ok)
+		{ LZ_decompress_close(lzd); return -ENOMEM; }
+
+	for (;;) {
+		int rd;
+		const int size = min(LZ_decompress_write_size(lzd),
+				     (int)sizeof in_buf);
+
+		if (did == total) {
+			const int realloc_step = 4 * 1024 * 1024;
+			void *tmp = realloc(p, total + realloc_step);
+			if (tmp == NULL) {
+				err = -ENOMEM;
+				goto error;
+			}
+			total += realloc_step;
+			p = tmp;
+		}
+
+		if (size > 0) {
+			rd = read(file->fd, in_buf, size);
+			if (rd < 0) {
+				err = -errno;
+				goto error;
+			}
+			if (rd == 0)
+				LZ_decompress_finish(lzd);
+			else if (LZ_decompress_write(lzd, in_buf, rd) != rd) {
+				err = -EINVAL;
+				goto error;
+			}
+		}
+		rd = LZ_decompress_read(lzd, p + did, total - did);
+		if (rd < 0) {
+			const char *lz_errmsg =
+				LZ_strerror(LZ_decompress_errno(lzd));
+
+			ERR(file->ctx, "lzip: %s\n", lz_errmsg);
+			err = -EINVAL;
+			goto error;
+		}
+		did += rd;
+		if (LZ_decompress_finished(lzd) == 1)
+			break;
+	}
+
+	if (LZ_decompress_close(lzd) < 0)
+		return -EINVAL;
+	file->lz_used = true;
+	file->memory = p;
+	file->size = did;
+	p = NULL;
+	return 0;
+
+error:
+	LZ_decompress_close(lzd);
+	return err;
+}
+
+static void unload_lzlib(struct kmod_file *file)
+{
+	if (!file->lz_used)
+		return;
+	free(file->memory);
+}
+
+static const char magic_lzlib[] = { 0x4C, 0x5A, 0x49, 0x50 }; /* "LZIP" */
+#endif
+
 #ifdef ENABLE_ZLIB
 #define READ_STEP (4 * 1024 * 1024)
 static int load_zlib(struct kmod_file *file)
@@ -241,6 +329,9 @@
 #ifdef ENABLE_XZ
 	{sizeof(magic_xz), magic_xz, {load_xz, unload_xz}},
 #endif
+#ifdef ENABLE_LZLIB
+	{sizeof(magic_lzlib), magic_lzlib, {load_lzlib, unload_lzlib}},
+#endif
 #ifdef ENABLE_ZLIB
 	{sizeof(magic_zlib), magic_zlib, {load_zlib, unload_zlib}},
 #endif
diff -urdN kmod-25.orig/libkmod/libkmod.pc.in kmod-25/libkmod/libkmod.pc.in
--- kmod-25.orig/libkmod/libkmod.pc.in	2013-04-24 22:02:37.000000000 +0200
+++ kmod-25/libkmod/libkmod.pc.in	2018-04-18 22:57:17.000000000 +0200
@@ -7,5 +7,5 @@
 Description: Library to deal with kernel modules
 Version: @VERSION@
 Libs: -L${libdir} -lkmod
-Libs.private: @liblzma_LIBS@ @zlib_LIBS@
+Libs.private: @liblzma_LIBS@ @lzlib_LIBS@ @zlib_LIBS@
 Cflags: -I${includedir}
diff -urdN kmod-25.orig/man/Makefile.in kmod-25/man/Makefile.in
--- kmod-25.orig/man/Makefile.in	2018-01-09 02:26:05.000000000 +0100
+++ kmod-25/man/Makefile.in	2018-04-18 22:57:17.000000000 +0200
@@ -307,6 +307,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+lzlib_CFLAGS = @lzlib_CFLAGS@
+lzlib_LIBS = @lzlib_LIBS@
 zlib_CFLAGS = @zlib_CFLAGS@
 zlib_LIBS = @zlib_LIBS@
 MAN5 = depmod.d.5 modprobe.d.5 modules.dep.5
diff -urdN kmod-25.orig/shared/util.c kmod-25/shared/util.c
--- kmod-25.orig/shared/util.c	2017-12-07 23:05:47.000000000 +0100
+++ kmod-25/shared/util.c	2018-04-18 22:57:17.000000000 +0200
@@ -43,6 +43,9 @@
 #ifdef ENABLE_ZLIB
 	{".ko.gz", sizeof(".ko.gz") - 1},
 #endif
+#ifdef ENABLE_LZLIB
+	{".ko.lz", sizeof(".ko.lz") - 1},
+#endif
 #ifdef ENABLE_XZ
 	{".ko.xz", sizeof(".ko.xz") - 1},
 #endif
diff -urdN kmod-25.orig/testsuite/test-util.c kmod-25/testsuite/test-util.c
--- kmod-25.orig/testsuite/test-util.c	2017-12-07 23:05:47.000000000 +0100
+++ kmod-25/testsuite/test-util.c	2018-04-18 22:57:17.000000000 +0200
@@ -154,6 +154,9 @@
 #ifdef ENABLE_ZLIB
 		{ "/bla.ko.gz", true },
 #endif
+#ifdef ENABLE_LZLIB
+		{ "/bla.ko.lz", true },
+#endif
 #ifdef ENABLE_XZ
 		{ "/bla.ko.xz", true },
 #endif