diff --git a/sys-apps/util-linux/patches/util_linux-2.33.patchset b/sys-apps/util-linux/patches/util_linux-2.34.patchset similarity index 87% rename from sys-apps/util-linux/patches/util_linux-2.33.patchset rename to sys-apps/util-linux/patches/util_linux-2.34.patchset index 5b3f1eb2a..9e2bd34a2 100644 --- a/sys-apps/util-linux/patches/util_linux-2.33.patchset +++ b/sys-apps/util-linux/patches/util_linux-2.34.patchset @@ -1,11 +1,11 @@ -From f9bda2ce44de1d434aee3e985b0ea88d9306434b Mon Sep 17 00:00:00 2001 +From 733682191dbc9d9e230bc1dd60de4530640c6486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Tue, 22 Aug 2017 18:43:38 +0200 Subject: Haiku patches diff --git a/include/c.h b/include/c.h -index b769b58..9e0c2dc 100644 +index 02e9e59..902b5e6 100644 --- a/include/c.h +++ b/include/c.h @@ -33,6 +33,10 @@ @@ -17,13 +17,13 @@ index b769b58..9e0c2dc 100644 +#endif + /* - * Compiler-specific stuff - */ + * __GNUC_PREREQ is deprecated in favour of __has_attribute() and + * __has_feature(). The __has macros are supported by clang and gcc>=5. diff --git a/include/ttyutils.h b/include/ttyutils.h -index af97915..e0a3cc2 100644 +index f164a58..2ac1c88 100644 --- a/include/ttyutils.h +++ b/include/ttyutils.h -@@ -90,15 +90,23 @@ extern int get_terminal_name(const char **path, const char **name, +@@ -91,15 +91,23 @@ extern int get_terminal_name(const char **path, const char **name, static inline void reset_virtual_console(struct termios *tp, int flags) { /* Use defaults of for base settings */ @@ -47,7 +47,7 @@ index af97915..e0a3cc2 100644 } /* Sane setting, allow eight bit characters, no carriage return delay -@@ -150,7 +158,11 @@ static inline void reset_virtual_console(struct termios *tp, int flags) +@@ -151,7 +159,11 @@ static inline void reset_virtual_console(struct termios *tp, int flags) # define TABDLY 0 #endif @@ -59,7 +59,7 @@ index af97915..e0a3cc2 100644 tp->c_iflag &= ~(IGNBRK | INLCR | IGNCR | IXOFF | IUCLC | IXANY | ISTRIP); tp->c_oflag |= (OPOST | ONLCR | NL0 | CR0 | TAB0 | BS0 | VT0 | FF0); tp->c_oflag &= ~(OLCUC | OCRNL | ONOCR | ONLRET | OFILL | \ -@@ -180,24 +192,48 @@ static inline void reset_virtual_console(struct termios *tp, int flags) +@@ -181,24 +193,48 @@ static inline void reset_virtual_console(struct termios *tp, int flags) */ tp->c_cc[VTIME] = 0; tp->c_cc[VMIN] = 1; @@ -123,17 +123,17 @@ index de42795..9e07457 100644 #include "c.h" #include "randutils.h" -- -2.14.1 +2.23.0 -From 1facdd03af765653e0247b3940e98c72d72c2ace Mon Sep 17 00:00:00 2001 +From b16f1be478a7cb39cc0fd09ad3dc80e551f344f2 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Tue, 6 Nov 2018 13:55:22 +0000 Subject: define {makedev,major,minor} macros diff --git a/include/c.h b/include/c.h -index 9e0c2dc..4e61d6e 100644 +index 902b5e6..f5d4cbd 100644 --- a/include/c.h +++ b/include/c.h @@ -23,6 +23,10 @@ @@ -148,17 +148,17 @@ index 9e0c2dc..4e61d6e 100644 #ifndef LOGIN_NAME_MAX -- -2.19.1 +2.23.0 -From fd2e9e4c8d43bc0c5504b222b6156f5ef050e6fa Mon Sep 17 00:00:00 2001 +From f8485aeff00b3c3c1ce1ebfb6fc7dc6a852b6864 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Tue, 6 Nov 2018 14:07:17 +0000 Subject: Don't define macros if they require others which are undefined. diff --git a/include/ttyutils.h b/include/ttyutils.h -index e0a3cc2..21580cd 100644 +index 2ac1c88..e5bb761 100644 --- a/include/ttyutils.h +++ b/include/ttyutils.h @@ -43,22 +43,32 @@ @@ -195,10 +195,10 @@ index e0a3cc2..21580cd 100644 /* Storage for things detected while the login name was read. */ -- -2.19.1 +2.23.0 -From b93db0c4aad939824a0881b6995b3c1f1961cfac Mon Sep 17 00:00:00 2001 +From a811da01d6200b3a6c9f5615a206dfaa4f1d4faa Mon Sep 17 00:00:00 2001 From: fbrosson Date: Thu, 8 Nov 2018 07:27:38 +0000 Subject: Skip tests which fail to build. @@ -220,17 +220,17 @@ index ab0b3ce..393af5e 100644 check_PROGRAMS += test_uuid_namespace test_uuid_namespace_SOURCES = tests/helpers/test_uuid_namespace.c \ -- -2.19.1 +2.23.0 -From 646efc2df34d7acd9e4b15f8df6213517d5b236f Mon Sep 17 00:00:00 2001 +From f772bbf679db9ae00e291b0d87cccde0763bafe9 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Thu, 8 Nov 2018 07:29:11 +0000 Subject: include posix/syslog.h instead of sys/syslog.h diff --git a/login-utils/logindefs.c b/login-utils/logindefs.c -index ebf1a9f..b69cc67 100644 +index 2b505d2..d6218d3 100644 --- a/login-utils/logindefs.c +++ b/login-utils/logindefs.c @@ -26,7 +26,11 @@ @@ -246,5 +246,5 @@ index ebf1a9f..b69cc67 100644 #include #include -- -2.19.1 +2.23.0 diff --git a/sys-apps/util-linux/util_linux-2.33.recipe b/sys-apps/util-linux/util_linux-2.34.recipe similarity index 96% rename from sys-apps/util-linux/util_linux-2.33.recipe rename to sys-apps/util-linux/util_linux-2.34.recipe index 86ac264dd..7b42603dc 100644 --- a/sys-apps/util-linux/util_linux-2.33.recipe +++ b/sys-apps/util-linux/util_linux-2.34.recipe @@ -6,9 +6,9 @@ LICENSE="GNU GPL v2 GNU LGPL v2 BSD (4-clause) Public Domain" -REVISION="2" -SOURCE_URI="https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-$portVersion.tar.xz" -CHECKSUM_SHA256="f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a" +REVISION="1" +SOURCE_URI="https://www.kernel.org/pub/linux/utils/util-linux/v$portVersion/util-linux-$portVersion.tar.xz" +CHECKSUM_SHA256="743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" SOURCE_DIR="util-linux-$portVersion" PATCHES="util_linux-$portVersion.patchset"