tags 615572 + patch
thanks
Dear Jelmer
Attached is a patch fixing this bug. Note that I do NOT intend to NMU.
Cheers
Luk
diff -u ctrlproxy-3.0.7/Makefile.settings ctrlproxy-3.0.7/Makefile.settings
--- ctrlproxy-3.0.7/Makefile.settings
+++ ctrlproxy-3.0.7/Makefile.settings
@@ -1,24 +1,24 @@
BZR_CHECKOUT = yes
SHLIBEXT = so
-LIBS = -lreadline -Wl,--export-dynamic -lgmodule-2.0 -ldl -lglib-2.0
+LIBS = -lreadline -Wl,--export-dynamic -pthread -lgmodule-2.0 -lrt -lglib-2.0
CC = gcc
LD = gcc
-prefix = /usr/local
+prefix = /usr
exec_prefix = ${prefix}
datarootdir = ${prefix}/share
localedir = ${datarootdir}/locale
INSTALL = /usr/bin/install -c
bindir = ${exec_prefix}/bin
-docdir = /usr/local/share/doc/ctrlproxy
+docdir = /usr/share/doc/ctrlproxy
modulesdir = ${exec_prefix}/lib/ctrlproxy
libdir = ${exec_prefix}/lib
-includedir = ${prefix}/include
-mandir = ${datarootdir}/man
+includedir = /usr/include/ctrlproxy
+mandir = /usr/share/man
destincludedir = $(includedir)/ctrlproxy-3.0
cdatadir = ${datarootdir}/ctrlproxy
EXEEXT =
OBJEXT = o
-CFLAGS = -g -O2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DHAVE_CONFIG_H -DSHAREDIR=\"/usr/local/share/ctrlproxy\" -DDEFAULT_CONFIG_DIR=\"/usr/local/share/ctrlproxy/default\" -DHELPFILE=\"/usr/local/share/ctrlproxy/help\" -ansi -Wall -DMODULESDIR=\"/usr/local/lib/ctrlproxy\" -DSTRICT_MEMORY_ALLOCS= -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+CFLAGS = -g -O2 -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
LDFLAGS =
BINS = linestack-cmd ctrlproxy-admin
scriptdir = $(cdatadir)/scripts
@@ -30,7 +30,7 @@
SSL_OBJS = src/gnutls.o src/tlscert.o
PYTHON = @PYTHON@
PYTHON_PREFIX = @PYTHON_PREFIX@
-SWIG = /usr/bin/swig
+SWIG =
PYTHON_CFLAGS = @PYTHON_CPPFLAGS@
PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ @PYTHON_EXTRA_LIBS@
IRCDTORTURE =
diff -u ctrlproxy-3.0.7/debian/changelog ctrlproxy-3.0.7/debian/changelog
--- ctrlproxy-3.0.7/debian/changelog
+++ ctrlproxy-3.0.7/debian/changelog
@@ -1,3 +1,10 @@
+ctrlproxy (3.0.7-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add -lgcrypt when linking (Closes: #615572)
+
+ -- Luk Claes <l...@debian.org> Sun, 27 Feb 2011 18:26:55 +0100
+
ctrlproxy (3.0.7-1) unstable; urgency=low
* New upstream release.
only in patch2:
unchanged:
--- ctrlproxy-3.0.7.orig/Makefile
+++ ctrlproxy-3.0.7/Makefile
@@ -101,11 +101,11 @@
linestack-cmd$(EXEEXT): src/linestack-cmd.o $(objs) $(LIBIRC)
@echo Linking $@
- @$(LD) $(LIBS) -lreadline -rdynamic -o $@ $^
+ @$(LD) -rdynamic -o $@ $^ $(LIBS) -lreadline -lgcrypt
ctrlproxy$(EXEEXT): src/main.o $(objs) $(LIBIRC)
@echo Linking $@
- @$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
+ @$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS) -lgcrypt
ctrlproxyd$(EXEEXT): daemon/main.o $(objs) $(LIBIRC)
@echo Linking $@
