#link shared libs against -lresolv since we use those functions
#
#http://bugs.gentoo.org/305823
#
#original patch by Andrej Filipcic
#ported to openafs-1.6
#
#Updated to support BSD by "Naohiro Aota <naota@gentoo.org>" Bug #425352
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 0fb2e4c..31bfec3 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -739,6 +739,12 @@ if test "x$enable_optimize_kernel" = "x" ; then
     [enable_optimize_kernel=yes])
 fi
 
+case $AFS_SYSNAME in
+	*linux*)
+		MT_LIBS="${MT_LIBS} -lresolv"
+		;;
+esac
+
 #
 # Special build targets
 #
--- openafs-1.6.0/src/shlibafsauthent/libafsauthent.map
+++ openafs-1.6.0/src/shlibafsauthent/libafsauthent.map
@@ -85,6 +85,7 @@
 	setpag;
 	afs_snprintf;
 	LogThreadNum;
+	ka_GetAFSTicket;
 
     local:
 	*;
--- a/src/config/Makefile.config.in.orig	2015-03-21 15:13:04.000000000 +0300
+++ b/src/config/Makefile.config.in	2015-03-21 15:13:58.367157826 +0300
@@ -140,10 +140,10 @@
 # conditionalise them on that.
 
 COMMON_INCL=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${srcdir} -I.
-COMMON_CFLAGS=${DBG} ${OPTMZ} ${COMMON_INCL} ${INCLUDE_LIBINTL}
+COMMON_CFLAGS=${COMMON_INCL} ${INCLUDE_LIBINTL}
 
-CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${ARCHFLAGS} $(CFLAGS_NOERROR)
-LDFLAGS=${XLDFLAGS} ${ARCHFLAGS}
+CFLAGS+=${COMMON_CFLAGS} ${XCFLAGS} ${ARCHFLAGS} $(CFLAGS_NOERROR)
+LDFLAGS+=${XLDFLAGS} ${ARCHFLAGS}
 
 .c.o:
 	$(CCOBJ) $(CFLAGS) -c $<
--- a/src/config/Makefile.in.orig	2015-02-27 16:24:26.000000000 +0300
+++ b/src/config/Makefile.in	2015-03-21 15:14:20.182106274 +0300
@@ -12,7 +12,7 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-CFLAGS=${DBG} ${OPTMZ} -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
+CFLAGS+=-I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
 
 all: config mkvers \
 	${TOP_INCDIR}/afs/param.h \
--- a/src/sys/Makefile.in.orig	2015-02-27 16:24:26.000000000 +0300
+++ b/src/sys/Makefile.in	2015-03-21 16:34:28.545191594 +0300
@@ -14,7 +14,7 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-CFLAGS=${DBUG} ${COMMON_INCL} ${XCFLAGS} ${ARCHFLAGS}
+CFLAGS+=${DBUG} ${COMMON_INCL} ${XCFLAGS} ${ARCHFLAGS}
 SFLAGS=-I${TOP_INCDIR}
 LIBS=libsys.a ${TOP_LIBDIR}/librx.a libsys.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a ${XLIBS}
 
@@ -155,15 +155,15 @@
 	${RXGEN} -A -k -h -o Krmtsys.h ${srcdir}/rmtsys.xg
 
 rmtsysd: rmtsysd.o libsys.a
-	${CC} ${CFLAGS} -o rmtsysd rmtsysd.o ${LIBS}
+	${CC} ${CFLAGS} ${LDFLAGS} -o rmtsysd rmtsysd.o ${LIBS}
 
 pagsh:	libsys.a AFS_component_version_number.o pagsh.c
 	${CC} ${CFLAGS} -c ${srcdir}/pagsh.c
-	${CC} ${CFLAGS} -o pagsh pagsh.o ${LIBS}
+	${CC} ${CFLAGS} ${LDFLAGS} -o pagsh pagsh.o ${LIBS}
 
 pagsh.krb: libsys.a pagsh.c ${TOP_LIBDIR}/libauth.krb.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a
 	${CC} ${CFLAGS} -o pagsh.krb.o -c ${srcdir}/pagsh.c -DAFS_KERBEROS_ENV
-	${CC} ${CFLAGS} -o pagsh.krb pagsh.krb.o ${TOP_LIBDIR}/libauth.krb.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a ${LIBS}
+	${CC} ${CFLAGS} ${LDFLAGS} -o pagsh.krb pagsh.krb.o ${TOP_LIBDIR}/libauth.krb.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a ${LIBS}
 
 #
 # Test programs.