diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-06-03 05:14:12 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-06-03 14:58:00 +0200 |
commit | b5c37d741f799c8289c331f601c6499e8b974ec7 (patch) | |
tree | 9216f624c85161f6510d11c45a32e00b6edba884 | |
parent | 49c42264db93dbcfad7b9c15f7cb731627cc4ebc (diff) | |
download | current-b5c37d741f799c8289c331f601c6499e8b974ec7.tar.gz current-b5c37d741f799c8289c331f601c6499e8b974ec7.tar.xz |
Sun Jun 3 05:14:12 UTC 201820180603051412
a/mkinitrd-1.4.11-x86_64-7.txz: Rebuilt.
Provide absolute path to depmod. Thanks to andygoth.
ap/mariadb-10.3.7-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
libmysqld.so.19 was renamed to libmariadbd.so.19.
Anything linking to libmysqld.so.19 will need to be recompiled.
ap/nano-2.9.8-x86_64-1.txz: Upgraded.
ap/sysstat-11.6.4-x86_64-1.txz: Upgraded.
kde/amarok-2.9.0-x86_64-3.txz: Rebuilt.
Recompiled to link to libmariadbd.so.19.
l/librsvg-2.42.5-x86_64-1.txz: Upgraded.
n/p11-kit-0.23.12-x86_64-1.txz: Upgraded.
x/mesa-18.1.1-x86_64-1.txz: Upgraded.
-rw-r--r-- | ChangeLog.txt | 15 | ||||
-rw-r--r-- | FILELIST.TXT | 140 | ||||
-rw-r--r-- | source/a/mkinitrd/mkinitrd | 2 | ||||
-rwxr-xr-x | source/a/mkinitrd/mkinitrd.SlackBuild | 2 | ||||
-rwxr-xr-x | source/ap/mariadb/mariadb.SlackBuild | 1 | ||||
-rwxr-xr-x | source/ap/sysstat/sysstat.SlackBuild | 2 | ||||
-rw-r--r-- | source/ap/sysstat/sysstat.url | 2 | ||||
-rw-r--r-- | source/kde/build/amarok | 2 |
8 files changed, 91 insertions, 75 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 2ad5792aa..073ae17a8 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,18 @@ +Sun Jun 3 05:14:12 UTC 2018 +a/mkinitrd-1.4.11-x86_64-7.txz: Rebuilt. + Provide absolute path to depmod. Thanks to andygoth. +ap/mariadb-10.3.7-x86_64-1.txz: Upgraded. + Shared library .so-version bump. + libmysqld.so.19 was renamed to libmariadbd.so.19. + Anything linking to libmysqld.so.19 will need to be recompiled. +ap/nano-2.9.8-x86_64-1.txz: Upgraded. +ap/sysstat-11.6.4-x86_64-1.txz: Upgraded. +kde/amarok-2.9.0-x86_64-3.txz: Rebuilt. + Recompiled to link to libmariadbd.so.19. +l/librsvg-2.42.5-x86_64-1.txz: Upgraded. +n/p11-kit-0.23.12-x86_64-1.txz: Upgraded. +x/mesa-18.1.1-x86_64-1.txz: Upgraded. ++--------------------------+ Fri Jun 1 21:28:10 UTC 2018 a/mcelog-158-x86_64-1.txz: Upgraded. a/pkgtools-15.0-noarch-15.txz: Rebuilt. diff --git a/FILELIST.TXT b/FILELIST.TXT index caa3daf51..7b481d8e8 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Fri Jun 1 21:59:55 UTC 2018 +Sun Jun 3 05:25:11 UTC 2018 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 2018-06-01 21:28 . +drwxr-xr-x 12 root root 4096 2018-06-03 05:14 . -rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2 -rw-r--r-- 1 root root 11329 2018-01-08 02:48 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 893710 2018-05-31 05:07 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2018-05-31 05:07 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 893507 2018-06-01 22:00 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2018-06-01 22:00 ./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 403989 2018-06-01 21:28 ./ChangeLog.txt +-rw-r--r-- 1 root root 404630 2018-06-03 05:14 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2018-05-31 04:47 ./EFI/BOOT -rw-r--r-- 1 root root 1253376 2018-02-24 20:49 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2018-05-31 04:47 ./EFI/BOOT -rwxr-xr-x 1 root root 2494 2018-02-24 20:49 ./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 1176593 2018-05-31 05:07 ./FILELIST.TXT +-rw-r--r-- 1 root root 1176364 2018-06-01 21:59 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 724862 2018-06-01 21:58 ./PACKAGES.TXT +-rw-r--r-- 1 root root 724861 2018-06-03 05:23 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3634 2018-05-31 03:30 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -748,13 +748,13 @@ 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 2018-06-01 21:58 ./slackware64 --rw-r--r-- 1 root root 288031 2018-06-01 21:58 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2018-06-01 21:58 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 358852 2018-06-01 21:55 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 3605466 2018-06-01 21:56 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2018-06-03 05:23 ./slackware64 +-rw-r--r-- 1 root root 288028 2018-06-03 05:23 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2018-06-03 05:23 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 358849 2018-06-03 05:21 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 3610950 2018-06-03 05:21 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT -drwxr-xr-x 2 root root 20480 2018-06-01 21:55 ./slackware64/a +drwxr-xr-x 2 root root 20480 2018-06-03 05:20 ./slackware64/a -rw-r--r-- 1 root root 327 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txt -rw-r--r-- 1 root root 10972 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txz -rw-r--r-- 1 root root 163 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txz.asc @@ -957,9 +957,9 @@ drwxr-xr-x 2 root root 20480 2018-06-01 21:55 ./slackware64/a -rw-r--r-- 1 root root 374 2018-04-13 13:09 ./slackware64/a/minicom-2.7.1-x86_64-2.txt -rw-r--r-- 1 root root 296324 2018-04-13 13:09 ./slackware64/a/minicom-2.7.1-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:09 ./slackware64/a/minicom-2.7.1-x86_64-2.txz.asc --rw-r--r-- 1 root root 527 2018-04-18 18:55 ./slackware64/a/mkinitrd-1.4.11-x86_64-6.txt --rw-r--r-- 1 root root 584172 2018-04-18 18:55 ./slackware64/a/mkinitrd-1.4.11-x86_64-6.txz --rw-r--r-- 1 root root 163 2018-04-18 18:55 ./slackware64/a/mkinitrd-1.4.11-x86_64-6.txz.asc +-rw-r--r-- 1 root root 527 2018-06-03 02:32 ./slackware64/a/mkinitrd-1.4.11-x86_64-7.txt +-rw-r--r-- 1 root root 584104 2018-06-03 02:32 ./slackware64/a/mkinitrd-1.4.11-x86_64-7.txz +-rw-r--r-- 1 root root 163 2018-06-03 02:32 ./slackware64/a/mkinitrd-1.4.11-x86_64-7.txz.asc -rw-r--r-- 1 root root 668 2018-04-13 13:10 ./slackware64/a/mlocate-0.26-x86_64-2.txt -rw-r--r-- 1 root root 107812 2018-04-13 13:10 ./slackware64/a/mlocate-0.26-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:10 ./slackware64/a/mlocate-0.26-x86_64-2.txz.asc @@ -1096,7 +1096,7 @@ drwxr-xr-x 2 root root 20480 2018-06-01 21:55 ./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 2018-05-31 05:02 ./slackware64/ap +drwxr-xr-x 2 root root 20480 2018-06-03 05:20 ./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 @@ -1236,9 +1236,9 @@ drwxr-xr-x 2 root root 20480 2018-05-31 05:02 ./slackware64/ap -rw-r--r-- 1 root root 489 2018-05-01 15:32 ./slackware64/ap/man-pages-4.16-noarch-1.txt -rw-r--r-- 1 root root 3273928 2018-05-01 15:32 ./slackware64/ap/man-pages-4.16-noarch-1.txz -rw-r--r-- 1 root root 163 2018-05-01 15:32 ./slackware64/ap/man-pages-4.16-noarch-1.txz.asc --rw-r--r-- 1 root root 369 2018-05-22 04:20 ./slackware64/ap/mariadb-10.2.15-x86_64-1.txt --rw-r--r-- 1 root root 25561804 2018-05-22 04:20 ./slackware64/ap/mariadb-10.2.15-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-05-22 04:20 ./slackware64/ap/mariadb-10.2.15-x86_64-1.txz.asc +-rw-r--r-- 1 root root 369 2018-06-02 21:34 ./slackware64/ap/mariadb-10.3.7-x86_64-1.txt +-rw-r--r-- 1 root root 26479204 2018-06-02 21:34 ./slackware64/ap/mariadb-10.3.7-x86_64-1.txz +-rw-r--r-- 1 root root 163 2018-06-02 21:34 ./slackware64/ap/mariadb-10.3.7-x86_64-1.txz.asc -rw-r--r-- 1 root root 448 2018-04-13 13:27 ./slackware64/ap/mc-4.8.20-x86_64-2.txt -rw-r--r-- 1 root root 1747524 2018-04-13 13:27 ./slackware64/ap/mc-4.8.20-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:27 ./slackware64/ap/mc-4.8.20-x86_64-2.txz.asc @@ -1251,9 +1251,9 @@ drwxr-xr-x 2 root root 20480 2018-05-31 05:02 ./slackware64/ap -rw-r--r-- 1 root root 331 2018-04-13 13:28 ./slackware64/ap/mpg123-1.25.10-x86_64-2.txt -rw-r--r-- 1 root root 325668 2018-04-13 13:28 ./slackware64/ap/mpg123-1.25.10-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:28 ./slackware64/ap/mpg123-1.25.10-x86_64-2.txz.asc --rw-r--r-- 1 root root 430 2018-05-16 20:54 ./slackware64/ap/nano-2.9.7-x86_64-1.txt --rw-r--r-- 1 root root 501716 2018-05-16 20:54 ./slackware64/ap/nano-2.9.7-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-05-16 20:54 ./slackware64/ap/nano-2.9.7-x86_64-1.txz.asc +-rw-r--r-- 1 root root 430 2018-06-02 17:01 ./slackware64/ap/nano-2.9.8-x86_64-1.txt +-rw-r--r-- 1 root root 506216 2018-06-02 17:01 ./slackware64/ap/nano-2.9.8-x86_64-1.txz +-rw-r--r-- 1 root root 163 2018-06-02 17:01 ./slackware64/ap/nano-2.9.8-x86_64-1.txz.asc -rw-r--r-- 1 root root 512 2018-04-13 13:28 ./slackware64/ap/normalize-0.7.7-x86_64-3.txt -rw-r--r-- 1 root root 63188 2018-04-13 13:28 ./slackware64/ap/normalize-0.7.7-x86_64-3.txz -rw-r--r-- 1 root root 163 2018-04-13 13:28 ./slackware64/ap/normalize-0.7.7-x86_64-3.txz.asc @@ -1308,9 +1308,9 @@ drwxr-xr-x 2 root root 20480 2018-05-31 05:02 ./slackware64/ap -rw-r--r-- 1 root root 442 2018-04-30 18:43 ./slackware64/ap/sudo-1.8.23-x86_64-1.txt -rw-r--r-- 1 root root 713040 2018-04-30 18:43 ./slackware64/ap/sudo-1.8.23-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-04-30 18:43 ./slackware64/ap/sudo-1.8.23-x86_64-1.txz.asc --rw-r--r-- 1 root root 442 2018-04-13 13:33 ./slackware64/ap/sysstat-11.6.3-x86_64-2.txt --rw-r--r-- 1 root root 316140 2018-04-13 13:33 ./slackware64/ap/sysstat-11.6.3-x86_64-2.txz --rw-r--r-- 1 root root 163 2018-04-13 13:33 ./slackware64/ap/sysstat-11.6.3-x86_64-2.txz.asc +-rw-r--r-- 1 root root 442 2018-06-02 06:40 ./slackware64/ap/sysstat-11.6.4-x86_64-1.txt +-rw-r--r-- 1 root root 316468 2018-06-02 06:40 ./slackware64/ap/sysstat-11.6.4-x86_64-1.txz +-rw-r--r-- 1 root root 163 2018-06-02 06:40 ./slackware64/ap/sysstat-11.6.4-x86_64-1.txz.asc -rw-r--r-- 1 root root 928 2018-05-25 20:16 ./slackware64/ap/tagfile -rw-r--r-- 1 root root 505 2018-04-14 22:21 ./slackware64/ap/terminus-font-4.40-noarch-2.txt -rw-r--r-- 1 root root 2048976 2018-04-14 22:21 ./slackware64/ap/terminus-font-4.40-noarch-2.txz @@ -1561,10 +1561,10 @@ drwxr-xr-x 2 root root 4096 2018-05-31 05:02 ./slackware64/k -rw-r--r-- 1 root root 1171 2018-05-31 03:30 ./slackware64/k/maketag -rw-r--r-- 1 root root 1171 2018-05-31 03:30 ./slackware64/k/maketag.ez -rw-r--r-- 1 root root 18 2018-05-31 03:30 ./slackware64/k/tagfile -drwxr-xr-x 2 root root 45056 2018-05-28 19:18 ./slackware64/kde --rw-r--r-- 1 root root 319 2018-04-17 12:29 ./slackware64/kde/amarok-2.9.0-x86_64-2.txt --rw-r--r-- 1 root root 47000108 2018-04-17 12:29 ./slackware64/kde/amarok-2.9.0-x86_64-2.txz --rw-r--r-- 1 root root 163 2018-04-17 12:29 ./slackware64/kde/amarok-2.9.0-x86_64-2.txz.asc +drwxr-xr-x 2 root root 45056 2018-06-03 05:20 ./slackware64/kde +-rw-r--r-- 1 root root 319 2018-06-02 22:05 ./slackware64/kde/amarok-2.9.0-x86_64-3.txt +-rw-r--r-- 1 root root 47003780 2018-06-02 22:05 ./slackware64/kde/amarok-2.9.0-x86_64-3.txz +-rw-r--r-- 1 root root 163 2018-06-02 22:05 ./slackware64/kde/amarok-2.9.0-x86_64-3.txz.asc -rw-r--r-- 1 root root 444 2018-04-17 11:22 ./slackware64/kde/amor-4.14.3-x86_64-3.txt -rw-r--r-- 1 root root 193516 2018-04-17 11:22 ./slackware64/kde/amor-4.14.3-x86_64-3.txz -rw-r--r-- 1 root root 163 2018-04-17 11:22 ./slackware64/kde/amor-4.14.3-x86_64-3.txz.asc @@ -2401,7 +2401,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 2018-06-01 21:55 ./slackware64/l +drwxr-xr-x 2 root root 69632 2018-06-03 05:20 ./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 @@ -2740,7 +2740,7 @@ drwxr-xr-x 2 root root 69632 2018-06-01 21:55 ./slackware64/l -rw-r--r-- 1 root root 390 2018-04-13 14:52 ./slackware64/l/jasper-2.0.12-x86_64-2.txt -rw-r--r-- 1 root root 171052 2018-04-13 14:52 ./slackware64/l/jasper-2.0.12-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 14:52 ./slackware64/l/jasper-2.0.12-x86_64-2.txz.asc --rw-r--r-- 1 root root 246 2018-04-13 14:52 ./slackware64/l/jemalloc-4.5.0-x86_64-2.txt +-rw-r--r-- 1 root root 246 2018-04-13 14:52 ./slackware64/l/jemalloc-4.5.0-x86_64-2.txt -rw-r--r-- 1 root root 239832 2018-04-13 14:52 ./slackware64/l/jemalloc-4.5.0-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 14:52 ./slackware64/l/jemalloc-4.5.0-x86_64-2.txz.asc -rw-r--r-- 1 root root 349 2018-04-17 07:54 ./slackware64/l/js185-1.0.0-x86_64-2.txt @@ -2956,9 +2956,9 @@ drwxr-xr-x 2 root root 69632 2018-06-01 21:55 ./slackware64/l -rw-r--r-- 1 root root 405 2018-04-17 07:58 ./slackware64/l/librevenge-0.0.4-x86_64-2.txt -rw-r--r-- 1 root root 280644 2018-04-17 07:58 ./slackware64/l/librevenge-0.0.4-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-17 07:58 ./slackware64/l/librevenge-0.0.4-x86_64-2.txz.asc --rw-r--r-- 1 root root 174 2018-05-09 04:22 ./slackware64/l/librsvg-2.42.4-x86_64-1.txt --rw-r--r-- 1 root root 522780 2018-05-09 04:22 ./slackware64/l/librsvg-2.42.4-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-05-09 04:22 ./slackware64/l/librsvg-2.42.4-x86_64-1.txz.asc +-rw-r--r-- 1 root root 174 2018-06-02 06:31 ./slackware64/l/librsvg-2.42.5-x86_64-1.txt +-rw-r--r-- 1 root root 525376 2018-06-02 06:31 ./slackware64/l/librsvg-2.42.5-x86_64-1.txz +-rw-r--r-- 1 root root 163 2018-06-02 06:31 ./slackware64/l/librsvg-2.42.5-x86_64-1.txz.asc -rw-r--r-- 1 root root 650 2018-04-13 15:02 ./slackware64/l/libsamplerate-0.1.9-x86_64-2.txt -rw-r--r-- 1 root root 976748 2018-04-13 15:02 ./slackware64/l/libsamplerate-0.1.9-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 15:02 ./slackware64/l/libsamplerate-0.1.9-x86_64-2.txz.asc @@ -3349,7 +3349,7 @@ drwxr-xr-x 2 root root 69632 2018-06-01 21:55 ./slackware64/l -rw-r--r-- 1 root root 388 2018-04-13 15:26 ./slackware64/l/zlib-1.2.11-x86_64-2.txt -rw-r--r-- 1 root root 103500 2018-04-13 15:26 ./slackware64/l/zlib-1.2.11-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 15:26 ./slackware64/l/zlib-1.2.11-x86_64-2.txz.asc -drwxr-xr-x 2 root root 32768 2018-05-31 05:02 ./slackware64/n +drwxr-xr-x 2 root root 32768 2018-06-03 05:20 ./slackware64/n -rw-r--r-- 1 root root 368 2018-04-13 15:28 ./slackware64/n/ModemManager-1.6.12-x86_64-2.txt -rw-r--r-- 1 root root 928472 2018-04-13 15:28 ./slackware64/n/ModemManager-1.6.12-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 15:28 ./slackware64/n/ModemManager-1.6.12-x86_64-2.txz.asc @@ -3681,9 +3681,9 @@ drwxr-xr-x 2 root root 32768 2018-05-31 05:02 ./slackware64/n -rw-r--r-- 1 root root 430 2018-05-08 04:24 ./slackware64/n/openvpn-2.4.6-x86_64-2.txt -rw-r--r-- 1 root root 451652 2018-05-08 04:24 ./slackware64/n/openvpn-2.4.6-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-05-08 04:24 ./slackware64/n/openvpn-2.4.6-x86_64-2.txz.asc --rw-r--r-- 1 root root 485 2018-05-28 18:08 ./slackware64/n/p11-kit-0.23.11-x86_64-1.txt --rw-r--r-- 1 root root 443332 2018-05-28 18:08 ./slackware64/n/p11-kit-0.23.11-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-05-28 18:08 ./slackware64/n/p11-kit-0.23.11-x86_64-1.txz.asc +-rw-r--r-- 1 root root 485 2018-06-02 17:02 ./slackware64/n/p11-kit-0.23.12-x86_64-1.txt +-rw-r--r-- 1 root root 442196 2018-06-02 17:02 ./slackware64/n/p11-kit-0.23.12-x86_64-1.txz +-rw-r--r-- 1 root root 163 2018-06-02 17:02 ./slackware64/n/p11-kit-0.23.12-x86_64-1.txz.asc -rw-r--r-- 1 root root 374 2018-05-25 18:31 ./slackware64/n/php-7.2.6-x86_64-1.txt -rw-r--r-- 1 root root 6342720 2018-05-25 18:31 ./slackware64/n/php-7.2.6-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-05-25 18:31 ./slackware64/n/php-7.2.6-x86_64-1.txz.asc @@ -3829,7 +3829,7 @@ drwxr-xr-x 2 root root 4096 2018-04-18 08:32 ./slackware64/tcl -rw-r--r-- 1 root root 198 2018-04-13 16:03 ./slackware64/tcl/tk-8.6.8-x86_64-2.txt -rw-r--r-- 1 root root 1762804 2018-04-13 16:03 ./slackware64/tcl/tk-8.6.8-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 16:03 ./slackware64/tcl/tk-8.6.8-x86_64-2.txz.asc -drwxr-xr-x 2 root root 65536 2018-06-01 21:55 ./slackware64/x +drwxr-xr-x 2 root root 65536 2018-06-03 05:20 ./slackware64/x -rw-r--r-- 1 root root 257 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txt -rw-r--r-- 1 root root 5074404 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txz.asc @@ -4188,9 +4188,9 @@ drwxr-xr-x 2 root root 65536 2018-06-01 21:55 ./slackware64/x -rw-r--r-- 1 root root 163 2018-04-13 05:49 ./slackware64/x/makedepend-1.0.5-x86_64-3.txz.asc -rw-r--r-- 1 root root 22426 2018-05-01 20:38 ./slackware64/x/maketag -rw-r--r-- 1 root root 22426 2018-05-01 20:38 ./slackware64/x/maketag.ez --rw-r--r-- 1 root root 333 2018-05-18 17:36 ./slackware64/x/mesa-18.0.4-x86_64-1.txt --rw-r--r-- 1 root root 13173888 2018-05-18 17:36 ./slackware64/x/mesa-18.0.4-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-05-18 17:36 ./slackware64/x/mesa-18.0.4-x86_64-1.txz.asc +-rw-r--r-- 1 root root 333 2018-06-02 06:56 ./slackware64/x/mesa-18.1.1-x86_64-1.txt +-rw-r--r-- 1 root root 13437016 2018-06-02 06:56 ./slackware64/x/mesa-18.1.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2018-06-02 06:56 ./slackware64/x/mesa-18.1.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 425 2018-04-13 06:03 ./slackware64/x/mkcomposecache-1.2.1-x86_64-3.txt -rw-r--r-- 1 root root 9448 2018-04-13 06:03 ./slackware64/x/mkcomposecache-1.2.1-x86_64-3.txz -rw-r--r-- 1 root root 163 2018-04-13 06:03 ./slackware64/x/mkcomposecache-1.2.1-x86_64-3.txz.asc @@ -4927,11 +4927,11 @@ drwxr-xr-x 2 root root 4096 2018-04-18 08:35 ./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 2018-06-01 21:59 ./source --rw-r--r-- 1 root root 450394 2018-06-01 21:59 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2018-06-01 21:59 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 637564 2018-06-01 21:59 ./source/FILE_LIST --rw-r--r-- 1 root root 14762871 2018-06-01 21:59 ./source/MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2018-06-03 05:25 ./source +-rw-r--r-- 1 root root 450393 2018-06-03 05:25 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2018-06-03 05:25 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 637563 2018-06-03 05:24 ./source/FILE_LIST +-rw-r--r-- 1 root root 14779992 2018-06-03 05:24 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT drwxr-xr-x 108 root root 4096 2018-05-24 18:00 ./source/a -rw-r--r-- 1 root root 567 2018-03-13 18:43 ./source/a/FTBFSlog @@ -5446,9 +5446,9 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/mkinitrd -rw-r--r-- 1 root root 27605 2018-04-18 04:06 ./source/a/mkinitrd/busybox-dot-config -rwxr-xr-x 1 root root 12440 2018-04-18 18:55 ./source/a/mkinitrd/init -rw-r--r-- 1 root root 29903 2009-12-18 05:10 ./source/a/mkinitrd/keymaps.tar.gz --rw-r--r-- 1 root root 26426 2017-10-09 18:06 ./source/a/mkinitrd/mkinitrd +-rw-r--r-- 1 root root 26432 2018-06-03 02:30 ./source/a/mkinitrd/mkinitrd -rw-r--r-- 1 root root 8981 2018-04-18 18:49 ./source/a/mkinitrd/mkinitrd.8 --rwxr-xr-x 1 root root 5364 2018-04-23 17:20 ./source/a/mkinitrd/mkinitrd.SlackBuild +-rwxr-xr-x 1 root root 5364 2018-06-03 02:30 ./source/a/mkinitrd/mkinitrd.SlackBuild -rw-r--r-- 1 root root 7109 2018-04-18 18:46 ./source/a/mkinitrd/mkinitrd.conf.5 -rw-r--r-- 1 root root 529 2017-06-29 16:52 ./source/a/mkinitrd/mkinitrd.conf.sample -rw-r--r-- 1 root root 5624 2016-02-08 20:10 ./source/a/mkinitrd/mkinitrd_command_generator.8 @@ -5699,7 +5699,7 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/udisks -rw-r--r-- 1 root root 37 2010-11-10 05:15 ./source/a/udisks/udisks.url drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/udisks2 -rw-r--r-- 1 root root 386 2012-07-19 03:58 ./source/a/udisks2/doinst.sh.gz --rw-r--r-- 1 root root 882 2018-02-27 06:13 ./source/a/udisks2/slack-desc +-rw-r--r-- 1 root root 882 2018-02-27 06:13 ./source/a/udisks2/slack-desc -rw-r--r-- 1 root root 967776 2017-05-15 11:29 ./source/a/udisks2/udisks-2.6.5.tar.xz -rwxr-xr-x 1 root root 4543 2018-04-23 17:20 ./source/a/udisks2/udisks2.SlackBuild drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/unarj @@ -5782,7 +5782,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 2018-05-24 18:55 ./source/ap +drwxr-xr-x 82 root root 4096 2018-06-02 22:01 ./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-04-23 17:20 ./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 @@ -6095,10 +6095,10 @@ drwxr-xr-x 2 root root 4096 2018-05-01 15:30 ./source/ap/man-pages -rwxr-xr-x 1 root root 3747 2018-05-01 15:31 ./source/ap/man-pages/man-pages.SlackBuild -rw-r--r-- 1 root root 48 2018-05-01 15:30 ./source/ap/man-pages/man-pages.url -rw-r--r-- 1 root root 946 2018-02-27 06:13 ./source/ap/man-pages/slack-desc -drwxr-xr-x 2 root root 4096 2018-05-22 03:38 ./source/ap/mariadb +drwxr-xr-x 2 root root 4096 2018-06-02 20:41 ./source/ap/mariadb -rw-r--r-- 1 root root 418 2017-09-08 16:20 ./source/ap/mariadb/doinst.sh.gz --rw-r--r-- 1 root root 44374142 2018-05-16 21:31 ./source/ap/mariadb/mariadb-10.2.15.tar.lz --rwxr-xr-x 1 root root 7333 2018-05-22 04:13 ./source/ap/mariadb/mariadb.SlackBuild +-rw-r--r-- 1 root root 44371697 2018-05-23 20:39 ./source/ap/mariadb/mariadb-10.3.7.tar.lz +-rwxr-xr-x 1 root root 7383 2018-06-02 21:24 ./source/ap/mariadb/mariadb.SlackBuild -rw-r--r-- 1 root root 34 2015-05-07 18:51 ./source/ap/mariadb/mirror.url -rw-r--r-- 1 root root 1328 2017-08-12 11:02 ./source/ap/mariadb/rc.mysqld.gz -rw-r--r-- 1 root root 824 2018-02-27 06:12 ./source/ap/mariadb/slack-desc @@ -6125,10 +6125,10 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/ap/mpg123 -rw-r--r-- 1 root root 761421 2018-02-27 10:40 ./source/ap/mpg123/mpg123-1.25.10.tar.lz -rwxr-xr-x 1 root root 6121 2018-04-25 18:15 ./source/ap/mpg123/mpg123.SlackBuild -rw-r--r-- 1 root root 785 2018-02-27 06:12 ./source/ap/mpg123/slack-desc -drwxr-xr-x 2 root root 4096 2018-05-16 20:51 ./source/ap/nano +drwxr-xr-x 2 root root 4096 2018-06-02 17:00 ./source/ap/nano -rw-r--r-- 1 root root 269 2012-06-18 08:46 ./source/ap/nano/doinst.sh.gz --rw-r--r-- 1 root root 1504124 2018-05-15 07:15 ./source/ap/nano/nano-2.9.7.tar.xz --rw-r--r-- 1 root root 833 2018-05-15 07:15 ./source/ap/nano/nano-2.9.7.tar.xz.sig +-rw-r--r-- 1 root root 1499948 2018-06-02 08:26 ./source/ap/nano/nano-2.9.8.tar.xz +-rw-r--r-- 1 root root 833 2018-06-02 08:26 ./source/ap/nano/nano-2.9.8.tar.xz.sig -rwxr-xr-x 1 root root 5238 2018-04-27 18:12 ./source/ap/nano/nano.SlackBuild -rw-r--r-- 1 root root 882 2018-02-27 06:12 ./source/ap/nano/slack-desc drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/ap/normalize @@ -6261,12 +6261,12 @@ drwxr-xr-x 2 root root 4096 2018-04-30 18:39 ./source/ap/sudo -rw-r--r-- 1 root root 894 2018-02-27 06:12 ./source/ap/sudo/slack-desc -rw-r--r-- 1 root root 1748006 2018-04-29 20:00 ./source/ap/sudo/sudo-1.8.23.tar.lz -rwxr-xr-x 1 root root 4155 2018-04-30 18:40 ./source/ap/sudo/sudo.SlackBuild -drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/ap/sysstat +drwxr-xr-x 2 root root 4096 2018-06-02 06:39 ./source/ap/sysstat -rw-r--r-- 1 root root 527 2009-08-30 05:02 ./source/ap/sysstat/doinst.sh.gz -rw-r--r-- 1 root root 897 2018-02-27 06:12 ./source/ap/sysstat/slack-desc --rw-r--r-- 1 root root 527828 2018-04-06 13:20 ./source/ap/sysstat/sysstat-11.6.3.tar.xz --rwxr-xr-x 1 root root 5411 2018-04-23 17:20 ./source/ap/sysstat/sysstat.SlackBuild --rw-r--r-- 1 root root 62 2018-04-07 20:08 ./source/ap/sysstat/sysstat.url +-rw-r--r-- 1 root root 528028 2018-06-01 09:55 ./source/ap/sysstat/sysstat-11.6.4.tar.xz +-rwxr-xr-x 1 root root 5411 2018-06-02 06:39 ./source/ap/sysstat/sysstat.SlackBuild +-rw-r--r-- 1 root root 62 2018-06-02 06:39 ./source/ap/sysstat/sysstat.url drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/ap/terminus-font -rw-r--r-- 1 root root 158 2013-02-19 21:51 ./source/ap/terminus-font/doinst.sh.gz -rw-r--r-- 1 root root 966 2018-02-27 06:12 ./source/ap/terminus-font/slack-desc @@ -6781,7 +6781,7 @@ drwxr-xr-x 2 root root 4096 2018-03-05 18:29 ./source/k/slack-desc drwxr-xr-x 14 root root 4096 2018-04-15 21:21 ./source/kde -rw-r--r-- 1 root root 1025 2018-03-24 17:45 ./source/kde/FTBFSlog drwxr-xr-x 2 root root 4096 2018-04-13 02:43 ./source/kde/build --rw-r--r-- 1 root root 2 2018-04-13 02:43 ./source/kde/build/amarok +-rw-r--r-- 1 root root 2 2018-06-02 22:02 ./source/kde/build/amarok -rw-r--r-- 1 root root 2 2018-04-13 02:43 ./source/kde/build/amor -rw-r--r-- 1 root root 2 2018-04-13 02:43 ./source/kde/build/analitza -rw-r--r-- 1 root root 2 2018-04-13 02:43 ./source/kde/build/ark @@ -8867,8 +8867,8 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/l/librevenge -rw-r--r-- 1 root root 421604 2016-01-12 07:44 ./source/l/librevenge/librevenge-0.0.4.tar.xz -rwxr-xr-x 1 root root 4133 2018-04-23 17:20 ./source/l/librevenge/librevenge.SlackBuild -rw-r--r-- 1 root root 863 2018-02-27 06:12 ./source/l/librevenge/slack-desc -drwxr-xr-x 2 root root 4096 2018-05-09 04:19 ./source/l/librsvg --rw-r--r-- 1 root root 9915784 2018-05-07 21:34 ./source/l/librsvg/librsvg-2.42.4.tar.xz +drwxr-xr-x 2 root root 4096 2018-06-02 06:29 ./source/l/librsvg +-rw-r--r-- 1 root root 9922440 2018-06-02 02:22 ./source/l/librsvg/librsvg-2.42.5.tar.xz -rwxr-xr-x 1 root root 4132 2018-05-09 04:19 ./source/l/librsvg/librsvg.SlackBuild -rw-r--r-- 1 root root 629 2018-02-27 06:12 ./source/l/librsvg/slack-desc drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/l/libsamplerate @@ -10304,8 +10304,8 @@ drwxr-xr-x 2 root root 4096 2018-05-06 19:33 ./source/n/openvpn -rw-r--r-- 1 root root 3489 2018-02-28 21:25 ./source/n/openvpn/rc.openvpn -rw-r--r-- 1 root root 885 2018-02-27 06:13 ./source/n/openvpn/slack-desc -rw-r--r-- 1 root root 6942 2007-06-12 03:48 ./source/n/openvpn/slackware.conf -drwxr-xr-x 2 root root 4096 2018-05-28 18:07 ./source/n/p11-kit --rw-r--r-- 1 root root 785944 2018-05-25 14:30 ./source/n/p11-kit/p11-kit-0.23.11.tar.lz +drwxr-xr-x 2 root root 4096 2018-06-02 17:01 ./source/n/p11-kit +-rw-r--r-- 1 root root 788149 2018-05-30 14:24 ./source/n/p11-kit/p11-kit-0.23.12.tar.lz -rwxr-xr-x 1 root root 3604 2018-05-28 18:07 ./source/n/p11-kit/p11-kit.SlackBuild -rw-r--r-- 1 root root 45 2018-05-28 18:06 ./source/n/p11-kit/p11-kit.url -rw-r--r-- 1 root root 972 2018-02-27 06:13 ./source/n/p11-kit/slack-desc @@ -10767,12 +10767,12 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/x/m17n-lib -rw-r--r-- 1 root root 749501 2018-02-08 14:02 ./source/x/m17n-lib/m17n-lib-1.8.0.tar.lz -rwxr-xr-x 1 root root 5603 2018-04-23 17:20 ./source/x/m17n-lib/m17n-lib.SlackBuild -rw-r--r-- 1 root root 870 2018-02-27 06:13 ./source/x/m17n-lib/slack-desc -drwxr-xr-x 3 root root 4096 2018-05-18 17:21 ./source/x/mesa +drwxr-xr-x 3 root root 4096 2018-06-02 06:42 ./source/x/mesa -rw-r--r-- 1 root root 352 2008-03-10 07:13 ./source/x/mesa/README.GIT -rw-r--r-- 1 root root 268 2017-08-26 17:17 ./source/x/mesa/doinst.sh.gz -rwxr-xr-x 1 root root 720 2015-12-11 03:09 ./source/x/mesa/get-mesa.sh --rw-r--r-- 1 root root 10939356 2018-05-17 18:38 ./source/x/mesa/mesa-18.0.4.tar.xz --rw-r--r-- 1 root root 566 2018-05-17 18:38 ./source/x/mesa/mesa-18.0.4.tar.xz.sig +-rw-r--r-- 1 root root 11110892 2018-06-01 15:21 ./source/x/mesa/mesa-18.1.1.tar.xz +-rw-r--r-- 1 root root 119 2018-06-01 15:21 ./source/x/mesa/mesa-18.1.1.tar.xz.sig -rw-r--r-- 1 root root 7206679 2018-02-23 08:54 ./source/x/mesa/mesa-demos-8.4.0.tar.lz -rwxr-xr-x 1 root root 6609 2018-05-19 03:20 ./source/x/mesa/mesa.SlackBuild -rw-r--r-- 1 root root 78 2010-10-01 04:23 ./source/x/mesa/mesa.url diff --git a/source/a/mkinitrd/mkinitrd b/source/a/mkinitrd/mkinitrd index c594ed2df..7c2f7629f 100644 --- a/source/a/mkinitrd/mkinitrd +++ b/source/a/mkinitrd/mkinitrd @@ -759,7 +759,7 @@ if [ ! -z "$MODULE_LIST" ]; then done # Pregenerate the module dependency information - depmod -a -b $SOURCE_TREE ${KERNEL_VERSION} + /sbin/depmod -a -b $SOURCE_TREE ${KERNEL_VERSION} # Copy /{etc,lib}/modprobe.d/* if desired if [ ! -z $MODCONF ]; then diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild index 22fa7344f..fba5eeac2 100755 --- a/source/a/mkinitrd/mkinitrd.SlackBuild +++ b/source/a/mkinitrd/mkinitrd.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mkinitrd VERSION=${VERSION:-1.4.11} BB=1.28.3 -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild index f7d803d88..643adc883 100755 --- a/source/ap/mariadb/mariadb.SlackBuild +++ b/source/ap/mariadb/mariadb.SlackBuild @@ -163,6 +163,7 @@ install -m644 debian/additions/mysqlreport.1 $PKG/usr/man/man1/ if [ "$KEEPSTATIC" = "NO" ]; then # Remove large static libraries: rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmariadbclient.a + rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmariadbd.a rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqlclient.a rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqlclient_r.a rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqld.a diff --git a/source/ap/sysstat/sysstat.SlackBuild b/source/ap/sysstat/sysstat.SlackBuild index 0ce3927de..ddeeb4c13 100755 --- a/source/ap/sysstat/sysstat.SlackBuild +++ b/source/ap/sysstat/sysstat.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sysstat VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/sysstat/sysstat.url b/source/ap/sysstat/sysstat.url index ce62113c1..5ff1b1e07 100644 --- a/source/ap/sysstat/sysstat.url +++ b/source/ap/sysstat/sysstat.url @@ -1 +1 @@ -http://perso.orange.fr/sebastien.godard/sysstat-11.6.3.tar.xz +http://perso.orange.fr/sebastien.godard/sysstat-11.6.4.tar.xz diff --git a/source/kde/build/amarok b/source/kde/build/amarok index 0cfbf0888..00750edc0 100644 --- a/source/kde/build/amarok +++ b/source/kde/build/amarok @@ -1 +1 @@ -2 +3 |