pcap-dnsproxy-git 1:0.4.9.13.r0.g70a40bb-1.

6 files changed, 152 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 024200ac206a..edb66f4cf181 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,40 @@
-# Generated by mksrcinfo v8
-# Sat Dec 17 15:59:22 UTC 2016
 pkgbase = pcap-dnsproxy-git
 	pkgdesc = A local DNS server base on WinPcap and LibPcap.
-	pkgver = 0.4.8.2.0.g1c40e79
+	pkgver = 0.4.9.13.r0.g70a40bb
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/chengr28/Pcap_DNSProxy
 	install = pcap-dnsproxy.install
 	arch = x86_64
-	arch = i686
 	license = GPL2
 	makedepends = git
 	makedepends = cmake
-	makedepends = sh
 	makedepends = m4
 	makedepends = bison
 	makedepends = flex
 	makedepends = gcc
+	depends = libevent>=2.1.8
 	depends = libpcap
-	depends = libsodium
+	depends = libsodium>=1.0.16
+	depends = openssl>=1.0.2
 	provides = pcap-dnsproxy
+	provides = pcap-dnsproxy-bin
 	conflicts = pcap-dnsproxy
-	source = pcap-dnsproxy-git::git://github.com/chengr28/Pcap_DNSProxy.git
-	source = pcap-dnsproxy.service
+	conflicts = pcap-dnsproxy-bin
+	backup = etc/systemd/system/Pcap_DNSProxy.service
+	backup = etc/pcap-dnsproxy/Config.conf
+	backup = etc/pcap-dnsproxy/Hosts.conf
+	backup = etc/pcap-dnsproxy/IPFilter.conf
+	backup = etc/pcap-dnsproxy/Routing.txt
+	backup = etc/pcap-dnsproxy/WhiteList.txt
+	source = pcap-dnsproxy::git+git://github.com/chengr28/Pcap_DNSProxy.git
+	source = pcap-dnsproxy.install
+	source = make.patch
+	source = service.patch
 	md5sums = SKIP
-	md5sums = 29af12cdfedf4353406c4a0bb2ed8dc5
+	md5sums = e990e642a0aac24c8f2d68d60b65b314
+	md5sums = 7d59b750c7375bb77bcb2b6fae326e3b
+	md5sums = abe842d6182ec4be0cc5130433146129
 
 pkgname = pcap-dnsproxy-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 3549890575ba..a440945cc4db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,111 @@
-# Maintainer: wenLiangcan <boxeed at gmail dot com>
+# Maintainer: Darren Wu <$(base64 --decode <<<'ZGFycmVuMTk5NzA4MTBAZ21haWwuY29tCg==')>
+# Contributor: wenLiangcan <boxeed at gmail dot com>
 
-_pkgname=pcap-dnsproxy
-pkgname="${_pkgname}-git"
-pkgver=0.4.8.2.0.g1c40e79
+pkgname="pcap-dnsproxy-git"
+pkgver=0.4.9.13.r0.g70a40bb
 pkgrel=1
-epoch=1
+epoch=1 # default value if left unspecified is 0
 pkgdesc="A local DNS server base on WinPcap and LibPcap."
-arch=('x86_64' 'i686')
+arch=('x86_64') # 'i686' untested
 url="https://github.com/chengr28/Pcap_DNSProxy"
 license=('GPL2')
