From 1c21d6adf181b154a795421db14732c4c925f11e Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Tue, 9 Jan 2024 19:30:05 +0000 Subject: [PATCH 1/3] swig - update from 4.1.1 to 4.2.0 --- build/swig/build.sh | 4 +- build/swig/patches/unneeded-libs.patch | 8 +-- build/swig/testsuite.log | 85 ++++++++++++++++++++++++-- doc/packages.md | 2 +- 4 files changed, 86 insertions(+), 13 deletions(-) diff --git a/build/swig/build.sh b/build/swig/build.sh index 7bf50513d8..126161114a 100755 --- a/build/swig/build.sh +++ b/build/swig/build.sh @@ -12,12 +12,12 @@ # http://www.illumos.org/license/CDDL. # }}} # -# Copyright 2022 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. . ../../lib/build.sh PROG=swig -VER=4.1.1 +VER=4.2.0 PKG=developer/swig SUMMARY="The Simplified Wrapper and Interface Generator (swig)" DESC="A compiler that integrates C and C++ with languages including Perl, " diff --git a/build/swig/patches/unneeded-libs.patch b/build/swig/patches/unneeded-libs.patch index c527e76d82..15f926af93 100644 --- a/build/swig/patches/unneeded-libs.patch +++ b/build/swig/patches/unneeded-libs.patch @@ -1,7 +1,7 @@ -diff -wpruN '--exclude=*.orig' a~/configure.ac a/configure.ac +diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac --- a~/configure.ac 1970-01-01 00:00:00 +++ a/configure.ac 1970-01-01 00:00:00 -@@ -465,7 +465,7 @@ case $host in +@@ -457,7 +457,7 @@ case $host in esac # Check for specific libraries. Used for SWIG examples @@ -10,7 +10,7 @@ diff -wpruN '--exclude=*.orig' a~/configure.ac a/configure.ac AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX dnl The following three libraries (nsl,inet,socket) are needed on Sequent, -@@ -475,9 +475,9 @@ dnl +@@ -467,9 +467,9 @@ dnl dnl Most SVR4 platforms will need -lsocket and -lnsl. However on SGI IRIX 5, dnl these exist but are broken, so we use AC_SEARCH_LIBS which will only try dnl the library if the function isn't already available without it. @@ -22,7 +22,7 @@ diff -wpruN '--exclude=*.orig' a~/configure.ac a/configure.ac # check for --with-libm=... AC_SUBST(LIBM) -@@ -487,7 +487,7 @@ if test "$withval" != yes +@@ -479,7 +479,7 @@ if test "$withval" != yes then LIBM=$withval else AC_MSG_ERROR([proper usage is --with-libm=STRING]) fi]) diff --git a/build/swig/testsuite.log b/build/swig/testsuite.log index 6aea60ee10..7db6b65e30 100644 --- a/build/swig/testsuite.log +++ b/build/swig/testsuite.log @@ -9,6 +9,7 @@ partialchecking perl5 testcase abstract_access partialchecking perl5 testcase abstract_basecast partialchecking perl5 testcase abstract_inherit partialchecking perl5 testcase abstract_inherit_ok +partialchecking perl5 testcase abstract_inherit_using partialchecking perl5 testcase abstract_signature partialchecking perl5 testcase abstract_typedef partialchecking perl5 testcase abstract_typedef2 @@ -31,7 +32,10 @@ partialchecking perl5 testcase arrays_dimensionless partialchecking perl5 testcase arrays_global partialchecking perl5 testcase arrays_global_twodim partialchecking perl5 testcase arrays_scope +partialchecking perl5 testcase assign_const +partialchecking perl5 testcase assign_reference partialchecking perl5 testcase autodoc +partialchecking perl5 testcase begin_code partialchecking perl5 testcase bloody_hell partialchecking perl5 testcase bools partialchecking perl5 testcase catches @@ -53,6 +57,7 @@ partialchecking perl5 testcase constant_expr partialchecking perl5 testcase constant_pointers partialchecking perl5 testcase constover partialchecking perl5 testcase constructor_copy +partialchecking perl5 testcase constructor_copy_non_const partialchecking perl5 testcase constructor_exception partialchecking perl5 testcase constructor_explicit partialchecking perl5 testcase constructor_ignore @@ -63,6 +68,7 @@ partialchecking perl5 testcase conversion partialchecking perl5 testcase conversion_namespace partialchecking perl5 testcase conversion_ns_template partialchecking perl5 testcase conversion_operators +partialchecking perl5 testcase copyctor partialchecking perl5 testcase cplusplus_throw partialchecking perl5 testcase cpp_basic partialchecking perl5 testcase cpp_enum @@ -128,6 +134,7 @@ partialchecking perl5 testcase director_void partialchecking perl5 testcase director_wombat (with run test) partialchecking perl5 testcase disown (with run test) partialchecking perl5 testcase duplicate_class_name_in_ns +partialchecking perl5 testcase duplicate_parm_names partialchecking perl5 testcase dynamic_cast (with run test) partialchecking perl5 testcase empty partialchecking perl5 testcase enum_ignore @@ -249,6 +256,7 @@ partialchecking perl5 testcase nested_workaround partialchecking perl5 testcase newobject1 partialchecking perl5 testcase newobject3 partialchecking perl5 testcase null_pointer +partialchecking perl5 testcase numeric_bounds_checking partialchecking perl5 testcase operator_overload (with run test) partialchecking perl5 testcase operator_overload_break (with run test) partialchecking perl5 testcase operator_pointer_ref @@ -271,6 +279,8 @@ partialchecking perl5 testcase overload_template partialchecking perl5 testcase overload_template_fast partialchecking perl5 testcase pointer_reference partialchecking perl5 testcase preproc_constants +partialchecking perl5 testcase preproc_cpp +partialchecking perl5 testcase preproc_predefined_stdcpp partialchecking perl5 testcase primitive_ref (with run test) partialchecking perl5 testcase private_assign partialchecking perl5 testcase proxycode @@ -361,10 +371,12 @@ partialchecking perl5 testcase template_enum partialchecking perl5 testcase template_enum_ns_inherit partialchecking perl5 testcase template_enum_typedef partialchecking perl5 testcase template_explicit +partialchecking perl5 testcase template_expr partialchecking perl5 testcase template_extend1 partialchecking perl5 testcase template_extend2 partialchecking perl5 testcase template_extend_overload partialchecking perl5 testcase template_extend_overload_2 +partialchecking perl5 testcase template_function_parm partialchecking perl5 testcase template_forward partialchecking perl5 testcase template_inherit partialchecking perl5 testcase template_inherit_abstract @@ -372,8 +384,10 @@ partialchecking perl5 testcase template_int_const partialchecking perl5 testcase template_keyword_in_type partialchecking perl5 testcase template_methods partialchecking perl5 testcase template_namespace_forward_declaration +partialchecking perl5 testcase template_private_assignment partialchecking perl5 testcase template_using_directive_and_declaration_forward partialchecking perl5 testcase template_using_directive_typedef +partialchecking perl5 testcase template_using_member_default_arg partialchecking perl5 testcase template_nested partialchecking perl5 testcase template_nested_flat partialchecking perl5 testcase template_nested_typemaps @@ -388,6 +402,7 @@ partialchecking perl5 testcase template_ns_scope partialchecking perl5 testcase template_parameters_global_scope partialchecking perl5 testcase template_partial_arg partialchecking perl5 testcase template_partial_specialization +partialchecking perl5 testcase template_partial_specialization_more partialchecking perl5 testcase template_partial_specialization_typedef partialchecking perl5 testcase template_qualifier partialchecking perl5 testcase template_ref_type (with run test) @@ -396,9 +411,12 @@ partialchecking perl5 testcase template_retvalue partialchecking perl5 testcase template_specialization partialchecking perl5 testcase template_specialization_defarg partialchecking perl5 testcase template_specialization_enum +partialchecking perl5 testcase template_specialization_using_declaration partialchecking perl5 testcase template_static partialchecking perl5 testcase template_tbase_template partialchecking perl5 testcase template_template_parameters +partialchecking perl5 testcase template_template_template_parameters +partialchecking perl5 testcase template_type_collapse partialchecking perl5 testcase template_typedef partialchecking perl5 testcase template_typedef_class_template partialchecking perl5 testcase template_typedef_cplx (with run test) @@ -462,6 +480,7 @@ partialchecking perl5 testcase using_directive_and_declaration_forward partialchecking perl5 testcase using_extend partialchecking perl5 testcase using_inherit partialchecking perl5 testcase using_member +partialchecking perl5 testcase using_member_multiple_inherit partialchecking perl5 testcase using_member_scopes partialchecking perl5 testcase using_namespace partialchecking perl5 testcase using_namespace_loop @@ -507,12 +526,18 @@ partialchecking perl5 testcase template_opaque partialchecking perl5 testcase cpp11_alias_nested_template_scoping partialchecking perl5 testcase cpp11_alignment partialchecking perl5 testcase cpp11_alternate_function_syntax +partialchecking perl5 testcase cpp11_assign_delete +partialchecking perl5 testcase cpp11_assign_rvalue_reference partialchecking perl5 testcase cpp11_attribute_specifiers +partialchecking perl5 testcase cpp11_auto_variable +partialchecking perl5 testcase cpp11_brackets_expression partialchecking perl5 testcase cpp11_constexpr +partialchecking perl5 testcase cpp11_copyctor_delete partialchecking perl5 testcase cpp11_decltype partialchecking perl5 testcase cpp11_default_delete partialchecking perl5 testcase cpp11_delegating_constructors partialchecking perl5 testcase cpp11_director_enums +partialchecking perl5 testcase cpp11_director_using_constructor partialchecking perl5 testcase cpp11_directors partialchecking perl5 testcase cpp11_explicit_conversion_operators partialchecking perl5 testcase cpp11_final_class @@ -545,18 +570,28 @@ partialchecking perl5 testcase cpp11_strongly_typed_enumerations (with run test) partialchecking perl5 testcase cpp11_thread_local partialchecking perl5 testcase cpp11_template_double_brackets partialchecking perl5 testcase cpp11_template_explicit +partialchecking perl5 testcase cpp11_template_parameters_decltype partialchecking perl5 testcase cpp11_template_typedefs partialchecking perl5 testcase cpp11_type_traits partialchecking perl5 testcase cpp11_type_aliasing partialchecking perl5 testcase cpp11_uniform_initialization partialchecking perl5 testcase cpp11_unrestricted_unions partialchecking perl5 testcase cpp11_userdefined_literals +partialchecking perl5 testcase cpp11_using_constructor +partialchecking perl5 testcase cpp11_using_typedef_struct +partialchecking perl5 testcase cpp11_variadic_function_templates +partialchecking perl5 testcase cpp11_variadic_templates +partialchecking perl5 testcase cpp14_auto_return_type partialchecking perl5 testcase cpp14_binary_integer_literals +partialchecking perl5 testcase cpp17_director_string_view (with run test) partialchecking perl5 testcase cpp17_enable_if_t partialchecking perl5 testcase cpp17_hex_floating_literals +partialchecking perl5 testcase cpp17_map_no_default_ctor partialchecking perl5 testcase cpp17_nested_namespaces partialchecking perl5 testcase cpp17_nspace_nested_namespaces +partialchecking perl5 testcase cpp17_string_view (with run test) partialchecking perl5 testcase cpp17_u8_char_literals +partialchecking perl5 testcase cpp20_constexpr_destructor partialchecking perl5 testcase cpp20_lambda_template partialchecking perl5 testcase cpp20_spaceship_operator partialchecking perl5 testcase li_cstring @@ -592,7 +627,7 @@ partialchecking perl5 testcase lextype partialchecking perl5 testcase li_carrays (with run test) partialchecking perl5 testcase li_cdata partialchecking perl5 testcase li_cmalloc -partialchecking perl5 testcase li_constraints +partialchecking perl5 testcase li_constraints (with run test) partialchecking perl5 testcase li_cpointer partialchecking perl5 testcase li_math partialchecking perl5 testcase long_long @@ -613,6 +648,7 @@ partialchecking perl5 testcase preproc_gcc_output partialchecking perl5 testcase preproc_include partialchecking perl5 testcase preproc_line_file partialchecking perl5 testcase preproc_predefined +partialchecking perl5 testcase preproc_predefined_stdc partialchecking perl5 testcase register_par partialchecking perl5 testcase ret_by_value (with run test) partialchecking perl5 testcase simple_array @@ -633,7 +669,7 @@ partialchecking perl5 testcase mod partialchecking perl5 testcase multi_import partialchecking perl5 testcase packageoption (with run test) partialchecking perl5 testcase template_typedef_import -634 perl5 tests passed +670 perl5 tests passed partialchecking python test-suite partialchecking python testcase callback (with run test) partialchecking python testcase complextest (with run test) @@ -680,6 +716,7 @@ partialchecking python testcase python_pythoncode (with run test) partialchecking python testcase python_richcompare (with run test) partialchecking python testcase python_strict_unicode (with run test) partialchecking python testcase python_threads (with run test) +partialchecking python testcase python_typemap_macro (with run test) partialchecking python testcase simutry partialchecking python testcase std_containers (with run test) partialchecking python testcase swigobject (with run test) @@ -688,6 +725,7 @@ partialchecking python testcase abstract_access (with run test) partialchecking python testcase abstract_basecast (with run test) partialchecking python testcase abstract_inherit partialchecking python testcase abstract_inherit_ok +partialchecking python testcase abstract_inherit_using partialchecking python testcase abstract_signature partialchecking python testcase abstract_typedef (with run test) partialchecking python testcase abstract_typedef2 (with run test) @@ -710,7 +748,10 @@ partialchecking python testcase arrays_dimensionless partialchecking python testcase arrays_global (with run test) partialchecking python testcase arrays_global_twodim partialchecking python testcase arrays_scope +partialchecking python testcase assign_const +partialchecking python testcase assign_reference partialchecking python testcase autodoc (with run test) +partialchecking python testcase begin_code partialchecking python testcase bloody_hell partialchecking python testcase bools partialchecking python testcase catches @@ -732,6 +773,7 @@ partialchecking python testcase constant_expr partialchecking python testcase constant_pointers partialchecking python testcase constover (with run test) partialchecking python testcase constructor_copy (with run test) +partialchecking python testcase constructor_copy_non_const (with run test) partialchecking python testcase constructor_exception partialchecking python testcase constructor_explicit partialchecking python testcase constructor_ignore @@ -742,6 +784,7 @@ partialchecking python testcase conversion partialchecking python testcase conversion_namespace partialchecking python testcase conversion_ns_template partialchecking python testcase conversion_operators +partialchecking python testcase copyctor (with run test) partialchecking python testcase cplusplus_throw partialchecking python testcase cpp_basic partialchecking python testcase cpp_enum (with run test) @@ -807,6 +850,7 @@ partialchecking python testcase director_void partialchecking python testcase director_wombat partialchecking python testcase disown (with run test) partialchecking python testcase duplicate_class_name_in_ns +partialchecking python testcase duplicate_parm_names partialchecking python testcase dynamic_cast (with run test) partialchecking python testcase empty (with run test) partialchecking python testcase enum_ignore @@ -928,6 +972,7 @@ partialchecking python testcase nested_workaround (with run test) partialchecking python testcase newobject1 partialchecking python testcase newobject3 partialchecking python testcase null_pointer +partialchecking python testcase numeric_bounds_checking partialchecking python testcase operator_overload (with run test) partialchecking python testcase operator_overload_break partialchecking python testcase operator_pointer_ref @@ -950,6 +995,8 @@ partialchecking python testcase overload_template (with run test) partialchecking python testcase overload_template_fast (with run test) partialchecking python testcase pointer_reference (with run test) partialchecking python testcase preproc_constants +partialchecking python testcase preproc_cpp (with run test) +partialchecking python testcase preproc_predefined_stdcpp partialchecking python testcase primitive_ref (with run test) partialchecking python testcase private_assign partialchecking python testcase proxycode @@ -1022,7 +1069,7 @@ partialchecking python testcase template_classes (with run test) partialchecking python testcase template_class_reuse_name (with run test) partialchecking python testcase template_const_ref partialchecking python testcase template_construct (with run test) -partialchecking python testcase template_templated_constructors +partialchecking python testcase template_templated_constructors (with run test) partialchecking python testcase template_default partialchecking python testcase template_default2 partialchecking python testcase template_default_arg (with run test) @@ -1040,10 +1087,12 @@ partialchecking python testcase template_enum partialchecking python testcase template_enum_ns_inherit partialchecking python testcase template_enum_typedef partialchecking python testcase template_explicit +partialchecking python testcase template_expr partialchecking python testcase template_extend1 (with run test) partialchecking python testcase template_extend2 (with run test) partialchecking python testcase template_extend_overload partialchecking python testcase template_extend_overload_2 +partialchecking python testcase template_function_parm partialchecking python testcase template_forward partialchecking python testcase template_inherit (with run test) partialchecking python testcase template_inherit_abstract @@ -1051,8 +1100,10 @@ partialchecking python testcase template_int_const partialchecking python testcase template_keyword_in_type partialchecking python testcase template_methods partialchecking python testcase template_namespace_forward_declaration +partialchecking python testcase template_private_assignment partialchecking python testcase template_using_directive_and_declaration_forward partialchecking python testcase template_using_directive_typedef (with run test) +partialchecking python testcase template_using_member_default_arg (with run test) partialchecking python testcase template_nested partialchecking python testcase template_nested_flat partialchecking python testcase template_nested_typemaps @@ -1067,6 +1118,7 @@ partialchecking python testcase template_ns_scope partialchecking python testcase template_parameters_global_scope partialchecking python testcase template_partial_arg partialchecking python testcase template_partial_specialization +partialchecking python testcase template_partial_specialization_more partialchecking python testcase template_partial_specialization_typedef partialchecking python testcase template_qualifier partialchecking python testcase template_ref_type (with run test) @@ -1075,9 +1127,12 @@ partialchecking python testcase template_retvalue partialchecking python testcase template_specialization partialchecking python testcase template_specialization_defarg partialchecking python testcase template_specialization_enum +partialchecking python testcase template_specialization_using_declaration partialchecking python testcase template_static (with run test) partialchecking python testcase template_tbase_template (with run test) partialchecking python testcase template_template_parameters (with run test) +partialchecking python testcase template_template_template_parameters +partialchecking python testcase template_type_collapse partialchecking python testcase template_typedef (with run test) partialchecking python testcase template_typedef_class_template partialchecking python testcase template_typedef_cplx (with run test) @@ -1141,6 +1196,7 @@ partialchecking python testcase using_directive_and_declaration_forward partialchecking python testcase using_extend (with run test) partialchecking python testcase using_inherit (with run test) partialchecking python testcase using_member (with run test) +partialchecking python testcase using_member_multiple_inherit (with run test) partialchecking python testcase using_member_scopes partialchecking python testcase using_namespace partialchecking python testcase using_namespace_loop @@ -1211,19 +1267,25 @@ partialchecking python testcase cpp11_std_unordered_set partialchecking python testcase cpp11_alias_nested_template_scoping partialchecking python testcase cpp11_alignment partialchecking python testcase cpp11_alternate_function_syntax (with run test) +partialchecking python testcase cpp11_assign_delete +partialchecking python testcase cpp11_assign_rvalue_reference partialchecking python testcase cpp11_attribute_specifiers +partialchecking python testcase cpp11_auto_variable +partialchecking python testcase cpp11_brackets_expression partialchecking python testcase cpp11_constexpr +partialchecking python testcase cpp11_copyctor_delete partialchecking python testcase cpp11_decltype (with run test) partialchecking python testcase cpp11_default_delete partialchecking python testcase cpp11_delegating_constructors partialchecking python testcase cpp11_director_enums +partialchecking python testcase cpp11_director_using_constructor (with run test) partialchecking python testcase cpp11_directors partialchecking python testcase cpp11_explicit_conversion_operators partialchecking python testcase cpp11_final_class (with run test) partialchecking python testcase cpp11_final_directors (with run test) partialchecking python testcase cpp11_final_override partialchecking python testcase cpp11_function_objects (with run test) -partialchecking python testcase cpp11_inheriting_constructors +partialchecking python testcase cpp11_inheriting_constructors (with run test) partialchecking python testcase cpp11_initializer_list (with run test) partialchecking python testcase cpp11_initializer_list_extend (with run test) partialchecking python testcase cpp11_lambda_functions @@ -1249,18 +1311,28 @@ partialchecking python testcase cpp11_strongly_typed_enumerations (with run test partialchecking python testcase cpp11_thread_local (with run test) partialchecking python testcase cpp11_template_double_brackets partialchecking python testcase cpp11_template_explicit (with run test) +partialchecking python testcase cpp11_template_parameters_decltype partialchecking python testcase cpp11_template_typedefs (with run test) partialchecking python testcase cpp11_type_traits (with run test) partialchecking python testcase cpp11_type_aliasing (with run test) partialchecking python testcase cpp11_uniform_initialization (with run test) partialchecking python testcase cpp11_unrestricted_unions partialchecking python testcase cpp11_userdefined_literals +partialchecking python testcase cpp11_using_constructor (with run test) +partialchecking python testcase cpp11_using_typedef_struct +partialchecking python testcase cpp11_variadic_function_templates (with run test) +partialchecking python testcase cpp11_variadic_templates (with run test) +partialchecking python testcase cpp14_auto_return_type (with run test) partialchecking python testcase cpp14_binary_integer_literals (with run test) +partialchecking python testcase cpp17_std_filesystem (with run test) +partialchecking python testcase cpp17_director_string_view (with run test) partialchecking python testcase cpp17_enable_if_t partialchecking python testcase cpp17_hex_floating_literals (with run test) partialchecking python testcase cpp17_nested_namespaces (with run test) partialchecking python testcase cpp17_nspace_nested_namespaces +partialchecking python testcase cpp17_string_view (with run test) partialchecking python testcase cpp17_u8_char_literals (with run test) +partialchecking python testcase cpp20_constexpr_destructor partialchecking python testcase cpp20_lambda_template partialchecking python testcase cpp20_spaceship_operator (with run test) partialchecking python testcase ccomplextest (with run test) @@ -1299,7 +1371,7 @@ partialchecking python testcase lextype partialchecking python testcase li_carrays (with run test) partialchecking python testcase li_cdata (with run test) partialchecking python testcase li_cmalloc (with run test) -partialchecking python testcase li_constraints +partialchecking python testcase li_constraints (with run test) partialchecking python testcase li_cpointer (with run test) partialchecking python testcase li_math partialchecking python testcase long_long @@ -1320,6 +1392,7 @@ partialchecking python testcase preproc_gcc_output (with run test) partialchecking python testcase preproc_include (with run test) partialchecking python testcase preproc_line_file partialchecking python testcase preproc_predefined +partialchecking python testcase preproc_predefined_stdc partialchecking python testcase register_par partialchecking python testcase ret_by_value (with run test) partialchecking python testcase simple_array @@ -1341,4 +1414,4 @@ partialchecking python testcase mod (with run test) partialchecking python testcase multi_import (with run test) partialchecking python testcase packageoption partialchecking python testcase template_typedef_import (with run test) -706 python tests passed +743 python tests passed diff --git a/doc/packages.md b/doc/packages.md index 2a6b157657..ee2a5f93d3 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -123,7 +123,7 @@ | developer/gnu-binutils | 2.41 | https://ftp.gnu.org/gnu/binutils | media/xorriso | 1.5.6.pl02 | https://www.gnu.org/software/xorriso/ | system/virtualization/open-vm-tools | 12.3.0 | https://github.com/vmware/open-vm-tools/releases https://docs.vmware.com/en/VMware-Tools/ -| developer/swig | 4.1.1 | http://www.swig.org/download.html +| developer/swig | 4.2.0 | http://www.swig.org/download.html | library/security/trousers | 0.3.15 | https://sourceforge.net/projects/trousers/files/trousers | library/python-3/asn1crypto-311 | 1.5.1 | https://pypi.org/project/asn1crypto | library/python-3/attrs-311 | 23.1.0 | https://pypi.org/project/attrs From ba60c464396c04fa28f938c5e4f6a659b389e13e Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Tue, 9 Jan 2024 19:30:11 +0000 Subject: [PATCH 2/3] sudo - update from 1.9.15p4 to 1.9.15p5 --- build/sudo/build.sh | 4 ++-- doc/packages.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/sudo/build.sh b/build/sudo/build.sh index 827019352a..c5a27be1ad 100755 --- a/build/sudo/build.sh +++ b/build/sudo/build.sh @@ -13,12 +13,12 @@ # }}} # # Copyright 2011-2012 OmniTI Computer Consulting, Inc. All rights reserved. -# Copyright 2023 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. . ../../lib/build.sh PROG=sudo -VER=1.9.15p4 +VER=1.9.15p5 PKG=security/sudo SUMMARY="Authority delegation tool" DESC="Provide limited super-user privileges to specific users" diff --git a/doc/packages.md b/doc/packages.md index ee2a5f93d3..58c97f7e99 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -82,7 +82,7 @@ | runtime/python-39 | 3.9.18 | https://www.python.org/downloads/source/ | runtime/python-310 | 3.10.13 | https://www.python.org/downloads/source/ | runtime/python-311 | 3.11.7 | https://www.python.org/downloads/source/ -| security/sudo | 1.9.15p4 | https://www.sudo.ws/ +| security/sudo | 1.9.15p5 | https://www.sudo.ws/ | service/network/chrony | 4.5 | https://download.tuxfamily.org/chrony/ | service/network/ntpsec | 1.2.2 | https://github.com/ntpsec/ntpsec/tags https://blog.ntpsec.org/ | service/network/smtp/dma | 0.13 | https://github.com/corecode/dma/tags From 61d039b1e450044e4114cf1940aefada7c2372b0 Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Tue, 9 Jan 2024 19:30:14 +0000 Subject: [PATCH 3/3] ntpsec - update from 1.2.2 to 1.2.3 --- build/ntpsec/build.sh | 5 ++--- build/ntpsec/local.mog | 18 +++++++++++------- build/ntpsec/patches/asciidoc.patch | 2 +- build/ntpsec/patches/clockwork.patch | 13 +++++++++++++ build/ntpsec/patches/conf.patch | 12 ++++++------ build/ntpsec/patches/nonet.patch | 2 +- build/ntpsec/patches/pie.patch | 6 +++--- build/ntpsec/patches/series | 1 + build/ntpsec/patches/unneeded_libs.patch | 4 ++-- build/ntpsec/testsuite.log | 15 +++++---------- doc/packages.md | 2 +- 11 files changed, 46 insertions(+), 34 deletions(-) create mode 100644 build/ntpsec/patches/clockwork.patch diff --git a/build/ntpsec/build.sh b/build/ntpsec/build.sh index b5aed0f9b9..299df91514 100755 --- a/build/ntpsec/build.sh +++ b/build/ntpsec/build.sh @@ -12,12 +12,12 @@ # http://www.illumos.org/license/CDDL. # }}} -# Copyright 2023 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. . ../../lib/build.sh PROG=ntpsec -VER=1.2.2 +VER=1.2.3 PKG=service/network/ntpsec SUMMARY="Network time services" DESC="A secure, hardened and improved Network Time Protocol implementation" @@ -47,7 +47,6 @@ CONFIGURE_OPTS=" --libdir=$PYTHONVENDOR/ntp --enable-manpage --disable-doc --nopyc --nopyo --nopycache - --enable-debug-gdb " CONFIGURE_OPTS[WS]=" --build-desc=\"$DISTRO $RELVER\" diff --git a/build/ntpsec/local.mog b/build/ntpsec/local.mog index 7659fd9d82..7ddd690571 100644 --- a/build/ntpsec/local.mog +++ b/build/ntpsec/local.mog @@ -8,13 +8,17 @@ # source. A copy of the CDDL is also available via the Internet at # http://www.illumos.org/license/CDDL. -# Copyright 2022 OmniOS Community Edition (OmniOSce) Association. - -license LICENSES/BSD-2 license=simplified-BSD -license LICENSES/BSD-3 license=modified-BSD -license LICENSES/MIT license=MIT -license LICENSES/CC-BY-4.0 license=skipCC -license LICENSES/NTP license=skipNTP +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. + +license LICENSES/Apache-2.0.txt license=Apache2 +license LICENSES/BSD-2-Clause.txt license=simplified-BSD +license LICENSES/BSD-3-Clause.txt license=modified-BSD +license LICENSES/BSD-4-Clause.txt license=modified-BSD +license LICENSES/ISC.txt license=ISC +license LICENSES/MIT.txt license=MIT +license LICENSES/Beerware.txt license=skip/beerware +license LICENSES/CC-BY-4.0.txt license=skip/CC +license LICENSES/NTP.txt license=skip/NTP # Skip dependency detection for python programs that break the dependency # checker - more investigation required here. diff --git a/build/ntpsec/patches/asciidoc.patch b/build/ntpsec/patches/asciidoc.patch index 5ad11dee5d..b18ec854fb 100644 --- a/build/ntpsec/patches/asciidoc.patch +++ b/build/ntpsec/patches/asciidoc.patch @@ -1,4 +1,4 @@ -diff -wpruN '--exclude=*.orig' a~/wafhelpers/asciidoc.py a/wafhelpers/asciidoc.py +diff -wpruN --no-dereference '--exclude=*.orig' a~/wafhelpers/asciidoc.py a/wafhelpers/asciidoc.py --- a~/wafhelpers/asciidoc.py 1970-01-01 00:00:00 +++ a/wafhelpers/asciidoc.py 1970-01-01 00:00:00 @@ -37,8 +37,7 @@ def configure(ctx): diff --git a/build/ntpsec/patches/clockwork.patch b/build/ntpsec/patches/clockwork.patch new file mode 100644 index 0000000000..1ca4218215 --- /dev/null +++ b/build/ntpsec/patches/clockwork.patch @@ -0,0 +1,13 @@ +diff -wpruN --no-dereference '--exclude=*.orig' a~/libntp/clockwork.c a/libntp/clockwork.c +--- a~/libntp/clockwork.c 1970-01-01 00:00:00 ++++ a/libntp/clockwork.c 1970-01-01 00:00:00 +@@ -39,8 +39,8 @@ + */ + int ntp_adjtime_ns(struct timex *ntx) + { +-#ifdef STA_NANO + static bool nanoseconds = false; ++#ifdef STA_NANO + static bool initial_call = true; + if (initial_call) + { diff --git a/build/ntpsec/patches/conf.patch b/build/ntpsec/patches/conf.patch index 61dd8dce97..77a4ac5faa 100644 --- a/build/ntpsec/patches/conf.patch +++ b/build/ntpsec/patches/conf.patch @@ -1,7 +1,7 @@ Re-locate the default configuration file from /etc/ to /etc/inet/ -diff -wpruN '--exclude=*.orig' a~/docs/includes/ntp-conf-body.adoc a/docs/includes/ntp-conf-body.adoc +diff -wpruN --no-dereference '--exclude=*.orig' a~/docs/includes/ntp-conf-body.adoc a/docs/includes/ntp-conf-body.adoc --- a~/docs/includes/ntp-conf-body.adoc 1970-01-01 00:00:00 +++ a/docs/includes/ntp-conf-body.adoc 1970-01-01 00:00:00 @@ -3,14 +3,14 @@ @@ -30,7 +30,7 @@ diff -wpruN '--exclude=*.orig' a~/docs/includes/ntp-conf-body.adoc a/docs/includ the default name of the configuration file `ntp.keys`:: private keys -diff -wpruN '--exclude=*.orig' a~/docs/ntpsec.adoc a/docs/ntpsec.adoc +diff -wpruN --no-dereference '--exclude=*.orig' a~/docs/ntpsec.adoc a/docs/ntpsec.adoc --- a~/docs/ntpsec.adoc 1970-01-01 00:00:00 +++ a/docs/ntpsec.adoc 1970-01-01 00:00:00 @@ -213,7 +213,7 @@ to the security-critical core. @@ -55,7 +55,7 @@ diff -wpruN '--exclude=*.orig' a~/docs/ntpsec.adoc a/docs/ntpsec.adoc more configuration declarations. Only files with the extension ".conf" are interpreted; others are ignored. This feature is intended to make assembling configuration easier for administration -diff -wpruN '--exclude=*.orig' a~/include/ntp_config.h a/include/ntp_config.h +diff -wpruN --no-dereference '--exclude=*.orig' a~/include/ntp_config.h a/include/ntp_config.h --- a~/include/ntp_config.h 1970-01-01 00:00:00 +++ a/include/ntp_config.h 1970-01-01 00:00:00 @@ -18,7 +18,7 @@ @@ -67,7 +67,7 @@ diff -wpruN '--exclude=*.orig' a~/include/ntp_config.h a/include/ntp_config.h #endif /* not CONFIG_FILE */ #define CONFIG_DIR "ntp.d" -diff -wpruN '--exclude=*.orig' a~/ntpclients/ntpleapfetch a/ntpclients/ntpleapfetch +diff -wpruN --no-dereference '--exclude=*.orig' a~/ntpclients/ntpleapfetch a/ntpclients/ntpleapfetch --- a~/ntpclients/ntpleapfetch 1970-01-01 00:00:00 +++ a/ntpclients/ntpleapfetch 1970-01-01 00:00:00 @@ -28,7 +28,7 @@ MAXTRIES=6 @@ -79,10 +79,10 @@ diff -wpruN '--exclude=*.orig' a~/ntpclients/ntpleapfetch a/ntpclients/ntpleapfe # How long before expiration to get updated file PREFETCH="60 days" -diff -wpruN '--exclude=*.orig' a~/pylib/packet.py a/pylib/packet.py +diff -wpruN --no-dereference '--exclude=*.orig' a~/pylib/packet.py a/pylib/packet.py --- a~/pylib/packet.py 1970-01-01 00:00:00 +++ a/pylib/packet.py 1970-01-01 00:00:00 -@@ -1728,7 +1728,7 @@ class Authenticator: +@@ -1723,7 +1723,7 @@ class Authenticator: return (keyid,) + self.passwords[keyid] else: return (keyid, None, None) diff --git a/build/ntpsec/patches/nonet.patch b/build/ntpsec/patches/nonet.patch index 9511f7c25a..a397371088 100644 --- a/build/ntpsec/patches/nonet.patch +++ b/build/ntpsec/patches/nonet.patch @@ -1,7 +1,7 @@ Always pass --nonet to xsltproc to avoid it checking for updated stylesheets. -diff -wpruN '--exclude=*.orig' a~/wafhelpers/asciidoc.py a/wafhelpers/asciidoc.py +diff -wpruN --no-dereference '--exclude=*.orig' a~/wafhelpers/asciidoc.py a/wafhelpers/asciidoc.py --- a~/wafhelpers/asciidoc.py 1970-01-01 00:00:00 +++ a/wafhelpers/asciidoc.py 1970-01-01 00:00:00 @@ -120,6 +120,7 @@ def configure(ctx): diff --git a/build/ntpsec/patches/pie.patch b/build/ntpsec/patches/pie.patch index d0ca8da392..0e9edace0a 100644 --- a/build/ntpsec/patches/pie.patch +++ b/build/ntpsec/patches/pie.patch @@ -2,12 +2,12 @@ Support for position independent executable is detected but then GCC fails to link the NTP daemon. Disable the PIE test for now. -diff -wpruN '--exclude=*.orig' a~/wscript a/wscript +diff -wpruN --no-dereference '--exclude=*.orig' a~/wscript a/wscript --- a~/wscript 1970-01-01 00:00:00 +++ a/wscript 1970-01-01 00:00:00 -@@ -300,7 +300,7 @@ def configure(ctx): +@@ -299,7 +299,7 @@ def configure(ctx): + cc_test_flags = [ - ('f_stack_protector_all', '-fstack-protector-all'), ('PIC', '-fPIC'), - ('PIE', '-pie -fPIE'), + #('PIE', '-pie -fPIE'), diff --git a/build/ntpsec/patches/series b/build/ntpsec/patches/series index 033c4e11d2..91b4d38c20 100644 --- a/build/ntpsec/patches/series +++ b/build/ntpsec/patches/series @@ -3,3 +3,4 @@ conf.patch nonet.patch unneeded_libs.patch asciidoc.patch +clockwork.patch diff --git a/build/ntpsec/patches/unneeded_libs.patch b/build/ntpsec/patches/unneeded_libs.patch index 1964bd2fd3..8117eb4512 100644 --- a/build/ntpsec/patches/unneeded_libs.patch +++ b/build/ntpsec/patches/unneeded_libs.patch @@ -1,4 +1,4 @@ -diff -wpruN '--exclude=*.orig' a~/wscript a/wscript +diff -wpruN --no-dereference '--exclude=*.orig' a~/wscript a/wscript --- a~/wscript 1970-01-01 00:00:00 +++ a/wscript 1970-01-01 00:00:00 @@ -276,8 +276,8 @@ def configure(ctx): @@ -29,5 +29,5 @@ diff -wpruN '--exclude=*.orig' a~/wscript a/wscript - ctx.env.LDFLAGS += ["-lssp_nonshared"] - cc_test_flags = [ - ('f_stack_protector_all', '-fstack-protector-all'), ('PIC', '-fPIC'), + #('PIE', '-pie -fPIE'), diff --git a/build/ntpsec/testsuite.log b/build/ntpsec/testsuite.log index 106cecb2fd..b0e98cfd1e 100644 --- a/build/ntpsec/testsuite.log +++ b/build/ntpsec/testsuite.log @@ -335,11 +335,13 @@ TEST(macencrypt, Encrypt) PASS TEST(macencrypt, DecryptValid) PASS TEST(macencrypt, DecryptInvalid) PASS TEST(macencrypt, CMAC_Encrypt) PASS +TEST(macencrypt, CMAC_Encrypt) PASS TEST(macencrypt, DecryptValidCMAC) PASS TEST(macencrypt, DecryptInvalidCMAC) PASS TEST(macencrypt, IPv4AddressToRefId) PASS TEST(macencrypt, IPv6AddressToRefId) PASS TEST(macencrypt, null_trunc) PASS +TEST(macencrypt, CMAC_TestVectors) PASS TEST(numtoa, RefidStr) PASS TEST(prettydate, ConstantDate) PASS TEST(prettydate, Rfc3339Date1) PASS @@ -361,13 +363,6 @@ TEST(statestr, PeerRestart) PASS TEST(statestr, SysUnspecified) PASS TEST(statestr, ClockCodeExists) PASS TEST(statestr, ClockCodeUnknown) PASS -TEST(strtolfp, PositiveInteger) PASS -TEST(strtolfp, NegativeInteger) PASS -TEST(strtolfp, PositiveFraction) PASS -TEST(strtolfp, NegativeFraction) PASS -TEST(strtolfp, PositiveMsFraction) PASS -TEST(strtolfp, NegativeMsFraction) PASS -TEST(strtolfp, InvalidChars) PASS TEST(timespecops, Helpers1) PASS TEST(timespecops, Normalise) PASS TEST(timespecops, SignNoFrac) PASS @@ -411,7 +406,7 @@ TEST(ymd2yd, LeapYearFebruary) PASS TEST(ymd2yd, LeapYearDecember) PASS ----------------------- -155 Tests 0 Failures 0 Ignored +150 Tests 0 Failures 0 Ignored OK *** stderr *** @@ -493,9 +488,9 @@ RETURN VALUE: 0 *** stdout *** *** stderr *** -... +.... ---------------------------------------------------------------------- -Ran 3 tests +Ran 4 tests OK diff --git a/doc/packages.md b/doc/packages.md index 58c97f7e99..b17aa208c0 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -84,7 +84,7 @@ | runtime/python-311 | 3.11.7 | https://www.python.org/downloads/source/ | security/sudo | 1.9.15p5 | https://www.sudo.ws/ | service/network/chrony | 4.5 | https://download.tuxfamily.org/chrony/ -| service/network/ntpsec | 1.2.2 | https://github.com/ntpsec/ntpsec/tags https://blog.ntpsec.org/ +| service/network/ntpsec | 1.2.3 | https://github.com/ntpsec/ntpsec/tags https://blog.ntpsec.org/ | service/network/smtp/dma | 0.13 | https://github.com/corecode/dma/tags | shell/bash | 5.2.21 | https://ftp.gnu.org/gnu/bash/ | shell/bash5-patchlvl | 021 | https://ftp.gnu.org/gnu/bash/bash-5.2-patches