Merge pull request #1357 from hadfl/pkgupd

package updates

build/cairo/build.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=cairo
-VER=1.16.0
+VER=1.18.0
 PKG=ooce/library/cairo
 SUMMARY="cairo"
 DESC="Cairo is a 2D graphics library with support for multiple output devices"
@@ -29,6 +29,9 @@ BUILD_DEPENDS_IPS="
     ooce/library/pixman
 "
 
+# ctime_r, mkdtemp, ...
+set_standard POSIX+EXTENSIONS
+
 OPREFIX=$PREFIX
 PREFIX+="/$PROG"
 
@@ -41,7 +44,6 @@ XFORM_ARGS="
 
 CONFIGURE_OPTS="
     --prefix=$PREFIX
-    --disable-static
     --includedir=$OPREFIX/include
 "
 CONFIGURE_OPTS[i386]="
@@ -52,19 +54,46 @@ CONFIGURE_OPTS[amd64]="
     --bindir=$PREFIX/bin
     --libdir=$OPREFIX/lib/amd64
 "
-CONFIGURE_OPTS[aarch64]+="
+CONFIGURE_OPTS[aarch64]="
     --bindir=$PREFIX/bin
     --libdir=$OPREFIX/lib
 "
 
-LDFLAGS[i386]+=" -R$OPREFIX/lib"
-LDFLAGS[amd64]+=" -R$OPREFIX/lib/amd64"
-LDFLAGS[aarch64]+=" -R$OPREFIX/lib"
+pre_configure() {
+    typeset arch=$1
+
+    LDFLAGS[$arch]+=" -R$OPREFIX/${LIBDIRS[$arch]} -lxnet"
+
+    ! cross_arch $arch && return
+
+    CONFIGURE_CMD+=" --cross-file $SRCDIR/files/aarch64-gcc.txt"
+}
+
+post_install() {
+    typeset arch=$1
+
+    pushd $DESTDIR/$OPREFIX >/dev/null
+
+    # Unfortunately, meson messes up the runtime library path
+    # Fixing this up post-install for now,
+    # there may be a better way to do it.
+    typeset rpath="$OPREFIX/${LIBDIRS[$arch]}"
+    rpath+=":/usr/gcc/$GCCVER/${LIBDIRS[$arch]}"
+
+    for f in ${LIBDIRS[$arch]}/lib$PROG*.so.*; do
+        [ -f $f -a ! -h $f ] || continue
+        logmsg "--- fixing runpath in $f"
+        logcmd $ELFEDIT -e "dyn:value -s RUNPATH $rpath" $f
+        logcmd $ELFEDIT -e "dyn:value -s RPATH $rpath" $f
+    done
+
+    popd >/dev/null
+}
 
 init
 download_source $PROG $PROG $VER
 patch_source
-prep_build
+prep_build meson
 build
 make_package
 clean_up

build/cairo/files/aarch64-gcc.txt

@@ -0,0 +1,12 @@
+[binaries]
+c = '/opt/cross/aarch64/bin/aarch64-unknown-solaris2.11-gcc'
+cpp = '/opt/cross/aarch64/bin/aarch64-unknown-solaris2.11-g++'
+ar = '/opt/cross/aarch64/bin/aarch64-unknown-solaris2.11-ar'
+pkgconfig = 'pkg-config'
+
+[host_machine]
+system = 'sunos'
+cpu_family = 'aarch64'
+cpu = 'aarch64'
+endian = 'little'
+

build/cairo/patches/alloca.patch

@@ -0,0 +1,14 @@
+diff -wpruN --no-dereference '--exclude=*.orig' a~/src/cairo-colr-glyph-render.c a/src/cairo-colr-glyph-render.c
+--- a~/src/cairo-colr-glyph-render.c	1970-01-01 00:00:00
++++ a/src/cairo-colr-glyph-render.c	1970-01-01 00:00:00
+@@ -43,6 +43,10 @@
+ #include <stdio.h>
+ #include <string.h>
+
++#ifdef __illumos__
++#include <alloca.h>
++#endif
++
+ #if HAVE_FT_COLR_V1
+
+ #include <ft2build.h>

