From 5205288d38f4ac3ee3ddf99c7e46c8b2dc124bf1 Mon Sep 17 00:00:00 2001 From: Suyun114 <108112549+Suyun114@users.noreply.github.com> Date: Thu, 2 May 2024 16:52:47 +0800 Subject: [PATCH 1/3] db: Update to 6.2.32 --- db/5.3-java.patch | 21 --------------------- db/5.3-tcl.patch | 11 ----------- db/5.3-vpath.patch | 11 ----------- db/PKGBUILD | 21 +++------------------ 4 files changed, 3 insertions(+), 61 deletions(-) delete mode 100644 db/5.3-java.patch delete mode 100644 db/5.3-tcl.patch delete mode 100644 db/5.3-vpath.patch diff --git a/db/5.3-java.patch b/db/5.3-java.patch deleted file mode 100644 index 668bb253c4f..00000000000 --- a/db/5.3-java.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- origsrc/db-5.3.21/dist/aclocal_java/ac_jni_include_dirs.m4 2012-05-11 12:57:48.000000000 -0500 -+++ src/db-5.3.21/dist/aclocal_java/ac_jni_include_dirs.m4 2013-03-08 00:21:17.541594900 -0600 -@@ -75,7 +75,6 @@ if test "$_JTOPDIR" != "/usr"; then - case "$host_os" in - aix*) _JNI_INC_SUBDIRS="aix";; - bsdi*) _JNI_INC_SUBDIRS="bsdos";; -- cygwin*) _JNI_INC_SUBDIRS="win32";; - freebsd*) _JNI_INC_SUBDIRS="freebsd";; - hp*) _JNI_INC_SUBDIRS="hp-ux";; - linux*) _JNI_INC_SUBDIRS="linux genunix";; ---- origsrc/db-5.3.21/dist/configure.ac 2012-05-11 12:57:48.000000000 -0500 -+++ src/db-5.3.21/dist/configure.ac 2013-03-08 00:20:48.257920000 -0600 -@@ -435,7 +435,7 @@ if test "$db_cv_java" = "yes" -o "$db_cv - # A classpath that includes . is needed to check for Java - # Since Cygwin uses Windows' javac, we need Windows path separators - case "$host_os" in -- cygwin*) CLASSPATH=".;$CLASSPATH";; -+ mingw*) CLASSPATH=".;$CLASSPATH";; - *) CLASSPATH=".:$CLASSPATH";; - esac - export CLASSPATH diff --git a/db/5.3-tcl.patch b/db/5.3-tcl.patch deleted file mode 100644 index ca8234cc4f4..00000000000 --- a/db/5.3-tcl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- origsrc/db-5.3.21/dist/aclocal/tcl.m4 2012-05-11 12:57:48.000000000 -0500 -+++ src/db-5.3.21/dist/aclocal/tcl.m4 2013-03-08 00:21:33.268494500 -0600 -@@ -107,7 +107,7 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [ - # given by the Tcl spec are insufficient for our use. [#5779],[#17109] - # - case "$host_os" in -- aix*) -+ aix*|cygwin*) - LIBTSO_LIBS="$LIBTSO_LIBS $TCL_LIB_SPEC $TCL_LIB_FLAG" - LIBTSO_LIBS="$LIBTSO_LIBS -L$TCL_EXEC_PREFIX/lib -ltcl$TCL_VERSION";; - esac diff --git a/db/5.3-vpath.patch b/db/5.3-vpath.patch deleted file mode 100644 index 1d2597b279e..00000000000 --- a/db/5.3-vpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/db-5.2.38/dist/aclocal/sql.m4.orig 2014-10-03 16:21:14.838769800 +0900 -+++ src/db-5.2.38/dist/aclocal/sql.m4 2014-10-03 16:25:09.722632200 +0900 -@@ -96,7 +96,7 @@ - # !!! END COPIED from autoconf distribution - - sqlite_dir=$srcdir/../lang/sql/sqlite --(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline" && cat build_config.h >> config.h) || exit 1 -+(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline " && cat build_config.h >> config.h) || exit 1 - - # Configure JDBC if --enable-jdbc - if test "$db_cv_jdbc" != "no"; then diff --git a/db/PKGBUILD b/db/PKGBUILD index 943f41a6aa5..8c0c74ce0cd 100644 --- a/db/PKGBUILD +++ b/db/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=('db' 'libdb' 'libdb-devel' 'db-docs') -pkgver=5.3.28 +pkgver=6.2.32 pkgrel=5 pkgdesc="The Berkeley DB embedded database system" url="https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" @@ -12,27 +12,12 @@ license=('custom') arch=('i686' 'x86_64') depends=('sh') makedepends=('autotools' 'gcc') -source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz - #http://download.oracle.com/otn/berkeley-db/db-${pkgver}.tar.gz - 5.3-java.patch - 5.3-tcl.patch - 5.3-vpath.patch - https://src.fedoraproject.org/rpms/libdb/raw/d6841b3b46a51db98c162347211a5a64d154ea37/f/db-5.3.28-atomic_compare_exchange.patch) +source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) options=('!makeflags') -sha256sums=('e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628' - 'a925b88e58cff6d4aeed3eecfa2cf4c606f2ed469607d8fd0c5c0a9c4b5a8bd1' - '2166bac574f60d42fe6dd6c03223d6595accf303375be397e277b38676b8cb08' - '7614933d2770c2aa6864cd731c114b90a4e4c1a8a988daabd9b6f203ab8f1f21' - 'eb58b5764e16c6f81df8ff80964ef2e071ca5cbb9e24d37f45a831107afb68cc') +sha256sums=('a9c5e2b004a5777aa03510cfe5cd766a4a3b777713406b02809c17c8e0e7a8fb') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np2 -i ${srcdir}/5.3-java.patch - patch -Np2 -i ${srcdir}/5.3-tcl.patch - patch -Np2 -i ${srcdir}/5.3-vpath.patch - patch -Np1 -i ${srcdir}/db-5.3.28-atomic_compare_exchange.patch - cd dist ac_macrodir=aclocal libtoolize --copy --force --install ./s_config From 20c00ff3c3d5fcefadb2207e5b23154c77bfd397 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 8 May 2024 22:42:42 +0200 Subject: [PATCH 2/3] db: update license --- db/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/PKGBUILD b/db/PKGBUILD index 8c0c74ce0cd..619c358d7c8 100644 --- a/db/PKGBUILD +++ b/db/PKGBUILD @@ -8,7 +8,7 @@ url="https://www.oracle.com/technetwork/database/database-technologies/berkeleyd msys2_references=( "cpe: cpe:/a:oracle:berkeley_db" ) -license=('custom') +license=('spdx:AGPL-3.0-or-later') arch=('i686' 'x86_64') depends=('sh') makedepends=('autotools' 'gcc') From 7598f5e2c8b5f7e85d72862c1483bbb8d9ff1bbb Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 8 May 2024 22:43:49 +0200 Subject: [PATCH 3/3] db: rebuilds --- cyrus-sasl/PKGBUILD | 2 +- heimdal/PKGBUILD | 2 +- perl/PKGBUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cyrus-sasl/PKGBUILD b/cyrus-sasl/PKGBUILD index f6c43bf3258..20a66edc61d 100644 --- a/cyrus-sasl/PKGBUILD +++ b/cyrus-sasl/PKGBUILD @@ -3,7 +3,7 @@ pkgname=(cyrus-sasl libsasl libsasl-devel) _basever=2.1.28 pkgver=${_basever} -pkgrel=4 +pkgrel=5 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') url="https://www.cyrusimap.org/sasl/" diff --git a/heimdal/PKGBUILD b/heimdal/PKGBUILD index af736e3e53f..373a048aa75 100644 --- a/heimdal/PKGBUILD +++ b/heimdal/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=heimdal pkgname=('heimdal' 'heimdal-libs' 'heimdal-devel') pkgver=7.8.0 -pkgrel=4 +pkgrel=5 pkgdesc="Implementation of Kerberos V5 libraries" arch=('i686' 'x86_64') url="https://www.h5l.org/" diff --git a/perl/PKGBUILD b/perl/PKGBUILD index 765c8b0cdad..68d04720dfa 100644 --- a/perl/PKGBUILD +++ b/perl/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=perl pkgname=('perl' 'perl-doc' 'perl-devel') pkgver=5.38.2 -pkgrel=1 +pkgrel=2 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL')