summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--dnsmasq.main10
3 files changed, 3 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 827bc839adcc..898677b5daed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,15 +16,13 @@ pkgbase = pi-hole-standalone
backup = etc/dnsmasq.d/01-pihole.conf
source = https://github.com/pi-hole/pi-hole/archive/v4.3.1.tar.gz
source = https://raw.githubusercontent.com/max72bra/pi-hole-standalone-archlinux-customization/master/arch-server-core-4.3.1.patch
- source = dnsmasq.main
source = dnsmasq.include
source = pi-hole-gravity.service
source = pi-hole-gravity.timer
source = mimic_setupVars.conf.sh
source = piholeDebug.sh
md5sums = 3973f2a9d7fcd6ea10265feaa397f108
- md5sums = 9a07ec70243c20ed5127a9b140cdccff
- md5sums = 91a3f21bb0a7d429cce2b8d7551e99da
+ md5sums = 3cd7bd0ec53825b609c2ba138a089f6f
md5sums = 50d29442a7b185f0d05bc2ed72f875be
md5sums = 047f13d4ac97877f724f87b002aaee63
md5sums = d42a864f88299998f8233c0bc0dd093d
diff --git a/PKGBUILD b/PKGBUILD
index f82c8639f898..2436fa42d8cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,6 @@ backup=('etc/pihole/whitelist.txt' 'etc/pihole/blacklist.txt'
source=(https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz
"https://raw.githubusercontent.com/max72bra/pi-hole-standalone-archlinux-customization/master/arch-server-core-$pkgver.patch"
- dnsmasq.main
dnsmasq.include
$_pkgname-gravity.service
$_pkgname-gravity.timer
@@ -24,8 +23,7 @@ source=(https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz
piholeDebug.sh)
md5sums=('3973f2a9d7fcd6ea10265feaa397f108'
- '9a07ec70243c20ed5127a9b140cdccff'
- '91a3f21bb0a7d429cce2b8d7551e99da'
+ '3cd7bd0ec53825b609c2ba138a089f6f'
'50d29442a7b185f0d05bc2ed72f875be'
'047f13d4ac97877f724f87b002aaee63'
'd42a864f88299998f8233c0bc0dd093d'
@@ -62,7 +60,7 @@ package() {
install -Dm644 $_pkgname-$pkgver/adlists.list "$pkgdir"/etc/pihole/adlists.list
install -Dm644 /dev/null "$pkgdir"/etc/pihole/whitelist.txt
install -Dm644 /dev/null "$pkgdir"/etc/pihole/blacklist.txt
- install -Dm644 dnsmasq.main "$pkgdir"/usr/share/pihole/configs/dnsmasq.example.conf
+ install -Dm644 $_pkgname-$pkgver/advanced/dnsmasq.conf.original "$pkgdir"/etc/dnsmasq.conf
install -Dm644 dnsmasq.include "$pkgdir"/etc/dnsmasq.d/01-pihole.conf
install -dm755 "$pkgdir"/usr/share/licenses/pihole
install -Dm644 ${pkgname%-*}-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/pihole/Pi-hole
diff --git a/dnsmasq.main b/dnsmasq.main
deleted file mode 100644
index 43de3370d896..000000000000
--- a/dnsmasq.main
+++ /dev/null
@@ -1,10 +0,0 @@
-# If you want dnsmasq to listen for DHCP and DNS requests only on
-# specified interfaces (and the loopback) give the name of the
-# interface (eg eth0) here.
-#interface=eth0
-# Or which to listen on by address (remember to include 127.0.0.1 if
-# you use this.)
-listen-address=127.0.0.1
-
-# Include all files in a directory which end in .conf
-conf-dir=/etc/dnsmasq.d/,*.conf