build/cairo/patches/series

@@ -0,0 +1,2 @@
+alloca.patch
+winsize.patch

build/cairo/patches/winsize.patch

@@ -0,0 +1,14 @@
+diff -wpruN --no-dereference '--exclude=*.orig' a~/perf/cairo-perf-print.c a/perf/cairo-perf-print.c
+--- a~/perf/cairo-perf-print.c	1970-01-01 00:00:00
++++ a/perf/cairo-perf-print.c	1970-01-01 00:00:00
+@@ -45,6 +45,10 @@
+ #include <sys/ioctl.h>
+ #endif
+
++#ifdef __illumos__
++#include <sys/termios.h>
++#endif
++
+ static void
+ report_print (const cairo_perf_report_t *report,
+ 	      int show_histogram)

build/freetype2/build.sh

@@ -18,7 +18,7 @@
 . ../../lib/build.sh
 
 PROG=freetype
-VER=2.13.1
+VER=2.13.2
 PKG=ooce/library/freetype2
 SUMMARY="$PROG"
 DESC="A Free, High-Quality, and Portable Font Engine"

build/gnuplot/build.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=gnuplot
-VER=5.4.6
+VER=5.4.9
 PKG=ooce/application/gnuplot
 SUMMARY="gnuplot"
 DESC="A portable command-line driven graphing utility"
@@ -36,6 +36,8 @@ XFORM_ARGS="
     -DPKGROOT=$PROG
 "
 
+CONFIGURE_OPTS+=" --with-qt=no"
+
 CPPFLAGS+=" -I$OPREFIX/include"
 LDFLAGS[amd64]+=" -L$OPREFIX/lib/amd64 -R$OPREFIX/lib/amd64"
 

build/haproxy/build.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=haproxy
-VER=2.8.2
+VER=2.8.3
 PKG=ooce/server/haproxy
 SUMMARY="HAProxy - fast and reliable http reverse proxy and load balancer"
 DESC="A TCP/HTTP reverse proxy which is particularly suited for high "

build/imagemagick/build.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=ImageMagick
-VER=7.1.1-12
+VER=7.1.1-20
 PKG=ooce/application/imagemagick
 SUMMARY="$PROG - Convert, Edit, or Compose Bitmap Images"
 DESC="Use $PROG to create, edit, compose, or convert bitmap images. It can "

build/libarchive/build.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=libarchive
-VER=3.7.1
+VER=3.7.2
 PKG=ooce/library/libarchive
 SUMMARY="libarchive"
 DESC="Multi-format archive and compression library"

build/libarchive/testsuite.log

@@ -4,7 +4,7 @@ PASS: bsdcpio_test
 PASS: bsdcat_test
 PASS: bsdunzip_test
 ============================================================================
-Testsuite summary for libarchive 3.7.1
+Testsuite summary for libarchive 3.7.2
 ============================================================================
 # TOTAL: 5
 # PASS:  5

build/libzip/build.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=libzip
-VER=1.10.0
+VER=1.10.1
 PKG=ooce/library/libzip
 SUMMARY="libzip"
 DESC="A C library for reading, creating and modifying zip archives"

build/pango/build.sh

@@ -12,19 +12,19 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=pango
-VER=1.50.11
+VER=1.51.0
 PKG=ooce/library/pango
 SUMMARY="pango"
 DESC="Pango is a library for laying out and rendering of text"
 
 # Dependencies
-HARFBUZZVER=5.2.0
-FRIBIDIVER=1.0.12
+HARFBUZZVER=8.2.1
+FRIBIDIVER=1.0.13
 
 # The icu4c ABI changes frequently. Lock the version
 # pulled into each build of harfbuzz.
@@ -68,12 +68,21 @@ prep_build
 
 ######################################################################
 
