diff options
33 files changed, 327 insertions, 146 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 5d870f436..87d7b1d48 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -5,9 +5,6 @@ set -e TARGET_ARCH="$1" SUDO_APK=abuild-apk -# optional cross build packages -KERNEL_PKG="linux-firmware linux-vanilla" - # get abuild configurables [ -e /usr/share/abuild/functions.sh ] || (echo "abuild not found" ; exit 1) CBUILDROOT="$(CTARGET=$TARGET_ARCH . /usr/share/abuild/functions.sh ; echo $CBUILDROOT)" @@ -17,7 +14,7 @@ CBUILDROOT="$(CTARGET=$TARGET_ARCH . /usr/share/abuild/functions.sh ; echo $CBUI # deduce aports directory [ -z "$APORTS" ] && APORTS=$(realpath $(dirname $0)/../) -[ -e "$APORTS/system/build-tools" ] || die "Unable to deduce aports base checkout" +[ -e "$APORTS/system/build-tools" ] || die "Unable to deduce packages directory" apkbuildname() { local repo="${1%%/*}" @@ -39,14 +36,14 @@ if [ -z "$TARGET_ARCH" ]; then usage: $program TARGET_ARCH This script creates a local cross-compiler, and uses it to -cross-compile an Alpine Linux base system for new architecture. +cross-compile an Adélie Linux base system for new architecture. Steps for introducing new architecture include: - adding the compiler tripler and arch type to abuild - adding the arch type detection to apk-tools - adjusting build rules for packages that are arch aware: - gcc, libressl, linux-headers -- create new kernel config for linux-vanilla + gcc, musl, binutils, easy-kernel +- create new kernel config for easy-kernel After these steps the initial cross-build can be completed by running this with the target arch as parameter, e.g.: @@ -68,7 +65,7 @@ msg "Building cross-compiler" # Build and install cross binutils (--with-sysroot) CTARGET=$TARGET_ARCH BOOTSTRAP=nobase APKBUILD=$(apkbuildname binutils) abuild -r -if ! CHOST=$TARGET_ARCH BOOTSTRAP=nolibc APKBUILD=$(apkbuildname musl) abuild up2date 2>/dev/null; then +#if ! CHOST=$TARGET_ARCH BOOTSTRAP=nolibc APKBUILD=$(apkbuildname musl) abuild up2date 2>/dev/null; then # C-library headers for target CHOST=$TARGET_ARCH BOOTSTRAP=nocc APKBUILD=$(apkbuildname musl) abuild -r @@ -79,7 +76,7 @@ if ! CHOST=$TARGET_ARCH BOOTSTRAP=nolibc APKBUILD=$(apkbuildname musl) abuild up # Cross build bootstrap C-library for the target EXTRADEPENDS_BUILD="gcc-pass2-$TARGET_ARCH" \ CHOST=$TARGET_ARCH BOOTSTRAP=nolibc APKBUILD=$(apkbuildname musl) abuild -r -fi +#fi # Full cross GCC EXTRADEPENDS_TARGET="musl musl-dev" \ @@ -97,10 +94,10 @@ apk info --quiet --installed --root "$CBUILDROOT" libgcc libstdc++ musl-dev || \ ${SUDO_APK} --root "$CBUILDROOT" add --repository "$REPODEST/system" libgcc libstdc++ musl-dev # ordered cross-build -for PKG in fortify-headers linux-headers musl libc-dev pkgconf zlib \ - gettext-tiny ncurses readline bash binutils make bison flex m4 \ - openssl libfetch apk-tools linux-pam shadow \ - gmp mpfr3 mpc1 isl cloog gcc ca-certificates \ +for PKG in musl pkgconf zlib \ + gettext-tiny ncurses bash binutils make bison flex m4 \ + openssl apk-tools linux-pam shadow \ + gmp mpfr3 mpc1 isl gcc ca-certificates \ openrc libcap-ng coreutils sed gzip bzip2 diffutils \ attr libcap patch sudo acl fakeroot libarchive mawk \ pax-utils abuild grep findutils patch lzip unzip autoconf automake libtool \ @@ -115,7 +112,7 @@ for PKG in fortify-headers linux-headers musl libc-dev pkgconf zlib \ fortify-headers | libc-dev | build-base) # headers packages which are implicit but mandatory dependency apk info --quiet --installed --root "$CBUILDROOT" $PKG || \ - ${SUDO_APK} --update --root "$CBUILDROOT" --repository "$REPODEST/main" add $PKG + ${SUDO_APK} --update --root "$CBUILDROOT" --repository "$REPODEST/system" add $PKG ;; musl | gcc) # target libraries rebuilt, force upgrade diff --git a/system/docbook-xsl/APKBUILD b/system/docbook-xsl/APKBUILD index ebfbf4dee..11a858afa 100644 --- a/system/docbook-xsl/APKBUILD +++ b/system/docbook-xsl/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=docbook-xsl pkgver=1.79.1 -pkgrel=3 -pkgdesc="XML stylesheets for Docbook-xml transformations." +pkgrel=4 +pkgdesc="XML stylesheets for DocBook transformations" url="http://docbook.sourceforge.net/" arch="noarch" options="!check" # Just XML files @@ -11,7 +11,9 @@ license="MIT" depends="libxml2-utils libxslt docbook-xml" subpackages="$pkgname-ns" makedepends="" -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" +install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall + $pkgname-ns.post-install $pkgname-ns.post-upgrade + $pkgname-ns.post-deinstall" source="http://downloads.sourceforge.net/sourceforge/docbook/$pkgname-$pkgver.tar.bz2 https://downloads.sourceforge.net/project/docbook/docbook-xsl-ns/$pkgver/$pkgname-ns-$pkgver.tar.bz2 765567_non-recursive_string_subst.patch diff --git a/system/docbook-xsl/docbook-xsl-ns.post-deinstall b/system/docbook-xsl/docbook-xsl-ns.post-deinstall new file mode 100644 index 000000000..fdd4d3652 --- /dev/null +++ b/system/docbook-xsl/docbook-xsl-ns.post-deinstall @@ -0,0 +1,8 @@ +#!/bin/sh + +if command -v xmlcatalog > /dev/null; then + xmlcatalog --noout --del \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog +fi + diff --git a/system/docbook-xsl/docbook-xsl-ns.post-install b/system/docbook-xsl/docbook-xsl-ns.post-install new file mode 100644 index 000000000..aa708e534 --- /dev/null +++ b/system/docbook-xsl/docbook-xsl-ns.post-install @@ -0,0 +1,29 @@ +#!/bin/sh + +if [ ! -f /etc/xml/catalog ]; then + xmlcatalog --noout --create /etc/xml/catalog +fi + + +_NEW=${1%-r[0-9]*} + +xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl-ns/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog + +xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl-ns/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog && + +xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl-ns/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog && + +xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl-ns/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog + diff --git a/system/docbook-xsl/docbook-xsl-ns.post-upgrade b/system/docbook-xsl/docbook-xsl-ns.post-upgrade new file mode 100644 index 000000000..92c32378f --- /dev/null +++ b/system/docbook-xsl/docbook-xsl-ns.post-upgrade @@ -0,0 +1,32 @@ +#!/bin/sh + +if [ ! -f /etc/xml/catalog ]; then + xmlcatalog --noout --create /etc/xml/catalog +fi + +_NEW=${1%-r[0-9]*} + +xmlcatalog --noout --del \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog + +xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl-ns/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog + +xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl-ns/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog + +xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl-ns/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog + +xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl-ns/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog + diff --git a/system/docbook-xsl/docbook-xsl.install b/system/docbook-xsl/docbook-xsl.install deleted file mode 100644 index a8ea3e72b..000000000 --- a/system/docbook-xsl/docbook-xsl.install +++ /dev/null @@ -1,47 +0,0 @@ -post_install() { - if [ ! -f /etc/xml/catalog ]; then - xmlcatalog --noout --create /etc/xml/catalog - fi - _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'` - - xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ - etc/xml/catalog - - xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ - etc/xml/catalog && - - xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ - etc/xml/catalog && - - xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ - etc/xml/catalog -} - -post_upgrade() { - post_remove $2 - post_install $1 -} - -post_remove() { - _OLD=`echo $1 | sed 's|\(.*\)\-.*|\1|'` - xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" etc/xml/catalog - - if [ $(vercmp $1 1.72.0-3) -lt 0 ]; then - xmlcatalog --noout --del "/usr/share/xml/docbook" etc/xml/catalog - xmlcatalog --noout --del "file:///etc/xml/docbook" etc/xml/catalog - fi -} - -op=$1 -shift - -$op $* - diff --git a/system/docbook-xsl/docbook-xsl.post-deinstall b/system/docbook-xsl/docbook-xsl.post-deinstall index 3faecd5a3..ffe2a0f23 100644 --- a/system/docbook-xsl/docbook-xsl.post-deinstall +++ b/system/docbook-xsl/docbook-xsl.post-deinstall @@ -6,5 +6,8 @@ if command -v xmlcatalog > /dev/null; then xmlcatalog --noout --del \ "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \ etc/xml/catalog + xmlcatalog --noout --del \ + "/usr/share/xml/docbook/xsl-stylesheets" \ + etc/xml/catalog fi diff --git a/system/docbook-xsl/docbook-xsl.post-install b/system/docbook-xsl/docbook-xsl.post-install index 6afae6abe..250f7b986 100644 --- a/system/docbook-xsl/docbook-xsl.post-install +++ b/system/docbook-xsl/docbook-xsl.post-install @@ -9,21 +9,21 @@ _NEW=${1%-r[0-9]*} xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog && xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog && xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog diff --git a/system/docbook-xsl/docbook-xsl.post-upgrade b/system/docbook-xsl/docbook-xsl.post-upgrade index d481480fc..5c82ae7d9 100644 --- a/system/docbook-xsl/docbook-xsl.post-upgrade +++ b/system/docbook-xsl/docbook-xsl.post-upgrade @@ -11,23 +11,27 @@ xmlcatalog --noout --del \ "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \ etc/xml/catalog +xmlcatalog --noout --del \ + "/usr/share/xml/docbook/xsl-stylesheets" \ + etc/xml/catalog + xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog diff --git a/system/perl-cpanel-json-xs/APKBUILD b/system/perl-cpanel-json-xs/APKBUILD index 08b33c3e9..ef5094438 100644 --- a/system/perl-cpanel-json-xs/APKBUILD +++ b/system/perl-cpanel-json-xs/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-cpanel-json-xs _pkgreal=Cpanel-JSON-XS -pkgver=4.11 +pkgver=4.12 pkgrel=0 pkgdesc="cPanel's fork of JSON::XS, fast and correct serialising" url="https://metacpan.org/release/Cpanel-JSON-XS" @@ -40,4 +40,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="a14fe211b769184c28d946b9e88d9a380331d6a16c67a0f286fb4bf0f25e2a3b80f3df907bdf1a7eceaa8a34e69f13b3296cc135bc1ea2d2fcba6355dcf88579 Cpanel-JSON-XS-4.11.tar.gz" +sha512sums="8545095726d833d7404e8fc2a6e71a4f4b8e6c2f5d7d9939758bb8eb1ffcf33f28867a8e70fb1df995ec6c14eccde53c5c85fb6d3da2929337b15905d4195c5b Cpanel-JSON-XS-4.12.tar.gz" diff --git a/system/perl-net-ssleay/APKBUILD b/system/perl-net-ssleay/APKBUILD index ae01038ca..593eb4886 100644 --- a/system/perl-net-ssleay/APKBUILD +++ b/system/perl-net-ssleay/APKBUILD @@ -2,17 +2,17 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-net-ssleay _realname=Net-SSLeay -pkgver=1.85 +pkgver=1.88 pkgrel=0 pkgdesc="Perl extension for using OpenSSL" url="https://metacpan.org/release/Net-SSLeay" arch="all" -license="GPL-2.0-only OR Artistic-1.0-Perl" +license="Artistic-2.0" depends="perl" makedepends="perl-dev openssl-dev zlib-dev" checkdepends="perl-test-exception perl-test-warn perl-test-nowarnings" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-$pkgver.tar.gz" builddir="$srcdir/$_realname-$pkgver" build() { @@ -35,4 +35,4 @@ package() { find "$pkgdir" -name perllocal.pod -delete } -sha512sums="74e0f2f56b707f1ff845c78c1fa7ce26a71b8f943bb99e994d4e065d1f42259fe4cd1a6a17d333459727534158f9541f116dbc8515122380807d9450b0faa26b Net-SSLeay-1.85.tar.gz" +sha512sums="37fc32ec003337f3dc18bf928139079a3127628c6fa0fccaed0c27b6bf3b216c2c5338ed1aaf9408b0add3be549df3218d3c5a6d6299793c1329d8a0813a1682 Net-SSLeay-1.88.tar.gz" diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index 4399681eb..aecdbcc4a 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vim -pkgver=8.1.1583 +pkgver=8.1.1635 pkgrel=0 pkgdesc="advanced text editor" url="https://www.vim.org" @@ -81,6 +81,6 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -sha512sums="ad66bfc031f61d652fe6700656416b3d5d708cc7407bc45c757ce89d1346ba5fc597a2623d7593b819626076f7a74179d768ac425fa5b145a5de0fb27a6474a1 vim-8.1.1583.tar.gz +sha512sums="41b79ff52438ecbf56366696d3a12d34531a835b64d2ea809597797531950f2f8eb73d753375d23e1411631afaa3f9413fad8af7b0a1fed1532a1714ec1dbb4b vim-8.1.1635.tar.gz 12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc 16026a3ed3e080b3f8281948579ab678e9acd724ad594463279712fbf1024bcd923155a133bd08118848d2c6cdf11c69489d85b1c7438f60b4c279094714d181 no-default-mouse.patch" diff --git a/user/erl-rebar/APKBUILD b/user/erl-rebar/APKBUILD new file mode 100644 index 000000000..c4fe28bb2 --- /dev/null +++ b/user/erl-rebar/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +pkgname=erl-rebar +pkgver=2.6.4 +pkgrel=0 +pkgdesc="Legacy Erlang build tool" +url="https://github.com/rebar/rebar" +arch="noarch" +license="Apache-2" +options="!tracedeps" +depends="erlang" +makedepends="erlang-dev" +source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/rebar/rebar/tar.gz/$pkgver" +builddir="$srcdir/rebar-$pkgver" + +build() { + ./bootstrap +} + +check() { + ./rebar -v eunit +} + +package() { + install -d -m755 $pkgdir/usr/bin/ + install -m755 ./rebar $pkgdir/usr/bin/ +} + +sha512sums="4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa erl-rebar-2.6.4.tar.gz" diff --git a/user/erl-rebar3/APKBUILD b/user/erl-rebar3/APKBUILD new file mode 100644 index 000000000..75cb671d5 --- /dev/null +++ b/user/erl-rebar3/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +pkgname=erl-rebar3 +pkgver=3.11.1 +pkgrel=0 +pkgdesc="Erlang build tool" +url="http://www.rebar3.org/" +arch="all" +license="Apache-2" +options="!tracedeps" +depends="erlang" +makedepends="erlang-dev" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/erlang/rebar3/tar.gz/$pkgver" +builddir="$srcdir/rebar3-$pkgver" + +build() { + ./bootstrap +} + +check() { + ./rebar3 ct +} + +package() { + install -d -m755 $pkgdir/usr/bin/ + install -m755 ./rebar3 $pkgdir/usr/bin/ + gzip -c ./manpages/rebar3.1 > ./manpages/rebar3.1.gz + install -d -m755 $pkgdir/usr/share/man/man1/ + install -m644 ./manpages/rebar3.1.gz $pkgdir/usr/share/man/man1/ +} + +sha512sums="749368c8c19641d0c1083f1750438cfc5f1c75e284bd74b4f8ae368103e79a376f4bd91e85db35e1619116cd2f3b1a8dc2d3d89db19da8f4440e0b58d3c0a37c erl-rebar3-3.11.1.tar.gz" diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index d698c149d..e195793cc 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=gvim _pkgreal=vim -pkgver=8.1.1583 +pkgver=8.1.1635 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -74,4 +74,4 @@ package() { ln -s gvim rgvim } -sha512sums="ad66bfc031f61d652fe6700656416b3d5d708cc7407bc45c757ce89d1346ba5fc597a2623d7593b819626076f7a74179d768ac425fa5b145a5de0fb27a6474a1 vim-8.1.1583.tar.gz" +sha512sums="41b79ff52438ecbf56366696d3a12d34531a835b64d2ea809597797531950f2f8eb73d753375d23e1411631afaa3f9413fad8af7b0a1fed1532a1714ec1dbb4b vim-8.1.1635.tar.gz" diff --git a/user/iputils/APKBUILD b/user/iputils/APKBUILD index 4a35f931b..142a5ff2d 100644 --- a/user/iputils/APKBUILD +++ b/user/iputils/APKBUILD @@ -6,18 +6,16 @@ pkgrel=0 pkgdesc="IP Configuration Utilities (and Ping)" url="https://github.com/iputils/iputils/" arch="all" +options="suid" license="BSD-3-Clause AND GPL-2.0-or-later" -makedepends="meson libcap-dev libxslt docbook-xsl-ns openssl-dev libgcrypt-dev" +makedepends="docbook-xsl docbook-xsl-ns libcap-dev libgcrypt-dev libxslt meson + openssl-dev" replaces="bbsuid" subpackages="$pkgname-doc $pkgname-lang $pkgname-openrc" -source="$pkgname-$pkgver.tgz::https://github.com/$pkgname/$pkgname/archive/s$pkgver.tar.gz - docbook-man.patch - " -options="suid" +source="$pkgname-$pkgver.tgz::https://github.com/$pkgname/$pkgname/archive/s$pkgver.tar.gz" builddir="$srcdir/$pkgname-s$pkgver" build() { - cd "$builddir" # we're waiting for idn support in musl so that we can enable it here # https://wiki.musl-libc.org/functional-differences-from-glibc.html#Name-Resolver/DNS meson --prefix /usr --buildtype=plain builddir -DUSE_IDN=false @@ -25,18 +23,14 @@ build() { } check() { - cd "$builddir" ninja -C builddir test } package() { - cd "$builddir" - DESTDIR=$pkgdir ninja -C builddir install ln -s tracepath "$pkgdir"/usr/bin/tracepath6 ln -s ping "$pkgdir"/usr/bin/ping6 } -sha512sums="adb8831ca3a567b9a5f3762227c631aefa62eedbaa7578c2bfea90b6d494b9e0cccf49b68713912611ec56c352d6c517df9e8409c9c9478cfc5732371c8cf250 iputils-20190515.tgz -411f45a2d16c88b09f3547e3f04aa20e257f54650c7783123e4cb021bd8850cd96896480fbf9305d6df72abe32d8d5c2239ce4ac4ef9bfa821c205309451d6ff docbook-man.patch" +sha512sums="adb8831ca3a567b9a5f3762227c631aefa62eedbaa7578c2bfea90b6d494b9e0cccf49b68713912611ec56c352d6c517df9e8409c9c9478cfc5732371c8cf250 iputils-20190515.tgz" diff --git a/user/iputils/docbook-man.patch b/user/iputils/docbook-man.patch deleted file mode 100644 index 1793858e4..000000000 --- a/user/iputils/docbook-man.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- iputils-s20190515/doc/custom-man.xsl.old 2019-06-25 11:48:48.790000000 +0000 -+++ iputils-s20190515/doc/custom-man.xsl 2019-06-25 11:49:06.250000000 +0000 -@@ -5,7 +5,7 @@ - extension-element-prefixes="exsl" - version="1.0"> - --<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl"/> -+<xsl:import href="file:///usr/share/xml/docbook/xsl-stylesheets-ns/manpages/docbook.xsl"/> - - <xsl:template name="top.comment" /> - ---- iputils-s20190515/doc/meson.build.old 2019-06-25 14:54:58.170000000 +0000 -+++ iputils-s20190515/doc/meson.build 2019-06-25 14:55:28.460000000 +0000 -@@ -48,7 +48,7 @@ - ] - - if xsltproc.found() -- xsl = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' -+ xsl = 'file:///usr/share/xml/docbook/xsl-stylesheets-ns/manpages/docbook.xsl' - testrun = run_command([xsltproc, '--nonet', xsl]) - xsltproc_works = testrun.returncode() == 0 - if xsltproc_works == false ---- iputils-s20190515/doc/custom-html.xsl.old 2019-06-25 14:56:50.460000000 +0000 -+++ iputils-s20190515/doc/custom-html.xsl 2019-06-25 14:57:11.680000000 +0000 -@@ -2,7 +2,7 @@ - - <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> - --<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl"/> -+<xsl:import href="file:///usr/share/xml/docbook/xsl-stylesheets-ns/html/docbook.xsl"/> - <!-- - - The docbook stylesheet injects empty anchor tags into generated HTML, identified by an auto-generated ID. - - Ask the docbook stylesheet to generate reproducible output when generating (these) ID values. diff --git a/user/kdoctools/APKBUILD b/user/kdoctools/APKBUILD index f11c59983..126b3eda5 100644 --- a/user/kdoctools/APKBUILD +++ b/user/kdoctools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdoctools pkgver=5.54.0 -pkgrel=0 +pkgrel=1 pkgdesc="Tools to generate user-readable documentation from DocBook XML" url="https://www.kde.org/" arch="all" diff --git a/user/kpmcore/APKBUILD b/user/kpmcore/APKBUILD index 102059e09..a6fef6476 100644 --- a/user/kpmcore/APKBUILD +++ b/user/kpmcore/APKBUILD @@ -4,7 +4,7 @@ pkgname=kpmcore pkgver=3.3.0 pkgrel=0 pkgdesc="Core routines for KDE Partition Manager" -url="https://www.kde.org/applications/system/kdepartitionmanager" +url="https://www.kde.org/applications/system/partitionmanager" arch="all" license="LGPL-2.1+" depends="" diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD index f4eae23bd..a512e4072 100644 --- a/user/kwalletmanager/APKBUILD +++ b/user/kwalletmanager/APKBUILD @@ -4,7 +4,7 @@ pkgname=kwalletmanager pkgver=19.04.2 pkgrel=0 pkgdesc="Manage KDE wallets" -url="https://www.kde.org/applications/system/kwalletmanager/" +url="https://www.kde.org/applications/system/kwalletmanager5" arch="all" license="GPL-2.0-only" depends="" diff --git a/user/labplot/APKBUILD b/user/labplot/APKBUILD index caf9aa5df..d6ed5bf7e 100644 --- a/user/labplot/APKBUILD +++ b/user/labplot/APKBUILD @@ -4,7 +4,7 @@ pkgname=labplot pkgver=2.6 pkgrel=0 pkgdesc="Interactive tool for graphing and analysis of scientific data" -url="https://www.kde.org/applications/education/labplot/" +url="https://www.kde.org/applications/education/labplot2" arch="all" license="GPL-2.0-only" depends="shared-mime-info" @@ -13,7 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kdoctools-dev ki18n-dev kiconthemes-dev kdelibs4support-dev kxmlgui-dev knewstuff-dev ktextwidgets-dev kwidgetsaddons-dev gsl-dev fftw-dev qt5-qtserialport-dev syntax-highlighting-dev bison libexecinfo-dev - cantor-dev" + cantor-dev docbook-xsl" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/labplot/$pkgver.0/labplot-$pkgver.0.tar.xz" diff --git a/user/partitionmanager/APKBUILD b/user/partitionmanager/APKBUILD index 33c6e3bdf..5e67e25af 100644 --- a/user/partitionmanager/APKBUILD +++ b/user/partitionmanager/APKBUILD @@ -4,7 +4,7 @@ pkgname=partitionmanager pkgver=3.3.1 pkgrel=0 pkgdesc="Qt-based partition manager" -url="https://www.kde.org/applications/system/kdepartitionmanager" +url="https://www.kde.org/applications/system/partitionmanager" arch="all" license="GPL-3.0+" depends="" diff --git a/user/perl-bit-vector/APKBUILD b/user/perl-bit-vector/APKBUILD new file mode 100644 index 000000000..90dc9385a --- /dev/null +++ b/user/perl-bit-vector/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-bit-vector +pkgver=7.4 +pkgrel=0 +pkgdesc="Efficient bit vector, set of integers and 'big int' math library" +url="https://metacpan.org/release/Bit-Vector" +arch="all" +license="Artistic-1.0-Perl" +makedepends="perl-dev perl-carp-clan" +subpackages="$pkgname-doc" +#https://cpan.metacpan.org/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz +source="https://cpan.metacpan.org/authors/id/S/ST/STBEY/Bit-Vector-$pkgver.tar.gz" +builddir="$srcdir/Bit-Vector-$pkgver" + +build() { + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + make test +} + +package() { + make DESTDIR="$pkgdir" install + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +sha512sums="80aa49aea8c31c60c14161198eab9d620d738530c3c209104b8ad8f1144822f80c3effb3303c569fc556b2457328659ae5d1aaf511d714c835618b84c722abc5 Bit-Vector-7.4.tar.gz" diff --git a/user/perl-carp-clan/APKBUILD b/user/perl-carp-clan/APKBUILD new file mode 100644 index 000000000..0a2586220 --- /dev/null +++ b/user/perl-carp-clan/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-carp-clan +pkgver=6.07 +pkgrel=0 +pkgdesc="Report modules as a 'clan' in Perl" +url="https://metacpan.org/pod/Carp::Clan" +arch="noarch" +license="Artistic-1.0-Perl" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Carp-Clan-$pkgver.tar.gz" +builddir="$srcdir/Carp-Clan-$pkgver" + +build() { + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + make test +} + +package() { + make DESTDIR="$pkgdir" install + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +sha512sums="0180c2bd2ffe9f2b6c23d7e76bf3dd8ceeacfc842b09c2dab2f81d002ff7235ce2d145e53c55e375cb889291577cfcd4cb9be34b5445ae532cb9768979c57e41 Carp-Clan-6.07.tar.gz" diff --git a/user/perl-class-accessor/APKBUILD b/user/perl-class-accessor/APKBUILD new file mode 100644 index 000000000..6ea77357d --- /dev/null +++ b/user/perl-class-accessor/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-class-accessor +pkgver=0.51 +pkgrel=0 +pkgdesc="Perl class accessor generator" +url="https://metacpan.org/release/Class-Accessor" +arch="noarch" +license="Artistic-1.0-Perl" +depends="perl-sub-name" +makedepends="perl-dev perl-module-install" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/K/KA/KASEI/Class-Accessor-$pkgver.tar.gz" +builddir="$srcdir/Class-Accessor-$pkgver" + +build() { + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + make test +} + +package() { + make DESTDIR="$pkgdir" install + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +sha512sums="be11acea4747c59e3e524c75d818e0391756cbc08eebff71dca280e737ce228209e76310649298e536e07db1c856d5a71dd64aefc55b49e33cfcb2b3439eab0b Class-Accessor-0.51.tar.gz" diff --git a/user/perl-crypt-rijndael/APKBUILD b/user/perl-crypt-rijndael/APKBUILD index 5b9e1283a..6ae7262f7 100644 --- a/user/perl-crypt-rijndael/APKBUILD +++ b/user/perl-crypt-rijndael/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-crypt-rijndael _pkgreal=Crypt-Rijndael -pkgver=1.13 +pkgver=1.14 pkgrel=0 pkgdesc="Crypt::CBC compliant Rijndael encryption module" url="https://metacpan.org/release/Crypt-Rijndael" @@ -39,5 +39,5 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="46eea4eb6568d9bb70685314c6a29214552787c8cf138adb77271d07b85c16d83ee3faa53e6c3b7d0abb5cb735827407e970f954ae93123dfeaebb5fb34f1329 Crypt-Rijndael-1.13.tar.gz +sha512sums="a3c419142954dc2b430422f532b5349d0fb902a704335ba0708504a6a4a5d617835409916b76bc1b8dc8669c0f03356dab3ef90e5f7ea530b5fcc70bd1bf4eff Crypt-Rijndael-1.14.tar.gz 4f96e3f326c48bdca94aa721468f6c927a6af39ab9683bc69058a9330d733c96e656883890cf9f2c4588173784d248238dec82a49e8261c0cd9e1d794764d97e use-stdint_h.patch" diff --git a/user/perl-datetime-timezone/APKBUILD b/user/perl-datetime-timezone/APKBUILD index 9ebee6f7b..1c862ef14 100644 --- a/user/perl-datetime-timezone/APKBUILD +++ b/user/perl-datetime-timezone/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-datetime-timezone _pkgname=DateTime-TimeZone -pkgver=2.35 +pkgver=2.36 pkgrel=0 pkgdesc="Time zone object class and factory for Perl" url="https://metacpan.org/release/DateTime-TimeZone" @@ -30,4 +30,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="5d103d89586c24f9409baba8233c0655cdf7799d5fa58b5a8708eb883289c35cc6f04f2488c90987b91be17932054293bedac3b682dd534206848bd4778f0ce5 DateTime-TimeZone-2.35.tar.gz" +sha512sums="6958d4ac21f1ed641e31d86dad83153bf4ad763e499cb062d918ac292d3ed7339486470d9812d7c5fc27040bc8d39fa73fd9f34bf2fd72404743cb1e9cf18a85 DateTime-TimeZone-2.36.tar.gz" diff --git a/user/perl-yaml-libyaml/APKBUILD b/user/perl-yaml-libyaml/APKBUILD index 87a8c5a80..c196a7506 100644 --- a/user/perl-yaml-libyaml/APKBUILD +++ b/user/perl-yaml-libyaml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-yaml-libyaml -pkgver=0.77 +pkgver=0.79 pkgrel=0 pkgdesc="Perl YAML Serialization using XS and libyaml" url="https://metacpan.org/pod/YAML::LibYAML" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="20d35718ebd318c2e7cfd618274dafb9c4489596e6ee77ca957f58d4971b7c712cbbf71517c9b29f316d0059b1b9f375aab57facc895c61c200cc0e40589de33 YAML-LibYAML-0.77.tar.gz" +sha512sums="47b0f2d42ff972224af6fffa09631c7bcf221867cba3a0f9d56ce48f5a34bde56f3fdedbf15c47843ef24aba65676bfc7df5ce3d26b8f50011f2730071ca4877 YAML-LibYAML-0.79.tar.gz" diff --git a/user/ruby-bundler/APKBUILD b/user/ruby-bundler/APKBUILD new file mode 100644 index 000000000..d3c470b51 --- /dev/null +++ b/user/ruby-bundler/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +_gemname=bundler +pkgname=ruby-$_gemname +pkgver=2.0.2 +pkgrel=0 +pkgdesc="Manage an application's gem dependencies" +url="https://bundler.io/" +arch="noarch" +license="MIT" +depends="ruby ruby-dev" +subpackages="$pkgname-doc" +options="!check" +source="https://rubygems.org/downloads/$_gemname-$pkgver.gem" +builddir="$srcdir/$_gemname-$pkgver" + +package() { + local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')" + + gem install --local \ + --install-dir "$gemdir" \ + --bindir "$pkgdir/usr/bin" \ + --ignore-dependencies \ + --no-document \ + --verbose \ + "$srcdir"/$_gemname-$pkgver.gem + + local n; for n in 1 5; do + mkdir -p "$pkgdir"/usr/share/man/man$n + mv "$gemdir"/gems/$_gemname-$pkgver/man/*.$n "$pkgdir"/usr/share/man/man$n/ + done + + rm -rf "$gemdir"/cache \ + "$gemdir"/build_info \ + "$gemdir"/doc \ + "$gemdir"/gems/$_gemname-$pkgver/man \ + "$gemdir"/gems/$_gemname-$pkgver/*.md +} + + +sha512sums="f41fe9e385fbf42859f3514b71abdaa1fd787f4ff4b1169b8ee40ea7778c114657c60ca3d6d6d72fbe972af0558f0cccd9c9f28cad7fc712ada27f037dce8a6a bundler-2.0.2.gem" diff --git a/user/wireguard-module-power8-64k/APKBUILD b/user/wireguard-module-power8-64k/APKBUILD index 9159a6ff3..bbac9bafa 100644 --- a/user/wireguard-module-power8-64k/APKBUILD +++ b/user/wireguard-module-power8-64k/APKBUILD @@ -3,7 +3,7 @@ # KEEP THIS IN SYNC with the other wireguard-module packages. _kflavour="-power8-64k" _kver="4.14.127-mc14" -pkgver=0.0.20190601 +pkgver=0.0.20190702 pkgrel=0 _pkgname="wireguard-module$_kflavour" pkgname="$_pkgname-$_kver" @@ -29,4 +29,4 @@ package() { make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install } -sha512sums="d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3 WireGuard-0.0.20190601.tar.xz" +sha512sums="8b92b51506cd3f8e9939378b86f23678e08e8501432decd0abf6a9d4e3dfe4742b6f1cb75e06407f5816778b3dd90849a5da83252ab882392ec1905dfb997501 WireGuard-0.0.20190702.tar.xz" diff --git a/user/wireguard-module-power8/APKBUILD b/user/wireguard-module-power8/APKBUILD index 3d55c8bdd..4405367b7 100644 --- a/user/wireguard-module-power8/APKBUILD +++ b/user/wireguard-module-power8/APKBUILD @@ -3,7 +3,7 @@ # KEEP THIS IN SYNC with the other wireguard-module packages. _kflavour="-power8" _kver="4.14.127-mc14" -pkgver=0.0.20190601 +pkgver=0.0.20190702 pkgrel=0 _pkgname="wireguard-module$_kflavour" pkgname="$_pkgname-$_kver" @@ -29,4 +29,4 @@ package() { make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install } -sha512sums="d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3 WireGuard-0.0.20190601.tar.xz" +sha512sums="8b92b51506cd3f8e9939378b86f23678e08e8501432decd0abf6a9d4e3dfe4742b6f1cb75e06407f5816778b3dd90849a5da83252ab882392ec1905dfb997501 WireGuard-0.0.20190702.tar.xz" diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD index c0e02fd93..fbe32d2d7 100644 --- a/user/wireguard-module/APKBUILD +++ b/user/wireguard-module/APKBUILD @@ -3,7 +3,7 @@ # KEEP THIS IN SYNC with the other wireguard-module packages. _kflavour="" _kver="4.14.127-mc14" -pkgver=0.0.20190601 +pkgver=0.0.20190702 pkgrel=0 _pkgname="wireguard-module$_kflavour" pkgname="$_pkgname-$_kver" @@ -29,4 +29,4 @@ package() { make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install } -sha512sums="d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3 WireGuard-0.0.20190601.tar.xz" +sha512sums="8b92b51506cd3f8e9939378b86f23678e08e8501432decd0abf6a9d4e3dfe4742b6f1cb75e06407f5816778b3dd90849a5da83252ab882392ec1905dfb997501 WireGuard-0.0.20190702.tar.xz" diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD index 2ae8d845b..97de72f1f 100644 --- a/user/wireguard-tools/APKBUILD +++ b/user/wireguard-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=wireguard-tools _pkgreal=WireGuard -pkgver=0.0.20190601 +pkgver=0.0.20190702 pkgrel=0 pkgdesc="Userland tools for the WireGuard VPN" url="https://www.wireguard.com/" @@ -43,4 +43,4 @@ _patch() { } -sha512sums="d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3 WireGuard-0.0.20190601.tar.xz" +sha512sums="8b92b51506cd3f8e9939378b86f23678e08e8501432decd0abf6a9d4e3dfe4742b6f1cb75e06407f5816778b3dd90849a5da83252ab882392ec1905dfb997501 WireGuard-0.0.20190702.tar.xz" |