diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-06-11 19:09:59 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2021-06-12 08:59:52 +0200 |
commit | 658e62183bbb841a65b6ba5a20a16a216394cd4a (patch) | |
tree | 92a4d7f4490a051c7a559dbeb8a89f8a2255b5f0 /source | |
parent | 501b288e546fa7115e1675d4dcff55af2cb4cf3f (diff) | |
download | current-658e62183bbb841a65b6ba5a20a16a216394cd4a.tar.gz current-658e62183bbb841a65b6ba5a20a16a216394cd4a.tar.xz |
Fri Jun 11 19:09:59 UTC 202120210611190959
a/util-linux-2.37-x86_64-1.txz: Upgraded.
l/glib2-2.68.3-x86_64-1.txz: Upgraded.
l/mozilla-nss-3.67-x86_64-1.txz: Upgraded.
l/rubygem-asciidoctor-2.0.15-x86_64-1.txz: Added.
This is required to process the man pages for the util-linux build.
Thanks to Trevor D. Cook.
n/gnupg2-2.2.28-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-x | source/a/util-linux/util-linux.SlackBuild | 5 | ||||
-rwxr-xr-x | source/l/mozilla-nss/mozilla-nss.SlackBuild | 4 | ||||
-rw-r--r-- | source/l/rubygem-asciidoctor/asciidoctor-2.0.15.gem | bin | 0 -> 276480 bytes | |||
-rw-r--r-- | source/l/rubygem-asciidoctor/asciidoctor.url | 1 | ||||
-rwxr-xr-x | source/l/rubygem-asciidoctor/rubygem-asciidoctor.SlackBuild | 131 | ||||
-rw-r--r-- | source/l/rubygem-asciidoctor/slack-desc | 19 | ||||
-rwxr-xr-x | source/n/gnupg2/gnupg2.SlackBuild | 2 |
7 files changed, 157 insertions, 5 deletions
diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 3c33fe586..d905da669 100755 --- a/source/a/util-linux/util-linux.SlackBuild +++ b/source/a/util-linux/util-linux.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=util-linux VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} ADJTIMEXVERS=1.29 SETSERIALVERS=2.17 @@ -142,6 +142,7 @@ configure_with_python(){ --docdir=/usr/doc/util-linux-$VERSION \ --disable-static \ --enable-agetty \ + --enable-fdformat \ --enable-kill \ --disable-last \ --enable-libmount-support-mtab \ diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild index 25613b202..4bef0f095 100755 --- a/source/l/mozilla-nss/mozilla-nss.SlackBuild +++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-nss SRCNAM=nss -VERSION=${VERSION:-3.66} -NSPR=${NSPR:-4.30} +VERSION=${VERSION:-3.67} +NSPR=${NSPR:-4.31} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/l/rubygem-asciidoctor/asciidoctor-2.0.15.gem b/source/l/rubygem-asciidoctor/asciidoctor-2.0.15.gem Binary files differnew file mode 100644 index 000000000..5c37df301 --- /dev/null +++ b/source/l/rubygem-asciidoctor/asciidoctor-2.0.15.gem diff --git a/source/l/rubygem-asciidoctor/asciidoctor.url b/source/l/rubygem-asciidoctor/asciidoctor.url new file mode 100644 index 000000000..73023a064 --- /dev/null +++ b/source/l/rubygem-asciidoctor/asciidoctor.url @@ -0,0 +1 @@ +https://rubygems.org/gems/asciidoctor diff --git a/source/l/rubygem-asciidoctor/rubygem-asciidoctor.SlackBuild b/source/l/rubygem-asciidoctor/rubygem-asciidoctor.SlackBuild new file mode 100755 index 000000000..5a3843d67 --- /dev/null +++ b/source/l/rubygem-asciidoctor/rubygem-asciidoctor.SlackBuild @@ -0,0 +1,131 @@ +#!/bin/bash + +# Copyright 2021 Trevor D. Cook, Issaquah, WA, USA +# Copyright 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=rubygem-asciidoctor +SRCNAM=asciidoctor +VERSION=${VERSION:-$(basename $(echo $SRCNAM-*.gem | cut -f 2 -d -) .gem)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +# 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 +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP + +DESTDIR=$( ruby -r rbconfig -e ' +include RbConfig +printf("%s/%s/gems/%s\n", + CONFIG["libdir"], + CONFIG["RUBY_INSTALL_NAME"], + CONFIG["ruby_version"] + ) +') + +gem specification $CWD/$SRCNAM-$VERSION.gem | \ + ruby -r yaml -r rbconfig -e ' +c = RbConfig::CONFIG +path = sprintf("%s/%s/gems/%s", + c["libdir"], + c["RUBY_INSTALL_NAME"], + c["ruby_version"]) +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } +obj = Gem::Specification.from_yaml($stdin) +obj.dependencies.each {|dep| + if not(dep.type == :runtime) + next + end + if not(sys_gemspecs.include?(dep.name)) + $stderr.write("WARNING: #{dep.name} gem not found\n") + sleep 0.5 + end + +}' + +gem install \ + --local \ + --no-update-sources \ + --ignore-dependencies \ + --backtrace \ + --install-dir $PKG/$DESTDIR \ + --bindir $PKG/usr/bin \ + $CWD/$SRCNAM-$VERSION.gem || exit 1 + +# Strip binaries (there aren't any though): +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a $PKG/usr/lib${LIBDIRSUFFIX}/ruby/gems/*/gems/asciidoctor-${VERSION}/CHANGELOG* $PKG/usr/doc/$PKGNAM-$VERSION +cp -a $PKG/usr/lib${LIBDIRSUFFIX}/ruby/gems/*/gems/asciidoctor-${VERSION}/LICENSE* $PKG/usr/doc/$PKGNAM-$VERSION +cp -a $PKG/usr/lib${LIBDIRSUFFIX}/ruby/gems/*/gems/asciidoctor-${VERSION}/README* $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/rubygem-asciidoctor/slack-desc b/source/l/rubygem-asciidoctor/slack-desc new file mode 100644 index 000000000..da8a67270 --- /dev/null +++ b/source/l/rubygem-asciidoctor/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +rubygem-asciidoctor: rubygem-asciidoctor (text processor and publishing toolchain) +rubygem-asciidoctor: +rubygem-asciidoctor: Asciidoctor is a fast text processor and publishing toolchain for +rubygem-asciidoctor: converting AsciiDoc content to HTML5, DocBook 5 (or 4.5) and other +rubygem-asciidoctor: formats. +rubygem-asciidoctor: +rubygem-asciidoctor: Homepage: https://asciidoctor.org +rubygem-asciidoctor: +rubygem-asciidoctor: +rubygem-asciidoctor: +rubygem-asciidoctor: diff --git a/source/n/gnupg2/gnupg2.SlackBuild b/source/n/gnupg2/gnupg2.SlackBuild index eb93a8251..eb30b9d3d 100755 --- a/source/n/gnupg2/gnupg2.SlackBuild +++ b/source/n/gnupg2/gnupg2.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gnupg2 VERSION=${VERSION:-$(echo gnupg-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} |