From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F347A13877A for ; Tue, 19 Aug 2014 13:59:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FFE8E0909; Tue, 19 Aug 2014 13:59:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E480AE0908 for ; Tue, 19 Aug 2014 13:59:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF785340084 for ; Tue, 19 Aug 2014 13:59:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 61BA138FB for ; Tue, 19 Aug 2014 13:59:16 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1407943899.f543e69201441fdc901ccdda0d7a4d23cc5d829b.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:musl commit in: sys-apps/util-linux/, sys-apps/util-linux/files/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: sys-apps/util-linux/files/util-linux-2.25-missing__SWORD_TYPE.patch sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch sys-apps/util-linux/util-linux-2.25-r99.ebuild X-VCS-Directories: sys-apps/util-linux/ sys-apps/util-linux/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: f543e69201441fdc901ccdda0d7a4d23cc5d829b X-VCS-Branch: musl Date: Tue, 19 Aug 2014 13:59:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0f64b8ee-67c4-4c6f-9c2c-b43b365ecd11 X-Archives-Hash: ff110599f996ba826284eadb3565a9bb commit: f543e69201441fdc901ccdda0d7a4d23cc5d829b Author: Anthony G. Basile gentoo org> AuthorDate: Wed Aug 13 15:31:39 2014 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Wed Aug 13 15:31:39 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=f543e692 sys-apps/util-linux: Don't cast at all, per Rich Felker Package-Manager: portage-2.2.8-r1 Manifest-Sign-Key: 0xF52D4BBA --- .../util-linux-2.25-missing__SWORD_TYPE.patch | 28 ---------------------- .../files/util-linux-2.25-remove__SWORD_TYPE.patch | 14 +++++++++++ sys-apps/util-linux/util-linux-2.25-r99.ebuild | 2 +- 3 files changed, 15 insertions(+), 29 deletions(-) diff --git a/sys-apps/util-linux/files/util-linux-2.25-missing__SWORD_TYPE.patch b/sys-apps/util-linux/files/util-linux-2.25-missing__SWORD_TYPE.patch deleted file mode 100644 index e20a63a..0000000 --- a/sys-apps/util-linux/files/util-linux-2.25-missing__SWORD_TYPE.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naur util-linux-2.25.orig/sys-utils/switch_root.c util-linux-2.25/sys-utils/switch_root.c ---- util-linux-2.25.orig/sys-utils/switch_root.c 2014-06-25 09:35:44.333812673 +0000 -+++ util-linux-2.25/sys-utils/switch_root.c 2014-08-12 14:54:40.752012106 +0000 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -47,6 +48,16 @@ - #define MNT_DETACH 0x00000002 /* Just detach from the tree */ - #endif - -+#ifndef __SWORD_TYPE -+#if __WORDSIZE == 32 -+# define __SWORD_TYPE int -+#elif __WORDSIZE == 64 -+# define __SWORD_TYPE long int -+#else -+# error -+#endif -+#endif -+ - /* remove all files/directories below dirName -- don't cross mountpoints */ - static int recursiveRemove(int fd) - { diff --git a/sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch b/sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch new file mode 100644 index 0000000..86edab4 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch @@ -0,0 +1,14 @@ +diff -Naur util-linux-2.25.orig/sys-utils/switch_root.c util-linux-2.25/sys-utils/switch_root.c +--- util-linux-2.25.orig/sys-utils/switch_root.c 2014-08-13 15:08:15.632801343 +0000 ++++ util-linux-2.25/sys-utils/switch_root.c 2014-08-13 15:09:19.617801087 +0000 +@@ -181,8 +181,8 @@ + if (pid <= 0) { + struct statfs stfs; + if (fstatfs(cfd, &stfs) == 0 && +- (stfs.f_type == (__SWORD_TYPE)STATFS_RAMFS_MAGIC || +- stfs.f_type == (__SWORD_TYPE)STATFS_TMPFS_MAGIC)) ++ (stfs.f_type == STATFS_RAMFS_MAGIC || ++ stfs.f_type == STATFS_TMPFS_MAGIC)) + recursiveRemove(cfd); + else + warn(_("old root filesystem is not an initramfs")); diff --git a/sys-apps/util-linux/util-linux-2.25-r99.ebuild b/sys-apps/util-linux/util-linux-2.25-r99.ebuild index eb17752..6fc8054 100644 --- a/sys-apps/util-linux/util-linux-2.25-r99.ebuild +++ b/sys-apps/util-linux/util-linux-2.25-r99.ebuild @@ -66,7 +66,7 @@ src_prepare() { eautoreconf fi epatch "${FILESDIR}"/${P}-lscpu-pic.patch #518936 - epatch "${FILESDIR}"/${PN}-2.25-missing__SWORD_TYPE.patch + epatch "${FILESDIR}"/${PN}-2.25-remove__SWORD_TYPE.patch elibtoolize } From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D988F13877A for ; Wed, 13 Aug 2014 15:29:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B9E5E0984; Wed, 13 Aug 2014 15:29:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A2711E0984 for ; Wed, 13 Aug 2014 15:29:46 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B7563405A2 for ; Wed, 13 Aug 2014 15:29:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 2AF5E18816 for ; Wed, 13 Aug 2014 15:29:44 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1407943899.f543e69201441fdc901ccdda0d7a4d23cc5d829b.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:musl commit in: sys-apps/util-linux/, sys-apps/util-linux/files/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: sys-apps/util-linux/files/util-linux-2.25-missing__SWORD_TYPE.patch sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch sys-apps/util-linux/util-linux-2.25-r99.ebuild X-VCS-Directories: sys-apps/util-linux/ sys-apps/util-linux/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: f543e69201441fdc901ccdda0d7a4d23cc5d829b X-VCS-Branch: musl Date: Wed, 13 Aug 2014 15:29:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 79ab02c7-f413-4e9b-86b2-84d8b2423933 X-Archives-Hash: b3dd2a6e9fdd53b012451b6b89c6df66 Message-ID: <20140813152944.9D77e9fzETMIrACRHxzgr4BYwPHusm5I4dx7GKD13EA@z> commit: f543e69201441fdc901ccdda0d7a4d23cc5d829b Author: Anthony G. Basile gentoo org> AuthorDate: Wed Aug 13 15:31:39 2014 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Wed Aug 13 15:31:39 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=f543e692 sys-apps/util-linux: Don't cast at all, per Rich Felker Package-Manager: portage-2.2.8-r1 Manifest-Sign-Key: 0xF52D4BBA --- .../util-linux-2.25-missing__SWORD_TYPE.patch | 28 ---------------------- .../files/util-linux-2.25-remove__SWORD_TYPE.patch | 14 +++++++++++ sys-apps/util-linux/util-linux-2.25-r99.ebuild | 2 +- 3 files changed, 15 insertions(+), 29 deletions(-) diff --git a/sys-apps/util-linux/files/util-linux-2.25-missing__SWORD_TYPE.patch b/sys-apps/util-linux/files/util-linux-2.25-missing__SWORD_TYPE.patch deleted file mode 100644 index e20a63a..0000000 --- a/sys-apps/util-linux/files/util-linux-2.25-missing__SWORD_TYPE.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naur util-linux-2.25.orig/sys-utils/switch_root.c util-linux-2.25/sys-utils/switch_root.c ---- util-linux-2.25.orig/sys-utils/switch_root.c 2014-06-25 09:35:44.333812673 +0000 -+++ util-linux-2.25/sys-utils/switch_root.c 2014-08-12 14:54:40.752012106 +0000 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -47,6 +48,16 @@ - #define MNT_DETACH 0x00000002 /* Just detach from the tree */ - #endif - -+#ifndef __SWORD_TYPE -+#if __WORDSIZE == 32 -+# define __SWORD_TYPE int -+#elif __WORDSIZE == 64 -+# define __SWORD_TYPE long int -+#else -+# error -+#endif -+#endif -+ - /* remove all files/directories below dirName -- don't cross mountpoints */ - static int recursiveRemove(int fd) - { diff --git a/sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch b/sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch new file mode 100644 index 0000000..86edab4 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch @@ -0,0 +1,14 @@ +diff -Naur util-linux-2.25.orig/sys-utils/switch_root.c util-linux-2.25/sys-utils/switch_root.c +--- util-linux-2.25.orig/sys-utils/switch_root.c 2014-08-13 15:08:15.632801343 +0000 ++++ util-linux-2.25/sys-utils/switch_root.c 2014-08-13 15:09:19.617801087 +0000 +@@ -181,8 +181,8 @@ + if (pid <= 0) { + struct statfs stfs; + if (fstatfs(cfd, &stfs) == 0 && +- (stfs.f_type == (__SWORD_TYPE)STATFS_RAMFS_MAGIC || +- stfs.f_type == (__SWORD_TYPE)STATFS_TMPFS_MAGIC)) ++ (stfs.f_type == STATFS_RAMFS_MAGIC || ++ stfs.f_type == STATFS_TMPFS_MAGIC)) + recursiveRemove(cfd); + else + warn(_("old root filesystem is not an initramfs")); diff --git a/sys-apps/util-linux/util-linux-2.25-r99.ebuild b/sys-apps/util-linux/util-linux-2.25-r99.ebuild index eb17752..6fc8054 100644 --- a/sys-apps/util-linux/util-linux-2.25-r99.ebuild +++ b/sys-apps/util-linux/util-linux-2.25-r99.ebuild @@ -66,7 +66,7 @@ src_prepare() { eautoreconf fi epatch "${FILESDIR}"/${P}-lscpu-pic.patch #518936 - epatch "${FILESDIR}"/${PN}-2.25-missing__SWORD_TYPE.patch + epatch "${FILESDIR}"/${PN}-2.25-remove__SWORD_TYPE.patch elibtoolize }