Merge branch 'master' of code.foxkit.us:adelie/packages into bump.aerdan.20190604

12 files changed, 25 insertions, 221 deletions

diff --git a/system/.rootbld-repositories b/system/.rootbld-repositories
index dd670b51f..6c3a18950 100644
--- a/system/.rootbld-repositories
+++ b/system/.rootbld-repositories
@@ -1,2 +1 @@
-https://distfiles.adelielinux.org/adelie/1.0-beta1/system/
-https://distfiles.adelielinux.org/adelie/1.0-beta1/user/
+https://distfiles.adelielinux.org/adelie/current/system/
diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD
index ccdf74a65..766378d3d 100644
--- a/system/adelie-base/APKBUILD
+++ b/system/adelie-base/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=adelie-base
 pkgver=0.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The Adélie Linux Base System"
 url="https://www.adelielinux.org/"
 arch="noarch"
@@ -42,6 +42,7 @@ package() {
 	install -m644 "$srcdir"/group "$pkgdir"/etc/group
 	install -m644 "$srcdir"/passwd "$pkgdir"/etc/passwd
 	install -m640 -g shadow "$builddir"/tree/etc/shadow "$pkgdir"/etc/shadow
+	chmod 1777 "$pkgdir"/var/tmp
 	echo '' > "$pkgdir"/etc/shells
 
 	# stupid inflatable stupid busybox
diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD
index 061d2bc26..e8819ca27 100644
--- a/system/coreutils/APKBUILD
+++ b/system/coreutils/APKBUILD
@@ -37,6 +37,7 @@ build() {
 		--enable-nls \
 		--without-gmp \
 		--enable-no-install-program=hostname,su,kill,uptime \
+		--enable-install-program=arch \
 		--with-packager="Adélie" \
 		--with-packager-bug-reports="https://bts.adelielinux.org/" \
 		--enable-single-binary=symlinks
diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD
index c4db68544..8180307f5 100644
--- a/system/easy-kernel/APKBUILD
+++ b/system/easy-kernel/APKBUILD
@@ -137,7 +137,7 @@ bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5f
 6ede43cf169e79d8a08f7a9d79bb4bdf15618ec450b42a67a53a75bc5f5cb4d5a8c82d2b95c27a80567999876d103091bc104104f0494ca34707b5ccae5da725  0502-muqss-smt-fix.patch
 e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be  ast-endianness.patch
 19be54c3f635cca893b668987e5db6931e48ea8ee55fe8ba2fc9103f3f116346f2227d3dadb9fbf13b3444c7085e5db5785d3161a1544d37254403ca90bc757a  config-ppc64
-b68ccd10b767dc9d68bae4bdc9939d3132198fa03dc94b8bb815c305825880a353f04cdfad2f2478e5f1682a506506c51e2e4a298dd2db40eae132b238de127d  config-ppc
+e9ad73259f2138c1c1506c1627b8f42a525505a1d16ca4cdc1dad4a381a462d9946f2a8191c40ee18fe5010fb8465316d665f60231fb79f0be9cc064eeb82b60  config-ppc
 124baf02726630f8ad3c066cdcb5b0273b6c0ce796af70a0913cb447cd452f4dde34b2070c5fe87c312cbe019cb1c1b334ae3049f429cfb3bcdec7267aba89fd  config-x86_64
 bb7debbed592c27fd6aceeeab0f92fb878740b34f3c65b7968008c3209924d0daf484509572d350ce2ec757d3a541c50812b30c1a8c3010eaeeac5e560546927  config-pmmx
 20d0e09d339d534ce93c156e1e2c630da2bc55e88467481b8e89074773a3ebabba76503a05c51ad07ffa0219953b49f5849f0d9839bfe040dc006506c8adb3bb  config-aarch64
diff --git a/system/easy-kernel/config-ppc b/system/easy-kernel/config-ppc
index fcc0086a6..8ae4b0701 100644
--- a/system/easy-kernel/config-ppc
+++ b/system/easy-kernel/config-ppc
@@ -1594,7 +1594,7 @@ CONFIG_SATA_ULI=y
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
 # CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD64X is not set
+CONFIG_PATA_CMD64X=m
 # CONFIG_PATA_CYPRESS is not set
 # CONFIG_PATA_EFAR is not set
 # CONFIG_PATA_HPT366 is not set
@@ -1627,12 +1627,13 @@ CONFIG_PATA_WINBOND=y
 #
 # PIO-only SFF controllers
 #
-# CONFIG_PATA_CMD640_PCI is not set
+CONFIG_PATA_CMD640_PCI=m
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_NS87410 is not set
 # CONFIG_PATA_OPTI is not set
 CONFIG_PATA_PCMCIA=y
-# CONFIG_PATA_PLATFORM is not set
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_OF_PLATFORM=m
 # CONFIG_PATA_RZ1000 is not set
 
 #
diff --git a/system/libexecinfo/10-execinfo.patch b/system/libexecinfo/10-execinfo.patch
deleted file mode 100644
index 97bd8cd5d..000000000
--- a/system/libexecinfo/10-execinfo.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/execinfo.c
-+++ b/execinfo.c
-@@ -69,7 +69,8 @@
- char **
- backtrace_symbols(void *const *buffer, int size)
- {
--    int i, clen, alen, offset;
-+    size_t clen, alen;
-+    int i, offset;
-     char **rval;
-     char *cp;
-     Dl_info info;
-@@ -78,7 +79,6 @@
-     rval = malloc(clen);
-     if (rval == NULL)
-         return NULL;
--    (char **)cp = &(rval[size]);
-     for (i = 0; i < size; i++) {
-         if (dladdr(buffer[i], &info) != 0) {
-             if (info.dli_sname == NULL)
-@@ -92,14 +92,14 @@
-                    2 +                      /* " <" */
-                    strlen(info.dli_sname) + /* "function" */
-                    1 +                      /* "+" */
--                   D10(offset) +            /* "offset */
-+                   10 +                     /* "offset */
-                    5 +                      /* "> at " */
-                    strlen(info.dli_fname) + /* "filename" */
-                    1;                       /* "\0" */
-             rval = realloc_safe(rval, clen + alen);
-             if (rval == NULL)
-                 return NULL;
--            snprintf(cp, alen, "%p <%s+%d> at %s",
-+            snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s",
-               buffer[i], info.dli_sname, offset, info.dli_fname);
-         } else {
-             alen = 2 +                      /* "0x" */
-@@ -108,12 +108,15 @@
-             rval = realloc_safe(rval, clen + alen);
-             if (rval == NULL)
-                 return NULL;
--            snprintf(cp, alen, "%p", buffer[i]);
-+            snprintf((char *) rval + clen, alen, "%p", buffer[i]);
-         }
--        rval[i] = cp;
--        cp += alen;
-+        rval[i] = (char *) clen;
-+        clen += alen;
-     }
- 
-+    for (i = 0; i < size; i++)
-+        rval[i] += (long) rval;
-+
-     return rval;
- }
- 
-@@ -155,6 +158,6 @@
-                 return;
-             snprintf(buf, len, "%p\n", buffer[i]);
-         }
--        write(fd, buf, len - 1);
-+        write(fd, buf, strlen(buf));
-     }
- }
diff --git a/system/libexecinfo/20-define-gnu-source.patch b/system/libexecinfo/20-define-gnu-source.patch
deleted file mode 100644
index ac18f6eeb..000000000
--- a/system/libexecinfo/20-define-gnu-source.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/execinfo.c
-+++ b/execinfo.c
-@@ -26,6 +26,7 @@
-  * $Id: execinfo.c,v 1.3 2004/07/19 05:21:09 sobomax Exp $
-  */
- 
-+#define _GNU_SOURCE
- #include <sys/types.h>
- #include <sys/uio.h>
- #include <dlfcn.h>
---- a/stacktraverse.c
-+++ b/stacktraverse.c
-@@ -1,3 +1,4 @@
-+#define _GNU_SOURCE
- #include <stddef.h>
- 
- #include "stacktraverse.h"
---- a/test.c
-+++ b/test.c
-@@ -1,3 +1,4 @@
-+#define _GNU_SOURCE
- #include <stdio.h>
- #include <stdlib.h>
- 
diff --git a/system/libexecinfo/30-linux-makefile.patch b/system/libexecinfo/30-linux-makefile.patch
deleted file mode 100644
index f832adce7..000000000
--- a/system/libexecinfo/30-linux-makefile.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -23,24 +23,25 @@
- # SUCH DAMAGE.
- #
- # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $
-+#
-+# Linux Makefile by Matt Smith <mcs@darkregion.net>, 2011/01/04
- 
--LIB=	execinfo
-+CC=cc
-+AR=ar
-+EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -fstack-protector -c
-+EXECINFO_LDFLAGS=$(LDFLAGS)
- 
--SRCS=	stacktraverse.c stacktraverse.h execinfo.c execinfo.h
-+all: static dynamic
- 
--INCS=	execinfo.h
-+static:
-+	$(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c
-+	$(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c
-+	$(AR) rcs libexecinfo.a stacktraverse.o execinfo.o
- 
--SHLIB_MAJOR=	1
--SHLIB_MINOR=	0
-+dynamic:
-+	$(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So
-+	$(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So
-+	$(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 stacktraverse.So execinfo.So
- 
--NOPROFILE=	yes
--
--DPADD=		${LIBM}
--LDADD=		-lm
--
--#WARNS?=	4
--
--#stacktraverse.c: gen.py
--#	./gen.py > stacktraverse.c
--
--.include <bsd.lib.mk>
-+clean:
-+	rm -rf *.o *.So *.a *.so
diff --git a/system/libexecinfo/APKBUILD b/system/libexecinfo/APKBUILD
deleted file mode 100644
index e2f261689..000000000
--- a/system/libexecinfo/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Philipp Andronov <filipp.andronov@gmail.com>
-# Maintainer: 
-pkgname=libexecinfo
-pkgver=1.1
-pkgrel=1
-pkgdesc="Experimental BSD clone of the GNU libc backtrace facility"
-url="https://www.freshports.org/devel/libexecinfo"
-arch="all"
-options="!check"  # Test file would require manual inspection of output.
-license="BSD-2-Clause"
-depends=
-makedepends=
-install=
-subpackages="${pkgname}-dev"
-source="https://distcache.freebsd.org/local-distfiles/itetcu/$pkgname-$pkgver.tar.bz2
-	10-execinfo.patch
-	20-define-gnu-source.patch
-	30-linux-makefile.patch
-	"
-
-build() {
-	cd "$builddir"
-	export CFLAGS="${CFLAGS} -fno-omit-frame-pointer"
-	make
-}
-
-package() {
-	cd "$builddir"
-
-	install -D -m755 "$builddir"/execinfo.h \
-		"$pkgdir"/usr/include/execinfo.h
-	install -D -m755 "$builddir"/stacktraverse.h \
-		"$pkgdir"/usr/include/stacktraverse.h
-	install -D -m755 "$builddir"/libexecinfo.a \
-		"$pkgdir"/usr/lib/libexecinfo.a
-	install -D -m755 "$builddir"/libexecinfo.so.1 \
-		"$pkgdir"/usr/lib/libexecinfo.so.1
-	ln -s /usr/lib/libexecinfo.so.1 \
-		"$pkgdir"/usr/lib/libexecinfo.so
-}
-
-sha512sums="51fea7910ef6873061a25c22434ce4da724e9d8e37616a069ad0a58c0463755be4c6c7da88cd747484c2f3373909d7be4678b32a4bd91b6d9e0f74526094e92c  libexecinfo-1.1.tar.bz2
-97dab43979f6bc07deb11b20cc134c7d95619536b108058388856bcc48dc5a7de4ebceebe88e79d92ccbb9307975bb91a630cc569a5ed35a37a0f92f2d7f83d0  10-execinfo.patch
-6b1d5ba0a2765fcbcde2d88e85c6ee9fb49ef1878284fd7da15afebed17b8415959233c735574661b0a5e77d4d40c132552477dbbf4432512a32629727ebdbbc  20-define-gnu-source.patch
-7d83e3113b93ed9d54a2077d6b9381aa69c6a5d2066dd3cd7c5ec3ce0c93eb7b86fd47481151117f9c8f3790bde6125498a49e32e81d3ff6630b6d8e0ec391d0  30-linux-makefile.patch"
diff --git a/system/openrc/APKBUILD b/system/openrc/APKBUILD
index d48ee52f6..fcec2abeb 100644
--- a/system/openrc/APKBUILD
+++ b/system/openrc/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=openrc
 pkgver=0.24.1
 _ver=${pkgver/_git*/}
-pkgrel=6
+pkgrel=7
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="https://github.com/OpenRC/openrc"
 arch="all"
@@ -27,7 +27,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve
 	openrc.logrotate
 	hostname.initd
 	hwdrivers.initd
-	keymaps.initd
 	modules.initd
 	modloop.initd
 	modloop.confd
@@ -73,6 +72,13 @@ package() {
 
 	# we do not use their default networking stuff
 	rm "$pkgdir"/etc/conf.d/network
+	rm "$pkgdir"/etc/init.d/network
+
+	# we use console-setup for keymaps
+	rm "$pkgdir"/etc/init.d/keymaps
+
+	# we use gettys-openrc for TTY
+	rm "$pkgdir"/etc/init.d/agetty
 
 	install -Dm644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
 	install -d "$pkgdir"/etc/local.d "$pkgdir"/run
@@ -90,7 +96,6 @@ d54630d40a2d6b10a325cb012d4efcda997a60c008ca953ce5d60059d3f267308a59dabddf93a5fc
 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec  openrc.logrotate
 99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd  hostname.initd
 c06eac7264f6cc6888563feeae5ca745aae538323077903de1b19102e4f16baa34c18b8c27af5dd5423e7670834e2261e9aa55f2b1ec8d8fdc2be105fe894d55  hwdrivers.initd
-584ecbbcecb284527d7616790b6e337ace610e4b3cedf2993eca294bfbef54674aeaee3078b6c17d746a0c48b5a64a813c3534136915947e6f62a6fa206cd3ca  keymaps.initd
 b04058ec630e19de0bafefe06198dc1bff8c8d5d2c89e4660dd83dda8bb82a76cdb1d8661cce88e4a406aa6b4152e17efff52d3eb18ffaec0751d0b6cdbcc48a  modules.initd
 92c0245ba4d7cc6828a9b68510fb541cf3b21b9b844a858336af60e84d1db62ddb4471aad0d82ef05d639335a81014f8350a71a746c2bcd90697daa6a8c03408  modloop.initd
 aa702a7da8e6c0e5d8738febaf6b4e4cb021b30ce5c1809b530abf2b36739079446b16fc054740da8d86ed099942cf5deed6597cedb64c058f3def587a8b4689  modloop.confd
diff --git a/system/openrc/keymaps.initd b/system/openrc/keymaps.initd
deleted file mode 100644
index 24d1e8777..000000000
--- a/system/openrc/keymaps.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-
-description="Applies a keymap for the consoles."
-
-depend()
-{
-	need localmount
-	keyword -openvz -prefix -uml -vserver -xenu -lxc
-}
-
-start() {
-	[ -z "$KEYMAP" ] && return
-	ebegin "Setting keymap"
-	zcat "$KEYMAP" | loadkmap
-	eend $?
-}
-
-stop() {
-	return
-}
diff --git a/system/util-linux/APKBUILD b/system/util-linux/APKBUILD
index f12fb48dc..fb2a5f734 100644
--- a/system/util-linux/APKBUILD
+++ b/system/util-linux/APKBUILD
@@ -9,7 +9,7 @@ case $pkgver in
 	*.*) _v=$pkgver;;
 esac
 
-pkgrel=0
+pkgrel=1
 pkgdesc="Official Linux system management utilities"
 url="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 arch="all"
@@ -19,13 +19,15 @@ depends=""
 makedepends_build="autoconf automake libtool"
 makedepends_host="zlib-dev ncurses-dev linux-headers libcap-ng-dev utmps-dev"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:bashcomp:noarch
-	libuuid libfdisk $pkgname-lang"
+	libuuid $pkgname-lang"
 makedepends="$makedepends_build $makedepends_host"
 replaces="e2fsprogs util-linux-ng sfdisk cfdisk findmnt mcookie blkid setpriv
-	libblkid libsmartcols libmount"
-provides="sfdisk=$pkgver-$pkgrel cfdisk=$pkgver-$pkgrel findmnt=$pkgver-$pkgrel
-	mcookie=$pkgver-$pkgrel blkid=$pkgver-$pkgrel libblkid=$pkgver-$pkgrel
-	libmount=$pkgver-$pkgrel libsmartcols=$pkgver-$pkgrel"
+	libblkid libsmartcols libmount libfdisk"
+provides="sfdisk=$pkgver-r$pkgrel cfdisk=$pkgver-r$pkgrel
+	findmnt=$pkgver-r$pkgrel mcookie=$pkgver-r$pkgrel
+	blkid=$pkgver-r$pkgrel libblkid=$pkgver-r$pkgrel
+	libmount=$pkgver-r$pkgrel libsmartcols=$pkgver-r$pkgrel
+	libfdisk=$pkgver-r$pkgrel"
 source="https://www.kernel.org/pub/linux/utils/$pkgname/v${_v}/$pkgname-$pkgver.tar.xz
 	ttydefaults.h
 	"
@@ -92,13 +94,5 @@ libmount() {
 	mv "$pkgdir"/lib/libmount.so.* "$subpkgdir"/lib/
 }
 
-libfdisk() {
-	pkgdesc="Partitioning library for fdisk-like programs"
-	license="LGPL.2.1+"
-	depends=""
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/libfdisk.so.* "$subpkgdir"/lib/
-}
-
 sha512sums="ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749  util-linux-2.33.2.tar.xz
 876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9  ttydefaults.h"