diff options
Diffstat (limited to 'source')
33 files changed, 307 insertions, 223 deletions
diff --git a/source/a/FTBFSlog b/source/a/FTBFSlog index 77094315b..46b928237 100644 --- a/source/a/FTBFSlog +++ b/source/a/FTBFSlog @@ -1,3 +1,7 @@ +Tue Jun 26 09:45:32 UTC 2018 + grub: fix FTBFS with gcc8 by patching to fix this warning: + alignment 1 of struct efi_variable is less than 8 [-Werror=packed-not-aligned] ++--------------------------+ Tue Mar 13 18:42:23 UTC 2018 btrfs-progs: patched to build with latest e2fsprogs. Thanks to nobodino. +--------------------------+ diff --git a/source/a/grub/0198-align-struct-efi_variable-better.patch b/source/a/grub/0198-align-struct-efi_variable-better.patch new file mode 100644 index 000000000..8ce8bdc82 --- /dev/null +++ b/source/a/grub/0198-align-struct-efi_variable-better.patch @@ -0,0 +1,36 @@ +From 2485633ada06c11c07a34a696a92b14e58f1e846 Mon Sep 17 00:00:00 2001 +From: Peter Jones <pjones@redhat.com> +Date: Tue, 27 Feb 2018 13:55:35 -0500 +Subject: [PATCH 198/250] align struct efi_variable better... + +--- + include/grub/efiemu/runtime.h | 2 +- + include/grub/types.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h +index 9b6b729f4cc..856774a7c34 100644 +--- a/include/grub/efiemu/runtime.h ++++ b/include/grub/efiemu/runtime.h +@@ -33,5 +33,5 @@ struct efi_variable + grub_uint32_t namelen; + grub_uint32_t size; + grub_efi_uint32_t attributes; +-} GRUB_PACKED; ++} GRUB_PACKED GRUB_ALIGNED(8); + #endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */ +diff --git a/include/grub/types.h b/include/grub/types.h +index b93e4820194..f6a9723971d 100644 +--- a/include/grub/types.h ++++ b/include/grub/types.h +@@ -29,6 +29,7 @@ + #else + #define GRUB_PACKED __attribute__ ((packed)) + #endif ++#define GRUB_ALIGNED(x) __attribute__((aligned (x))) + + #ifdef GRUB_BUILD + # define GRUB_CPU_SIZEOF_VOID_P BUILD_SIZEOF_VOID_P +-- +2.14.3 + diff --git a/source/a/grub/grub.SlackBuild b/source/a/grub/grub.SlackBuild index 5bd18cdb7..26b8e51e6 100755 --- a/source/a/grub/grub.SlackBuild +++ b/source/a/grub/grub.SlackBuild @@ -109,6 +109,9 @@ zcat $CWD/grub.dejavusansmono.gfxterm.font.diff.gz | patch -p1 --verbose || exit # Fix security issue when reading username and password: zcat $CWD/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch.gz | patch -p1 --verbose || exit 1 +# Fix alignment error with gcc8: +zcat $CWD/0198-align-struct-efi_variable-better.patch.gz | patch -p1 --verbose || exit 1 + build_grub() { EFI_DO="$*" # Configure: diff --git a/source/ap/sox/slack-desc b/source/ap/sox/slack-desc index 940a5422b..62a308027 100644 --- a/source/ap/sox/slack-desc +++ b/source/ap/sox/slack-desc @@ -12,8 +12,8 @@ sox: Sox is a universal sound converter, player, and recorder. It can sox: play, record, and convert between several sound file formats such as sox: .au, .snd, .voc and .wav. sox: +sox: Homepage: http://sox.sourceforge.net/ sox: sox: sox: -sox: Homepage: http://sox.sourceforge.net/ sox: diff --git a/source/ap/sox/sox.SlackBuild b/source/ap/sox/sox.SlackBuild index b666d426f..757f6d93c 100755 --- a/source/ap/sox/sox.SlackBuild +++ b/source/ap/sox/sox.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sox VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/FTBFSlog b/source/d/FTBFSlog index 3b50d8fda..256491d25 100644 --- a/source/d/FTBFSlog +++ b/source/d/FTBFSlog @@ -1,3 +1,6 @@ +Tue Jun 26 09:44:11 UTC 2018 + nasm: remove invalid pure_func qualifiers to fix gcc8 build ++--------------------------+ Thu Mar 29 18:14:22 UTC 2018 doxygen: build fixed with update to flex. Thanks to nobodino. +--------------------------+ diff --git a/source/d/gcc/fetch-from-svn-and-prep-tarball.sh b/source/d/gcc/fetch-from-svn-and-prep-tarball.sh new file mode 100755 index 000000000..b38c2fc0c --- /dev/null +++ b/source/d/gcc/fetch-from-svn-and-prep-tarball.sh @@ -0,0 +1,83 @@ +#!/bin/sh +# Copyright 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# +# Parts of this script are based on the gcc_release script by +# Jeffrey Law, Bernd Schmidt, Mark Mitchell. +# Copyright (c) 2001-2015 Free Software Foundation. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +BRANCH=${BRANCH:-gcc-8-branch} + +rm -rf tmp-fetch +mkdir tmp-fetch +cd tmp-fetch +# Not sure why, but this emits a different revision when the fetch is done than +# what's returned by "svn log -r COMMITTED". We'll trust the latter. +svn co svn://gcc.gnu.org/svn/gcc/branches/${BRANCH} gcc +cd gcc +echo "Generating LAST_UPDATED..." +svn log -r COMMITTED > LAST_UPDATED.raw +REVISION="$(cat LAST_UPDATED.raw | head -n 2 | tail -n 1 | cut -f 1 -d ' ' | cut -f 2 -d r)" +DATE="$(date -d "$(cat LAST_UPDATED.raw | head -n 2 | tail -n 1 | cut -f 3 -d '|' | cut -f 1 -d '(')" "+%Y%m%d")" +echo "Obtained from SVN: branches/${BRANCH} revision ${REVISION}" > LAST_UPDATED +cat LAST_UPDATED.raw >> LAST_UPDATED +rm LAST_UPDATED.raw +# Remove the .svn data (not packaged): +rm -r .svn +# Get the version number: +VERSION=$(cat gcc/BASE-VER) +# Rename the directory: +cd .. +GCCDIR="gcc-${VERSION}_${DATE}_r${REVISION}" +mv gcc $GCCDIR +cd $GCCDIR +# Now we need to generate some documentation files that would normally be +# created during the GCC release process: +echo "Generating INSTALL/ documentation..." +SOURCEDIR=gcc/doc \ +DESTDIR=INSTALL \ +gcc/doc/install.texi2html 1> /dev/null 2> /dev/null +echo "Generating NEWS..." +contrib/gennews > NEWS +# Create a "MD5SUMS" file to use for checking the validity of the release. +echo "Generating MD5SUMS..." +echo \ +"# This file contains the MD5 checksums of the files in the +# "${GCCDIR}".tar.lz tarball. +# +# Besides verifying that all files in the tarball were correctly expanded, +# it also can be used to determine if any files have changed since the +# tarball was expanded or to verify that a patchfile was correctly applied. +# +# Suggested usage: +# md5sum -c MD5SUMS | grep -v \"OK$\" +#" > MD5SUMS +find . -type f | +sed -e 's:^\./::' -e '/MD5SUMS/d' | +sort | +xargs md5sum >>MD5SUMS +cd .. +# Tar it up: +echo "Creating ${GCCDIR}.tar..." +tar cf ${GCCDIR}.tar ${GCCDIR} +# Compress with (p)lzip: +echo "Compressing ${GCCDIR}.tar.lz..." +plzip -9 ${GCCDIR}.tar +# Move the new archive up a directory: +mv ${GCCDIR}.tar.lz .. +# Move up a directory and then delete the cruft: +cd .. +rm -r tmp-fetch +echo "Done." diff --git a/source/d/gcc/gcc-no_fixincludes.diff b/source/d/gcc/gcc-no_fixincludes.diff index 52b661613..e152e0821 100644 --- a/source/d/gcc/gcc-no_fixincludes.diff +++ b/source/d/gcc/gcc-no_fixincludes.diff @@ -1,6 +1,6 @@ ---- ./gcc/Makefile.in.orig 2010-04-02 02:49:06.000000000 -0500 -+++ ./gcc/Makefile.in 2010-08-01 16:55:30.088318841 -0500 -@@ -3864,9 +3864,9 @@ +--- ./gcc/Makefile.in.orig 2018-03-09 09:24:44.000000000 -0600 ++++ ./gcc/Makefile.in 2018-05-02 12:25:43.958002771 -0500 +@@ -3004,9 +3004,9 @@ chmod a+r $${fix_dir}/limits.h; \ done # Install the README @@ -13,14 +13,14 @@ $(STAMP) $@ .PHONY: install-gcc-tooldir -@@ -3947,10 +3947,7 @@ +@@ -3087,10 +3087,7 @@ (TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \ SHELL='$(SHELL)'; MACRO_LIST=`${PWD_COMMAND}`/macro_list ; \ gcc_dir=`${PWD_COMMAND}` ; \ - export TARGET_MACHINE srcdir SHELL MACRO_LIST && \ - cd $(build_objdir)/fixincludes && \ - $(SHELL) ./fixinc.sh "$${gcc_dir}/$${fix_dir}" \ -- $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \ +- $(BUILD_SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \ + export TARGET_MACHINE srcdir SHELL MACRO_LIST ); \ rm -f $${fix_dir}/syslimits.h; \ if [ -f $${fix_dir}/limits.h ]; then \ diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild index f16f923cd..2981291e2 100755 --- a/source/d/gcc/gcc.SlackBuild +++ b/source/d/gcc/gcc.SlackBuild @@ -55,8 +55,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gcc -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +SRCVER=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=$(echo $SRCVER | cut -f 1 -d _) +BUILD=${BUILD:-1} # How many jobs to run in parallel: NUMJOBS=" -j 7 " @@ -128,6 +129,11 @@ esac # Temporary build location: TMP=${TMP:-/tmp} +# Extract the source code: +cd $TMP +rm -rf gcc-$SRCVER +tar xvf $CWD/gcc-$SRCVER.tar.?z || exit 1 + # This is the main DESTDIR target: PKG1=$TMP/package-gcc # These are the directories to build other packages in: @@ -155,11 +161,7 @@ cat $CWD/slack-desc.gcc-objc > $PKG6/install/slack-desc cat $CWD/slack-desc.gcc-go > $PKG8/install/slack-desc cat $CWD/slack-desc.gcc-brig > $PKG9/install/slack-desc -cd $TMP -rm -rf gcc-$VERSION -tar xvf $CWD/gcc-$VERSION.tar.xz || exit 1 - -( cd gcc-$VERSION || exit 1 +( cd gcc-$SRCVER || exit 1 # Smite the fixincludes: zcat $CWD/gcc-no_fixincludes.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 @@ -187,7 +189,7 @@ tar xvf $CWD/gcc-$VERSION.tar.xz || exit 1 fi if [ -r NEWS ]; then DOCSDIR=$(echo $PKG1/usr/doc/gcc-$VERSION) - cat NEWS | head -n 1000 > $DOCSDIR/NEWS + cat NEWS | head -n 1500 > $DOCSDIR/NEWS touch -r NEWS $DOCSDIR/NEWS fi @@ -317,7 +319,7 @@ tar xvf $CWD/gcc-$VERSION.tar.xz || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ - ../gcc-$VERSION/configure --prefix=/usr \ + ../gcc-$SRCVER/configure --prefix=/usr \ --libdir=/usr/lib$LIBDIRSUFFIX \ --mandir=/usr/man \ --infodir=/usr/info \ @@ -330,11 +332,15 @@ tar xvf $CWD/gcc-$VERSION.tar.xz || exit 1 --with-system-zlib \ --enable-libstdcxx-dual-abi \ --with-default-libstdcxx-abi=new \ + --disable-libstdcxx-pch \ --disable-libunwind-exceptions \ --enable-__cxa_atexit \ - --enable-libssp \ + --disable-libssp \ + --enable-gnu-unique-object \ + --enable-plugin \ --enable-lto \ --disable-install-libiberty \ + --disable-werror \ --with-gnu-ld \ --verbose \ --with-arch-directory=$LIB_ARCH \ @@ -570,6 +576,8 @@ rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la mv $PKG1/usr/lib${LIBDIRSUFFIX}/libhsail* usr/lib${LIBDIRSUFFIX} mkdir -p usr/libexec/gcc/$TARGET/$VERSION mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/brig1 usr/libexec/gcc/$TARGET/$VERSION + mkdir -p usr/man/man1 + mv $PKG1/usr/man/man1/gccbrig.1.gz usr/man/man1 ) # Generate packages: diff --git a/source/d/gcc/slack-desc.gcc b/source/d/gcc/slack-desc.gcc index 1c00df83a..ebe1b8422 100644 --- a/source/d/gcc/slack-desc.gcc +++ b/source/d/gcc/slack-desc.gcc @@ -12,7 +12,7 @@ gcc: GCC is the GNU Compiler Collection. gcc: gcc: This package contains those parts of the compiler collection needed to gcc: compile C code. Other packages add Ada, C++, Fortran, Go, -gcc: Objective-C, and Java support to the compiler core. +gcc: Objective-C, and BRIG support to the compiler core. gcc: gcc: gcc: diff --git a/source/d/gcc/slack-desc.gcc-g++ b/source/d/gcc/slack-desc.gcc-g++ index fa9b4f1ca..6beaf21b1 100644 --- a/source/d/gcc/slack-desc.gcc-g++ +++ b/source/d/gcc/slack-desc.gcc-g++ @@ -11,7 +11,7 @@ gcc-g++: gcc-g++: C++ support for the GNU Compiler Collection. gcc-g++: gcc-g++: This package contains those parts of the compiler collection needed to -gcc-g++: compile C++ code. The base gcc package is also required. +gcc-g++: compile C++ code. gcc-g++: gcc-g++: gcc-g++: diff --git a/source/d/gcc/slack-desc.gcc-gfortran b/source/d/gcc/slack-desc.gcc-gfortran index 111dcb1f7..6d08f0125 100644 --- a/source/d/gcc/slack-desc.gcc-gfortran +++ b/source/d/gcc/slack-desc.gcc-gfortran @@ -15,5 +15,5 @@ gcc-gfortran: GNU Fortran also contains many standard and extensions and can be gcc-gfortran: used to run real-world programs. gcc-gfortran: gcc-gfortran: This package contains those parts of the compiler collection -gcc-gfortran: needed to compile Fortran code. The gcc package is also required. +gcc-gfortran: needed to compile Fortran code. gcc-gfortran: diff --git a/source/d/gcc/slack-desc.gcc-gnat b/source/d/gcc/slack-desc.gcc-gnat index 8ffa7ac04..9c1eb7714 100644 --- a/source/d/gcc/slack-desc.gcc-gnat +++ b/source/d/gcc/slack-desc.gcc-gnat @@ -13,7 +13,7 @@ gcc-gnat: gcc-gnat: This package contains those parts of the compiler collection needed to gcc-gnat: compile Ada code. GNAT implements Ada 95, Ada 2005 and Ada 2012, and gcc-gnat: it may also be invoked in Ada 83 compatibility mode. By default, GNAT -gcc-gnat: assumes Ada 2012. The base gcc package is also required. +gcc-gnat: assumes Ada 2012. gcc-gnat: gcc-gnat: gcc-gnat: diff --git a/source/d/gcc/slack-desc.gcc-objc b/source/d/gcc/slack-desc.gcc-objc index 174418434..6cf5a3170 100644 --- a/source/d/gcc/slack-desc.gcc-objc +++ b/source/d/gcc/slack-desc.gcc-objc @@ -15,5 +15,5 @@ gcc-objc: compile code written in Objective-C. Objective-C was originally gcc-objc: developed to add object-oriented extensions to the C language, and is gcc-objc: best known as the native language of the NeXT computer. gcc-objc: -gcc-objc: The base gcc package is also required. +gcc-objc: gcc-objc: diff --git a/source/d/libtool/libtool.SlackBuild b/source/d/libtool/libtool.SlackBuild index 0d77480eb..87ec0530c 100755 --- a/source/d/libtool/libtool.SlackBuild +++ b/source/d/libtool/libtool.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libtool VERSION=${VERSION:-$(echo libtool-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-7} +BUILD=${BUILD:-8} NUMJOBS=${NUMJOBS:--j6} diff --git a/source/d/nasm/0001-Remove-invalid-pure_func-qualifiers.patch b/source/d/nasm/0001-Remove-invalid-pure_func-qualifiers.patch new file mode 100644 index 000000000..87ec601c2 --- /dev/null +++ b/source/d/nasm/0001-Remove-invalid-pure_func-qualifiers.patch @@ -0,0 +1,27 @@ +From d0dabb46a821b2506681f882af0d5696d2c2bade Mon Sep 17 00:00:00 2001 +From: Michael Simacek <msimacek@redhat.com> +Date: Thu, 8 Feb 2018 14:47:08 +0100 +Subject: [PATCH] Remove invalid pure_func qualifiers + +--- + include/nasmlib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/nasmlib.h b/include/nasmlib.h +index 79e866b..c93cef0 100644 +--- a/include/nasmlib.h ++++ b/include/nasmlib.h +@@ -191,8 +191,8 @@ int64_t readstrnum(char *str, int length, bool *warn); + * seg_init: Initialise the segment-number allocator. + * seg_alloc: allocate a hitherto unused segment number. + */ +-void pure_func seg_init(void); +-int32_t pure_func seg_alloc(void); ++void seg_init(void); ++int32_t seg_alloc(void); + + /* + * many output formats will be able to make use of this: a standard +-- +2.14.3 + diff --git a/source/d/nasm/nasm.SlackBuild b/source/d/nasm/nasm.SlackBuild index f52d2aa53..458cabb8a 100755 --- a/source/d/nasm/nasm.SlackBuild +++ b/source/d/nasm/nasm.SlackBuild @@ -59,6 +59,10 @@ cd $TMP rm -rf nasm-$VERSION tar xvf $CWD/nasm-$VERSION.tar.?z* || exit 1 cd nasm-$VERSION || exit 1 + +# Fix FTBFS with gcc8: +zcat $CWD/0001-Remove-invalid-pure_func-qualifiers.patch.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/k/kernel-configs/config-generic-4.14.51 b/source/k/kernel-configs/config-generic-4.14.52 index f15bff360..951393aef 100644 --- a/source/k/kernel-configs/config-generic-4.14.51 +++ b/source/k/kernel-configs/config-generic-4.14.52 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.51 Kernel Configuration +# Linux/x86 4.14.52 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/source/k/kernel-configs/config-generic-4.14.51.x64 b/source/k/kernel-configs/config-generic-4.14.52.x64 index 1633b9294..031687209 100644 --- a/source/k/kernel-configs/config-generic-4.14.51.x64 +++ b/source/k/kernel-configs/config-generic-4.14.52.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.51 Kernel Configuration +# Linux/x86 4.14.52 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/source/k/kernel-configs/config-generic-smp-4.14.51-smp b/source/k/kernel-configs/config-generic-smp-4.14.52-smp index c9963b1fa..f5ce028a2 100644 --- a/source/k/kernel-configs/config-generic-smp-4.14.51-smp +++ b/source/k/kernel-configs/config-generic-smp-4.14.52-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.51 Kernel Configuration +# Linux/x86 4.14.52 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/source/k/kernel-configs/config-huge-4.14.51 b/source/k/kernel-configs/config-huge-4.14.52 index b94767f0f..6e2a36a81 100644 --- a/source/k/kernel-configs/config-huge-4.14.51 +++ b/source/k/kernel-configs/config-huge-4.14.52 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.51 Kernel Configuration +# Linux/x86 4.14.52 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/source/k/kernel-configs/config-huge-4.14.51.x64 b/source/k/kernel-configs/config-huge-4.14.52.x64 index 824ec9a84..2fcdddbde 100644 --- a/source/k/kernel-configs/config-huge-4.14.51.x64 +++ b/source/k/kernel-configs/config-huge-4.14.52.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.51 Kernel Configuration +# Linux/x86 4.14.52 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/source/k/kernel-configs/config-huge-smp-4.14.51-smp b/source/k/kernel-configs/config-huge-smp-4.14.52-smp index 1f8ad808c..3d949517a 100644 --- a/source/k/kernel-configs/config-huge-smp-4.14.51-smp +++ b/source/k/kernel-configs/config-huge-smp-4.14.52-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.51 Kernel Configuration +# Linux/x86 4.14.52 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog index f18c27b50..a256e66d4 100644 --- a/source/l/FTBFSlog +++ b/source/l/FTBFSlog @@ -1,3 +1,8 @@ +Tue Jun 26 09:10:33 UTC 2018 + db48: Fix symbol collision in atomic.h with gcc8 + glibc: fix FTBFS with gcc8 by adding --disable-werror + libodfgen: fix FTBFS with gcc8 by adding --disable-werror ++--------------------------+ Mon Apr 9 17:01:51 UTC 2018 db48: patch docs install out of Makefile, as it's causing a build failure and they would just be deleted before packaging anyway. diff --git a/source/l/db48/db.rename.atomic_compare_exchange.diff b/source/l/db48/db.rename.atomic_compare_exchange.diff new file mode 100644 index 000000000..36647c7d3 --- /dev/null +++ b/source/l/db48/db.rename.atomic_compare_exchange.diff @@ -0,0 +1,20 @@ +--- ./dbinc/atomic.h.orig 2010-04-12 15:25:22.000000000 -0500 ++++ ./dbinc/atomic.h 2018-06-26 04:32:46.092853113 -0500 +@@ -144,7 +144,7 @@ + #define atomic_inc(env, p) __atomic_inc(p) + #define atomic_dec(env, p) __atomic_dec(p) + #define atomic_compare_exchange(env, p, o, n) \ +- __atomic_compare_exchange((p), (o), (n)) ++ __db_atomic_compare_exchange((p), (o), (n)) + static inline int __atomic_inc(db_atomic_t *p) + { + int temp; +@@ -176,7 +176,7 @@ + * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html + * which configure could be changed to use. + */ +-static inline int __atomic_compare_exchange( ++static inline int __db_atomic_compare_exchange( + db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) + { + atomic_value_t was; diff --git a/source/l/db48/db48.SlackBuild b/source/l/db48/db48.SlackBuild index 3b3ce45ae..4d3060233 100755 --- a/source/l/db48/db48.SlackBuild +++ b/source/l/db48/db48.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=db48 VERSION=4.8.30 -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:--j7} @@ -77,6 +77,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix symbol collision with gcc8: +zcat $CWD/db.rename.atomic_compare_exchange.diff.gz | patch -p1 --verbose || exit 1 + # We aren't installing the docs anyway so let's not let them break the build: zcat $CWD/db48.no.broken.doc.install.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild index 0623cd5ce..acaadbeae 100755 --- a/source/l/glibc/glibc.SlackBuild +++ b/source/l/glibc/glibc.SlackBuild @@ -54,6 +54,13 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +# Work around -Werror failure with gcc8: +if gcc --version | grep -wq 8.1.1 ; then + if [ "$VERSION" = "2.27" ]; then + WERROR="--disable-werror" + fi +fi + # I'll break this out as an option for fun :-) case $ARCH in i386) @@ -226,6 +233,7 @@ CFLAGS="-g $OPTIMIZ" \ --enable-obsolete-rpc \ --enable-profile \ $DISABLE_NSCD \ + $WERROR \ --infodir=/usr/info \ --mandir=/usr/man \ --with-tls \ diff --git a/source/l/libodfgen/libodfgen.SlackBuild b/source/l/libodfgen/libodfgen.SlackBuild index 2ff89c721..24333dab9 100755 --- a/source/l/libodfgen/libodfgen.SlackBuild +++ b/source/l/libodfgen/libodfgen.SlackBuild @@ -96,7 +96,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ --disable-static \ - --disable-tests \ + --disable-werror \ --build=$TARGET || exit 1 make $NUMJOBS || make || exit 1 diff --git a/source/n/netatalk/afppasswd b/source/n/netatalk/afppasswd deleted file mode 100644 index e69de29bb..000000000 --- a/source/n/netatalk/afppasswd +++ /dev/null diff --git a/source/n/netatalk/doinst.sh b/source/n/netatalk/doinst.sh index 18ce52e2f..939e530ff 100644 --- a/source/n/netatalk/doinst.sh +++ b/source/n/netatalk/doinst.sh @@ -19,13 +19,6 @@ fi config etc/rc.d/rc.atalk.new -config etc/netatalk/AppleVolumes.default.new -config etc/netatalk/AppleVolumes.system.new -config etc/netatalk/afp_ldap.conf.new -config etc/netatalk/afpd.conf.new -config etc/netatalk/afppasswd.new -config etc/netatalk/atalkd.conf.new -config etc/netatalk/netatalk.conf.new -config etc/netatalk/papd.conf.new -# Don't need an empty file: -rm -f etc/netatalk/afppasswd.new +config etc/netatalk/afp.conf.new +config etc/netatalk/dbus-session.conf.new +config etc/netatalk/extmap.conf.new diff --git a/source/n/netatalk/netatalk.SlackBuild b/source/n/netatalk/netatalk.SlackBuild index 8a8858016..679cdb76e 100755 --- a/source/n/netatalk/netatalk.SlackBuild +++ b/source/n/netatalk/netatalk.SlackBuild @@ -19,12 +19,14 @@ # 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. +# +# Script updated to package netatalk 3.1.11 by Matthew Schumacher cd $(dirname $0) ; CWD=$(pwd) PKGNAM=netatalk VERSION=${VERSION:-$(echo netatalk-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-7} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -76,42 +78,44 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fixup some paths in etc2ps.sh -zcat $CWD/netatalk.etc2ps.diff.gz | patch -p1 || exit 1 - -autoreconf -vif +# use the system libevent, because the internal one won't compile +# with openssl 1.1. Also skip pam and kerberos (for now). CFLAGS="$SLKCFLAGS" \ -CPPFLAGS="-D_IPP_PRIVATE_STRUCTURES" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ - --sysconfdir=/etc \ + --sysconfdir=/etc/netatalk \ --libexecdir=/usr/sbin \ --localstatedir=/var \ --disable-static \ --with-shadow \ - --enable-ddp \ + --disable-static \ + --with-libevent=system \ + --with-dbus-sysconf-dir=/etc/dbus-1/system.d/ \ + --with-dbus-daemon=/usr/bin/dbus-daemon \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# At least make this unreadable to non-root users: +if [ -u $PKG/usr/bin/afppasswd ]; then + chmod 4711 $PKG/usr/bin/afppasswd +fi + # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -gzip -9 $PKG/usr/man/man?/* - -# This is normally installed setuid root, but I'm not 100% sure I trust it yet. -# I see it uses strcpy() in a few places... -chmod 755 $PKG/usr/bin/afppasswd - -# Install the afppasswd config file -mkdir -p $PKG/etc/netatalk -cat $CWD/afppasswd > $PKG/etc/netatalk/afppasswd +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done # Install an init script mkdir -p $PKG/etc/rc.d @@ -123,28 +127,18 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc ( cd $PKG/etc/netatalk - for file in AppleVolumes.default AppleVolumes.system afpd.conf afp_ldap.conf afppasswd atalkd.conf netatalk.conf papd.conf ; do + for file in afp.conf dbus-session.conf extmap.conf ; do mv $file ${file}.new done ) mkdir -p $PKG/usr/doc/netatalk-$VERSION cp -a \ - CONTRIBUTORS COPYING COPYRIGHT NEWS README TODO VERSION doc/* \ + AUTHORS CONTRIBUTORS COPYING* COPYRIGHT NEWS VERSION \ $PKG/usr/doc/netatalk-$VERSION -# -1, Redundant -rm -rf $PKG/usr/doc/netatalk-$VERSION/doc/Makefile* \ - $PKG/usr/doc/netatalk-$VERSION/doc/htmldocs \ - $PKG/usr/doc/netatalk-$VERSION/doc/*.pdf - -# "make install" creates this directory with chmod 0777 -# I'd rather use 755, but I'll assume since this is a -# new directory that it is needed for something. This -# will help it a bit anyway... -chmod 1777 $PKG/var/spool/netatalk -# If anyone can confirm that 755 would still work let me know. +cp -a $CWD/examples $PKG/usr/doc/netatalk-$VERSION +chown -R root:root $PKG/usr/doc/netatalk-$VERSION/examples # Build the package: cd $PKG /sbin/makepkg -l y -c n $TMP/netatalk-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/n/netatalk/netatalk.etc2ps.diff b/source/n/netatalk/netatalk.etc2ps.diff deleted file mode 100644 index f326415a7..000000000 --- a/source/n/netatalk/netatalk.etc2ps.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- ./etc/psf/etc2ps.sh.orig 2004-10-26 20:28:38.000000000 -0700 -+++ ./etc/psf/etc2ps.sh 2004-10-28 11:43:19.000000000 -0700 -@@ -9,14 +9,14 @@ - # tag in the case. - # - --DVIPSPATH=/usr/local/tex/bin --DVIPS=/usr/local/tex/bin/dvips -+DVIPSPATH=/usr/share/texmf/bin -+DVIPS=/usr/share/texmf/bin/dvips - DVIPSARGS="-f -q" - - TROFF2PS=/usr/local/psroff/troff2/troff2ps - TROFF2PSARGS="-Z -O-.10" - --PATH=/usr/bin:$DVIPSPATH; export PATH -+PATH=$PATH:$DVIPSPATH; export PATH - - case $1 in - diff --git a/source/n/netatalk/rc.atalk.new b/source/n/netatalk/rc.atalk.new index 9cb17f009..bc079b580 100644 --- a/source/n/netatalk/rc.atalk.new +++ b/source/n/netatalk/rc.atalk.new @@ -1,145 +1,58 @@ -#! /bin/sh -# -# Start/stop the Netatalk daemons. -# -# Netatalk daemons. -# If you use AppleTalk, Make sure not to start atalkd in the background: -# its data structures must have time to stablize before running the -# other processes. -# +#!/bin/sh +# Start/stop/restart the netatalk daemon. -# -# kill the named process(es) -# -killproc() { - pid=`/usr/bin/ps -e | - /usr/bin/grep $1 | - /usr/bin/sed -e 's/^ *//' -e 's/ .*//'` - [ "$pid" != "" ] && kill $pid -} - -# netatalk.conf expects hostname in $HOSTNAME by default -HOSTNAME=`hostname` - -. /etc/netatalk/netatalk.conf - - -# -# Start the netatalk server processes. -# - -atalk_startup() { - echo -n 'starting netatalk daemons: ' - if [ x"${ATALKD_RUN}" != x"no" ]; then - if [ -x /usr/sbin/atalkd ]; then - /usr/sbin/atalkd; echo -n ' atalkd' - fi - - if [ -x /usr/bin/nbprgstr ]; then - /usr/bin/nbprgstr -p 4 "${ATALK_NAME}:Workstation${ATALK_ZONE}"; - /usr/bin/nbprgstr -p 4 "${ATALK_NAME}:netatalk${ATALK_ZONE}"; - echo -n ' nbprgstr' - fi +netatalk_start() { + if [ -x /usr/sbin/netatalk ]; then - if [ x"${PAPD_RUN}" = x"yes" -a -x /usr/sbin/papd ]; then - /usr/sbin/papd; echo -n ' papd' - fi + LINES="$(grep "^[^;]" /etc/netatalk/afp.conf | wc -l)" + if [ "$LINES" -lt "2" ]; then + echo "netatalk is not configured.... exiting." + exit + fi - if [ x"${TIMELORD_RUN}" = x"yes" -a -x /usr/sbin/timelord ]; then - /usr/sbin/timelord; echo -n ' timelord' - fi - fi - - if [ x"${CNID_METAD_RUN}" = x"yes" -a -x /usr/sbin/cnid_metad ]; then - /usr/sbin/cnid_metad $CNID_CONFIG - echo -n ' cnid_metad' - fi - - if [ x"${AFPD_RUN}" = x"yes" -a -x /usr/sbin/afpd ]; then - /usr/sbin/afpd ${AFPD_UAMLIST} -g ${AFPD_GUEST} \ - -c ${AFPD_MAX_CLIENTS} -n "${ATALK_NAME}${ATALK_ZONE}"; echo -n ' afpd' - fi - - echo '.' + echo "Starting netatalk: /usr/sbin/netatalk" + /usr/sbin/netatalk + fi } -atalk_shutdown() { - echo -n 'stopping netatalk daemons:' - - if [ -x /usr/sbin/papd ]; then - killproc papd; echo -n ' papd' - fi - - if [ -x /usr/sbin/afpd ]; then - killproc afpd; echo -n ' afpd' - fi - - if [ -x /usr/sbin/cnid_metad ]; then - killproc cnid_met; echo -n ' cnid_metad' - fi +# Stop netatalk +netatalk_stop() { + echo "Stopping netatalk." + /usr/bin/pkill --ns $$ -f "^/usr/sbin/netatalk" 2> /dev/null +} - if [ -x /usr/sbin/timelord ]; then - killproc timelord; echo -n ' timelord' - fi +# Restart netatalk +netatalk_restart() { + netatalk_stop + sleep 1 + netatalk_start +} - # kill atalkd last, since without it the plumbing goes away. - if [ -x /usr/sbin/atalkd ]; then - killproc atalkd; echo -n ' atalkd' - fi - echo '.' +# Check if netatalk is running +netatalk_status() { + PID="$(/usr/bin/pgrep --ns $$ -f "^/usr/sbin/netatalk" 2> dev/null) + if [ $PID ]; then + echo "netatalk is running. PID: $PID" + else + echo "netatalk is stopped." + exit 1 + fi } -case "$1" in +case "$1" in 'start') - if [ x"${ATALK_BGROUND}" = x"yes" ]; then - echo -n "Starting netatalk in the background ... " - atalk_startup > /dev/null & - else - atalk_startup - fi - ;; - -# -# Stop the netatalk server processes. -# + netatalk_start + ;; 'stop') - - echo -n 'stopping netatalk daemons:' - - if [ -x /usr/sbin/papd ]; then - killproc papd; echo -n ' papd' - fi - - if [ -x /usr/sbin/afpd ]; then - killproc afpd; echo -n ' afpd' - fi - - if [ -x /usr/sbin/cnid_metad ]; then - killproc cnid_met; echo -n ' cnid_metad' - fi - - if [ -x /usr/sbin/timelord ]; then - killproc timelord; echo -n ' timelord' - fi - - # kill atalkd last, since without it the plumbing goes away. - if [ -x /usr/sbin/atalkd ]; then - killproc atalkd; echo -n ' atalkd' - fi - - echo '.' - ;; - + netatalk_stop + ;; 'restart') -atalk_shutdown -atalk_startup - ;; -# -# Usage statement. -# - + netatalk_restart + ;; +'status') + netatalk_status + ;; *) - echo "usage: $0 {start|stop|restart}" - exit 1 - ;; + echo "usage $0 start|stop|restart|status" esac + |