Bug#891532: captagent FTBFS with shared libfl

2019-08-14 Thread Gianfranco Costamagna
control: tags -1 patch pending
On Mon, 26 Feb 2018 15:22:58 +0200 Adrian Bunk  wrote:
> Source: captagent
> Version: 6.1.0.20-3
> Severity: serious
> Tags: buster sid
> 
> https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/captagent.html
> 
> ...
> checking whether make sets $(MAKE)... (cached) yes
> checking for flex... flex
> checking lex output file root... lex.yy
> checking lex library... -lfl
> checking whether yytext is a pointer... yes
> checking for bison... bison -y
> checking for pthread_create in -lpthread... yes
> checking for dlopen in -ldl... yes
> checking for XML_ParserCreate in -lexpat... yes
> checking for pcap_open_live in -lpcap... yes
> checking for json_object_get in -ljson... no
> checking for json_object_get in -ljson-c... yes
> checking for yywrap in -lfl... no
> configure: error: captagent requires but cannot find libfl
> 
> 
> Fix attached.

uploaded as NMU.

G.



Bug#891532: captagent FTBFS with shared libfl

2019-08-14 Thread Gianfranco Costamagna
and attached.
diff -Nru captagent-6.1.0.20/debian/changelog 
captagent-6.1.0.20/debian/changelog
--- captagent-6.1.0.20/debian/changelog 2017-01-15 21:09:31.0 +0100
+++ captagent-6.1.0.20/debian/changelog 2019-08-14 09:59:44.0 +0200
@@ -1,3 +1,11 @@
+captagent (6.1.0.20-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * debian/patches/shared-libfl.patch:
+- find shared libfl (Closes: #891532)
+
+ -- Gianfranco Costamagna   Wed, 14 Aug 2019 
09:59:44 +0200
+
 captagent (6.1.0.20-3) unstable; urgency=high
 
   * Update Build-Deps for default-libmysqlclient-dev. (Closes: #845827)
diff -Nru captagent-6.1.0.20/debian/patches/series 
captagent-6.1.0.20/debian/patches/series
--- captagent-6.1.0.20/debian/patches/series1970-01-01 01:00:00.0 
+0100
+++ captagent-6.1.0.20/debian/patches/series2019-08-14 09:59:43.0 
+0200
@@ -0,0 +1 @@
+shared-libfl.patch
diff -Nru captagent-6.1.0.20/debian/patches/shared-libfl.patch 
captagent-6.1.0.20/debian/patches/shared-libfl.patch
--- captagent-6.1.0.20/debian/patches/shared-libfl.patch1970-01-01 
01:00:00.0 +0100
+++ captagent-6.1.0.20/debian/patches/shared-libfl.patch2019-08-14 
09:59:44.0 +0200
@@ -0,0 +1,36 @@
+Description: AC_CHECK_LIB(fl, yywrap) doesn't work with shared libfl
+Author: Adrian Bunk 
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891532
+
+--- captagent-6.1.0.20.orig/configure.ac
 captagent-6.1.0.20/configure.ac
+@@ -153,6 +153,10 @@ AC_PROG_LEX
+ if test "$LEX" != "flex"; then
+   AC_MSG_ERROR([flex not found. Please install flex])
+ fi
++if test "x$LEXLIB" = "x"; then
++  AC_MSG_ERROR([captagent requires but cannot find libfl])
++fi
++
+ 
+ if test -z "`echo %%|$LEX -t|grep yypop_buffer_state`"; then
+   AC_MSG_ERROR([flex missing yypop_buffer_state - upgrade to version 
2.5.33 or later])
+@@ -181,8 +185,6 @@ echo "If it is in a different di
+ echo "the LDFLAGS to set its proper path.";
+ AC_MSG_ERROR([Fatal:  libjson not found.])])])
+ 
+-AC_CHECK_LIB(fl, yywrap, [ FLEX_LIBS="-lfl" ] , [AC_MSG_ERROR([captagent 
requires but cannot find libfl])])
+-
+ AC_SUBST(PTHREAD_LIBS)
+ AC_SUBST(DL_LIBS)
+ AC_SUBST(EXPAT_LIBS)
+--- captagent-6.1.0.20.orig/src/Makefile.am
 captagent-6.1.0.20/src/Makefile.am
