diff options
Diffstat (limited to 'source')
16 files changed, 97 insertions, 57 deletions
diff --git a/source/ap/jove/jove.SlackBuild b/source/ap/jove/jove.SlackBuild index 14f8e5c73..cf0036884 100755 --- a/source/ap/jove/jove.SlackBuild +++ b/source/ap/jove/jove.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=jove VERSION=4.16.0.73 -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -77,7 +77,12 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/jove.makefile.diff.gz | patch -p1 --verbose --backup +zcat $CWD/jove.makefile.diff.gz | patch -p1 --verbose --backup || exit 1 + +# Avoid a glibc namespace conflict with getline(), and increase some +# buffer sizes: +zcat $CWD/jove.getline.buffsiz.diff.gz | patch -p1 --verbose --backup || exit 1 + # More patching needed now: sed -i -e "s#/lib/jove#/lib${LIBDIRSUFFIX}/jove#" \ -e "s#^OPTFLAGS = .*#OPTFLAGS = $SLKCFLAGS#" Makefile diff --git a/source/ap/jove/jove.getline.buffsiz.diff b/source/ap/jove/jove.getline.buffsiz.diff new file mode 100644 index 000000000..59b79c522 --- /dev/null +++ b/source/ap/jove/jove.getline.buffsiz.diff @@ -0,0 +1,60 @@ +--- ./fp.h.orig 2002-03-20 15:49:38.000000000 -0600 ++++ ./fp.h 2018-08-16 12:43:15.763002319 -0500 +@@ -17,7 +17,8 @@ + # define scr_putchar(c) f_putc((c), jstdout) + extern void flushscreen proto((void)); + # ifndef SMALL +-# define MAXTTYBUF 2048 ++// TTK here -- upping from 2048 to 256K ++# define MAXTTYBUF 262144 + # else + # define MAXTTYBUF 512 + # endif +--- ./insert.c.orig 2002-03-20 15:49:38.000000000 -0600 ++++ ./insert.c 2018-08-16 12:43:15.773002319 -0500 +@@ -504,7 +506,7 @@ + atchar = 0; + } + +- getline(atline->l_dline, genbuf); ++ j_getline(atline->l_dline, genbuf); + atchar += tchar; + linecopy(genbuf, atchar, save); + atline->l_dline = putline(genbuf); +--- ./jove.h.orig 2002-03-20 15:49:38.000000000 -0600 ++++ ./jove.h 2018-08-16 12:43:15.797002319 -0500 +@@ -267,7 +267,8 @@ + + /* term.c: universal termcap-like declarations */ + +-#define MAXCOLS 256 /* maximum number of columns */ ++// TTK here -- boosting to 256K ++#define MAXCOLS 262144 /* maximum number of columns */ + + extern int + SG, /* number of magic cookies left by SO and SE */ +--- ./io.h.orig 2002-03-20 15:49:38.000000000 -0600 ++++ ./io.h 2018-08-16 12:43:15.790002319 -0500 +@@ -40,7 +40,7 @@ + close_file proto((File *fp)), + d_cache_init proto((void)), + file_write proto((char *fname, bool app)), +- getline proto((daddr addr, char *buf)), ++ j_getline proto((daddr addr, char *buf)), + lsave proto((void)), + putreg proto((File *fp,LinePtr line1,int char1,LinePtr line2,int char2,bool makesure)), + read_file proto((char *file, bool is_insert)), +--- ./io.c.orig 2010-04-16 00:41:46.000000000 -0500 ++++ ./io.c 2018-08-16 12:43:15.782002319 -0500 +@@ -1356,9 +1356,9 @@ + + void + #ifdef USE_PROTOTYPES +-getline proto((daddr addr, register char *buf)) ++j_getline proto((daddr addr, register char *buf)) + #else +-getline(addr, buf) ++j_getline(addr, buf) + daddr addr; + register char *buf; + #endif diff --git a/source/k/kernel-configs/config-generic-4.14.62 b/source/k/kernel-configs/config-generic-4.14.64 index df7b77029..7a73608b9 100644 --- a/source/k/kernel-configs/config-generic-4.14.62 +++ b/source/k/kernel-configs/config-generic-4.14.64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.62 Kernel Configuration +# Linux/x86 4.14.64 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -7155,9 +7155,9 @@ CONFIG_FW_CFG_SYSFS_CMDLINE=y # # EFI (Extensible Firmware Interface) Support # -CONFIG_EFI_VARS=m +CONFIG_EFI_VARS=y CONFIG_EFI_ESRT=y -CONFIG_EFI_VARS_PSTORE=m +CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_RUNTIME_MAP=y # CONFIG_EFI_FAKE_MEMMAP is not set diff --git a/source/k/kernel-configs/config-generic-4.14.62.x64 b/source/k/kernel-configs/config-generic-4.14.64.x64 index 9478f1ff8..89f3d6c99 100644 --- a/source/k/kernel-configs/config-generic-4.14.62.x64 +++ b/source/k/kernel-configs/config-generic-4.14.64.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.62 Kernel Configuration +# Linux/x86 4.14.64 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -261,6 +261,7 @@ CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -7073,9 +7074,9 @@ CONFIG_FW_CFG_SYSFS_CMDLINE=y # # EFI (Extensible Firmware Interface) Support # -CONFIG_EFI_VARS=m +CONFIG_EFI_VARS=y CONFIG_EFI_ESRT=y -CONFIG_EFI_VARS_PSTORE=m +CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_RUNTIME_MAP=y # CONFIG_EFI_FAKE_MEMMAP is not set diff --git a/source/k/kernel-configs/config-generic-smp-4.14.62-smp b/source/k/kernel-configs/config-generic-smp-4.14.64-smp index 473d305f2..61b13940c 100644 --- a/source/k/kernel-configs/config-generic-smp-4.14.62-smp +++ b/source/k/kernel-configs/config-generic-smp-4.14.64-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.62 Kernel Configuration +# Linux/x86 4.14.64 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -253,6 +253,7 @@ CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -7206,9 +7207,9 @@ CONFIG_FW_CFG_SYSFS_CMDLINE=y # # EFI (Extensible Firmware Interface) Support # -CONFIG_EFI_VARS=m +CONFIG_EFI_VARS=y CONFIG_EFI_ESRT=y -CONFIG_EFI_VARS_PSTORE=m +CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_RUNTIME_MAP=y # CONFIG_EFI_FAKE_MEMMAP is not set diff --git a/source/k/kernel-configs/config-huge-4.14.62 b/source/k/kernel-configs/config-huge-4.14.64 index c2022ae5e..22de7c791 100644 --- a/source/k/kernel-configs/config-huge-4.14.62 +++ b/source/k/kernel-configs/config-huge-4.14.64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.62 Kernel Configuration +# Linux/x86 4.14.64 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -7155,9 +7155,9 @@ CONFIG_FW_CFG_SYSFS_CMDLINE=y # # EFI (Extensible Firmware Interface) Support # -CONFIG_EFI_VARS=m +CONFIG_EFI_VARS=y CONFIG_EFI_ESRT=y -CONFIG_EFI_VARS_PSTORE=m +CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_RUNTIME_MAP=y # CONFIG_EFI_FAKE_MEMMAP is not set diff --git a/source/k/kernel-configs/config-huge-4.14.62.x64 b/source/k/kernel-configs/config-huge-4.14.64.x64 index bea43e83a..63fd2cec2 100644 --- a/source/k/kernel-configs/config-huge-4.14.62.x64 +++ b/source/k/kernel-configs/config-huge-4.14.64.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.62 Kernel Configuration +# Linux/x86 4.14.64 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -261,6 +261,7 @@ CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -7073,9 +7074,9 @@ CONFIG_FW_CFG_SYSFS_CMDLINE=y # # EFI (Extensible Firmware Interface) Support # -CONFIG_EFI_VARS=m +CONFIG_EFI_VARS=y CONFIG_EFI_ESRT=y -CONFIG_EFI_VARS_PSTORE=m +CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_RUNTIME_MAP=y # CONFIG_EFI_FAKE_MEMMAP is not set diff --git a/source/k/kernel-configs/config-huge-smp-4.14.62-smp b/source/k/kernel-configs/config-huge-smp-4.14.64-smp index 5dbc39c71..b305a8ed6 100644 --- a/source/k/kernel-configs/config-huge-smp-4.14.62-smp +++ b/source/k/kernel-configs/config-huge-smp-4.14.64-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.62 Kernel Configuration +# Linux/x86 4.14.64 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -253,6 +253,7 @@ CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -7206,9 +7207,9 @@ CONFIG_FW_CFG_SYSFS_CMDLINE=y # # EFI (Extensible Firmware Interface) Support # -CONFIG_EFI_VARS=m +CONFIG_EFI_VARS=y CONFIG_EFI_ESRT=y -CONFIG_EFI_VARS_PSTORE=m +CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_RUNTIME_MAP=y # CONFIG_EFI_FAKE_MEMMAP is not set diff --git a/source/k/kernel-source.SlackBuild b/source/k/kernel-source.SlackBuild index 9b08a852a..5b0b953a0 100755 --- a/source/k/kernel-source.SlackBuild +++ b/source/k/kernel-source.SlackBuild @@ -147,7 +147,7 @@ echo "Untarring $CWD/linux-${VERSION}.tar.?z in $PKG/usr/src..." cp -a .config $CWD/kernel-configs/config-generic${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX} fi echo "Building kernel..." - make -j ${NUMJOBS} bzImage || make bzImage || exit 1 + make ${NUMJOBS} bzImage || make bzImage || exit 1 echo "Cleaning up..." make clean # Make sure header files aren't missing... diff --git a/source/l/expat/expat.SlackBuild b/source/l/expat/expat.SlackBuild index 182fa82d6..5183fd276 100755 --- a/source/l/expat/expat.SlackBuild +++ b/source/l/expat/expat.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=expat -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -67,7 +67,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf expat-$VERSION -tar xvf $CWD/expat-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/expat-$VERSION.tar.?z || exit 1 cd expat-$VERSION || exit 1 chown -R root:root . diff --git a/source/l/expat/slack-desc b/source/l/expat/slack-desc index f25823173..114a13754 100644 --- a/source/l/expat/slack-desc +++ b/source/l/expat/slack-desc @@ -12,7 +12,7 @@ expat: This is Expat, a C library for parsing XML, written by James Clark. expat: Expat is a stream-oriented XML parser used by Python, GNOME, Xft2, expat: and other things. expat: -expat: +expat: Homepage: https://libexpat.github.io expat: expat: expat: diff --git a/source/n/ntp/ntp.SlackBuild b/source/n/ntp/ntp.SlackBuild index b22410a1c..66e472d20 100755 --- a/source/n/ntp/ntp.SlackBuild +++ b/source/n/ntp/ntp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ntp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url index ab8fd5143..86b7a373d 100644 --- a/source/n/samba/samba.url +++ b/source/n/samba/samba.url @@ -1,2 +1,2 @@ -https://download.samba.org/pub/samba/stable/samba-4.8.2.tar.gz -https://download.samba.org/pub/samba/stable/samba-4.8.2.tar.asc +https://download.samba.org/pub/samba/stable/samba-4.8.4.tar.gz +https://download.samba.org/pub/samba/stable/samba-4.8.4.tar.asc diff --git a/source/x/x11/configure/xf86-video-v4l b/source/x/x11/configure/xf86-video-v4l deleted file mode 100644 index 291eb9b94..000000000 --- a/source/x/x11/configure/xf86-video-v4l +++ /dev/null @@ -1,13 +0,0 @@ -CFLAGS=$SLKCFLAGS \ -CXXFLAGS=$SLKCFLAGS \ -./autogen.sh \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ - --with-udev-rules-dir=/lib/udev/rules.d \ - --disable-static \ - --build=$ARCH-slackware-linux diff --git a/source/x/x11/patch/xf86-video-v4l.patch b/source/x/x11/patch/xf86-video-v4l.patch deleted file mode 100644 index a90d8ce2f..000000000 --- a/source/x/x11/patch/xf86-video-v4l.patch +++ /dev/null @@ -1,2 +0,0 @@ -zcat $CWD/patch/xf86-video-v4l/xf86-video-v4l-0.2.0-build-fix.patch.gz \ - | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xf86-video-v4l/xf86-video-v4l-0.2.0-build-fix.patch b/source/x/x11/patch/xf86-video-v4l/xf86-video-v4l-0.2.0-build-fix.patch deleted file mode 100644 index febba2c68..000000000 --- a/source/x/x11/patch/xf86-video-v4l/xf86-video-v4l-0.2.0-build-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up xf86-video-v4l-0.2.0/src/v4l.c~ xf86-video-v4l-0.2.0/src/v4l.c ---- xf86-video-v4l-0.2.0/src/v4l.c~ 2015-02-11 17:42:55.000000000 +0100 -+++ xf86-video-v4l-0.2.0/src/v4l.c 2015-02-11 17:44:33.432706357 +0100 -@@ -42,6 +42,10 @@ - # define DEBUG(x) - #endif - -+#ifndef VIDEO_INVERT_CLIPLIST -+#define VIDEO_INVERT_CLIPLIST 0x00000002 -+#endif -+ - /***************************************************************************/ - - static void V4LIdentify(int flags); |