+# false positive due to the BUFFER_VERIFY_ERROR macro showing up in the build log
+# since there will be one error in the log after the 32-bit build but two
+# after the 64-bit build we disable error checking for harfbuzz but enable
+# it afterwards and set the expected error count to 2
+SKIP_BUILD_ERRCHK=1
+
 EXPECTED_OPTIONS="CAIRO CAIRO_FT FREETYPE GLIB"
 build_dependency -merge -noctf harfbuzz harfbuzz-$HARFBUZZVER \
     harfbuzz harfbuzz $HARFBUZZVER
 
 export CPPFLAGS+=" -I$DEPROOT/$PREFIX/include/harfbuzz"
 
+SKIP_BUILD_ERRCHK=
+EXPECTED_BUILD_ERRS=2
+
 ######################################################################
 
 EXPECTED_OPTIONS=""

build/zrepl/build.sh

@@ -12,13 +12,13 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=zrepl
 PKG=ooce/system/zrepl
-VER=0.6.0
+VER=0.6.1
 SUMMARY="$PROG - ZFS replication"
 DESC="$PROG is a one-stop, integrated solution for ZFS replication"
 

doc/baseline.aarch64

@@ -14,6 +14,7 @@ extra.omnios ooce/library/fontconfig
 extra.omnios ooce/library/freetype2
 extra.omnios ooce/library/gnutls
 extra.omnios ooce/library/json-c
+extra.omnios ooce/library/libarchive
 extra.omnios ooce/library/libev
 extra.omnios ooce/library/libexif
 extra.omnios ooce/library/libgif

doc/packages.md

@@ -3,9 +3,9 @@
 | ooce/application/alpine	| 2.26		| https://alpineapp.email/ | [omniosorg](https://github.com/omniosorg)
 | ooce/application/fcgiwrap	| 1.1.0		| https://github.com/gnosek/fcgiwrap/tags | [omniosorg](https://github.com/omniosorg)
 | ooce/application/gitea	| 1.19.3	| https://github.com/go-gitea/gitea/releases | [omniosorg](https://github.com/omniosorg)
-| ooce/application/gnuplot	| 5.4.6		| https://sourceforge.net/projects/gnuplot/files/gnuplot/ http://www.gnuplot.info/ | [omniosorg](https://github.com/omniosorg)
+| ooce/application/gnuplot	| 5.4.9		| https://sourceforge.net/projects/gnuplot/files/gnuplot/ http://www.gnuplot.info/ | [omniosorg](https://github.com/omniosorg)
 | ooce/application/graphviz	| 2.44.1	| https://www2.graphviz.org/Packages/stable/portable_source/ https://graphviz.org/download/source/ | [omniosorg](https://github.com/omniosorg)
-| ooce/application/imagemagick	| 7.1.1-12	| https://imagemagick.org/archive/ | [omniosorg](https://github.com/omniosorg)
+| ooce/application/imagemagick	| 7.1.1-20	| https://imagemagick.org/archive/ | [omniosorg](https://github.com/omniosorg)
 | ooce/application/links	| 2.28		| http://links.twibright.com/download.php | [omniosorg](https://github.com/omniosorg)
 | ooce/application/listmonk	| 2.5.1		| https://github.com/knadh/listmonk/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/application/mattermost	| 7.5.2		| https://github.com/mattermost/mattermost-server/releases https://docs.mattermost.com/upgrade/version-archive.html#mattermost-team-edition | [omniosorg](https://github.com/omniosorg)
@@ -94,17 +94,17 @@
 | ooce/library/apr		| 1.7.4 	| https://downloads.apache.org/apr/ | [omniosorg](https://github.com/omniosorg)
 | ooce/library/apr-util		| 1.6.3		| https://downloads.apache.org/apr/ | [omniosorg](https://github.com/omniosorg)
 | ooce/library/bdw-gc		| 8.2.2		| https://www.hboehm.info/gc/gc_source/ | [omniosorg](https://github.com/omniosorg)
