From 3db41f6c7650f0cff2bb0010c9db60bfb74e6b02 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 19 Jul 2019 18:26:45 +0000 Subject: Fri Jul 19 18:26:45 UTC 2019 a/aaa_elflibs-15.0-x86_64-9.txz: Rebuilt. Upgraded: libbz2.so.1.0.8, libexpat.so.1.6.9, libglib-2.0.so.0.6000.5, libgmodule-2.0.so.0.6000.5, libgobject-2.0.so.0.6000.5, libgthread-2.0.so.0.6000.5, libidn2.so.0.3.6. Removed: libicudata.so.63.1, libicui18n.so.63.1, libicuio.so.63.1, libicutest.so.63.1, libicutu.so.63.1, libicuuc.so.63.1. Added: libpcre2-8.so.0.8.0, libpsl.so.5.3.2. These are needed by wget which is used by slackpkg, so they should be in here. Thanks to OutSiderBR. ap/lxc-2.0.11_fad08f383-x86_64-1.txz: Upgraded. Updated from 2.0 git branch. Ported init script updates from sysvinit-scripts. d/ccache-3.7.2-x86_64-1.txz: Upgraded. l/libsigc++-2.10.2-x86_64-1.txz: Upgraded. n/curl-7.65.3-x86_64-1.txz: Upgraded. This is a bugfix release: Fix a regression that caused the progress meter not to appear. For more information, see: https://curl.haxx.se/changes.html n/iputils-20190709-x86_64-1.txz: Upgraded. --- ChangeLog.rss | 33 +++- ChangeLog.txt | 21 +++ FILELIST.TXT | 136 +++++++------- source/a/aaa_elflibs/aaa_elflibs.SlackBuild | 2 +- source/a/aaa_elflibs/symlinks-to-tracked-libs | 2 + source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp | 6 - source/ap/lxc/scripts/rc.6.lxc | 21 ++- source/ap/lxc/scripts/rc.6.orig | 28 ++- source/ap/lxc/scripts/rc.M.lxc | 65 ++++--- source/ap/lxc/scripts/rc.M.orig | 67 ++++--- source/ap/lxc/scripts/rc.S.lxc | 68 +++---- source/ap/lxc/scripts/rc.S.orig | 68 +++---- source/ap/lxc/scripts/rc.inet1.lxc | 40 ++-- source/ap/lxc/scripts/rc.inet1.orig | 40 ++-- source/l/libsigc++/libsigc++.SlackBuild | 12 +- source/n/iputils/iputils.SlackBuild | 2 +- source/n/iputils/iputils.docbook.revert.diff | 219 +++++++++------------- 17 files changed, 477 insertions(+), 353 deletions(-) diff --git a/ChangeLog.rss b/ChangeLog.rss index 71f0c2fcc..7dc5ccd7f 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,38 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Thu, 18 Jul 2019 20:46:19 GMT - Fri, 19 Jul 2019 06:59:44 GMT + Fri, 19 Jul 2019 18:26:45 GMT + Sat, 20 Jul 2019 06:59:45 GMT maintain_current_git.sh v 1.11 + + Fri, 19 Jul 2019 18:26:45 GMT + Fri, 19 Jul 2019 18:26:45 GMT + https://git.slackware.nl/current/tag/?h=20190719182645 + 20190719182645 + + +a/aaa_elflibs-15.0-x86_64-9.txz: Rebuilt. + Upgraded: libbz2.so.1.0.8, libexpat.so.1.6.9, libglib-2.0.so.0.6000.5, + libgmodule-2.0.so.0.6000.5, libgobject-2.0.so.0.6000.5, + libgthread-2.0.so.0.6000.5, libidn2.so.0.3.6. + Removed: libicudata.so.63.1, libicui18n.so.63.1, libicuio.so.63.1, + libicutest.so.63.1, libicutu.so.63.1, libicuuc.so.63.1. + Added: libpcre2-8.so.0.8.0, libpsl.so.5.3.2. These are needed by wget which + is used by slackpkg, so they should be in here. Thanks to OutSiderBR. +ap/lxc-2.0.11_fad08f383-x86_64-1.txz: Upgraded. + Updated from 2.0 git branch. + Ported init script updates from sysvinit-scripts. +d/ccache-3.7.2-x86_64-1.txz: Upgraded. +l/libsigc++-2.10.2-x86_64-1.txz: Upgraded. +n/curl-7.65.3-x86_64-1.txz: Upgraded. + This is a bugfix release: + Fix a regression that caused the progress meter not to appear. + For more information, see: + https://curl.haxx.se/changes.html +n/iputils-20190709-x86_64-1.txz: Upgraded. + ]]> + + Thu, 18 Jul 2019 20:46:19 GMT Thu, 18 Jul 2019 20:46:19 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index 43260d32f..cb73876e5 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,24 @@ +Fri Jul 19 18:26:45 UTC 2019 +a/aaa_elflibs-15.0-x86_64-9.txz: Rebuilt. + Upgraded: libbz2.so.1.0.8, libexpat.so.1.6.9, libglib-2.0.so.0.6000.5, + libgmodule-2.0.so.0.6000.5, libgobject-2.0.so.0.6000.5, + libgthread-2.0.so.0.6000.5, libidn2.so.0.3.6. + Removed: libicudata.so.63.1, libicui18n.so.63.1, libicuio.so.63.1, + libicutest.so.63.1, libicutu.so.63.1, libicuuc.so.63.1. + Added: libpcre2-8.so.0.8.0, libpsl.so.5.3.2. These are needed by wget which + is used by slackpkg, so they should be in here. Thanks to OutSiderBR. +ap/lxc-2.0.11_fad08f383-x86_64-1.txz: Upgraded. + Updated from 2.0 git branch. + Ported init script updates from sysvinit-scripts. +d/ccache-3.7.2-x86_64-1.txz: Upgraded. +l/libsigc++-2.10.2-x86_64-1.txz: Upgraded. +n/curl-7.65.3-x86_64-1.txz: Upgraded. + This is a bugfix release: + Fix a regression that caused the progress meter not to appear. + For more information, see: + https://curl.haxx.se/changes.html +n/iputils-20190709-x86_64-1.txz: Upgraded. ++--------------------------+ Thu Jul 18 20:46:19 UTC 2019 a/kernel-firmware-20190717_bf13a71-noarch-1.txz: Upgraded. ap/mpg123-1.25.11-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 1e3d005a8..c8e1c0dcf 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Thu Jul 18 21:04:14 UTC 2019 +Fri Jul 19 18:49:39 UTC 2019 Here is the file list for this directory. If you are using a mirror site and find missing or extra files in the disk subdirectories, please have the archive administrator refresh the mirror. -drwxr-xr-x 12 root root 4096 2019-07-18 20:46 . +drwxr-xr-x 12 root root 4096 2019-07-19 18:26 . -rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2 -rw-r--r-- 1 root root 14341 2018-11-29 05:40 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 920461 2019-07-17 22:21 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-07-17 22:21 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 920512 2019-07-18 21:04 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-07-18 21:04 ./CHECKSUMS.md5.asc -rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING -rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3 -rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT -rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT --rw-r--r-- 1 root root 662227 2019-07-18 20:46 ./ChangeLog.txt +-rw-r--r-- 1 root root 663243 2019-07-19 18:26 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2019-07-15 00:25 ./EFI/BOOT -rw-r--r-- 1 root root 1417216 2019-07-05 18:54 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2019-07-15 00:25 ./EFI/BOOT -rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg --rw-r--r-- 1 root root 1209969 2019-07-17 22:20 ./FILELIST.TXT +-rw-r--r-- 1 root root 1210019 2019-07-18 21:04 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 733444 2019-07-18 21:02 ./PACKAGES.TXT +-rw-r--r-- 1 root root 733444 2019-07-19 18:47 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3635 2019-07-14 22:37 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -786,19 +786,19 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches -rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT -drwxr-xr-x 18 root root 4096 2019-07-18 21:02 ./slackware64 --rw-r--r-- 1 root root 290943 2019-07-18 21:02 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-07-18 21:02 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 362412 2019-07-18 20:59 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 3689885 2019-07-18 21:00 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2019-07-19 18:48 ./slackware64 +-rw-r--r-- 1 root root 290946 2019-07-19 18:48 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-07-19 18:48 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 362415 2019-07-19 18:45 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 3689226 2019-07-19 18:46 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT -drwxr-xr-x 2 root root 28672 2019-07-18 20:59 ./slackware64/a +drwxr-xr-x 2 root root 28672 2019-07-19 18:45 ./slackware64/a -rw-r--r-- 1 root root 327 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txt -rw-r--r-- 1 root root 10820 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txz -rw-r--r-- 1 root root 163 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txz.asc --rw-r--r-- 1 root root 471 2019-05-13 21:50 ./slackware64/a/aaa_elflibs-15.0-x86_64-8.txt --rw-r--r-- 1 root root 13955748 2019-05-13 21:50 ./slackware64/a/aaa_elflibs-15.0-x86_64-8.txz --rw-r--r-- 1 root root 163 2019-05-13 21:50 ./slackware64/a/aaa_elflibs-15.0-x86_64-8.txz.asc +-rw-r--r-- 1 root root 471 2019-07-19 18:02 ./slackware64/a/aaa_elflibs-15.0-x86_64-9.txt +-rw-r--r-- 1 root root 5951252 2019-07-19 18:02 ./slackware64/a/aaa_elflibs-15.0-x86_64-9.txz +-rw-r--r-- 1 root root 163 2019-07-19 18:02 ./slackware64/a/aaa_elflibs-15.0-x86_64-9.txz.asc -rw-r--r-- 1 root root 503 2019-05-23 18:51 ./slackware64/a/aaa_terminfo-6.1_20190518-x86_64-1.txt -rw-r--r-- 1 root root 49096 2019-05-23 18:51 ./slackware64/a/aaa_terminfo-6.1_20190518-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-05-23 18:51 ./slackware64/a/aaa_terminfo-6.1_20190518-x86_64-1.txz.asc @@ -1143,7 +1143,7 @@ drwxr-xr-x 2 root root 28672 2019-07-18 20:59 ./slackware64/a -rw-r--r-- 1 root root 540 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txt -rw-r--r-- 1 root root 56156 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz.asc -drwxr-xr-x 2 root root 20480 2019-07-18 20:59 ./slackware64/ap +drwxr-xr-x 2 root root 20480 2019-07-19 18:45 ./slackware64/ap -rw-r--r-- 1 root root 291 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txt -rw-r--r-- 1 root root 694880 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz -rw-r--r-- 1 root root 163 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz.asc @@ -1269,9 +1269,9 @@ drwxr-xr-x 2 root root 20480 2019-07-18 20:59 ./slackware64/ap -rw-r--r-- 1 root root 366 2019-03-26 18:38 ./slackware64/ap/lsscsi-0.30-x86_64-1.txt -rw-r--r-- 1 root root 50784 2019-03-26 18:38 ./slackware64/ap/lsscsi-0.30-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-03-26 18:38 ./slackware64/ap/lsscsi-0.30-x86_64-1.txz.asc --rw-r--r-- 1 root root 504 2019-03-20 19:42 ./slackware64/ap/lxc-2.0.11_8c238670-x86_64-1.txt --rw-r--r-- 1 root root 641472 2019-03-20 19:42 ./slackware64/ap/lxc-2.0.11_8c238670-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-03-20 19:42 ./slackware64/ap/lxc-2.0.11_8c238670-x86_64-1.txz.asc +-rw-r--r-- 1 root root 504 2019-07-19 18:07 ./slackware64/ap/lxc-2.0.11_fad08f383-x86_64-1.txt +-rw-r--r-- 1 root root 642224 2019-07-19 18:07 ./slackware64/ap/lxc-2.0.11_fad08f383-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-07-19 18:07 ./slackware64/ap/lxc-2.0.11_fad08f383-x86_64-1.txz.asc -rw-r--r-- 1 root root 338 2018-04-13 13:23 ./slackware64/ap/madplay-0.15.2b-x86_64-5.txt -rw-r--r-- 1 root root 60100 2018-04-13 13:23 ./slackware64/ap/madplay-0.15.2b-x86_64-5.txz -rw-r--r-- 1 root root 163 2018-04-13 13:23 ./slackware64/ap/madplay-0.15.2b-x86_64-5.txz.asc @@ -1389,7 +1389,7 @@ drwxr-xr-x 2 root root 20480 2019-07-18 20:59 ./slackware64/ap -rw-r--r-- 1 root root 506 2019-02-04 20:25 ./slackware64/ap/zsh-5.7.1-x86_64-1.txt -rw-r--r-- 1 root root 3008036 2019-02-04 20:25 ./slackware64/ap/zsh-5.7.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-02-04 20:25 ./slackware64/ap/zsh-5.7.1-x86_64-1.txz.asc -drwxr-xr-x 2 root root 20480 2019-07-17 22:16 ./slackware64/d +drwxr-xr-x 2 root root 20480 2019-07-19 18:45 ./slackware64/d -rw-r--r-- 1 root root 360 2019-07-07 18:38 ./slackware64/d/Cython-0.29.12-x86_64-1.txt -rw-r--r-- 1 root root 3222748 2019-07-07 18:38 ./slackware64/d/Cython-0.29.12-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-07-07 18:38 ./slackware64/d/Cython-0.29.12-x86_64-1.txz.asc @@ -1405,9 +1405,9 @@ drwxr-xr-x 2 root root 20480 2019-07-17 22:16 ./slackware64/d -rw-r--r-- 1 root root 513 2019-05-22 20:49 ./slackware64/d/bison-3.4.1-x86_64-1.txt -rw-r--r-- 1 root root 601700 2019-05-22 20:49 ./slackware64/d/bison-3.4.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-05-22 20:49 ./slackware64/d/bison-3.4.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 350 2019-05-02 17:44 ./slackware64/d/ccache-3.7.1-x86_64-1.txt --rw-r--r-- 1 root root 95776 2019-05-02 17:44 ./slackware64/d/ccache-3.7.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-05-02 17:44 ./slackware64/d/ccache-3.7.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 350 2019-07-19 16:45 ./slackware64/d/ccache-3.7.2-x86_64-1.txt +-rw-r--r-- 1 root root 96172 2019-07-19 16:45 ./slackware64/d/ccache-3.7.2-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-07-19 16:45 ./slackware64/d/ccache-3.7.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 663 2019-04-03 21:09 ./slackware64/d/clisp-2.49_20181112_df3b9f6fd-x86_64-2.txt -rw-r--r-- 1 root root 3103124 2019-04-03 21:09 ./slackware64/d/clisp-2.49_20181112_df3b9f6fd-x86_64-2.txz -rw-r--r-- 1 root root 163 2019-04-03 21:09 ./slackware64/d/clisp-2.49_20181112_df3b9f6fd-x86_64-2.txz.asc @@ -2457,7 +2457,7 @@ drwxr-xr-x 2 root root 20480 2016-03-10 03:11 ./slackware64/kdei -rw-r--r-- 1 root root 7544 2018-03-01 07:54 ./slackware64/kdei/maketag -rw-r--r-- 1 root root 7544 2018-03-01 07:54 ./slackware64/kdei/maketag.ez -rw-r--r-- 1 root root 1500 2018-03-01 07:54 ./slackware64/kdei/tagfile -drwxr-xr-x 2 root root 69632 2019-07-18 20:59 ./slackware64/l +drwxr-xr-x 2 root root 69632 2019-07-19 18:45 ./slackware64/l -rw-r--r-- 1 root root 338 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txt -rw-r--r-- 1 root root 149752 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txz -rw-r--r-- 1 root root 163 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txz.asc @@ -3030,9 +3030,9 @@ drwxr-xr-x 2 root root 69632 2019-07-18 20:59 ./slackware64/l -rw-r--r-- 1 root root 250 2019-03-02 17:27 ./slackware64/l/libsecret-0.18.8-x86_64-1.txt -rw-r--r-- 1 root root 203064 2019-03-02 17:27 ./slackware64/l/libsecret-0.18.8-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-03-02 17:27 ./slackware64/l/libsecret-0.18.8-x86_64-1.txz.asc --rw-r--r-- 1 root root 545 2018-10-30 21:20 ./slackware64/l/libsigc++-2.10.1-x86_64-1.txt --rw-r--r-- 1 root root 128416 2018-10-30 21:20 ./slackware64/l/libsigc++-2.10.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-10-30 21:20 ./slackware64/l/libsigc++-2.10.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 545 2019-07-19 17:14 ./slackware64/l/libsigc++-2.10.2-x86_64-1.txt +-rw-r--r-- 1 root root 122024 2019-07-19 17:14 ./slackware64/l/libsigc++-2.10.2-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-07-19 17:14 ./slackware64/l/libsigc++-2.10.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 601 2018-12-27 23:13 ./slackware64/l/libsigsegv-2.12-x86_64-3.txt -rw-r--r-- 1 root root 34412 2018-12-27 23:13 ./slackware64/l/libsigsegv-2.12-x86_64-3.txz -rw-r--r-- 1 root root 163 2018-12-27 23:13 ./slackware64/l/libsigsegv-2.12-x86_64-3.txz.asc @@ -3423,7 +3423,7 @@ drwxr-xr-x 2 root root 69632 2019-07-18 20:59 ./slackware64/l -rw-r--r-- 1 root root 463 2019-04-18 20:04 ./slackware64/l/zstd-1.4.0-x86_64-1.txt -rw-r--r-- 1 root root 390012 2019-04-18 20:04 ./slackware64/l/zstd-1.4.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-04-18 20:04 ./slackware64/l/zstd-1.4.0-x86_64-1.txz.asc -drwxr-xr-x 2 root root 36864 2019-07-18 20:59 ./slackware64/n +drwxr-xr-x 2 root root 36864 2019-07-19 18:45 ./slackware64/n -rw-r--r-- 1 root root 357 2019-07-05 18:51 ./slackware64/n/ModemManager-1.10.4-x86_64-1.txt -rw-r--r-- 1 root root 1697584 2019-07-05 18:51 ./slackware64/n/ModemManager-1.10.4-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-07-05 18:51 ./slackware64/n/ModemManager-1.10.4-x86_64-1.txz.asc @@ -3469,9 +3469,9 @@ drwxr-xr-x 2 root root 36864 2019-07-18 20:59 ./slackware64/n -rw-r--r-- 1 root root 409 2019-03-13 23:05 ./slackware64/n/crda-3.18-x86_64-9.txt -rw-r--r-- 1 root root 69332 2019-03-13 23:05 ./slackware64/n/crda-3.18-x86_64-9.txz -rw-r--r-- 1 root root 163 2019-03-13 23:05 ./slackware64/n/crda-3.18-x86_64-9.txz.asc --rw-r--r-- 1 root root 552 2019-07-17 19:54 ./slackware64/n/curl-7.65.2-x86_64-1.txt --rw-r--r-- 1 root root 1272048 2019-07-17 19:54 ./slackware64/n/curl-7.65.2-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-07-17 19:54 ./slackware64/n/curl-7.65.2-x86_64-1.txz.asc +-rw-r--r-- 1 root root 552 2019-07-19 16:49 ./slackware64/n/curl-7.65.3-x86_64-1.txt +-rw-r--r-- 1 root root 1271572 2019-07-19 16:49 ./slackware64/n/curl-7.65.3-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-07-19 16:49 ./slackware64/n/curl-7.65.3-x86_64-1.txz.asc -rw-r--r-- 1 root root 373 2018-11-24 18:58 ./slackware64/n/cyrus-sasl-2.1.27-x86_64-1.txt -rw-r--r-- 1 root root 952180 2018-11-24 18:58 ./slackware64/n/cyrus-sasl-2.1.27-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-11-24 18:58 ./slackware64/n/cyrus-sasl-2.1.27-x86_64-1.txz.asc @@ -3549,9 +3549,9 @@ drwxr-xr-x 2 root root 36864 2019-07-18 20:59 ./slackware64/n -rw-r--r-- 1 root root 584 2018-04-13 15:38 ./slackware64/n/iptraf-ng-1.1.4-x86_64-3.txt -rw-r--r-- 1 root root 277768 2018-04-13 15:38 ./slackware64/n/iptraf-ng-1.1.4-x86_64-3.txz -rw-r--r-- 1 root root 163 2018-04-13 15:38 ./slackware64/n/iptraf-ng-1.1.4-x86_64-3.txz.asc --rw-r--r-- 1 root root 422 2019-05-17 18:30 ./slackware64/n/iputils-20190515-x86_64-1.txt --rw-r--r-- 1 root root 85316 2019-05-17 18:30 ./slackware64/n/iputils-20190515-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-05-17 18:30 ./slackware64/n/iputils-20190515-x86_64-1.txz.asc +-rw-r--r-- 1 root root 422 2019-07-19 17:03 ./slackware64/n/iputils-20190709-x86_64-1.txt +-rw-r--r-- 1 root root 85352 2019-07-19 17:03 ./slackware64/n/iputils-20190709-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-07-19 17:03 ./slackware64/n/iputils-20190709-x86_64-1.txz.asc -rw-r--r-- 1 root root 479 2008-11-04 11:29 ./slackware64/n/ipw2100-fw-1.3-fw-1.txt -rw-r--r-- 1 root root 119440 2008-11-04 11:29 ./slackware64/n/ipw2100-fw-1.3-fw-1.txz -rw-r--r-- 1 root root 197 2008-11-04 11:29 ./slackware64/n/ipw2100-fw-1.3-fw-1.txz.asc @@ -5007,11 +5007,11 @@ drwxr-xr-x 2 root root 4096 2019-02-17 23:51 ./slackware64/y -rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag -rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag.ez -rw-r--r-- 1 root root 14 2018-03-01 07:55 ./slackware64/y/tagfile -drwxr-xr-x 19 root root 4096 2019-07-18 21:04 ./source --rw-r--r-- 1 root root 468279 2019-07-18 21:04 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-07-18 21:04 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 660703 2019-07-18 21:03 ./source/FILE_LIST --rw-r--r-- 1 root root 17302678 2019-07-18 21:03 ./source/MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2019-07-19 18:49 ./source +-rw-r--r-- 1 root root 468280 2019-07-19 18:49 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-07-19 18:49 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 660704 2019-07-19 18:49 ./source/FILE_LIST +-rw-r--r-- 1 root root 17301248 2019-07-19 18:49 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT drwxr-xr-x 111 root root 4096 2019-07-05 18:41 ./source/a -rw-r--r-- 1 root root 1034 2019-05-04 17:56 ./source/a/FTBFSlog @@ -5023,11 +5023,11 @@ drwxr-xr-x 2 root root 4096 2018-06-24 18:43 ./source/a/aaa_base -rw-r--r-- 1 root root 783 2018-02-27 06:13 ./source/a/aaa_base/slack-desc -rw-r--r-- 1 root root 15 2015-12-28 19:27 ./source/a/aaa_base/slackware-version drwxr-xr-x 2 root root 4096 2019-02-08 21:24 ./source/a/aaa_elflibs --rwxr-xr-x 1 root root 4259 2019-05-13 21:50 ./source/a/aaa_elflibs/aaa_elflibs.SlackBuild +-rwxr-xr-x 1 root root 4259 2019-07-19 18:02 ./source/a/aaa_elflibs/aaa_elflibs.SlackBuild -rwxr-xr-x 1 root root 1630 2015-04-20 04:39 ./source/a/aaa_elflibs/display_orphans.sh -rw-r--r-- 1 root root 930 2018-02-27 06:13 ./source/a/aaa_elflibs/slack-desc --rw-r--r-- 1 root root 1849 2019-04-03 22:07 ./source/a/aaa_elflibs/symlinks-to-tracked-libs --rw-r--r-- 1 root root 373 2019-03-28 21:37 ./source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp +-rw-r--r-- 1 root root 1895 2019-07-19 18:02 ./source/a/aaa_elflibs/symlinks-to-tracked-libs +-rw-r--r-- 1 root root 223 2019-07-19 18:01 ./source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp -rw-r--r-- 1 root root 288 2015-08-29 17:08 ./source/a/aaa_elflibs/tracked-files -rw-r--r-- 1 root root 213 2015-04-20 04:40 ./source/a/aaa_elflibs/tracked-files-tmp lrwxrwxrwx 1 root root 12 2018-04-16 17:31 ./source/a/aaa_terminfo -> ../l/ncurses @@ -5931,7 +5931,7 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/zoo -rw-r--r-- 1 root root 173607 1994-12-30 20:19 ./source/a/zoo/zoo-2.10.tar.gz -rwxr-xr-x 1 root root 3143 2018-04-23 17:20 ./source/a/zoo/zoo.SlackBuild -rw-r--r-- 1 root root 14136 2010-05-22 09:49 ./source/a/zoo/zoo_2.10-22.debian.tar.gz -drwxr-xr-x 82 root root 4096 2019-07-17 18:42 ./source/ap +drwxr-xr-x 82 root root 4096 2019-07-19 18:06 ./source/ap -rw-r--r-- 1 root root 270 2018-02-12 23:18 ./source/ap/FTBFSlog drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/ap/a2ps -rw-r--r-- 1 root root 1521 2017-10-01 17:59 ./source/ap/a2ps/a2ps-4.14-texinfo-nodes.patch.gz @@ -6203,23 +6203,23 @@ drwxr-xr-x 2 root root 4096 2019-03-26 18:37 ./source/ap/lsscsi -rwxr-xr-x 1 root root 4171 2019-03-26 18:38 ./source/ap/lsscsi/lsscsi.SlackBuild -rw-r--r-- 1 root root 36 2008-11-29 19:46 ./source/ap/lsscsi/lsscsi.url -rw-r--r-- 1 root root 821 2018-02-27 06:12 ./source/ap/lsscsi/slack-desc -drwxr-xr-x 3 root root 4096 2019-03-20 19:40 ./source/ap/lxc +drwxr-xr-x 3 root root 4096 2019-07-19 17:20 ./source/ap/lxc -rw-r--r-- 1 root root 501 2015-09-01 21:57 ./source/ap/lxc/doinst.sh -rwxr-xr-x 1 root root 2327 2019-02-12 20:26 ./source/ap/lxc/get-lxc.sh --rw-r--r-- 1 root root 582080 2019-03-20 19:40 ./source/ap/lxc/lxc-2.0.11_8c238670.tar.xz +-rw-r--r-- 1 root root 581588 2019-07-19 17:20 ./source/ap/lxc/lxc-2.0.11_fad08f383.tar.xz -rw-r--r-- 1 root root 11199 2017-11-26 21:42 ./source/ap/lxc/lxc-slackware.in -rwxr-xr-x 1 root root 6528 2019-03-20 19:41 ./source/ap/lxc/lxc.SlackBuild -rw-r--r-- 1 root root 1340 2017-06-21 17:56 ./source/ap/lxc/rc.lxc drwxr-xr-x 2 root root 4096 2017-11-27 18:45 ./source/ap/lxc/scripts -rw-r--r-- 1 root root 512 2016-03-08 00:10 ./source/ap/lxc/scripts/README --rw-r--r-- 1 root root 9429 2017-11-27 18:15 ./source/ap/lxc/scripts/rc.6.lxc --rw-r--r-- 1 root root 8672 2017-11-15 00:12 ./source/ap/lxc/scripts/rc.6.orig --rw-r--r-- 1 root root 12737 2017-11-27 18:23 ./source/ap/lxc/scripts/rc.M.lxc --rw-r--r-- 1 root root 12162 2017-11-18 17:21 ./source/ap/lxc/scripts/rc.M.orig --rw-r--r-- 1 root root 17489 2017-11-27 18:35 ./source/ap/lxc/scripts/rc.S.lxc --rw-r--r-- 1 root root 16162 2017-11-19 01:17 ./source/ap/lxc/scripts/rc.S.orig --rw-r--r-- 1 root root 13245 2017-11-27 18:44 ./source/ap/lxc/scripts/rc.inet1.lxc --rw-r--r-- 1 root root 12765 2017-11-27 04:48 ./source/ap/lxc/scripts/rc.inet1.orig +-rw-r--r-- 1 root root 9852 2019-07-19 17:32 ./source/ap/lxc/scripts/rc.6.lxc +-rw-r--r-- 1 root root 9341 2019-02-20 00:32 ./source/ap/lxc/scripts/rc.6.orig +-rw-r--r-- 1 root root 13087 2019-07-19 17:39 ./source/ap/lxc/scripts/rc.M.lxc +-rw-r--r-- 1 root root 12482 2019-02-20 00:32 ./source/ap/lxc/scripts/rc.M.orig +-rw-r--r-- 1 root root 18049 2019-07-19 17:48 ./source/ap/lxc/scripts/rc.S.lxc +-rw-r--r-- 1 root root 16761 2019-02-20 00:32 ./source/ap/lxc/scripts/rc.S.orig +-rw-r--r-- 1 root root 13966 2019-07-19 17:53 ./source/ap/lxc/scripts/rc.inet1.lxc +-rw-r--r-- 1 root root 13486 2019-02-20 00:32 ./source/ap/lxc/scripts/rc.inet1.orig -rw-r--r-- 1 root root 955 2019-02-12 20:15 ./source/ap/lxc/slack-desc drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/ap/madplay -rw-r--r-- 1 root root 285 2011-04-02 17:59 ./source/ap/madplay/madplay-0.15.2b-fix-segfault.patch.gz @@ -6530,9 +6530,9 @@ drwxr-xr-x 2 root root 4096 2019-05-22 20:48 ./source/d/bison -rw-r--r-- 1 root root 195 2019-05-22 16:59 ./source/d/bison/bison-3.4.1.tar.xz.sig -rwxr-xr-x 1 root root 4463 2018-09-18 22:04 ./source/d/bison/bison.SlackBuild -rw-r--r-- 1 root root 966 2018-08-28 17:22 ./source/d/bison/slack-desc -drwxr-xr-x 2 root root 4096 2019-05-02 17:44 ./source/d/ccache --rw-r--r-- 1 root root 349276 2019-05-01 14:43 ./source/d/ccache/ccache-3.7.1.tar.xz --rw-r--r-- 1 root root 833 2019-05-01 14:43 ./source/d/ccache/ccache-3.7.1.tar.xz.asc +drwxr-xr-x 2 root root 4096 2019-07-19 16:45 ./source/d/ccache +-rw-r--r-- 1 root root 351168 2019-07-19 09:09 ./source/d/ccache/ccache-3.7.2.tar.xz +-rw-r--r-- 1 root root 833 2019-07-19 09:09 ./source/d/ccache/ccache-3.7.2.tar.xz.asc -rwxr-xr-x 1 root root 3275 2019-01-15 19:42 ./source/d/ccache/ccache.SlackBuild -rw-r--r-- 1 root root 804 2018-02-27 06:13 ./source/d/ccache/slack-desc drwxr-xr-x 2 root root 4096 2019-04-03 20:39 ./source/d/clisp @@ -8079,7 +8079,7 @@ drwxr-xr-x 2 root root 4096 2018-02-27 06:35 ./source/kdei/kde-l10n/slack -rw-r--r-- 1 root root 648 2018-02-27 06:35 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-wa -rw-r--r-- 1 root root 698 2018-02-27 06:37 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_CN -rw-r--r-- 1 root root 687 2018-02-27 06:37 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_TW -drwxr-xr-x 318 root root 12288 2019-07-18 20:11 ./source/l +drwxr-xr-x 318 root root 12288 2019-07-19 17:15 ./source/l drwxr-xr-x 3 root root 4096 2018-09-18 22:04 ./source/l/ConsoleKit2 -rw-r--r-- 1 root root 705880 2015-08-10 06:49 ./source/l/ConsoleKit2/ConsoleKit2-1.0.0.tar.xz -rwxr-xr-x 1 root root 5326 2018-09-18 22:04 ./source/l/ConsoleKit2/ConsoleKit2.SlackBuild @@ -9074,9 +9074,9 @@ drwxr-xr-x 2 root root 4096 2019-03-02 17:26 ./source/l/libsecret -rw-r--r-- 1 root root 509432 2019-03-02 08:02 ./source/l/libsecret/libsecret-0.18.8.tar.xz -rwxr-xr-x 1 root root 3716 2018-12-29 19:00 ./source/l/libsecret/libsecret.SlackBuild -rw-r--r-- 1 root root 707 2018-02-27 06:12 ./source/l/libsecret/slack-desc -drwxr-xr-x 2 root root 4096 2018-10-30 21:20 ./source/l/libsigc++ --rw-r--r-- 1 root root 4062388 2018-10-30 15:31 ./source/l/libsigc++/libsigc++-2.10.1.tar.xz --rwxr-xr-x 1 root root 3795 2018-10-30 21:20 ./source/l/libsigc++/libsigc++.SlackBuild +drwxr-xr-x 2 root root 4096 2019-07-19 17:13 ./source/l/libsigc++ +-rw-r--r-- 1 root root 410943 2019-06-12 16:23 ./source/l/libsigc++/libsigc++-2.10.2.tar.lz +-rwxr-xr-x 1 root root 3900 2019-06-13 18:29 ./source/l/libsigc++/libsigc++.SlackBuild -rw-r--r-- 1 root root 1034 2018-10-30 21:18 ./source/l/libsigc++/slack-desc drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/l/libsigsegv -rw-r--r-- 1 root root 295054 2018-01-16 20:28 ./source/l/libsigsegv/libsigsegv-2.12.tar.lz @@ -9987,11 +9987,11 @@ drwxr-xr-x 2 root root 4096 2019-03-13 23:04 ./source/n/crda -rw-r--r-- 1 root root 488 2019-03-01 21:31 ./source/n/crda/wireless-regdb-2019.03.01.tar.sign -rw-r--r-- 1 root root 23196 2019-03-01 21:31 ./source/n/crda/wireless-regdb-2019.03.01.tar.xz -rw-r--r-- 1 root root 55 2018-02-05 06:31 ./source/n/crda/wireless-regdb.url -drwxr-xr-x 2 root root 4096 2019-07-17 19:52 ./source/n/curl +drwxr-xr-x 2 root root 4096 2019-07-19 16:48 ./source/n/curl -rwxr-xr-x 1 root root 86 2012-04-08 00:28 ./source/n/curl/cacert-fetch.sh -rw-r--r-- 1 root root 127787 2019-05-15 03:12 ./source/n/curl/cacert.pem.bz2 --rw-r--r-- 1 root root 2388668 2019-07-17 07:31 ./source/n/curl/curl-7.65.2.tar.xz --rw-r--r-- 1 root root 488 2019-07-17 07:31 ./source/n/curl/curl-7.65.2.tar.xz.asc +-rw-r--r-- 1 root root 2392472 2019-07-19 09:39 ./source/n/curl/curl-7.65.3.tar.xz +-rw-r--r-- 1 root root 488 2019-07-19 09:39 ./source/n/curl/curl-7.65.3.tar.xz.asc -rwxr-xr-x 1 root root 4973 2019-03-27 18:21 ./source/n/curl/curl.SlackBuild -rw-r--r-- 1 root root 30 2018-04-20 16:49 ./source/n/curl/curl.url -rw-r--r-- 1 root root 1004 2019-02-06 21:57 ./source/n/curl/slack-desc @@ -10156,10 +10156,10 @@ drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/n/iptraf-ng -rw-r--r-- 1 root root 403028 2013-07-23 13:15 ./source/n/iptraf-ng/iptraf-ng-1.1.4.tar.xz -rwxr-xr-x 1 root root 4474 2018-09-18 22:04 ./source/n/iptraf-ng/iptraf-ng.SlackBuild -rw-r--r-- 1 root root 1041 2018-02-27 06:13 ./source/n/iptraf-ng/slack-desc -drwxr-xr-x 2 root root 4096 2019-05-17 18:30 ./source/n/iputils --rw-r--r-- 1 root root 359506 2019-05-17 18:18 ./source/n/iputils/iputils-s20190515.tar.lz --rwxr-xr-x 1 root root 4595 2019-07-17 20:03 ./source/n/iputils/iputils.SlackBuild --rw-r--r-- 1 root root 1353 2019-05-17 18:29 ./source/n/iputils/iputils.docbook.revert.diff.gz +drwxr-xr-x 2 root root 4096 2019-07-19 17:03 ./source/n/iputils +-rw-r--r-- 1 root root 360196 2019-07-19 16:55 ./source/n/iputils/iputils-s20190709.tar.lz +-rwxr-xr-x 1 root root 4592 2019-07-19 17:02 ./source/n/iputils/iputils.SlackBuild +-rw-r--r-- 1 root root 1069 2019-07-19 17:02 ./source/n/iputils/iputils.docbook.revert.diff.gz -rw-r--r-- 1 root root 44 2018-08-06 17:28 ./source/n/iputils/iputils.url -rw-r--r-- 1 root root 877 2018-02-27 06:13 ./source/n/iputils/slack-desc drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/n/ipw2100-fw diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild index bf2a5823a..a93e4aeeb 100755 --- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild +++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_elflibs VERSION=${VERSION:-15.0} -BUILD=${BUILD:-8} +BUILD=${BUILD:-9} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs index 5071f1a09..764d77bd2 100644 --- a/source/a/aaa_elflibs/symlinks-to-tracked-libs +++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs @@ -61,9 +61,11 @@ /usr/lib/libpanel.so.6 /usr/lib/libpanelw.so.5 /usr/lib/libpanelw.so.6 +/usr/lib/libpcre2-8.so.0 /usr/lib/libpng.so.14 /usr/lib/libpng14.so.14 /usr/lib/libpng16.so.16 +/usr/lib/libpsl.so.5 /usr/lib/libreadline.so.6 /usr/lib/libreadline.so.7 /usr/lib/libreadline.so.8 diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp index 18b81364c..2e0d30830 100644 --- a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp +++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp @@ -2,9 +2,3 @@ # like to keep copies of temporarily until we can recompile # everything that's still using them. Once that happens, they'll # be dropped from this package. -/usr/lib/libicudata.so.63 -/usr/lib/libicui18n.so.63 -/usr/lib/libicuio.so.63 -/usr/lib/libicutest.so.63 -/usr/lib/libicutu.so.63 -/usr/lib/libicuuc.so.63 diff --git a/source/ap/lxc/scripts/rc.6.lxc b/source/ap/lxc/scripts/rc.6.lxc index 7fd57ef26..73923da97 100644 --- a/source/ap/lxc/scripts/rc.6.lxc +++ b/source/ap/lxc/scripts/rc.6.lxc @@ -44,6 +44,10 @@ case "$0" in ;; esac +# Restart init. This prevents init from hanging on to file handles for removed +# glibc shared libraries in the case that those were upgraded or reinstalled. +/sbin/telinit u + # Save the system time to the hardware clock using hwclock --systohc. # This will also create or update the timestamps in /etc/adjtime. if [ -x /sbin/hwclock -a -z "$container" ]; then @@ -114,6 +118,11 @@ if [ -x /etc/rc.d/rc.openldap ]; then /etc/rc.d/rc.openldap stop fi +# Stop the haveged entropy daemon: +if [ -x /etc/rc.d/rc.haveged -a -z "$container" ]; then + /etc/rc.d/rc.haveged stop +fi + # Stop D-Bus: if [ -x /etc/rc.d/rc.messagebus ]; then /etc/rc.d/rc.messagebus stop @@ -122,10 +131,10 @@ fi # Kill any processes (typically gam) that would otherwise prevent # unmounting NFS volumes: unset FUSER_DELAY -for dir in $(/bin/mount | grep 'type nfs ' | cut -d ' ' -f 3 ) ; do +for dir in $(/bin/mount | grep 'type nfs ' | sed -e 's|.* on ||g' | cut -d ' ' -f 1) ; do echo "Killing processes holding NFS mount $dir open..." # Background this to prevent fuser from also blocking shutdown: - /usr/bin/fuser -k -m $dir & + /usr/bin/fuser -k -M -m "$dir" & FUSER_DELAY=5 done # If fuser was run, let it have some delay: @@ -236,7 +245,11 @@ fi if [ -z "$container" ]; then echo "Unmounting local file systems:" - /bin/umount -v -a -t no,proc,sysfs | tr -d ' ' | grep successfully | sed "s/:successfullyunmounted/ has been successfully unmounted./g" 2> /dev/null + /bin/umount -v -a -t no,proc,sysfs,devtmpfs,fuse.gvfsd-fuse,tmpfs + # JFS needs a sync here or the / partition cannot be remounted read-only. + # In spite of this, it seems that a JFS root partition will always be checked + # (and found to be clean) at boot: + /bin/sync echo "Remounting root filesystem read-only:" /bin/mount -v -n -o remount,ro / fi @@ -269,7 +282,7 @@ fi if [ -z "$container" ]; then if [ -r /etc/lvmtab -o -d /etc/lvm/backup ]; then echo "Deactivating LVM volume groups:" - /sbin/vgchange -an --ignorelockingfailure + /sbin/vgchange -an fi fi diff --git a/source/ap/lxc/scripts/rc.6.orig b/source/ap/lxc/scripts/rc.6.orig index 23c280d91..e3986db86 100644 --- a/source/ap/lxc/scripts/rc.6.orig +++ b/source/ap/lxc/scripts/rc.6.orig @@ -37,6 +37,10 @@ case "$0" in ;; esac +# Restart init. This prevents init from hanging on to file handles for removed +# glibc shared libraries in the case that those were upgraded or reinstalled. +/sbin/telinit u + # Save the system time to the hardware clock using hwclock --systohc. # This will also create or update the timestamps in /etc/adjtime. if [ -x /sbin/hwclock ]; then @@ -107,6 +111,11 @@ if [ -x /etc/rc.d/rc.openldap ]; then /etc/rc.d/rc.openldap stop fi +# Stop the haveged entropy daemon: +if [ -x /etc/rc.d/rc.haveged ]; then + /etc/rc.d/rc.haveged stop +fi + # Stop D-Bus: if [ -x /etc/rc.d/rc.messagebus ]; then /etc/rc.d/rc.messagebus stop @@ -115,10 +124,10 @@ fi # Kill any processes (typically gam) that would otherwise prevent # unmounting NFS volumes: unset FUSER_DELAY -for dir in $(/bin/mount | grep 'type nfs ' | cut -d ' ' -f 3 ) ; do +for dir in $(/bin/mount | grep 'type nfs ' | sed -e 's|.* on ||g' | cut -d ' ' -f 1) ; do echo "Killing processes holding NFS mount $dir open..." # Background this to prevent fuser from also blocking shutdown: - /usr/bin/fuser -k -m $dir & + /usr/bin/fuser -k -M -m "$dir" & FUSER_DELAY=5 done # If fuser was run, let it have some delay: @@ -225,8 +234,19 @@ if [ -x /etc/rc.d/rc.cgmanager ]; then /etc/rc.d/rc.cgmanager stop fi +# Umount all tmpfs mounts except /dev/shm and under /run: +cat /proc/mounts | grep " tmpfs " | grep -v -e " /run " -e " /run/" -e " /dev/shm " | while read mount ; do + umount --recursive -v $(echo $mount | cut -f 2 -d ' ') 2> /dev/null +done + +# Unmount local file systems: echo "Unmounting local file systems:" -/bin/umount -v -a -t no,proc,sysfs | tr -d ' ' | grep successfully | sed "s/:successfullyunmounted/ has been successfully unmounted./g" 2> /dev/null +/bin/umount -v -a -t no,proc,sysfs,devtmpfs,fuse.gvfsd-fuse,tmpfs + +# JFS needs a sync here or the / partition cannot be remounted read-only. +# In spite of this, it seems that a JFS root partition will always be checked +# (and found to be clean) at boot: +/bin/sync echo "Remounting root filesystem read-only:" /bin/mount -v -n -o remount,ro / @@ -258,7 +278,7 @@ fi # Deactivate LVM volume groups: if [ -r /etc/lvmtab -o -d /etc/lvm/backup ]; then echo "Deactivating LVM volume groups:" - /sbin/vgchange -an --ignorelockingfailure + /sbin/vgchange -an fi # This never hurts again (especially since root-on-LVM always fails diff --git a/source/ap/lxc/scripts/rc.M.lxc b/source/ap/lxc/scripts/rc.M.lxc index 2b16190eb..8cab0150b 100644 --- a/source/ap/lxc/scripts/rc.M.lxc +++ b/source/ap/lxc/scripts/rc.M.lxc @@ -27,10 +27,10 @@ if [ -x /sbin/ldconfig ]; then /sbin/ldconfig & fi -# Screen blanks after 15 minutes idle time, and powers down in one hour -# if the kernel supports APM or ACPI power management: -if [ -z "$container" ]; then - /bin/setterm -blank 15 -powersave powerdown -powerdown 60 +# Call the setterm init script to set screen blanking and power management +# defaults: +if [ -x /etc/rc.d/rc.setterm -a -z "$container" ]; then + /etc/rc.d/rc.setterm fi # Set the hostname. @@ -105,6 +105,16 @@ if grep -wq sysfs /proc/mounts && grep -q devtmpfs /proc/filesystems ; then fi fi +# Start the haveged entropy daemon: +if [ -x /etc/rc.d/rc.haveged -a -z "$container" ]; then + /etc/rc.d/rc.haveged start +fi + +# Start the rngd entropy daemon: +if [ -x /etc/rc.d/rc.rngd -a -z "$container" ]; then + /etc/rc.d/rc.rngd start +fi + # Initialize the networking hardware. if [ -x /etc/rc.d/rc.inet1 ]; then /etc/rc.d/rc.inet1 @@ -115,6 +125,11 @@ if [ -x /etc/rc.d/rc.messagebus ]; then /etc/rc.d/rc.messagebus start fi +# Start console-kit-daemon: +if [ -x /etc/rc.d/rc.consolekit ]; then + /etc/rc.d/rc.consolekit start +fi + # Start Bluetooth: if [ -x /etc/rc.d/rc.bluetooth ]; then /etc/rc.d/rc.bluetooth start @@ -146,8 +161,7 @@ if [ -x /etc/rc.d/rc.ntpd ]; then fi # Remove stale locks and junk files (must be done after mount -a!) -/bin/rm -f /var/lock/* /var/spool/uucp/LCK..* /tmp/.X*lock /tmp/core /core 2> /dev/null -/bin/rm -rf /var/spool/cron/cron.?????? 2> /dev/null +/bin/rm -f /var/lock/* /var/spool/uucp/LCK..* /tmp/.X*lock /tmp/.X11-unix/* 2> /dev/null # Remove stale hunt sockets so the game can start. if [ -r /tmp/hunt -o -r /tmp/hunt.stats ]; then @@ -191,11 +205,6 @@ if [ -x /usr/bin/update-mime-database -a -d /usr/share/mime ]; then /usr/bin/update-mime-database /usr/share/mime 1> /dev/null 2> /dev/null & fi -# Start console-kit-daemon: -if [ -x /etc/rc.d/rc.consolekit ]; then - /etc/rc.d/rc.consolekit start -fi - # Start HAL: if [ -x /etc/rc.d/rc.hald ]; then /etc/rc.d/rc.hald start @@ -217,7 +226,7 @@ fi if [ -x /usr/bin/update-gdk-pixbuf-loaders ]; then echo "Updating gdk-pixbuf.loaders:" echo " /usr/bin/update-gdk-pixbuf-loaders &" - /usr/bin/update-gdk-pixbuf-loaders > /dev/null 2>&1 & + HOME=/root /usr/bin/update-gdk-pixbuf-loaders > /dev/null 2>&1 & fi if [ -x /usr/bin/update-pango-querymodules ]; then echo "Updating pango.modules:" @@ -255,12 +264,10 @@ if [ -x /etc/rc.d/rc.atalk ]; then fi # Start smartd, which monitors the status of S.M.A.R.T. compatible -# hard drives and reports any problems. Note some devices (which aren't -# smart, I guess ;) will hang if probed by smartd, so it's commented out -# by default. -#if [ -x /usr/sbin/smartd ]; then -# /usr/sbin/smartd -#fi +# hard drives and reports any problems: +if [ -x /etc/rc.d/rc.smartd -a -z "$container" ]; then + /etc/rc.d/rc.smartd start +fi # Monitor the UPS with genpowerd. # To use this, uncomment this section and edit your settings in @@ -285,15 +292,13 @@ if [ -x /sbin/accton -a -r /var/log/pacct ]; then fi # Start crond (Dillon's crond): -# If you want cron to actually log activity to /var/log/cron, then change -# -l notice to -l info to increase the logging level. -if [ -x /usr/sbin/crond ]; then - /usr/sbin/crond -l notice +if [ -x /etc/rc.d/rc.crond ]; then + /etc/rc.d/rc.crond start fi # Start atd (manages jobs scheduled with 'at'): -if [ -x /usr/sbin/atd ]; then - /usr/sbin/atd -b 15 -l 1 +if [ -x /etc/rc.d/rc.atd ]; then + /etc/rc.d/rc.atd start fi # Slackware-Mini-Quota-HOWTO: @@ -386,6 +391,18 @@ if [ -x /etc/rc.d/rc.gpm ]; then /etc/rc.d/rc.gpm start fi +# Start the Icecream scheduler. This needs to run on only one machine that is +# part of the compile cluster: +if [ -x /etc/rc.d/rc.icecc-scheduler ]; then + /etc/rc.d/rc.icecc-scheduler start +fi + +# Start the Icecream daemon. This needs to run on every machine that will be +# part of the compile cluster (including the machine running the scheduler): +if [ -x /etc/rc.d/rc.iceccd ]; then + /etc/rc.d/rc.iceccd start +fi + # If there are SystemV init scripts for this runlevel, run them. if [ -x /etc/rc.d/rc.sysvinit ]; then /etc/rc.d/rc.sysvinit diff --git a/source/ap/lxc/scripts/rc.M.orig b/source/ap/lxc/scripts/rc.M.orig index 0cd9f0b52..cfffb8ec4 100644 --- a/source/ap/lxc/scripts/rc.M.orig +++ b/source/ap/lxc/scripts/rc.M.orig @@ -20,9 +20,11 @@ if [ -x /sbin/ldconfig ]; then /sbin/ldconfig & fi -# Screen blanks after 15 minutes idle time, and powers down in one hour -# if the kernel supports APM or ACPI power management: -/bin/setterm -blank 15 -powersave powerdown -powerdown 60 +# Call the setterm init script to set screen blanking and power management +# defaults: +if [ -x /etc/rc.d/rc.setterm ]; then + /etc/rc.d/rc.setterm +fi # Set the hostname. if [ -r /etc/HOSTNAME ]; then @@ -30,7 +32,7 @@ if [ -r /etc/HOSTNAME ]; then else # fall back on this old default: echo "darkstar.example.net" > /etc/HOSTNAME - /bin/hostname darkstar + /bin/hostname $(cat /etc/HOSTNAME) fi # Set the permissions on /var/log/dmesg according to whether the kernel @@ -94,6 +96,16 @@ if grep -wq sysfs /proc/mounts && grep -q devtmpfs /proc/filesystems ; then fi fi +# Start the haveged entropy daemon: +if [ -x /etc/rc.d/rc.haveged ]; then + /etc/rc.d/rc.haveged start +fi + +# Start the rngd entropy daemon: +if [ -x /etc/rc.d/rc.rngd ]; then + /etc/rc.d/rc.rngd start +fi + # Initialize the networking hardware. if [ -x /etc/rc.d/rc.inet1 ]; then /etc/rc.d/rc.inet1 @@ -104,6 +116,11 @@ if [ -x /etc/rc.d/rc.messagebus ]; then /etc/rc.d/rc.messagebus start fi +# Start console-kit-daemon: +if [ -x /etc/rc.d/rc.consolekit ]; then + /etc/rc.d/rc.consolekit start +fi + # Start Bluetooth: if [ -x /etc/rc.d/rc.bluetooth ]; then /etc/rc.d/rc.bluetooth start @@ -135,8 +152,7 @@ if [ -x /etc/rc.d/rc.ntpd ]; then fi # Remove stale locks and junk files (must be done after mount -a!) -/bin/rm -f /var/lock/* /var/spool/uucp/LCK..* /tmp/.X*lock /tmp/core /core 2> /dev/null -/bin/rm -rf /var/spool/cron/cron.?????? 2> /dev/null +/bin/rm -f /var/lock/* /var/spool/uucp/LCK..* /tmp/.X*lock /tmp/.X11-unix/* 2> /dev/null # Remove stale hunt sockets so the game can start. if [ -r /tmp/hunt -o -r /tmp/hunt.stats ]; then @@ -180,11 +196,6 @@ if [ -x /usr/bin/update-mime-database -a -d /usr/share/mime ]; then /usr/bin/update-mime-database /usr/share/mime 1> /dev/null 2> /dev/null & fi -# Start console-kit-daemon: -if [ -x /etc/rc.d/rc.consolekit ]; then - /etc/rc.d/rc.consolekit start -fi - # Start HAL: if [ -x /etc/rc.d/rc.hald ]; then /etc/rc.d/rc.hald start @@ -206,7 +217,7 @@ fi if [ -x /usr/bin/update-gdk-pixbuf-loaders ]; then echo "Updating gdk-pixbuf.loaders:" echo " /usr/bin/update-gdk-pixbuf-loaders &" - /usr/bin/update-gdk-pixbuf-loaders > /dev/null 2>&1 & + HOME=/root /usr/bin/update-gdk-pixbuf-loaders > /dev/null 2>&1 & fi if [ -x /usr/bin/update-pango-querymodules ]; then echo "Updating pango.modules:" @@ -244,12 +255,10 @@ if [ -x /etc/rc.d/rc.atalk ]; then fi # Start smartd, which monitors the status of S.M.A.R.T. compatible -# hard drives and reports any problems. Note some devices (which aren't -# smart, I guess ;) will hang if probed by smartd, so it's commented out -# by default. -#if [ -x /usr/sbin/smartd ]; then -# /usr/sbin/smartd -#fi +# hard drives and reports any problems: +if [ -x /etc/rc.d/rc.smartd ]; then + /etc/rc.d/rc.smartd start +fi # Monitor the UPS with genpowerd. # To use this, uncomment this section and edit your settings in @@ -274,15 +283,13 @@ if [ -x /sbin/accton -a -r /var/log/pacct ]; then fi # Start crond (Dillon's crond): -# If you want cron to actually log activity to /var/log/cron, then change -# -l notice to -l info to increase the logging level. -if [ -x /usr/sbin/crond ]; then - /usr/sbin/crond -l notice +if [ -x /etc/rc.d/rc.crond ]; then + /etc/rc.d/rc.crond start fi # Start atd (manages jobs scheduled with 'at'): -if [ -x /usr/sbin/atd ]; then - /usr/sbin/atd -b 15 -l 1 +if [ -x /etc/rc.d/rc.atd ]; then + /etc/rc.d/rc.atd start fi # Slackware-Mini-Quota-HOWTO: @@ -375,6 +382,18 @@ if [ -x /etc/rc.d/rc.gpm ]; then /etc/rc.d/rc.gpm start fi +# Start the Icecream scheduler. This needs to run on only one machine that is +# part of the compile cluster: +if [ -x /etc/rc.d/rc.icecc-scheduler ]; then + /etc/rc.d/rc.icecc-scheduler start +fi + +# Start the Icecream daemon. This needs to run on every machine that will be +# part of the compile cluster (including the machine running the scheduler): +if [ -x /etc/rc.d/rc.iceccd ]; then + /etc/rc.d/rc.iceccd start +fi + # If there are SystemV init scripts for this runlevel, run them. if [ -x /etc/rc.d/rc.sysvinit ]; then /etc/rc.d/rc.sysvinit diff --git a/source/ap/lxc/scripts/rc.S.lxc b/source/ap/lxc/scripts/rc.S.lxc index d6bc21f0a..6732184a1 100644 --- a/source/ap/lxc/scripts/rc.S.lxc +++ b/source/ap/lxc/scripts/rc.S.lxc @@ -191,11 +191,6 @@ if [ -z "$container" ]; then /sbin/swapon -a 2> /dev/null fi -# Start FUSE, if requested: -if [ -x /etc/rc.d/rc.fuse -a -z "$container" ]; then - /etc/rc.d/rc.fuse start -fi - # Set the tick and frequency for the system clock. # Default values are: TICK=10000 and FREQ=0 if [ -z "$container" ]; then @@ -255,7 +250,12 @@ fi # Check the root filesystem: if [ -z "$container" ]; then - if [ ! $READWRITE = yes ]; then + # If we're using F2FS for the root filesystem, don't check it as it doesn't + # allow checking a read-only filesystem: + if grep -q ' / f2fs ' /proc/mounts ; then + echo "Remounting root device with read-write enabled." + /sbin/mount -w -v -n -o remount / + elif [ ! $READWRITE = yes ]; then RETVAL=0 if [ ! -r /etc/fastboot ]; then echo "Checking root filesystem:" @@ -294,7 +294,6 @@ if [ -z "$container" ]; then /sbin/umount -a -r /sbin/mount -n -o remount,ro / echo "Rebooting system." - sleep 2 reboot -f fi # Remount the root filesystem in read-write mode @@ -318,24 +317,23 @@ if [ -z "$container" ]; then fi # Done checking root filesystem fi -# Any /etc/mtab that exists here is old, so we start with a new one: -/bin/rm -f /etc/mtab{,~,.tmp} && /bin/touch /etc/mtab - -# Add entry for / to /etc/mtab: -if [ -z "$container" ]; then - /sbin/mount -f -w / -fi - -# Add /proc, /sys, and /dev/shm mounts to /etc/mtab: -if [ -z "$container" ]; then - if [ -d /proc/sys ]; then - /sbin/mount -f -t proc proc /proc - fi - if [ -d /sys/bus ]; then - /sbin/mount -f -t sysfs sysfs /sys - fi - if grep -q '^[^ ]\+ /dev/shm ' /proc/mounts 2> /dev/null ; then - /sbin/mount -f -t tmpfs tmpfs /dev/shm +# If /etc/mtab is a symlink (probably to /proc/mounts) then we don't want to mess with it. +if [ ! -L /etc/mtab -o ! -r /etc/mtab ]; then + # /etc/mtab is a file (or doesn't exist), so we'll handle it the old way: + # Any /etc/mtab that exists here is old, so we start with a new one: + /bin/rm -f /etc/mtab{,~,.tmp} && /bin/touch /etc/mtab + if [ -z "$container" ]; then + # Add /, /proc, /sys, and /dev/shm mounts to /etc/mtab: + /sbin/mount -f -w / + if [ -d /proc/sys ]; then + /sbin/mount -f -t proc proc /proc + fi + if [ -d /sys/bus ]; then + /sbin/mount -f -t sysfs sysfs /sys + fi + if grep -q '^[^ ]\+ /dev/shm ' /proc/mounts 2> /dev/null ; then + /sbin/mount -f -t tmpfs tmpfs /dev/shm + fi fi fi @@ -384,18 +382,15 @@ fi # because those have already been mounted. Also check that # devpts is not already mounted before attempting to mount # it. With a 2.6.x or newer kernel udev mounts devpts. -# We also need to wait a little bit to let USB and other -# hotplugged devices settle (sorry to slow down the boot): if [ -z "$container" ]; then echo "Mounting non-root local filesystems:" - sleep 3 if /bin/grep -wq devpts /proc/mounts ; then # This pipe after the mount command is just to convert the new # mount verbose output back to the old format that contained # more useful information: - /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs,nodevpts | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep "${dev} " ; done + /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs,nodevpts | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep " ${dev} " ; done else - /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep "${dev} " ; done + /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep " ${dev} " ; done fi fi @@ -411,13 +406,23 @@ if [ -x /etc/rc.d/rc.cgmanager -a -d /sys/fs/cgroup ]; then /etc/rc.d/rc.cgmanager start fi +# Start libcgroup services: +if [ -x /etc/rc.d/rc.cgconfig -a -x /etc/rc.d/rc.cgred -a -d /sys/fs/cgroup ]; then + /etc/rc.d/rc.cgconfig start ; echo " /usr/sbin/cgconfigparser -l /etc/cgconfig.conf" + /etc/rc.d/rc.cgred start +fi + # Clean up some temporary files: rm -f /var/run/* /var/run/*/* /var/run/*/*/* /etc/nologin \ /etc/dhcpc/*.pid /etc/forcefsck /etc/fastboot \ /var/state/saslauthd/saslauthd.pid \ /tmp/.Xauth* 1> /dev/null 2> /dev/null +if [ -d /var/lib/pkgtools/setup/tmp ]; then + ( cd /var/lib/pkgtools/setup/tmp && rm -rf * ) +elif [ -d /var/log/setup/tmp ]; then ( cd /var/log/setup/tmp && rm -rf * ) - ( cd /tmp && rm -rf kde-[a-zA-Z]* ksocket-[a-zA-Z]* hsperfdata_[a-zA-Z]* plugtmp* ) +fi +( cd /tmp && rm -rf kde-[a-zA-Z]* ksocket-[a-zA-Z]* hsperfdata_[a-zA-Z]* plugtmp* ) # Clear /var/lock/subsys: if [ -d /var/lock/subsys ]; then @@ -471,4 +476,3 @@ else dd if=/dev/urandom of=/etc/random-seed count=1 bs=512 2> /dev/null fi chmod 600 /etc/random-seed - diff --git a/source/ap/lxc/scripts/rc.S.orig b/source/ap/lxc/scripts/rc.S.orig index 78e68e40a..4162938f3 100644 --- a/source/ap/lxc/scripts/rc.S.orig +++ b/source/ap/lxc/scripts/rc.S.orig @@ -73,7 +73,6 @@ if grep -wq cgroup /proc/filesystems ; then fi fi - # Initialize the Logical Volume Manager. # This won't start unless we find /etc/lvmtab (LVM1) or # /etc/lvm/backup/ (LVM2). This is created by /sbin/vgscan, so to @@ -177,11 +176,6 @@ fi # Enable swapping: /sbin/swapon -a 2> /dev/null -# Start FUSE, if requested: -if [ -x /etc/rc.d/rc.fuse ]; then - /etc/rc.d/rc.fuse start -fi - # Set the tick and frequency for the system clock. # Default values are: TICK=10000 and FREQ=0 TICK=10000 @@ -235,8 +229,13 @@ if [ -r /etc/forcefsck ]; then FORCEFSCK="-f" fi -# Check the root filesystem: -if [ ! $READWRITE = yes ]; then +# If we're using F2FS for the root filesystem, don't check it as it doesn't +# allow checking a read-only filesystem: +if grep -q ' / f2fs ' /proc/mounts ; then + echo "Remounting root device with read-write enabled." + /sbin/mount -w -v -n -o remount / +elif [ ! $READWRITE = yes ]; then + # Check the root filesystem: RETVAL=0 if [ ! -r /etc/fastboot ]; then echo "Checking root filesystem:" @@ -275,7 +274,6 @@ if [ ! $READWRITE = yes ]; then /sbin/umount -a -r /sbin/mount -n -o remount,ro / echo "Rebooting system." - sleep 2 reboot -f fi # Remount the root filesystem in read-write mode @@ -298,22 +296,22 @@ else echo "to the Linux section in your /etc/lilo.conf and type 'lilo' to reinstall it." fi # Done checking root filesystem - -# Any /etc/mtab that exists here is old, so we start with a new one: -/bin/rm -f /etc/mtab{,~,.tmp} && /bin/touch /etc/mtab - -# Add entry for / to /etc/mtab: -/sbin/mount -f -w / - -# Add /proc, /sys, and /dev/shm mounts to /etc/mtab: -if [ -d /proc/sys ]; then - /sbin/mount -f -t proc proc /proc -fi -if [ -d /sys/bus ]; then - /sbin/mount -f -t sysfs sysfs /sys -fi -if grep -q '^[^ ]\+ /dev/shm ' /proc/mounts 2> /dev/null ; then - /sbin/mount -f -t tmpfs tmpfs /dev/shm +# If /etc/mtab is a symlink (probably to /proc/mounts) then we don't want to mess with it. +if [ ! -L /etc/mtab -o ! -r /etc/mtab ]; then + # /etc/mtab is a file (or doesn't exist), so we'll handle it the old way: + # Any /etc/mtab that exists here is old, so we start with a new one: + /bin/rm -f /etc/mtab{,~,.tmp} && /bin/touch /etc/mtab + # Add /, /proc, /sys, and /dev/shm mounts to /etc/mtab: + /sbin/mount -f -w / + if [ -d /proc/sys ]; then + /sbin/mount -f -t proc proc /proc + fi + if [ -d /sys/bus ]; then + /sbin/mount -f -t sysfs sysfs /sys + fi + if grep -q '^[^ ]\+ /dev/shm ' /proc/mounts 2> /dev/null ; then + /sbin/mount -f -t tmpfs tmpfs /dev/shm + fi fi # Configure ISA Plug-and-Play devices: @@ -359,17 +357,14 @@ fi # because those have already been mounted. Also check that # devpts is not already mounted before attempting to mount # it. With a 2.6.x or newer kernel udev mounts devpts. -# We also need to wait a little bit to let USB and other -# hotplugged devices settle (sorry to slow down the boot): echo "Mounting non-root local filesystems:" -sleep 3 if /bin/grep -wq devpts /proc/mounts ; then # This pipe after the mount command is just to convert the new # mount verbose output back to the old format that contained # more useful information: - /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs,nodevpts | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep "${dev} " ; done + /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs,nodevpts | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep " ${dev} " ; done else - /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep "${dev} " ; done + /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep " ${dev} " ; done fi # Enable swapping again. This is needed in case a swapfile is used, @@ -382,13 +377,23 @@ if [ -x /etc/rc.d/rc.cgmanager -a -d /sys/fs/cgroup ]; then /etc/rc.d/rc.cgmanager start fi +# Start libcgroup services: +if [ -x /etc/rc.d/rc.cgconfig -a -x /etc/rc.d/rc.cgred -a -d /sys/fs/cgroup ]; then + /etc/rc.d/rc.cgconfig start ; echo " /usr/sbin/cgconfigparser -l /etc/cgconfig.conf" + /etc/rc.d/rc.cgred start +fi + # Clean up some temporary files: rm -f /var/run/* /var/run/*/* /var/run/*/*/* /etc/nologin \ /etc/dhcpc/*.pid /etc/forcefsck /etc/fastboot \ /var/state/saslauthd/saslauthd.pid \ /tmp/.Xauth* 1> /dev/null 2> /dev/null +if [ -d /var/lib/pkgtools/setup/tmp ]; then + ( cd /var/lib/pkgtools/setup/tmp && rm -rf * ) +elif [ -d /var/log/setup/tmp ]; then ( cd /var/log/setup/tmp && rm -rf * ) - ( cd /tmp && rm -rf kde-[a-zA-Z]* ksocket-[a-zA-Z]* hsperfdata_[a-zA-Z]* plugtmp* ) +fi +( cd /tmp && rm -rf kde-[a-zA-Z]* ksocket-[a-zA-Z]* hsperfdata_[a-zA-Z]* plugtmp* ) # Clear /var/lock/subsys: if [ -d /var/lock/subsys ]; then @@ -442,4 +447,3 @@ else dd if=/dev/urandom of=/etc/random-seed count=1 bs=512 2> /dev/null fi chmod 600 /etc/random-seed - diff --git a/source/ap/lxc/scripts/rc.inet1.lxc b/source/ap/lxc/scripts/rc.inet1.lxc index 58213a7c0..2ae9bbb58 100644 --- a/source/ap/lxc/scripts/rc.inet1.lxc +++ b/source/ap/lxc/scripts/rc.inet1.lxc @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/bash # /etc/rc.d/rc.inet1 # This script is used to bring up the various network interfaces. # @@ -215,19 +215,28 @@ if_up() { # 15 seconds should be a reasonable default DHCP timeout. 30 was too much. echo "/etc/rc.d/rc.inet1: /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1}" | $LOGGER /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1} - # If the dhcpcd call succeeds, add extra IP addresses, if defined, to interface - if [ "$?" == "0" ] && [ -n "${IPALIASES[$i]}" ]; then - num=0 - for ipalias in ${IPALIASES[$i]}; do - /sbin/ip address add ${ipalias}/32 dev ${1} label ${1}:${num} ; - num=$(($num + 1)) - done + if [ "$?" == "0" ]; then # the dhcp call has succeeded + if [ -n "${IPALIASES[$i]}" ]; then + # Add extra IP addresses, if defined, to interface + num=0 + for ipalias in ${IPALIASES[$i]}; do + ip="${ipalias%/*}" + nm="${ipalias#*/}" + [ -z "$nm" ] || [ "$ip" == "$nm" ] && nm="32" + /sbin/ip address add ${ip}/${nm} dev ${1} label ${1}:${num} + num=$(($num + 1)) + done + fi + if [ "${PROMISCUOUS[$i]}" = "yes" ]; then + # Set promiscuous mode on the interface + /sbin/ip link set dev ${1} promisc on + fi fi else # bring up interface using a static IP address if [ -n "${IPADDR[$i]}" ]; then # skip unconfigured interfaces # Set up the network card: - echo "/etc/rc.d/rc.inet1: /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} dev ${1}" | $LOGGER - /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} dev ${1} + echo "/etc/rc.d/rc.inet1: /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} broadcast + dev ${1}" | $LOGGER + /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} broadcast + dev ${1} if /sbin/ip link show dev ${1} | grep -wq "state DOWN" ; then /sbin/ip link set dev ${1} up # Bring up interface fi @@ -235,10 +244,17 @@ if_up() { if [ -n "${IPALIASES[$i]}" ]; then num=0 for ipalias in ${IPALIASES[$i]}; do - /sbin/ip address add ${ipalias}/32 dev ${1} label ${1}:${num} ; + ip="${ipalias%/*}" + nm="${ipalias#*/}" + [ -z "$nm" ] || [ "$ip" == "$nm" ] && nm="32" + /sbin/ip address add ${ip}/${nm} dev ${1} label ${1}:${num} num=$(($num + 1)) done fi + if [ "${PROMISCUOUS[$i]}" = "yes" ]; then + # Set promiscuous mode on the interface + /sbin/ip link set dev ${1} promisc on + fi else debug_log "${1} interface is not configured in /etc/rc.d/rc.inet1.conf" fi @@ -279,6 +295,8 @@ if_down() { if [ -n "${BRNICS[$i]}" ]; then br_close $i fi + # Flush the address from the interface: + ip address flush dev ${1} fi } diff --git a/source/ap/lxc/scripts/rc.inet1.orig b/source/ap/lxc/scripts/rc.inet1.orig index 2f566ef89..cf9da0f46 100644 --- a/source/ap/lxc/scripts/rc.inet1.orig +++ b/source/ap/lxc/scripts/rc.inet1.orig @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/bash # /etc/rc.d/rc.inet1 # This script is used to bring up the various network interfaces. # @@ -204,19 +204,28 @@ if_up() { # 15 seconds should be a reasonable default DHCP timeout. 30 was too much. echo "/etc/rc.d/rc.inet1: /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1}" | $LOGGER /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1} - # If the dhcpcd call succeeds, add extra IP addresses, if defined, to interface - if [ "$?" == "0" ] && [ -n "${IPALIASES[$i]}" ]; then - num=0 - for ipalias in ${IPALIASES[$i]}; do - /sbin/ip address add ${ipalias}/32 dev ${1} label ${1}:${num} ; - num=$(($num + 1)) - done + if [ "$?" == "0" ]; then # the dhcp call has succeeded + if [ -n "${IPALIASES[$i]}" ]; then + # Add extra IP addresses, if defined, to interface + num=0 + for ipalias in ${IPALIASES[$i]}; do + ip="${ipalias%/*}" + nm="${ipalias#*/}" + [ -z "$nm" ] || [ "$ip" == "$nm" ] && nm="32" + /sbin/ip address add ${ip}/${nm} dev ${1} label ${1}:${num} + num=$(($num + 1)) + done + fi + if [ "${PROMISCUOUS[$i]}" = "yes" ]; then + # Set promiscuous mode on the interface + /sbin/ip link set dev ${1} promisc on + fi fi else # bring up interface using a static IP address if [ -n "${IPADDR[$i]}" ]; then # skip unconfigured interfaces # Set up the network card: - echo "/etc/rc.d/rc.inet1: /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} dev ${1}" | $LOGGER - /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} dev ${1} + echo "/etc/rc.d/rc.inet1: /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} broadcast + dev ${1}" | $LOGGER + /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} broadcast + dev ${1} if /sbin/ip link show dev ${1} | grep -wq "state DOWN" ; then /sbin/ip link set dev ${1} up # Bring up interface fi @@ -224,10 +233,17 @@ if_up() { if [ -n "${IPALIASES[$i]}" ]; then num=0 for ipalias in ${IPALIASES[$i]}; do - /sbin/ip address add ${ipalias}/32 dev ${1} label ${1}:${num} ; + ip="${ipalias%/*}" + nm="${ipalias#*/}" + [ -z "$nm" ] || [ "$ip" == "$nm" ] && nm="32" + /sbin/ip address add ${ip}/${nm} dev ${1} label ${1}:${num} num=$(($num + 1)) done fi + if [ "${PROMISCUOUS[$i]}" = "yes" ]; then + # Set promiscuous mode on the interface + /sbin/ip link set dev ${1} promisc on + fi else debug_log "${1} interface is not configured in /etc/rc.d/rc.inet1.conf" fi @@ -268,6 +284,8 @@ if_down() { if [ -n "${BRNICS[$i]}" ]; then br_close $i fi + # Flush the address from the interface: + ip address flush dev ${1} fi } diff --git a/source/l/libsigc++/libsigc++.SlackBuild b/source/l/libsigc++/libsigc++.SlackBuild index 7c003a0ae..c20c6cea0 100755 --- a/source/l/libsigc++/libsigc++.SlackBuild +++ b/source/l/libsigc++/libsigc++.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libsigc++ -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then @@ -64,9 +64,9 @@ fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 -cd $PKGNAM-$VERSION || exit 1 +rm -rf libsigcplusplus-$VERSION $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd libsigcplusplus-$VERSION || cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -74,6 +74,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +if [ ! -r configure ]; then + autoreconf -vif +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ diff --git a/source/n/iputils/iputils.SlackBuild b/source/n/iputils/iputils.SlackBuild index 137ec39b1..b4fee0c84 100755 --- a/source/n/iputils/iputils.SlackBuild +++ b/source/n/iputils/iputils.SlackBuild @@ -74,7 +74,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/iputils.docbook.revert.diff.gz | patch -p1 -R --verbose || exit 1 +zcat $CWD/iputils.docbook.revert.diff.gz | patch -p1 --verbose || exit 1 # Configure and build: export CFLAGS="$SLKCFLAGS" diff --git a/source/n/iputils/iputils.docbook.revert.diff b/source/n/iputils/iputils.docbook.revert.diff index a6cdc35bc..1658f89bf 100644 --- a/source/n/iputils/iputils.docbook.revert.diff +++ b/source/n/iputils/iputils.docbook.revert.diff @@ -1,164 +1,125 @@ -diff -u -r --new-file iputils-s20190324/doc/arping.xml iputils-s20190515/doc/arping.xml ---- iputils-s20190324/doc/arping.xml 2019-03-24 09:28:37.000000000 -0500 -+++ iputils-s20190515/doc/arping.xml 2019-05-15 15:14:10.000000000 -0500 +--- ./doc/rarpd.xml.orig 2019-07-09 15:55:49.000000000 -0500 ++++ ./doc/rarpd.xml 2019-07-19 11:58:31.999331384 -0500 @@ -1,4 +1,4 @@ -- +- -diff -u -r --new-file iputils-s20190324/doc/clockdiff.xml iputils-s20190515/doc/clockdiff.xml ---- iputils-s20190324/doc/clockdiff.xml 2019-03-24 09:28:37.000000000 -0500 -+++ iputils-s20190515/doc/clockdiff.xml 2019-05-15 15:14:10.000000000 -0500 +--- ./doc/custom-man.xsl.orig 2019-07-09 15:55:49.000000000 -0500 ++++ ./doc/custom-man.xsl 2019-07-19 11:58:31.966331383 -0500 +@@ -5,7 +5,7 @@ + extension-element-prefixes="exsl" + version="1.0"> + +- ++ + + + +--- ./doc/ninfod.xml.orig 2019-07-09 15:55:49.000000000 -0500 ++++ ./doc/ninfod.xml 2019-07-19 11:58:31.996331384 -0500 @@ -1,4 +1,4 @@ -- +- -diff -u -r --new-file iputils-s20190324/doc/custom-html.xsl iputils-s20190515/doc/custom-html.xsl ---- iputils-s20190324/doc/custom-html.xsl 2019-03-24 09:28:37.000000000 -0500 -+++ iputils-s20190515/doc/custom-html.xsl 2019-05-15 15:14:10.000000000 -0500 -@@ -2,7 +2,7 @@ +--- ./doc/traceroute6.xml.orig 2019-07-09 15:55:49.000000000 -0500 ++++ ./doc/traceroute6.xml 2019-07-19 11:58:32.004331384 -0500 +@@ -1,4 +1,4 @@ +- - + +--- ./doc/rdisc.xml.orig 2019-07-09 15:55:49.000000000 -0500 ++++ ./doc/rdisc.xml 2019-07-19 11:58:32.001331384 -0500 +@@ -1,4 +1,4 @@ +- -- -+ -