keep it as close to upstream as possible

7 files changed, 16 insertions, 89 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 583cb3fe59b3..f371af623932 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = popura-git
 	pkgdesc = Popura ポプラ: alternative Yggdrasil network client
 	pkgver = 0.3.15+popura1
-	pkgrel = 6
+	pkgrel = 7
 	url = https://github.com/popura-network/Popura
 	arch = i686
 	arch = x86_64
@@ -13,19 +13,14 @@ pkgbase = popura-git
 	makedepends = go
 	depends = glibc
 	conflicts = popura
-	backup = etc/default/popura
+	conflicts = yggdrasil
+	conflicts = yggdrasil-git
+	conflicts = yggdrasil
+	conflicts = yggdrasil-openrc
 	source = popura::git+https://github.com/popura-network/Popura.git#commit=42941caaf13472f1ecc0c675ae6059a857f3e60a
 	source = popura.sysusers
-	source = popura-default-config.service
-	source = popura.service
-	source = popura.defaults
-	source = popura.apparmor
 	sha512sums = SKIP
 	sha512sums = af276973744e079e6892d8ecdf2027ea265a05908f624f82da35d5bcc77a91ddeb458c4c3d07341aae42f003189201d3989cce5f87e184e472c1a23112cfe554
-	sha512sums = 449da220d0e7f502268adb302a2672315e37dc0a08a7923727eec6eb9f49fdc803ac0240508e62920edd826c6d294cec238485edebb5250228fa35eb20e544fb
-	sha512sums = ab2d69471c6b9fb6ac85212057feda5159b74b88f0247e8af74e09092878cc75a112f0aad0d776df337ba348f521e1960c1ce1dbc6fe0ac50de96d1aea9e4a1a
-	sha512sums = 6a74ae04dc12987c246ad07bf04362e2b076939f3a91c9dff89dbbae9b443762b7dd39fb3aca46e028032fc4a3dd7910a9dfc9622e8c66d8e00862d6e9f5b9ce
-	sha512sums = 8912a0dcbd61d412303e584946e38a7d7771fee61202e2d70f693dbdbae2ea37b2a9d4f342c7b1c5c875c7fcd98225331aff4206ddc452d1feed45dbde21b382
 
 pkgname = popura-git
 
diff --git a/PKGBUILD b/PKGBUILD
index c62b231d5f54..0930be7ce204 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,27 +4,18 @@ pkgname=popura-git
 _pkgname="popura"
 pkgver=0.3.15+popura1
 _commit=42941caaf13472f1ecc0c675ae6059a857f3e60a
-pkgrel=6
+pkgrel=7
 pkgdesc="Popura ポプラ: alternative Yggdrasil network client"
 arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64')
 url="https://github.com/popura-network/Popura"
 license=('LGPLv3')
-conflicts=('popura')
+conflicts=('popura' 'yggdrasil' 'yggdrasil-git' 'yggdrasil' 'yggdrasil-openrc')
 depends=('glibc')
 makedepends=('git' 'go')
