diff options
172 files changed, 402 insertions, 294 deletions
diff --git a/experimental/cython/APKBUILD b/experimental/cython/APKBUILD index 34bcf9a99..eb9609f74 100644 --- a/experimental/cython/APKBUILD +++ b/experimental/cython/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cython _pkgname=Cython +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.29.12 pkgrel=0 pkgdesc="C extension compiler for Python" @@ -11,7 +13,7 @@ license="Apache-2.0" depends="" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/experimental/firefox-esr/APKBUILD b/experimental/firefox-esr/APKBUILD index ae94ce6e7..15191dba8 100644 --- a/experimental/firefox-esr/APKBUILD +++ b/experimental/firefox-esr/APKBUILD @@ -82,7 +82,7 @@ prepare() { echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig # too much memory - if [ -z "$JOBS" -o $JOBS -gt 32 ]; then + if [ -z "$JOBS" ] || [ $JOBS -gt 32 ]; then echo "mk_add_options MOZ_MAKE_FLAGS=\"-j32\"" >> "$builddir"/mozconfig fi } @@ -117,7 +117,7 @@ package() { local png for png in browser/branding/official/default*.png; do - local i=${_png%.png} + local i="${_png%.png}" i=${i##*/default} install -D -m644 "$png" \ "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png diff --git a/experimental/firefox/APKBUILD b/experimental/firefox/APKBUILD index 828754077..8d6a24d9b 100644 --- a/experimental/firefox/APKBUILD +++ b/experimental/firefox/APKBUILD @@ -59,7 +59,7 @@ prepare() { echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig # too much memory - if [ -z "$JOBS" -o $JOBS -gt 16 ]; then + if [ -z "$JOBS" ] || [ $JOBS -gt 16 ]; then echo "mk_add_options MOZ_MAKE_FLAGS=\"-j16\"" >> "$builddir"/mozconfig fi } @@ -100,7 +100,7 @@ package() { local png for png in browser/branding/official/default*.png; do - local i=${_png%.png} + local i="${_png%.png}" i=${i##*/default} install -D -m644 "$png" \ "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png diff --git a/experimental/lmms/APKBUILD b/experimental/lmms/APKBUILD index 5a045f66e..6724d80ef 100644 --- a/experimental/lmms/APKBUILD +++ b/experimental/lmms/APKBUILD @@ -2,6 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lmms pkgver=1.2.0 +_pkgver=$(printf '%s' "$pkgver" | sed 's/_/-/') pkgrel=0 pkgdesc="Music production software" url="https://lmms.io/" @@ -13,13 +14,13 @@ makedepends="alsa-lib-dev cmake fftw-dev fltk-dev fluidsynth-dev lame-dev pulseaudio-dev qt5-qtbase-dev qt5-qttools-dev qt5-qtx11extras-dev sdl-dev extra-cmake-modules xcb-util-dev xcb-util-keysyms-dev" subpackages="$pkgname-dev $pkgname-doc" -source="lmms-${pkgver/_/-}.tar.gz::https://github.com/LMMS/lmms/archive/v${pkgver/_/-}.tar.gz +source="lmms-$_pkgver.tar.gz::https://github.com/LMMS/lmms/archive/v$_pkgver.tar.gz https://distfiles.adelielinux.org/source/qt5-x11embed-20171106.tar.xz rpmalloc-1.3.1.tar.gz::https://github.com/rampantpixels/rpmalloc/archive/1.3.1.tar.gz thread.patch use-system-ecm.patch " -builddir="$srcdir"/lmms-${pkgver/_/-} +builddir="$srcdir/lmms-$_pkgver" prepare() { cd "$builddir" diff --git a/experimental/py3-hbmqtt/APKBUILD b/experimental/py3-hbmqtt/APKBUILD index e3f10e5ca..35172edf4 100644 --- a/experimental/py3-hbmqtt/APKBUILD +++ b/experimental/py3-hbmqtt/APKBUILD @@ -2,7 +2,9 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-hbmqtt _pkgname=${pkgname#py3-} -pkgver=0.9.5 +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" +pkgver=0.9.5 pkgrel=0 pkgdesc="MQTT client/broker using Python and asyncio" url="https://pypi.org/project/hbmqtt/" @@ -12,7 +14,7 @@ depends="python3" checkdepends="py3-docopt py3-passlib py3-pyyaml py3-six py3-transitions py3-websockets" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/experimental/qt5-qtwebkit/APKBUILD b/experimental/qt5-qtwebkit/APKBUILD index fb6c39631..c7e0834e5 100644 --- a/experimental/qt5-qtwebkit/APKBUILD +++ b/experimental/qt5-qtwebkit/APKBUILD @@ -3,7 +3,7 @@ pkgname=qt5-qtwebkit _realname=qtwebkit pkgver=5.212.0_alpha2 -_realver=${pkgver/_/-} +_realver=$(printf '%s' "$pkgver" | sed 's/_/-/') pkgrel=0 pkgdesc="Open source Web browser engine" url="https://github.com/annulen/webkit" @@ -72,7 +72,7 @@ build() { -DUSE_SYSTEM_MALLOC=ON \ ${CMAKE_CROSSOPTS} # too memory hungry - if [ -z "$JOBS" -o $JOBS -gt 32 ]; then + if [ -z "$JOBS" ] || [ $JOBS -gt 32 ]; then make -j32 else make diff --git a/experimental/thunderbird/APKBUILD b/experimental/thunderbird/APKBUILD index 4a98b52b4..92dffeb6b 100644 --- a/experimental/thunderbird/APKBUILD +++ b/experimental/thunderbird/APKBUILD @@ -78,7 +78,7 @@ prepare() { echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig # too much memory - if [ -z "$JOBS" -o $JOBS -gt 32 ]; then + if [ -z "$JOBS" ] || [ $JOBS -gt 32 ]; then echo "mk_add_options MOZ_MAKE_FLAGS=\"-j32\"" >> "$builddir"/mozconfig fi } diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD index 46495b93f..30428a27c 100644 --- a/system/abuild/APKBUILD +++ b/system/abuild/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=abuild pkgver=3.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Script to build APK packages" url="https://code.foxkit.us/adelie/abuild" arch="all" diff --git a/system/abuild/abuild.pre-install b/system/abuild/abuild.pre-install index fd3d39a36..169982d83 100644 --- a/system/abuild/abuild.pre-install +++ b/system/abuild/abuild.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -addgroup -S abuild 2>/dev/null +groupadd -r abuild 2>/dev/null exit 0 diff --git a/system/apk-tools/APKBUILD b/system/apk-tools/APKBUILD index 86a15d28a..5305ed1cb 100644 --- a/system/apk-tools/APKBUILD +++ b/system/apk-tools/APKBUILD @@ -56,16 +56,16 @@ static() { # lets sign the static binary so it can be vefified from distros # that does not have apk-tools - local abuild_conf=${ABUILD_CONF:-"/etc/abuild.conf"} - local abuild_home=${ABUILD_USERDIR:-"$HOME/.abuild"} - local abuild_userconf=${ABUILD_USERCONF:-"$abuild_home/abuild.conf"} + local abuild_conf="${ABUILD_CONF:-"/etc/abuild.conf"}" + local abuild_home="${ABUILD_USERDIR:-"$HOME/.abuild"}" + local abuild_userconf="${ABUILD_USERCONF:-"$abuild_home/abuild.conf"}" [ -f "$abuild_userconf" ] && . "$abuild_userconf" local privkey="$PACKAGER_PRIVKEY" - local pubkey=${PACKAGER_PUBKEY:-"${privkey}.pub"} - local keyname=${pubkey##*/} + local pubkey="${PACKAGER_PUBKEY:-"${privkey}.pub"}" + local keyname="${pubkey##*/}" ${CROSS_COMPILE}strip "$subpkgdir"/sbin/apk.static openssl dgst -sha1 -sign "$privkey" \ - -out "$subpkgdir"/sbin/apk.static.SIGN.RSA.$keyname \ + -out "$subpkgdir/sbin/apk.static.SIGN.RSA.$keyname" \ "$subpkgdir"/sbin/apk.static } diff --git a/system/at/APKBUILD b/system/at/APKBUILD index d4bdb4f2e..a50d7fb77 100644 --- a/system/at/APKBUILD +++ b/system/at/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=at pkgver=3.1.23 -pkgrel=1 +pkgrel=2 pkgdesc="Delayed job execution and batch processing daemon" url="https://packages.qa.debian.org/a/at.html" arch="all" diff --git a/system/at/at.pre-install b/system/at/at.pre-install index 78aa4bcf1..1d92862db 100644 --- a/system/at/at.pre-install +++ b/system/at/at.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -addgroup -S at 2>/dev/null -adduser -S -D -H -s /bin/false -G at -g at at 2>/dev/null +groupadd -r at 2>/dev/null +useradd -c at -s /sbin/nologin -g at -r at 2>/dev/null exit 0 diff --git a/system/bash/APKBUILD b/system/bash/APKBUILD index ccdf8ab13..1e1dccbee 100644 --- a/system/bash/APKBUILD +++ b/system/bash/APKBUILD @@ -5,7 +5,7 @@ pkgname=bash pkgver=4.4.23 _patchlevel=${pkgver##*.} _myver=${pkgver%.*} -_patchbase=${_myver/./} +_patchbase=$(printf '%s' "$_myver" | tr -d .) pkgrel=1 pkgdesc="The GNU Bourne Again shell" url="https://www.gnu.org/software/bash/bash.html" diff --git a/system/bc/APKBUILD b/system/bc/APKBUILD index 4dcc4b94b..79d5a0c4d 100644 --- a/system/bc/APKBUILD +++ b/system/bc/APKBUILD @@ -10,8 +10,7 @@ license="BSD-2-Clause" depends="" makedepends="" subpackages="$pkgname-doc" -source="https://github.com/gavinhoward/bc/releases/download/${pkgver/_/-}/bc-${pkgver/_/-}.tar.xz" -builddir="$srcdir"/$pkgname-${pkgver/_/-} +source="https://github.com/gavinhoward/bc/releases/download/$pkgver/bc-$pkgver.tar.xz" build() { PREFIX="/usr" DESTDIR="$pkgdir" ./configure.sh -g -G -O3 diff --git a/system/ca-certificates/APKBUILD b/system/ca-certificates/APKBUILD index d5af2b91c..0785ec441 100644 --- a/system/ca-certificates/APKBUILD +++ b/system/ca-certificates/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ca-certificates pkgver=20190131 -pkgrel=0 +pkgrel=1 pkgdesc="CA root certificates" url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/" arch="all" diff --git a/system/ca-certificates/ca-certificates.trigger b/system/ca-certificates/ca-certificates.trigger index eff198163..e584113a9 100644 --- a/system/ca-certificates/ca-certificates.trigger +++ b/system/ca-certificates/ca-certificates.trigger @@ -1,3 +1,3 @@ #!/bin/sh -/usr/sbin/update-ca-certificates --fresh &> /dev/null +/usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1 exit 0 diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD index e5461c7d2..4a70574c3 100644 --- a/system/coreutils/APKBUILD +++ b/system/coreutils/APKBUILD @@ -9,10 +9,10 @@ url="https://www.gnu.org/software/coreutils/" arch="all" license="GPL-3.0+" makedepends="bash acl-dev attr-dev" -[ ${CBUILD} == ${CHOST} ] && makedepends="$makedepends perl gettext-tiny +[ "${CBUILD}" = "${CHOST}" ] && makedepends="$makedepends perl gettext-tiny gettext-tiny-dev utmps-dev" subpackages="$pkgname-doc" -[ ${CBUILD} == ${CHOST} ] && subpackages="$subpackages $pkgname-lang" +[ "${CBUILD}" = "${CHOST}" ] && subpackages="$subpackages $pkgname-lang" install="$pkgname.post-deinstall" source="https://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz date-debug.patch @@ -22,7 +22,7 @@ source="https://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz gnulib-test-fixes.patch localename-test-fix.patch " -[ ${CBUILD} != ${CHOST} ] && source="$source +[ "${CBUILD}" != "${CHOST}" ] && source="$source 051_all_coreutils-mangen.patch " @@ -43,9 +43,10 @@ build() { --with-packager="Adélie" \ --with-packager-bug-reports="https://bts.adelielinux.org/" - if [ ${CBUILD} != ${CHOST} ]; then - set -- man/*.x - touch ${@/%x/1} + if [ "${CBUILD}" != "${CHOST}" ]; then + for i in man/*.x; do + touch "${i%x}1" + done fi make } @@ -70,7 +71,7 @@ bd8b5cecba59eba30458c8afa895877d39a987b989bc06b70cd6836e0ef684677aaadcb4949b58a7 fd97fccd661befc558b3afb3e32c82dd2cef511a05e6129d49540599297c1b59ab1f109e63a12f585a2348c26c28fb98330c348829d1fe61cf8149d0dd1c989c gnulib-tests-dont-require-gpg-passphrase.patch a1d014a683fb3b2e08e7392f7589fd92a565e2a4d0cac1cf960968dd3d990e020fdd3bb6aea2bbeaca3ba8f2522b4da3d75b93f414ebf83d8b26b5ccbb38a64d gnulib-test-fixes.patch aac3a89b27a7854fbf483e155df9133c3d33a0f36bd55d5606559a7781f9d27d5c17779ea427142311749252767097bf92ec22d4cf86b510568c186da84ff16c date-debug.patch" -[ ${CBUILD} != ${CHOST} ] && sha512sums=" +[ "${CBUILD}" != "${CHOST}" ] && sha512sums=" bae804f057252c25452ac178c545dc2c4b4775cbfbdcfd4775edd1a4ed6507882bfac39e2b11ad01b74230ca48d761bf62f11bde5bcbc35a6e5a61cbe4a46e36 051_all_coreutils-mangen.patch " return 0 diff --git a/system/fcron/APKBUILD b/system/fcron/APKBUILD index 79f12c416..15f9c2713 100644 --- a/system/fcron/APKBUILD +++ b/system/fcron/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fcron pkgver=3.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="periodical command scheduler for systems not always up" url="http://fcron.free.fr/" pkgusers="fcron" diff --git a/system/fcron/fcron.pre-install b/system/fcron/fcron.pre-install index b15879178..8f64a517b 100644 --- a/system/fcron/fcron.pre-install +++ b/system/fcron/fcron.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -adduser -S -D -H -s /sbin/nologin -g fcron fcron 2>/dev/null -addgroup -S fcron 2>/dev/null +groupadd -r fcron 2>/dev/null +useradd -c fcron -s /sbin/nologin -g fcron -r fcron 2>/dev/null exit 0 diff --git a/system/gcc/APKBUILD b/system/gcc/APKBUILD index 5eaae5163..68771a8aa 100644 --- a/system/gcc/APKBUILD +++ b/system/gcc/APKBUILD @@ -343,7 +343,7 @@ package() { rm -f "$pkgdir"/usr/lib/libffi* "$pkgdir"/usr/share/man/man3/ffi* find "$pkgdir" -name 'ffi*.h' | xargs rm -f - local gdblib=${_target:+$CTARGET/}lib + local gdblib="${_target:+$CTARGET/}lib" for i in $(find "$pkgdir"/usr/$gdblib/ -type f -maxdepth 1 -name "*-gdb.py" ); do mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib mv "$i" "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib/ @@ -368,7 +368,7 @@ package() { # linker finds the libs from relocated sysroot for so in "$pkgdir"/usr/$CTARGET/lib/*.so; do if [ -h "$so" ]; then - local _real=$(basename $(readlink "$so")) + local _real="$(basename $(readlink "$so"))" rm -f "$so" echo "GROUP ($_real)" > "$so" fi diff --git a/system/icu/APKBUILD b/system/icu/APKBUILD index 35ca27573..7676fbf2b 100644 --- a/system/icu/APKBUILD +++ b/system/icu/APKBUILD @@ -4,7 +4,7 @@ pkgname=icu pkgver=63.1 # convert x.y.z to x_y_z -_ver=${pkgver//./_} +_ver=$(printf '%s' "$pkgver" | tr . _) pkgrel=1 pkgdesc="International Components for Unicode library" @@ -15,7 +15,7 @@ subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs" depends="" checkdepends="diffutils" makedepends="" -source="https://download.icu-project.org/files/icu4c/${pkgver}/${pkgname}4c-$_ver-src.tgz +source="https://ssl.icu-project.org/files/icu4c/${pkgver}/${pkgname}4c-$_ver-src.tgz icu-60.2-always-use-utf8.patch checkimpl.patch icu-63.1-test-failure.patch diff --git a/system/libedit/APKBUILD b/system/libedit/APKBUILD index d9dc2003b..33d7abb78 100644 --- a/system/libedit/APKBUILD +++ b/system/libedit/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libedit pkgver=20190324.3.1 -_realver=${pkgver/.3.1/-3.1} +_realver="${pkgver%%.*}-${pkgver#*.}" pkgrel=0 pkgdesc="Library providing line editing, history, and tokenisation functions" url="https://thrysoee.dk/editline/" diff --git a/system/mawk/APKBUILD b/system/mawk/APKBUILD index ca9005ce5..8f2cd7faf 100644 --- a/system/mawk/APKBUILD +++ b/system/mawk/APKBUILD @@ -8,7 +8,7 @@ url="https://invisible-island.net/mawk/mawk.html" arch="all" license="BSD-3-Clause" subpackages="$pkgname-doc" -_dlver="${pkgver/.201/-201}" +_dlver="${pkgver%.*}-${pkgver##*.}" source="https://invisible-mirror.net/archives/$pkgname/$pkgname-$_dlver.tgz" builddir="$srcdir/$pkgname-$_dlver" diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD index 7028f21ec..73bfea8b5 100644 --- a/system/musl/APKBUILD +++ b/system/musl/APKBUILD @@ -82,7 +82,7 @@ package() { make DESTDIR="$pkgdir" install # make LDSO the be the real file, and libc the symlink - local LDSO=$(make -f Makefile --eval "$(echo -e 'print-ldso:\n\t@echo $$(basename $(LDSO_PATHNAME))')" print-ldso) + local LDSO="$(make -f Makefile --eval "$(printf 'print-ldso:\n\t@echo $$(basename $(LDSO_PATHNAME))')" print-ldso)" mv -f "$pkgdir"/usr/lib/libc.so "$pkgdir"/lib/"$LDSO" ln -sf "$LDSO" "$pkgdir"/lib/libc.musl-${CARCH}.so.1 ln -sf ../../lib/"$LDSO" "$pkgdir"/usr/lib/libc.so diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD index 058a81abd..414283adf 100644 --- a/system/ncurses/APKBUILD +++ b/system/ncurses/APKBUILD @@ -49,8 +49,8 @@ package() { # Install basic terms in /etc/terminfo for i in ansi console dumb linux rxvt screen sun vt52 vt100 vt102 \ vt200 vt220 xterm xterm-color xterm-xfree86; do - local termfile=$(find "$pkgdir"/usr/share/terminfo/ -name "$i" 2>/dev/null) || true - local basedir=$(basename $(dirname "$termfile")) + local termfile="$(find "$pkgdir"/usr/share/terminfo/ -name "$i" 2>/dev/null)" + local basedir="$(basename $(dirname "$termfile"))" [ -z "$termfile" ] && continue diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD index 9c41ced39..f88776116 100644 --- a/system/nss/APKBUILD +++ b/system/nss/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nss pkgver=3.44.1 -_ver=${pkgver//./_} +_ver=$(printf '%s' "$pkgver" | tr . _) pkgrel=0 pkgdesc="Mozilla Network Security Services" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" @@ -13,7 +13,7 @@ depends="" depends_dev="nspr-dev" makedepends="nspr-dev sqlite-dev zlib-dev perl bsd-compat-headers" subpackages="$pkgname-static $pkgname-dev $pkgname-tools" -source="https://ftp.mozilla.org/pub/security/$pkgname/releases/NSS_${pkgver//./_}_RTM/src/$pkgname-$pkgver.tar.gz +source="https://ftp.mozilla.org/pub/security/$pkgname/releases/NSS_${_ver}_RTM/src/$pkgname-$pkgver.tar.gz nss.pc.in nss-util.pc.in nss-softokn.pc.in @@ -85,7 +85,7 @@ package() { -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ > "$pkgdir"/usr/bin/nss-config chmod 755 "$pkgdir"/usr/bin/nss-config - local minor=${pkgver#*.} + local minor="${pkgver#*.}" minor=${minor%.*} for file in $(find dist/*.OBJ/lib -name "*.so"); do install -m755 $file \ diff --git a/system/openrc/APKBUILD b/system/openrc/APKBUILD index fcec2abeb..c59c0b642 100644 --- a/system/openrc/APKBUILD +++ b/system/openrc/APKBUILD @@ -1,7 +1,6 @@ # Maintainer: pkgname=openrc pkgver=0.24.1 -_ver=${pkgver/_git*/} pkgrel=7 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="https://github.com/OpenRC/openrc" @@ -33,7 +32,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve sysfsconf.initd " -builddir="$srcdir/$pkgname-$_ver" prepare() { default_prepare sed -i -e '/^sed/d' "$builddir"/pkgconfig/Makefile diff --git a/system/ruby/APKBUILD b/system/ruby/APKBUILD index 67b89f845..1a26b65b3 100644 --- a/system/ruby/APKBUILD +++ b/system/ruby/APKBUILD @@ -73,7 +73,7 @@ replaces="ruby-etc ruby-gems" _gemdir="/usr/lib/ruby/gems/$_abiver" _rubydir="/usr/lib/ruby/$_abiver" -_chost="${CHOST/-foxkit-/-}" +_chost="$(printf '%s' "$CHOST" | sed 's/-foxkit-/-/')" case "$CARCH" in x86 | pmmx) _arch="i386";; @@ -136,7 +136,7 @@ package() { rm -R "$pkgdir"$_gemdir/cache/* if [ -d "$pkgdir"/usr/local ]; then - local f=$(cd "$pkgdir" ; find usr/local -type f) + local f="$(cd "$pkgdir" ; find usr/local -type f)" if [ -n "$f" ]; then error "Found files in /usr/local:" echo "$f" diff --git a/system/sysvinit/APKBUILD b/system/sysvinit/APKBUILD index b95525084..e13e92043 100644 --- a/system/sysvinit/APKBUILD +++ b/system/sysvinit/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sysvinit pkgver=2.88 -pkgrel=6 +pkgrel=7 pkgdesc="System V-style init programs" url="https://savannah.nongnu.org/projects/sysvinit" arch="all" diff --git a/system/sysvinit/sysvinit.post-upgrade b/system/sysvinit/sysvinit.post-upgrade index 189621e2c..9b909f73b 100644 --- a/system/sysvinit/sysvinit.post-upgrade +++ b/system/sysvinit/sysvinit.post-upgrade @@ -1,4 +1,4 @@ #!/bin/sh -/sbin/telinit U &> /dev/null +/sbin/telinit U >/dev/null 2>&1 exit 0 diff --git a/system/unzip/APKBUILD b/system/unzip/APKBUILD index 55ad2fd05..aad54fa2d 100644 --- a/system/unzip/APKBUILD +++ b/system/unzip/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=unzip pkgver=6.0 -_pkgver=${pkgver//./} +_pkgver=$(printf '%s' "$pkgver" | tr -d .) pkgrel=3 pkgdesc="Extract PKZIP-compatible .zip files" url="http://www.info-zip.org/UnZip.html" diff --git a/user/ae_fonts/APKBUILD b/user/ae_fonts/APKBUILD index c5f66b6ab..19535f00f 100644 --- a/user/ae_fonts/APKBUILD +++ b/user/ae_fonts/APKBUILD @@ -18,9 +18,9 @@ package() { cd "$builddir" local _fontdir for _fontdir in AAHS AGA FS Kasr MCS Shmookh; do - pushd $_fontdir + cd $_fontdir install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf - popd + cd "$OLDPWD" done } diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD index fb5e75d29..90a098922 100644 --- a/user/apache-httpd/APKBUILD +++ b/user/apache-httpd/APKBUILD @@ -3,7 +3,7 @@ pkgname=apache-httpd _pkgreal=httpd pkgver=2.4.39 -pkgrel=0 +pkgrel=1 pkgdesc="Open-source HTTP server" url="https://httpd.apache.org" arch="all" diff --git a/user/apache-httpd/apache-httpd.pre-install b/user/apache-httpd/apache-httpd.pre-install index d4ede7476..65cf5b926 100644 --- a/user/apache-httpd/apache-httpd.pre-install +++ b/user/apache-httpd/apache-httpd.pre-install @@ -1,8 +1,8 @@ #!/bin/sh -addgroup -S -g 82 www-data 2>/dev/null -addgroup -S apache 2>/dev/null -adduser -S -D -H -h /var/www -s /sbin/nologin -G apache -g apache apache 2>/dev/null -addgroup apache www-data 2>/dev/null +groupadd -r -g 82 www-data 2>/dev/null +groupadd -r apache 2>/dev/null +useradd -c apache -s /sbin/nologin -g apache -G www-data \ + -m -d /var/www -r apache 2>/dev/null exit 0 diff --git a/user/apache-httpd/apache-httpd.pre-upgrade b/user/apache-httpd/apache-httpd.pre-upgrade index d4ede7476..02edc914c 100644..120000 --- a/user/apache-httpd/apache-httpd.pre-upgrade +++ b/user/apache-httpd/apache-httpd.pre-upgrade @@ -1,8 +1 @@ -#!/bin/sh - -addgroup -S -g 82 www-data 2>/dev/null -addgroup -S apache 2>/dev/null -adduser -S -D -H -h /var/www -s /sbin/nologin -G apache -g apache apache 2>/dev/null -addgroup apache www-data 2>/dev/null - -exit 0 +apache-httpd.pre-install
\ No newline at end of file diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD index 41eca142e..aae3a8f34 100644 --- a/user/bind/APKBUILD +++ b/user/bind/APKBUILD @@ -9,7 +9,7 @@ _p=${pkgver#*_p} _ver=${pkgver%_p*} _major=${pkgver%%.*} [ "$_p" != "$pkgver" ] && _ver="${_ver}-P$_p" -pkgrel=1 +pkgrel=2 pkgdesc="The ISC DNS server" url="https://www.isc.org/downloads/bind/" arch="all" diff --git a/user/bind/bind.pre-install b/user/bind/bind.pre-install index 3f7c36847..2801f5172 100644 --- a/user/bind/bind.pre-install +++ b/user/bind/bind.pre-install @@ -1,6 +1,7 @@ #!/bin/sh -addgroup -S named 2>/dev/null -adduser -S -D -H -h /etc/bind -s /sbin/nologin -G named -g named named 2>/dev/null +groupadd -r named 2>/dev/null +useradd -c named -s /sbin/nologin -g named \ + -m -d /etc/bind -r named 2>/dev/null exit 0 diff --git a/user/boost/APKBUILD b/user/boost/APKBUILD index ffd7e867e..2a8a89786 100644 --- a/user/boost/APKBUILD +++ b/user/boost/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=boost pkgver=1.69.0 -_pkgver="${pkgver//./_}" +_pkgver=$(printf '%s' "$pkgver" | tr . _) pkgrel=0 pkgdesc="Free peer-reviewed portable C++ source libraries" url="https://www.boost.org/" diff --git a/user/cgit/APKBUILD b/user/cgit/APKBUILD index abd773d44..eda8e62b4 100644 --- a/user/cgit/APKBUILD +++ b/user/cgit/APKBUILD @@ -30,7 +30,7 @@ prepare() { cd "$builddir" # check that upstream git ver corresponds with ours - local _ver=$(awk -F'[ \t]*=[ \t]*' '/^GIT_VER/ { print $2 }' Makefile) + local _ver="$(awk -F'[ \t]*=[ \t]*' '/^GIT_VER/ { print $2 }' Makefile)" if [ "$_ver" != "$_gitver" ]; then error "Please set _gitver in APKBUILD to $_ver" return 1 diff --git a/user/chrony/APKBUILD b/user/chrony/APKBUILD index 46516b598..01f3a13b7 100644 --- a/user/chrony/APKBUILD +++ b/user/chrony/APKBUILD @@ -4,8 +4,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=chrony pkgver=3.5 -pkgrel=0 -_ver=${pkgver/_/-} +pkgrel=1 pkgdesc="NTP client and server programs" url="https://chrony.tuxfamily.org" pkgusers="$pkgname" @@ -17,7 +16,7 @@ depends="" makedepends="asciidoctor libcap-dev libedit-dev texinfo" checkdepends="bash" subpackages="$pkgname-doc $pkgname-openrc" -source="https://download.tuxfamily.org/$pkgname/$pkgname-$_ver.tar.gz +source="https://download.tuxfamily.org/$pkgname/$pkgname-$pkgver.tar.gz fix-tests.patch max_resolve_interval.patch chronyd.confd @@ -26,7 +25,6 @@ source="https://download.tuxfamily.org/$pkgname/$pkgname-$_ver.tar.gz chrony.conf timepps.h " -builddir="$srcdir/$pkgname-$_ver" prepare() { default_prepare diff --git a/user/chrony/chrony.pre-install b/user/chrony/chrony.pre-install index 897fb74cc..b143d0a4c 100644 --- a/user/chrony/chrony.pre-install +++ b/user/chrony/chrony.pre-install @@ -1,6 +1,7 @@ #!/bin/sh -addgroup -S chrony 2>/dev/null -adduser -S -D -h /var/log/chrony -s /sbin/nologin -G chrony -g chrony chrony 2>/dev/null +groupadd -r chrony 2>/dev/null +useradd -c chrony -s /sbin/nologin -g chrony \ + -m -d /var/log/chrony -r chrony 2>/dev/null exit 0 diff --git a/user/clang/APKBUILD b/user/clang/APKBUILD index e5ed50d06..bd24476b8 100644 --- a/user/clang/APKBUILD +++ b/user/clang/APKBUILD @@ -47,7 +47,7 @@ build() { make clang-tblgen # too memory hungry - if [ -z "$JOBS" -o $JOBS -gt 32 ]; then + if [ -z "$JOBS" ] || [ $JOBS -gt 32 ]; then make -j32 else make @@ -71,13 +71,13 @@ package() { mkdir -p "$pkgdir"/usr/lib/llvm$_llvmver/bin mkdir -p "$pkgdir"/usr/lib/llvm$_llvmver/lib for _dir in bin lib; do - pushd "$pkgdir"/usr/$_dir + cd "$pkgdir"/usr/$_dir for _file in *; do [ -f $_file ] || continue ln -s "../../../$_dir/$_file" \ "$pkgdir"/usr/lib/llvm$_llvmver/$_dir/$_file done - popd + cd "$OLDPWD" done # needed for at least Qt Creator diff --git a/user/cups/APKBUILD b/user/cups/APKBUILD index f37bc34d0..efc7566af 100644 --- a/user/cups/APKBUILD +++ b/user/cups/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=cups pkgver=2.2.11 -pkgrel=0 +pkgrel=1 pkgdesc="The CUPS Printing System" url="https://www.cups.org/" arch="all" diff --git a/user/cups/cups.pre-install b/user/cups/cups.pre-install index cdb75cac5..9776f0796 100644 --- a/user/cups/cups.pre-install +++ b/user/cups/cups.pre-install @@ -1,8 +1,7 @@ #!/bin/sh -addgroup -S lpadmin 2>/dev/null -addgroup -S lp 2>/dev/null -adduser -S -G lp -g lp lp 2>/dev/null -addgroup lp lp 2>/dev/null +groupadd -r lpadmin 2>/dev/null +groupadd -r lp 2>/dev/null +useradd -c lp -s /sbin/nologin -g lp -r lp 2>/dev/null exit 0 diff --git a/user/dbus/APKBUILD b/user/dbus/APKBUILD index 72b009f38..d9a305186 100644 --- a/user/dbus/APKBUILD +++ b/user/dbus/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dbus pkgver=1.12.16 -pkgrel=0 +pkgrel=1 pkgdesc="IPC/message bus system, allowing user applications to communicate" url="http://www.freedesktop.org/wiki/Software/dbus/" pkggroups="messagebus" diff --git a/user/dbus/dbus.pre-install b/user/dbus/dbus.pre-install index 889651721..39e5464f2 100644 --- a/user/dbus/dbus.pre-install +++ b/user/dbus/dbus.pre-install @@ -1,6 +1,7 @@ #!/bin/sh -addgroup -S messagebus 2>/dev/null -adduser -S -D -H -h /dev/null -s /sbin/nologin -G messagebus -g "D-Bus User" messagebus 2>/dev/null +groupadd -r messagebus 2>/dev/null +useradd -c "D-Bus User" -s /sbin/nologin -g messagebus \ + -m -d /dev/null -r messagebus 2>/dev/null exit 0 diff --git a/user/dialog/APKBUILD b/user/dialog/APKBUILD index 6e0547a1f..c2a85db1f 100644 --- a/user/dialog/APKBUILD +++ b/user/dialog/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dialog -_realver=1.3-20190211 -pkgver=${_realver/-/.} +pkgver=1.3.20190211 +_realver="${pkgver%.*}-${pkgver##*.}" pkgrel=0 pkgdesc="Script interpreter providing curses widgets" url="https://invisible-island.net/dialog/dialog.html" @@ -13,7 +13,7 @@ depends="" makedepends="ncurses-dev" subpackages="$pkgname-doc" source="https://invisible-mirror.net/archives/dialog/dialog-$_realver.tgz" -builddir="$srcdir"/$pkgname-$_realver +builddir="$srcdir/$pkgname-$_realver" build() { ./configure \ diff --git a/user/distcc/APKBUILD b/user/distcc/APKBUILD index 9584cab67..c70c6225e 100644 --- a/user/distcc/APKBUILD +++ b/user/distcc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=distcc pkgver=3.3.2 -pkgrel=0 +pkgrel=1 pkgdesc="Distributed builds for C, C++ and Objective C" url="https://distcc.github.io/" arch="all" diff --git a/user/distcc/distcc.pre-install b/user/distcc/distcc.pre-install index ded93fd09..16b5e4f59 100644 --- a/user/distcc/distcc.pre-install +++ b/user/distcc/distcc.pre-install @@ -1,6 +1,7 @@ #!/bin/sh -addgroup -S distcc 2>/dev/null -adduser -S -D -H -h /var/lib/distcc -s /bin/false -G distcc -g distcc distcc 2>/dev/null +groupadd -r distcc 2>/dev/null +useradd -c distcc -s /sbin/nologin -g distcc \ + -m -d /var/lib/distcc -r distcc 2>/dev/null exit 0 diff --git a/user/fftw/APKBUILD b/user/fftw/APKBUILD index 31a334f88..aba0de1a6 100644 --- a/user/fftw/APKBUILD +++ b/user/fftw/APKBUILD @@ -2,6 +2,7 @@ # Maintainer: pkgname=fftw pkgver=3.3.8 +_pkgver=$(printf '%s' "$pkgver" | sed 's/p/-pl/') pkgrel=0 pkgdesc="Fastest fourier transform in the west" url="http://www.fftw.org/" @@ -12,9 +13,8 @@ makedepends="texinfo" # order of the libs split functions are important because of lib naming subpackages="$pkgname-dev $pkgname-doc $pkgname-single-libs:single $pkgname-long-double-libs:long_double $pkgname-double-libs:double" -srcpkgver=${pkgver//p/-pl} -source="http://www.fftw.org/$pkgname-$srcpkgver.tar.gz" -builddir="$srcdir/$pkgname-$srcpkgver" +source="http://www.fftw.org/$pkgname-$_pkgver.tar.gz" +builddir="$srcdir/$pkgname-$_pkgver" _precision="single double long-double" diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD index 8a9a805e1..b9d51af8c 100644 --- a/user/firefox-esr/APKBUILD +++ b/user/firefox-esr/APKBUILD @@ -157,7 +157,7 @@ build() { --with-system-zlib \ $extra_flags # too memory hungry - if [ -z "$JOBS" -o $JOBS -gt 16 ]; then + if [ -z "$JOBS" ] || [ $JOBS -gt 16 ]; then make -j16 else make @@ -177,7 +177,7 @@ package() { local png for png in ../browser/branding/official/default*.png; do - local i=${_png%.png} + local i="${_png%.png}" i=${i##*/default} install -D -m644 "$png" \ "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png diff --git a/user/gnutls/APKBUILD b/user/gnutls/APKBUILD index 78d9b6fdd..627abf2ec 100644 --- a/user/gnutls/APKBUILD +++ b/user/gnutls/APKBUILD @@ -62,7 +62,8 @@ package() { dane() { pkgdesc="$pkgdesc (DNS DANE support library)" - mkdir -p "$subpkgdir"/usr/{bin,lib} + mkdir -p "$subpkgdir"/usr/bin + mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/bin/danetool "$subpkgdir"/usr/bin/ mv "$pkgdir"/usr/lib/libgnutls-dane* "$subpkgdir"/usr/lib/ } diff --git a/user/graphite2/APKBUILD b/user/graphite2/APKBUILD index 33ff919e7..6ad455474 100644 --- a/user/graphite2/APKBUILD +++ b/user/graphite2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=graphite2 -_realname=${pkgname/2/} +_realname=${pkgname%2} pkgver=1.3.13 pkgrel=0 pkgdesc="Text processing engine for complex languages" @@ -17,7 +17,7 @@ subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/silnrsi/$_realname/archive/$pkgver.tar.gz graphite2-1.2.0-cmakepath.patch " -builddir="$srcdir"/$_realname-$pkgver +builddir="$srcdir/$_realname-$pkgver" build() { cd "$builddir" diff --git a/user/intlfonts/APKBUILD b/user/intlfonts/APKBUILD index 8459dd241..35f39ccb6 100644 --- a/user/intlfonts/APKBUILD +++ b/user/intlfonts/APKBUILD @@ -34,7 +34,8 @@ package() { make DESTDIR="$pkgdir" install mv "$pkgdir"/usr/share/fonts/X11/misc/TrueType \ "$pkgdir"/usr/share/fonts/X11/TTF - rm "$pkgdir"/usr/share/fonts/X11/misc/fonts.{alias,dir} + rm "$pkgdir"/usr/share/fonts/X11/misc/fonts.alias + rm "$pkgdir"/usr/share/fonts/X11/misc/fonts.dir # font-daewoo-misc rm "$pkgdir"/usr/share/fonts/X11/misc/hanglg16.pcf.gz diff --git a/user/ipaexfont/APKBUILD b/user/ipaexfont/APKBUILD index dfbbc3436..f76922b9a 100644 --- a/user/ipaexfont/APKBUILD +++ b/user/ipaexfont/APKBUILD @@ -2,6 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ipaexfont pkgver=004.01 +_pkgver="${pkgver%.*}${pkgver#*.}" pkgrel=0 pkgdesc="Standard Japanese typefaces" url="https://ipafont.ipa.go.jp/" @@ -11,8 +12,8 @@ license="IPA" depends="fontconfig" makedepends="" subpackages="" -source="https://oscdl.ipa.go.jp/IPAexfont/IPAexfont${pkgver/./}.zip" -builddir="$srcdir/IPAexfont${pkgver/./}" +source="https://oscdl.ipa.go.jp/IPAexfont/IPAexfont$_pkgver.zip" +builddir="$srcdir/IPAexfont$_pkgver" package() { cd "$builddir" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index ae31b0430..26afe3227 100644 --- a/user/kate/APKBUILD +++ b/user/kate/APKBUILD @@ -71,7 +71,7 @@ kwrite_doc() { pkgdesc="Simple GUI text editor (documentation)" install_if="docs kwrite=$pkgver-r$pkgrel" for _langpath in "$pkgdir"/usr/share/doc/HTML/*; do - local _sublangpath=${_langpath/"$pkgdir"/"$subpkgdir"} + local _sublangpath="$subpkgdir/${_langpath#"$pkgdir"}" if [ -d "$_langpath"/kwrite ]; then mkdir -p "$_sublangpath" mv "$_langpath"/kwrite "$_sublangpath"/ @@ -84,7 +84,7 @@ kwrite_lang() { pkgdesc="Simple GUI text editor (translations)" for _langpath in "$pkgdir"/usr/share/locale/*/LC_MESSAGES; do - local _sublangpath=${_langpath/"$pkgdir"/"$subpkgdir"} + local _sublangpath="$subpkgdir/${_langpath#"$pkgdir"}" if [ -f "$_langpath"/kwrite.mo ]; then mkdir -p "$_sublangpath" mv "$_langpath"/kwrite.mo "$_sublangpath"/ diff --git a/user/libcdio-paranoia/APKBUILD b/user/libcdio-paranoia/APKBUILD index 9fc9a08b1..befa3a20d 100644 --- a/user/libcdio-paranoia/APKBUILD +++ b/user/libcdio-paranoia/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=libcdio-paranoia pkgver=0.94_p1 -_pkgver="10.2+${pkgver/_p/+}" +_pkgver="10.2+${pkgver%_p*}+${pkgver#*_p}" pkgrel=1 pkgdesc="CD paranoia on top of libcdio" url="https://www.gnu.org/software/libcdio/" diff --git a/user/libdbusmenu-qt/APKBUILD b/user/libdbusmenu-qt/APKBUILD index 8b95777ca..b91995d28 100644 --- a/user/libdbusmenu-qt/APKBUILD +++ b/user/libdbusmenu-qt/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libdbusmenu-qt pkgver=0.9.3.16.04.20160218 -_realver=${pkgver/.16.04/+16.04} +_realver="${pkgver%.*.*.*}+${pkgver#*.*.*.}" pkgrel=0 pkgdesc="library to export QMenu over DBusMenu protocol" url="https://launchpad.net/libdbusmenu-qt/" @@ -14,8 +14,8 @@ depends="" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake doxygen" subpackages="$pkgname-dev $pkgname-doc" -source="https://launchpad.net/ubuntu/+archive/primary/+files/"$pkgname"_"$_realver".orig.tar.gz" -builddir="$srcdir"/$pkgname-$_realver +source="https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname}_${_realver}.orig.tar.gz" +builddir="$srcdir/$pkgname-$_realver" prepare() { cd "$builddir" diff --git a/user/libgphoto2/APKBUILD b/user/libgphoto2/APKBUILD index 59cd04e35..c1250aabb 100644 --- a/user/libgphoto2/APKBUILD +++ b/user/libgphoto2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=libgphoto2 pkgver=2.5.23 -pkgrel=0 +pkgrel=1 pkgdesc="Digital camera library" url="http://www.gphoto.org" arch="all" diff --git a/user/libgphoto2/libgphoto2.pre-install b/user/libgphoto2/libgphoto2.pre-install index c696fcdca..7e52e2fe3 100644 --- a/user/libgphoto2/libgphoto2.pre-install +++ b/user/libgphoto2/libgphoto2.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -addgroup -S camera 2>/dev/null +groupadd -r camera 2>/dev/null exit 0 diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD index aff1202d7..2934d5713 100644 --- a/user/libkdegames/APKBUILD +++ b/user/libkdegames/APKBUILD @@ -49,7 +49,12 @@ package() { # https://bugs.kde.org/show_bug.cgi?id=402220 # Qt doesn't care: # https://bugreports.qt.io/browse/QTBUG-72779 - rm -r "$pkgdir"/usr/share/carddecks/svg-{ancient-egyptians,future,jolly-royal,konqi-modern,standard,xskat-french} + cd "$pkgdir"/usr/share/carddecks + local i; for i in ancient-egyptians future jolly-royal \ + konqi-modern standard xskat-french + do + rm -r "svg-$i" + done } carddecks() { diff --git a/user/libnl3/APKBUILD b/user/libnl3/APKBUILD index 58dc88d4e..f5a2e5668 100644 --- a/user/libnl3/APKBUILD +++ b/user/libnl3/APKBUILD @@ -1,6 +1,7 @@ # Maintainer: pkgname=libnl3 pkgver=3.2.28 +_pkgver=$(printf '%s' "$pkgver" | tr . _) pkgrel=2 pkgdesc="Library for applications dealing with netlink sockets" url="http://www.infradead.org/~tgr/libnl/" @@ -10,8 +11,8 @@ depends="" makedepends="linux-headers flex bison" checkdepends="check-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-cli" -source="https://github.com/thom311/libnl/releases/download/libnl${pkgver//./_}/libnl-$pkgver.tar.gz" -builddir="$srcdir"/libnl-$pkgver +source="https://github.com/thom311/libnl/releases/download/libnl$_pkgver/libnl-$pkgver.tar.gz" +builddir="$srcdir/libnl-$pkgver" build() { cd "$builddir" diff --git a/user/libtheora/APKBUILD b/user/libtheora/APKBUILD index 2dd25afa7..618f413b9 100644 --- a/user/libtheora/APKBUILD +++ b/user/libtheora/APKBUILD @@ -30,7 +30,9 @@ prepare() { } build() { - CFLAGS="${CFLAGS/-Os/-O3}" CPPFLAGS="${CPPFLAGS/-Os/-O3}" ./configure \ + CFLAGS="$(printf '%s' "$CFLAGS" | sed 's/-Os/-O3/')" \ + CPPFLAGS="$(printf '%s' "$CPPFLAGS" | sed 's/-Os/-O3/')" \ + ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ diff --git a/user/libtommath/APKBUILD b/user/libtommath/APKBUILD index 826ecf131..2e5bce094 100644 --- a/user/libtommath/APKBUILD +++ b/user/libtommath/APKBUILD @@ -10,8 +10,7 @@ license="Unlicense" depends="" makedepends="" subpackages="$pkgname-dev" -source="https://github.com/libtom/libtommath/releases/download/v${pkgver/_/-}/ltm-${pkgver/_/-}.tar.xz" -builddir="$srcdir/$pkgname-${pkgver/_/-}" +source="https://github.com/libtom/libtommath/releases/download/v$pkgver/ltm-$pkgver.tar.xz" build() { make PREFIX=/usr -f makefile.shared diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD index 113d84c04..6a6420b06 100644 --- a/user/lighttpd/APKBUILD +++ b/user/lighttpd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lighttpd pkgver=1.4.54 -pkgrel=0 +pkgrel=1 pkgdesc="A secure, fast, compliant and very flexible web-server" url="http://www.lighttpd.net/" arch="all" diff --git a/user/lighttpd/lighttpd.pre-install b/user/lighttpd/lighttpd.pre-install index 81ccda1f9..bdc9b91b6 100644 --- a/user/lighttpd/lighttpd.pre-install +++ b/user/lighttpd/lighttpd.pre-install @@ -1,8 +1,8 @@ #!/bin/sh -addgroup -S -g 82 www-data 2>/dev/null -addgroup -S lighttpd 2>/dev/null -adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -G lighttpd -g lighttpd lighttpd 2>/dev/null -addgroup lighttpd www-data 2>/dev/null +groupadd -r -g 82 www-data 2>/dev/null +groupadd -S lighttpd 2>/dev/null +useradd -c lighttpd -s /sbin/nologin -g -G www-data \ + lighttpd -m -d /var/www/localhost/htdocs -k /etc/skel -r lighttpd 2>/dev/null exit 0 diff --git a/user/llvm8/APKBUILD b/user/llvm8/APKBUILD index b86bfda2b..21e3267b6 100644 --- a/user/llvm8/APKBUILD +++ b/user/llvm8/APKBUILD @@ -211,8 +211,8 @@ _test_utils() { _common_subpkg replaces="" - local litver=$(python3 "$builddir"/utils/lit/setup.py --version 2>/dev/null \ - | sed 's/\.dev.*$//') + local litver="$(python3 "$builddir"/utils/lit/setup.py --version 2>/dev/null \ + | sed 's/\.dev.*$//')" test -n "$litver" || return 1 provides="$provides lit=$litver-r$pkgrel" diff --git a/user/lm_sensors/APKBUILD b/user/lm_sensors/APKBUILD index 3b46a20f1..cf8e93f1b 100644 --- a/user/lm_sensors/APKBUILD +++ b/user/lm_sensors/APKBUILD @@ -1,6 +1,8 @@ # Maintainer: pkgname=lm_sensors +_pkgname=lm-sensors pkgver=3.5.0 +_pkgver=$(printf '%s' "$pkgver" | tr . -) pkgrel=0 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring." url="https://hwmon.wiki.kernel.org/lm_sensors" @@ -17,7 +19,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/lm-sensors/lm-sensors/archiv sensord.confd sensord.initd " -builddir="$srcdir/${pkgname/_/-}-${pkgver//./-}" +builddir="$srcdir/$_pkgname-$_pkgver" prepare() { cd "$builddir" diff --git a/user/lua-filesystem/APKBUILD b/user/lua-filesystem/APKBUILD index 3cf8fd603..e0deea91a 100644 --- a/user/lua-filesystem/APKBUILD +++ b/user/lua-filesystem/APKBUILD @@ -3,7 +3,7 @@ pkgname=lua-filesystem _pkgname=luafilesystem pkgver=1.7.0.2 -_pkgver=${pkgver//./_} +_pkgver=$(printf '%s' "$pkgver" | tr . _) _rockver=${pkgver%.*}-${pkgver##*.} pkgrel=1 pkgdesc="Filesystem functions for Lua" @@ -26,9 +26,9 @@ check() { } package() { - local rockdir="$pkgdir"/usr/lib/luarocks/rocks-5.3/$_pkgname/$_rockver + local rockdir="$pkgdir/usr/lib/luarocks/rocks-5.3/$_pkgname/$_rockver" cd "$builddir" - make LUA_LIBDIR="$pkgdir"/$(pkg-config --variable=INSTALL_CMOD lua) install + make LUA_LIBDIR="$pkgdir/$(pkg-config --variable=INSTALL_CMOD lua)" install mkdir -p "$rockdir" echo 'rock_manifest = {}' > "$rockdir"/rock_manifest } diff --git a/user/lua-socket/APKBUILD b/user/lua-socket/APKBUILD index 16bfbcf40..89cbd7447 100644 --- a/user/lua-socket/APKBUILD +++ b/user/lua-socket/APKBUILD @@ -5,7 +5,7 @@ _name=luasocket pkgver=3.0_rc1_git20160306 pkgrel=0 _ver=${pkgver%_git*} -_ver=${_ver/_rc/-rc} +_ver=$(printf '%s' "$_ver" | sed 's/_rc/-rc/') pkgdesc="Networking library for Lua" url="http://luaforge.net/projects/luasocket/" arch="all" diff --git a/user/lynx/APKBUILD b/user/lynx/APKBUILD index 4e69511e8..24af506f4 100644 --- a/user/lynx/APKBUILD +++ b/user/lynx/APKBUILD @@ -3,8 +3,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lynx pkgver=2.8.9_p1 -_relver=${pkgver/_p/rel.} -_v=${_relver%rel.*} +_relver="${pkgver%_p*}rel.${pkgver#*_p}" pkgrel=0 pkgdesc="Cross-platform text-based browser" url="https://lynx.invisible-island.net/" @@ -14,7 +13,7 @@ depends="gzip" makedepends="glib-dev ncurses-dev openssl-dev perl utmps-dev zlib-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_relver}.tar.bz2" -builddir="$srcdir"/${pkgname}${_relver} +builddir="$srcdir/${pkgname}${_relver}" build() { cd "$builddir" diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index 4b8dc8d5a..50100c2bb 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -196,7 +196,7 @@ _mv_gpipe() { } _dri() { - local n=${subpkgname##*-dri-} + local n="${subpkgname##*-dri-}" pkgdesc="Mesa DRI driver for $n" case $n in ati) diff --git a/user/newt/APKBUILD b/user/newt/APKBUILD index 0ba5de3ed..361caa50b 100644 --- a/user/newt/APKBUILD +++ b/user/newt/APKBUILD @@ -2,6 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=newt pkgver=0.52.21 +_pkgver=$(printf '%s' "$pkgver" | tr . -) pkgrel=0 pkgdesc="Terminal user interface library" url="https://pagure.io/newt/" @@ -11,8 +12,8 @@ license="LGPL-2.0-only" depends="" makedepends="popt-dev slang-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://pagure.io/newt/archive/r${pkgver//./-}/newt-r${pkgver//./-}.tar.gz" -builddir="$srcdir/newt-r${pkgver//./-}" +source="https://pagure.io/newt/archive/r$_pkgver/newt-r$_pkgver.tar.gz" +builddir="$srcdir/newt-r$_pkgver" prepare() { default_prepare diff --git a/user/nextcloud/APKBUILD b/user/nextcloud/APKBUILD index 6f86863ac..e21c3bf54 100644 --- a/user/nextcloud/APKBUILD +++ b/user/nextcloud/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=nextcloud pkgver=14.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="Self-hosted file sync and groupware server" url="https://nextcloud.com" arch="noarch" diff --git a/user/nextcloud/nextcloud.pre-install b/user/nextcloud/nextcloud.pre-install index e9cf53919..746906a7a 100644 --- a/user/nextcloud/nextcloud.pre-install +++ b/user/nextcloud/nextcloud.pre-install @@ -1,6 +1,7 @@ #!/bin/sh -addgroup -S -g 82 www-data 2>/dev/null -adduser -S -D -H -h /var/lib/nextcloud -s /sbin/nologin -G www-data -g Nextcloud nextcloud 2>/dev/null +groupadd -r -g 82 www-data 2>/dev/null +useradd -c Nextcloud -s /sbin/nologin -g www-data \ + -m -d /var/lib/nextcloud -r nextcloud 2>/dev/null exit 0 diff --git a/user/openjdk7/APKBUILD b/user/openjdk7/APKBUILD index de476ea21..e87060a19 100644 --- a/user/openjdk7/APKBUILD +++ b/user/openjdk7/APKBUILD @@ -214,7 +214,7 @@ jrelib() { jre/lib/security jre/lib/ext/*.jar jre/lib/cmm \ jre/ASSEMBLY_EXCEPTION jre/THIRD_PARTY_README jre/LICENSE; do - local dirname=${A%/*} + local dirname="${A%/*}" mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname done @@ -247,7 +247,7 @@ jre() { jre/lib/$_jarch/xawt \ jre/lib/$_jarch/libsplashscreen.so; do - local dirname=${A%/*} + local dirname="${A%/*}" mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname done diff --git a/user/openjdk8/APKBUILD b/user/openjdk8/APKBUILD index 24dd5e28a..8ac3960b4 100644 --- a/user/openjdk8/APKBUILD +++ b/user/openjdk8/APKBUILD @@ -104,8 +104,8 @@ unpack() { prepare() { cd "$builddir" - local ver_u=$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4) - local ver_b=$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4) + local ver_u="$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4)" + local ver_b="$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4)" [ "${pkgver#*.}" = "$ver_u.$ver_b" ] \ || die "Version mismatch, source is 8.$ver_u.$ver_b, but abuild defines $pkgver!" diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD index 552c760c6..22d31dac7 100644 --- a/user/openldap/APKBUILD +++ b/user/openldap/APKBUILD @@ -10,7 +10,7 @@ # pkgname=openldap pkgver=2.4.47 -pkgrel=0 +pkgrel=1 pkgdesc="LDAP Server" url="http://www.openldap.org/" arch="all" diff --git a/user/openldap/openldap.pre-install b/user/openldap/openldap.pre-install index eb6b10fa4..a98a882ae 100644 --- a/user/openldap/openldap.pre-install +++ b/user/openldap/openldap.pre-install @@ -1,7 +1,7 @@ #!/bin/sh -addgroup -S ldap 2>/dev/null -adduser -S -D -H -h /usr/lib/openldap -s /sbin/nologin -G ldap \ - -g "OpenLdap User" ldap 2>/dev/null +groupadd -r ldap 2>/dev/null +useradd -c "OpenLdap User" -s /sbin/nologin -g ldap \ + -m -d /usr/lib/openldap -r ldap 2>/dev/null exit 0 diff --git a/user/openvpn/APKBUILD b/user/openvpn/APKBUILD index 06317735b..83627323d 100644 --- a/user/openvpn/APKBUILD +++ b/user/openvpn/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=openvpn pkgver=2.4.6 -pkgrel=1 +pkgrel=2 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)" url="https://openvpn.net/" arch="all" diff --git a/user/openvpn/openvpn.pre-install b/user/openvpn/openvpn.pre-install index c07253531..f17d62880 100644 --- a/user/openvpn/openvpn.pre-install +++ b/user/openvpn/openvpn.pre-install @@ -1,6 +1,7 @@ #!/bin/sh -addgroup -S openvpn 2>/dev/null -adduser -S -D -H -h /dev/null -s /sbin/nologin -G openvpn -g openvpn openvpn 2>/dev/null +groupadd -r openvpn 2>/dev/null +useradd -c openvpn -s /sbin/nologin -g openvpn \ + -m -d /dev/null -r openvpn 2>/dev/null exit 0 diff --git a/user/opus/APKBUILD b/user/opus/APKBUILD index 2b2a2d887..7d6854a1b 100644 --- a/user/opus/APKBUILD +++ b/user/opus/APKBUILD @@ -14,7 +14,8 @@ builddir="$srcdir/$pkgname-$pkgver" build() { cd "$builddir" - CFLAGS="${CFLAGS/-Os/-O2}" ./configure \ + CFLAGS="$(printf '%s' "$CFLAGS" | sed 's/-Os/-O2/')" \ + ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ diff --git a/user/pcsc-lite/APKBUILD b/user/pcsc-lite/APKBUILD index 9746a2d46..ff8a667a9 100644 --- a/user/pcsc-lite/APKBUILD +++ b/user/pcsc-lite/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: pkgname=pcsc-lite pkgver=1.8.25 -pkgrel=0 +pkgrel=1 pkgdesc="Middleware to access a smart card using SCard API (PC/SC)" url="https://pcsclite.apdu.fr/" arch="all" diff --git a/user/pcsc-lite/pcsc-lite.pre-install b/user/pcsc-lite/pcsc-lite.pre-install index 2e654f28d..d7938a846 100644 --- a/user/pcsc-lite/pcsc-lite.pre-install +++ b/user/pcsc-lite/pcsc-lite.pre-install @@ -1,10 +1,7 @@ #!/bin/sh -username=pcscd -groupname=$username - -addgroup -S $username 2>/dev/null -adduser -S -D -H -h /var/run/$username -s /sbin/nologin -G $groupname \ - -g $username $username 2>/dev/null +groupadd -r pcscd 2>/dev/null +useradd -c pcscd -s /sbin/nologin -g pcscd \ + -m -d /var/run/pcscd -r pcscd 2>/dev/null exit 0 diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD index fb646c7c1..6c6b08849 100644 --- a/user/php7/APKBUILD +++ b/user/php7/APKBUILD @@ -247,7 +247,7 @@ prepare() { default_prepare update_config_sub - local vapi=$(sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h) + local vapi="$(sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h)" if [ "$vapi" != "$_apiver" ]; then error "Upstreram API version is now $vapi. Expecting $_apiver" error "After updating _apiver, all 3rd-party extensions must be rebuilt." diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD index 312916128..695f108cb 100644 --- a/user/postfix/APKBUILD +++ b/user/postfix/APKBUILD @@ -56,7 +56,8 @@ package() { "$pkgdir"/var/lib/postfix chown -R postfix:postfix \ "$pkgdir"/var/spool/postfix - chgrp postdrop "$pkgdir"/var/spool/postfix/{public,maildrop} + chgrp postdrop "$pkgdir"/var/spool/postfix/public \ + "$pkgdir"/var/spool/postfix/maildrop chmod 0750 "$pkgdir"/var/lib/postfix chgrp postdrop "$pkgdir"/usr/sbin/postdrop "$pkgdir"/usr/sbin/postqueue chmod 2755 "$pkgdir"/usr/sbin/postdrop "$pkgdir"/usr/sbin/postqueue diff --git a/user/postgresql/APKBUILD b/user/postgresql/APKBUILD index 91bdf258a..97300d986 100644 --- a/user/postgresql/APKBUILD +++ b/user/postgresql/APKBUILD @@ -69,8 +69,8 @@ prepare() { build() { export PYTHON=/usr/bin/python3 - export CFLAGS="${CFLAGS/-Os/-O2}" - export CPPFLAGS="${CPPFLAGS/-Os/-O2}" + export CFLAGS="$(printf '%s' "$CFLAGS" | sed 's/-Os/-O2/')" + export CFLAGS="$(printf '%s' "$CPPFLAGS" | sed 's/-Os/-O2/')" ./configure \ --build=$CBUILD \ diff --git a/user/ppp/APKBUILD b/user/ppp/APKBUILD index bcd4c85cf..c99d82171 100644 --- a/user/ppp/APKBUILD +++ b/user/ppp/APKBUILD @@ -78,7 +78,8 @@ package() { install -m 0644 etc.ppp/options "$pkgdir"/etc/ppp/options install -Dm 0644 "$srcdir"/ppp.pamd "$pkgdir"/etc/pam.d/ppp - install -Dm 0755 -t "$pkgdir"/usr/bin/ scripts/p{on,off,log} + install -Dm 0755 -t "$pkgdir"/usr/bin/ scripts/pon \ + scripts/poff scripts/plog install -Dm 0644 -t "$pkgdir"/usr/share/man/man1/ scripts/pon.1 install -Dm 0755 contrib/pppgetpass/pppgetpass.vt \ diff --git a/user/prosody/APKBUILD b/user/prosody/APKBUILD index 8fc6ce35c..89849d5a5 100644 --- a/user/prosody/APKBUILD +++ b/user/prosody/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=prosody pkgver=0.11.2 -pkgrel=0 +pkgrel=1 pkgdesc="Lua based Jabber/XMPP server" url="http://prosody.im/" arch="all" diff --git a/user/prosody/prosody.pre-install b/user/prosody/prosody.pre-install index 39d9cfadd..d7b34c634 100644 --- a/user/prosody/prosody.pre-install +++ b/user/prosody/prosody.pre-install @@ -1,11 +1,7 @@ #!/bin/sh -addgroup -S prosody 2>/dev/null -adduser -S -D \ - -h /var/lib/prosody \ - -s /sbin/nologin \ - -G prosody \ - -g "Prosody XMPP Server" \ - prosody 2>/dev/null +groupadd -r prosody 2>/dev/null +useradd -c "Prosody XMPP Server" -s /sbin/nologin -g prosody \ + -m -d /var/lib/prosody -r prosody 2>/dev/null exit 0 diff --git a/user/pulseaudio/APKBUILD b/user/pulseaudio/APKBUILD index bacaab731..2829f044a 100644 --- a/user/pulseaudio/APKBUILD +++ b/user/pulseaudio/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pulseaudio pkgver=12.2 -pkgrel=3 +pkgrel=4 pkgdesc="A featureful, general-purpose sound server" url="https://www.freedesktop.org/wiki/Software/PulseAudio" pkgusers="pulse" diff --git a/user/pulseaudio/pulseaudio.pre-install b/user/pulseaudio/pulseaudio.pre-install index 7a1a18d59..ae20dce54 100644 --- a/user/pulseaudio/pulseaudio.pre-install +++ b/user/pulseaudio/pulseaudio.pre-install @@ -1,8 +1,8 @@ #!/bin/sh -addgroup -S pulse 2>/dev/null -addgroup -S pulse-access 2>/dev/null -adduser -S -D -H -h /var/empty -s /sbin/nologin -G pulse -g "PulseAudio daemon" pulse 2>/dev/null -addgroup pulse pulse-access 2>/dev/null +groupadd -r pulse 2>/dev/null +groupadd -r pulse-access 2>/dev/null +useradd -c "PulseAudio daemon" -s /sbin/nologin -g pulse -G pulse-access \ + -m -d /var/empty -r pulse 2>/dev/null exit 0 diff --git a/user/py3-alabaster/APKBUILD b/user/py3-alabaster/APKBUILD index 65356c103..4bf90edf0 100644 --- a/user/py3-alabaster/APKBUILD +++ b/user/py3-alabaster/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-alabaster _pkgname=alabaster +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.7.12 pkgrel=0 pkgdesc="Default theme for Sphinx Documentation Generator" @@ -11,7 +13,7 @@ arch="noarch" license="BSD-3-Clause" depends="python3 py3-pygments" makedepends="python3-dev" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-babel/APKBUILD b/user/py3-babel/APKBUILD index b9ce036aa..dc20f1d39 100644 --- a/user/py3-babel/APKBUILD +++ b/user/py3-babel/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-babel _pkgname=Babel +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.6.0 pkgrel=0 pkgdesc="Internationalization tools for Python" @@ -10,8 +12,8 @@ arch="noarch" license="BSD-3-Clause" depends="python3" makedepends="python3-dev" -checkdepends="py3-pytest py3-freezegun py3-python-dateutil py3-tz" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +checkdepends="py3-pytest py3-freezegun py3-python-dateutil py3-tz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-cffi/APKBUILD b/user/py3-cffi/APKBUILD index 4760f7521..439609e37 100644 --- a/user/py3-cffi/APKBUILD +++ b/user/py3-cffi/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-cffi _pkgname=cffi +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.12.3 pkgrel=0 pkgdesc="Interface for Python to call in to C code" @@ -12,7 +14,7 @@ depends="python3 py3-cparser" makedepends="libffi-dev python3-dev" checkdepends="py3-pytest" subpackages="" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-chardet/APKBUILD b/user/py3-chardet/APKBUILD index 81f03379a..f33618402 100644 --- a/user/py3-chardet/APKBUILD +++ b/user/py3-chardet/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-chardet _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=3.0.4 pkgrel=0 pkgdesc="The Universal Character Encoding Detector" @@ -13,7 +15,7 @@ license="LGPL-2.1-only" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-commonmark/APKBUILD b/user/py3-commonmark/APKBUILD index f8df6a75e..6f27198b2 100644 --- a/user/py3-commonmark/APKBUILD +++ b/user/py3-commonmark/APKBUILD @@ -2,16 +2,18 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-commonmark _pkgname=commonmark +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.9.0 pkgrel=0 pkgdesc="Python parser for the CommonMark Markdown flavour" -url="https://pypi.org/project/CommonMark/" +url="https://pypi.org/project/commonmark/" arch="noarch" license="BSD-3-Clause" depends="python3" makedepends="" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-cryptography/APKBUILD b/user/py3-cryptography/APKBUILD index 1f3b6d7ba..d1c6da05c 100644 --- a/user/py3-cryptography/APKBUILD +++ b/user/py3-cryptography/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-cryptography _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.7 pkgrel=0 pkgdesc="A package which provides cryptographic recipes and primitives" @@ -13,7 +15,7 @@ license="Apache-2.0 OR BSD-3-Clause" depends="python3 py3-cffi py3-asn1crypto py3-six" makedepends="python3-dev libffi-dev openssl-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-docopt/APKBUILD b/user/py3-docopt/APKBUILD index b0bdf48a7..cf1616ad2 100644 --- a/user/py3-docopt/APKBUILD +++ b/user/py3-docopt/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-docopt _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.6.2 pkgrel=0 pkgdesc="Expressive Python argument parsing library" @@ -11,7 +13,7 @@ license="MIT" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-docutils/APKBUILD b/user/py3-docutils/APKBUILD index febab9f74..30e60456d 100644 --- a/user/py3-docutils/APKBUILD +++ b/user/py3-docutils/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-docutils _pkgname=docutils +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.14 pkgrel=0 pkgdesc="Documentation utilities for Python" @@ -12,7 +14,7 @@ license="Custom" depends="python3 py3-pillow py3-roman" makedepends="python3-dev" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-freezegun/APKBUILD b/user/py3-freezegun/APKBUILD index 4148189a0..fcdc15747 100644 --- a/user/py3-freezegun/APKBUILD +++ b/user/py3-freezegun/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-freezegun _pkgname=freezegun +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.3.11 pkgrel=0 pkgdesc="Let your Python tests travel through time" @@ -12,7 +14,7 @@ license="Apache-2.0" depends="python3 py3-six" makedepends="python3-dev" checkdepends="py3-python-dateutil py3-pytest py3-mock py3-pbr" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-future/APKBUILD b/user/py3-future/APKBUILD index 3fead3a17..13265d2e6 100644 --- a/user/py3-future/APKBUILD +++ b/user/py3-future/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-future _pkgname=${pkgname##py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.17.1 pkgrel=0 pkgdesc="Easy, clean, reliable Python 2/3 compatibility" @@ -13,7 +15,7 @@ license="MIT" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-html5lib/APKBUILD b/user/py3-html5lib/APKBUILD index f65096fad..898efe4f1 100644 --- a/user/py3-html5lib/APKBUILD +++ b/user/py3-html5lib/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-html5lib _pkgname=html5lib +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.1 pkgrel=0 pkgdesc="HTML parser based on the WHATWG HTML specification" @@ -11,7 +13,7 @@ license="MIT" depends="python3 py3-six py3-webencodings" makedepends="python3-dev" checkdepends="py3-pytest py3-mock py3-pytest-expect" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-hypothesis/APKBUILD b/user/py3-hypothesis/APKBUILD index 808a84296..8775838a1 100644 --- a/user/py3-hypothesis/APKBUILD +++ b/user/py3-hypothesis/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-hypothesis _pkgname=hypothesis +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=4.14.3 pkgrel=0 pkgdesc="A library for property based testing" @@ -12,7 +14,7 @@ license="MPL-2.0" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest py3-attrs" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-imagesize/APKBUILD b/user/py3-imagesize/APKBUILD index c47afd26f..8b2dad108 100644 --- a/user/py3-imagesize/APKBUILD +++ b/user/py3-imagesize/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-imagesize _pkgname=imagesize +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.1.0 pkgrel=0 pkgdesc="Parse image file header and return image size" @@ -11,7 +13,7 @@ license="MIT" depends="python3" makedepends="python3-dev" #subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-jinja2/APKBUILD b/user/py3-jinja2/APKBUILD index 5f54488f5..71a4c2313 100644 --- a/user/py3-jinja2/APKBUILD +++ b/user/py3-jinja2/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-jinja2 _pkgname=Jinja2 +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.10 pkgrel=0 pkgdesc="A small but fast and easy to use stand-alone template engine written in pure python." @@ -11,7 +13,7 @@ license="BSD-3-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest py3-markupsafe" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-lxml/APKBUILD b/user/py3-lxml/APKBUILD index cdb7b4362..8e07f64aa 100644 --- a/user/py3-lxml/APKBUILD +++ b/user/py3-lxml/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-lxml _pkgname=lxml +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=4.3.4 pkgrel=0 pkgdesc="Python LXML Library" @@ -12,7 +14,7 @@ options="!check" # No test suite. license="BSD-3-Clause" depends="" makedepends="python3-dev libxml2-dev libxslt-dev" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-mako/APKBUILD b/user/py3-mako/APKBUILD index cf0db705a..0f7a0ab72 100644 --- a/user/py3-mako/APKBUILD +++ b/user/py3-mako/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-mako _pkgname=Mako +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.12 pkgrel=0 pkgdesc="Fast templating language for Python" @@ -12,7 +14,7 @@ depends="python3" makedepends="python3-dev" checkdepends="py3-markupsafe py3-mock py3-pbr py3-pluggy py3-py py3-pytest py3-six" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir"/$_pkgname-$pkgver build() { diff --git a/user/py3-markdown/APKBUILD b/user/py3-markdown/APKBUILD index d8faf68a3..40df4e38d 100644 --- a/user/py3-markdown/APKBUILD +++ b/user/py3-markdown/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: pkgname=py3-markdown _pkgname=Markdown +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=3.1.1 pkgrel=0 pkgdesc="A Python implementation of Markdown" @@ -12,7 +14,7 @@ license="BSD-3-Clause" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-markupsafe/APKBUILD b/user/py3-markupsafe/APKBUILD index 9d2c46b51..ced64dfdf 100644 --- a/user/py3-markupsafe/APKBUILD +++ b/user/py3-markupsafe/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-markupsafe _pkgname=MarkupSafe +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.1.1 pkgrel=0 pkgdesc="Safely add untrusted strings to HTML/XML markup." @@ -11,7 +13,7 @@ license="BSD-3-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-mock/APKBUILD b/user/py3-mock/APKBUILD index 1164ba07c..28047234a 100644 --- a/user/py3-mock/APKBUILD +++ b/user/py3-mock/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-mock _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.0.0 pkgrel=0 pkgdesc="A Python Mocking and Patching Library for Testing" @@ -13,7 +15,7 @@ license="BSD-2-Clause" depends="python3 py3-pbr py3-six" makedepends="python3-dev" subpackages="" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-openssl/APKBUILD b/user/py3-openssl/APKBUILD index f39f3da42..2908ca5c7 100644 --- a/user/py3-openssl/APKBUILD +++ b/user/py3-openssl/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-openssl _pkgname=pyOpenSSL +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=19.0.0 pkgrel=0 pkgdesc="Python wrapper module around the OpenSSL library" @@ -13,7 +15,7 @@ license="Apache-2.0" depends="python3 py3-cryptography py3-six" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-packaging/APKBUILD b/user/py3-packaging/APKBUILD index 08936d2a5..87527b822 100644 --- a/user/py3-packaging/APKBUILD +++ b/user/py3-packaging/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-packaging _pkgname=packaging +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=19.0 pkgrel=0 pkgdesc="Core utilities for Python packages" @@ -11,7 +13,7 @@ license="Apache-2.0 AND BSD-2-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest py3-pretend py3-pyparsing" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-passlib/APKBUILD b/user/py3-passlib/APKBUILD index e3b86d402..83d184039 100644 --- a/user/py3-passlib/APKBUILD +++ b/user/py3-passlib/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-passlib _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.7.1 pkgrel=0 pkgdesc="Python password hashing framework" @@ -13,7 +15,7 @@ depends="python3" checkdepends="py3-nose" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-pbr/APKBUILD b/user/py3-pbr/APKBUILD index bfbf75df6..53bd5311c 100644 --- a/user/py3-pbr/APKBUILD +++ b/user/py3-pbr/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-pbr _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=5.4.1 pkgrel=0 pkgdesc="Python Build Reasonableness" @@ -13,7 +15,7 @@ license="Apache-2.0" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-pexpect/APKBUILD b/user/py3-pexpect/APKBUILD index 2394872d5..b4e0e1745 100644 --- a/user/py3-pexpect/APKBUILD +++ b/user/py3-pexpect/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=py3-pexpect _pkgname=${pkgname#*-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=4.7.0 pkgrel=0 pkgdesc="Python library for managing console applications" @@ -10,7 +12,7 @@ arch="noarch" license="ISC" depends="python3 py3-ptyprocess" makedepends="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/pexpect-$pkgver" build() { diff --git a/user/py3-pillow/APKBUILD b/user/py3-pillow/APKBUILD index e137a6b0f..24583fbc7 100644 --- a/user/py3-pillow/APKBUILD +++ b/user/py3-pillow/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-pillow _pkgname=Pillow +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=5.3.0 pkgrel=0 pkgdesc="A Python Imaging Library" diff --git a/user/py3-pretend/APKBUILD b/user/py3-pretend/APKBUILD index 7cf86f96f..87ba1cdf6 100644 --- a/user/py3-pretend/APKBUILD +++ b/user/py3-pretend/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-pretend _pkgname=pretend +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.9 pkgrel=0 pkgdesc="A library for stubbing in Python" @@ -12,7 +14,7 @@ license="BSD-3-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-pygments/APKBUILD b/user/py3-pygments/APKBUILD index 81088c5d6..a9c885418 100644 --- a/user/py3-pygments/APKBUILD +++ b/user/py3-pygments/APKBUILD @@ -4,6 +4,8 @@ # Maintainer: pkgname=py3-pygments _pkgname=Pygments +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.4.2 pkgrel=0 pkgdesc="A syntax highlighting package written in Python" @@ -14,7 +16,7 @@ license="BSD-2-Clause" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-pyparsing/APKBUILD b/user/py3-pyparsing/APKBUILD index f84545871..b1ed948fb 100644 --- a/user/py3-pyparsing/APKBUILD +++ b/user/py3-pyparsing/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-pyparsing _pkgname=pyparsing +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.3.1 pkgrel=0 pkgdesc="Python parsing module" @@ -12,7 +14,7 @@ license="MIT" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-pysocks/APKBUILD b/user/py3-pysocks/APKBUILD index 61ed10714..b6ad62c26 100644 --- a/user/py3-pysocks/APKBUILD +++ b/user/py3-pysocks/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-pysocks _pkgname=PySocks +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.7.0 pkgrel=0 pkgdesc="SOCKS client module for Python" @@ -14,7 +16,7 @@ depends="python3" makedepends="python3-dev py3-atomicwrites py3-attrs py3-more-itertools py3-pluggy py3-py py3-pytest" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/PySocks-$pkgver" build() { diff --git a/user/py3-pytest-expect/APKBUILD b/user/py3-pytest-expect/APKBUILD index a8fcfadcf..0a3d5cb17 100644 --- a/user/py3-pytest-expect/APKBUILD +++ b/user/py3-pytest-expect/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-pytest-expect _pkgname=pytest-expect +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.1.0 pkgrel=0 pkgdesc="py.test plugin to store test expectations and mark tests based on them" @@ -10,7 +12,7 @@ arch="noarch" license="MIT" depends="python3 py3-pytest py3-u-msgpack-python" makedepends="python3-dev" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-python-dateutil/APKBUILD b/user/py3-python-dateutil/APKBUILD index 0e47c9ce1..2d114ce9d 100644 --- a/user/py3-python-dateutil/APKBUILD +++ b/user/py3-python-dateutil/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-python-dateutil _pkgname=python-dateutil +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.8.0 pkgrel=0 pkgdesc="Extensions to the standard Python datetime module" @@ -11,7 +13,7 @@ license="Apache-2.0 AND BSD-3-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest py3-hypothesis py3-freezegun" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-random2/APKBUILD b/user/py3-random2/APKBUILD index 9293281ed..d8ac44035 100644 --- a/user/py3-random2/APKBUILD +++ b/user/py3-random2/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-random2 _pkgname=random2 +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.1 pkgrel=0 pkgdesc="A Python module implementing Python 2's RNG" @@ -11,7 +13,7 @@ license="Python-2.0" depends="python3" makedepends="python3-dev" install="" -source="$pkgname-$pkgver.zip::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.zip" +source="$pkgname-$pkgver.zip::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.zip" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-recommonmark/APKBUILD b/user/py3-recommonmark/APKBUILD index 2b0d6db68..a0b15b675 100644 --- a/user/py3-recommonmark/APKBUILD +++ b/user/py3-recommonmark/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-recommonmark _pkgname=recommonmark +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.5.0 pkgrel=0 pkgdesc="Bridge between CommonMark and docutils" @@ -13,7 +15,7 @@ depends="python3 py3-commonmark py3-docutils py3-sphinx" checkdepends="py3-future" makedepends="" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-requests/APKBUILD b/user/py3-requests/APKBUILD index 947eb68f6..a82061ee2 100644 --- a/user/py3-requests/APKBUILD +++ b/user/py3-requests/APKBUILD @@ -4,6 +4,8 @@ # Maintainer: pkgname=py3-requests _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.22.0 pkgrel=0 pkgdesc="A HTTP request library for Python" @@ -14,7 +16,7 @@ options="!check" # tests connect to remote sites depends="python3 py3-chardet py3-idna py3-certifi py3-urllib3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-rfc3339/APKBUILD b/user/py3-rfc3339/APKBUILD index b1ea564a9..34332a1d8 100644 --- a/user/py3-rfc3339/APKBUILD +++ b/user/py3-rfc3339/APKBUILD @@ -4,6 +4,8 @@ # Maintainer: pkgname=py3-rfc3339 _pkgname=pyRFC3339 +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.1 pkgrel=0 pkgdesc="Generate and parse RFC 3339 timestamps" @@ -14,7 +16,7 @@ license="MIT" depends="python3 py3-tz" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-snowballstemmer/APKBUILD b/user/py3-snowballstemmer/APKBUILD index 5e24c7788..b86f0e46d 100644 --- a/user/py3-snowballstemmer/APKBUILD +++ b/user/py3-snowballstemmer/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-snowballstemmer _pkgname=snowballstemmer +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.2.1 pkgrel=0 pkgdesc="This package provides 16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms." @@ -11,7 +13,7 @@ options="!check" # Test script nowhere to be found license="BSD-2-Clause" depends="python3" makedepends="python3-dev" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinx/APKBUILD b/user/py3-sphinx/APKBUILD index 8fe5a9944..c8606a2fe 100644 --- a/user/py3-sphinx/APKBUILD +++ b/user/py3-sphinx/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-sphinx _pkgname=Sphinx +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.0.0 pkgrel=1 pkgdesc="Sphinx Python Documentation Generator" @@ -13,7 +15,7 @@ license="BSD-2-Clause AND BSD-3-Clause AND MIT" depends="python3 py3-alabaster py3-babel py3-pygments py3-docutils py3-imagesize py3-jinja2 py3-packaging py3-pyparsing py3-requests py3-snowballstemmer py3-tz py3-sphinxcontrib-applehelp py3-sphinxcontrib-devhelp py3-sphinxcontrib-htmlhelp py3-sphinxcontrib-jsmath py3-sphinxcontrib-qthelp py3-sphinxcontrib-serializinghtml imagemagick" makedepends="python3-dev" checkdepends="py3-pytest py3-docutils py3-html5lib" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinxcontrib-applehelp/APKBUILD b/user/py3-sphinxcontrib-applehelp/APKBUILD index 20e2a4430..26010c36a 100644 --- a/user/py3-sphinxcontrib-applehelp/APKBUILD +++ b/user/py3-sphinxcontrib-applehelp/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-sphinxcontrib-applehelp _pkgname=sphinxcontrib-applehelp +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.1 pkgrel=0 pkgdesc="A Sphinx extension to output Apple help books" @@ -12,7 +14,7 @@ license="BSD-2-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinxcontrib-asyncio/APKBUILD b/user/py3-sphinxcontrib-asyncio/APKBUILD index 73056c35a..09f91c27b 100644 --- a/user/py3-sphinxcontrib-asyncio/APKBUILD +++ b/user/py3-sphinxcontrib-asyncio/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-sphinxcontrib-asyncio _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.2.0 pkgrel=0 pkgdesc="Sphinx extension for using asyncio coroutines in markup" @@ -13,7 +15,7 @@ depends="python3" checkdepends="py3-pytest" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinxcontrib-devhelp/APKBUILD b/user/py3-sphinxcontrib-devhelp/APKBUILD index 01bfdf037..5b25ff13c 100644 --- a/user/py3-sphinxcontrib-devhelp/APKBUILD +++ b/user/py3-sphinxcontrib-devhelp/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-sphinxcontrib-devhelp _pkgname=sphinxcontrib-devhelp +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.1 pkgrel=0 pkgdesc="A sphinx extension to output Devhelp documents" @@ -12,7 +14,7 @@ license="BSD-2-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinxcontrib-htmlhelp/APKBUILD b/user/py3-sphinxcontrib-htmlhelp/APKBUILD index 66e2da105..1e5f428d6 100644 --- a/user/py3-sphinxcontrib-htmlhelp/APKBUILD +++ b/user/py3-sphinxcontrib-htmlhelp/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-sphinxcontrib-htmlhelp _pkgname=sphinxcontrib-htmlhelp +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.1 pkgrel=0 pkgdesc="A sphinx extension to output HtmlHelp" @@ -12,7 +14,7 @@ license="BSD-2-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest py3-html5lib" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinxcontrib-jsmath/APKBUILD b/user/py3-sphinxcontrib-jsmath/APKBUILD index 0a760859f..9443b5d25 100644 --- a/user/py3-sphinxcontrib-jsmath/APKBUILD +++ b/user/py3-sphinxcontrib-jsmath/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-sphinxcontrib-jsmath _pkgname=sphinxcontrib-jsmath +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.1 pkgrel=0 pkgdesc="A sphinx extension which renders display math in HTML via JavaScript" @@ -12,7 +14,7 @@ license="BSD-2-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinxcontrib-qthelp/APKBUILD b/user/py3-sphinxcontrib-qthelp/APKBUILD index 9feee1eae..fb32bad02 100644 --- a/user/py3-sphinxcontrib-qthelp/APKBUILD +++ b/user/py3-sphinxcontrib-qthelp/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-sphinxcontrib-qthelp _pkgname=sphinxcontrib-qthelp +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.0.2 pkgrel=0 pkgdesc="A Sphinx extension to output QtHelp documents." @@ -12,7 +14,7 @@ license="BSD-2-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-sphinxcontrib-serializinghtml/APKBUILD b/user/py3-sphinxcontrib-serializinghtml/APKBUILD index d576f8de8..b18e17848 100644 --- a/user/py3-sphinxcontrib-serializinghtml/APKBUILD +++ b/user/py3-sphinxcontrib-serializinghtml/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-sphinxcontrib-serializinghtml _pkgname=sphinxcontrib-serializinghtml +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=1.1.3 pkgrel=0 pkgdesc="A Sphinx extension to output serialized HTML (json and pickle)" @@ -12,7 +14,7 @@ license="BSD-2-Clause" depends="python3 py3-markupsafe" makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-tox/APKBUILD b/user/py3-tox/APKBUILD index 6776b8de6..fe36077c9 100644 --- a/user/py3-tox/APKBUILD +++ b/user/py3-tox/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-tox _pkgname=tox +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=3.0.0 pkgrel=0 pkgdesc="virtualenv management and test command line tool" @@ -12,7 +14,7 @@ license="MIT" depends="py3-py py3-pluggy py3-virtualenv py3-six python3" makedepends="python3-dev" #checkdepends="py3-pytest py3-tox" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-transitions/APKBUILD b/user/py3-transitions/APKBUILD index 8d9005f3e..255e631d5 100644 --- a/user/py3-transitions/APKBUILD +++ b/user/py3-transitions/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-transitions _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.6.9 pkgrel=0 pkgdesc="Python state machine library" @@ -12,7 +14,7 @@ license="MIT" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-twisted/APKBUILD b/user/py3-twisted/APKBUILD index a29880a9c..38265d761 100644 --- a/user/py3-twisted/APKBUILD +++ b/user/py3-twisted/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-twisted _pkgname=Twisted +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=19.2.1 pkgrel=0 pkgdesc="Asynchronous networking framework written in Python" @@ -11,7 +13,7 @@ license="MIT" depends="py3-incremental" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.bz2" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.bz2" builddir="$srcdir/Twisted-$pkgver" build() { diff --git a/user/py3-u-msgpack-python/APKBUILD b/user/py3-u-msgpack-python/APKBUILD index 1f7f03e82..20fe5e6e0 100644 --- a/user/py3-u-msgpack-python/APKBUILD +++ b/user/py3-u-msgpack-python/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-u-msgpack-python _pkgname=u-msgpack-python +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=2.5.1 pkgrel=0 pkgdesc="A portable, lightweight MessagePack serializer and deserializer written in pure Python." @@ -11,7 +13,7 @@ license="MIT" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-webencodings/APKBUILD b/user/py3-webencodings/APKBUILD index 8802cc1eb..967596d83 100644 --- a/user/py3-webencodings/APKBUILD +++ b/user/py3-webencodings/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: Brandon Bergren <git@bdragon.rtk0.net> pkgname=py3-webencodings _pkgname=webencodings +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=0.5.1 pkgrel=0 pkgdesc="Character encoding aliases for legacy web content" @@ -12,7 +14,7 @@ license="BSD-3-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-websockets/APKBUILD b/user/py3-websockets/APKBUILD index 3dad1684a..d3db557cb 100644 --- a/user/py3-websockets/APKBUILD +++ b/user/py3-websockets/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-websockets _pkgname=${pkgname#py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=8.0 pkgrel=0 pkgdesc="Python implementation of RFCs 6455 and 7692" @@ -11,7 +13,7 @@ license="BSD-3-Clause" depends="python3" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/py3-zope-interface/APKBUILD b/user/py3-zope-interface/APKBUILD index d5262edb9..b1025e17c 100644 --- a/user/py3-zope-interface/APKBUILD +++ b/user/py3-zope-interface/APKBUILD @@ -3,6 +3,8 @@ # Maintainer: pkgname=py3-zope-interface _pkgname=zope.interface +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" pkgver=4.6.0 pkgrel=0 pkgdesc="Separate distribution of the zope.interface package used in Zope" @@ -12,7 +14,7 @@ license="ZPL-2.1" depends="python3 py3-zope-event" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD index 9d7239c45..d2b372b0c 100644 --- a/user/qemu/APKBUILD +++ b/user/qemu/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qemu pkgver=3.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Machine emulator and virtualisation software" url="https://www.qemu.org/" arch="all" @@ -314,8 +314,8 @@ package() { } _subsys() { - local name=${1:-"${subpkgname#$pkgname-}"} - pkgdesc="Qemu ${name/-/ } emulator" + local name="${1:-"${subpkgname#$pkgname-}"}" + pkgdesc="Qemu $(printf '%s' "$name" | tr - ' ') emulator" options="" depends="" case "$name" in diff --git a/user/qemu/qemu.pre-install b/user/qemu/qemu.pre-install index 2ef9b5366..2927f9aff 100644 --- a/user/qemu/qemu.pre-install +++ b/user/qemu/qemu.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -addgroup -S -g 34 kvm 2>/dev/null -addgroup -S -g 36 qemu 2>/dev/null +groupadd -r -g 34 kvm 2>/dev/null +groupadd -r -g 36 qemu 2>/dev/null exit 0 diff --git a/user/qt5-qtdeclarative/APKBUILD b/user/qt5-qtdeclarative/APKBUILD index 6518c3716..3b9b56a89 100644 --- a/user/qt5-qtdeclarative/APKBUILD +++ b/user/qt5-qtdeclarative/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtdeclarative -_pkgname=${pkgname/qt5-/}-opensource-src +_pkgname=${pkgname#qt5-}-opensource-src pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Qt Declarative and Qt Quick 2" diff --git a/user/qt5-qtpositioning/APKBUILD b/user/qt5-qtpositioning/APKBUILD index 5bb8daf6f..9f74280ef 100644 --- a/user/qt5-qtpositioning/APKBUILD +++ b/user/qt5-qtpositioning/APKBUILD @@ -21,7 +21,7 @@ build() { cd "$builddir" qmake # too memory hungry - if [ -z "$JOBS" -o $JOBS -gt 16 ]; then + if [ -z "$JOBS" ] || [ $JOBS -gt 16 ]; then make -j16 else make diff --git a/user/quassel/APKBUILD b/user/quassel/APKBUILD index f9f583de7..a52be97cb 100644 --- a/user/quassel/APKBUILD +++ b/user/quassel/APKBUILD @@ -59,7 +59,7 @@ client() { mv "$pkgdir"/usr/bin/quasselclient "$subpkgdir"/usr/bin/ local dir - for dir in {applications,icons,pixmaps,knotifications5}; do + for dir in applications icons pixmaps knotifications5; do mkdir -p "$subpkgdir"/usr/share/$dir mv "$pkgdir"/usr/share/$dir "$subpkgdir"/usr/share/ done diff --git a/user/quaternion/APKBUILD b/user/quaternion/APKBUILD index 76f7284af..a3445fb3d 100644 --- a/user/quaternion/APKBUILD +++ b/user/quaternion/APKBUILD @@ -2,6 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=quaternion pkgver=0.0.9.4c +_pkgver=$(printf '%s' "$pkgver" | sed 's/_/-/') pkgrel=0 pkgdesc="Qt5-based Matrix chat client" url="https://matrix.org/docs/projects/client/quaternion.html" @@ -11,8 +12,8 @@ depends="qt5-qtquickcontrols" makedepends="cmake libquotient-dev qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtmultimedia-dev qt5-qttools-dev" subpackages="" -source="quaternion-$pkgver.tar.gz::https://github.com/QMatrixClient/Quaternion/archive/${pkgver/_/-}.tar.gz" -builddir="$srcdir/Quaternion-${pkgver/_/-}" +source="quaternion-$pkgver.tar.gz::https://github.com/QMatrixClient/Quaternion/archive/$_pkgver.tar.gz" +builddir="$srcdir/Quaternion-$_pkgver" build() { if [ "$CBUILD" != "$CHOST" ]; then diff --git a/user/redis/APKBUILD b/user/redis/APKBUILD index b4b9f47f0..64be5cda6 100644 --- a/user/redis/APKBUILD +++ b/user/redis/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=redis pkgver=4.0.14 -pkgrel=0 +pkgrel=1 pkgdesc="Advanced key-value store" url="https://redis.io/" arch="all" diff --git a/user/redis/redis.pre-install b/user/redis/redis.pre-install index f73213126..bdea387cb 100644 --- a/user/redis/redis.pre-install +++ b/user/redis/redis.pre-install @@ -1,6 +1,7 @@ #!/bin/sh -addgroup -S redis 2>/dev/null -adduser -S -D -H -h /var/lib/redis -s /bin/false -G redis -g redis redis 2>/dev/null +groupadd -r redis 2>/dev/null +useradd -c redis -s /sbin/nologin -g redis \ + -m -d /var/lib/redis -r redis 2>/dev/null exit 0 diff --git a/user/rpcbind/APKBUILD b/user/rpcbind/APKBUILD index c9f8cc956..d1af0d6f9 100644 --- a/user/rpcbind/APKBUILD +++ b/user/rpcbind/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=rpcbind pkgver=1.2.5 -pkgrel=0 +pkgrel=1 pkgdesc="portmap replacement which supports RPC over various protocols" url="http://rpcbind.sourceforge.net" arch="all" diff --git a/user/rpcbind/rpcbind.pre-install b/user/rpcbind/rpcbind.pre-install index 771cdbf7b..0d4d46885 100644 --- a/user/rpcbind/rpcbind.pre-install +++ b/user/rpcbind/rpcbind.pre-install @@ -1,6 +1,7 @@ #!/bin/sh -addgroup -S rpc 2>/dev/null -adduser -S -D -h /var/lib/rpcbind -s /sbin/nologin -G rpc -g rpc rpc 2>/dev/null +groupadd -r rpc 2>/dev/null +useradd -c rpc -s /sbin/nologin -g rpc \ + -m -d /var/lib/rpcbind -r rpc 2>/dev/null exit 0 diff --git a/user/sane/APKBUILD b/user/sane/APKBUILD index 941402502..42b4984c7 100644 --- a/user/sane/APKBUILD +++ b/user/sane/APKBUILD @@ -4,7 +4,7 @@ pkgname=sane _pkgname=sane-backends pkgver=1.0.27 -pkgrel=5 +pkgrel=6 pkgdesc="Scanner access library" url="http://www.sane-project.org/" arch="all" @@ -66,7 +66,7 @@ check() { package() { cd "$builddir" make DESTDIR="$pkgdir" install - echo -n "" > "$pkgdir"/etc/sane.d/dll.conf + printf "" > "$pkgdir"/etc/sane.d/dll.conf install -Dm644 backend/dll.aliases "$pkgdir"/etc/sane.d/dll.aliases } @@ -117,7 +117,7 @@ backends() { } _backend() { - local name=${subpkgname#$pkgname-backend-} + local name="${subpkgname#$pkgname-backend-}" depends="$pkgname" pkgdesc=$(eval echo \$_pkgdesc_$name) if [ ! "$pkgdesc" ]; then diff --git a/user/sane/sane.pre-install b/user/sane/sane.pre-install index b75c867de..9b89cab57 100644 --- a/user/sane/sane.pre-install +++ b/user/sane/sane.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -addgroup -S scanner 2>/dev/null +groupadd -r scanner 2>/dev/null exit 0 diff --git a/user/sane/saned.pre-install b/user/sane/saned.pre-install index caad990d9..79ca791dd 100644 --- a/user/sane/saned.pre-install +++ b/user/sane/saned.pre-install @@ -1,5 +1,6 @@ #!/bin/sh -adduser -SDH -h /run/saned -s /sbin/nologin -G scanner -g saned saned 2>/dev/null +useradd -c saned -s /sbin/nologin -g scanner \ + -m -d /run/saned -r saned 2>/dev/null exit 0 diff --git a/user/serf/APKBUILD b/user/serf/APKBUILD index db2ae5425..06cc98c2a 100644 --- a/user/serf/APKBUILD +++ b/user/serf/APKBUILD @@ -31,7 +31,7 @@ package() { install -D -m755 libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1.3.0 ln -s libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1 ln -s libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so - for _header in serf{_bucket_{types,util},}.h; do + for _header in serf.h serf_bucket_types.h serf_bucket_util.h; do install -D -m644 $_header "$pkgdir"/usr/include/serf-1/$_header done install -D -m644 serf-1.pc "$pkgdir"/usr/lib/pkgconfig/serf-1.pc diff --git a/user/spectrwm/APKBUILD b/user/spectrwm/APKBUILD index 4c3de19db..7699adf7d 100644 --- a/user/spectrwm/APKBUILD +++ b/user/spectrwm/APKBUILD @@ -2,8 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=spectrwm pkgver=3.2.0 -_pkgver=${pkgver/./_} -_pkgver=${_pkgver/./_} +_pkgver=$(printf '%s' "$pkgver" | tr . _) pkgrel=0 pkgdesc="Small dynamic tiling window manager" url="https://github.com/conformal/spectrwm" diff --git a/user/strongswan/APKBUILD b/user/strongswan/APKBUILD index 29390b652..e81d0be7c 100644 --- a/user/strongswan/APKBUILD +++ b/user/strongswan/APKBUILD @@ -3,8 +3,7 @@ # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=strongswan pkgver=5.7.1 -_pkgver=${pkgver//_rc/rc} -pkgrel=0 +pkgrel=1 pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE" url="https://www.strongswan.org/" arch="all" @@ -17,7 +16,7 @@ makedepends="$depends_dev linux-headers python3 sqlite-dev openssl-dev curl-dev gmp-dev libcap-dev" install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-dbg $pkgname-openrc" -source="https://download.strongswan.org/$pkgname-$_pkgver.tar.bz2 +source="https://download.strongswan.org/$pkgname-$pkgver.tar.bz2 0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch 1001-charon-add-optional-source-and-remote-overrides-for-.patch 1002-vici-send-certificates-for-ike-sa-events.patch @@ -26,7 +25,6 @@ source="https://download.strongswan.org/$pkgname-$_pkgver.tar.bz2 strongswan.initd charon.initd " -builddir="$srcdir/$pkgname-$_pkgver" # secfixes: # 5.7.1-r0: diff --git a/user/strongswan/strongswan.pre-install b/user/strongswan/strongswan.pre-install index da43ede66..71663f7d2 100644 --- a/user/strongswan/strongswan.pre-install +++ b/user/strongswan/strongswan.pre-install @@ -1,6 +1,7 @@ #!/bin/sh -addgroup -S ipsec 2>/dev/null -adduser -S -D -H -h /var/empty -s /sbin/nologin -G ipsec -g ipsec ipsec 2>/dev/null +groupadd -r ipsec 2>/dev/null +useradd -c ipsec -s /sbin/nologin -g ipsec \ + -m -d /var/empty -r ipsec 2>/dev/null exit 0 diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD index 9acdee471..5b23efe27 100644 --- a/user/thunderbird/APKBUILD +++ b/user/thunderbird/APKBUILD @@ -74,7 +74,7 @@ prepare() { echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig # too much memory - if [ -z "$JOBS" -o $JOBS -gt 16 ]; then + if [ -z "$JOBS" ] || [ $JOBS -gt 16 ]; then echo "mk_add_options MOZ_MAKE_FLAGS=\"-j16\"" >> "$builddir"/mozconfig fi } diff --git a/user/urw-base35-fonts/APKBUILD b/user/urw-base35-fonts/APKBUILD index 40b0da945..f15189502 100644 --- a/user/urw-base35-fonts/APKBUILD +++ b/user/urw-base35-fonts/APKBUILD @@ -23,11 +23,10 @@ package() { cp -a "$builddir"/fonts/*.t1 "$pkgdir"/usr/share/fonts/urw-base35/ mkdir -p "$pkgdir"/etc/fonts/conf.d/ - pushd "$builddir"/fontconfig + cd "$builddir"/fontconfig for _fconf in *.conf; do install -m 644 "$_fconf" "$pkgdir"/etc/fonts/conf.d/61-${_fconf}.conf done - popd } sha512sums="897fef5968d659ff49dc144f6c94513b32f8d9167c4fabcd7c3b13d2ce4c82d4182b25528291a36158d7a6e1cd864c67d22ce64a2c55dad4e984305f2fd65a91 urw-base35-fonts-20170801.1.tar.gz" diff --git a/user/vde2/APKBUILD b/user/vde2/APKBUILD index f30051321..037c4cd22 100644 --- a/user/vde2/APKBUILD +++ b/user/vde2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=vde2 pkgver=2.3.2 -pkgrel=8 +pkgrel=9 pkgdesc="Virtual Distributed Ethernet - User mode networking for QEMU et al" url="http://vde.sourceforge.net/" arch="all" diff --git a/user/vde2/vde2.pre-install b/user/vde2/vde2.pre-install index 3c3e08d47..3c86dc732 100644 --- a/user/vde2/vde2.pre-install +++ b/user/vde2/vde2.pre-install @@ -1,6 +1,7 @@ #!/bin/sh -addgroup -S vde2-net 2>/dev/null -adduser -S -D -H -h /var/run/vde2 -s /sbin/nologin -G vde2-net -g vde2-net vde2-net 2>/dev/null +groupadd -r vde2-net 2>/dev/null +useradd -c vde2-net -s /sbin/nologin -g vde2-net \ + -m -d /var/run/vde2 -r vde2-net 2>/dev/null exit 0 diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD index f5be9f620..6bd76fafe 100644 --- a/user/vlc/APKBUILD +++ b/user/vlc/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=vlc pkgver=3.0.7.1 -pkgrel=0 +pkgrel=1 pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" pkgusers="vlc" @@ -142,7 +142,7 @@ check() { } _mv() { - local dir=${1%/*} + local dir="${1%/*}" mkdir -p "$subpkgdir"/$dir mv "$1" "$subpkgdir"/$dir/ } diff --git a/user/vlc/vlc-daemon.pre-install b/user/vlc/vlc-daemon.pre-install index aed6c1893..5ebf91ac7 100644 --- a/user/vlc/vlc-daemon.pre-install +++ b/user/vlc/vlc-daemon.pre-install @@ -1,15 +1,9 @@ #!/bin/sh -groups="vlc audio video" - -for group in $groups; do - addgroup -S $group 2>/dev/null -done -adduser -S -D -h /home/vlc -s /bin/sh -G vlc -g vlc vlc 2>/dev/null - -# make sure vlc are in all groups -for group in $groups; do - addgroup vlc $group 2>/dev/null -done +groupadd -r vlc 2>/dev/null +groupadd -r audio 2>/dev/null +groupadd -r video 2>/dev/null +useradd -c vlc -s /sbin/nologin -g vlc -G audio,video \ + -m -d /home/vlc -r vlc 2>/dev/null exit 0 diff --git a/user/vlc/vlc-libs.trigger b/user/vlc/vlc-libs.trigger index c13bace99..163806314 100644 --- a/user/vlc/vlc-libs.trigger +++ b/user/vlc/vlc-libs.trigger @@ -1,5 +1,5 @@ #!/bin/sh -exec /usr/lib/vlc/vlc-cache-gen "$@" >&/dev/null +exec /usr/lib/vlc/vlc-cache-gen "$@" >/dev/null 2>&1 exit 0 diff --git a/user/w3m/APKBUILD b/user/w3m/APKBUILD index 134acd67d..45fb1c014 100644 --- a/user/w3m/APKBUILD +++ b/user/w3m/APKBUILD @@ -2,6 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=w3m pkgver=0.5.3_git20190105 +_pkgverp="${pkgver%_*}+${pkgver#*_}" +_pkgverm="${pkgver%_*}-${pkgver#*_}" pkgrel=0 pkgdesc="Text-based Web browser" url="http://w3m.sourceforge.net/" @@ -12,8 +14,8 @@ depends="compface" makedepends="compface-dev gc-dev gdk-pixbuf-dev glib-dev gtk+2.0-dev imlib2-dev libbsd-dev libx11-dev ncurses-dev openssl-dev" subpackages="$pkgname-doc $pkgname-lang" -source="w3m-$pkgver.tar.gz::https://github.com/tats/w3m/archive/v0.5.3+git20190105.tar.gz" -builddir="$srcdir"/w3m-${pkgver/_/-} +source="w3m-$pkgver.tar.gz::https://github.com/tats/w3m/archive/v$_pkgverp.tar.gz" +builddir="$srcdir/$pkgname-$_pkgverm" build() { cd "$builddir" diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD index 5c8d91b84..e5f49da9d 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -45,7 +45,7 @@ package() { } _plugin() { - local _name=${subpkgname#*-} + local _name="${subpkgname#*-}" local _dir=usr/lib/weechat/plugins pkgdesc="WeeChat $_name plugin" depends="weechat" diff --git a/user/wireless-tools/APKBUILD b/user/wireless-tools/APKBUILD index 0d5cfcf02..8f327a3e9 100644 --- a/user/wireless-tools/APKBUILD +++ b/user/wireless-tools/APKBUILD @@ -4,8 +4,8 @@ # Note: Sorry this is disgusting, I blame the author for archiving it using a silly naming scheme pkgname=wireless-tools pkgver=30_pre9 -_pkgname=${pkgname/-/_} -_pkgver=${pkgver/_/.} +_pkgname=wireless_tools +_pkgver=$(printf '%s' "$pkgver" | sed 's/_/./') _pkgmaj=${pkgver%_pre[0-9]*} pkgrel=0 pkgdesc="Open Source wireless tools" @@ -16,9 +16,9 @@ license="GPL-2.0-or-later" depends="" makedepends="linux-headers" subpackages="$pkgname-dev $pkgname-doc" -source="https://hewlettpackard.github.io/wireless-tools/wireless_tools.${_pkgver}.tar.gz" +source="https://hewlettpackard.github.io/wireless-tools/wireless_tools.$_pkgver.tar.gz" -builddir="$srcdir"/"$_pkgname"."$_pkgmaj" +builddir="$srcdir/$_pkgname.$_pkgmaj" build() { cd "$builddir" diff --git a/user/x264/APKBUILD b/user/x264/APKBUILD index edae76ade..4c8b772a0 100644 --- a/user/x264/APKBUILD +++ b/user/x264/APKBUILD @@ -27,7 +27,8 @@ build() { esac # note: not autotools - CFLAGS="${CFLAGS/-Os/}" ./configure \ + CFLAGS="$(printf '%s' "$CFLAGS" | sed 's/-Os//')" \ + ./configure \ --host=$CHOST \ --prefix=/usr \ --enable-shared \ diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD index fc99a9870..2debe9c90 100644 --- a/user/xorg-server/APKBUILD +++ b/user/xorg-server/APKBUILD @@ -57,7 +57,7 @@ prepare() { build() { export CFLAGS="$CFLAGS -D_GNU_SOURCE" - [ "$CLIBC" == musl ] && export CFLAGS="$CFLAGS -D__gid_t=gid_t -D__uid_t=uid_t" + [ "$CLIBC" = musl ] && export CFLAGS="$CFLAGS -D__gid_t=gid_t -D__uid_t=uid_t" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure \ |