#! /bin/sh /usr/share/dpatch/dpatch-run ## Description: Add sasl2 and kerberos library in LDADD to fix FTBFS binutils-gold with --as-needed ## Author: Mahyuddin Susanto ## Bug-Ubuntu: https://launchpad.net/bugs/717653 @DPATCH@ diff -urNad squid3-3.1.6~/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid3-3.1.6/helpers/negotiate_auth/squid_kerb_auth/Makefile.am --- squid3-3.1.6~/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2010-08-01 21:01:37.000000000 +0700 +++ squid3-3.1.6/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2011-02-13 00:15:37.495120372 +0700 @@ -8,9 +8,13 @@ squid_kerb_auth_SOURCES = squid_kerb_auth.c base64.c base64.h squid_compat.h squid_kerb_auth_test_SOURCES = squid_kerb_auth_test.c base64.c base64.h squid_compat.h squid_kerb_auth_LDFLAGS = -squid_kerb_auth_LDADD = +squid_kerb_auth_LDADD = -L$(top_builddir)/lib -lmiscutil \ + -lsasl2 -lgssapi_krb5 -lkrb5 -lk5crypto \ + $(XTRA_LIBS) squid_kerb_auth_test_LDFLAGS = -squid_kerb_auth_test_LDADD = +squid_kerb_auth_test_LDADD = -L$(top_builddir)/lib -lmiscutil \ + -lsasl2 -lgssapi_krb5 -lkrb5 -lk5crypto \ + $(XTRA_LIBS) negotiate_kerb_auth_SOURCES = negotiate_kerb_auth_test_SOURCES = diff -urNad squid3-3.1.6~/helpers/negotiate_auth/squid_kerb_auth/Makefile.in squid3-3.1.6/helpers/negotiate_auth/squid_kerb_auth/Makefile.in --- squid3-3.1.6~/helpers/negotiate_auth/squid_kerb_auth/Makefile.in 2010-08-01 21:03:11.000000000 +0700 +++ squid3-3.1.6/helpers/negotiate_auth/squid_kerb_auth/Makefile.in 2011-02-13 00:16:18.001044521 +0700 @@ -51,12 +51,12 @@ libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(libexec_PROGRAMS) am_negotiate_kerb_auth_OBJECTS = -negotiate_kerb_auth_OBJECTS = $(am_negotiate_kerb_auth_OBJECTS) -negotiate_kerb_auth_LDADD = $(LDADD) +napi_krb5 -lkrb5 -lk5cryptogotiate_kerb_auth_OBJECTS = $(am_negotiate_kerb_auth_OBJECTS) +negotiate_kerb_auth_LDADD = -L$(top_builddir)/lib -lmiscutil $(LDADD) -lsasl2 -lgssapi_krb5 -lkrb5 -lk5crypto $(XTRA_LIBS) am_negotiate_kerb_auth_test_OBJECTS = negotiate_kerb_auth_test_OBJECTS = \ $(am_negotiate_kerb_auth_test_OBJECTS) -negotiate_kerb_auth_test_LDADD = $(LDADD) +negotiate_kerb_auth_test_LDADD = -L$(top_builddir)/lib -lmiscutil $(LDADD) -lsasl2 -lgssapi_krb5 -lkrb5 -lk5crypto $(XTRA_LIBS) am_squid_kerb_auth_OBJECTS = squid_kerb_auth.$(OBJEXT) \ base64.$(OBJEXT) squid_kerb_auth_OBJECTS = $(am_squid_kerb_auth_OBJECTS) @@ -197,9 +197,13 @@ squid_kerb_auth_SOURCES = squid_kerb_auth.c base64.c base64.h squid_compat.h squid_kerb_auth_test_SOURCES = squid_kerb_auth_test.c base64.c base64.h squid_compat.h squid_kerb_auth_LDFLAGS = -squid_kerb_auth_LDADD = +squid_kerb_auth_LDADD = -L$(top_builddir)/lib -lmiscutil \ + -lsasl2 -lgssapi_krb5 -lkrb5 -lk5crypto \ + $(XTRA_LIBS) squid_kerb_auth_test_LDFLAGS = -squid_kerb_auth_test_LDADD = +squid_kerb_auth_test_LDADD = -L$(top_builddir)/lib -lmiscutil \ + -lsasl2 -lgssapi_krb5 -lkrb5 -lk5crypto \ + $(XTRA_LIBS) negotiate_kerb_auth_SOURCES = negotiate_kerb_auth_test_SOURCES = all: ska_config.h @@ -282,10 +286,10 @@ -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS) squid_kerb_auth$(EXEEXT): $(squid_kerb_auth_OBJECTS) $(squid_kerb_auth_DEPENDENCIES) @rm -f squid_kerb_auth$(EXEEXT) - $(squid_kerb_auth_LINK) $(squid_kerb_auth_OBJECTS) $(squid_kerb_auth_LDADD) $(LIBS) + $(LINK) $(squid_kerb_auth_OBJECTS) $(squid_kerb_auth_test_LDADD) $(LIBS) squid_kerb_auth_test$(EXEEXT): $(squid_kerb_auth_test_OBJECTS) $(squid_kerb_auth_test_DEPENDENCIES) @rm -f squid_kerb_auth_test$(EXEEXT) - $(squid_kerb_auth_test_LINK) $(squid_kerb_auth_test_OBJECTS) $(squid_kerb_auth_test_LDADD) $(LIBS) + $(LINK) $(squid_kerb_auth_test_OBJECTS) $(squid_kerb_auth_test_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT)