Date: Wed, 30 Oct 2013 22:21:31 GMT From: Lukas Slebodnik <lukas.slebodnik@intrak.sk> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/183504: Fix krb5-config detection on 8.3-RELEASE (1386,amd64) Message-ID: <201310302221.r9UMLVVY080174@oldred.freebsd.org> Resent-Message-ID: <201310302230.r9UMU04p024166@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183504 >Category: ports >Synopsis: Fix krb5-config detection on 8.3-RELEASE (1386,amd64) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Oct 30 22:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Lukas Slebodnik >Release: FreeBSD 8.3-RELEASE >Organization: >Environment: >Description: Wrong krb5-config was detected on FreeBSD 8.3 checking for krb5-config... /usr/bin/krb5-config checking for working krb5-config... yes And therefore different krb5.h header file was used in configuration phase and building phase. Result of this wrong detection was compilation error ./src/util/sss_krb5.h:98: error: conflicting types for 'krb5_expire_callback_func' /usr/local/include/krb5/krb5.h:6920: error: previous declaration of 'krb5_expire_callback_func' was here Log files from failed build. http://beefy2.isc.freebsd.org/bulk/83amd64-default/2013-10-30_01h02m50s/logs/sssd-1.9.5.log http://beefy1.isc.freebsd.org/bulk/83i386-default/2013-10-30_01h01m05s/logs/sssd-1.9.5.log >How-To-Repeat: >Fix: Patch attached with submission follows: Index: files/patch-src__external__krb5.m4 =================================================================== --- files/patch-src__external__krb5.m4 (revision 0) +++ files/patch-src__external__krb5.m4 (working copy) @@ -0,0 +1,25 @@ +From b7947258702e250dbf569bb9cd74f1e73f0c94bb Mon Sep 17 00:00:00 2001 +From: Lukas Slebodnik <lukas.slebodnik@intrak.sk> +Date: Wed, 30 Oct 2013 08:53:42 +0100 +Subject: [PATCH 1/4] patch-src__external__krb5.m4 + +--- + src/external/krb5.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/external/krb5.m4 src/external/krb5.m4 +index 71239c9..63c8ece 100644 +--- src/external/krb5.m4 ++++ src/external/krb5.m4 +@@ -9,7 +9,7 @@ if test x$KRB5_CFLAGS != x; then + KRB5_PASSED_CFLAGS=$KRB5_CFLAGS + fi + +-AC_PATH_PROG(KRB5_CONFIG, krb5-config) ++AC_PATH_PROG(KRB5_CONFIG, krb5-config, [], [/usr/local/bin:$PATH]) + AC_MSG_CHECKING(for working krb5-config) + if test -x "$KRB5_CONFIG"; then + KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" +-- +1.8.0 + Index: files/patch-src__external__pac_responder.m4 =================================================================== --- files/patch-src__external__pac_responder.m4 (revision 0) +++ files/patch-src__external__pac_responder.m4 (working copy) @@ -0,0 +1,25 @@ +From b52128bc333fd4717a96950ef8fb4171f25fabcf Mon Sep 17 00:00:00 2001 +From: Lukas Slebodnik <lukas.slebodnik@intrak.sk> +Date: Wed, 30 Oct 2013 08:54:41 +0100 +Subject: [PATCH 2/4] patch-src__external__pac_responder.m4 + +--- + src/external/pac_responder.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/external/pac_responder.m4 src/external/pac_responder.m4 +index 49d5cbb..2b4ca5c 100644 +--- src/external/pac_responder.m4 ++++ src/external/pac_responder.m4 +@@ -14,7 +14,7 @@ then + PKG_CHECK_MODULES(NDR_KRB5PAC, ndr_krb5pac, ndr_krb5pac_ok=yes, + AC_MSG_WARN([Cannot build pac responder without libndr_krb5pac])) + +- AC_PATH_PROG(KRB5_CONFIG, krb5-config) ++ AC_PATH_PROG(KRB5_CONFIG, krb5-config, [], [/usr/local/bin:$PATH]) + AC_MSG_CHECKING(for supported MIT krb5 version) + KRB5_VERSION="`$KRB5_CONFIG --version`" + case $KRB5_VERSION in +-- +1.8.0 + Index: files/patch-src__responder__pac__pacsrv_utils.c =================================================================== --- files/patch-src__responder__pac__pacsrv_utils.c (revision 0) +++ files/patch-src__responder__pac__pacsrv_utils.c (working copy) @@ -0,0 +1,24 @@ +From 93a41acb0f1434d1638cc796c4529a135d61409d Mon Sep 17 00:00:00 2001 +From: Lukas Slebodnik <lukas.slebodnik@intrak.sk> +Date: Wed, 30 Oct 2013 10:49:27 +0100 +Subject: [PATCH 4/4] patch-src__responder__pac__pacsrv_utils.c + +--- + src/responder/pac/pacsrv_utils.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git src/responder/pac/pacsrv_utils.c src/responder/pac/pacsrv_utils.c +index 3ac7b84..6052432 100644 +--- src/responder/pac/pacsrv_utils.c ++++ src/responder/pac/pacsrv_utils.c +@@ -18,6 +18,7 @@ + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ ++#include <sys/types.h> + #include <stdbool.h> + #include <util/data_blob.h> + #include <gen_ndr/security.h> +-- +1.8.0 + >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310302221.r9UMLVVY080174>