From 48e09f463d219d8975a3fb82f2d7d52a88472a9f Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 21 Sep 2018 18:51:07 +0000 Subject: Fri Sep 21 18:51:07 UTC 2018 a/eudev-3.2.6-x86_64-1.txz: Upgraded. a/glibc-solibs-2.28-x86_64-2.txz: Upgraded. a/grub-2.02-x86_64-3.txz: Rebuilt. Patched to fix compatibility with recent xfsprogs. Thanks to Markus Wiesner. a/kernel-generic-4.14.71-x86_64-1.txz: Upgraded. a/kernel-huge-4.14.71-x86_64-1.txz: Upgraded. a/kernel-modules-4.14.71-x86_64-1.txz: Upgraded. ap/opus-tools-0.2-x86_64-1.txz: Upgraded. ap/sqlite-3.25.1-x86_64-1.txz: Upgraded. d/icecream-20180905_cdc6ff8-x86_64-1.txz: Upgraded. d/kernel-headers-4.14.71-x86-1.txz: Upgraded. d/llvm-7.0.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. k/kernel-source-4.14.71-noarch-1.txz: Upgraded. l/ffmpeg-3.4.4-x86_64-2.txz: Rebuilt. Don't try to link with Samba since the latest version is not compatible. l/glibc-2.28-x86_64-2.txz: Upgraded. All packages have been patched where needed for glibc-2.28 and compile tested here. Thanks to nobodino for the help. l/glibc-i18n-2.28-x86_64-2.txz: Upgraded. l/glibc-profile-2.28-x86_64-2.txz: Upgraded. l/gst-plugins-base-1.14.3-x86_64-1.txz: Upgraded. l/gst-plugins-good-1.14.3-x86_64-1.txz: Upgraded. l/gst-plugins-libav-1.14.3-x86_64-1.txz: Upgraded. l/gstreamer-1.14.3-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_11-x86_64-1.txz: Upgraded. l/libopusenc-0.2-x86_64-1.txz: Added. l/librsvg-2.44.3-x86_64-1.txz: Upgraded. l/opus-1.3_rc2-x86_64-1.txz: Upgraded. l/opusfile-0.11-x86_64-1.txz: Upgraded. l/soprano-2.9.4-x86_64-3.txz: Rebuilt. Recompiled to drop virtuoso dependency. l/virtuoso-ose-6.1.8-x86_64-9.txz: Removed. Even KDE4 has migrated away from actually using this for anything. The last thing in Slackware that was dependent on it was Soprano, which has been recompiled to no longer use it. n/postfix-3.3.1-x86_64-2.txz: Rebuilt. Recompiled so that it quits whining about OpenSSL. Thanks to shastah. x/mesa-18.2.1-x86_64-1.txz: Upgraded. Compiled against llvm-7.0.0. x/xf86-video-vmware-13.3.0-x86_64-2.txz: Rebuilt. Recompiled against llvm-7.0.0. x/xterm-336-x86_64-1.txz: Upgraded. extra/pure-alsa-system/ffmpeg-3.4.4-x86_64-2_alsa.txz: Rebuilt. Don't try to link with Samba since the latest version is not compatible. extra/pure-alsa-system/gst-plugins-good-1.14.3-x86_64-1_alsa.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. --- source/a/reiserfsprogs/reiserfsprogs.SlackBuild | 5 ++++- source/a/reiserfsprogs/reiserfsprogs.glibc228.diff | 24 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 source/a/reiserfsprogs/reiserfsprogs.glibc228.diff (limited to 'source/a/reiserfsprogs') diff --git a/source/a/reiserfsprogs/reiserfsprogs.SlackBuild b/source/a/reiserfsprogs/reiserfsprogs.SlackBuild index 1b88550a..d5e2a93f 100755 --- a/source/a/reiserfsprogs/reiserfsprogs.SlackBuild +++ b/source/a/reiserfsprogs/reiserfsprogs.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-reiserfsprogs @@ -67,6 +67,9 @@ cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 + +zcat $CWD/reiserfsprogs.glibc228.diff.gz | patch -p1 --backup --suffix=.orig || 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/a/reiserfsprogs/reiserfsprogs.glibc228.diff b/source/a/reiserfsprogs/reiserfsprogs.glibc228.diff new file mode 100644 index 00000000..2c611931 --- /dev/null +++ b/source/a/reiserfsprogs/reiserfsprogs.glibc228.diff @@ -0,0 +1,24 @@ +--- ./include/misc.h.orig 2017-07-24 20:34:11.000000000 -0500 ++++ ./include/misc.h 2018-09-18 19:00:40.783069613 -0500 +@@ -73,7 +73,7 @@ + int get_dma_info(dma_info_t *dma_info); + void clean_after_dma_check(int fd, dma_info_t *dma_info); + +-int valid_offset(int fd, loff_t offset); ++int valid_offset(int fd, off_t offset); + unsigned long count_blocks(const char *filename, int blocksize); + + void print_how_far(FILE * fp, unsigned long *passed, unsigned long total, +--- ./include/reiserfs_lib.h.orig 2016-06-07 09:22:56.000000000 -0500 ++++ ./include/reiserfs_lib.h 2018-09-18 19:00:40.786069613 -0500 +@@ -297,8 +297,8 @@ + char *key_of_what(const struct reiserfs_key *key); + int type_unknown(const struct reiserfs_key *key); + void set_type(int format, struct reiserfs_key *key, int type); +-void set_offset(int format, struct reiserfs_key *key, loff_t offset); +-void set_type_and_offset(int format, struct reiserfs_key *key, loff_t offset, ++void set_offset(int format, struct reiserfs_key *key, off_t offset); ++void set_type_and_offset(int format, struct reiserfs_key *key, off_t offset, + int type); + + typedef int (*check_unfm_func_t) (reiserfs_filsys_t , __u32); -- cgit v1.2.3