svn commit: r472762 - in head/security/krb5-devel: . files
Cy Schubert
Cy.Schubert at cschubert.com
Tue Jun 19 07:09:31 UTC 2018
In message <201806190656.w5J6uC57084388 at repo.freebsd.org>, Cy Schubert
writes:
> Author: cy
> Date: Tue Jun 19 06:56:12 2018
> New Revision: 472762
> URL: https://svnweb.freebsd.org/changeset/ports/472762
>
> Log:
> As described in r472760, the "register" keyword is meaningless and
> causes at least one port some gas. Remove the keyword from krb5.h.
>
> Added:
> head/security/krb5-devel/files/patch-include_krb5_krb5.hin (contents, pro
> ps changed)
> Modified:
> head/security/krb5-devel/Makefile
>
> Modified: head/security/krb5-devel/Makefile
> =============================================================================
> =
> --- head/security/krb5-devel/Makefile Tue Jun 19 06:52:44 2018 (r47276
> 1)
> +++ head/security/krb5-devel/Makefile Tue Jun 19 06:56:12 2018 (r47276
> 2)
> @@ -3,7 +3,7 @@
>
> PORTNAME= krb5
> PORTVERSION= 1.17.${MIT_COMMIT_DATE}
> -PORTREVISION= 1
> +PORTREVISION= 2
> CATEGORIES= security
> .if !defined(MASTERDIR)
> PKGNAMESUFFIX= -devel
>
> Added: head/security/krb5-devel/files/patch-include_krb5_krb5.hin
> =============================================================================
> =
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/security/krb5-devel/files/patch-include_krb5_krb5.hin Tue Jun
> 19 06:56:12 2018 (r472762)
> @@ -0,0 +1,74 @@
> +--- include/krb5/krb5.hin.orig 2018-05-12 22:15:24.000000000 -0700
> ++++ include/krb5/krb5.hin 2018-06-18 23:46:02.119491000 -0700
> +@@ -3566,7 +3566,7 @@
> + */
> + krb5_error_code KRB5_CALLCONV
> + krb5_unparse_name(krb5_context context, krb5_const_principal principal,
> +- register char **name);
> ++ char **name);
> +
> + /**
> + * Convert krb5_principal structure to string and length.
> +@@ -4389,7 +4389,7 @@
> + */
> + krb5_error_code KRB5_CALLCONV_WRONG
> + krb5_principal2salt(krb5_context context,
> +- register krb5_const_principal pr, krb5_data *ret);
> ++ krb5_const_principal pr, krb5_data *ret);
> + /* librc.spec--see rcache.h */
> +
> + /* libcc.spec */
> +@@ -4730,7 +4730,7 @@
> + * This function frees the contents of @a val and the structure itself.
> + */
> + void KRB5_CALLCONV
> +-krb5_free_error(krb5_context context, register krb5_error *val);
> ++krb5_free_error(krb5_context context, krb5_error *val);
> +
> + /**
> + * Free a krb5_creds structure.
> +@@ -4763,7 +4763,7 @@
> + * This function frees the contents of @a val and the structure itself.
> + */
> + void KRB5_CALLCONV
> +-krb5_free_checksum(krb5_context context, register krb5_checksum *val);
> ++krb5_free_checksum(krb5_context context, krb5_checksum *val);
> +
> + /**
> + * Free the contents of a krb5_checksum structure.
> +@@ -4774,7 +4774,7 @@
> + * This function frees the contents of @a val, but not the structure itself
> .
> + */
> + void KRB5_CALLCONV
> +-krb5_free_checksum_contents(krb5_context context, register krb5_checksum *v
> al);
> ++krb5_free_checksum_contents(krb5_context context, krb5_checksum *val);
> +
> + /**
> + * Free a krb5_keyblock structure.
> +@@ -4785,7 +4785,7 @@
> + * This function frees the contents of @a val and the structure itself.
> + */
> + void KRB5_CALLCONV
> +-krb5_free_keyblock(krb5_context context, register krb5_keyblock *val);
> ++krb5_free_keyblock(krb5_context context, krb5_keyblock *val);
> +
> + /**
> + * Free the contents of a krb5_keyblock structure.
> +@@ -4796,7 +4796,7 @@
> + * This function frees the contents of @a key, but not the structure itself
> .
> + */
> + void KRB5_CALLCONV
> +-krb5_free_keyblock_contents(krb5_context context, register krb5_keyblock *k
> ey);
> ++krb5_free_keyblock_contents(krb5_context context, krb5_keyblock *key);
> +
> + /**
> + * Free a krb5_ap_rep_enc_part structure.
> +@@ -4912,7 +4912,7 @@
> + * Kerberos error codes
> + */
> + krb5_error_code KRB5_CALLCONV
> +-krb5_timeofday(krb5_context context, register krb5_timestamp *timeret);
> ++krb5_timeofday(krb5_context context, krb5_timestamp *timeret);
> +
> + /**
> + * Check if a timestamp is within the allowed clock skew of the current tim
> e.
Updating the -devel port to the latest commit I discovered that our
upline was thinking the same. They removed the "register" keyword from
krb5.h and a number of other files as well. I will backport the
complete patch to the remaining krb5 ports after krb5-devel is updated
(probably tomorrow).
It's been serendipitous on more than one occasion today.
Given that it's past midnight here, the update to krb5-devel will have
to wait.
--
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX: <cy at FreeBSD.org> Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
More information about the svn-ports-all
mailing list