-backup=(etc/default/popura)
 source=("popura::git+https://github.com/popura-network/Popura.git#commit=${_commit}"
-	'popura.sysusers'
-	'popura-default-config.service'
-	'popura.service'
-        'popura.defaults'
-	'popura.apparmor')
+	'popura.sysusers')
 sha512sums=('SKIP'
-	'af276973744e079e6892d8ecdf2027ea265a05908f624f82da35d5bcc77a91ddeb458c4c3d07341aae42f003189201d3989cce5f87e184e472c1a23112cfe554'
-	'449da220d0e7f502268adb302a2672315e37dc0a08a7923727eec6eb9f49fdc803ac0240508e62920edd826c6d294cec238485edebb5250228fa35eb20e544fb'
-	'ab2d69471c6b9fb6ac85212057feda5159b74b88f0247e8af74e09092878cc75a112f0aad0d776df337ba348f521e1960c1ce1dbc6fe0ac50de96d1aea9e4a1a'
-	'6a74ae04dc12987c246ad07bf04362e2b076939f3a91c9dff89dbbae9b443762b7dd39fb3aca46e028032fc4a3dd7910a9dfc9622e8c66d8e00862d6e9f5b9ce'
-	'8912a0dcbd61d412303e584946e38a7d7771fee61202e2d70f693dbdbae2ea37b2a9d4f342c7b1c5c875c7fcd98225331aff4206ddc452d1feed45dbde21b382')
+	'b78d1f5efeeba184588ba7bdb2249d976aec160daa59742e032983da1aedad062d15c7c97cba3eba69412a0f7904ee123d98b58f859892d71188c25624295c32')
 
 build() {
 	cd "${srcdir}/${_pkgname}"
@@ -36,12 +27,12 @@ build() {
 
 package() {
 	cd "${srcdir}/${_pkgname}"
-	install -Dm755 "yggdrasil" "${pkgdir}/usr/bin/popura"
-	install -Dm755 "yggdrasilctl" "${pkgdir}/usr/bin/popuractl"
+	install -Dm755 "yggdrasil" "${pkgdir}/usr/bin/yggdrasil"
+	install -Dm755 "yggdrasilctl" "${pkgdir}/usr/bin/yggdrasilctl"
 	install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${_pkgname}"
 	install -Dm644 "${srcdir}/popura.sysusers" "${pkgdir}/usr/lib/sysusers.d/popura.conf"
-	install -Dm644 "${srcdir}/popura.service" -t "${pkgdir}/usr/lib/systemd/system"
-	install -Dm644 "${srcdir}/popura-default-config.service" -t "${pkgdir}/usr/lib/systemd/system"
-	install -Dm644 "${srcdir}/popura.defaults" "${pkgdir}/etc/default/popura"
-	install -Dm644 "${srcdir}/popura.apparmor" "${pkgdir}/etc/apparmor.d/usr.bin.popura"
+	install -Dm644 -t "${pkgdir}/usr/lib/systemd/system" \
+		contrib/systemd/yggdrasil.service \
+		contrib/systemd/yggdrasil-default-config.service
+	install -Dm644 "contrib/apparmor/usr.bin.yggdrasil" "${pkgdir}/etc/apparmor.d/usr.bin.yggdrasil"
 }
diff --git a/popura-default-config.service b/popura-default-config.service
deleted file mode 100644
index e9aad1432611..000000000000
--- a/popura-default-config.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=popura default config generator
-ConditionPathExists=|!/etc/popura.conf
-ConditionFileNotEmpty=|!/etc/popura.conf
-Wants=local-fs.target
-After=local-fs.target
-
-[Service]
-Type=oneshot
-Group=popura
-StandardOutput=file:/etc/popura.conf
-ExecStart=/usr/bin/popura -genconf
-ExecStartPost=/usr/bin/chmod 0640 /etc/popura.conf
diff --git a/popura.apparmor b/popura.apparmor
deleted file mode 100644
index ee386a741103..000000000000
--- a/popura.apparmor
+++ /dev/null
@@ -1,20 +0,0 @@
-# Last Modified: Thu Oct 29 19:43:48 2020
-include <tunables/global>
-
-# vim:syntax=apparmor
-# AppArmor policy for popura
-
-
-/usr/bin/popura {
-  include <abstractions/base>
-  include <abstractions/nameservice>
-
-  capability net_admin,
-
-  /sys/kernel/mm/transparent_hugepage/hpage_pmd_size r,
-  owner /dev/net/tun rw,
-  owner /etc/popura.conf r,
-  owner /proc/sys/net/core/somaxconn r,
-  owner /run/yggdrasil.sock w,
-
-}
diff --git a/popura.defaults b/popura.defaults
deleted file mode 100644
index 37d4b9044abd..000000000000
--- a/popura.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Here you could add additional options for popura
-#
-#popura_opts="-autopeer"
diff --git a/popura.service b/popura.service
deleted file mode 100644
index d5bd58bce883..000000000000
--- a/popura.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=popura
-Wants=network.target
-Wants=popura-default-config.service
-After=network.target
-After=popura-default-config.service
-
-[Service]
-Group=popura
-ProtectHome=true
-ProtectSystem=true
-SyslogIdentifier=popura
-CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW
-ExecStartPre=+-/sbin/modprobe tun
-ExecStart=/usr/bin/popura -useconffile /etc/popura.conf $popura_opts
-ExecReload=/bin/kill -HUP $MAINPID
-EnvironmentFile=-/etc/default/popura
-Restart=always
-TimeoutStopSec=5
-
-[Install]
-WantedBy=multi-user.target
diff --git a/popura.sysusers b/popura.sysusers
index 41d36aa6e147..42a86b0fa49c 100644
--- a/popura.sysusers
+++ b/popura.sysusers
@@ -1,2 +1,2 @@
 #Type Name      ID              GECOS                 Home directory Shell
-g     popura -               -
+g     yggdrasil -               -