-depends=('libpcap' 'libsodium')
-makedepends=('git' 'cmake' 'sh' 'm4' 'bison' 'flex' 'gcc')
-provides=("${_pkgname}")
-conflicts=("${_pkgname}")
-source=("${pkgname}"::'git://github.com/chengr28/Pcap_DNSProxy.git'
-        "${_pkgname}.service")
-install="${_pkgname}.install"
-md5sums=('SKIP'
-         '29af12cdfedf4353406c4a0bb2ed8dc5')
+depends=(
+  'libevent>=2.1.8'
+  'libpcap'
+  'libsodium>=1.0.16'
+  'openssl>=1.0.2'
+)
+makedepends=('git' 'cmake' 'm4' 'bison' 'flex' 'gcc')
+provides=("${pkgname%-git}" "${pkgname%-git}-bin")
+conflicts=("${pkgname%-git}" "${pkgname%-git}-bin")
+backup=(
+  "etc/systemd/system/Pcap_DNSProxy.service"
+  "etc/${pkgname%-git}/Config.conf"
+  "etc/${pkgname%-git}/Hosts.conf"
+  "etc/${pkgname%-git}/IPFilter.conf"
+  "etc/${pkgname%-git}/Routing.txt"
+  "etc/${pkgname%-git}/WhiteList.txt"
+)
+install="${pkgname%-git}.install"
+source=(
+  "${pkgname%-git}::git+git://github.com/chengr28/Pcap_DNSProxy.git"
+  "${pkgname%-git}.install"
+  "make.patch"
+  "service.patch"
+)
+md5sums=(
+  'SKIP'
+  'e990e642a0aac24c8f2d68d60b65b314'
+  '7d59b750c7375bb77bcb2b6fae326e3b'
+  'abe842d6182ec4be0cc5130433146129'
+)
 
 pkgver() {
-    cd "${srcdir}/${pkgname}"
-    git describe --tags --long | sed 's/^v//;s/release./r/;s/-/./g'
+  cd "${srcdir}/${pkgname%-git}"
+  # cutting off 'v' prefix that presents in the git tag
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+
+  cd "${srcdir}/${pkgname%-git}"
+
+  patch --verbose Source/Auxiliary/Scripts/CMake_Build.sh "${srcdir}/make.patch"
+  patch --verbose Source/Auxiliary/ExampleConfig/Pcap_DNSProxy.service "${srcdir}/service.patch"
+
+  find . \
+    \( \
+      -name '*.zh-Hans.*' -o \
+      -name '*.zh-Hant.*' -o \
+      -name '*.SysV.*' -o \
+      -name 'PcapDNSProxyService' -o \
+      -name 'Linux_Install.Systemd.sh' -o \
+      -name 'Linux_Uninstall.Systemd.sh' -o \
+      \( \
+        \( \
+          -name '*.sln' -o \
+          -name '*.vcxproj*' -o \
+          -name '*.xcodeproj' -o \
+          -name '*macOS*' -o \
+          -name '*Windows*' \
+        \) -a -not -iname '*linux*' \
+      \) \
+    \) \
+    -prune -exec rm -rfv {} \;
+
+  mv -v README.md Documents/
 }
 
 build() {
-    cd "${srcdir}/${pkgname}/Source/Auxiliary/Scripts"
-    sh ./CMake_Build.sh
+  cd "${srcdir}/${pkgname%-git}/Source/Auxiliary/Scripts"
+  chmod +x CMake_Build.sh
+  time ./CMake_Build.sh
 }
 
 package() {
-    cd "${srcdir}/${pkgname}/Source/Release"
 
-    install -Dm777 "Pcap_DNSProxy" "${pkgdir}/usr/share/${_pkgname}/Pcap_DNSProxy"
+  cd "${srcdir}/${pkgname%-git}/Source/Release"
 
-    install -Dm644 ./{*.conf,*.txt} "${pkgdir}/usr/share/${_pkgname}/"
-    install -dm755 "${pkgdir}/etc/${_pkgname}/"
-    ln -s "/usr/share/${_pkgname}/Config.conf" "${pkgdir}/etc/${_pkgname}/Config.conf"
-    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}/WhiteList.txt" "${pkgdir}/etc/${_pkgname}/WhiteList.txt"
+  install -dm755 "${pkgdir}/usr/share/doc/${pkgname%-git}"
+  install -Dm644 "${srcdir}/${pkgname%-git}/Documents"/* "${pkgdir}/usr/share/doc/${pkgname%-git}/"
 
-    install -Dm644 "${srcdir}/${_pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service"
+  install -dm755  "${pkgdir}/etc/systemd/system"
+  install -Dm644 Pcap_DNSProxy.service "${pkgdir}/etc/systemd/system/"
 
-    cd "${srcdir}/${pkgname}/Documents"
-    find . -type f -exec install -Dm644 {} \
-        "${pkgdir}/usr/share/doc/${_pkgname}/{}" \;
+  install -dm755 "${pkgdir}/usr/bin/"
+  install -Dm755 \
+    Pcap_DNSProxy \
+    Tools/Update_Routing.sh \
+    Tools/Update_WhiteList.sh \
+    "${pkgdir}/usr/bin/"
 
-    install -Dm644 "${srcdir}/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-}
+  install -dm755 "$pkgdir/etc/${pkgname%-git}/"
+  install -Dm644 \
+    Config.conf \
+    Hosts.conf \
+    IPFilter.conf \
+    Routing.txt \
+    WhiteList.txt \
+    "$pkgdir/etc/${pkgname%-git}/"
 
+}
\ No newline at end of file
diff --git a/make.patch b/make.patch
new file mode 100644
index 000000000000..05a6f185fc73
--- /dev/null
+++ b/make.patch
@@ -0,0 +1,18 @@
+diff --git a/Source/Auxiliary/Scripts/CMake_Build.sh b/Source/Auxiliary/Scripts/CMake_Build.sh
+old mode 100644
+new mode 100755
+index 71d993b..a3262c3
+--- a/Source/Auxiliary/Scripts/CMake_Build.sh
++++ b/Source/Auxiliary/Scripts/CMake_Build.sh
+@@ -49,8 +49,10 @@ if (echo "$*" | grep -iq -e "--enable-static"); then
+ 	CMakeShell="${CMakeShell}-DSTATIC_LIB=ON "
+ fi
+ CMakeShell="${CMakeShell}../Pcap_DNSProxy"
++echo ${CMakeShell}
++echo $MAKEFLAGS
+ ${CMakeShell}
+-make -j ${ThreadNum}
++make
+ cd ..
+ 
+ # Cleanup
diff --git a/pcap-dnsproxy.install b/pcap-dnsproxy.install
index e7e874b45639..054b7c9aa95d 100644
--- a/pcap-dnsproxy.install
+++ b/pcap-dnsproxy.install
@@ -1,3 +1,3 @@
 pre_remove() {
-    rm -f /usr/share/pcap-dnsproxy/Error.log
-}
+  rm -f /etc/pcap-dnsproxy/Error.log
+}
\ No newline at end of file
diff --git a/pcap-dnsproxy.service b/pcap-dnsproxy.service
deleted file mode 100644
index 291b4644a830..000000000000
--- a/pcap-dnsproxy.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-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=10
-
-[Install]
-WantedBy=multi-user.target
diff --git a/service.patch b/service.patch
new file mode 100644
index 000000000000..1b172fbae620
--- /dev/null
+++ b/service.patch
@@ -0,0 +1,21 @@
+diff --git a/Source/Auxiliary/ExampleConfig/Pcap_DNSProxy.service b/Source/Auxiliary/ExampleConfig/Pcap_DNSProxy.service
+index 4cd0da5..6e237b4 100644
+--- a/Source/Auxiliary/ExampleConfig/Pcap_DNSProxy.service
++++ b/Source/Auxiliary/ExampleConfig/Pcap_DNSProxy.service
+@@ -23,13 +23,14 @@ Description=Pcap_DNSProxy, a local DNS server based on WinPcap and LibPcap
+ Wants=network-online.target
+ 
+ [Service]
+-ExecStart=
++ExecStart=/usr/bin/Pcap_DNSProxy --log-file stdout --config-path /etc/pcap-dnsproxy
+ GuessMainPID=yes
+ LimitNOFILE=10240
+ Restart=on-failure
+ RestartSec=15s
+ Type=forking
+-WorkingDirectory=
++WorkingDirectory=/usr/bin
++User=root
+ 
+ [Install]
+ WantedBy=multi-user.target