From 4f231fe41f2f2510c2d3b83c182cd31b77f71990 Mon Sep 17 00:00:00 2001
From: wu-leilei <wu18740459704@163.com>
Date: Tue, 6 Jun 2023 09:11:10 +0800
Subject: [PATCH] Add PIE flags

(cherry picked from commit 12325ab9cc22af56e3fd41aa3bf3d896b1b5140c)
---
 bacula.spec                              |  6 +++++-
 fix-add-the-compilation-option-pie.patch | 24 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 fix-add-the-compilation-option-pie.patch

diff --git a/bacula.spec b/bacula.spec
index 93bc9cf..2b28594 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
 
 Name:               bacula
 Version:            9.4.4
-Release:            6
+Release:            7
 Summary:            Cross platform network backup for Linux, Unix, Mac and Windows
 License:            AGPLv3 with exceptions
 URL:                http://www.bacula.org
@@ -20,6 +20,7 @@ Patch0002:          bacula-seg-fault.patch
 Patch0003:          bacula-autoconf.patch
 Patch0004:          bacula-stop-the-service-and-the-process-exits-normally.patch
 Patch0005:          0001-Remove-unused-t-option-in-dbcheck.c-fixes-bug-2453.patch
+Patch0006:          fix-add-the-compilation-option-pie.patch
 BuildRequires:      desktop-file-utils perl-generators sed autoconf automake lzo-devel zlib-devel
 BuildRequires:      gcc gcc-c++ glibc-devel ImageMagick libacl-devel libstdc++-devel libxml2-devel
 BuildRequires:      libcap-devel ncurses-devel openssl-devel readline-devel sqlite-devel 
@@ -314,6 +315,9 @@ fi
 %{_mandir}/man*
 
 %changelog
+* Mon Jun 05 2023 wu lei <wu_lei@hoperun.com> - 9.4.4-7
+- Add PIE flags
+
 * Tue May 30 2023 chenchen <chen_aka_jan@163.com> - 9.4.4-6
 - Remove unused -t option in dbcheck.c
 
diff --git a/fix-add-the-compilation-option-pie.patch b/fix-add-the-compilation-option-pie.patch
new file mode 100644
index 0000000..4e4a2a0
--- /dev/null
+++ b/fix-add-the-compilation-option-pie.patch
@@ -0,0 +1,24 @@
+diff -Nur a/src/qt-console/bat.pro.in b/src/qt-console/bat.pro.in
+--- a/src/qt-console/bat.pro.in	2023-06-05 16:36:20.200951580 +0800
++++ b/src/qt-console/bat.pro.in	2023-06-05 16:37:07.576951580 +0800
+@@ -26,7 +26,7 @@
+ LIBS        += -L../lib -lbaccfg -lbac -L../findlib -lbacfind @OPENSSL_LIBS@
+ LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
+ LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
+-QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
++QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX) -fPIE -Wl,-pie
+ QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
+ QMAKE_CLEAN += .libs/* bat
+ 
+diff -Nur a/src/qt-console/tray-monitor/tray-monitor.pro.in b/src/qt-console/tray-monitor/tray-monitor.pro.in
+--- a/src/qt-console/tray-monitor/tray-monitor.pro.in	2023-06-05 16:36:20.208951580 +0800
++++ b/src/qt-console/tray-monitor/tray-monitor.pro.in	2023-06-05 16:37:53.676951580 +0800
+@@ -37,7 +37,7 @@
+ INCLUDEPATH += ../.. . 
+ LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
+ LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
+-QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
++QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX) -fPIE -Wl,-pie
+ QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
+ QMAKE_CLEAN += obj/* .libs/* bacula-tray-monitor release/bacula-tray-monitor
+ QMAKE_CXXFLAGS += -DTRAY_MONITOR