pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/security/mit-krb5
Module Name: pkgsrc
Committed By: jperkin
Date: Fri Apr 10 10:38:06 UTC 2026
Modified Files:
pkgsrc/security/mit-krb5: distinfo
pkgsrc/security/mit-krb5/patches: patch-lib_krb5_os_locate__kdc.c
Added Files:
pkgsrc/security/mit-krb5/patches: patch-lib_apputils_net-server.c
patch-lib_krb5_os_addr.c
Log Message:
mit-krb5: Fix build on SunOS.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/security/mit-krb5/distinfo
cvs rdiff -u -r0 -r1.5 \
pkgsrc/security/mit-krb5/patches/patch-lib_apputils_net-server.c
cvs rdiff -u -r0 -r1.1 \
pkgsrc/security/mit-krb5/patches/patch-lib_krb5_os_addr.c
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/security/mit-krb5/patches/patch-lib_krb5_os_locate__kdc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/security/mit-krb5/distinfo
diff -u pkgsrc/security/mit-krb5/distinfo:1.83 pkgsrc/security/mit-krb5/distinfo:1.84
--- pkgsrc/security/mit-krb5/distinfo:1.83 Tue Apr 7 14:12:48 2026
+++ pkgsrc/security/mit-krb5/distinfo Fri Apr 10 10:38:05 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.83 2026/04/07 14:12:48 tnn Exp $
+$NetBSD: distinfo,v 1.84 2026/04/10 10:38:05 jperkin Exp $
BLAKE2s (krb5-1.22.2.tar.gz) = d43a371657c4def55ee2502f9b5ac6ab2e9263b077dd94fecc717cb3cd85e6f5
SHA512 (krb5-1.22.2.tar.gz) = 3237cacfb2019285107991a3211e0d74944c605942ab38a8b4b372703b8f02f5779fa2de80c4e201bd59703d557f37ac346bdc5ea14b986b0a0db23eb422fc6f
@@ -17,6 +17,7 @@ SHA1 (patch-include_osconf.hin) = d31a81
SHA1 (patch-kadmin_cli_ss_wrapper.c) = e32e6180f8d508cb2eb18489ce2fef0a1ad0f51d
SHA1 (patch-kprop_kproplog.c) = cbfd43495d40ecd9edf427c3dfb135b0fe2c9546
SHA1 (patch-lib_apputils_Makefile.in) = 085004041a2bb8c4bb3074c2e71e71f22f4f06d7
+SHA1 (patch-lib_apputils_net-server.c) = 4defa579117eb02d8e22d228a381b4ffa31a05c7
SHA1 (patch-lib_apputils_udppktinfo.c) = 47ac861181faebfe5f95c28be329ce917ece872c
SHA1 (patch-lib_gssapi_Makefile.in) = 806b089d3b12ea9a17c6caab59cbdeb6ec17bbc3
SHA1 (patch-lib_gssapi_krb5_import__name.c) = 7445639b82eadf9b1feb1448c1654fa6ddc937aa
@@ -24,8 +25,9 @@ SHA1 (patch-lib_kdb_Makefile.in) = 0c45e
SHA1 (patch-lib_kdb_kdb__log.c) = dc759fae6099e7586686bcf14d7cd775854e0360
SHA1 (patch-lib_krb5_ccache_Makefile.in) = 330ae21ec3b290ae16478c2c49a138acac5bf2fd
SHA1 (patch-lib_krb5_ccache_ccbase.c) = 421b8f1f4fb9d42580e6cd493006b63eb077ce9e
+SHA1 (patch-lib_krb5_os_addr.c) = c01eedbff966e0e61b68df71a7b19f714474449b
SHA1 (patch-lib_krb5_os_expand__path.c) = 20530c7a29cef443713d2c6e50b934ec0366796e
-SHA1 (patch-lib_krb5_os_locate__kdc.c) = fe0e9b3a5ad6c394e2a24d3e00192427661190ad
+SHA1 (patch-lib_krb5_os_locate__kdc.c) = dd2469f4e78c25f01e90d4b388cce4a88beab733
SHA1 (patch-plugins_kdb_db2_Makefile.in) = eae56f7f450a299bdf1d86ee491af1fd51bd1d0c
SHA1 (patch-plugins_kdb_db2_libdb2_Makefile.in) = b4b7e8e4192b5e5318f1e42c49315789619f3ae9
SHA1 (patch-plugins_kdb_ldap_ldap__util_Makefile.in) = 7aa0f44cc02c523c837e7e3e1766624d2323deb9
Index: pkgsrc/security/mit-krb5/patches/patch-lib_krb5_os_locate__kdc.c
diff -u pkgsrc/security/mit-krb5/patches/patch-lib_krb5_os_locate__kdc.c:1.1 pkgsrc/security/mit-krb5/patches/patch-lib_krb5_os_locate__kdc.c:1.2
--- pkgsrc/security/mit-krb5/patches/patch-lib_krb5_os_locate__kdc.c:1.1 Tue Apr 7 14:12:48 2026
+++ pkgsrc/security/mit-krb5/patches/patch-lib_krb5_os_locate__kdc.c Fri Apr 10 10:38:05 2026
@@ -1,8 +1,9 @@
-$NetBSD: patch-lib_krb5_os_locate__kdc.c,v 1.1 2026/04/07 14:12:48 tnn Exp $
+$NetBSD: patch-lib_krb5_os_locate__kdc.c,v 1.2 2026/04/10 10:38:05 jperkin Exp $
https://github.com/krb5/krb5/commit/ad4dcf1856dadc4b352b5c8ff08e51c7290fb41f
+Avoid sun conflict.
---- lib/krb5/os/locate_kdc.c.orig 2025-08-20 19:44:32.000000000 +0000
+--- lib/krb5/os/locate_kdc.c.orig 2026-01-29 23:18:10.000000000 +0000
+++ lib/krb5/os/locate_kdc.c
@@ -214,8 +214,8 @@ oom:
}
@@ -25,6 +26,29 @@ https://github.com/krb5/krb5/commit/ad4d
krb5_error_code code;
size_t i;
int default_port;
+@@ -297,16 +296,16 @@ locate_srv_conf_1(krb5_context context,
+
+ #ifndef _WIN32
+ if (hostspec[0] == '/') {
+- struct sockaddr_un sun = { 0 };
++ struct sockaddr_un sockun = { 0 };
+
+- sun.sun_family = AF_UNIX;
+- if (strlcpy(sun.sun_path, hostspec, sizeof(sun.sun_path)) >=
+- sizeof(sun.sun_path)) {
++ sockun.sun_family = AF_UNIX;
++ if (strlcpy(sockun.sun_path, hostspec, sizeof(sockun.sun_path)) >=
++ sizeof(sockun.sun_path)) {
+ code = ENAMETOOLONG;
+ goto cleanup;
+ }
+- code = add_addr_to_list(serverlist, UNIXSOCK, AF_UNIX, sizeof(sun),
+- (struct sockaddr *)&sun);
++ code = add_addr_to_list(serverlist, UNIXSOCK, AF_UNIX, sizeof(sockun),
++ (struct sockaddr *)&sockun);
+ if (code)
+ goto cleanup;
+ continue;
@@ -587,8 +586,8 @@ prof_locate_server(krb5_context context,
* Return a NULL *host_out if there are any problems parsing the URI.
*/
Added files:
Index: pkgsrc/security/mit-krb5/patches/patch-lib_apputils_net-server.c
diff -u /dev/null pkgsrc/security/mit-krb5/patches/patch-lib_apputils_net-server.c:1.5
--- /dev/null Fri Apr 10 10:38:06 2026
+++ pkgsrc/security/mit-krb5/patches/patch-lib_apputils_net-server.c Fri Apr 10 10:38:05 2026
@@ -0,0 +1,36 @@
+$NetBSD: patch-lib_apputils_net-server.c,v 1.5 2026/04/10 10:38:05 jperkin Exp $
+
+Avoid sun conflict.
+
+--- lib/apputils/net-server.c.orig 2026-04-10 10:21:02.105019528 +0000
++++ lib/apputils/net-server.c
+@@ -938,7 +938,7 @@ setup_addresses(verto_ctx *ctx, void *ha
+ size_t i;
+ int err, bound_any;
+ struct bind_address addr;
+- struct sockaddr_un sun;
++ struct sockaddr_un sockun;
+ struct addrinfo hints, *ai_list = NULL, *ai = NULL;
+ struct sockact_list sockacts = { 0 };
+ verto_callback vcb;
+@@ -967,16 +967,16 @@ setup_addresses(verto_ctx *ctx, void *ha
+ hints.ai_socktype = bind_socktypes[addr.type];
+
+ if (addr.type == UNX) {
+- sun.sun_family = AF_UNIX;
+- if (strlcpy(sun.sun_path, addr.address, sizeof(sun.sun_path)) >=
+- sizeof(sun.sun_path)) {
++ sockun.sun_family = AF_UNIX;
++ if (strlcpy(sockun.sun_path, addr.address, sizeof(sockun.sun_path)) >=
++ sizeof(sockun.sun_path)) {
+ ret = ENAMETOOLONG;
+ krb5_klog_syslog(LOG_ERR,
+ _("UNIX domain socket path too long: %s"),
+ addr.address);
+ goto cleanup;
+ }
+- ret = setup_socket(&addr, (struct sockaddr *)&sun, &sockacts,
++ ret = setup_socket(&addr, (struct sockaddr *)&sockun, &sockacts,
+ handle, prog, ctx, listen_backlog,
+ verto_callbacks[addr.type],
+ bind_conn_types[addr.type]);
Index: pkgsrc/security/mit-krb5/patches/patch-lib_krb5_os_addr.c
diff -u /dev/null pkgsrc/security/mit-krb5/patches/patch-lib_krb5_os_addr.c:1.1
--- /dev/null Fri Apr 10 10:38:06 2026
+++ pkgsrc/security/mit-krb5/patches/patch-lib_krb5_os_addr.c Fri Apr 10 10:38:05 2026
@@ -0,0 +1,20 @@
+$NetBSD: patch-lib_krb5_os_addr.c,v 1.1 2026/04/10 10:38:05 jperkin Exp $
+
+Avoid sun conflict.
+
+--- lib/krb5/os/addr.c.orig 2026-04-10 10:08:05.637992098 +0000
++++ lib/krb5/os/addr.c
+@@ -62,10 +62,10 @@ k5_sockaddr_to_address(const struct sock
+ }
+ #ifndef _WIN32
+ } else if (sa->sa_family == AF_UNIX && local_use) {
+- const struct sockaddr_un *sun = sa2sun(sa);
++ const struct sockaddr_un *sockun = sa2sun(sa);
+ out->addrtype = ADDRTYPE_UNIXSOCK;
+- out->length = strlen(sun->sun_path);
+- out->contents = (uint8_t *)sun->sun_path;
++ out->length = strlen(sockun->sun_path);
++ out->contents = (uint8_t *)sockun->sun_path;
+ #endif
+ } else {
+ return KRB5_PROG_ATYPE_NOSUPP;
Home |
Main Index |
Thread Index |
Old Index