diff --git a/.reuse/dep5 b/.reuse/dep5 index e0920f7..e391115 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -19,7 +19,7 @@ Copyright: UnionTech Software Technology Co., Ltd. License: CC-BY-4.0 # xml toml json conf yaml -Files: msic/dbus-conf/com.deepin.face.conf msic/deepin-face-driver.json .gitignore msic/dbus-conf/org.deepin.dde.Face1.conf +Files: msic/dbus-conf/com.deepin.face.conf msic/deepin-face-driver.json .gitignore msic/dbus-conf/org.deepin.dde.Face1.conf msic/deepin-face.conf msic/dbus-services/org.deepin.dde.Face1.service Copyright: None License: CC0-1.0 diff --git a/debian/deepin-face.install b/debian/deepin-face.install new file mode 100644 index 0000000..b9c5812 --- /dev/null +++ b/debian/deepin-face.install @@ -0,0 +1 @@ +msic/deepin-face.conf etc/ld.so.conf.d/ diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..52b9c79 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,22 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + # Update the dynamic linker cache after installing ld.so.conf.d configuration + if [ -x "$(command -v ldconfig)" ]; then + ldconfig + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/postrm b/debian/postrm new file mode 100644 index 0000000..1565837 --- /dev/null +++ b/debian/postrm @@ -0,0 +1,22 @@ +#!/bin/sh + +set -e + +case "$1" in + remove|purge) + # Update the dynamic linker cache after removing ld.so.conf.d configuration + if [ -x "$(command -v ldconfig)" ]; then + ldconfig + fi + ;; + + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/rules b/debian/rules index 9a967bb..0049824 100755 --- a/debian/rules +++ b/debian/rules @@ -8,11 +8,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all # see ENVIRONMENT in dpkg-buildflags(1) # package maintainers to append CFLAGS -export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - - +export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +export DEB_CXXFLAGS_MAINT_APPEND = -Wall +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wl,-E %: dh $@ --buildsystem qmake6 diff --git a/deepin-face.pro b/deepin-face.pro index 4ff2b59..376fc7d 100644 --- a/deepin-face.pro +++ b/deepin-face.pro @@ -15,11 +15,6 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -# 增加安全编译参数 -QMAKE_CFLAGS += -fstack-protector-all -QMAKE_CXXFLAGS += -fstack-protector-all -QMAKE_LFLAGS += -z relro -z now -z noexecstack -pie - SOURCES += \ main.cpp \ @@ -50,7 +45,6 @@ LIBS += -L/usr/lib/auto \ -lSeetaFaceAntiSpoofingX600d -lSeetaFaceTracking600 -lSeetaFaceRecognizer610 \ -lSeetaQualityAssessor300 -lSeetaPoseEstimation600 -lSeetaAuthorize -ltennis -QMAKE_RPATHDIR += /usr/lib/auto/ isEmpty(PREFIX){ PREFIX = /usr diff --git a/msic/deepin-face.conf b/msic/deepin-face.conf new file mode 100644 index 0000000..b70281e --- /dev/null +++ b/msic/deepin-face.conf @@ -0,0 +1 @@ +/usr/lib/auto