summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD14
-rw-r--r--denariusd.service8
-rw-r--r--util-patch.diff12
4 files changed, 5 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5fe561e9fb3d..5f0c0bb40832 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,10 +15,8 @@ pkgbase = denarius-git
provides = denarius
conflicts = denarius
source = git+https://github.com/carsenk/denarius.git
- source = util-patch.diff
source = denariusd.service
sha512sums = SKIP
- sha512sums = c7a121b537bf612cf7e99b5bae4f8fdab1ef86c22a632e2068ddd8956d78e09e3271c80409bc62bfce9f1601023a4d91387d80094b391ebf4a10198b2e8a2d43
- sha512sums = 0bbdf08df9f7cd15cebd01df55415ebe9ee35034e81e3cf18a2f9754c9709d1efd347bfa0a5f0badde73d4d79df43c642ee018af025ab9069e804ab8007043e2
+ sha512sums = 7918404e8108892a77243c7cb70b5ff1f902f1ed5454c528a0625d14eaa08e479745e7112489770061ab5e3c0bbf19f1575bd641cb6280314e47f0d037ecc07f
pkgname = denarius-git
diff --git a/PKGBUILD b/PKGBUILD
index 113d4c025ad8..d284cdf507a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,28 +13,20 @@ provides=("${pkgname%-git}")
conflicts=("${pkgname%-git}")
source=(
'git+https://github.com/carsenk/denarius.git'
- 'util-patch.diff'
'denariusd.service'
)
-sha512sums=('SKIP'
- 'c7a121b537bf612cf7e99b5bae4f8fdab1ef86c22a632e2068ddd8956d78e09e3271c80409bc62bfce9f1601023a4d91387d80094b391ebf4a10198b2e8a2d43'
- '0bbdf08df9f7cd15cebd01df55415ebe9ee35034e81e3cf18a2f9754c9709d1efd347bfa0a5f0badde73d4d79df43c642ee018af025ab9069e804ab8007043e2')
+sha512sums=('SKIP'
+ '7918404e8108892a77243c7cb70b5ff1f902f1ed5454c528a0625d14eaa08e479745e7112489770061ab5e3c0bbf19f1575bd641cb6280314e47f0d037ecc07f')
pkgver() {
cd "${pkgname%-git}"
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
-prepare() {
- cd "${srcdir}/${pkgname%-git}"
-
- # put config files in ~/.config/denarius instead of ~/.denarius
- patch -uN src/util.cpp ../util-patch.diff
-}
build() {
cd "$srcdir/${pkgname%-git}/src"
- OPENSSL_LIB_PATH=/usr/lib/openssl-1.0 OPENSSL_INCLUDE_PATH=/usr/include/openssl-1.0 make "USE_NATIVETOR=-" -f makefile.unix
+ OPENSSL_LIB_PATH=/usr/lib/openssl-1.0 OPENSSL_INCLUDE_PATH=/usr/include/openssl-1.0 make "USE_NATIVETOR=-" -f makefile.unix -j7
}
package() {
diff --git a/denariusd.service b/denariusd.service
index 8afb73d6004d..cb8c9993f6f5 100644
--- a/denariusd.service
+++ b/denariusd.service
@@ -7,13 +7,7 @@ After=network.target
ProtectHome=true
ProtectSystem=true
SyslogIdentifier=denariusd
-ExecStartPre=/bin/sh -ec "if ! test -s /var/lib/denarius/denarius.conf; \
- then umask 0077; \
- /usr/bin/mkdir -p /var/lib/denarius ; \
- /usr/bin/denariusd -port=0 -conf=/dev/null 2>&1 | grep -A 1 rpcuser > /var/lib/denarius/denarius.conf; \
- echo 'WARNING: A new /var/lib/denarius/denarius.conf file has been generated.'; \
- fi"
-ExecStart=/usr/bin/denariusd -datadir=/var/lib/denarius
+ExecStart=/usr/bin/denariusd
[Install]
WantedBy=multi-user.target
diff --git a/util-patch.diff b/util-patch.diff
deleted file mode 100644
index de96d41d622c..000000000000
--- a/util-patch.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- util.cpp.old 2017-07-03 00:46:57.899433567 -0600
-+++ util.cpp 2017-07-03 00:46:48.212744966 -0600
-@@ -1010,7 +1010,8 @@
- return pathRet / "Denarius";
- #else
- // Unix
-- return pathRet / ".denarius";
-+ fs::create_directory(pathRet / ".config");
-+ return pathRet / ".config/denarius";
- #endif
- #endif
- }