diff options
Diffstat (limited to 'system')
27 files changed, 241 insertions, 226 deletions
diff --git a/system/bc/APKBUILD b/system/bc/APKBUILD index 85fba4be8..269a6f8d0 100644 --- a/system/bc/APKBUILD +++ b/system/bc/APKBUILD @@ -1,36 +1,27 @@ -# Contributor: Michael Mason <ms13sp@gmail.com> +# Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bc -pkgver=1.07.1 -pkgrel=1 +pkgver=1.0_rc7 +pkgrel=0 pkgdesc="An arbitrary precision numeric processing language (calculator)" -url="https://www.gnu.org/software/bc/bc.html" +url="https://github.com/gavinhoward/bc" arch="all" -license="GPL-2.0+" -makedepends="ed flex bison texinfo" -subpackages="$pkgname-doc" -source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" +options="!check" # No test suite. +license="BSD-0-Clause" +depends="" +makedepends="" +subpackages="" +source="https://github.com/gavinhoward/bc/releases/download/${pkgver/_/-}/bc-${pkgver/_/-}.tar.xz" +builddir="$srcdir"/$pkgname-${pkgver/_/-} build() { cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info - make -} - -check() { - cd "$builddir" - make check + make PREFIX="/usr" } package() { cd "$builddir" - make DESTDIR="$pkgdir" install + make PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34 bc-1.07.1.tar.gz" +sha512sums="58d50f6a369dd5aded16d9c9384f896a5a683bd1923c116fefe2dd8af24221c55a728d006c9cac9c9992ad6e04031173ce456fca61151b8b5d568ad0a3b39333 bc-1.0-rc7.tar.xz" diff --git a/system/byacc/APKBUILD b/system/byacc/APKBUILD index 5f01de805..42affc3bd 100644 --- a/system/byacc/APKBUILD +++ b/system/byacc/APKBUILD @@ -1,7 +1,8 @@ -# Maintainer: Nathan Angelacos <nangel@alpinelinux.org> +# Contributor: Nathan Angelacos <nangel@alpinelinux.org> +# Maintainer: pkgname=byacc pkgver=20180609 -pkgrel=1 +pkgrel=2 pkgdesc="The Berkeley Yacc general-purpose parser generator" url="http://invisible-island.net/byacc/byacc.html" arch="all" diff --git a/system/curl/APKBUILD b/system/curl/APKBUILD index e82cd55bf..7ed8be239 100644 --- a/system/curl/APKBUILD +++ b/system/curl/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Contributor: Valery Kartel <valery.kartel@gmail.com> # Contributor: Łukasz Jendrysik <scadu@yandex.com> -# Maintainer: Elizabeth Myers <elizabeth@adelielinux.org> +# Maintainer: pkgname=curl -pkgver=7.60.0 +pkgver=7.61.1 pkgrel=0 pkgdesc="An URL retrival utility and library" url="https://curl.haxx.se" @@ -98,4 +98,4 @@ libcurl() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } -sha512sums="c7566bbe7289cd75d34a65b457905d54b5d07543b9fed5a762c889eb09114ad66de62c3edafd1973e87bc8e303a434e77b4e40eea1718801e79ae9256531abe9 curl-7.60.0.tar.bz2" +sha512sums="484d33c0d32109539a95309cdb4404c03c0e7164fdbf7a4724a5b01aa20e2d48fbe6363c7cc53060d4d28050cfa6b43f9ed220ab65d4d389eb00efff5db1bfb5 curl-7.61.1.tar.bz2" diff --git a/system/e2fsprogs/APKBUILD b/system/e2fsprogs/APKBUILD index 748fab308..211cf9aa9 100644 --- a/system/e2fsprogs/APKBUILD +++ b/system/e2fsprogs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: pkgname=e2fsprogs -pkgver=1.44.2 +pkgver=1.44.4 pkgrel=0 pkgdesc="Standard ext2/3/4 filesystem utilities" url="http://e2fsprogs.sourceforge.net" @@ -13,8 +13,7 @@ depends_dev="util-linux-dev" makedepends="$depends_dev linux-headers" subpackages="$pkgname-lang $pkgname-dev $pkgname-doc libcom_err $pkgname-libs" source="https://www.kernel.org/pub/linux/kernel/people/tytso/$pkgname/v$pkgver/$pkgname-$pkgver.tar.xz - debugfs-spurious-message.patch - test-patch.patch + header-fix.patch " build () { @@ -59,6 +58,5 @@ libcom_err() { mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/ } -sha512sums="db34be8c2b606da565a46635d9ed859ccc28921c9a494dd90fbe461a400d0411b0ec6582d3a858adc916d68ec5e835814da798f1cb44710b75fc4efe0145eb90 e2fsprogs-1.44.2.tar.xz -4e224a46beb73147485fe47de06bdf451c5a2fd4ea3835364f57d53d4ee80f2cb807a25bce40bacfa9abe1e0f81d1a4b1be5cb160b5c1103de6492288c5f8b7a debugfs-spurious-message.patch -2718073be717f0f3b56147bb375fdffd3328cf920b12b474313f9c993184b73228b4478a91ba7913ef08a1119320ce1befe6eab20858c9ebc1c4b4890483f687 test-patch.patch" +sha512sums="52e39565dee30997b9c245b5d8791844067a903a570082f3a5ff9d9ef96624535322617bb21029056c88259fef46416eb1181bd7aec419e64fc021830887ec8f e2fsprogs-1.44.4.tar.xz +583c9133ea9df1fdffd2ec3d0234fbb3f36d180172a34ab5d8572434841690a08f1e045e189dc7e46b9396f49d4bd696335ef8625a033f969e26799f9b5c8a5b header-fix.patch" diff --git a/system/e2fsprogs/debugfs-spurious-message.patch b/system/e2fsprogs/debugfs-spurious-message.patch deleted file mode 100644 index 6ecb226da..000000000 --- a/system/e2fsprogs/debugfs-spurious-message.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5f63e5c4f9c45abafe6ea2ee31b1e85c97bf6ef2 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o <tytso@mit.edu> -Date: Sun, 24 Jun 2018 21:21:49 -0400 -Subject: debugfs: suppress spurious "checksum errors" message for unrelated - failures - -Signed-off-by: Theodore Ts'o <tytso@mit.edu> ---- - debugfs/debugfs.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c -index 2bf6a30..ecca810 100644 ---- a/debugfs/debugfs.c -+++ b/debugfs/debugfs.c -@@ -172,7 +172,8 @@ static void open_filesystem(char *device, int open_flags, blk64_t superblock, - try_open_again: - retval = ext2fs_open(device, open_flags, superblock, blocksize, - io_ptr, ¤t_fs); -- if (retval && !(open_flags & EXT2_FLAG_IGNORE_CSUM_ERRORS)) { -+ if (retval && (retval == EXT2_ET_SB_CSUM_INVALID) && -+ !(open_flags & EXT2_FLAG_IGNORE_CSUM_ERRORS)) { - open_flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS; - printf("Checksum errors in superblock! Retrying...\n"); - goto try_open_again; --- -cgit v1.1 - diff --git a/system/e2fsprogs/header-fix.patch b/system/e2fsprogs/header-fix.patch new file mode 100644 index 000000000..cc78a39d0 --- /dev/null +++ b/system/e2fsprogs/header-fix.patch @@ -0,0 +1,147 @@ +--- e2fsprogs-1.44.4/lib/ext2fs/hashmap.h.old 2018-10-22 22:12:54.700000000 +0000 ++++ e2fsprogs-1.44.4/lib/ext2fs/hashmap.h 2018-10-22 22:13:49.010000000 +0000 +@@ -17,12 +17,12 @@ + struct ext2fs_hashmap_entry *next; + struct ext2fs_hashmap_entry *list_next; + struct ext2fs_hashmap_entry *list_prev; +-#if __GNUC_PREREQ (4, 8) ++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" + #endif + } *entries[0]; +-#if __GNUC_PREREQ (4, 8) ++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4) + #pragma GCC diagnostic pop + #endif + }; +--- e2fsprogs-1.44.4/misc/e2undo.c.old 2018-08-19 02:26:58.000000000 +0000 ++++ e2fsprogs-1.44.4/misc/e2undo.c 2018-10-22 22:25:35.130000000 +0000 +@@ -81,12 +81,12 @@ + __le32 magic; /* KEYBLOCK_MAGIC number */ + __le32 crc; /* block checksum */ + __le64 reserved; /* zero */ +-#if __GNUC_PREREQ (4, 8) ++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" + #endif + struct undo_key keys[0]; /* keys, which come immediately after */ +-#if __GNUC_PREREQ (4, 8) ++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4) + #pragma GCC diagnostic pop + #endif + }; +--- e2fsprogs-1.44.4/misc/filefrag.c.old 2018-08-19 02:26:58.000000000 +0000 ++++ e2fsprogs-1.44.4/misc/filefrag.c 2018-10-22 22:26:04.730000000 +0000 +@@ -535,7 +535,7 @@ + char *end; + blocksize = strtoul(optarg, &end, 0); + if (end) { +-#if __GNUC_PREREQ (7, 0) ++#if defined(__GNUC__) && (__GNUC__ >= 7) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" + #endif +@@ -555,7 +555,7 @@ + default: + break; + } +-#if __GNUC_PREREQ (7, 0) ++#if defined(__GNUC__) && (__GNUC__ >= 7) + #pragma GCC diagnostic pop + #endif + } +--- e2fsprogs-1.44.4/lib/ext2fs/fiemap.h.old 2018-08-19 02:26:58.000000000 +0000 ++++ e2fsprogs-1.44.4/lib/ext2fs/fiemap.h 2018-10-22 22:21:59.110000000 +0000 +@@ -31,12 +31,12 @@ + __u32 fm_mapped_extents;/* number of extents that were mapped (out) */ + __u32 fm_extent_count; /* size of fm_extents array (in) */ + __u32 fm_reserved; +-#if __GNUC_PREREQ (4, 8) ++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" + #endif + struct fiemap_extent fm_extents[0]; /* array of mapped extents (out) */ +-#if __GNUC_PREREQ (4, 8) ++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4) + #pragma GCC diagnostic pop + #endif + }; +--- e2fsprogs-1.44.4/lib/ext2fs/ext4_acl.h.old 2018-08-19 02:26:58.000000000 +0000 ++++ e2fsprogs-1.44.4/lib/ext2fs/ext4_acl.h 2018-10-22 22:18:32.390000000 +0000 +@@ -50,12 +50,12 @@ + + typedef struct { + __le32 a_version; +-#if __GNUC_PREREQ (4, 8) ++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" + #endif + posix_acl_xattr_entry a_entries[0]; +-#if __GNUC_PREREQ (4, 8) ++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4) + #pragma GCC diagnostic pop + #endif + } posix_acl_xattr_header; +--- e2fsprogs-1.44.4/lib/ext2fs/unix_io.c.old 2018-08-19 02:26:58.000000000 +0000 ++++ e2fsprogs-1.44.4/lib/ext2fs/unix_io.c 2018-10-22 22:20:38.770000000 +0000 +@@ -1127,7 +1127,7 @@ + } + + /* parameters might not be used if OS doesn't support zeroout */ +-#if __GNUC_PREREQ (4, 6) ++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wunused-parameter" + #endif +@@ -1197,7 +1197,7 @@ + unimplemented: + return EXT2_ET_UNIMPLEMENTED; + } +-#if __GNUC_PREREQ (4, 6) ++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4) + #pragma GCC diagnostic pop + #endif + +--- e2fsprogs-1.44.4/lib/ext2fs/mmp.c.old 2018-08-19 02:26:58.000000000 +0000 ++++ e2fsprogs-1.44.4/lib/ext2fs/mmp.c 2018-10-22 22:21:10.640000000 +0000 +@@ -34,7 +34,7 @@ + #define O_DIRECT 0 + #endif + +-#if __GNUC_PREREQ (4, 6) ++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4) + #pragma GCC diagnostic push + #ifndef CONFIG_MMP + #pragma GCC diagnostic ignored "-Wunused-parameter" +@@ -467,6 +467,6 @@ + return EXT2_ET_OP_NOT_SUPPORTED; + #endif + } +-#if __GNUC_PREREQ (4, 6) ++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4) + #pragma GCC diagnostic pop + #endif +--- e2fsprogs-1.44.4/debugfs/set_fields.c.old 2018-08-19 02:26:58.000000000 +0000 ++++ e2fsprogs-1.44.4/debugfs/set_fields.c 2018-10-22 22:22:34.510000000 +0000 +@@ -75,7 +75,7 @@ + static errcode_t parse_mmp_clear(struct field_set_info *info, char *field, + char *arg); + +-#if __GNUC_PREREQ (4, 6) ++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wmissing-field-initializers" + #endif +@@ -291,7 +291,7 @@ + { "checksum", &set_mmp.mmp_checksum, NULL, 4, parse_uint }, + { 0, 0, 0, 0 } + }; +-#if __GNUC_PREREQ (4, 6) ++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4) + #pragma GCC diagnostic pop + #endif + diff --git a/system/e2fsprogs/test-patch.patch b/system/e2fsprogs/test-patch.patch deleted file mode 100644 index 149124561..000000000 --- a/system/e2fsprogs/test-patch.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 579e9ae1ddd15d7f9c9d01b23133b6187ae1b2b9 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o <tytso@mit.edu> -Date: Mon, 25 Jun 2018 09:43:18 -0400 -Subject: tests: fix up f_detect_junk and f_detect_xfs - -The golden output files for these two tests were out of date. - -Signed-off-by: Theodore Ts'o <tytso@mit.edu> ---- - tests/f_detect_junk/expect | 1 - - tests/f_detect_xfs/expect | 1 - - tests/f_detect_xfs/expect.nodebugfs | 2 -- - 3 files changed, 4 deletions(-) - -diff --git a/tests/f_detect_junk/expect b/tests/f_detect_junk/expect -index 59f34b8..39f99af 100644 ---- a/tests/f_detect_junk/expect -+++ b/tests/f_detect_junk/expect -@@ -13,7 +13,6 @@ is corrupt, and you might try running e2fsck with an alternate superblock: - - *** debugfs - test.img: Bad magic number in super-block while opening filesystem --Checksum errors in superblock! Retrying... - *** tune2fs - ../misc/tune2fs: Bad magic number in super-block while trying to open test.img - *** mke2fs -diff --git a/tests/f_detect_xfs/expect b/tests/f_detect_xfs/expect -index fb510d9..a48e8af 100644 ---- a/tests/f_detect_xfs/expect -+++ b/tests/f_detect_xfs/expect -@@ -14,7 +14,6 @@ is corrupt, and you might try running e2fsck with an alternate superblock: - test.img contains a xfs file system labelled 'test_filsys' - *** debugfs - test.img: Bad magic number in super-block while opening filesystem --Checksum errors in superblock! Retrying... - test.img contains a xfs file system labelled 'test_filsys' - *** tune2fs - ../misc/tune2fs: Bad magic number in super-block while trying to open test.img --- -cgit v1.1 - diff --git a/system/easy-kernel-power8-64k/APKBUILD b/system/easy-kernel-power8-64k/APKBUILD index 5f543bfe1..e25db0de2 100644 --- a/system/easy-kernel-power8-64k/APKBUILD +++ b/system/easy-kernel-power8-64k/APKBUILD @@ -77,7 +77,7 @@ modules() { } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -114611ae0cfaa3c277d857cd760047a47256f1f068297383b0a8d69b62e09de3c2cde617428ce207d156c63f6d89f4559d3dd29f72698d0e9ce68f27360e108c linux-4.14-mc11.patch.xz +d8bfe29549e0a1a7e86d8ead682e93e704c8d0b4b454f8a75306aa7ef5d628cab3a65847e27502866ed5901aff189eb440d47d8e07c2c34ebb7d2d82b717a64b linux-4.14-mc11.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch 615b66b937aac3b2e5081db5bb0abb51bf32b9b1ba1b2d143d6b29187754ba83428a55944e8c81d58cab32d9f7d2909dc5c6156e9fda25bdad5c9e9db3335004 config-ppc64 64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch" diff --git a/system/easy-kernel-power8/APKBUILD b/system/easy-kernel-power8/APKBUILD index 06d0ecb79..d80584ae3 100644 --- a/system/easy-kernel-power8/APKBUILD +++ b/system/easy-kernel-power8/APKBUILD @@ -83,7 +83,7 @@ src() { mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel-p8 } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -114611ae0cfaa3c277d857cd760047a47256f1f068297383b0a8d69b62e09de3c2cde617428ce207d156c63f6d89f4559d3dd29f72698d0e9ce68f27360e108c linux-4.14-mc11.patch.xz +d8bfe29549e0a1a7e86d8ead682e93e704c8d0b4b454f8a75306aa7ef5d628cab3a65847e27502866ed5901aff189eb440d47d8e07c2c34ebb7d2d82b717a64b linux-4.14-mc11.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch fd810263d9aeeb2ec33c7872a9ccf52f474d79995d7f265f457226d62ab44456edf583e67fd4425c1e8025df0d359ebab566fbdcf8ce0a6c8c7ce36d726d3da6 config-ppc64 64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch" diff --git a/system/file/APKBUILD b/system/file/APKBUILD index c870be1ef..24d8af2e9 100644 --- a/system/file/APKBUILD +++ b/system/file/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=file -pkgver=5.34 +pkgver=5.35 pkgrel=0 pkgdesc="File type identification utility" url="http://www.darwinsys.com/file/" @@ -38,4 +38,4 @@ libmagic() { mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr } -sha512sums="57849f8496fd356a66e5559804fdd907059dc2e2f75ede470a25c65b1c499481aad3d7978454b15a15e94c07c9d6795864e8705304a2281dacf1c4e31501bed8 file-5.34.tar.gz" +sha512sums="cbecc52e9209be8bc090752d0672efa181625d4e1e688e63edd1f5657b29bad69364a477fb4ed85d1fa413b8002c8578c86153d2acaaecce78446c0ca6ea9e38 file-5.35.tar.gz" diff --git a/system/git/APKBUILD b/system/git/APKBUILD index d3b64080d..4446e214a 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=git -pkgver=2.18.0 +pkgver=2.19.1 pkgrel=0 pkgdesc="A distributed version control system" url="https://www.git-scm.com/" @@ -30,7 +30,6 @@ makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev pcre2-dev asciidoctor xmlto perl-error" checkdepends="python3" source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz - bb-tar.patch dont-test-other-encodings.patch git-daemon.initd git-daemon.confd @@ -167,8 +166,7 @@ subtree_doc() { gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1 } -sha512sums="db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46 git-2.18.0.tar.xz -85767b5e03137008d6a96199e769e3979f75d83603ac8cb13a3481a915005637409a4fd94e0720da2ec6cd1124f35eba7cf20109a94816c4b4898a81fbc46bd2 bb-tar.patch -1e1cf54be8db0b7a63de2267f3cb0359070a50dcd940e5329a126f1d9f26b2596b93f2b836adc953e4d5b148bbba2eb8234dfeb2929ac3c1e3162507781141f6 dont-test-other-encodings.patch +sha512sums="a1bc1032b1de9eb9ea8b7c385cd009f64247e13066e0a91e9682e35400ded05f88c23b523cca4782f57544060d6ba0f9d3bec944399cda5771a4945c38bb9b98 git-2.19.1.tar.xz +ef6c31ac1474fa128aecf86eda75653fdd0fe7a09d35914c1a03749abf9c92cbc01f8064b2b697ca796fa18bec717b9bcb1aac6d36d02ce8ed4270d4728e72f0 dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd" diff --git a/system/git/bb-tar.patch b/system/git/bb-tar.patch deleted file mode 100644 index d9433ef12..000000000 --- a/system/git/bb-tar.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/templates/Makefile Mon Oct 26 02:57:33 2009 -+++ b/templates/Makefile Mon Nov 9 14:56:27 2009 -@@ -63,4 +63,4 @@ - install: all - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_instdir_SQ)' - (cd blt && $(TAR) cf - .) | \ -- (cd '$(DESTDIR_SQ)$(template_instdir_SQ)' && umask 022 && $(TAR) xof -) -+ (cd '$(DESTDIR_SQ)$(template_instdir_SQ)' && umask 022 && $(TAR) xf -) diff --git a/system/git/dont-test-other-encodings.patch b/system/git/dont-test-other-encodings.patch index 54a4012fe..29c4bdb34 100644 --- a/system/git/dont-test-other-encodings.patch +++ b/system/git/dont-test-other-encodings.patch @@ -191,12 +191,14 @@ We can't support Japanese people using musl cat >expected <<EOF author $UTF8_NAME summary $UTF8_MSG ---- git-2.18.0/t/t0028-working-tree-encoding.sh.old 2018-06-21 17:18:50.000000000 +0000 -+++ git-2.18.0/t/t0028-working-tree-encoding.sh 2018-09-05 17:42:14.650000000 +0000 -@@ -6,240 +6,4 @@ +--- git-2.19.1/t/t0028-working-tree-encoding.sh.old 2018-09-27 20:46:40.000000000 +0000 ++++ git-2.19.1/t/t0028-working-tree-encoding.sh 2018-10-22 20:59:17.530000000 +0000 +@@ -4,246 +4,4 @@ - GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING + . ./test-lib.sh +-GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING +- -test_expect_success 'setup test files' ' - git config core.eol lf && - @@ -394,7 +396,11 @@ We can't support Japanese people using musl - test_i18ngrep "error: BOM is required" err.out -' - --test_expect_success 'check roundtrip encoding' ' +-test_lazy_prereq ICONV_SHIFT_JIS ' +- iconv -f UTF-8 -t SHIFT-JIS </dev/null +-' +- +-test_expect_success ICONV_SHIFT_JIS 'check roundtrip encoding' ' - test_when_finished "rm -f roundtrip.shift roundtrip.utf16" && - test_when_finished "git reset --hard HEAD" && - diff --git a/system/help2man/APKBUILD b/system/help2man/APKBUILD index 4e137d42f..b021f7f88 100644 --- a/system/help2man/APKBUILD +++ b/system/help2man/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=help2man -pkgver=1.47.6 -pkgrel=1 +pkgver=1.47.8 +pkgrel=0 pkgdesc="Create simple man pages from --help output" url="https://www.gnu.org/software/help2man" arch="noarch" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942 help2man-1.47.6.tar.xz" +sha512sums="05e420560b143042418db2e992beaef45cc5a568cdbf640c7b285ba2dc322290d14e0df978ff4c412a99f4346e38f6fb9796ebda695ddc002a3d0e74e85725d6 help2man-1.47.8.tar.xz" diff --git a/system/libuv/APKBUILD b/system/libuv/APKBUILD index 30dfc1ed6..acbf16d8d 100644 --- a/system/libuv/APKBUILD +++ b/system/libuv/APKBUILD @@ -2,7 +2,7 @@ # Conttributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libuv -pkgver=1.23.0 +pkgver=1.23.2 pkgrel=0 pkgdesc="Cross-platform asychronous I/O" url="http://libuv.org" @@ -47,6 +47,6 @@ package() { "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -sha512sums="1fe36cf285bdcfee485633e095e731999485ea156f07769c0ff277df5e4e1314c434021b4b697cef8e7e7e4299b24b7ee837f3f6348b27b300feb6e6c2781e4d libuv-v1.23.0.tar.gz +sha512sums="8dd9053adad115ae6dd012bf1059aab87cea2adcd8d2f8061607929bf5b0c83b1898f5945325b0f3ace7cdd70b7cdc03f60d4b2f85495c34ca94b9dcf76b42fe libuv-v1.23.2.tar.gz 58bc259a0f703fa6b8dda14909f718e14dfb9ddc9039ae13378f7e32e0ff7096774cbfb2964a0abb06f8a64a71cf298cc77b7475927df0fb50ce3f0e414a7787 disable-process-priority.patch 478d25c8905cd393b9ced0f1b16e70794a7ef20fb9eb212fd74e50beca3f5a33a6a5267616abecf470426ed3d00efec51df468745ff43c0de05c0ad8234f1eb3 disable-setuid-test.patch" diff --git a/system/mpfr3/APKBUILD b/system/mpfr3/APKBUILD index b648abf1a..851326216 100644 --- a/system/mpfr3/APKBUILD +++ b/system/mpfr3/APKBUILD @@ -1,12 +1,13 @@ # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> pkgname=mpfr3 pkgver=3.1.6 -pkgrel=0 -pkgdesc="multiple-precision floating-point library" +pkgrel=1 +pkgdesc="Multiple-precision floating-point library" url="https://www.mpfr.org/" arch="all" license="LGPL-3.0+" depends="" +depends_dev="gmp-dev" makedepends_build="texinfo" makedepends_host="gmp-dev" makedepends="$makedepends_build $makedepends_host" diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD index d3905f3fc..8fa4f26f1 100644 --- a/system/ncurses/APKBUILD +++ b/system/ncurses/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=ncurses -pkgver=6.1_p20180901 +pkgver=6.1_p20181020 _ver=${pkgver%_p*}-${pkgver#*_p} pkgrel=0 pkgdesc="Console display library" @@ -106,4 +106,4 @@ static() { mv "$pkgdir"/lib/*.a "$subpkgdir"/lib/ } -sha512sums="3c7983a80aba1cc69ad9ac2f43cd60bfe714c8e83b8eb6755ca6c5cf14d26d1e98c7407de34af74e58d52ca1d9446e04f2a76fd31a37377782aa4e515b35ba7e ncurses-6.1-20180901.tgz" +sha512sums="9aa9beefb05ac3b3a12ae0cce53bf5aa1eaf89007794d6d0f145b3b9de452918d17e0362460856dc3daad3c9ae54a8e02669769668549e8c9746e0eb1b16db83 ncurses-6.1-20181020.tgz" diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD index f4ea3ae3c..4394eb5c2 100644 --- a/system/openssh/APKBUILD +++ b/system/openssh/APKBUILD @@ -2,9 +2,9 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=openssh -pkgver=7.7_p1 +pkgver=7.9_p1 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=2 +pkgrel=0 pkgdesc="Port of OpenBSD's free SSH release" url="http://www.openssh.org/portable.html" arch="all" @@ -29,12 +29,15 @@ source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar disable-forwarding-by-default.patch fix-utmpx.patch openssh7.4-peaktput.patch + openssh-7.9_p1-openssl-1.0.2-compat.patch sftp-interactive.patch sshd.initd sshd.confd " # secfixes: +# 7.9_p1: +# - CVE-2018-15473 # 7.7_p1: # - CVE-2017-15906 # 7.4_p1: @@ -150,11 +153,12 @@ server() { mv "$pkgdir"/usr/sbin/sshd "$subpkgdir"/usr/sbin/ } -sha512sums="597252cb48209a0cb98ca1928a67e8d63e4275252f25bc37269204c108f034baade6ba0634e32ae63422fddd280f73096a6b31ad2f2e7a848dde75ca30e14261 openssh-7.7p1.tar.gz +sha512sums="0412c9c429c9287f0794023951469c8e6ec833cdb55821bfa0300dd90d0879ff60484f620cffd93372641ab69bf0b032c2d700ccc680950892725fb631b7708e openssh-7.9p1.tar.gz f2b8daa537ea3f32754a4485492cc6eb3f40133ed46c0a5a29a89e4bcf8583d82d891d94bf2e5eb1c916fa68ec094abf4e6cd641e9737a6c05053808012b3a73 bsd-compatible-realpath.patch 8df35d72224cd255eb0685d2c707b24e5eb24f0fdd67ca6cc0f615bdbd3eeeea2d18674a6af0c6dab74c2d8247e2370d0b755a84c99f766a431bc50c40b557de disable-forwarding-by-default.patch 0c1e832cec420bc7b57558041d2288912a438db97050b87f6a57e94a2741a374cc5d141fe352968b0d1ba6accaff965794463fe9169d136678a8915a60d2f0b7 fix-utmpx.patch 398096a89aa104abeff31aa043ac406a6348e0fdd4d313b7888ee0b931d38fd71fc21bceee46145e88f03bc27e00890e068442faee2d33f86cfbc04d58ffa4b6 openssh7.4-peaktput.patch +dde28496df7ee74a2bbcf0aba389abefade3dc41f7d10dc6d3c1a0aca087478bafe10d31ec5e61e758084fa0a2a7c64314502091d900d9cee487c1bdc92722a6 openssh-7.9_p1-openssl-1.0.2-compat.patch c1d09c65dbc347f0904edc30f91aa9a24b0baee50309536182455b544f1e3f85a8cecfa959e32be8b101d8282ef06dde3febbbc3f315489339dcf04155c859a9 sftp-interactive.patch 394a420a36880bb0dd37dfd8727cea91fd9de6534050169e21212a46513ef3aaafe2752c338699b3d4ccd14871b26cf01a152df8060cd37f86ce0665fd53c63f sshd.initd ce0abddbd2004891f88efd8522c4b37a4989290269fab339c0fa9aacc051f7fd3b20813e192e92e0e64315750041cb74012d4321260f4865ff69d7a935b259d4 sshd.confd" diff --git a/system/openssh/openssh-7.9_p1-openssl-1.0.2-compat.patch b/system/openssh/openssh-7.9_p1-openssl-1.0.2-compat.patch new file mode 100644 index 000000000..c1c310e8f --- /dev/null +++ b/system/openssh/openssh-7.9_p1-openssl-1.0.2-compat.patch @@ -0,0 +1,13 @@ +diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c +index 8b4a3627..590b66d1 100644 +--- a/openbsd-compat/openssl-compat.c ++++ b/openbsd-compat/openssl-compat.c +@@ -76,7 +76,7 @@ ssh_OpenSSL_add_all_algorithms(void) + ENGINE_load_builtin_engines(); + ENGINE_register_all_complete(); + +-#if OPENSSL_VERSION_NUMBER < 0x10001000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + OPENSSL_config(NULL); + #else + OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | diff --git a/system/pcre2/APKBUILD b/system/pcre2/APKBUILD index e32e86bb0..614ac25c7 100644 --- a/system/pcre2/APKBUILD +++ b/system/pcre2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: pkgname=pcre2 -pkgver=10.31 +pkgver=10.32 pkgrel=0 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net/" @@ -70,4 +70,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="f333c97684d70daf4d892d60b36d94eb62132f9f53d2603e1e95f1230c93d482a1a793fe1c1bb3dca98bc894c86e4956f18b0eba9aac49e24bffbf3e1efcfd2d pcre2-10.31.tar.gz" +sha512sums="b0a247dc6411546f231f7588b979bc89f4c6d498a27232fb1e883d5222b9275d7b87c6afc0c67f11a453b35238dca472d14246e8bcb38df70f3701f9f3e8030f pcre2-10.32.tar.gz" diff --git a/system/pkgconf/0001-tuple-Ensure-buf-length-is-always-1-in-dequote.patch b/system/pkgconf/0001-tuple-Ensure-buf-length-is-always-1-in-dequote.patch deleted file mode 100644 index d1a423391..000000000 --- a/system/pkgconf/0001-tuple-Ensure-buf-length-is-always-1-in-dequote.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9b7affe0b1e6512c6c73d19e1220c94fdb5c8159 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Sat, 28 Jul 2018 19:06:33 -0500 -Subject: [PATCH] tuple: Ensure buf length is always >= 1 in dequote -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If a key is defined with no value, dequote will allocate a buffer with a -length of 0. Since the buffer's length is 0, any manipulation of its -content is UB. - -Example .pc file: - -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -xcflags= -xlibs= -lSM -lICE -lX11 - -Name: Obt -Description: Openbox Toolkit Library -Version: 3.6 -Requires: glib-2.0 libxml-2.0 -Libs: -L${libdir} -lobt ${xlibs} -Cflags: -I${includedir}/openbox/3.6 ${xcflags} - -Output using pkgconf 1.5.2 on x86_64 Linux/musl: - -% pkgconf --cflags obt-3.5 --I/usr/include/openbox/3.6 \�\\�I\�\ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 ---- - libpkgconf/tuple.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libpkgconf/tuple.c b/libpkgconf/tuple.c -index 26dc5d5..8523709 100644 ---- a/libpkgconf/tuple.c -+++ b/libpkgconf/tuple.c -@@ -139,7 +139,7 @@ pkgconf_tuple_find_delete(pkgconf_list_t *list, const char *key) - static char * - dequote(const char *value) - { -- char *buf = calloc(strlen(value) * 2, 1); -+ char *buf = calloc((strlen(value) + 1) * 2, 1); - char *bptr = buf; - const char *i; - char quote = 0; --- -2.17.1 - diff --git a/system/pkgconf/APKBUILD b/system/pkgconf/APKBUILD index d582b58be..79f4b3819 100644 --- a/system/pkgconf/APKBUILD +++ b/system/pkgconf/APKBUILD @@ -1,6 +1,6 @@ -# Maintainer: William Pitcock <nenolod@dereferenced.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pkgconf -pkgver=1.5.3 +pkgver=1.5.4 pkgrel=0 pkgdesc="development framework configuration tools" url="https://git.dereferenced.org/pkgconf/pkgconf/" @@ -49,4 +49,4 @@ dev() { mv "$subpkgdir"/usr/share/aclocal/pkg.m4 "$pkgdir"/usr/share/aclocal/ } -sha512sums="565c5caa4fb4cf358c42d2e1f709088810d275b26cdf313140575752fc6ea0bc6d6fd93dd8ee9fbb78b7b39044e5c6df9065acb5963189ea99916bea24a7b371 pkgconf-1.5.3.tar.xz" +sha512sums="795a67f8f98b7598c0af8e70c830851561f090a96cb66b75149e5faf633f06c1b098fa3cec76cde35160a9809556536da6a2a95af8ff954c9b28536d15b79f93 pkgconf-1.5.4.tar.xz" diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index 4ff68dce3..dd8c20f8b 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6 -pkgver=2.7.2.0 -pkgrel=4 +pkgver=2.7.2.1 +pkgrel=0 pkgdesc="skarnet.org's small & secure supervision software suite" url="https://skarnet.org/software/$pkgname/" arch="all" @@ -16,7 +16,6 @@ triggers="$pkgname.trigger=/run/service" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz s6-svscanboot" - build() { cd "$builddir" ./configure \ @@ -32,9 +31,9 @@ build() { package() { cd "$builddir" make DESTDIR="$pkgdir" install - cp -f "$srcdir/s6-svscanboot" "$pkgdir/lib/s6/s6-svscanboot" + cp -f "$srcdir/s6-svscanboot" "$pkgdir/lib/s6/s6-svscanboot" mkdir -p -m 0755 "$pkgdir/etc/s6/early-services" "$pkgdir/var/lib/s6/services" - chmod 0755 "$pkgdir/lib/s6/s6-svscanboot" + chmod 0755 "$pkgdir/lib/s6/s6-svscanboot" } doc() { @@ -43,5 +42,5 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="0ab98c44324054effa0754efd117b3126a53fac7096979aacffd7d86128c5cb1f714205e30ca4e561ca3740646d1f36eb53b9e30d139d7ce4dc1b8cfb3e33123 s6-2.7.2.0.tar.gz +sha512sums="dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790 s6-2.7.2.1.tar.gz bad19965aa8ea138cdf5688db9ae05fc7ce2111ac0945b5b0e78cda55ad290602f28ac8b52aae395ca5e857f32e9be4d6df882286b362ba7008a52b29472ff1e s6-svscanboot" diff --git a/system/sudo/APKBUILD b/system/sudo/APKBUILD index 3e3fdc7b5..f9b1fc66d 100644 --- a/system/sudo/APKBUILD +++ b/system/sudo/APKBUILD @@ -3,13 +3,13 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=sudo -pkgver=1.8.23 +pkgver=1.8.25_p1 if [ "${pkgver%_*}" != "$pkgver" ]; then _realver=${pkgver%_*}${pkgver#*_} else _realver=$pkgver fi -pkgrel=2 +pkgrel=0 pkgdesc="Give certain users the ability to run some commands as root" url="https://www.sudo.ws/sudo/" arch="all" @@ -22,7 +22,6 @@ depends= subpackages="$pkgname-doc $pkgname-dev $pkgname-lang" source="https://www.sudo.ws/dist/sudo-${_realver}.tar.gz fix-cross-compile.patch - libcrypt.patch musl-fix-headers.patch " @@ -61,7 +60,6 @@ package() { rm -rf "$pkgdir"/var/run } -sha512sums="a9d61850a4857bfd075547a13efb13b054e4736e3ebe3c8a98a90a090b1d9b9688354ec9725fc99d1d256999b6f9c6ae6215ce9770fcdebd7f24731107b48342 sudo-1.8.23.tar.gz +sha512sums="b1445be688d3c1dd7efbdfab68977a7a9b6fd6887191dc99ca717117eec0a550492642556cd55ca5873d054ddc5ccc2b87b2c34602e1ffc729ab6fbc4e523a72 sudo-1.8.25p1.tar.gz f0f462f40502da2194310fe4a72ec1a16ba40f95a821ba9aa6aabaa423d28c4ab26b684afa7fb81c2407cf60de9327bdab01de51b878c5d4de49b0d62645f53c fix-cross-compile.patch -5ad20254aa587ef615f794081ecd55344eada5cf8c1a1d7956cc3f73375554716c483eeb74081da9a8501afce92cfbaf2abe59d1067aac67ce6e4874eb5a23e1 libcrypt.patch -113416fed7532c6092687c8bdd9913d04888d2f0a32e4333dd27a6b3d39145717ad5c3b3f05ba11bd6462612a9a013d446d254d50b2b651c33eeebe670f41ab5 musl-fix-headers.patch" +dcc03abdd672c934f90dfd3683b3f81a8d39cfff91307d2dbd20a31a852022ab605d034c4fe11860ba99b78d391a9812fca1d6e052620b8ff2c42e4f0c7a1a62 musl-fix-headers.patch" diff --git a/system/sudo/libcrypt.patch b/system/sudo/libcrypt.patch deleted file mode 100644 index e83b69113..000000000 --- a/system/sudo/libcrypt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./plugins/sudoers/Makefile.in.orig -+++ ./plugins/sudoers/Makefile.in -@@ -52,7 +52,7 @@ - LT_LIBS = $(top_builddir)/lib/util/libsudo_util.la - LIBS = $(LT_LIBS) @LIBINTL@ - NET_LIBS = @NET_LIBS@ --SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ @LIBMD@ -+SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ @LIBMD@ -lcrypt - REPLAY_LIBS = @REPLAY_LIBS@ @ZLIB@ - VISUDO_LIBS = $(NET_LIBS) @LIBMD@ - TESTSUDOERS_LIBS = $(NET_LIBS) @LIBMD@ diff --git a/system/sudo/musl-fix-headers.patch b/system/sudo/musl-fix-headers.patch index 18a19b75d..d57a9ff4b 100644 --- a/system/sudo/musl-fix-headers.patch +++ b/system/sudo/musl-fix-headers.patch @@ -1,10 +1,10 @@ --- ./include/sudo_compat.h.orig +++ ./include/sudo_compat.h @@ -25,6 +25,7 @@ - #include <stdio.h> - #include <stdarg.h> - #include <stddef.h> /* for rsize_t */ + #endif + #if !defined(HAVE_MEMSET_S) && !defined(rsize_t) + # include <stddef.h> /* for rsize_t */ +#include <sys/types.h> /* for id_t */ - - /* - * Macros and functions that may be missing on some operating systems. + # ifdef HAVE_STRING_H + # include <string.h> /* for rsize_t on AIX */ + # endif /* HAVE_STRING_H */ diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index 22f0bc47f..7bc2766c2 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vim -pkgver=8.1.0429 +pkgver=8.1.0490 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -80,5 +80,5 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -sha512sums="e9ece2616f56f6ef0a08a73e48c4a87f138e381ec24b960f5e634c2291d9aba2c2d11a7f80dbe60eb3ccaeb8ea45b7c07ec5ebd50f4f5f326ffd1aff3729a13b vim-8.1.0429.tar.gz +sha512sums="1237ad835f65699ca095fbae4ac1039807638d4de7cc00ec83a56ba975ba224103740f6d6ee9e15b0135bc444eef747a5e15b88346e32f7ae4d436f183a44935 vim-8.1.0490.tar.gz 3a6c9bc187a6f45fd78e91dcc44d4d661c1ae1f2655e3a66bb36245ad1dc41e8d0e6061ec3aee6d323f96058b4a5501a87e3327e539cfd026f68cf81d455d721 vimrc" |