summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-09-04 19:58:00 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-09-04 19:58:00 +0000
commit004ba64dfa12112ce25064a9f4e6981d9581f8aa (patch)
tree2b642b2b0524afb9e4b3b7f82bd44d19b0224f76
parent43c2c5f547d8479044da601029ab702619ac4d77 (diff)
downloadpackages-004ba64dfa12112ce25064a9f4e6981d9581f8aa.tar.gz
packages-004ba64dfa12112ce25064a9f4e6981d9581f8aa.tar.bz2
packages-004ba64dfa12112ce25064a9f4e6981d9581f8aa.tar.xz
packages-004ba64dfa12112ce25064a9f4e6981d9581f8aa.zip
system/coreutils: bump to 8.30
-rw-r--r--system/coreutils/APKBUILD8
-rw-r--r--system/coreutils/localename-test-fix.patch17
2 files changed, 12 insertions, 13 deletions
diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD
index f54e82463..840c55421 100644
--- a/system/coreutils/APKBUILD
+++ b/system/coreutils/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=coreutils
-pkgver=8.29
-pkgrel=2
+pkgver=8.30
+pkgrel=0
pkgdesc="Basic file, shell, and text manipulation utilities"
url="http://www.gnu.org/software/coreutils/"
arch="all"
@@ -76,10 +76,10 @@ package() {
ln -s ../bin/coreutils "$pkgdir"/usr/sbin/chroot
}
-sha512sums="546bbcd5741beae7a68e7c4ca14d6d634f7c8be87feecdeddd00e226f4865bb89d503437c3a95622ba7bb0cb70addbb5bdf3767fa18d0b7410ab90ee53b29dfd coreutils-8.29.tar.xz
+sha512sums="25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda coreutils-8.30.tar.xz
bd8b5cecba59eba30458c8afa895877d39a987b989bc06b70cd6836e0ef684677aaadcb4949b58a713779fe1df1e15e3903e9be14e306671b86b69018b75de8b disable-csplit-io-err-test.patch
532ef8210261437855ba3e2fc72ec57b0e0252b2b0f7817990c9629613ece2cdd86cf30aa049f3cff6fbda12ed3bb9a0db3a3642475378ae44ce319bdf005d9b disable-mbrtowc-test.patch
-a6cbe77d2fd3655e59ead9ec5cfcc80ae8c1a688f779219910d9370a0e5f86195e2d3a1ca427a374d8457c5ca04ebb72f8bac0b7a7415337bac3545a85d22e3d localename-test-fix.patch"
+86944e9ea5493c5b21ab62562a63aa134952738297b21cfb2e8f751db4a695ff25ee1592eb231ed1bb80999bc31f7504c7feffde2e93b4e068c05c44ac83cbdf localename-test-fix.patch"
[ ${CBUILD} != ${CHOST} ] && sha512sums="$sha512sums
bae804f057252c25452ac178c545dc2c4b4775cbfbdcfd4775edd1a4ed6507882bfac39e2b11ad01b74230ca48d761bf62f11bde5bcbc35a6e5a61cbe4a46e36 051_all_coreutils-mangen.patch
diff --git a/system/coreutils/localename-test-fix.patch b/system/coreutils/localename-test-fix.patch
index 9907eb67a..ff89319c7 100644
--- a/system/coreutils/localename-test-fix.patch
+++ b/system/coreutils/localename-test-fix.patch
@@ -1,14 +1,13 @@
+# if defined __APPLE__ && defined __MACH__
+# include <xlocale.h>
+# endif
+# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || defined __CYGWIN__
+# if (defined __linux__ && !defined __UCLIBC__) || defined __CYGWIN__
+# include <langinfo.h>
+# endif
+# if !defined IN_LIBINTL
--- coreutils-8.27/gnulib-tests/localename.c.old 2016-12-31 13:54:43.000000000 +0000
+++ coreutils-8.27/gnulib-tests/localename.c 2017-07-30 16:40:47.098541270 +0000
-@@ -40,7 +40,7 @@
- # if defined __APPLE__ && defined __MACH__
- # include <xlocale.h>
- # endif
--# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || defined __CYGWIN__
-+# if (defined __linux__ && !defined __UCLIBC__) || defined __CYGWIN__
- # include <langinfo.h>
- # endif
- # if !defined IN_LIBINTL
@@ -2692,16 +2692,19 @@
locale_t thread_locale = uselocale (NULL);
if (thread_locale != LC_GLOBAL_LOCALE)