+@@ -19,6 +19,6 @@ AM_CPPFLAGS = -DSYSCONFDIR='"$(sysconfdi
+ BUILT_SOURCES = capplan.tab.h
+ noinst_HEADERS = md5.h captagent.h conf_function.h
+ captagent_SOURCES = captagent.c conf_function.c log.c md5.c modules.c 
xmlread.c capplan.l capplan.tab.y
+-captagent_LDADD = ${PTHREAD_LIBS} ${EXPAT_LIBS} ${DL_LIBS} ${FLEX_LIBS}
++captagent_LDADD = ${PTHREAD_LIBS} ${EXPAT_LIBS} ${DL_LIBS} ${LEXLIB}
+ captagentconfdir = $(sysconfdir)/$(bin_PROGRAMS)
+ captagentconf_DATA = $(top_srcdir)/conf/$(bin_PROGRAMS).xml


Bug#891532: captagent FTBFS with shared libfl

2018-02-26 Thread Adrian Bunk
Source: captagent
Version: 6.1.0.20-3
Severity: serious
Tags: buster sid

https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/captagent.html

...
checking whether make sets $(MAKE)... (cached) yes
checking for flex... flex
checking lex output file root... lex.yy
checking lex library... -lfl
checking whether yytext is a pointer... yes
checking for bison... bison -y
checking for pthread_create in -lpthread... yes
checking for dlopen in -ldl... yes
checking for XML_ParserCreate in -lexpat... yes
checking for pcap_open_live in -lpcap... yes
checking for json_object_get in -ljson... no
checking for json_object_get in -ljson-c... yes
checking for yywrap in -lfl... no
configure: error: captagent requires but cannot find libfl


Fix attached.
Description: AC_CHECK_LIB(fl, yywrap) doesn't work with shared libfl
Author: Adrian Bunk 

--- captagent-6.1.0.20.orig/configure.ac
+++ captagent-6.1.0.20/configure.ac
@@ -153,6 +153,10 @@ AC_PROG_LEX
 if test "$LEX" != "flex"; then
AC_MSG_ERROR([flex not found. Please install flex])
 fi
+if test "x$LEXLIB" = "x"; then
+   AC_MSG_ERROR([captagent requires but cannot find libfl])
+fi
+
 
 if test -z "`echo %%|$LEX -t|grep yypop_buffer_state`"; then
AC_MSG_ERROR([flex missing yypop_buffer_state - upgrade to version 
2.5.33 or later])
@@ -181,8 +185,6 @@ echo "If it is in a different di
 echo "the LDFLAGS to set its proper path.";
 AC_MSG_ERROR([Fatal:  libjson not found.])])])
 
-AC_CHECK_LIB(fl, yywrap, [ FLEX_LIBS="-lfl" ] , [AC_MSG_ERROR([captagent 
requires but cannot find libfl])])
-
 AC_SUBST(PTHREAD_LIBS)
 AC_SUBST(DL_LIBS)
 AC_SUBST(EXPAT_LIBS)
--- captagent-6.1.0.20.orig/src/Makefile.am
+++ captagent-6.1.0.20/src/Makefile.am
@@ -19,6 +19,6 @@ AM_CPPFLAGS = -DSYSCONFDIR='"$(sysconfdi
 BUILT_SOURCES = capplan.tab.h
 noinst_HEADERS = md5.h captagent.h conf_function.h
 captagent_SOURCES = captagent.c conf_function.c log.c md5.c modules.c 
xmlread.c capplan.l capplan.tab.y
-captagent_LDADD = ${PTHREAD_LIBS} ${EXPAT_LIBS} ${DL_LIBS} ${FLEX_LIBS}
+captagent_LDADD = ${PTHREAD_LIBS} ${EXPAT_LIBS} ${DL_LIBS} ${LEXLIB}
 captagentconfdir = $(sysconfdir)/$(bin_PROGRAMS)
 captagentconf_DATA = $(top_srcdir)/conf/$(bin_PROGRAMS).xml