sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (b9742c123979fdcf6702547cbfbec767a776520c)

From: Treeve Jelbert <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (b9742c123979fdcf6702547cbfbec767a776520c)
Date: Wed, 10 Apr 2024 09:44:22 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

crypto/openssl/DETAILS | 2
crypto/openssl/HISTORY | 3
database/firebird25/CONFLICTS | 1
database/firebird3/CONFLICTS | 2
database/firebird4/CONFLICTS | 1
database/firebird5/BUILD | 9
database/firebird5/CONFIGURE | 6
database/firebird5/CONFLICTS | 3
database/firebird5/DEPENDS | 7
database/firebird5/DETAILS | 23
database/firebird5/FINAL | 27
database/firebird5/HISTORY | 3
database/firebird5/INSTALL | 36 +
database/firebird5/PREPARE | 17
database/firebird5/PRE_BUILD | 9
database/firebird5/PROVIDES | 2
database/firebird5/excluded | 1
database/firebird5/firebird.service | 12
database/firebird5/init.d/firebird5 | 44 +
database/firebird5/patches/0001-btyacc-fix-mktemp-usage.patch | 35 +
devel/go/DETAILS | 8
devel/go/HISTORY | 4
dfl/qtgreet/DETAILS | 4
dfl/qtgreet/HISTORY | 3
security/oath-toolkit/BUILD | 14
security/oath-toolkit/DETAILS | 2
security/oath-toolkit/HISTORY | 4
video/ffmpeg-svn/CONFLICTS | 1
video/ffmpeg/CONFLICTS | 1
video/ffmpeg5/CONFLICTS | 1
video/ffmpeg6/CONFLICTS | 1
video/ffmpeg7/BUILD | 49 +
video/ffmpeg7/CONFIGURE | 24
video/ffmpeg7/CONFLICTS | 4
video/ffmpeg7/DEPENDS | 285
++++++++++
video/ffmpeg7/DETAILS | 22
video/ffmpeg7/HISTORY | 2
video/ffmpeg7/INSTALL | 5
video/ffmpeg7/PROVIDES | 1
video/ffmpeg7/TRIGGERS | 8
video/ffmpeg7/UP_TRIGGERS | 19
xorg-app/xdm/DETAILS | 2
xorg-app/xdm/HISTORY | 3
xorg/xwayland/DETAILS | 2
xorg/xwayland/HISTORY | 3
45 files changed, 693 insertions(+), 22 deletions(-)

New commits:
commit b9742c123979fdcf6702547cbfbec767a776520c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

oath-toolkit: => 2.6.11

commit 0f33e550329d50933ea08d13707f0bfe524f856c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

openssl: => 3.3.0

commit 69aa42b0179502845a695f46f5b79905f464931c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xwayland: => 23.2.6

commit e2a363f953c25ceeae2b9d8aa6fc922c2393a3be
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xdm: => 1.1.16

commit 37190a5ce3ee5977a595def2c95fc935a3248d50
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

go: => 1.22.2

commit 7f6b8ea604c3dd881d11519cda6c3dc793e6b500
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtgreet: => 2.0.2

commit 4f5f9a9882b5cdeadc156de0624f596726f51323
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ffmpeg - conflicta

commit cb893df57edb1426201a28de4ffe7da4b1bbfd19
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

add ffmpeg7 7.0

commit fdf98be1f954bdcaccbe009c3ee17fe05d2001fb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

conflicts firebird5

commit 5e1c0ecc96dd03037b728e413f20475d878b39be
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

add firebird5-5.0.0.1306-0

diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 209d702..0af62f9 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -1,5 +1,5 @@
SPELL=openssl
- VERSION=3.2.0
+ VERSION=3.3.0
SECURITY_PATCH=56
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://www.openssl.org/source/$SOURCE
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index c58015f..a56441c 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,6 @@
+2024-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.3.0
+
2024-01-15 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD, FINAL: Rework the wretched wget preservation hack
not to overwrite libraries being in use (by sshd, for example).
diff --git a/database/firebird25/CONFLICTS b/database/firebird25/CONFLICTS
index df70b78..a677f10 100755
--- a/database/firebird25/CONFLICTS
+++ b/database/firebird25/CONFLICTS
@@ -1 +1,2 @@
conflicts firebird
+conflicts firebird5
diff --git a/database/firebird3/CONFLICTS b/database/firebird3/CONFLICTS
index 531c5fe..e45d985 100755
--- a/database/firebird3/CONFLICTS
+++ b/database/firebird3/CONFLICTS
@@ -1,2 +1,4 @@
conflicts firebird &&
conflicts firebird25
+conflicts firebird4
+conflicts firebird5
diff --git a/database/firebird4/CONFLICTS b/database/firebird4/CONFLICTS
index 5e015fd..6d8b472 100755
--- a/database/firebird4/CONFLICTS
+++ b/database/firebird4/CONFLICTS
@@ -1,2 +1,3 @@
conflicts firebird3 &&
conflicts firebird25
+conflicts firebird5
diff --git a/database/firebird5/BUILD b/database/firebird5/BUILD
new file mode 100755
index 0000000..a5c07ac
--- /dev/null
+++ b/database/firebird5/BUILD
@@ -0,0 +1,9 @@
+CXXFLAGS+=" -Wno-deprecated" &&
+CXXFLAGS+=" -Wno-stringop-overflow" &&
+CXXFLAGS+=" -fPIC" &&
+persistent_add FB_PREFIX &&
+export FB_PREFIX=${INSTALL_ROOT}/opt/firebird5 &&
+OPTS+=' --with-fblog=/var/log' &&
+cd $SOURCE_DIRECTORY &&
+./configure --prefix=$FB_PREFIX $OPTS &&
+make -j6
diff --git a/database/firebird5/CONFIGURE b/database/firebird5/CONFIGURE
new file mode 100755
index 0000000..0f30565
--- /dev/null
+++ b/database/firebird5/CONFIGURE
@@ -0,0 +1,6 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
+#source $GRIMOIRE/FUNCTIONS &&
+# config_query_multi FB_GPRE "which additional GPRE languages to support?"
\
+# none ada cobol pascal fortran &&
+# config_query_option FB_STAT "build static libraries?" n "--enable-static"
"--disable-static"
+
diff --git a/database/firebird5/CONFLICTS b/database/firebird5/CONFLICTS
new file mode 100755
index 0000000..ebe0c34
--- /dev/null
+++ b/database/firebird5/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts firebird4 &&
+conflicts firebird3 &&
+conflicts firebird25
diff --git a/database/firebird5/DEPENDS b/database/firebird5/DEPENDS
new file mode 100755
index 0000000..42f3fcc
--- /dev/null
+++ b/database/firebird5/DEPENDS
@@ -0,0 +1,7 @@
+depends -sub CXX gcc &&
+depends icu &&
+depends libedit --with-system-editline &&
+depends libtomcrypt &&
+depends libtommath &&
+#depends re2 --with-system-re2 &&
+depends zlib
diff --git a/database/firebird5/DETAILS b/database/firebird5/DETAILS
new file mode 100755
index 0000000..1cfbb20
--- /dev/null
+++ b/database/firebird5/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=firebird5
+ SPELLX=Firebird
+ VERSION=5.0.0.1306-0
+
SOURCE_HASH=sha512:ccab819483a8f10d7352933638d849033335f66bd1663c809cd31ce2bdf61bc50c7a18c526aa9d3d6e7c7a648a28dd9483d5b79900f254b9b6bf1891aed1d5e7
+ PATCHLEVEL=1
+# SECURTIY_PATCH=1
+ VX=v${VERSION%.*}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION}-source
+ SOURCE=${SPELLX}-$VERSION-source.tar.xz
+
SOURCE_URL[0]=https://github.com/FirebirdSQL/firebird/releases/download/$VX/$SOURCE
+#https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/Firebird-5.0.0.1306-0-source.tar.xz
+ WEB_SITE=https://www.firebirdsql.org
+ LICENSE=IDPL
+ ENTERED=20240407
+ GATHER_DOCS=off
+ KEYWORDS="database engine"
+ SHORT="a very powerful relational dbms"
+cat << EOF
+Firebird is a relational database offering many ANSI SQL-92 features
+that runs on Linux, Windows, and a variety of Unix platforms.
+Firebird offers excellent concurrency, high performance, and powerful
+language support for stored procedures and triggers.
+EOF
diff --git a/database/firebird5/FINAL b/database/firebird5/FINAL
new file mode 100755
index 0000000..c2ef80e
--- /dev/null
+++ b/database/firebird5/FINAL
@@ -0,0 +1,27 @@
+ldconfig &&
+# we do this here, so that things are not tracked, as these files are
+# constantly modified in normal use
+local LOG &&
+
+cd $FB_PREFIX &&
+# log file
+ mkdir -p $INSTALL_ROOT/var/log/ &&
+ LOG=$INSTALL_ROOT/var/log/firebird.log &&
+ touch $LOG &&
+ chown firebird:firebird $LOG &&
+ chmod o=,ug=rw $LOG &&
+mkdir -p $INSTALL_ROOT/var/run/firebird5
+message "\n${PROBLEM_COLOR}Creating a SYSDBA user:" \
+ "$MESSAGE_COLOR" \
+ "\nThe Firebird5 install process does not create a SYSDBA user." \
+ "\n" \
+ "\nThis must be done before starting the firebird server:" \
+ "\nSee the section 'Initializing the Security Database (Chapter 12)'
in " \
+ "Firebird-4.*-ReleaseNotes.pdf" \
+ "\n" \
+ "\nThe default security database is /etc/firebird5/security5.fdb" \
+ "\n" \
+ "If you have any existing Firebird databases, please read\n" \
+ "/opt/firebird5/doc/README.incompatibilities.3to4.txt\n" \
+ "$DEFAULT_COLOR"
+
diff --git a/database/firebird5/HISTORY b/database/firebird5/HISTORY
new file mode 100644
index 0000000..46561b8
--- /dev/null
+++ b/database/firebird5/HISTORY
@@ -0,0 +1,3 @@
+2024-04-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.0.0.1306-0
+ spell created
diff --git a/database/firebird5/INSTALL b/database/firebird5/INSTALL
new file mode 100755
index 0000000..c5a8dfc
--- /dev/null
+++ b/database/firebird5/INSTALL
@@ -0,0 +1,36 @@
+SRC=$SOURCE_DIRECTORY &&
+BLD=$SRC/gen/Release/firebird &&
+cd $BLD &&
+local DEST &&
+# config files
+DEST=$INSTALL_ROOT/etc/firebird5 &&
+
+mkdir -p $DEST &&
+# treate the security db as a config file
+install_config_file security5.fdb $DEST/security5.fdb &&
+# link to config files
+FROM=$FB_PREFIX &&
+mkdir -p $FROM &&
+TGT=$TRACK_ROOT/etc/firebird5 &&
+ln -vsf $TGT/security5.fdb $FROM &&
+cd $SRC/builds/install/misc &&
+for FF in firebird databases plugins replication; do
+ install_config_file $FF.conf $DEST/$FF.conf &&
+ ln -vsf $TGT/$FF.conf $FROM
+done &&
+chown -Rv firebird:firebird $DEST &&
+
+cd $BLD &&
+DEST=$FB_PREFIX &&
+# install the built tree
+
+cp -dR --preserve=mode,ownership * $DEST &&
+
+cd $SRC/gen &&
+#cp msg.fdb help.fdb $DEST &&
+
+# systemd stuff
+DEST=$INSTALL_ROOT/lib/systemd/system &&
+FF=firebird.service &&
+mkdir -p $DEST &&
+install -m644 $SPELL_DIRECTORY/$FF $DEST/$FF
diff --git a/database/firebird5/PREPARE b/database/firebird5/PREPARE
new file mode 100755
index 0000000..da65e0e
--- /dev/null
+++ b/database/firebird5/PREPARE
@@ -0,0 +1,17 @@
+# warn about need for backup/restore of existing databases
+if ( spell_ok firebird3 ) || ( spell_ok firebird25 ) || (spell_ok firebird
);then
+ message "${PROBLEM_COLOR}Firebird5 cannot read old databases!" \
+ "$MESSAGE_COLOR" \
+ "\nbefore installing this program, use gbak from your existing firebird
installation " \
+ "to make backup copies of your existing databases." \
+ "\nAfter installing Firebird5, use the new gbak to restore the
databases" \
+ " in the new format." \
+ ${DEFAULT_COLOR}
+fi
+
+# check for running server
+ (ps -u firebird ) &&
+ message ${PROBLEM_COLOR}please stop the firebird server and try again\
+ ${DEFAULT_COLOR} &&
+ return 1
+return 0
diff --git a/database/firebird5/PRE_BUILD b/database/firebird5/PRE_BUILD
new file mode 100755
index 0000000..57895c4
--- /dev/null
+++ b/database/firebird5/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+create_account firebird &&
+sed -i '/firebird5/D' /etc/ld.so.conf &&
+echo adding entry for firebird5 to /etc/ld.so.conf &&
+echo /opt/firebird5/lib >> /etc/ld.so.conf &&
+ldconfig &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches &&
+sed -i '/Debug/d' builds/posix/prefix.linux_amd64
diff --git a/database/firebird5/PROVIDES b/database/firebird5/PROVIDES
new file mode 100755
index 0000000..64d8727
--- /dev/null
+++ b/database/firebird5/PROVIDES
@@ -0,0 +1,2 @@
+SQL
+FIREBIRD
diff --git a/database/firebird5/excluded b/database/firebird5/excluded
new file mode 100644
index 0000000..bba5cff
--- /dev/null
+++ b/database/firebird5/excluded
@@ -0,0 +1 @@
+^/opt/firebird5/firebird.log
diff --git a/database/firebird5/firebird.service
b/database/firebird5/firebird.service
new file mode 100644
index 0000000..03d5f97
--- /dev/null
+++ b/database/firebird5/firebird.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Firebird Database Server
+After=syslog.target network.target
+Documentation=https://firebirdsql.org/en/firebird-rdbms/
+
+[Service]
+User=firebird
+Group=firebird
+ExecStart=/opt/firebird5/bin/firebird
+
+[Install]
+WantedBy=multi-user.target
diff --git a/database/firebird5/init.d/firebird5
b/database/firebird5/init.d/firebird5
new file mode 100755
index 0000000..f9f3446
--- /dev/null
+++ b/database/firebird5/init.d/firebird5
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# description: Start/Stop firebird5 database server
+#
+# This file belongs in /etc/init.d where it will be run
+# on system startup and shutdown to start the background
+# Firebird5 database Super server daemon
+
+FB_DIR=/opt/firebird5/bin
+FB=firebird
+# preferred method of stopping is to kill the process
+
+source /etc/init.d/smgl_functions
+
+PROGRAM=/bin/false
+RUNLEVEL=3
+NEEDS="+network +remote_fs"
+
+case $1 in
+ start)
+ mkdir -p /var/run/firebird # may be a tmpfs, so create it
+ chown firebird:firebird /var/run/firebird
+ chmod o=,ug=rwx /var/run/firebird
+ echo "Starting Firebird5 Server"
+ su -s "/bin/sh" -c "$FB_DIR/$FB" -l "firebird" &
+ evaluate_retval
+ ;;
+ stop)
+ echo "Stopping Firebird5 server"
+ pkill -9 $FB
+ evaluate_retval
+ ;;
+
+ restart)
+ echo "Restarting Firebird5 server"
+ $0 stop
+ $0 start
+ evaluate_retval
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+ ;;
+esac
diff --git a/database/firebird5/patches/0001-btyacc-fix-mktemp-usage.patch
b/database/firebird5/patches/0001-btyacc-fix-mktemp-usage.patch
new file mode 100644
index 0000000..4c1b72c
--- /dev/null
+++ b/database/firebird5/patches/0001-btyacc-fix-mktemp-usage.patch
@@ -0,0 +1,35 @@
+From d3a1b90eb987e25741a7b750a91afc55dc3a1070 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Fri, 7 Aug 2020 12:25:06 +0200
+Subject: [PATCH 1/2] btyacc - fix mktemp usage
+
+---
+ extern/btyacc/main.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/extern/btyacc/main.c b/extern/btyacc/main.c
+index 6ac4cbd850..240520cdfd 100644
+--- a/extern/btyacc/main.c
++++ b/extern/btyacc/main.c
+@@ -341,15 +341,15 @@ void create_file_names()
+ text_file_name[len + 5] = 't';
+ union_file_name[len + 5] = 'u';
+
+- if(mktemp(action_file_name) == NULL) {
++ if(mkstemp(action_file_name) == -1) {
+ fprintf(stderr, "btyacc: Cannot create temporary file\n");
+ exit(1);
+ }
+- if(mktemp(text_file_name) == NULL) {
++ if(mkstemp(text_file_name) == -1) {
+ fprintf(stderr, "btyacc: Cannot create temporary file\n");
+ exit(1);
+ }
+- if(mktemp(union_file_name) == NULL) {
++ if(mkstemp(union_file_name) == -1) {
+ fprintf(stderr, "btyacc: Cannot create temporary file\n");
+ exit(1);
+ }
+--
+2.42.1
+
diff --git a/devel/go/DETAILS b/devel/go/DETAILS
index 626cd8a..edb4dfc 100755
--- a/devel/go/DETAILS
+++ b/devel/go/DETAILS
@@ -1,14 +1,14 @@
# DO NOT UPDATE TO 1.20, see
https://bugs.sourcemage.org/show_bug.cgi?id=16147
# Watch: https://go.dev/dl/ /go([0-9.]+)[.]src
SPELL="go"
- VERSION=1.22.1
- SECURITY_PATCH=2
+ VERSION=1.22.2
+ SECURITY_PATCH=3
BOOTSTRAP_VERSION=$VERSION
SOURCE="${SPELL}${VERSION}.src.tar.gz"
-
SOURCE_HASH=sha512:627530c3fa2ea872478e1df8ee20db2ddc3c94581fff4e66bda21ca45a643e9915f97115401f79667cd7e856ccca1b40a842f4c0b509a472c75696e3bdb3a908
+
SOURCE_HASH=sha512:f2491d2b5d4ef2dd86ca7820503a2534cd1860822049dc01a6cb40b556a0812cfc4196fa83173765816060253ac949f4165b0fb4b2bed5d45e30d03bb69e434d
SOURCE_URL[0]="https://redirector.gvt1.com/edgedl/go/$SOURCE";
SOURCE2="${SPELL}${BOOTSTRAP_VERSION}.linux-amd64.tar.gz"
-
SOURCE2_HASH=sha512:9421b127203ce9cb71c331bdad9da46aa8a75db3dcd3619f8e8f59ddf4516a1354b425914154b28b67b560b1f41d8be02a70b43303d5e7ad1db3dfda00ab2a2e
+
SOURCE2_HASH=sha512:94f50c9c0c14a969fbc1b246c6dbca9e46c65d75272c0da7aad5461af9fb28b73afab22ff4fa76493351e565339177def3fdb9f30f6ac133b259171aa4f04ff5
SOURCE2_URL[0]="https://redirector.gvt1.com/edgedl/go/$SOURCE2";
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
DOC_DIRS=""
diff --git a/devel/go/HISTORY b/devel/go/HISTORY
index b66058e..a88eb05 100644
--- a/devel/go/HISTORY
+++ b/devel/go/HISTORY
@@ -1,3 +1,7 @@
+2024-04-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.22.2
+ SECURITY_PATCH++
+
2024-03-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.22.1

diff --git a/dfl/qtgreet/DETAILS b/dfl/qtgreet/DETAILS
index 4fbf863..9f39800 100755
--- a/dfl/qtgreet/DETAILS
+++ b/dfl/qtgreet/DETAILS
@@ -1,8 +1,8 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=qtgreet
SPELLX=QtGreet
- VERSION=2.0.1
-
SOURCE_HASH=sha512:5cff2f74718bcb6597d25f712e1b28f2cad3d6d570dc39cbaa2847d27ab2293ded6e8529f81fa801c85d8b56d10f1a0ee4b6c2b631b950123d0c7a87ce9adf01
+ VERSION=2.0.2
+
SOURCE_HASH=sha512:477895adf36f73b4fbaab3f0ad5c92d113ca38619ac5f13dd3eecadee0dd6ff552c1f83edf88e714c5bc1a32512e0c29c3d89c8857e06763fcb2e424bf386cc9
SOURCE=$SPELLX-v$VERSION.tar.bz2
WEB_SITE=https://gitlab.com/marcusbritanicus/QtGreet
SOURCE_URL=$WEB_SITE/-/archive/v$VERSION/$SOURCE
diff --git a/dfl/qtgreet/HISTORY b/dfl/qtgreet/HISTORY
index 4975ce5..4cfe7ba 100644
--- a/dfl/qtgreet/HISTORY
+++ b/dfl/qtgreet/HISTORY
@@ -1,3 +1,6 @@
+2024-04-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0.2
+
2024-01-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.1

diff --git a/security/oath-toolkit/BUILD b/security/oath-toolkit/BUILD
index 97cca87..5e6dd42 100755
--- a/security/oath-toolkit/BUILD
+++ b/security/oath-toolkit/BUILD
@@ -1,13 +1,3 @@
-local ORIG_OPTS="${OPTS}" &&
-
-cd liboath &&
-
-OPTS="${LIBOATH_OPTS}" &&
-
-default_build &&
-
-cd .. &&
-
-OPTS="${ORIG_OPTS}" &&
-
+OPTS+=" --disable-static" &&
+OPTS+=" ${LIBOATH_OPTS}" &&
default_build
diff --git a/security/oath-toolkit/DETAILS b/security/oath-toolkit/DETAILS
index 2ef9419..aebce45 100755
--- a/security/oath-toolkit/DETAILS
+++ b/security/oath-toolkit/DETAILS
@@ -1,5 +1,5 @@
SPELL=oath-toolkit
- VERSION=2.6.7
+ VERSION=2.6.11
PATCHLEVEL=1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.sig
diff --git a/security/oath-toolkit/HISTORY b/security/oath-toolkit/HISTORY
index 8f07dac..06e4a79 100644
--- a/security/oath-toolkit/HISTORY
+++ b/security/oath-toolkit/HISTORY
@@ -1,3 +1,7 @@
+2024-01-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.6.11
+ * BUILD: tweak
+
2021-10-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.6.7

diff --git a/video/ffmpeg-svn/CONFLICTS b/video/ffmpeg-svn/CONFLICTS
index 931059e..4a2b473 100755
--- a/video/ffmpeg-svn/CONFLICTS
+++ b/video/ffmpeg-svn/CONFLICTS
@@ -1,3 +1,4 @@
conflicts ffmpeg
conflicts ffmpeg5
conflicts ffmpeg6
+conflicts ffmpeg7
diff --git a/video/ffmpeg/CONFLICTS b/video/ffmpeg/CONFLICTS
index ecde5e5..ca03149 100755
--- a/video/ffmpeg/CONFLICTS
+++ b/video/ffmpeg/CONFLICTS
@@ -1,3 +1,4 @@
conflicts ffmpeg-svn
conflicts ffmpeg5
conflicts ffmpeg6
+conflicts ffmpeg7
diff --git a/video/ffmpeg5/CONFLICTS b/video/ffmpeg5/CONFLICTS
index 7b00fd5..28d62f3 100755
--- a/video/ffmpeg5/CONFLICTS
+++ b/video/ffmpeg5/CONFLICTS
@@ -1,3 +1,4 @@
conflicts ffmpeg-svn
conflicts ffmpeg
conflicts ffmpeg6
+conflicts ffmpeg7
diff --git a/video/ffmpeg6/CONFLICTS b/video/ffmpeg6/CONFLICTS
index ee80314..4b67276 100755
--- a/video/ffmpeg6/CONFLICTS
+++ b/video/ffmpeg6/CONFLICTS
@@ -1,3 +1,4 @@
conflicts ffmpeg-svn
conflicts ffmpeg
conflicts ffmpeg5
+conflicts ffmpeg7
diff --git a/video/ffmpeg7/BUILD b/video/ffmpeg7/BUILD
new file mode 100755
index 0000000..05f91fa
--- /dev/null
+++ b/video/ffmpeg7/BUILD
@@ -0,0 +1,49 @@
+disable_pic &&
+
+if list_find "$FFMPEG_PROGRAMS" "none"; then
+ OPTS="--disable-programs $OPTS"
+elif list_find "$FFMPEG_PROGRAMS" "all"; then
+ :
+else
+ for program in $FFMPEG_PROGRAM_LIST; do
+ if ! list_find "$FFMPEG_PROGRAMS" "$program"; then
+ OPTS="--disable-$program $OPTS"
+ fi
+ done &&
+
+ persistent_remove FFMPEG_PROGRAM_LIST &&
+ persistent_save &&
+ persistent_load
+fi &&
+
+OPTS="$FFMPEG_OPTS $OPTS" &&
+
+if echo "$CFLAGS" | grep -q "\-Os"; then
+ OPTS="--enable-small $OPTS"
+fi &&
+
+if is_depends_enabled $SPELL opencore-amr; then
+ OPTS="--enable-version3 $OPTS"
+fi &&
+
+# fixing issue #381
+if is_depends_enabled $SPELL openjpeg; then
+ CFLAGS="$CFLAGS -I${INSTALL_ROOT}/usr/include/openjpeg-1.5"
+fi &&
+
+LDFLAGS=${LDFLAGS//-Wl,--as-needed/} &&
+
+OPTS="--disable-cuda --disable-cuvid $OPTS" &&
+
+check_tmp_noexec /tmp &&
+./configure --prefix=${INSTALL_ROOT}/usr \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --enable-shared \
+ --disable-static \
+ --enable-pthreads \
+ --enable-postproc \
+ --enable-gpl \
+ $OPTS &&
+check_tmp_noexec /tmp &&
+make V=1 &&
+make V=1 tools/qt-faststart
diff --git a/video/ffmpeg7/CONFIGURE b/video/ffmpeg7/CONFIGURE
new file mode 100755
index 0000000..4a29277
--- /dev/null
+++ b/video/ffmpeg7/CONFIGURE
@@ -0,0 +1,24 @@
+. $GRIMOIRE/config_query_multi.function &&
+default_configure &&
+
+config_query_option FFMPEG_OPTS "Enable software scaler support?" y \
+ "--enable-swscale" \
+ "--disable-swscale" &&
+
+config_query_option FFMPEG_OPTS "Enable debugging symbols?" y \
+ "--enable-debug" \
+ "--disable-debug" &&
+
+config_query_option FFMPEG_OPTS "Enable support for Blackmagick Decklink
output?" n \
+ "--enable-decklink" \
+ "--disable-decklink" &&
+
+persistent_add FFMPEG_PROGRAM_LIST &&
+local FFMPEG_PROGRAM_LIST="ffmpeg ffprobe" &&
+config_query_multi FFMPEG_PROGRAMS "Which command line programs would you
like to build?" \
+ $FFMPEG_PROGRAM_LIST \
+ all \
+ none &&
+
+config_query_list FFMPEG_HTTPS "how to support https"\
+ gnutls SSL none
diff --git a/video/ffmpeg7/CONFLICTS b/video/ffmpeg7/CONFLICTS
new file mode 100755
index 0000000..76fca6d
--- /dev/null
+++ b/video/ffmpeg7/CONFLICTS
@@ -0,0 +1,4 @@
+conflicts ffmpeg-svn
+conflicts ffmpeg
+conflicts ffmpeg5
+conflicts ffmpeg6
diff --git a/video/ffmpeg7/DEPENDS b/video/ffmpeg7/DEPENDS
new file mode 100755
index 0000000..1103126
--- /dev/null
+++ b/video/ffmpeg7/DEPENDS
@@ -0,0 +1,285 @@
+#optional_depends libmpx \
+# "--enable-mfx" \
+# "--disable-mfx" \
+# "for hardware acceleration through libmfx" &&
+
+#optional_depends openh264 \
+# "--enable-openh264" \
+# "--disable-openh264" \
+# "for H.264 support through OpenH264" &&
+
+optional_depends dav1d \
+ "--enable-libdav1d" \
+ "--disable-libdav1d" \
+ "enable AV1-codec support" &&
+
+optional_depends chromaprint \
+ "--enable-chromaprint" \
+ "--disable-chromaprint" \
+ "enable audio-fingerprinting support" &&
+
+optional_depends codec2 \
+ "--enable-libcodec2" \
+ "--disable-libcodec2" \
+ "enable codec2 support" &&
+
+optional_depends ladspa \
+ "--enable-ladspa" \
+ "--disable-ladspa" \
+ "enable ladspa support" &&
+
+optional_depends libdrm \
+ "--enable-libdrm" \
+ "--disable-libdrm" \
+ "enable DRM code" &&
+
+#optional_depends libdc1394 \
+# "--enable-libdc1394" \
+# "--disable-libdc1394" \
+# "enable IIDC-1394 grabbing support" &&
+
+optional_depends alsa-lib \
+ "--enable-alsa" \
+ "--disable-alsa" \
+ "for alsa sound support" &&
+
+optional_depends JACK-DRIVER "--enable-libjack" "" "for libjack sound
support" &&
+
+optional_depends librsvg2 \
+ "--enable-librsvg" \
+ "--disable-librsvg" \
+ "for svg support" &&
+
+optional_depends libxcb \
+ "--enable-libxcb --enable-libxcb-shm --enable-libxcb-xfixes
--enable-libxcb-shape" \
+ "--disable-libxcb" \
+ "for X11 grabbing using xcb" &&
+
+optional_depends LZMA \
+ "--enable-lzma" \
+ "--disable-lzma" \
+ "for lzma support" &&
+
+optional_depends zlib \
+ "--enable-zlib" \
+ "--disable-zlib" \
+ "for zlib support" &&
+
+optional_depends X86-ASSEMBLER \
+ "" \
+ "--disable-x86asm" \
+ "for some assembler optimizations" &&
+
+optional_depends celt \
+ "--enable-libcelt" \
+ "" \
+ "for celt codec support" &&
+
+optional_depends frei0r-plugins \
+ "--enable-frei0r" \
+ "" \
+ "to use frei0r for video filtering" &&
+
+ case $FFMPEG_HTTPS in
+ gnutls) depends gnutls "--enable-gnutls" ;;
+ SSL) depends SSL "--enable-nonfree --enable-openssl" &&
+ message "Open/Libre SSL ${PROBLEM_COLOR}nonfree${DEFAULT_COLOR}" ;;
+ esac &&
+
+ optional_depends fontconfig \
+ "--enable-libfontconfig" \
+ "" \
+ "to enable fontconfig" &&
+
+ optional_depends libass \
+ "--enable-libass" \
+ "" \
+ "use libass for subtitle rendering" &&
+
+ optional_depends libmodplug \
+ "--enable-libmodplug" \
+ "" \
+ "to enable libmodplug support for playing mod files" &&
+
+ optional_depends twolame \
+ "--enable-libtwolame" \
+ "" \
+ "for MP2 encoding" &&
+
+ optional_depends libcdio \
+ "--enable-libcdio" \
+ "" \
+ "for audio CD grabbing" &&
+
+ if is_depends_enabled $SPELL libcdio; then
+ depends libcdio-paranoia
+ fi &&
+
+ optional_depends libiec61883 \
+ "--enable-libiec61883" \
+ "" \
+ "to enable iec61883" &&
+
+ optional_depends flite \
+ "--enable-libflite" \
+ "" \
+ "for voice synthesis support" &&
+
+ optional_depends libcaca \
+ "--enable-libcaca" \
+ "" \
+ "for textual display support" &&
+
+ optional_depends libbluray \
+ "--enable-libbluray" \
+ "" \
+ "for BluRay reading support" &&
+
+ optional_depends openal \
+ "--enable-openal" \
+ "" \
+ "for OpenAL 1.1 capture support" &&
+
+ optional_depends v4l-utils \
+ "--enable-libv4l2" \
+ "" \
+ "to enable v4l support" &&
+
+ optional_depends pulseaudio \
+ "--enable-libpulse" \
+ "" \
+ "for Pulseaudio input support" &&
+
+ optional_depends libwebp \
+ "--enable-libwebp" \
+ "" \
+ "for WebP encoding via libwebp" &&
+
+ optional_depends OPENGL \
+ "--enable-opengl" \
+ "" \
+ "for OpenGL rendering" &&
+
+#optional_depends libvmaf \
+# "--enable-libvmaf" \
+# "--disable-libvmaf" \
+# "to enable vmaf filter support" &&
+
+optional_depends libxml2 \
+ "--enable-libxml2" \
+ "--disable-libxml2" \
+ "to enable XML parsing code" &&
+
+optional_depends libvdpau \
+ "--enable-vdpau" \
+ "--disable-vdpau" \
+ "to enable VDPAU code" &&
+
+optional_depends OPENCV \
+ "--enable-libopencv" \
+ "--disable-libopencv" \
+ "to video filtering via libopencv" &&
+
+optional_depends libva '--enable-vaapi' '--disable-vaapi' 'Video
Acceleration API' &&
+
+optional_depends libvpx \
+ "--enable-libvpx" \
+ "" \
+ "for VP8 (and VP9 for stable branch) de/encoding support" &&
+
+optional_depends speex \
+ "--enable-libspeex" \
+ "" \
+ "for Speex codec support" &&
+
+optional_depends openjpeg \
+ "--enable-libopenjpeg" \
+ "--disable-libopenjpeg" \
+ "for JPEG 2000 support" &&
+
+optional_depends lame \
+ "--enable-libmp3lame" \
+ "" \
+ "for mp3 encoding" &&
+
+optional_depends libvorbis \
+ "--enable-libvorbis" \
+ "" \
+ "for ogg/vorbis support" &&
+
+optional_depends freetype2 \
+ "--enable-libfreetype" \
+ "" \
+ "for a text render plugin" &&
+
+optional_depends xvid \
+ "--enable-libxvid" \
+ "" \
+ "for xvid support" &&
+
+optional_depends sdl2 \
+ "" \
+ "--disable-sdl2" \
+ "for ffplay video player" &&
+
+optional_depends opencore-amr \
+ "--enable-libopencore-amrnb" \
+ "" \
+ "for AMR-NB de/encoding via libopencore-amrnb
(${PROBLEM_COLOR}GPLv3${DEFAULT_COLOR}) support" &&
+
+optional_depends libtheora \
+ "--enable-libtheora" \
+ "" \
+ "for Theora encoding" &&
+
+optional_depends x264 \
+ "--enable-libx264" \
+ "" \
+ "for H.264 encoding" &&
+
+optional_depends x265 \
+ "--enable-libx265" \
+ "" \
+ "for H.265 encoding" &&
+
+optional_depends gsm \
+ "--enable-libgsm" \
+ "" \
+ "for GSM de/encoding" &&
+
+optional_depends rtmpdump \
+ "--enable-librtmp" \
+ "" \
+ "for RTMP[E] support" &&
+
+#optional_depends libdc1394 \
+# "--enable-libdc1394" \
+# "" \
+# "for IIDC-1394 grabbing" &&
+
+optional_depends rubberband \
+ "--enable-librubberband" \
+ "" \
+ "for rubberband filter" &&
+
+optional_depends tesseract \
+ "--enable-libtesseract" \
+ "" \
+ "for OCR filter" &&
+
+
+optional_depends snappy \
+ "--enable-libsnappy" \
+ "" \
+ "for Snappy compression, needed for hap encoding" &&
+
+optional_depends vulkan-headers \
+ --enable-vulkan \
+ --disable-vulkan \
+ 'Vulkan support'
+optional_depends texinfo '' \
+ '--disable-doc' \
+ 'build docs'
+
+
+
diff --git a/video/ffmpeg7/DETAILS b/video/ffmpeg7/DETAILS
new file mode 100755
index 0000000..5cd07ef
--- /dev/null
+++ b/video/ffmpeg7/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=ffmpeg7
+ SPELLX=ffmpeg
+ VERSION=7.0
+ SOURCE=$SPELLX-$VERSION.tar.xz
+ SOURCE2=$SOURCE.asc
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+ SOURCE_URL[0]=https://ffmpeg.org/releases/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=ffmpeg.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+ DOC_DIRS=""
+ WEB_SITE=https://ffmpeg.org/
+ ENTERED=20240407
+ LICENSE[0]=GPL
+ KEYWORDS="video"
+ SHORT="complete video and audio broadcasting solution"
+cat << EOF
+FFMpeg is a complete and free Internet live audio and video
+broadcasting solution for Linux/Unix. It also includes a digital VCR.
+It can encode in real time in many formats including MPEG1 audio and
+video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
+EOF
diff --git a/video/ffmpeg7/HISTORY b/video/ffmpeg7/HISTORY
new file mode 100644
index 0000000..1d73552
--- /dev/null
+++ b/video/ffmpeg7/HISTORY
@@ -0,0 +1,2 @@
+2024-04-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7.0
diff --git a/video/ffmpeg7/INSTALL b/video/ffmpeg7/INSTALL
new file mode 100755
index 0000000..be73a2f
--- /dev/null
+++ b/video/ffmpeg7/INSTALL
@@ -0,0 +1,5 @@
+make_single &&
+make V=1 install &&
+make_normal &&
+
+install -vm 755 "tools/qt-faststart" "$INSTALL_ROOT/usr/bin/qt-faststart"
diff --git a/video/ffmpeg7/PROVIDES b/video/ffmpeg7/PROVIDES
new file mode 100755
index 0000000..f6a1ac4
--- /dev/null
+++ b/video/ffmpeg7/PROVIDES
@@ -0,0 +1 @@
+LIBAVCODEC
diff --git a/video/ffmpeg7/TRIGGERS b/video/ffmpeg7/TRIGGERS
new file mode 100755
index 0000000..d5bbf70
--- /dev/null
+++ b/video/ffmpeg7/TRIGGERS
@@ -0,0 +1,8 @@
+on_cast codec2 check_self
+on_cast dav1d check_self
+on_cast libass check_self
+on_cast libunibreak check_self
+on_cast snappy check_self
+on_cast tesseract check_self
+on_cast x264 check_self
+on_cast x265 check_self
diff --git a/video/ffmpeg7/UP_TRIGGERS b/video/ffmpeg7/UP_TRIGGERS
new file mode 100755
index 0000000..8fc029e
--- /dev/null
+++ b/video/ffmpeg7/UP_TRIGGERS
@@ -0,0 +1,19 @@
+# up_trigger everything on major version updates
+local NEW_SPELL_BRANCH="" &&
+local OLD_SPELL_BRANCH="" &&
+
+if spell_ok $SPELL; then
+ NEW_SPELL_BRANCH="$(echo $VERSION | cut -d. -f1,2)" &&
+ OLD_SPELL_BRANCH="$(installed_version $SPELL | cut -d. -f1,2)" &&
+
+ if test "${NEW_SPELL_BRANCH}" != "${OLD_SPELL_BRANCH}"; then
+ message "This is a possibly incompatible update of ${SPELL}..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends $SPELL 1); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q
"NEEDED.*lib$\(swscale$\|$avcodec$\|$avdevice$\|$avfilter$\|$avutil$\|$postproc$\|$swresample$\)";
then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi
diff --git a/xorg-app/xdm/DETAILS b/xorg-app/xdm/DETAILS
index 766cfef..5d81efd 100755
--- a/xorg-app/xdm/DETAILS
+++ b/xorg-app/xdm/DETAILS
@@ -1,5 +1,5 @@
SPELL=xdm
- VERSION=1.1.14
+ VERSION=1.1.16
PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.xz

SOURCE_URL[0]=https://xorg.freedesktop.org/releases/individual/app/${SOURCE}
diff --git a/xorg-app/xdm/HISTORY b/xorg-app/xdm/HISTORY
index 1065463..de1b0a0 100644
--- a/xorg-app/xdm/HISTORY
+++ b/xorg-app/xdm/HISTORY
@@ -1,3 +1,6 @@
+2024-04-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.16
+
2022-12-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.14

diff --git a/xorg/xwayland/DETAILS b/xorg/xwayland/DETAILS
index 1ee4201..b90c9b3 100755
--- a/xorg/xwayland/DETAILS
+++ b/xorg/xwayland/DETAILS
@@ -1,7 +1,7 @@
# Watch: https://xorg.freedesktop.org/archive/individual/xserver
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=xwayland
- VERSION=23.2.5
+ VERSION=23.2.6
SECURITY_PATCH=9
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/xorg/xwayland/HISTORY b/xorg/xwayland/HISTORY
index 66592fc..e77f382 100644
--- a/xorg/xwayland/HISTORY
+++ b/xorg/xwayland/HISTORY
@@ -1,3 +1,6 @@
+2024-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 23.2.6
+
2024-04-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 23.2.5
SECURITY_PATCH++ fix CVE-2024-3108{0,1,3}

[[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (b9742c123979fdcf6702547cbfbec767a776520c), Treeve Jelbert, 04/10/2024