Merge pull request #1513 from hadfl/fix

package updates

build/cups/build.sh

@@ -61,13 +61,13 @@ CONFIGURE_OPTS="
     --without-php
     --without-java
 "
-# cups only supports openssl 3+
-[ $RELVER -lt 151041 ] && CONFIGURE_OPTS+=" --with-tls=gnutls"
 
 # cups uses libusb_get_device_list to enumerate devices
 # this currently fails in zones as it uses libdevinfo
 CONFIGURE_OPTS+=" --disable-libusb"
 
+CPPFLAGS+=" -DOOCEVER=$RELVER"
+
 pre_configure() {
     typeset arch=$1
 

build/cups/patches/pam_conv.patch → build/cups/patches/pam-illumos.patch

@@ -1,24 +1,42 @@
 see: https://www.illumos.org/issues/15657
-struct pam_message in struct pam_conv is not const in illumos
+struct pam_message in struct pam_conv is not const in illumos before r151051
 
+diff -wpruN --no-dereference '--exclude=*.orig' a~/scheduler/auth.c a/scheduler/auth.c
+--- a~/scheduler/auth.c	1970-01-01 00:00:00
++++ a/scheduler/auth.c	1970-01-01 00:00:00
+@@ -575,7 +575,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I
+       strlcpy(data.username, username, sizeof(data.username));
+       strlcpy(data.password, password, sizeof(data.password));
+
+-#  ifdef __sun
++#  if defined(__sun) && OOCEVER < 151051
+       pamdata.conv        = (int (*)(int, struct pam_message **,
+ 				     struct pam_response **,
+ 				     void *))pam_func;
 diff -wpruN --no-dereference '--exclude=*.orig' a~/tools/ippeveprinter.c a/tools/ippeveprinter.c
 --- a~/tools/ippeveprinter.c	1970-01-01 00:00:00
 +++ a/tools/ippeveprinter.c	1970-01-01 00:00:00
-@@ -324,7 +324,7 @@ static ipp_t		*load_legacy_attributes(co
+@@ -324,7 +324,11 @@ static ipp_t		*load_legacy_attributes(co
  static ipp_t		*load_ppd_attributes(const char *ppdfile, cups_array_t *docformats);
  #endif /* !CUPS_LITE */
  #if HAVE_LIBPAM
--static int		pam_func(int, const struct pam_message **, struct pam_response **, void *);
++#if OOCEVER >= 151051
+ static int		pam_func(int, const struct pam_message **, struct pam_response **, void *);
++#else
 +static int		pam_func(int, struct pam_message **, struct pam_response **, void *);
++#endif
  #endif /* HAVE_LIBPAM */
  static int		parse_options(ippeve_client_t *client, cups_option_t **options);
  static void		process_attr_message(ippeve_job_t *job, char *message);
-@@ -5649,7 +5649,7 @@ load_ppd_attributes(
+@@ -5649,7 +5653,11 @@ load_ppd_attributes(
  static int				/* O - Success or failure */
  pam_func(
      int                      num_msg,	/* I - Number of messages */
--    const struct pam_message **msg,	/* I - Messages */
++#if OOCEVER >= 151051
+     const struct pam_message **msg,	/* I - Messages */
++#else
 +    struct pam_message **msg,	/* I - Messages */
++#endif
      struct pam_response      **resp,	/* O - Responses */
      void                     *appdata_ptr)
  					/* I - Pointer to connection */

build/cups/patches/series

@@ -1,3 +1,3 @@
 02-smf.patch
 properly-check-pie.patch
-pam_conv.patch
+pam-illumos.patch

build/cyrus/build.sh

@@ -22,7 +22,7 @@ PKG=ooce/network/cyrus-imapd
 SUMMARY="Cyrus IMAP is an email, contacts and calendar server"
 DESC="$SUMMARY"
 
-ICALVER=3.0.17
+ICALVER=3.0.18
 
 # The icu4c ABI changes frequently. Lock the version
 # pulled into each build of cyrus-imapd.
@@ -37,9 +37,6 @@ PREFIX+="/$PROG"
 SKIP_LICENCES='*attribution*'
 SKIP_RTIME_CHECK=1
 
-# does not yet build with gcc 14
-((GCCVER > 13)) && set_gccver 13
-
 set_arch 64
 set_builddir $PROG-imapd-$VER
 

build/cyrus/patches/gcc14.patch

@@ -0,0 +1,22 @@
+diff -wpruN --no-dereference '--exclude=*.orig' a~/imap/relocate_by_id.c a/imap/relocate_by_id.c
+--- a~/imap/relocate_by_id.c	1970-01-01 00:00:00
++++ a/imap/relocate_by_id.c	1970-01-01 00:00:00
+@@ -54,6 +54,7 @@
+ #include <syslog.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <libgen.h>
+
+ #include "dav_db.h"
+ #include "global.h"
+diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/ptrarray.c a/lib/ptrarray.c
+--- a~/lib/ptrarray.c	1970-01-01 00:00:00
++++ a/lib/ptrarray.c	1970-01-01 00:00:00
+@@ -45,6 +45,7 @@
+
+ #include "ptrarray.h"
+ #include <memory.h>
++#include <string.h>
+ #include "util.h"
+ #include "xmalloc.h"
+

build/cyrus/patches/series

@@ -2,3 +2,4 @@ no-lmtp-version.patch
 adminip.patch
 sasllib.patch
 log-pri.patch
+gcc14.patch

build/freeradius/build.sh

@@ -97,7 +97,7 @@ pre_configure() {
     "
 
     # To find OpenLDAP
-    CPPFLAGS+=" -I$OPREFIX/include"
+    CPPFLAGS+=" -I$OPREFIX/include -DOOCEVER=$RELVER"
     LDFLAGS[$arch]+=" -L$OPREFIX/${LIBDIRS[$arch]} -R$OPREFIX/${LIBDIRS[$arch]}"
 }
 

build/freeradius/patches/pam-illumos.patch

@@ -1,12 +1,18 @@
+see: https://www.illumos.org/issues/15657
+struct pam_message in struct pam_conv is not const in illumos before r151051
+
 diff -wpruN --no-dereference '--exclude=*.orig' a~/src/modules/rlm_pam/rlm_pam.c a/src/modules/rlm_pam/rlm_pam.c
 --- a~/src/modules/rlm_pam/rlm_pam.c	1970-01-01 00:00:00
 +++ a/src/modules/rlm_pam/rlm_pam.c	1970-01-01 00:00:00
-@@ -68,7 +68,7 @@ typedef struct rlm_pam_data_t {
+@@ -68,7 +68,11 @@ typedef struct rlm_pam_data_t {
   * Uses PAM's appdata_ptr so it's thread safe, and doesn't
   * have any nasty static variables hanging around.
   */
--static int pam_conv(int num_msg, struct pam_message const **msg, struct pam_response **resp, void *appdata_ptr)
++#if OOCEVER >= 151051
+ static int pam_conv(int num_msg, struct pam_message const **msg, struct pam_response **resp, void *appdata_ptr)
++#else
 +static int pam_conv(int num_msg, struct pam_message **msg, struct pam_response **resp, void *appdata_ptr)
++#endif
  {
  	int count;
  	struct pam_response *reply;

build/isc-bind9/build-918.sh

@@ -18,7 +18,7 @@
 . ../../lib/build.sh
 
 PROG=bind
-VER=9.18.28
+VER=9.18.29
 PKG=ooce/network/bind-918
 SUMMARY="ISC BIND DNS Server & Tools"
 DESC="Server & Client Utilities for DNS"

build/isc-bind9/build-920.sh

@@ -18,7 +18,7 @@
 . ../../lib/build.sh
 
 PROG=bind
-VER=9.20.0
+VER=9.20.1
 PKG=ooce/network/bind-920
 SUMMARY="ISC BIND DNS Server & Tools"
 DESC="Server & Client Utilities for DNS"

build/libusb/build.sh

@@ -32,6 +32,7 @@ CONFIGURE_OPTS="--disable-static"
 init
 download_source $PROG $PROG $VER
 patch_source
+run_autoreconf -fi
 prep_build
 build
 make_package

build/mattermost/build.sh

@@ -17,18 +17,18 @@
 . ../../lib/build.sh
 
 PROG=mattermost
-VER=9.5.8
+VER=9.11.0
 # check for the current morph version/commit hash and create a patched branch in
 # https://github.com/omniosorg/morph; then point to that branch
-MORPHBRANCH=il_1.0.5
+MORPHBRANCH=il_1.1.0
 PKG=ooce/application/mattermost
 SUMMARY="$PROG"
 DESC="All your team communication in one place, "
 DESC+="instantly searchable and accessible anywhere."
 
 set_arch 64
 set_gover
-set_nodever 18
+set_nodever
 
 BUILD_DEPENDS_IPS+="
     ooce/library/libpng

build/mattermost/patches/series

@@ -1,4 +1,3 @@
 illumos-target.patch
 utils_unix.go.patch
 terminal.go.patch
-npm-10.patch

build/meta/extra-build-tools.p5m

@@ -80,7 +80,6 @@ depend fmri=ooce/multimedia/ffmpeg type=require
 depend fmri=ooce/multimedia/rav1e type=require
 depend fmri=ooce/multimedia/x264 type=require
 depend fmri=ooce/multimedia/x265 type=require
-depend fmri=ooce/runtime/node-18 type=require
 depend fmri=ooce/runtime/node-20 type=require
 depend fmri=ooce/runtime/ruby-30 type=require
 depend fmri=ooce/runtime/ruby-33 type=require

build/mod_wsgi/build.sh

@@ -13,6 +13,7 @@
 # }}}
 
 # Copyright 2023 Carsten Grzemba
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
@@ -31,6 +32,7 @@ sAPACHEVER=${APACHEVER//./}
 RUN_DEPENDS_IPS+=" ooce/server/apache-$sAPACHEVER"
 
 set_arch 64
+test_relver '>=' 151051 && set_clangver
 
 OPREFIX=$PREFIX
 PREFIX+="/apache-$APACHEVER"

build/nginx/build-126.sh

@@ -19,7 +19,7 @@
 
 PROG=nginx
 PKG=ooce/server/nginx-126
-VER=1.26.1
+VER=1.26.2
 SUMMARY="nginx 1.26 web server"
 DESC="nginx is a high-performance HTTP(S) server and reverse proxy"
 

build/nginx/build.sh

@@ -19,7 +19,7 @@
 
 PROG=nginx
 PKG=ooce/server/nginx
-VER=1.27.0
+VER=1.27.1
 SUMMARY="nginx web server"
 DESC="nginx is a high-performance HTTP(S) server and reverse proxy"
 

build/openvpn/build.sh

@@ -65,6 +65,8 @@ restore_buildenv
 
 #########################################################################
 
+CPPFLAGS+=" -DOOCEVER=$RELVER"
+
 CONFIGURE_OPTS[amd64]+="
     --includedir=$OPREFIX/include
     --libdir=$OPREFIX/lib/amd64

build/openvpn/patches/pam_conv.patch → build/openvpn/patches/pam-illumos.patch

@@ -1,21 +1,30 @@
+see: https://www.illumos.org/issues/15657
+struct pam_message in struct pam_conv is not const in illumos before r151051
+
 diff -wpruN --no-dereference '--exclude=*.orig' a~/src/plugins/auth-pam/auth-pam.c a/src/plugins/auth-pam/auth-pam.c
 --- a~/src/plugins/auth-pam/auth-pam.c	1970-01-01 00:00:00
 +++ a/src/plugins/auth-pam/auth-pam.c	1970-01-01 00:00:00
-@@ -645,7 +645,7 @@ openvpn_plugin_abort_v1(openvpn_plugin_h
+@@ -645,7 +645,11 @@ openvpn_plugin_abort_v1(openvpn_plugin_h
   * PAM conversation function
   */
  static int
--my_conv(int n, const struct pam_message **msg_array,
++#if OOCEVER >= 151051
+ my_conv(int n, const struct pam_message **msg_array,
++#else
 +my_conv(int n, struct pam_message **msg_array,
++#endif
          struct pam_response **response_array, void *appdata_ptr)
  {
      const struct user_pass *up = ( const struct user_pass *) appdata_ptr;
-@@ -667,7 +667,7 @@ my_conv(int n, const struct pam_message
+@@ -667,7 +671,11 @@ my_conv(int n, const struct pam_message
      /* loop through each PAM-module query */
      for (i = 0; i < n; ++i)
      {
--        const struct pam_message *msg = msg_array[i];
++#if OOCEVER >= 151051
+         const struct pam_message *msg = msg_array[i];
++#else
 +        struct pam_message *msg = msg_array[i];
++#endif
          aresp[i].resp_retcode = 0;
          aresp[i].resp = NULL;
 

build/openvpn/patches/series

@@ -1 +1 @@
-pam_conv.patch
+pam-illumos.patch

build/php/build-81.sh

@@ -24,9 +24,11 @@ DESC="A popular general-purpose scripting language"
 
 PANDAHASH=01eaaa9
 
-test_relver '>=' 151051 && set_clangver
+# panda does not yet build with gcc 14
+((GCCVER > 13)) && set_gccver 13
 
 set_arch 64
+set_standard XPG6
 
 SKIP_LICENCES=PHP
 
@@ -101,6 +103,8 @@ CONFIGURE_CMD=/bin/true \
 save_function _make_install make_install
 restore_buildenv
 
+set_gccver $DEFAULT_GCC_VER
+
 note -n "Building $PROG $VER"
 
 ######################################################################
@@ -210,6 +214,7 @@ upload_tmp_dir = /tmp
 
 download_source $PROG $PROG $VER
 patch_source
+run_inbuild ./buildconf -f
 build
 xform files/php-template.xml > $TMPDIR/$PROG-$sMAJVER.xml
 xform files/php-template > $TMPDIR/$PROG-$sMAJVER

build/php/build-82.sh

@@ -18,15 +18,17 @@
 
 PROG=php
 PKG=ooce/application/php-82
-VER=8.2.21
+VER=8.2.22
 SUMMARY="PHP 8.2"
 DESC="A popular general-purpose scripting language"
 
 PANDAHASH=01eaaa9
 
-test_relver '>=' 151051 && set_clangver
+# panda does not yet build with gcc 14
+((GCCVER > 13)) && set_gccver 13
 
 set_arch 64
+set_standard XPG6
 
 SKIP_LICENCES=PHP
 
@@ -101,6 +103,8 @@ CONFIGURE_CMD=/bin/true \
 save_function _make_install make_install
 restore_buildenv
 
+set_gccver $DEFAULT_GCC_VER
+
 note -n "Building $PROG $VER"
 
 ######################################################################
@@ -209,6 +213,7 @@ upload_tmp_dir = /tmp
 
 download_source $PROG $PROG $VER
 patch_source
+run_inbuild ./buildconf -f
 build
 xform files/php-template.xml > $TMPDIR/$PROG-$sMAJVER.xml
 xform files/php-template > $TMPDIR/$PROG-$sMAJVER