summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-01-11 21:58:08 +0000
committer Eric Hameleers <alien@slackware.com>2020-01-12 08:59:49 +0100
commited2eb16b1115533f646c6a631c2576f139096e6d (patch)
tree67004ad2d9492fbdf4e75891cd15cd262131f8f7 /source
parent8d94e33d1acc8665c22edbdcfa12173ca254b7ca (diff)
downloadcurrent-ed2eb16b1115533f646c6a631c2576f139096e6d.tar.gz
current-ed2eb16b1115533f646c6a631c2576f139096e6d.tar.xz
Sat Jan 11 21:58:08 UTC 202020200111215808
a/aaa_elflibs-15.0-x86_64-18.txz: Rebuilt. Added: libdb-4.8.so Upgraded: libcap.so.2.30 Removed: libdb-4.2.so a/mcelog-168-x86_64-1.txz: Upgraded. ap/vim-8.2.0111-x86_64-1.txz: Upgraded. d/subversion-1.13.0-x86_64-3.txz: Rebuilt. Recompiled against db48-4.8.30. l/apr-util-1.6.1-x86_64-8.txz: Rebuilt. Recompiled against db48-4.8.30. l/db42-4.2.52-x86_64-4.txz: Removed. l/db44-4.4.20-x86_64-4.txz: Removed. l/redland-1.0.17-x86_64-6.txz: Rebuilt. Recompiled against db48-4.8.30. l/serf-1.3.9-x86_64-4.txz: Rebuilt. Recompiled against db48-4.8.30. l/talloc-2.3.1-x86_64-3.txz: Rebuilt. Fix documentation permissions. Thanks to Xsane. n/httpd-2.4.41-x86_64-2.txz: Rebuilt. Recompiled against db48-4.8.30. n/ipset-7.5-x86_64-1.txz: Upgraded. xap/vim-gvim-8.2.0111-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/aaa_elflibs/aaa_elflibs.SlackBuild4
-rw-r--r--source/a/aaa_elflibs/tracked-files2
-rwxr-xr-xsource/d/subversion/subversion.SlackBuild2
-rwxr-xr-xsource/l/apr-util/apr-util.SlackBuild2
-rwxr-xr-xsource/l/db42/db42.SlackBuild167
-rw-r--r--source/l/db42/patch.4.2.52.136
-rw-r--r--source/l/db42/patch.4.2.52.245
-rw-r--r--source/l/db42/patch.4.2.52.3247
-rw-r--r--source/l/db42/patch.4.2.52.436
-rw-r--r--source/l/db42/slack-desc19
-rwxr-xr-xsource/l/db44/db44.SlackBuild169
-rw-r--r--source/l/db44/patch.4.4.20.127
-rw-r--r--source/l/db44/patch.4.4.20.229
-rw-r--r--source/l/db44/slack-desc19
-rwxr-xr-xsource/l/redland/redland.SlackBuild6
-rwxr-xr-xsource/l/serf/serf.SlackBuild2
-rwxr-xr-xsource/l/talloc/talloc.SlackBuild6
-rwxr-xr-xsource/n/httpd/httpd.SlackBuild2
18 files changed, 13 insertions, 807 deletions
diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
index 643e7e0bc..31f537002 100755
--- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
+++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=aaa_elflibs
VERSION=${VERSION:-15.0}
-BUILD=${BUILD:-17}
+BUILD=${BUILD:-18}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/a/aaa_elflibs/tracked-files b/source/a/aaa_elflibs/tracked-files
index 27e15993a..7ee005943 100644
--- a/source/a/aaa_elflibs/tracked-files
+++ b/source/a/aaa_elflibs/tracked-files
@@ -2,8 +2,8 @@
# in aaa_elflibs but which don't have a shared library symlink pointing
# at them.
-/lib/libdb-4.2.so
/lib/libdb-4.4.so
+/lib/libdb-4.8.so
/lib/libdevmapper.so.1.02
/usr/lib/libargon2.so.1
/usr/lib/libcups.so.2
diff --git a/source/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild
index 1097bb7e5..68e0e75bb 100755
--- a/source/d/subversion/subversion.SlackBuild
+++ b/source/d/subversion/subversion.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=subversion
VERSION=${VERSION:-$(echo subversion-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/apr-util/apr-util.SlackBuild b/source/l/apr-util/apr-util.SlackBuild
index 66081e4fe..e5c577206 100755
--- a/source/l/apr-util/apr-util.SlackBuild
+++ b/source/l/apr-util/apr-util.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=apr-util
VERSION=${VERSION:-$(echo apr-util-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-7}
+BUILD=${BUILD:-8}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/db42/db42.SlackBuild b/source/l/db42/db42.SlackBuild
deleted file mode 100755
index 373f837b6..000000000
--- a/source/l/db42/db42.SlackBuild
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/bash
-
-# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=db42
-VERSION=4.2.52
-BUILD=${BUILD:-4}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) export ARCH=i586 ;;
- arm*) export ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
- *) export ARCH=$( uname -m ) ;;
- esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
- echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
- exit 0
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-db42
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
- CONFIGURE_ARGS=""
-elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
- CONFIGURE_ARGS=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
- # Needed as a workaround for:
- # "architecture lacks fast mutexes: applications cannot be threaded"
- CONFIGURE_ARGS="--with-mutex=x86/gcc-assembly"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
- CONFIGURE_ARGS=""
-fi
-
-cd $TMP
-rm -rf db-$VERSION
-tar xvf $CWD/db-$VERSION.tar.bz2 || exit 1
-cd db-$VERSION || exit 1
-zcat $CWD/patch.4.2.52.1.gz | patch -p0 --verbose || exit 1
-zcat $CWD/patch.4.2.52.2.gz | patch -p0 --verbose || exit 1
-zcat $CWD/patch.4.2.52.3.gz | patch -p0 --verbose || exit 1
-zcat $CWD/patch.4.2.52.4.gz | patch -p0 --verbose || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-rm -rf build-dir
-mkdir build-dir
-cd build-dir
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-../dist/configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --enable-shared \
- --enable-rpc \
- --enable-compat185 \
- $CONFIGURE_ARGS \
- --build=$ARCH-slackware-linux || exit 1
-
-make -j3 || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-# Remove WAY TOO LARGE (and misplaced) docs:
-rm -rf $PKG/usr/docs
-mkdir -p $PKG/usr/doc/db-$VERSION
-cp -a \
- ../LICENSE ../README \
- $PKG/usr/doc/db-$VERSION
-cat << EOF > $PKG/usr/doc/db-$VERSION/README-DOCS
-
- For a ton of additional documentation (too large to include
- here) on writing source code that uses libdb42, please see
- the source tarball db-$VERSION.tar.bz2, which can be found
- in the Slackware source tree in source/l/db42/, or on
- Sleepycat's web site: http://www.sleepycat.com.
-
-EOF
-
-# Put libdb-4.2.so into /lib${LIBDIRSUFFIX} since it might be needed
-# before /usr is mounted.
-mkdir -p $PKG/lib${LIBDIRSUFFIX}
-mv $PKG/usr/lib${LIBDIRSUFFIX}/libdb-4.2.so $PKG/lib${LIBDIRSUFFIX}/libdb-4.2.so
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
- ln -sf /lib${LIBDIRSUFFIX}/libdb-4.2.so .
-)
-
-( cd $PKG/usr/include
- chmod 644 *
- mkdir db42
- mv db.h db_185.h db_cxx.h db42
- # Not any more... db-4.2 is on the way out.
- #ln -sf db42/db.h .
- #ln -sf db42/db_185.h .
- #ln -sf db42/db_cxx.h .
-)
-
-chmod 755 $PKG/usr/bin/*
-
-( cd $PKG/usr/bin
- mv berkeley_db_svc berkeley_db42_svc
- for file in db_* ; do
- mv $file db42_`echo $file | cut -f 2- -d _`
- done
-)
-
-# Not the default DB version:
-rm -f $PKG/usr/include/{db.h,db_185.h,db_cxx.h}
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libdb-4.so
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libdb.{a,so}
-# We will not be linking statically against this, either.
-# If you need to do that, drag up an old package from the Slackware 10.2 era...
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-makepkg -l y -c n $TMP/db42-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/db42/patch.4.2.52.1 b/source/l/db42/patch.4.2.52.1
deleted file mode 100644
index 474cb8751..000000000
--- a/source/l/db42/patch.4.2.52.1
+++ /dev/null
@@ -1,36 +0,0 @@
-*** mp/mp_fget.c.orig 25 Sep 2003 02:15:16 -0000 11.81
---- mp/mp_fget.c 9 Dec 2003 19:06:28 -0000 11.82
-***************
-*** 440,446 ****
- c_mp->stat.st_pages--;
- alloc_bhp = NULL;
- R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]);
-- MUTEX_LOCK(dbenv, &hp->hash_mutex);
-
- /*
- * We can't use the page we found in the pool if DB_MPOOL_NEW
---- 440,445 ----
-***************
-*** 455,460 ****
---- 454,462 ----
- b_incr = 0;
- goto alloc;
- }
-+
-+ /* We can use the page -- get the bucket lock. */
-+ MUTEX_LOCK(dbenv, &hp->hash_mutex);
- break;
- case SECOND_MISS:
- /*
-*** mp/mp_fput.c.orig 30 Sep 2003 17:12:00 -0000 11.48
---- mp/mp_fput.c 13 Dec 2003 00:08:29 -0000 11.49
-***************
-*** 285,290 ****
---- 285,291 ----
- bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh))
- if (bhp->priority != UINT32_T_MAX &&
- bhp->priority > MPOOL_BASE_DECREMENT)
-+ bhp->priority -= MPOOL_BASE_DECREMENT;
- MUTEX_UNLOCK(dbenv, &hp->hash_mutex);
- }
- }
diff --git a/source/l/db42/patch.4.2.52.2 b/source/l/db42/patch.4.2.52.2
deleted file mode 100644
index 3dc13c172..000000000
--- a/source/l/db42/patch.4.2.52.2
+++ /dev/null
@@ -1,45 +0,0 @@
-*** lock/lock.c.save 2004-01-30 10:48:33.000000000 -0800
---- lock/lock.c 2004-01-30 10:55:58.000000000 -0800
-***************
-*** 2216,2226 ****
- dp = (u_int8_t *)dp + \
- sizeof(db_pgno_t); \
- } while (0)
-! #define COPY_OBJ(dp, obj) do { \
-! memcpy(dp, obj->data, obj->size); \
-! dp = (u_int8_t *)dp + \
-! ALIGN(obj->size, \
-! sizeof(u_int32_t)); \
- } while (0)
-
- #define GET_COUNT(dp, count) do { \
---- 2216,2227 ----
- dp = (u_int8_t *)dp + \
- sizeof(db_pgno_t); \
- } while (0)
-! #define COPY_OBJ(dp, obj) do { \
-! memcpy(dp, \
-! (obj)->data, (obj)->size); \
-! dp = (u_int8_t *)dp + \
-! ALIGN((obj)->size, \
-! sizeof(u_int32_t)); \
- } while (0)
-
- #define GET_COUNT(dp, count) do { \
-***************
-*** 2339,2345 ****
- for (i = 0; i < nlocks; i = j) {
- PUT_PCOUNT(dp, obj[i].ulen);
- PUT_SIZE(dp, obj[i].size);
-! COPY_OBJ(dp, obj);
- lock = (DB_LOCK_ILOCK *)obj[i].data;
- for (j = i + 1; j <= i + obj[i].ulen; j++) {
- lock = (DB_LOCK_ILOCK *)obj[j].data;
---- 2340,2346 ----
- for (i = 0; i < nlocks; i = j) {
- PUT_PCOUNT(dp, obj[i].ulen);
- PUT_SIZE(dp, obj[i].size);
-! COPY_OBJ(dp, &obj[i]);
- lock = (DB_LOCK_ILOCK *)obj[i].data;
- for (j = i + 1; j <= i + obj[i].ulen; j++) {
- lock = (DB_LOCK_ILOCK *)obj[j].data;
diff --git a/source/l/db42/patch.4.2.52.3 b/source/l/db42/patch.4.2.52.3
deleted file mode 100644
index 9e82423c2..000000000
--- a/source/l/db42/patch.4.2.52.3
+++ /dev/null
@@ -1,247 +0,0 @@
---- java/src/com/sleepycat/db/DbEnv.java 2003-12-03 16:26:27.000000000 -0500
-+++ java/src/com/sleepycat/db/DbEnv.java 2004-03-18 15:15:42.000000000 -0500
-@@ -61,7 +61,7 @@
- // Internally, the JNI layer creates a global reference to each DbEnv,
- // which can potentially be different to this. We keep a copy here so
- // we can clean up after destructors.
-- private Object dbenv_ref;
-+ private long dbenv_ref;
- private DbAppDispatch app_dispatch_handler;
- private DbEnvFeedbackHandler env_feedback_handler;
- private DbErrorHandler error_handler;
-@@ -94,7 +94,7 @@
- void cleanup() {
- swigCPtr = 0;
- db_java.deleteRef0(dbenv_ref);
-- dbenv_ref = null;
-+ dbenv_ref = 0L;
- }
-
-
---- java/src/com/sleepycat/db/Db.java 2003-12-03 16:26:25.000000000 -0500
-+++ java/src/com/sleepycat/db/Db.java 2004-03-18 15:15:55.000000000 -0500
-@@ -57,7 +57,7 @@
- // Internally, the JNI layer creates a global reference to each Db,
- // which can potentially be different to this. We keep a copy here so
- // we can clean up after destructors.
-- private Object db_ref;
-+ private long db_ref;
- private DbEnv dbenv;
- private boolean private_dbenv;
- private DbAppendRecno append_recno_handler;
-@@ -84,7 +84,7 @@
- private void cleanup() {
- swigCPtr = 0;
- db_java.deleteRef0(db_ref);
-- db_ref = null;
-+ db_ref = 0L;
- if (private_dbenv) {
- dbenv.cleanup();
- }
---- java/src/com/sleepycat/db/db_java.java 2003-12-03 16:10:54.000000000 -0500
-+++ java/src/com/sleepycat/db/db_java.java 2004-03-18 15:17:24.000000000 -0500
-@@ -14,15 +14,15 @@
- db_javaJNI.DbEnv_lock_vec(DbEnv.getCPtr(dbenv), locker, flags, list, offset, nlist);
- }
-
-- static Object initDbEnvRef0(DbEnv self, Object handle) {
-+ static long initDbEnvRef0(DbEnv self, Object handle) {
- return db_javaJNI.initDbEnvRef0(DbEnv.getCPtr(self), handle);
- }
-
-- static Object initDbRef0(Db self, Object handle) {
-+ static long initDbRef0(Db self, Object handle) {
- return db_javaJNI.initDbRef0(Db.getCPtr(self), handle);
- }
-
-- static void deleteRef0(Object ref) {
-+ static void deleteRef0(long ref) {
- db_javaJNI.deleteRef0(ref);
- }
-
---- java/src/com/sleepycat/db/db_javaJNI.java 2003-12-03 16:10:55.000000000 -0500
-+++ java/src/com/sleepycat/db/db_javaJNI.java 2004-03-18 15:16:18.000000000 -0500
-@@ -45,9 +45,9 @@
- static native final void initialize();
-
- public final static native void DbEnv_lock_vec(long jarg1, int jarg2, int jarg3, DbLockRequest[] jarg4, int jarg5, int jarg6) throws DbException;
-- final static native Object initDbEnvRef0(long jarg1, Object jarg2);
-- final static native Object initDbRef0(long jarg1, Object jarg2);
-- final static native void deleteRef0(Object jarg1);
-+ final static native long initDbEnvRef0(long jarg1, Object jarg2);
-+ final static native long initDbRef0(long jarg1, Object jarg2);
-+ final static native void deleteRef0(long jarg1);
- final static native long getDbEnv0(long jarg1);
- public final static native long new_Db(long jarg1, int jarg2) throws DbException;
- public final static native void Db_associate(long jarg1, long jarg2, long jarg3, DbSecondaryKeyCreate jarg4, int jarg5) throws DbException;
---- libdb_java/db_java.i 2003-11-17 15:00:52.000000000 -0500
-+++ libdb_java/db_java.i 2004-03-18 09:21:14.000000000 -0500
-@@ -53,7 +53,7 @@
- // Internally, the JNI layer creates a global reference to each DbEnv,
- // which can potentially be different to this. We keep a copy here so
- // we can clean up after destructors.
-- private Object dbenv_ref;
-+ private long dbenv_ref;
- private DbAppDispatch app_dispatch_handler;
- private DbEnvFeedbackHandler env_feedback_handler;
- private DbErrorHandler error_handler;
-@@ -76,7 +76,7 @@
- void cleanup() {
- swigCPtr = 0;
- db_java.deleteRef0(dbenv_ref);
-- dbenv_ref = null;
-+ dbenv_ref = 0L;
- }
-
- public synchronized void close(int flags) throws DbException {
-@@ -220,7 +220,7 @@
- // Internally, the JNI layer creates a global reference to each Db,
- // which can potentially be different to this. We keep a copy here so
- // we can clean up after destructors.
-- private Object db_ref;
-+ private long db_ref;
- private DbEnv dbenv;
- private boolean private_dbenv;
- private DbAppendRecno append_recno_handler;
-@@ -245,7 +245,7 @@
- private void cleanup() {
- swigCPtr = 0;
- db_java.deleteRef0(db_ref);
-- db_ref = null;
-+ db_ref = 0L;
- if (private_dbenv)
- dbenv.cleanup();
- dbenv = null;
-@@ -503,46 +503,42 @@
- }
- %}
-
--%native(initDbEnvRef0) jobject initDbEnvRef0(DB_ENV *self, void *handle);
--%native(initDbRef0) jobject initDbRef0(DB *self, void *handle);
--%native(deleteRef0) void deleteRef0(jobject ref);
-+%native(initDbEnvRef0) jlong initDbEnvRef0(DB_ENV *self, void *handle);
-+%native(initDbRef0) jlong initDbRef0(DB *self, void *handle);
-+%native(deleteRef0) void deleteRef0(jlong ref);
- %native(getDbEnv0) DB_ENV *getDbEnv0(DB *self);
-
- %{
--JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0(
-+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0(
- JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) {
- DB_ENV *self = *(DB_ENV **)&jarg1;
-+ jlong ret;
- COMPQUIET(jcls, NULL);
-
- DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2);
- self->set_errpfx(self, (const char*)self);
-- return (jobject)DB_ENV_INTERNAL(self);
-+ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self);
-+ return (ret);
- }
-
--JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0(
-+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0(
- JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) {
- DB *self = *(DB **)&jarg1;
-+ jlong ret;
- COMPQUIET(jcls, NULL);
-
- DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2);
-- return (jobject)DB_INTERNAL(self);
-+ *(jobject *)&ret = (jobject)DB_INTERNAL(self);
-+ return (ret);
- }
-
- JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0(
-- JNIEnv *jenv, jclass jcls, jobject jref) {
-- COMPQUIET(jcls, NULL);
--
-- if (jref != NULL)
-- (*jenv)->DeleteGlobalRef(jenv, jref);
--}
--
--JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0(
- JNIEnv *jenv, jclass jcls, jlong jarg1) {
-- DB *self = *(DB **)&jarg1;
-+ jobject jref = *(jobject *)&jarg1;
- COMPQUIET(jcls, NULL);
-- COMPQUIET(jenv, NULL);
-
-- return (jobject)DB_INTERNAL(self);
-+ if (jref != 0L)
-+ (*jenv)->DeleteGlobalRef(jenv, jref);
- }
-
- JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0(
-@@ -554,7 +550,7 @@
- COMPQUIET(jcls, NULL);
-
- *(DB_ENV **)&env_cptr = self->dbenv;
-- return env_cptr;
-+ return (env_cptr);
- }
-
- JNIEXPORT jboolean JNICALL
---- libdb_java/db_java_wrap.c 2003-12-03 16:10:36.000000000 -0500
-+++ libdb_java/db_java_wrap.c 2004-03-18 12:18:58.000000000 -0500
-@@ -1192,40 +1192,36 @@
- }
-
-
--JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0(
-+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0(
- JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) {
- DB_ENV *self = *(DB_ENV **)&jarg1;
-+ jlong ret;
- COMPQUIET(jcls, NULL);
-
- DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2);
- self->set_errpfx(self, (const char*)self);
-- return (jobject)DB_ENV_INTERNAL(self);
-+ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self);
-+ return (ret);
- }
-
--JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0(
-+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0(
- JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) {
- DB *self = *(DB **)&jarg1;
-+ jlong ret;
- COMPQUIET(jcls, NULL);
-
- DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2);
-- return (jobject)DB_INTERNAL(self);
-+ *(jobject *)&ret = (jobject)DB_INTERNAL(self);
-+ return (ret);
- }
-
- JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0(
-- JNIEnv *jenv, jclass jcls, jobject jref) {
-- COMPQUIET(jcls, NULL);
--
-- if (jref != NULL)
-- (*jenv)->DeleteGlobalRef(jenv, jref);
--}
--
--JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0(
- JNIEnv *jenv, jclass jcls, jlong jarg1) {
-- DB *self = *(DB **)&jarg1;
-+ jobject jref = *(jobject *)&jarg1;
- COMPQUIET(jcls, NULL);
-- COMPQUIET(jenv, NULL);
-
-- return (jobject)DB_INTERNAL(self);
-+ if (jref != 0L)
-+ (*jenv)->DeleteGlobalRef(jenv, jref);
- }
-
- JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0(
-@@ -1237,7 +1233,7 @@
- COMPQUIET(jcls, NULL);
-
- *(DB_ENV **)&env_cptr = self->dbenv;
-- return env_cptr;
-+ return (env_cptr);
- }
-
- JNIEXPORT jboolean JNICALL
diff --git a/source/l/db42/patch.4.2.52.4 b/source/l/db42/patch.4.2.52.4
deleted file mode 100644
index 4ba773bbc..000000000
--- a/source/l/db42/patch.4.2.52.4
+++ /dev/null
@@ -1,36 +0,0 @@
-*** btree/bt_rec.c.orig Tue Mar 22 09:41:49 2005
---- btree/bt_rec.c Tue Mar 22 09:42:11 2005
-***************
-*** 222,228 ****
- * previous-page pointer updated to our new page. The next
- * page must exist because we're redoing the operation.
- */
-! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) {
- if ((ret =
- __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) {
- ret = __db_pgerr(file_dbp, argp->npgno, ret);
---- 222,228 ----
- * previous-page pointer updated to our new page. The next
- * page must exist because we're redoing the operation.
- */
-! if (!rootsplit && argp->npgno != PGNO_INVALID) {
- if ((ret =
- __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) {
- ret = __db_pgerr(file_dbp, argp->npgno, ret);
-***************
-*** 294,300 ****
- * possible that the next-page never existed, we ignore it as
- * if there's nothing to undo.
- */
-! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) {
- if ((ret =
- __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) {
- np = NULL;
---- 294,300 ----
- * possible that the next-page never existed, we ignore it as
- * if there's nothing to undo.
- */
-! if (!rootsplit && argp->npgno != PGNO_INVALID) {
- if ((ret =
- __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) {
- np = NULL;
diff --git a/source/l/db42/slack-desc b/source/l/db42/slack-desc
deleted file mode 100644
index e6fbbf561..000000000
--- a/source/l/db42/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------------|
-db42: db42 (Berkeley database library version 4.2.x)
-db42:
-db42: The Berkeley Database (Berkeley DB) library provides embedded database
-db42: support for both traditional and client/server applications.
-db42:
-db42: This package should be installed if compatibility is needed with
-db42: databases created with the Berkeley DB version 4.2.x.
-db42:
-db42:
-db42:
-db42:
diff --git a/source/l/db44/db44.SlackBuild b/source/l/db44/db44.SlackBuild
deleted file mode 100755
index 310d85ae0..000000000
--- a/source/l/db44/db44.SlackBuild
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/bash
-
-# Copyright 2008, 2009, 2010, 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=db44
-VERSION=4.4.20
-BUILD=${BUILD:-4}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) export ARCH=i586 ;;
- arm*) export ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
- *) export ARCH=$( uname -m ) ;;
- esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
- echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
- exit 0
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-db44
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-cd $TMP
-rm -rf db-$VERSION
-tar xvf $CWD/db-$VERSION.tar.bz2 || exit 1
-cd db-$VERSION || exit 1
-
-# Official patches:
-zcat $CWD/patch.4.4.20.1.gz | patch -p0 --verbose || exit 1
-zcat $CWD/patch.4.4.20.2.gz | patch -p0 --verbose || exit 1
-
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-rm -rf build-dir
-mkdir build-dir
-cd build-dir
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-../dist/configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --enable-shared \
- --enable-rpc \
- --enable-cxx \
- --enable-compat185 \
- --build=$ARCH-slackware-linux || exit 1
-
-make -j3 || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-# Remove WAY TOO LARGE (and misplaced) docs:
-rm -rf $PKG/usr/docs
-mkdir -p $PKG/usr/doc/db-$VERSION
-cp -a \
- ../LICENSE ../README \
- $PKG/usr/doc/db-$VERSION
-cat << EOF > $PKG/usr/doc/db-$VERSION/README-DOCS
-
- For a ton of additional documentation (too large to include
- here) on writing source code that uses libdb44, please see
- the source tarball db-$VERSION.tar.bz2, which can be found
- in the Slackware source tree in source/l/db44/, or on
- Sleepycat's web site: http://www.sleepycat.com.
-
-EOF
-
-# Move include files:
-( cd $PKG/usr/include
- mkdir db44
- mv *.h db44
- for file in db44/* ; do
- ln -sf $file .
- done
- # Better add this symlink, too, just to be safe...
- ln -sf db44 db4
-)
-
-# Rename binaries to avoid overlap:
-( cd $PKG/usr/bin
- mv berkeley_db_svc berkeley_db44_svc
- for file in db_* ; do
- mv $file db44_`echo $file | cut -f 2- -d _`
- done
-)
-
-# Put libdb-4.4.so into /lib${LIBDIRSUFFIX} since it might be needed
-# before /usr is mounted (eg, nsswitch.conf can be set up to
-# use databases instead of flat files)
-mkdir -p $PKG/lib${LIBDIRSUFFIX}
-mv $PKG/usr/lib${LIBDIRSUFFIX}/libdb-4.4.so $PKG/lib${LIBDIRSUFFIX}/libdb-4.4.so
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
- ln -sf /lib${LIBDIRSUFFIX}/libdb-4.4.so .
-)
-
-# Some things might look for these libraries by other names.
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
- ln -sf libdb-4.4.a libdb-4.a
- ln -sf libdb-4.4.a libdb4.a
- ln -sf libdb-4.4.a libdb.a
- ln -sf libdb_cxx-4.4.a libdb_cxx-4.a
- ln -sf libdb_cxx-4.4.a libdb_cxx.a
- ln -sf libdb-4.4.so libdb4.so
- ln -sf libdb-4.4.so libdb.so
-)
-
-chmod 755 $PKG/usr/bin/*
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-makepkg -l y -c n $TMP/db44-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/db44/patch.4.4.20.1 b/source/l/db44/patch.4.4.20.1
deleted file mode 100644
index f6877290f..000000000
--- a/source/l/db44/patch.4.4.20.1
+++ /dev/null
@@ -1,27 +0,0 @@
-*** qam/qam_files.c.orig 2005-10-20 11:57:12.000000000 -0700
---- qam/qam_files.c 2006-01-27 13:38:38.000000000 -0800
-***************
-*** 411,416 ****
---- 411,422 ----
- DB_APP_DATA, buf, 0, NULL, &real_name)) != 0)
- goto err;
- #endif
-+
-+ mpf = array->mpfarray[offset].mpf;
-+ /* This extent my already be marked for delete and closed. */
-+ if (mpf == NULL)
-+ goto err;
-+
- /*
- * The log must be flushed before the file is deleted. We depend on
- * the log record of the last delete to recreate the file if we crash.
-***************
-*** 418,424 ****
- if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0)
- goto err;
-
-- mpf = array->mpfarray[offset].mpf;
- (void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1);
- /* Someone could be real slow, let them close it down. */
- if (array->mpfarray[offset].pinref != 0)
---- 424,429 ----
diff --git a/source/l/db44/patch.4.4.20.2 b/source/l/db44/patch.4.4.20.2
deleted file mode 100644
index 0231ec711..000000000
--- a/source/l/db44/patch.4.4.20.2
+++ /dev/null
@@ -1,29 +0,0 @@
-*** txn/txn.c.orig Tue Nov 1 06:50:03 2005
---- txn/txn.c Tue Jan 31 15:05:13 2006
-***************
-*** 1049,1060 ****
---- 1049,1062 ----
- return (ret);
- memcpy(txn->name, name, len);
-
-+ TXN_SYSTEM_LOCK(dbenv);
- if (td->name != INVALID_ROFF) {
- __db_shalloc_free(
- &mgr->reginfo, R_ADDR(&mgr->reginfo, td->name));
- td->name = INVALID_ROFF;
- }
- if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) {
-+ TXN_SYSTEM_UNLOCK(dbenv);
- __db_err(dbenv,
- "Unable to allocate memory for transaction name");
-
-***************
-*** 1063,1068 ****
---- 1065,1071 ----
-
- return (ret);
- }
-+ TXN_SYSTEM_UNLOCK(dbenv);
- td->name = R_OFFSET(&mgr->reginfo, p);
- memcpy(p, name, len);
-
diff --git a/source/l/db44/slack-desc b/source/l/db44/slack-desc
deleted file mode 100644
index 84d13a3b8..000000000
--- a/source/l/db44/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------------|
-db44: db44 (Berkeley database library version 4.4.x)
-db44:
-db44: The Berkeley Database (Berkeley DB) library provides embedded database
-db44: support for both traditional and client/server applications.
-db44:
-db44: This package should be installed if compatibility is needed with
-db44: databases created with the Berkeley DB version 4.4.x.
-db44:
-db44:
-db44:
-db44:
diff --git a/source/l/redland/redland.SlackBuild b/source/l/redland/redland.SlackBuild
index 07c0a1903..1be554313 100755
--- a/source/l/redland/redland.SlackBuild
+++ b/source/l/redland/redland.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2007, 2013 Heinz Wiesinger, Amsterdam, NL
-# Copyright 2008, 2009, 2010, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=redland
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -103,7 +103,7 @@ CXXFLAGS="$SLKCFLAGS" \
--disable-static \
--with-included-ltdl=no \
--with-bdb-lib=/usr/lib${LIBDIRSUFFIX} \
- --with-bdb-dbname=db-4.4 \
+ --with-bdb-dbname=db-4.8 \
--with-threads \
--build=$TARGET
diff --git a/source/l/serf/serf.SlackBuild b/source/l/serf/serf.SlackBuild
index a4a9a3cba..a1a8df3bc 100755
--- a/source/l/serf/serf.SlackBuild
+++ b/source/l/serf/serf.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=serf
VERSION=${VERSION:-$(echo serf-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/talloc/talloc.SlackBuild b/source/l/talloc/talloc.SlackBuild
index 92c7f082e..091415e4e 100755
--- a/source/l/talloc/talloc.SlackBuild
+++ b/source/l/talloc/talloc.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=talloc
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -80,9 +80,9 @@ cd $PKGNAM-$VERSION || exit 1
chown -R root:root .
find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ \( -perm 777 -o -perm 775 -o -perm 770 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ \( -perm 666 -o -perm 664 -o -perm 660 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
# Fix path to waf binary:
diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild
index 438525eef..36a3a91e3 100755
--- a/source/n/httpd/httpd.SlackBuild
+++ b/source/n/httpd/httpd.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=httpd
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then