diff --git a/debian/patches/0004-Make-root-bootstraps-to-system-path.patch b/debian/patches/0004-Make-root-bootstraps-to-system-path.patch deleted file mode 100644 index 735eaf947..000000000 --- a/debian/patches/0004-Make-root-bootstraps-to-system-path.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Jason Rhinelander -Date: Wed, 4 Sep 2019 15:50:06 -0300 -Subject: Make root bootstraps to system path - ---- - lokinet-bootstrap | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/lokinet-bootstrap b/lokinet-bootstrap -index 683173b..1536007 100755 ---- a/lokinet-bootstrap -+++ b/lokinet-bootstrap -@@ -13,6 +13,10 @@ default_mainnet=https://seed.lokinet.org/lokinet.signed - default_testnet=https://seed.lokinet.org/testnet.signed - default_dest="$HOME/.lokinet/bootstrap.signed" - -+if [ "$UID" == 0 ]; then -+ default_dest=/var/lib/lokinet/bootstrap.signed -+fi -+ - if [ "$#" -gt 2 ]; then - helpme=y - fi -@@ -21,6 +25,9 @@ if [ -z "$1" ] || [ "$1" == "mainnet" ] || [ "$1" == "lokinet" ]; then - url="${default_mainnet}" - elif [ "$1" == "testnet" ]; then - url="${default_testnet}" -+ if [ "$UID" == "0" ]; then -+ default_dest=/var/lib/lokinet/testnet/bootstrap.signed -+ fi - elif [[ "$1" = -* ]]; then - helpme=y - else diff --git a/debian/patches/0005-Move-default-user-group-into-deb-patch.patch b/debian/patches/0005-Move-default-user-group-into-deb-patch.patch deleted file mode 100644 index 2c6c3deb2..000000000 --- a/debian/patches/0005-Move-default-user-group-into-deb-patch.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Jason Rhinelander -Date: Mon, 9 Sep 2019 22:12:03 -0300 -Subject: Move default user/group into deb patch - -Rather than cramming it into CXXFLAGS in debian/rules. ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8f98214..901f8e0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -116,6 +116,9 @@ include(cmake/unix.cmake) - include(cmake/check_for_std_optional.cmake) - include(cmake/check_for_std_filesystem.cmake) - -+# Unique user for system lokinet; _loki group is intentionally shared with the loki-core debs. -+add_definitions(-DDEFAULT_LOKINET_USER=\"_lokinet\" -DDEFAULT_LOKINET_GROUP=\"_loki\") -+ - if(NOT WIN32) - if(IOS OR ANDROID) - set(NON_PC_TARGET ON) diff --git a/debian/patches/series b/debian/patches/series index deec55d43..38a9e7a4f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -0004-Make-root-bootstraps-to-system-path.patch -0005-Move-default-user-group-into-deb-patch.patch 0007-Pass-debian-version-as-GIT_VERSION.patch