diff options
-rw-r--r-- | system/attr/APKBUILD | 6 | ||||
-rw-r--r-- | system/bash/APKBUILD | 7 | ||||
-rw-r--r-- | system/byacc/APKBUILD | 4 | ||||
-rw-r--r-- | system/cflow/APKBUILD | 6 | ||||
-rw-r--r-- | system/coreutils/APKBUILD | 4 | ||||
-rw-r--r-- | system/fakeroot/APKBUILD | 5 | ||||
-rw-r--r-- | system/findutils/APKBUILD | 6 | ||||
-rw-r--r-- | system/libssh2/APKBUILD | 5 | ||||
-rw-r--r-- | system/make/APKBUILD | 5 | ||||
-rw-r--r-- | system/parted/APKBUILD | 5 | ||||
-rw-r--r-- | system/rsync/APKBUILD | 6 | ||||
-rw-r--r-- | system/sed/APKBUILD | 6 |
12 files changed, 3 insertions, 62 deletions
diff --git a/system/attr/APKBUILD b/system/attr/APKBUILD index 29c13d522..9dccb1415 100644 --- a/system/attr/APKBUILD +++ b/system/attr/APKBUILD @@ -6,7 +6,6 @@ pkgdesc="Utilities for managing filesystem extended attributes" url="https://savannah.nongnu.org/projects/attr" arch="all" license="GPL-2.0+ AND LGPL-2.1+" -options="!checkroot" depends="" makedepends="libtool autoconf automake bash gettext-tiny gettext-tiny-dev" checkdepends="perl" @@ -17,13 +16,10 @@ source="https://download.savannah.nongnu.org/releases/attr/attr-$pkgver.tar.gz " prepare() { - cd "$builddir" default_prepare } build() { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -38,12 +34,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } diff --git a/system/bash/APKBUILD b/system/bash/APKBUILD index 70b82d7a0..ccdf8ab13 100644 --- a/system/bash/APKBUILD +++ b/system/bash/APKBUILD @@ -14,7 +14,6 @@ license="GPL-3.0+" makedepends_build="byacc flex" makedepends_host="ncurses-dev" depends="" -options="!checkroot" install="$pkgname.post-upgrade $pkgname.pre-deinstall" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-binsh:binsh:noarch" @@ -40,8 +39,6 @@ done builddir="$srcdir"/$pkgname-$_myver prepare() { - cd "$builddir" - # NOTE: This section is for applying the vendor patches, which are required to fix # security holes. `default_prepare` does *not* apply vendor patches in the format # shipped with bash. We also need to make sure vendor patches are applied before @@ -62,7 +59,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -77,14 +73,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd ${startdir}/src/${pkgname}-${_myver} make DESTDIR=${pkgdir} install - install -D -m755 "$srcdir"/bashrc "$pkgdir"/etc/bash/bashrc } diff --git a/system/byacc/APKBUILD b/system/byacc/APKBUILD index ff756eb4a..c2769268e 100644 --- a/system/byacc/APKBUILD +++ b/system/byacc/APKBUILD @@ -6,14 +6,12 @@ pkgrel=2 pkgdesc="The Berkeley Yacc general-purpose parser generator" url="https://invisible-island.net/byacc/byacc.html" arch="all" -options="!checkroot" license="Public-Domain" depends="!bison" subpackages="$pkgname-doc" source="https://invisible-mirror.net/archives/byacc/byacc-$pkgver.tgz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/system/cflow/APKBUILD b/system/cflow/APKBUILD index 644be2e42..d2516b9b7 100644 --- a/system/cflow/APKBUILD +++ b/system/cflow/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cflow -pkgver=1.5 -pkgrel=2 +pkgver=1.6 +pkgrel=0 pkgdesc="Chart control flow in a C program" url="https://www.gnu.org/software/cflow/" arch="all" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d3fd027122d9e5ec67712e2ddcea8a3480407b188bf07506b043b874ba21dedb3f1b8eb737673d211da354109869057aa6c40cd3cb66b6cbbad17f87d89cf945 cflow-1.5.tar.xz" +sha512sums="8f15503b0f94385641039bd05d65aa3c9a91bc032be26963279022d32136e12a583d15fdcb8e9d5ef0d31662334f994fd50b014baf7d8b221a1877172576e305 cflow-1.6.tar.xz" diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD index 0557cd5d0..ff9c92a4b 100644 --- a/system/coreutils/APKBUILD +++ b/system/coreutils/APKBUILD @@ -8,7 +8,6 @@ pkgdesc="Basic file, shell, and text manipulation utilities" url="https://www.gnu.org/software/coreutils/" arch="all" license="GPL-3.0+" -options="!checkroot" makedepends="bash acl-dev attr-dev" [ ${CBUILD} == ${CHOST} ] && makedepends="$makedepends perl gettext-tiny gettext-tiny-dev utmps-dev" @@ -25,7 +24,6 @@ source="https://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz " build() { - cd "$builddir" LIBS="-lutmps -lskarnet" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -48,12 +46,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm -rf "$pkgdir"/usr/lib/charset.alias diff --git a/system/fakeroot/APKBUILD b/system/fakeroot/APKBUILD index 18aedfd36..404165e4c 100644 --- a/system/fakeroot/APKBUILD +++ b/system/fakeroot/APKBUILD @@ -4,7 +4,6 @@ pkgver=1.22 pkgrel=0 pkgdesc="Utility to provide a 'fake' root environment as a non-privileged user" arch="all" -options="!checkroot" license="GPL-3.0+" url="http://fakeroot.alioth.debian.org/" depends= @@ -23,8 +22,6 @@ source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.o " build() { - cd "$builddir" - if [ "$CLIBC" = "musl" ]; then # musl does not have _STAT_VER, it's really not used for # anything, so define it as zero (just like uclibc does) @@ -44,12 +41,10 @@ build() { } check() { - cd "$builddir" bash -c 'make check' } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/system/findutils/APKBUILD b/system/findutils/APKBUILD index 5415a21fb..c64c309e2 100644 --- a/system/findutils/APKBUILD +++ b/system/findutils/APKBUILD @@ -11,17 +11,13 @@ license="GPL-3.0+" depends="" makedepends="" checkdepends="coreutils diffutils dejagnu" -install= subpackages="$pkgname-doc $pkgname-lang" source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz localename-test-fix.patch gnulib-tests-dont-require-gpg-passphrase.patch " -options="!checkroot" build() { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,12 +30,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm -rf "$pkgdir"/usr/lib } diff --git a/system/libssh2/APKBUILD b/system/libssh2/APKBUILD index 2f8ee1c5a..9f5b9c683 100644 --- a/system/libssh2/APKBUILD +++ b/system/libssh2/APKBUILD @@ -6,20 +6,17 @@ pkgrel=2 pkgdesc="library for accessing ssh1/ssh2 protocol servers" url="https://libssh2.org/" arch="all" -options="!checkroot" license="BSD-3-Clause" makedepends="openssl-dev zlib-dev" subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc" source="https://www.libssh2.org/download/libssh2-$pkgver.tar.gz" prepare() { - cd "$builddir" update_config_sub default_prepare } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/system/make/APKBUILD b/system/make/APKBUILD index 725ce49ae..944f1c8b3 100644 --- a/system/make/APKBUILD +++ b/system/make/APKBUILD @@ -5,7 +5,6 @@ pkgrel=2 pkgdesc="GNU make utility to maintain groups of programs" url="https://www.gnu.org/software/make" arch="all" -options="!checkroot" license="GPL-3.0+" depends="" checkdepends="perl" @@ -15,13 +14,11 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 " prepare() { - cd "$builddir" update_config_sub default_prepare } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +29,10 @@ build() { } check() { - cd "$builddir" [ "$CBUILD" != "$CHOST" ] || (ulimit -n 64 && PERL5LIB=. make check) || return 1 } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/system/parted/APKBUILD b/system/parted/APKBUILD index 081de8bf2..ff9eb6c76 100644 --- a/system/parted/APKBUILD +++ b/system/parted/APKBUILD @@ -6,7 +6,6 @@ pkgrel=8 pkgdesc="Utility to create, destroy, resize, check and copy partitions" url="https://www.gnu.org/software/parted/parted.html" arch="all" -options="!checkroot" license="GPL-3.0+" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends= @@ -21,13 +20,11 @@ source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz " prepare() { - cd "$builddir" default_prepare autoreconf } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -41,12 +38,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm -rf "$pkgdir"/usr/lib/charset.alias rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true diff --git a/system/rsync/APKBUILD b/system/rsync/APKBUILD index c4d57a19c..7131a95b0 100644 --- a/system/rsync/APKBUILD +++ b/system/rsync/APKBUILD @@ -7,7 +7,6 @@ pkgdesc="A file transfer program to keep remote files in sync" url="https://rsync.samba.org/" arch="all" license="GPL-3.0+" -options="!checkroot" makedepends="perl acl-dev attr-dev popt-dev" subpackages="$pkgname-doc $pkgname-openrc rrsync::noarch" source="https://download.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz @@ -16,10 +15,8 @@ source="https://download.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz rsyncd.conf rsyncd.logrotate " -builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$builddir" # Force IPv6 enabled, upstream bug https://bugzilla.samba.org/show_bug.cgi?id=10715 CFLAGS="$CFLAGS -DINET6" \ ./configure \ @@ -35,12 +32,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -D -m 755 "$srcdir"/rsyncd.initd "$pkgdir"/etc/init.d/rsyncd @@ -54,7 +49,6 @@ rrsync() { pkgdesc="Restricted rsync, restricts rsync to a subdir declared in .ssh/authorized_keys" depends="rsync perl" - cd "$builddir" install -D -m 755 ./support/rrsync "$subpkgdir"/usr/bin/rrsync } diff --git a/system/sed/APKBUILD b/system/sed/APKBUILD index f4f144b84..61d644e32 100644 --- a/system/sed/APKBUILD +++ b/system/sed/APKBUILD @@ -6,7 +6,6 @@ pkgrel=0 pkgdesc="GNU stream editor" url="https://www.gnu.org/software/sed" arch="all" -options="!checkroot" license="GPL-3.0+" makedepends="perl" subpackages="$pkgname-doc $pkgname-lang" @@ -16,10 +15,7 @@ source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz gnulib-tests-dont-require-gpg-passphrase.patch " -builddir="$srcdir/$pkgname-$pkgver" - build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +28,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm -rf "$pkgdir"/usr/lib/charset.alias || true |