diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-09-18 19:22:30 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-09-19 09:00:33 +0200 |
| commit | a22d1843900f65ede3f87d55207ca0b8f2a38b98 (patch) | |
| tree | 2a80883ce31d38a325747f2d3b7596f19a647d35 /source/ap/slackpkg/slackpkg.SlackBuild | |
| parent | 77f4f1f5e6332a7c51dad716aba3ff2b03dc8d8a (diff) | |
| download | current-a22d1843900f65ede3f87d55207ca0b8f2a38b98.tar.gz | |
Tue Sep 18 19:22:30 UTC 201820180918192230
ap/dmidecode-3.2-x86_64-1.txz: Upgraded.
ap/nano-3.1-x86_64-1.txz: Upgraded.
ap/slackpkg-2.83.0-noarch-4.txz: Rebuilt.
Merged two patches from git:
Clarify that a press of "Enter" is needed to confirm kernel change
Mention possible stale mirror if CHECKSUMS.md5 gpg verify fails
Thanks to Mario Preksavec and Robby Workman.
ap/sqlite-3.25.0-x86_64-1.txz: Upgraded.
ap/xorriso-1.5.0-x86_64-1.txz: Upgraded.
l/lmdb-0.9.22-x86_64-2.txz: Rebuilt.
Fixed the build script to clear out the build area properly - previously
it was possible for binaries of the wrong $ARCH to end up in the package.
Thanks to reddog83.
n/gnutls-3.6.3-x86_64-2.txz: Rebuilt.
Merged backported SSL/TLS fixes. Thanks to orbea.
n/samba-4.9.0-x86_64-2.txz: Rebuilt.
Recompiled in case the lmdb package was broken.
Diffstat (limited to 'source/ap/slackpkg/slackpkg.SlackBuild')
| -rwxr-xr-x | source/ap/slackpkg/slackpkg.SlackBuild | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild index 2d6fe94c..a9323d8a 100755 --- a/source/ap/slackpkg/slackpkg.SlackBuild +++ b/source/ap/slackpkg/slackpkg.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=slackpkg VERSION=${VERSION:-2.83.0} ARCH="noarch" -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information @@ -134,6 +134,14 @@ mkdir -pv $PKG/var/cache/packages zcat $CWD/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch.gz | patch -p2 --verbose || exit 1 ) || exit 1 +( cd $PKG/usr/libexec/slackpkg/functions.d + zcat $CWD/0005-Clarify-that-a-press-of-Enter-is-needed-to-confirm-k.patch.gz | patch -p2 --verbose || exit 1 +) || exit 1 + +( cd $PKG/usr/libexec/slackpkg + zcat $CWD/0006-Mention-possible-stale-mirror-if-CHECKSUMS.md5-gpg-v.patch.gz | patch -p2 --verbose || exit 1 +) || exit 1 + mkdir -p $PKG/install zcat $CWD/doinst.sh.gz | sed -e "s/@VERSION@/$VERSION/g" > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc |