summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/libcap/APKBUILD4
-rw-r--r--system/ncurses/APKBUILD6
-rw-r--r--system/nss/APKBUILD4
-rw-r--r--system/pcre/APKBUILD24
-rw-r--r--system/pcre/ppc64-elfv2-fix.patch25
-rw-r--r--system/perl-module-build/APKBUILD4
-rw-r--r--system/pkgconf/APKBUILD9
-rw-r--r--system/pkgconf/personality.patch55
-rw-r--r--system/tzdata/APKBUILD8
-rw-r--r--system/util-linux/APKBUILD4
-rw-r--r--system/vim/APKBUILD4
-rw-r--r--system/yaml/APKBUILD15
-rw-r--r--system/yaml/fix-emitter-0.2.1.patch35
-rw-r--r--system/yaml/skip-trailing-doc-term-0.2.1.patch30
14 files changed, 28 insertions, 199 deletions
diff --git a/system/libcap/APKBUILD b/system/libcap/APKBUILD
index 517b30609..335d4bcc4 100644
--- a/system/libcap/APKBUILD
+++ b/system/libcap/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer:
pkgname=libcap
-pkgver=2.26
+pkgver=2.27
pkgrel=0
pkgdesc="POSIX 1003.1e capabilities"
arch="all"
@@ -26,4 +26,4 @@ package() {
make lib=/lib prefix=/usr RAISE_SETFCAP=no DESTDIR="$pkgdir" install
}
-sha512sums="1c2d59f007226405a924950b2c2090393527e06f0692a84e6463e33915a070df61a9070b8f30a624d5630ddd39290eac117e5d440577d1edd48510195b9d12f0 libcap-2.26.tar.xz"
+sha512sums="e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6 libcap-2.27.tar.xz"
diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD
index 5499a5537..09ab2d5c3 100644
--- a/system/ncurses/APKBUILD
+++ b/system/ncurses/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
pkgname=ncurses
-pkgver=6.1_p20190302
-_ver=${pkgver%_p*}-${pkgver#*_p}
+pkgver=6.1.20190413
+_ver=${pkgver%.*}-${pkgver#*.*.}
pkgrel=0
pkgdesc="Console display library"
url="https://invisible-island.net/ncurses/ncurses.html"
@@ -106,4 +106,4 @@ static() {
mv "$pkgdir"/lib/*.a "$subpkgdir"/lib/
}
-sha512sums="97598052792ecdc0d7d392ca7ea2596c5eb497dc674f89ad5202350433796f83efca9d7462c7235f6afb71cd56c1e13fc3fa80b19ede61094371e12b2bcfe734 ncurses-6.1-20190302.tgz"
+sha512sums="04efbfccda38bf1dbe01b7343c58ae702c626f53ef672d2fe6eb5a71cd29eee56b0981841610ea83f26ac283e0a8829ebd09304a6ed439041ab590e517874e9c ncurses-6.1-20190413.tgz"
diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD
index cd3dd5ab2..d1c8d6100 100644
--- a/system/nss/APKBUILD
+++ b/system/nss/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=nss
-pkgver=3.42.1
+pkgver=3.43
_ver=${pkgver//./_}
pkgrel=0
pkgdesc="Mozilla Network Security Services"
@@ -141,7 +141,7 @@ tools() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="468e1d4ea9d2b832c7b8975443ee6fe2790b39cbbd9f8e3d8428a43f47cce0e81d5ca21e3566701b75bcd4af09110c0134e204b2850d30ecfd6347ec27e6e265 nss-3.42.1.tar.gz
+sha512sums="e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5 nss-3.43.tar.gz
75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531 nss.pc.in
0f2efa8563b11da68669d281b4459289a56f5a3a906eb60382126f3adcfe47420cdcedc6ab57727a3afeeffa2bbb4c750b43bef8b5f343a75c968411dfa30e09 nss-util.pc.in
09c69d4cc39ec9deebc88696a80d0f15eb2d8c94d9daa234a2adfec941b63805eb4ce7f2e1943857b938bddcaee1beac246a0ec627b71563d9f846e6119a4a15 nss-softokn.pc.in
diff --git a/system/pcre/APKBUILD b/system/pcre/APKBUILD
index eb2d468a9..0c0f36a10 100644
--- a/system/pcre/APKBUILD
+++ b/system/pcre/APKBUILD
@@ -1,20 +1,17 @@
# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=pcre
-pkgver=8.42
-pkgrel=1
+pkgver=8.43
+pkgrel=0
pkgdesc="Perl-compatible regular expression library"
url="http://pcre.sourceforge.net"
arch="all"
license="BSD-3-Clause"
depends=
makedepends=""
-checkdepends="paxmark"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools
libpcrecpp libpcre16 libpcre32"
-source="ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgver.tar.bz2
- ppc64-elfv2-fix.patch
- "
+source="ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgver.tar.bz2"
# secfixes:
# 8.40-r2:
@@ -22,10 +19,7 @@ source="ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgv
# 7.8-r0:
# - CVE-2017-11164
-builddir="$srcdir/$pkgname-$pkgver"
-
build() {
- cd "$builddir"
local _enable_jit="--enable-jit"
[ "$CARCH" = "s390x" ] && _enable_jit=""
./configure \
@@ -46,19 +40,10 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
check() {
- cd "$builddir"
-
- # paxmark tests requiring JIT
- for fn in pcre_jit_test pcretest; do
- ./$fn &>/dev/null < /dev/null || true
- [ -x .libs/lt-$fn ] && paxmark -m .libs/lt-$fn
- done
-
# skip locale specific tests
sed -i -e 's/do3=yes//g' RunTest
@@ -89,5 +74,4 @@ tools() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d pcre-8.42.tar.bz2
-61f06b2fb1d1d0d512056da4b8eb4905948b45a26ee177b0bcc6d25a75ffbdaff29c4b52ec461a7287b4f47ae20dbec31382188934e855c960f5877c31948a4b ppc64-elfv2-fix.patch"
+sha512sums="3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7 pcre-8.43.tar.bz2"
diff --git a/system/pcre/ppc64-elfv2-fix.patch b/system/pcre/ppc64-elfv2-fix.patch
deleted file mode 100644
index 040f93ee9..000000000
--- a/system/pcre/ppc64-elfv2-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur pcre-8.42-original/sljit/sljitConfigInternal.h pcre-8.42/sljit/sljitConfigInternal.h
---- pcre-8.42-original/sljit/sljitConfigInternal.h 2018-03-13 16:15:23.000000000 +0000
-+++ pcre-8.42/sljit/sljitConfigInternal.h 2018-09-13 01:16:46.640000000 +0000
-@@ -530,7 +530,7 @@
- #endif /* !SLJIT_FUNC */
-
- #ifndef SLJIT_INDIRECT_CALL
--#if ((defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) && (defined SLJIT_BIG_ENDIAN && SLJIT_BIG_ENDIAN)) \
-+#if ((defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) && ((defined _CALL_ELF && _CALL_ELF == 1) || (!defined _CALL_ELF))) \
- || ((defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32) && defined _AIX)
- /* It seems certain ppc compilers use an indirect addressing for functions
- which makes things complicated. */
-diff -Naur pcre-8.42-original/sljit/sljitNativePPC_common.c pcre-8.42/sljit/sljitNativePPC_common.c
---- pcre-8.42-original/sljit/sljitNativePPC_common.c 2018-01-08 10:25:56.000000000 +0000
-+++ pcre-8.42/sljit/sljitNativePPC_common.c 2018-09-13 01:21:00.360000000 +0000
-@@ -42,7 +42,8 @@
- #include <sys/cache.h>
- #endif
-
--#if (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN)
-+#if (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN) \
-+ || (defined _CALL_ELF && _CALL_ELF == 2)
- #define SLJIT_PASS_ENTRY_ADDR_TO_CALL 1
- #endif
-
diff --git a/system/perl-module-build/APKBUILD b/system/perl-module-build/APKBUILD
index 6a13e68e3..72b5d4bb7 100644
--- a/system/perl-module-build/APKBUILD
+++ b/system/perl-module-build/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-module-build
_pkgreal=Module-Build
-pkgver=0.4224
+pkgver=0.4229
pkgrel=0
pkgdesc="Build and install Perl modules"
url="https://metacpan.org/release/Module-Build"
@@ -41,4 +41,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="c08e84c542a882aa16a682a81cbb7a4860774a3f6a0ec2e720ba9e9bcea76dab331999fee86bf8b92edc08560d7cef4a7c2dfa4e626ab9b22da965e715af531f Module-Build-0.4224.tar.gz"
+sha512sums="51e0d73cecf450062121c3223b1a4c6f8a8c260fc2345d1c1a5e13ddcbd2b7bc2578411ac254420e27720b9e00a8efc9a9daa3159e9cba5338a188734b35c738 Module-Build-0.4229.tar.gz"
diff --git a/system/pkgconf/APKBUILD b/system/pkgconf/APKBUILD
index 777af1613..0ccefb0b9 100644
--- a/system/pkgconf/APKBUILD
+++ b/system/pkgconf/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=pkgconf
-pkgver=1.6.0
+pkgver=1.6.1
pkgrel=0
pkgdesc="Toolkit for maintaining development package metadata"
url="https://git.dereferenced.org/pkgconf/pkgconf/"
@@ -10,9 +10,7 @@ replaces="pkgconfig"
provides="pkgconfig=1"
subpackages="$pkgname-doc $pkgname-dev"
checkdepends="kyua atf"
-source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz
- personality.patch
- "
+source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz"
build() {
./configure \
@@ -47,5 +45,4 @@ dev() {
mv "$subpkgdir"/usr/share/aclocal/pkg.m4 "$pkgdir"/usr/share/aclocal/
}
-sha512sums="eddb9354b3e0a4b91eb49c7b81ed4cbeb92b96b1931f25185b37fa66f25604315f0e1cc8cf13a415508b5a07c1b0d85ddb39a988648787b968083ddc82e73fda pkgconf-1.6.0.tar.xz
-94d7749fa5d751f9207c9f6168dcce52bbe6108e9440721a640b6bc3492867c3fce5231d779a780a611009f1c1ad65bc9db8e81452c059f7b34b97314b38844a personality.patch"
+sha512sums="d7314da008ca90858be2ad2599a1bc017da465ef3eae5ab8f18893539ffd557fff3316ae2f2ecf97d34550de6f7a3a3ab3f82ec5eb45e4f0a239b89fe3877835 pkgconf-1.6.1.tar.xz"
diff --git a/system/pkgconf/personality.patch b/system/pkgconf/personality.patch
deleted file mode 100644
index e7ff9ad9a..000000000
--- a/system/pkgconf/personality.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From d926e75b345a6948e4e976828d3331cd7f0db660 Mon Sep 17 00:00:00 2001
-From: Emil Renner Berthing <esmil@mailme.dk>
-Date: Wed, 6 Mar 2019 16:03:32 +0100
-Subject: [PATCH] main: fix personalities when argv[0] contains path
-
----
- cli/main.c | 31 ++++++++++++++++++++-----------
- 1 file changed, 20 insertions(+), 11 deletions(-)
-
-diff --git a/cli/main.c b/cli/main.c
-index b52cc85..caa2525 100644
---- a/cli/main.c
-+++ b/cli/main.c
-@@ -740,21 +740,30 @@ dump_personality(const pkgconf_cross_personality_t *p)
- static pkgconf_cross_personality_t *
- deduce_personality(char *argv[])
- {
-- char *workbuf = strdup(argv[0]), *i;
-- pkgconf_cross_personality_t *out = pkgconf_cross_personality_default(), *deduced;
-+ const char *argv0 = argv[0];
-+ char *i, *prefix;
-+ pkgconf_cross_personality_t *out;
-+
-+ i = strrchr(argv0, '/');
-+ if (i != NULL)
-+ argv0 = i + 1;
-+
-+#if defined(_WIN32) || defined(_WIN64)
-+ i = strrchr(argv0, '\\');
-+ if (i != NULL)
-+ argv0 = i + 1;
-+#endif
-
-- i = strstr(workbuf, "-pkg");
-+ i = strstr(argv0, "-pkg");
- if (i == NULL)
-- goto finish;
--
-- *i = 0;
-+ return pkgconf_cross_personality_default();
-
-- deduced = pkgconf_cross_personality_find(workbuf);
-- if (deduced != NULL)
-- out = deduced;
-+ prefix = strndup(argv0, i - argv0);
-+ out = pkgconf_cross_personality_find(prefix);
-+ free(prefix);
-+ if (out == NULL)
-+ return pkgconf_cross_personality_default();
-
--finish:
-- free(workbuf);
- return out;
- }
-
diff --git a/system/tzdata/APKBUILD b/system/tzdata/APKBUILD
index cd09dac9c..4e518876e 100644
--- a/system/tzdata/APKBUILD
+++ b/system/tzdata/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=tzdata
-pkgver=2018i
-_tzcodever=2018i
+pkgver=2019a
+_tzcodever=2019a
_ptzver=0.5
pkgrel=0
pkgdesc="Time zone data"
@@ -54,7 +54,7 @@ package() {
"$pkgdir"/usr/bin/posixtz
}
-sha512sums="1a3d53043f20b8252f7598f547d78e7294d9e0cf1fcdd2159354d9769f824c8c8a03cef9cbb7fa579345fdb41372335117d2ef782ecd9c107dd0526e59492d9d tzcode2018i.tar.gz
-6afcacb377842190648ed26f01abcf3db37aa2e7c63d8c509c29b4bc0078b7ff2d4e5375291b9f53498215b9e2f04936bc6145e2f651ae0be6d8166d8d336f6a tzdata2018i.tar.gz
+sha512sums="7cc76ce6be4a67c3e1b2222cb632d2de9dabb76899793a938f87a1d4bb20e462cabdae9e3b986aaabaa400795370510095d236dbad5aff4c192d0887f0ecedf5 tzcode2019a.tar.gz
+d8eb5b2b68abee08bd2b0d2134bce85b5c0aee85168e9697a607604ed5be7d1539ac60fda9b37e0c9c793ef6251978bc250563a0af59497fde775499964bb5aa tzdata2019a.tar.gz
68dbaab9f4aef166ac2f2d40b49366527b840bebe17a47599fe38345835e4adb8a767910745ece9c384b57af815a871243c3e261a29f41d71f8054df3061b3fd posixtz-0.5.tar.xz
f54ce213d74c5a8387e1a7c56299bc6eee65a035772288222128abc249a112067b8791b88b45c342b2d4d8d12e9e4f1f2f5c92c5de67f8b6413b1ebf1d7de467 0001-posixtz-fix-up-lseek.patch"
diff --git a/system/util-linux/APKBUILD b/system/util-linux/APKBUILD
index 182e27176..f12fb48dc 100644
--- a/system/util-linux/APKBUILD
+++ b/system/util-linux/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=util-linux
-pkgver=2.33.1
+pkgver=2.33.2
case $pkgver in
*.*.*) _v=${pkgver%.*};;
@@ -100,5 +100,5 @@ libfdisk() {
mv "$pkgdir"/lib/libfdisk.so.* "$subpkgdir"/lib/
}
-sha512sums="94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2 util-linux-2.33.1.tar.xz
+sha512sums="ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749 util-linux-2.33.2.tar.xz
876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9 ttydefaults.h"
diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD
index a6d0bbaac..c89fb7bf7 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.1073
+pkgver=8.1.1177
pkgrel=0
pkgdesc="advanced text editor"
url="https://www.vim.org"
@@ -81,6 +81,6 @@ vimdiff() {
mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin
}
-sha512sums="74d13063853677aaff795925414baa293819ccd20e3deb7013c134b42434e8abd14db1645116b20081f80bcb3dfd9a1e0c6b210ed9af62a4cf19c183025c9779 vim-8.1.1073.tar.gz
+sha512sums="b90d3f6b6727ea97a1e41154855c45f80a2e94a8e3cf1b912ec6812494c2658d66ba4bc796f5a9e7713544ecdd2f813512e4497293d0e362ae9281695dcee52f vim-8.1.1177.tar.gz
12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc
16026a3ed3e080b3f8281948579ab678e9acd724ad594463279712fbf1024bcd923155a133bd08118848d2c6cdf11c69489d85b1c7438f60b4c279094714d181 no-default-mouse.patch"
diff --git a/system/yaml/APKBUILD b/system/yaml/APKBUILD
index f6e0dfd63..7542e1305 100644
--- a/system/yaml/APKBUILD
+++ b/system/yaml/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=yaml
-pkgver=0.2.1
-pkgrel=1
+pkgver=0.2.2
+pkgrel=0
pkgdesc="YAML 1.1 parser and emitter written in C"
url="https://pyyaml.org/wiki/LibYAML"
arch="all"
@@ -10,12 +10,9 @@ license="MIT"
depends=""
makedepends=""
subpackages="$pkgname-dev"
-source="https://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz
- fix-emitter-$pkgver.patch
- skip-trailing-doc-term-$pkgver.patch"
+source="https://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,15 +25,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="97ebeea2a2c877b24de2e1ffbf175d07d97d5c8b90e06d21fd057e1114d10b96c04fd92c2ed4e956db751b7ac1686b3fd5778927912ca5bb0d096908a1351235 yaml-0.2.1.tar.gz
-ad35c3b893cfeb33fab748b39b06ad0c54215941f68d0df591b8e4e4edc3b67f27ea3206321b7621c0e9e6faf749255fd80209da017c77a91d8de68eec54fd2b fix-emitter-0.2.1.patch
-715ad72a4a74b19fdf03b8be96b9e5c3801bab5475eeee4c98b109eabcf86e193d5884ad6466b6765ccc2174ebaedade25e43fff711d9522fb8f370bcea5eef4 skip-trailing-doc-term-0.2.1.patch"
+sha512sums="13d2197135946204323dbfccafa0ac7b3d05437e920545a56f46811fd7319c01419a58083090ce85fccd4d6901a620ceb9f1190078cc0830bc0ce769bb024f51 yaml-0.2.2.tar.gz"
diff --git a/system/yaml/fix-emitter-0.2.1.patch b/system/yaml/fix-emitter-0.2.1.patch
deleted file mode 100644
index f3614e349..000000000
--- a/system/yaml/fix-emitter-0.2.1.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Contributor Note: This patch will be part of v0.2.2 which hasn't been
-formally released as of 2018-11-20. It should be removed once this
-package is version bumped.
-
-From e5ebb70a01cc0fbd9e519050d51d704f58c2a33d Mon Sep 17 00:00:00 2001
-From: James Clarke <jrtc27@jrtc27.com>
-Date: Thu, 29 Jun 2017 02:26:09 +0100
-Subject: [PATCH 2/2] Skip trailing document terminator at the end of the
- stream
-
----
- src/emitter.c | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/src/emitter.c b/src/emitter.c
-index c593a7d..1502590 100644
---- a/src/emitter.c
-+++ b/src/emitter.c
-@@ -649,14 +649,6 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter,
-
- else if (event->type == YAML_STREAM_END_EVENT)
- {
-- if (emitter->open_ended)
-- {
-- if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
-- return 0;
-- if (!yaml_emitter_write_indent(emitter))
-- return 0;
-- }
--
- if (!yaml_emitter_flush(emitter))
- return 0;
-
---
-2.13.2
diff --git a/system/yaml/skip-trailing-doc-term-0.2.1.patch b/system/yaml/skip-trailing-doc-term-0.2.1.patch
deleted file mode 100644
index 7e10cd9ea..000000000
--- a/system/yaml/skip-trailing-doc-term-0.2.1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Contributor Note: As with fix-emitter-0.2.1.patch, this patch should
-not be necessary when v0.2.2 is released.
-
-From 7c2e6f47e1b12ca3dfa9ea2f6c65e9bd8a02e8c8 Mon Sep 17 00:00:00 2001
-From: James Clarke <jrtc27@jrtc27.com>
-Date: Thu, 29 Jun 2017 02:24:53 +0100
-Subject: [PATCH 1/2] Revert "This code is not needed and breaks tests"
-
-This reverts commit 56400d976a1999156b1abfd674c3122843980260.
----
- src/emitter.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/emitter.c b/src/emitter.c
-index a5b7ff8..c593a7d 100644
---- a/src/emitter.c
-+++ b/src/emitter.c
-@@ -1946,6 +1946,10 @@ yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter,
-
- emitter->whitespace = 0;
- emitter->indention = 0;
-+ if (emitter->root_context)
-+ {
-+ emitter->open_ended = 1;
-+ }
-
- return 1;
- }
---
-2.13.2