packages/bacula
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!27 [sync] PR-26: Add PIE flags

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge
This commit is contained in:
openeuler-ci-bot 2023-06-13 02:41:32 +00:00 committed by Gitee
commit 3105175e8a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bacula.spec
View File

@ -3,7 +3,7 @@
Name: bacula Name: bacula
Version: 9.4.4 Version: 9.4.4
Release: 6 Release: 7
Summary: Cross platform network backup for Linux, Unix, Mac and Windows Summary: Cross platform network backup for Linux, Unix, Mac and Windows
License: AGPLv3 with exceptions License: AGPLv3 with exceptions
URL: http://www.bacula.org URL: http://www.bacula.org
@ -20,6 +20,7 @@ Patch0002: bacula-seg-fault.patch
Patch0003: bacula-autoconf.patch Patch0003: bacula-autoconf.patch
Patch0004: bacula-stop-the-service-and-the-process-exits-normally.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 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: 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: gcc gcc-c++ glibc-devel ImageMagick libacl-devel libstdc++-devel libxml2-devel
BuildRequires: libcap-devel ncurses-devel openssl-devel readline-devel sqlite-devel BuildRequires: libcap-devel ncurses-devel openssl-devel readline-devel sqlite-devel
@ -314,6 +315,9 @@ fi
%{_mandir}/man* %{_mandir}/man*
%changelog %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 * Tue May 30 2023 chenchen <chen_aka_jan@163.com> - 9.4.4-6
- Remove unused -t option in dbcheck.c - Remove unused -t option in dbcheck.c

24
fix-add-the-compilation-option-pie.patch Normal file
View File

@ -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