summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD17
-rw-r--r--smartdns.patch24
3 files changed, 7 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2e9f79427fed..631314686746 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = smartdns-git
pkgdesc = Local DNS server that accepts DNS query requests from local clients, obtains DNS query results from multiple upstream DNS servers, and returns the fastest access results to clients.
- pkgver = r288.d6c3465
+ pkgver = r319.3ad7cd7
pkgrel = 1
url = https://github.com/pymumu/smartdns
arch = x86_64
@@ -11,9 +11,7 @@ pkgbase = smartdns-git
conflicts = smartdns
backup = etc/smartdns/smartdns.conf
source = smartdns::git+https://github.com/pymumu/smartdns.git
- source = smartdns.patch
md5sums = SKIP
- md5sums = 2481e2bdb5bf5c140107fef66f13151f
pkgname = smartdns-git
diff --git a/PKGBUILD b/PKGBUILD
index af51feedfeba..d6968aa09241 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,27 @@
# Maintainer: zlowly <zlowly@gmail.com>
pkgname=smartdns-git
_pkgname=${pkgname%-git}
-pkgver=r288.d6c3465
+pkgver=r319.3ad7cd7
pkgrel=1
pkgdesc="Local DNS server that accepts DNS query requests from local clients, obtains DNS query results from multiple upstream DNS servers, and returns the fastest access results to clients."
arch=("x86_64")
url="https://github.com/pymumu/smartdns"
license=("GPL3")
-depends=('openssl-1.0')
+depends=('openssl')
makedepends=('git')
provides=("${_pkgname}")
conflicts=("${_pkgname}")
-source=("smartdns::git+https://github.com/pymumu/smartdns.git" "${_pkgname}.patch")
+source=("smartdns::git+https://github.com/pymumu/smartdns.git")
backup=("etc/smartdns/smartdns.conf")
-md5sums=('SKIP'
- '2481e2bdb5bf5c140107fef66f13151f')
+md5sums=('SKIP')
pkgver() {
cd "$srcdir/${_pkgname}"
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
-prepare() {
- cd "$srcdir"
- patch -p1 "${_pkgname}/systemd/smartdns.service" < "${_pkgname}.patch"
-}
build() {
cd "$srcdir/${_pkgname}"
- make -C ./src clean
- make -C ./src all VER=$pkgver
+ make clean
+ make VER=$pkgver SBINDIR=/usr/bin RUNSTATEDIR=/run
}
package() {
cd "$srcdir/${_pkgname}"
diff --git a/smartdns.patch b/smartdns.patch
deleted file mode 100644
index bc511092ff92..000000000000
--- a/smartdns.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- smartdns.service.old 2019-09-24 10:41:44.487335094 +0800
-+++ smartdns.service.new 2019-09-24 10:44:43.832401460 +0800
-@@ -1,17 +1,17 @@
- [Unit]
- Description=smart dns server
- After=network.target
-+StartLimitBurst=0
-+StartLimitIntervalSec=60
-
- [Service]
- Type=forking
--PIDFile=/var/run/smartdns.pid
-+PIDFile=/run/smartdns.pid
- EnvironmentFile=/etc/default/smartdns
--ExecStart=/usr/sbin/smartdns $SMART_DNS_OPTS
-+ExecStart=/usr/bin/smartdns $SMART_DNS_OPTS
- KillMode=process
- Restart=always
- RestartSec=2
--StartLimitBurst=0
--StartLimitIntervalSec=60
-
- [Install]
- WantedBy=multi-user.target