Skip to content

Commit 6d8cbc0

Browse files
committed
Drop bundled minilzo, use system lzo library
The bundled minilzo was affected by CVE-2014-4607.
1 parent 8dcebf2 commit 6d8cbc0

10 files changed

+5
-7155
lines changed

Makefile.am

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ EXTRA_DIST = README.md
33
ACLOCAL_AMFLAGS = -I m4
44

55
SUBDIRS = \
6-
minilzo \
76
services \
87
daemon \
98
client \

configure.ac

+3-18
Original file line numberDiff line numberDiff line change
@@ -221,23 +221,9 @@ AC_CHECK_FUNCS([getloadavg])
221221

222222
AC_CHECK_DECLS([snprintf, vsnprintf, vasprintf, asprintf, strndup])
223223

224-
dnl === LZO
225-
dnl Checks for typedefs and structures
226-
AC_CHECK_TYPE(ptrdiff_t,long)
227-
AC_TYPE_SIZE_T
228-
AC_CHECK_SIZEOF(unsigned short)
229-
AC_CHECK_SIZEOF(unsigned)
230-
AC_CHECK_SIZEOF(unsigned long)
231-
AC_CHECK_SIZEOF(char *)
232-
AC_CHECK_SIZEOF(ptrdiff_t)
233-
AC_CHECK_SIZEOF(size_t)
234-
235-
dnl Checks for compiler characteristics
236-
dnl AC_C_CONST
237-
238-
dnl Checks for library functions
239-
AC_CHECK_FUNCS(memcmp memcpy memmove memset)
240-
dnl === END LZO
224+
AC_CHECK_LIB(lzo2, lzo1x_1_compress, LZO_LDADD=-llzo2,
225+
AC_MSG_ERROR([Could not find lzo2 library - please install lzo-devel]))
226+
AC_SUBST(LZO_LDADD)
241227

242228
# In DragonFlyBSD daemon needs to be linked against libkinfo.
243229
case $host_os in
@@ -340,7 +326,6 @@ AC_CONFIG_FILES([ Makefile ])
340326
AC_CONFIG_FILES([ client/Makefile ])
341327
AC_CONFIG_FILES([ daemon/Makefile ])
342328
AC_CONFIG_FILES([ doc/Makefile ])
343-
AC_CONFIG_FILES([ minilzo/Makefile ])
344329
AC_CONFIG_FILES([ services/Makefile ])
345330
AC_CONFIG_FILES([ services/icecc.pc ])
346331
AC_CONFIG_FILES([ suse/Makefile ])

minilzo/Makefile.am

-21
This file was deleted.

minilzo/README.LZO

-124
This file was deleted.

0 commit comments

Comments
 (0)