Package: ulogd
Version: 1.24-2.2
Severity: serious
Hello,
The resolution to bug #527534 removed the -rdynamic option
from Makefile.in, which causes ulogd to be unable to load
its plugins. This makes ulogd unusuable.
The attached patch fixes this issue and a few other problems.
Regards,
M. Vefa Bicakci
diff -u ulogd-1.24/Rules.make.in ulogd-1.24/Rules.make.in
--- ulogd-1.24/Rules.make.in
+++ ulogd-1.24/Rules.make.in
@@ -34,7 +34,7 @@
# mysql output support
#ULOGD_SL+=MYSQL
-mysql_cflags...@mysqlincludes@ @EXTRA_MYSQL_DEF@
+mysql_cfla...@mysqlincludes@ @EXTRA_MYSQL_DEF@
mysql_ldfla...@database_lib_dir@ @MYSQL_LIB@
# postgreSQL output support
diff -u ulogd-1.24/Makefile.in ulogd-1.24/Makefile.in
--- ulogd-1.24/Makefile.in
+++ ulogd-1.24/Makefile.in
@@ -63,7 +63,7 @@
@for d in $(SUBDIRS); do if ! make -C $$d; then exit 1; fi; done
ulogd: ulogd.c $(LIBIPULOG) include/ulogd/ulogd.h conffile/conffile.o $(LIBIPULOG)/libipulog.a ulogd.conf
- $(CC) $(CFLAGS) $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ $(LIBS)
+ $(CC) $(CFLAGS) -rdynamic $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ $(LIBS)
edit = sed -e 's,@libdir\@,$(ULOGD_LIB_PATH),g'
diff -u ulogd-1.24/debian/patches/ipt_ULOG.patch ulogd-1.24/debian/patches/ipt_ULOG.patch
--- ulogd-1.24/debian/patches/ipt_ULOG.patch
+++ ulogd-1.24/debian/patches/ipt_ULOG.patch
@@ -5,7 +5,7 @@
# doesn't work for subdirs
#CFLAGS+=$(INCIPULOG) $(INCCONFFILE)
-CFLAGS+=-I/lib/modules/`uname -r`/build/include
-+cflags+...@abs_srcdir@/debian/include
++cflags+...@srcdir@/debian/include
#cflag...@defs@
#CFLAGS+=-g -DDEBUG -DDEBUG_MYSQL -DDEBUG_PGSQL
only in patch2:
unchanged:
--- ulogd-1.24.orig/mysql/Makefile.in
+++ ulogd-1.24/mysql/Makefile.in
@@ -14,7 +14,8 @@
distrib:
$(SHARED_LIBS): %.so: %_sh.o
- $(LD) -shared $(MYSQL_LDFLAGS) -o $@ $< -lc
+ #$(LD) -shared $(MYSQL_LDFLAGS) -o $@ $< -lc
+ $(CC) -nostartfiles -shared $(MYSQL_LDFLAGS) -o $@ $<
%_sh.o: %.c
$(CC) $(MYSQL_CFLAGS) $(SH_CFLAGS) -o $@ -c $<
diff -u ulogd-1.24/configure ulogd-1.24/configure
--- ulogd-1.24/configure
+++ ulogd-1.24/configure
@@ -1728,7 +1728,7 @@
EOF
MYSQLINCLUDES=`$d/mysql_config --include`
- MYSQLLIBS=`$d/mysql_config --libs | sed 's/-rdynamic//'`
+ MYSQLLIBS=`$d/mysql_config --libs`
DATABASE_DIR="${DATABASE_DIR} mysql"