-| ooce/library/cairo		| 1.16.0	| https://cairographics.org/releases/ | [omniosorg](https://github.com/omniosorg)
+| ooce/library/cairo		| 1.18.0	| https://cairographics.org/releases/ | [omniosorg](https://github.com/omniosorg)
 | ooce/library/fcgi2		| 2.4.2		| https://github.com/FastCGI-Archives/fcgi2/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/library/fontconfig	| 2.14.2	| https://www.freedesktop.org/software/fontconfig/release/ https://www.freedesktop.org/wiki/Software/fontconfig/ | [omniosorg](https://github.com/omniosorg)
-| ooce/library/freetype2	| 2.13.1	| https://sourceforge.net/projects/freetype/files/freetype2/ | [omniosorg](https://github.com/omniosorg)
+| ooce/library/freetype2	| 2.13.2	| https://sourceforge.net/projects/freetype/files/freetype2/ | [omniosorg](https://github.com/omniosorg)
 | ooce/library/gnutls		| 3.6.16	| https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/ https://www.gnutls.org/download.html | [omniosorg](https://github.com/omniosorg)
 | ooce/library/guile		| 2.0.14	| https://ftp.gnu.org/gnu/guile/ | [omniosorg](https://github.com/omniosorg)
 | ooce/library/icu4c		| 72.1		| https://github.com/unicode-org/icu/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/library/jansson		| 2.14		| https://github.com/akheron/jansson/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/library/json-c		| 0.17		| https://github.com/json-c/json-c/tags https://github.com/json-c/json-c/wiki | [omniosorg](https://github.com/omniosorg)
 | ooce/library/ldns		| 1.8.3		| https://nlnetlabs.nl/downloads/ldns/ | [omniosorg](https://github.com/omniosorg)
-| ooce/library/libarchive	| 3.7.1		| https://libarchive.org/downloads/ | [omniosorg](https://github.com/omniosorg)
+| ooce/library/libarchive	| 3.7.2		| https://libarchive.org/downloads/ | [omniosorg](https://github.com/omniosorg)
 | ooce/library/libde265		| 1.0.12	| https://github.com/strukturag/libde265/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/library/libdwarf		| 20210528	| https://www.prevanders.net/dwarf.html | [omniosorg](https://github.com/omniosorg)
 | ooce/library/libgd		| 2.3.3		| https://github.com/libgd/libgd/releases | [omniosorg](https://github.com/omniosorg)
@@ -125,10 +125,10 @@
 | ooce/library/libvorbis	| 1.3.7		| https://ftp.osuosl.org/pub/xiph/releases/vorbis/ | [omniosorg](https://github.com/omniosorg)
 | ooce/library/libvncserver	| 0.9.14	| https://github.com/LibVNC/libvncserver/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/library/libwebp		| 1.3.2		| https://developers.google.com/speed/webp/download | [omniosorg](https://github.com/omniosorg)
-| ooce/library/libzip		| 1.10.0	| https://libzip.org/download/ | [omniosorg](https://github.com/omniosorg)
+| ooce/library/libzip		| 1.10.1	| https://libzip.org/download/ | [omniosorg](https://github.com/omniosorg)
 | ooce/library/nettle		| 3.9.1		| https://ftp.gnu.org/gnu/nettle/ https://www.lysator.liu.se/~nisse/nettle/ | [omniosorg](https://github.com/omniosorg)
 | ooce/library/onig		| 6.9.8		| https://github.com/kkos/oniguruma/releases/ | [omniosorg](https://github.com/omniosorg)
-| ooce/library/pango		| 1.50.11	| https://download.gnome.org/sources/pango/cache.json https://ftp.gnome.org/pub/GNOME/sources/pango/ | [omniosorg](https://github.com/omniosorg)
+| ooce/library/pango		| 1.51.0	| https://download.gnome.org/sources/pango/cache.json https://ftp.gnome.org/pub/GNOME/sources/pango/ | [omniosorg](https://github.com/omniosorg)
 | ooce/library/pixman		| 0.42.2	| https://www.cairographics.org/releases/ http://www.pixman.org/ | [omniosorg](https://github.com/omniosorg)
 | ooce/library/protobuf		| 3.21.9	| https://github.com/protocolbuffers/protobuf/releases/ | Currently used solely by mosh
 | ooce/library/security/libsasl2 | 2.1.28	| https://github.com/cyrusimap/cyrus-sasl/releases | [omniosorg](https://github.com/omniosorg)
