From 362bbfae137caa493ba5c6f5f986c0ce1fad5f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 21 Aug 2023 12:45:22 +0200
Subject: [PATCH] debian/patches: Use proper rpath and permissions on installed
 libraries

---
 debian/patches/series                         |  2 +
 ...utable-bits-from-installed-libraries.patch | 68 +++++++++++++++++++
 ...ests-Use-tests-execdir-install-rpath.patch | 20 ++++++
 3 files changed, 90 insertions(+)
 create mode 100644 debian/patches/tests-Remove-executable-bits-from-installed-libraries.patch
 create mode 100644 debian/patches/tests-Use-tests-execdir-install-rpath.patch

diff --git a/debian/patches/series b/debian/patches/series
index 7f8b4af1..767b5d47 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 tests-Install-current-TOD-driver-in-installed-tests-and-u.patch
 tests-Use-native-GTest-utils-to-generate-assets-names.patch
+tests-Use-tests-execdir-install-rpath.patch
+tests-Remove-executable-bits-from-installed-libraries.patch
diff --git a/debian/patches/tests-Remove-executable-bits-from-installed-libraries.patch b/debian/patches/tests-Remove-executable-bits-from-installed-libraries.patch
new file mode 100644
index 00000000..5fdff68d
--- /dev/null
+++ b/debian/patches/tests-Remove-executable-bits-from-installed-libraries.patch
@@ -0,0 +1,68 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
+Date: Mon, 21 Aug 2023 12:42:02 +0200
+Subject: tests: Remove executable bits from installed libraries
+
+(cherry picked from commit 54f02c77991506bd28d375a19ccdac49a12ba9ae)
+---
+ .../libdevice-fake-tod-ssm-test-v1+1.90.1-x86_64.so         | Bin
+ .../libdevice-fake-tod-test-driver-v1+1.90.1-x86_64.so      | Bin
+ .../libdevice-fake-tod-ssm-test-v1+1.90.2-x86_64.so         | Bin
+ .../libdevice-fake-tod-test-driver-v1+1.90.2-x86_64.so      | Bin
+ .../libdevice-fake-tod-ssm-test-v1+1.90.3-x86_64.so         | Bin
+ .../libdevice-fake-tod-test-driver-v1+1.90.3-x86_64.so      | Bin
+ .../libdevice-fake-tod-ssm-test-v1+1.90.5-x86_64.so         | Bin
+ .../libdevice-fake-tod-test-driver-v1+1.90.5-x86_64.so      | Bin
+ .../libdevice-fake-tod-ssm-test-v1+1.94.0-x86_64.so         | Bin
+ .../libdevice-fake-tod-test-driver-v1+1.94.0-x86_64.so      | Bin
+ .../libdevice-fake-tod-ssm-test-v1+1.94.3-x86_64.so         | Bin
+ .../libdevice-fake-tod-test-driver-v1+1.94.3-x86_64.so      | Bin
+ 12 files changed, 0 insertions(+), 0 deletions(-)
+ mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.1/libdevice-fake-tod-ssm-test-v1+1.90.1-x86_64.so
+ mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.1/libdevice-fake-tod-test-driver-v1+1.90.1-x86_64.so
+ mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.2/libdevice-fake-tod-ssm-test-v1+1.90.2-x86_64.so
+ mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.2/libdevice-fake-tod-test-driver-v1+1.90.2-x86_64.so
+ mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.3/libdevice-fake-tod-ssm-test-v1+1.90.3-x86_64.so
+ mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.3/libdevice-fake-tod-test-driver-v1+1.90.3-x86_64.so
+ mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.5/libdevice-fake-tod-ssm-test-v1+1.90.5-x86_64.so
+ mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.90.5/libdevice-fake-tod-test-driver-v1+1.90.5-x86_64.so
+ mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.94.0/libdevice-fake-tod-ssm-test-v1+1.94.0-x86_64.so
+ mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.94.0/libdevice-fake-tod-test-driver-v1+1.94.0-x86_64.so
+ mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.94.3/libdevice-fake-tod-ssm-test-v1+1.94.3-x86_64.so
+ mode change 100755 => 100644 tests/tod-drivers/tod-x86_64-v1+1.94.3/libdevice-fake-tod-test-driver-v1+1.94.3-x86_64.so
+
+diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.1/libdevice-fake-tod-ssm-test-v1+1.90.1-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.1/libdevice-fake-tod-ssm-test-v1+1.90.1-x86_64.so
+old mode 100755
+new mode 100644
+diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.1/libdevice-fake-tod-test-driver-v1+1.90.1-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.1/libdevice-fake-tod-test-driver-v1+1.90.1-x86_64.so
+old mode 100755
+new mode 100644
+diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.2/libdevice-fake-tod-ssm-test-v1+1.90.2-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.2/libdevice-fake-tod-ssm-test-v1+1.90.2-x86_64.so
+old mode 100755
+new mode 100644
+diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.2/libdevice-fake-tod-test-driver-v1+1.90.2-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.2/libdevice-fake-tod-test-driver-v1+1.90.2-x86_64.so
+old mode 100755
+new mode 100644
+diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.3/libdevice-fake-tod-ssm-test-v1+1.90.3-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.3/libdevice-fake-tod-ssm-test-v1+1.90.3-x86_64.so
+old mode 100755
+new mode 100644
+diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.3/libdevice-fake-tod-test-driver-v1+1.90.3-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.3/libdevice-fake-tod-test-driver-v1+1.90.3-x86_64.so
+old mode 100755
+new mode 100644
+diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.5/libdevice-fake-tod-ssm-test-v1+1.90.5-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.5/libdevice-fake-tod-ssm-test-v1+1.90.5-x86_64.so
+old mode 100755
+new mode 100644
+diff --git a/tests/tod-drivers/tod-x86_64-v1+1.90.5/libdevice-fake-tod-test-driver-v1+1.90.5-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.90.5/libdevice-fake-tod-test-driver-v1+1.90.5-x86_64.so
+old mode 100755
+new mode 100644
+diff --git a/tests/tod-drivers/tod-x86_64-v1+1.94.0/libdevice-fake-tod-ssm-test-v1+1.94.0-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.94.0/libdevice-fake-tod-ssm-test-v1+1.94.0-x86_64.so
+old mode 100755
+new mode 100644
+diff --git a/tests/tod-drivers/tod-x86_64-v1+1.94.0/libdevice-fake-tod-test-driver-v1+1.94.0-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.94.0/libdevice-fake-tod-test-driver-v1+1.94.0-x86_64.so
+old mode 100755
+new mode 100644
+diff --git a/tests/tod-drivers/tod-x86_64-v1+1.94.3/libdevice-fake-tod-ssm-test-v1+1.94.3-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.94.3/libdevice-fake-tod-ssm-test-v1+1.94.3-x86_64.so
+old mode 100755
+new mode 100644
+diff --git a/tests/tod-drivers/tod-x86_64-v1+1.94.3/libdevice-fake-tod-test-driver-v1+1.94.3-x86_64.so b/tests/tod-drivers/tod-x86_64-v1+1.94.3/libdevice-fake-tod-test-driver-v1+1.94.3-x86_64.so
+old mode 100755
+new mode 100644
diff --git a/debian/patches/tests-Use-tests-execdir-install-rpath.patch b/debian/patches/tests-Use-tests-execdir-install-rpath.patch
new file mode 100644
index 00000000..2e95456d
--- /dev/null
+++ b/debian/patches/tests-Use-tests-execdir-install-rpath.patch
@@ -0,0 +1,20 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
+Date: Mon, 21 Aug 2023 12:22:07 +0200
+Subject: tests: Use tests execdir install rpath
+
+---
+ tests/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 2832158..e95c1cf 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -396,6 +396,7 @@ if get_option('tod')
+         dependencies: deps,
+         install: installed_tests,
+         install_dir: installed_tests_execdir / 'tod-drivers' / 'current',
++        install_rpath: installed_tests_execdir,
+     )
+ 
+     fp_todv1_enums = gnome.mkenums_simple('fp-todv1-enums',