diff options
Diffstat (limited to 'krb5-1.14-no_system_krb5_conf.patch')
| -rw-r--r-- | krb5-1.14-no_system_krb5_conf.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/krb5-1.14-no_system_krb5_conf.patch b/krb5-1.14-no_system_krb5_conf.patch new file mode 100644 index 0000000..700de81 --- /dev/null +++ b/krb5-1.14-no_system_krb5_conf.patch @@ -0,0 +1,75 @@ +diff --git a/src/lib/krad/Makefile.in b/src/lib/krad/Makefile.in +index 75431a0..6764d90 100644 +--- a/src/lib/krad/Makefile.in ++++ b/src/lib/krad/Makefile.in +@@ -33,12 +33,18 @@ install-unix:: install-libs + clean-unix:: clean-liblinks clean-libs clean-libobjs + + check-unix:: t_attr t_attrset t_code t_packet t_remote t_client +- $(RUN_SETUP) $(VALGRIND) ./t_attr +- $(RUN_SETUP) $(VALGRIND) ./t_attrset +- $(RUN_SETUP) $(VALGRIND) ./t_code +- $(RUN_SETUP) $(VALGRIND) ./t_packet $(PYTHON) $(srcdir)/t_daemon.py +- $(RUN_SETUP) $(VALGRIND) ./t_remote $(PYTHON) $(srcdir)/t_daemon.py +- $(RUN_SETUP) $(VALGRIND) ./t_client $(PYTHON) $(srcdir)/t_daemon.py ++ KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ ++ $(RUN_SETUP) $(VALGRIND) ./t_attr ++ KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ ++ $(RUN_SETUP) $(VALGRIND) ./t_attrset ++ KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ ++ $(RUN_SETUP) $(VALGRIND) ./t_code ++ KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ ++ $(RUN_SETUP) $(VALGRIND) ./t_packet $(PYTHON) $(srcdir)/t_daemon.py ++ KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ ++ $(RUN_SETUP) $(VALGRIND) ./t_remote $(PYTHON) $(srcdir)/t_daemon.py ++ KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ ++ $(RUN_SETUP) $(VALGRIND) ./t_client $(PYTHON) $(srcdir)/t_daemon.py + + TESTDEPS=t_test.o $(KRB5_BASE_DEPLIBS) + TESTLIBS=t_test.o $(KRB5_BASE_LIBS) +diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in +index 62f0b90..ba5f761 100644 +--- a/src/lib/krb5/krb/Makefile.in ++++ b/src/lib/krb5/krb/Makefile.in +@@ -464,16 +464,22 @@ check-unix:: $(TEST_PROGS) + $(RM) test.out + KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ + $(RUN_SETUP) $(VALGRIND) ./t_ser +- $(RUN_SETUP) $(VALGRIND) ./t_deltat +- $(RUN_SETUP) $(VALGRIND) sh $(srcdir)/transit-tests ++ KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ ++ $(RUN_SETUP) $(VALGRIND) ./t_deltat ++ KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ ++ $(RUN_SETUP) $(VALGRIND) sh $(srcdir)/transit-tests + KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ + $(RUN_SETUP) $(VALGRIND) sh $(srcdir)/walktree-tests + KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ +- $(RUN_SETUP) $(VALGRIND) ./t_authdata +- $(RUN_SETUP) $(VALGRIND) ./t_pac +- $(RUN_SETUP) $(VALGRIND) ./t_princ +- $(RUN_SETUP) $(VALGRIND) ./t_etypes +- $(RUN_SETUP) $(VALGRIND) ./t_response_items ++ $(RUN_SETUP) $(VALGRIND) ./t_authdata ++ KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ ++ $(RUN_SETUP) $(VALGRIND) ./t_pac ++ KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ ++ $(RUN_SETUP) $(VALGRIND) ./t_princ ++ KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ ++ $(RUN_SETUP) $(VALGRIND) ./t_etypes ++ KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ ++ $(RUN_SETUP) $(VALGRIND) ./t_response_items + KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ + $(RUN_SETUP) $(VALGRIND) ./t_copy_context + +diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in +index 1bd8573..b87e7f9 100644 +--- a/src/lib/krb5/os/Makefile.in ++++ b/src/lib/krb5/os/Makefile.in +@@ -233,6 +233,7 @@ check-unix-locate:: t_locate_kdc + check-unix-trace:: t_trace + rm -f t_trace.out + KRB5_TRACE=t_trace.out ; export KRB5_TRACE ; \ ++ KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ + $(RUN_SETUP) $(VALGRIND) ./t_trace + sed -e 's/^[^:]*: //' t_trace.out | cmp - $(srcdir)/t_trace.ref + rm -f t_trace.out |