pcap-dnsproxy-git 20150927-1.

3 files changed, 22 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2185c884ed6c..fa5bf7b4886c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,18 @@
 pkgbase = pcap-dnsproxy-git
 	pkgdesc = A local DNS server base on WinPcap and LibPcap.
-	pkgver = 20150505
-	pkgrel = 2
+	pkgver = 20150927
+	pkgrel = 1
 	url = https://github.com/chengr28/Pcap_DNSProxy
 	install = pcap-dnsproxy.install
 	arch = any
-	license = GPL v2
+	license = GPL2
 	makedepends = git
-	makedepends = make
+	makedepends = cmake
 	makedepends = sh
+	makedepends = m4
+	makedepends = bison
+	makedepends = flex
+	makedepends = gcc
 	depends = libpcap
 	depends = libsodium
 	provides = pcap-dnsproxy
@@ -16,7 +20,7 @@ pkgbase = pcap-dnsproxy-git
 	source = pcap-dnsproxy-git::git://github.com/chengr28/Pcap_DNSProxy.git
 	source = pcap-dnsproxy.service
 	md5sums = SKIP
-	md5sums = 1d7b33ef0552aee4a96f0291e1f67a07
+	md5sums = 29af12cdfedf4353406c4a0bb2ed8dc5
 
 pkgname = pcap-dnsproxy-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 981986df0e28..08b48b51710d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,21 @@
 
 pkgname=pcap-dnsproxy-git
 _pkgname=pcap-dnsproxy
-pkgver=20150505
-pkgrel=2
+pkgver=20150927
+pkgrel=1
 pkgdesc="A local DNS server base on WinPcap and LibPcap."
 arch=("any")
 url="https://github.com/chengr28/Pcap_DNSProxy"
-license=('GPL v2')
+license=('GPL2')
 depends=('libpcap' 'libsodium')
-makedepends=('git' 'make' 'sh')
+makedepends=('git' 'cmake' 'sh' 'm4' 'bison' 'flex' 'gcc')
 provides=('pcap-dnsproxy')
 conflicts=('pcap-dnsproxy')
 source=("${pkgname}"::'git://github.com/chengr28/Pcap_DNSProxy.git'
         "${_pkgname}.service")
 install="${_pkgname}.install"
 md5sums=('SKIP'
-         '1d7b33ef0552aee4a96f0291e1f67a07')
+         '29af12cdfedf4353406c4a0bb2ed8dc5')
 
 pkgver() {
     cd "${srcdir}/${pkgname}"
@@ -24,12 +24,13 @@ pkgver() {
 }
 
 build() {
-    cd "${srcdir}/${pkgname}/Source"
-    sh ./Build_Linux.sh
+    cd "${srcdir}/${pkgname}/Source/Scripts"
+    sh ./Linux_Build.sh
 }
 
 package() {
     cd "${srcdir}/${pkgname}/Source/Release"
+
     install -Dm777 "Pcap_DNSProxy" "${pkgdir}/usr/share/${_pkgname}/Pcap_DNSProxy"
     install -Dm777 "KeyPairGenerator" "${pkgdir}/usr/share/${_pkgname}/KeyPairGenerator"
 
@@ -39,7 +40,7 @@ package() {
     ln -s "/usr/share/${_pkgname}/Hosts.conf" "${pkgdir}/etc/${_pkgname}/Hosts.conf"
     ln -s "/usr/share/${_pkgname}/IPFilter.conf" "${pkgdir}/etc/${_pkgname}/IPFilter.conf"
     ln -s "/usr/share/${_pkgname}/Routing.txt" "${pkgdir}/etc/${_pkgname}/Routing.txt"
-    ln -s "/usr/share/${_pkgname}/White_List.txt" "${pkgdir}/etc/${_pkgname}/White_List.txt"
+    ln -s "/usr/share/${_pkgname}/WhiteList.txt" "${pkgdir}/etc/${_pkgname}/WhiteList.txt"
 
     install -Dm644 "${srcdir}/${_pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service"
 
diff --git a/pcap-dnsproxy.service b/pcap-dnsproxy.service
index 71e7036678d7..291b4644a830 100644
--- a/pcap-dnsproxy.service
+++ b/pcap-dnsproxy.service
@@ -1,14 +1,16 @@
 [Unit]
-Description=Pcap_DNSProxy Service
+Description=A local DNS server based on WinPcap and LibPcap
 After=network.target
+Wants=network-online.target
 
 [Service]
 Type=forking
 User=root
 WorkingDirectory=/usr/share/pcap-dnsproxy
 ExecStart=/usr/share/pcap-dnsproxy/Pcap_DNSProxy
+GuessMainPID=yes
 Restart=on-failure
-RestartSec=3
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target