Merge pull request #1490 from hadfl/pkgupd

package updates

build/aarch64/gcc10/build.sh

@@ -72,8 +72,8 @@ export LD=/bin/ld
 export LD_FOR_HOST=/bin/ld
 export LD_FOR_TARGET=$PREFIX/bin/ld
 export AS_FOR_TARGET=$PREFIX/bin/$TRIPLET64-as
-export CFLAGS_FOR_TARGET="-mtls-dialect=trad"
-export CXXFLAGS_FOR_TARGET="-mtls-dialect=trad"
+export CFLAGS_FOR_TARGET="-mno-outline-atomics -mtls-dialect=trad"
+export CXXFLAGS_FOR_TARGET="-mno-outline-atomics -mtls-dialect=trad"
 export STRIP="/usr/bin/strip -x"
 export STRIP_FOR_TARGET="$STRIP"
 

build/apache/build-24.sh

@@ -18,13 +18,14 @@
 
 PROG=apache
 PKG=ooce/server/apache-24
-VER=2.4.61
+VER=2.4.62
 MAJVER=${VER%.*}            # M.m
 sMAJVER=${MAJVER//./}       # Mm
 SUMMARY="Apache httpd $MAJVER"
 DESC="The Apache HTTP Server Project web server, version $MAJVER"
 
 set_arch 64
+test_relver '>=' 151051 && set_clangver
 set_builddir httpd-$VER
 
 set_patchdir patches-$sMAJVER
@@ -70,7 +71,7 @@ CONFIGURE_OPTS="
     --enable-md
 "
 
-LDFLAGS[amd64]+=" -R$OPREFIX/${LIBDIRS[amd64]}"
+LDFLAGS[amd64]+=" -Wl,-R$OPREFIX/${LIBDIRS[amd64]}"
 
 init
 download_source $PROG httpd $VER

build/cmake/build.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=cmake
-VER=3.30.0
+VER=3.30.1
 PKG=ooce/developer/cmake
 SUMMARY="Build coordinator"
 DESC="An extensible system that manages the build process in a "

build/fd/build.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=fd
-VER=10.0.0
+VER=10.1.0
 PKG=ooce/util/fd
 SUMMARY="find utility"
 DESC="fd is a simple, fast and user-friendly alternative to find"

build/fd/patches/do-not-strip-symbol-table.patch

@@ -0,0 +1,12 @@
+diff -wpruN --no-dereference '--exclude=*.orig' a~/Cargo.toml a/Cargo.toml
+--- a~/Cargo.toml	1970-01-01 00:00:00
++++ a/Cargo.toml	1970-01-01 00:00:00
+@@ -84,7 +84,7 @@ test-case = "3.3"
+
+ [profile.release]
+ lto = true
+-strip = true
++#strip = true
+ codegen-units = 1
+
+ [features]

build/fd/patches/series

@@ -1 +1 @@
-Cargo.toml.patch
+do-not-strip-symbol-table.patch

build/freeradius/build.sh

@@ -18,8 +18,8 @@
 
 PROG=freeradius
 PKG=ooce/server/freeradius
-VER=3.2.3
-TALLOCVER=2.4.0
+VER=3.2.5
+TALLOCVER=2.4.2             # https://www.samba.org/ftp/talloc/
 MAJVER=${VER%.*}            # M.m
 sMAJVER=${MAJVER//./}       # Mm
 SUMMARY="FreeRADIUS $MAJVER"
@@ -36,40 +36,57 @@ XFORM_ARGS="
     -DPREFIX=${PREFIX#/}
     -DOPREFIX=${OPREFIX#/}
     -DPROG=$PROG
-    -DPKGROOT=$PROG-$MAJVER
+    -DPKGROOT=$PROG
     -DVERSION=$MAJVER
     -DsVERSION=$sMAJVER
     -DDsVERSION=-$sMAJVER
     -DUSER=radius -DUID=74
     -DGROUP=radius -DGID=74
 "
 
-# does not yet build with gcc 14
-((GCCVER > 13)) && set_gccver 13
-
 set_arch 64
 set_builddir $PROG-server-$VER
-set_standard XPG4v2
+set_standard XPG6
 
 SKIP_RTIME_CHECK=1
 NO_SONAME_EXPECTED=1
 
 init
 prep_build
 
-## build talloc dependency
+#########################################################################
+# build static libtalloc dependency
+
 save_buildenv
 
+post_install() {
+    typeset arch=$1
+
+    # talloc does not support buiding a static archive
+    # wipe the dynamic libraries from _deproot and
+    # build a static archive ourselves
+    logcmd $RM -f $DEPROOT$PREFIX/${LIBDIRS[$arch]}/libtalloc.* \
+        || logerr "removing dynamic libraries failed"
+
+    logcmd $AR -q "$DEPROOT$PREFIX/${LIBDIRS[$arch]}/libtalloc.a" \
+        $TMPDIR/$BUILDDIR/bin/default/talloc.c.*.o \
+        || logerr "creating archive failed"
+}
+
 CONFIGURE_OPTS="
     --prefix=$PREFIX
     --disable-python
 "
-build_dependency -merge talloc talloc-$TALLOCVER $PROG talloc $TALLOCVER
+build_dependency talloc talloc-$TALLOCVER $PROG talloc $TALLOCVER
 # Extract the talloc licence
 sed '/^\*/q' < $TMPDIR/talloc-$TALLOCVER/talloc.c > $TMPDIR/LICENCE.talloc
 
 restore_buildenv
 
+unset -f post_install
+
+#########################################################################
+
 note -n "Building $PROG"
 
 CONFIGURE_OPTS="
@@ -78,11 +95,11 @@ CONFIGURE_OPTS="
     --with-logdir=/var/log$PREFIX
     --localstatedir=/var$PREFIX
     --with-raddbdir=/etc$PREFIX
-    --with-talloc-include-dir=$DESTDIR$PREFIX/include
+    --with-talloc-include-dir=$DEPROOT$PREFIX/include
 "
 CONFIGURE_OPTS[amd64]+="
-    --libdir=$PREFIX/lib/amd64
-    --with-talloc-lib-dir=$DESTDIR$PREFIX/lib/amd64
+    --libdir=$PREFIX/${LIBDIRS[amd64]}
+    --with-talloc-lib-dir=$DEPROOT$PREFIX/${LIBDIRS[amd64]}
 "
 
 pre_configure() {
@@ -91,18 +108,18 @@ pre_configure() {
     # This prevents the build from embedding the temporary build directory into
     # the runpath of every object.
     MAKE_ARGS_WS="
-        TALLOC_LDFLAGS=\"-L$DESTDIR$PREFIX/${LIBDIRS[$arch]} \
+        TALLOC_LDFLAGS=\"-L$DEPROOT$PREFIX/${LIBDIRS[$arch]} \
             -R$PREFIX/${LIBDIRS[$arch]}\"
     "
 
     # To find OpenLDAP
     CPPFLAGS+=" -I$OPREFIX/include"
-    LDFLAGS[$arch]+=" -L$OPREFIX/lib/$arch -R$OPREFIX/lib/$arch"
+    LDFLAGS[$arch]+=" -L$OPREFIX/${LIBDIRS[$arch]} -R$OPREFIX/${LIBDIRS[$arch]}"
 }
 
 download_source $PROG "$PROG-server" $VER
 patch_source
-MAKE_INSTALL_ARGS="R=$DESTDIR" build -ctf
+MAKE_INSTALL_ARGS="R=$DESTDIR" build
 xform files/freeradius-template.xml > $TMPDIR/$PROG-$sMAJVER.xml
 install_smf ooce $PROG-$sMAJVER.xml
 add_notes README.server-install

build/freeradius/local.mog

@@ -29,9 +29,6 @@ user ftpuser=false username=$(USER) uid=$(UID) group=$(GROUP) \
 # Drop rc.radiusd
 <transform path=$(PREFIX)/sbin/rc.radiusd -> drop>
 
-# Drop talloc header and .pc
-<transform file path=.*/talloc.(?:pc|h)$ -> drop>
-
 # Drop static libs
 <transform file path=.*\.a$ -> drop>
 

build/freeradius/patches/openssl3.patch

@@ -1,7 +1,7 @@
 diff -wpruN --no-dereference '--exclude=*.orig' a~/src/main/tls.c a/src/main/tls.c
 --- a~/src/main/tls.c	1970-01-01 00:00:00
 +++ a/src/main/tls.c	1970-01-01 00:00:00
-@@ -1805,7 +1805,7 @@ static int load_dh_params(SSL_CTX *ctx,
+@@ -1824,7 +1824,7 @@ static int load_dh_params(SSL_CTX *ctx,
  	 *
  	 * Change suggested by @t8m
  	 */

build/freeradius/patches/pam-illumos.patch

@@ -0,0 +1,12 @@
+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 {
+  * 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)
++static int pam_conv(int num_msg, struct pam_message **msg, struct pam_response **resp, void *appdata_ptr)
+ {
+ 	int count;
+ 	struct pam_response *reply;

build/freeradius/patches/series

@@ -1,2 +1,2 @@
 openssl3.patch
-sol_tcp.patch
+pam-illumos.patch

build/gdb/build.sh

@@ -18,7 +18,7 @@
 
 PROG=gdb
 PKG=ooce/developer/gdb
-VER=14.2
+VER=15.1
 SUMMARY="$PROG - GNU Debugger"
 DESC="The GNU debugger"
 
@@ -29,10 +29,9 @@ RUN_DEPENDS_IPS+=" shell/bash"
 OPREFIX=$PREFIX
 PREFIX+=/$PROG
 
-# does not yet build with gcc 14
-((GCCVER > 13)) && set_gccver 13
-
 set_arch 64
+# Needed for X/Open curses/termcap
+set_standard -xcurses XPG6
 
 XFORM_ARGS="
     -DPREFIX=${PREFIX#/}

build/gdb/files/ctf.ignore

@@ -16,6 +16,7 @@ amd64-sol2-tdep.c
 amd64-tdep.c
 amd64.c
 annotate.c
+aranges.c
 arch-utils.c
 async-event.c
 attribute.c
@@ -104,6 +105,7 @@ exec.c
 expprint.c
 expr.c
 extension.c
+extract-store-integer.c
 f-exp.c
 f-lang.c
 f-typeprint.c
@@ -374,6 +376,7 @@ tui-out.c
 tui-regs.c
 tui-source.c
 tui-stack.c
+tui-status.c
 tui-win.c
 tui-wingeneral.c
 tui-winsource.c

build/gdb/patches/fix-attach.patch

@@ -8,7 +8,7 @@ Will be sent to upstream.
 diff -wpruN --no-dereference '--exclude=*.orig' a~/gdb/procfs.c a/gdb/procfs.c
 --- a~/gdb/procfs.c	1970-01-01 00:00:00
 +++ a/gdb/procfs.c	1970-01-01 00:00:00
-@@ -1863,7 +1863,7 @@ do_attach (ptid_t ptid)
+@@ -1862,7 +1862,7 @@ do_attach (ptid_t ptid)
 
    /* Add it to gdb's thread list.  */
    ptid = ptid_t (pi->pid, lwpid, 0);

build/gdb/patches/fix-null-ptr.patch

@@ -1,7 +1,7 @@
 diff -wpruN --no-dereference '--exclude=*.orig' a~/gdb/osabi.c a/gdb/osabi.c
 --- a~/gdb/osabi.c	1970-01-01 00:00:00
 +++ a/gdb/osabi.c	1970-01-01 00:00:00
-@@ -64,7 +64,7 @@ static const struct osabi_names gdb_osab
+@@ -63,7 +63,7 @@ static const struct osabi_names gdb_osab
 
    { "SVR4", NULL },
    { "GNU/Hurd", NULL },

build/gdb/patches/force-bash.patch

@@ -8,7 +8,7 @@ Not suitable for upstream.
 diff -wpruN --no-dereference '--exclude=*.orig' a~/gdbsupport/pathstuff.cc a/gdbsupport/pathstuff.cc
 --- a~/gdbsupport/pathstuff.cc	1970-01-01 00:00:00
 +++ a/gdbsupport/pathstuff.cc	1970-01-01 00:00:00
-@@ -373,11 +373,7 @@ find_gdb_home_config_file (const char *n
+@@ -372,11 +372,7 @@ find_gdb_home_config_file (const char *n
  const char *
  get_shell ()
  {

build/gdb/patches/remove-core-warning.patch

@@ -7,7 +7,7 @@
 diff -wpruN --no-dereference '--exclude=*.orig' a~/gdb/corelow.c a/gdb/corelow.c
 --- a~/gdb/corelow.c	1970-01-01 00:00:00
 +++ a/gdb/corelow.c	1970-01-01 00:00:00
-@@ -863,11 +863,14 @@ core_target::get_core_register_section (
+@@ -869,11 +869,14 @@ core_target::get_core_register_section (
  	       section_name.c_str ());
        return;
      }
@@ -21,4 +21,4 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/gdb/corelow.c a/gdb/corelow.c
 +#endif
 
    gdb::byte_vector contents (size);
-   if (!bfd_get_section_contents (core_bfd, section, contents.data (),
+   if (!bfd_get_section_contents (current_program_space->core_bfd (), section,

build/gdb/patches/syscalls.patch

@@ -4,14 +4,14 @@ The XML representation of the illumos system calls is generated in ../build.sh
 diff -wpruN --no-dereference '--exclude=*.orig' a~/gdb/data-directory/Makefile.in a/gdb/data-directory/Makefile.in
 --- a~/gdb/data-directory/Makefile.in	1970-01-01 00:00:00
 +++ a/gdb/data-directory/Makefile.in	1970-01-01 00:00:00
-@@ -51,8 +51,10 @@ SYSCALLS_INSTALL_DIR = $(DESTDIR)$(GDB_D
+@@ -53,8 +53,10 @@ SYSCALLS_INSTALL_DIR = $(DESTDIR)$(GDB_D
  GEN_SYSCALLS_FILES = \
  	aarch64-linux.xml \
  	amd64-linux.xml \
 +	amd64-illumos.xml \
  	arm-linux.xml \
  	i386-linux.xml \
 +	i386-illumos.xml \
+ 	loongarch-linux.xml \
  	mips-n32-linux.xml \
  	mips-n64-linux.xml \
- 	mips-o32-linux.xml \

build/libheif/build.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=libheif
-VER=1.17.6
+VER=1.18.0
 PKG=ooce/library/libheif
 SUMMARY="HEIF and AVIF encoder"
 DESC="ISO/IEC 23008-12:2017 HEIF and AVIF (AV1 Image File Format) "
@@ -58,6 +58,10 @@ pre_configure() {
         -DCMAKE_INSTALL_LIBDIR=$PREFIX/${LIBDIRS[$arch]}
         -DZLIB_INCLUDE_DIR=${SYSROOT[$arch]}/usr/include
         -DZLIB_LIBRARY_RELEASE=${SYSROOT[$arch]}/usr/${LIBDIRS[$arch]}/libz.so
+        -DBROTLI_DEC_INCLUDE_DIR=${SYSROOT[$arch]}/usr/include
+        -DBROTLI_DEC_LIB=${SYSROOT[$arch]}/usr/${LIBDIRS[$arch]}/libbrotlidec.so
+        -DBROTLI_ENC_INCLUDE_DIR=${SYSROOT[$arch]}/usr/include
+        -DBROTLI_ENC_LIB=${SYSROOT[$arch]}/usr/${LIBDIRS[$arch]}/libbrotlienc.so
     "
 
     cross_arch $arch && CONFIGURE_OPTS[$arch]+=" -DWITH_RAV1E=OFF"

build/mbuffer/build.sh

@@ -18,7 +18,7 @@
 . ../../lib/build.sh
 
 PROG=mbuffer
-VER=20240107
+VER=20240707
 PKG=ooce/system/mbuffer
 SUMMARY="$PROG - measuring buffer"
 DESC="$PROG is a tool for buffering data streams"
@@ -27,7 +27,9 @@ OPREFIX=$PREFIX
 PREFIX+="/$PROG"
 
 set_arch 64
-test_relver '>=' 151045 && set_clangver
+set_clangver
+
+set_builddir $PROG-r$VER
 
 XFORM_ARGS="
     -DOPREFIX=${OPREFIX#/}

build/meta/extra-build-tools.p5m

@@ -80,7 +80,7 @@ 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
 depend fmri=ooce/server/apache-24 type=require