@@ -189,7 +189,7 @@
 | ooce/server/apache-24/modules/fcgid | 2.3.9	| https://downloads.apache.org/httpd/mod_fcgid/ | [omniosorg](https://github.com/omniosorg)
 | ooce/server/apache-24/modules/wsgi | 4.9.4    | https://github.com/GrahamDumpleton/mod_wsgi/tags/ | [cgrzemba](https://github.com/cgrzemba)
 | ooce/server/freeradius	| 3.2.3		| https://github.com/FreeRADIUS/freeradius-server/releases https://freeradius.org/releases | [omniosorg](https://github.com/omniosorg)
-| ooce/server/haproxy		| 2.8.2		| https://www.haproxy.org/ | [omniosorg](https://github.com/omniosorg)
+| ooce/server/haproxy		| 2.8.3		| https://www.haproxy.org/ | [omniosorg](https://github.com/omniosorg)
 | ooce/server/nginx		| 1.25.2	| https://nginx.org/en/download.html | [omniosorg](https://github.com/omniosorg)
 | ooce/server/nginx-124		| 1.24.0	| https://nginx.org/en/download.html | [omniosorg](https://github.com/omniosorg)
 | ooce/storage/minio		| 2023-10-07T15-07-38Z | https://github.com/minio/minio/releases | [omniosorg](https://github.com/omniosorg)
@@ -204,7 +204,7 @@
 | ooce/system/sysstat		| 20151012	| https://www.maier-komor.de/sysstat.html | [omniosorg](https://github.com/omniosorg)
 | ooce/system/top		| 3.8		| https://sourceforge.net/projects/unixtop/files/unixtop/ | [omniosorg](https://github.com/omniosorg)
 | ooce/system/znapzend		| 0.21.2	| https://github.com/oetiker/znapzend/releases | [omniosorg](https://github.com/omniosorg)
-| ooce/system/zrepl		| 0.6.0		| https://github.com/zrepl/zrepl/releases | [omniosorg](https://github.com/omniosorg)
+| ooce/system/zrepl		| 0.6.1		| https://github.com/zrepl/zrepl/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/terminal/byobu		| 5.133		| https://launchpad.net/byobu/+download https://launchpad.net/byobu/ | [omniosorg](https://github.com/omniosorg)
 | ooce/terminal/minicom		| 2.9		| https://salsa.debian.org/api/v4/projects/minicom-team%2Fminicom/repository/tags/ https://salsa.debian.org/minicom-team/minicom/ | [omniosorg](https://github.com/omniosorg)
 | ooce/text/asciidoc		| 10.2.0	| https://pypi.org/project/asciidoc | [omniosorg](https://github.com/omniosorg)

doc/pkglist.aarch64

@@ -42,6 +42,7 @@ ooce/library/onig
 ooce/developer/ninja
 ooce/network/irssi
 ooce/util/stress-ng
+ooce/library/libarchive
 ###############################################################################
 .SYSROOT
 ooce/audio/flac

lib/functions.sh

@@ -818,6 +818,8 @@ init_sysroot() {
         logmsg "--- Seeding initial $arch sysroot"
         case $arch in
             aarch64)
+                logcmd $PKGCLIENT -R $tmpsysroot set-publisher \
+                    -g ${BRAICH_REPO} $PKGPUBLISHER
                 logcmd $PKGCLIENT -R $tmpsysroot set-publisher \
                     -g ${BRAICH_REPO} omnios
                 logcmd -p $PKGCLIENT -R $tmpsysroot install '*'