Merge pull request #1359 from hadfl/pango

package updates
omniosorg · Oct 23, 2023 · 5956b84 · 5956b84
2 parents a56f2d2 + 5b925d7
commit 5956b84
Show file tree

Hide file tree

Showing 25 changed files with 81 additions and 43 deletions.
diff --git a/build/apache/build-24.sh b/build/apache/build-24.sh
@@ -18,7 +18,7 @@
 
 PROG=apache
 PKG=ooce/server/apache-24
-VER=2.4.57
+VER=2.4.58
 MAJVER=${VER%.*}            # M.m
 sMAJVER=${MAJVER//./}       # Mm
 SUMMARY="Apache httpd $MAJVER"

diff --git a/build/apache/patches-24/httpd.conf.patch b/build/apache/patches-24/httpd.conf.patch
@@ -1,4 +1,4 @@
-diff -wpruN '--exclude=*.orig' a~/docs/conf/extra/httpd-default.conf.in a/docs/conf/extra/httpd-default.conf.in
+diff -wpruN --no-dereference '--exclude=*.orig' a~/docs/conf/extra/httpd-default.conf.in a/docs/conf/extra/httpd-default.conf.in
 --- a~/docs/conf/extra/httpd-default.conf.in	1970-01-01 00:00:00
 +++ a/docs/conf/extra/httpd-default.conf.in	1970-01-01 00:00:00
 @@ -52,7 +52,7 @@ AccessFileName .htaccess
@@ -10,7 +10,7 @@ diff -wpruN '--exclude=*.orig' a~/docs/conf/extra/httpd-default.conf.in a/docs/c
 
  #
  # Optionally add a line containing the server version and virtual host
-diff -wpruN '--exclude=*.orig' a~/docs/conf/httpd.conf.in a/docs/conf/httpd.conf.in
+diff -wpruN --no-dereference '--exclude=*.orig' a~/docs/conf/httpd.conf.in a/docs/conf/httpd.conf.in
 --- a~/docs/conf/httpd.conf.in	1970-01-01 00:00:00
 +++ a/docs/conf/httpd.conf.in	1970-01-01 00:00:00
 @@ -74,8 +74,8 @@ Listen @@Port@@

diff --git a/build/apache/patches-24/layout.patch b/build/apache/patches-24/layout.patch
@@ -1,4 +1,4 @@
-diff -wpruN '--exclude=*.orig' a~/config.layout a/config.layout
+diff -wpruN --no-dereference '--exclude=*.orig' a~/config.layout a/config.layout
 --- a~/config.layout	1970-01-01 00:00:00
 +++ a/config.layout	1970-01-01 00:00:00
 @@ -419,3 +419,27 @@

diff --git a/build/apache/patches-24/priv_drop.patch b/build/apache/patches-24/priv_drop.patch
@@ -5,7 +5,7 @@ Patch status: Solaris-specific; not suitable for upstream
 
 Drops extra privilege which was given via SMF manifest file.
 
-diff -wpruN '--exclude=*.orig' a~/server/main.c a/server/main.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/server/main.c a/server/main.c
 --- a~/server/main.c	1970-01-01 00:00:00
 +++ a/server/main.c	1970-01-01 00:00:00
 @@ -46,6 +46,8 @@
@@ -25,7 +25,7 @@ diff -wpruN '--exclude=*.orig' a~/server/main.c a/server/main.c
      APR_OPTIONAL_FN_TYPE(ap_signal_server) *signal_server;
      int rc = OK;
 
-@@ -837,6 +840,21 @@ int main(int argc, const char * const ar
+@@ -839,6 +842,21 @@ int main(int argc, const char * const ar
 
          ap_run_optional_fn_retrieve();
 

diff --git a/build/clang/build-17.sh b/build/clang/build-17.sh
@@ -18,7 +18,7 @@
 
 PROG=clang
 PKG=ooce/developer/clang-17
-VER=17.0.2
+VER=17.0.3
 SUMMARY="C language family frontend for LLVM"
 DESC="The Clang project provides a language front-end and tooling "
 DESC+="infrastructure for languages in the C language family (C, C++, "

diff --git a/build/fd/build.sh b/build/fd/build.sh
@@ -17,8 +17,7 @@
 . ../../lib/build.sh
 
 PROG=fd
-VER=8.7.0
-DASHREV=1
+VER=8.7.1
 PKG=ooce/util/fd
 SUMMARY="find utility"
 DESC="fd is a simple, fast and user-friendly alternative to find"

diff --git a/build/fd/patches/Cargo.toml.patch b/build/fd/patches/Cargo.toml.patch
@@ -1,7 +1,7 @@
-diff -wpruN '--exclude=*.orig' a~/Cargo.toml a/Cargo.toml
+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
-@@ -94,3 +94,7 @@ use-jemalloc = ["jemallocator"]
+@@ -93,3 +93,7 @@ use-jemalloc = ["jemallocator"]
  completions = ["clap_complete"]
  base = ["use-jemalloc"]
  default = ["use-jemalloc", "completions"]

diff --git a/build/gitea/build.sh b/build/gitea/build.sh
@@ -18,7 +18,7 @@
 
 PROG=gitea
 PKG=ooce/application/gitea
-VER=1.19.3
+VER=1.20.5
 SUMMARY="Git with a cup of tea"
 DESC="Git with a cup of tea, painless self-hosted git service"
 

diff --git a/build/gitea/patches/series b/build/gitea/patches/series
@@ -0,0 +1 @@
+syscall.patch
diff --git a/build/gitea/patches/syscall.patch b/build/gitea/patches/syscall.patch
@@ -0,0 +1,25 @@
+diff -wpruN --no-dereference '--exclude=*.orig' a~/_deps/pkg/mod/github.com/sassoftware/[email protected]/fileutil/fileutil_unix.go a/_deps/pkg/mod/github.com/sassoftware/[email protected]/fileutil/fileutil_unix.go
+--- a~/_deps/pkg/mod/github.com/sassoftware/[email protected]/fileutil/fileutil_unix.go	1970-01-01 00:00:00
++++ a/_deps/pkg/mod/github.com/sassoftware/[email protected]/fileutil/fileutil_unix.go	1970-01-01 00:00:00
+@@ -20,12 +20,12 @@ package fileutil
+
+ import (
+ 	"os"
+-	"syscall"
++	"golang.org/x/sys/unix"
+ )
+
+ // HasLinks returns true if the given file has Nlink > 1
+ func HasLinks(info os.FileInfo) bool {
+-	stat, ok := info.Sys().(*syscall.Stat_t)
++	stat, ok := info.Sys().(*unix.Stat_t)
+ 	if !ok {
+ 		return false
+ 	}
+@@ -34,5 +34,5 @@ func HasLinks(info os.FileInfo) bool {
+
+ // Mkfifo creates a named pipe with the specified path and permissions
+ func Mkfifo(path string, mode uint32) error {
+-	return syscall.Mkfifo(path, mode)
++	return unix.Mkfifo(path, mode)
+ }
diff --git a/build/libheif/build.sh b/build/libheif/build.sh
@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=libheif
-VER=1.16.2
+VER=1.17.1
 PKG=ooce/library/libheif
 SUMMARY="HEIF and AVIF encoder"
 DESC="ISO/IEC 23008-12:2017 HEIF and AVIF (AV1 Image File Format) "

diff --git a/build/libjpeg-turbo/build.sh b/build/libjpeg-turbo/build.sh
@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=libjpeg-turbo
-VER=3.0.0
+VER=3.0.1
 PKG=ooce/library/libjpeg-turbo
 SUMMARY="libjpeg-turbo"
 DESC="SIMD-accelerated libjpeg-compatible JPEG codec library"

diff --git a/build/llvm/build-17.sh b/build/llvm/build-17.sh
@@ -18,7 +18,7 @@
 
 PROG=llvm
 PKG=ooce/developer/llvm-17
-VER=17.0.2
+VER=17.0.3
 SUMMARY="Low Level Virtual Machine compiler infrastructure"
 DESC="A collection of modular and reusable compiler and toolchain technologies"
 

diff --git a/build/mosquitto/build.sh b/build/mosquitto/build.sh
@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=mosquitto
-VER=2.0.17
+VER=2.0.18
 PKG=ooce/network/mosquitto
 SUMMARY="$PROG - an open source message broker"
 DESC="$PROG is an open source (EPL/EDL licensed) message broker that "

diff --git a/build/onig/build.sh b/build/onig/build.sh
@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=onig
-VER=6.9.8
+VER=6.9.9
 PKG=ooce/library/onig
 SUMMARY="Oniguruma"
 DESC="A modern and flexible regular expressions library"

diff --git a/build/pango/build.sh b/build/pango/build.sh
@@ -81,7 +81,7 @@ build_dependency -merge -noctf harfbuzz harfbuzz-$HARFBUZZVER \
 export CPPFLAGS+=" -I$DEPROOT/$PREFIX/include/harfbuzz"
 
 SKIP_BUILD_ERRCHK=
-EXPECTED_BUILD_ERRS=2
+test_relver '>=' 151044 && EXPECTED_BUILD_ERRS=2
 
 ######################################################################
 

diff --git a/build/qemu/build.sh b/build/qemu/build.sh
@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=qemu
-VER=8.1.1
+VER=8.1.2
 PKG=ooce/emulator/qemu
 SUMMARY="$PROG"
 DESC="A generic and open source machine emulator and virtualizer"

diff --git a/build/rclone/build.sh b/build/rclone/build.sh
@@ -18,7 +18,7 @@
 
 PROG=rclone
 PKG=ooce/network/rclone
-VER=1.64.0
+VER=1.64.2
 SUMMARY="rsync for cloud storage"
 DESC="A command line program to sync files and directories to and from "
 DESC+="different cloud storage providers"

diff --git a/build/sg3_utils/build.sh b/build/sg3_utils/build.sh
@@ -13,12 +13,12 @@
 # }}}
 #
 # Copyright 2020 Carsten Grzemba
-# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=sg3_utils
-VER=1.47
+VER=1.48
 PKG=ooce/system/sg3_utils
 SUMMARY="the sg3-utils SCSI utilities"
 DESC="Collection of utilities for devices that use the SCSI command set. "

diff --git a/build/sg3_utils/patches/missing-include.patch b/build/sg3_utils/patches/missing-include.patch
@@ -0,0 +1,12 @@
+diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/sg_pt_solaris.c a/lib/sg_pt_solaris.c
+--- a~/lib/sg_pt_solaris.c	1970-01-01 00:00:00
++++ a/lib/sg_pt_solaris.c	1970-01-01 00:00:00
+@@ -32,7 +32,7 @@
+
+ #include "sg_pt.h"
+ #include "sg_lib.h"
+-
++#include "sg_pr2serr.h"
+
+ #define DEF_TIMEOUT 60       /* 60 seconds */
+
diff --git a/build/sg3_utils/patches/series b/build/sg3_utils/patches/series
@@ -0,0 +1 @@
+missing-include.patch
diff --git a/build/texlive/build.sh b/build/texlive/build.sh
@@ -13,12 +13,12 @@
 # }}}
 
 # Copyright 2014 OmniTI Computer Consulting, Inc.  All rights reserved.
-# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=texlive
-VER=20220321
+VER=20230313
 PKG=ooce/application/texlive
 SUMMARY="TeX Live"
 DESC="LaTeX distribution"

diff --git a/build/texlive/patches/texmfroot.patch b/build/texlive/patches/texmfroot.patch
@@ -1,7 +1,7 @@
-diff -wpruN '--exclude=*.orig' texlive-20180414-source~/texk/kpathsea/texmf.cnf texlive-20180414-source/texk/kpathsea/texmf.cnf
---- texlive-20180414-source~/texk/kpathsea/texmf.cnf	2018-03-26 14:23:43.000000000 +0000
-+++ texlive-20180414-source/texk/kpathsea/texmf.cnf	2018-10-14 17:51:56.208543279 +0000
-@@ -58,7 +58,7 @@
+diff -wpruN --no-dereference '--exclude=*.orig' a~/texk/kpathsea/texmf.cnf a/texk/kpathsea/texmf.cnf
+--- a~/texk/kpathsea/texmf.cnf	1970-01-01 00:00:00
++++ a/texk/kpathsea/texmf.cnf	1970-01-01 00:00:00
+@@ -59,7 +59,7 @@
  % SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and
  % SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive).
  % Sorry for the off-by-one-generation names.

diff --git a/build/virtualbox/build.sh b/build/virtualbox/build.sh
@@ -18,7 +18,7 @@
 
 PROG=VirtualBox
 PKG=ooce/virtualization/virtualbox
-VER=7.0.10
+VER=7.0.12
 GSOAPVER=2.8.129
 GSOAPDIR=gsoap-${GSOAPVER%.*}
 SUMMARY="VirtualBox"