From ca9627e70852f6b2e835660df870fe3ab405882d Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Sun, 1 Sep 2019 00:00:32 +0200
Subject: Initial import

---
 .../util-linux-2.12i-swapon-check-symlinks.patch   | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 sys-apps/util-linux/files/util-linux-2.12i-swapon-check-symlinks.patch

(limited to 'sys-apps/util-linux/files/util-linux-2.12i-swapon-check-symlinks.patch')

diff --git a/sys-apps/util-linux/files/util-linux-2.12i-swapon-check-symlinks.patch b/sys-apps/util-linux/files/util-linux-2.12i-swapon-check-symlinks.patch
new file mode 100644
index 0000000..b9ed346
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.12i-swapon-check-symlinks.patch
@@ -0,0 +1,33 @@
+--- util-linux-2.12b/mount/swapon.c.orig	2004-10-28 10:02:44.320023600 -0400
++++ util-linux-2.12b/mount/swapon.c	2004-10-28 10:02:14.384574000 -0400
+@@ -22,2 +22,3 @@
+ #include <stdlib.h>
++#include <sys/param.h>
+ #include <stdio.h>
+@@ -143,10 +144,26 @@
+ static int
+ is_in_proc_swaps(char *fname) {
+ 	int i;
++	struct stat fstatbuf;
+ 
+ 	for (i = 0; i < numSwaps; i++)
+ 		if (!strcmp(fname, swapFiles[i]))
+ 			return 1;
++
++	/* fallback:
++	 * if the device in /etc/fstab is a symlink, the entry
++	 * in /proc/swaps won't match because the kernel stores
++	 * absolute pathnames.  Here we compare dev_t's.
++	 */
++	if (!lstat(fname, &fstatbuf))
++		if (S_ISLNK(fstatbuf.st_mode)) {
++			struct stat swapstatbuf;
++			for (i = 0; i < numSwaps; i++)
++				if (!stat(swapFiles[i], &swapstatbuf) && \
++				    swapstatbuf.st_dev == fstatbuf.st_dev)
++					return 1;
++		}
++
+ 	return 0;
+ }
+ 
-- 
cgit v1.2.3