bump version

5 files changed, 16 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9d8122de99d1..d787eb062da1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = oomd
 	pkgdesc = A userspace out-of-memory killer.
-	pkgver = 0.2.0
-	pkgrel = 7
+	pkgver = 0.3.2
+	pkgrel = 1
 	url = https://github.com/facebookincubator/oomd
 	install = oomd.install
 	arch = x86_64
@@ -14,13 +14,9 @@ pkgbase = oomd
 	optdepends = systemd-libs
 	provides = oomd
 	conflicts = oomd-git
-	backup = etc/oomd.json
-	source = https://github.com/facebookincubator/oomd/archive/v0.2.0.tar.gz
-	source = oomd.service
-	source = oomd.default
-	sha512sums = f6ce5483d96ca54558642ec60ce28b6f5ad63460c3af2cda17fdbdea125bc31236a2468db7125077d2a68ca951a21b1ad853e31869fe957ab261b5ec55e7992c
-	sha512sums = 0515f2ec37c654830e7b14ac1fd721eda4932e152502e454e06df5ab01aab1a1d15423c1bc8d593412cd7616a441d46dc1b05564f79b157045fd69c0555da20b
-	sha512sums = 1db7c71b1b1d21ba5ebe10add5b1b37c6df2169f24938f91170833eddb40e7acf58726cb01e528f340d66ada18b557b26f9c07b542a253d15f04c440e7cd1eb8
+	backup = etc/oomd/oomd.json
+	source = oomd-0.3.2.tar.gz::https://github.com/facebookincubator/oomd/archive/v0.3.2.tar.gz
+	sha512sums = 42187233ad4b10feeb9666b56e0fa3fbb04dda824184b60eb6f69052913b44127331da8901e1ef5e2c723989f5f1ccd4c28f3ffdae3f02e359cc4e6d288b5fe3
 
 pkgname = oomd
 
diff --git a/PKGBUILD b/PKGBUILD
index 20bb45f8db0f..abeb35152161 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Previous Maintainer: Julien Nicoulaud <julien dot nicoulaud at gmail dot com>
 
 pkgname=oomd
-pkgver=0.2.0
-pkgrel=7
+pkgver=0.3.2
+pkgrel=1
 pkgdesc='A userspace out-of-memory killer.'
 arch=('x86_64')
 url='https://github.com/facebookincubator/oomd'
@@ -15,24 +15,19 @@ checkdepends=('gtest' 'gmock')
 install="${pkgname}.install"
 provides=("${pkgname}")
 conflicts=("${pkgname}-git")
-backup=("etc/${pkgname}.json")
-source=("https://github.com/facebookincubator/${pkgname}/archive/v${pkgver}.tar.gz"
-        "${pkgname}.service"
-        "${pkgname}.default")
-sha512sums=('f6ce5483d96ca54558642ec60ce28b6f5ad63460c3af2cda17fdbdea125bc31236a2468db7125077d2a68ca951a21b1ad853e31869fe957ab261b5ec55e7992c'
-            '0515f2ec37c654830e7b14ac1fd721eda4932e152502e454e06df5ab01aab1a1d15423c1bc8d593412cd7616a441d46dc1b05564f79b157045fd69c0555da20b'
-            '1db7c71b1b1d21ba5ebe10add5b1b37c6df2169f24938f91170833eddb40e7acf58726cb01e528f340d66ada18b557b26f9c07b542a253d15f04c440e7cd1eb8')
+backup=("etc/${pkgname}/${pkgname}.json")
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/facebookincubator/${pkgname}/archive/v${pkgver}.tar.gz")
+sha512sums=('42187233ad4b10feeb9666b56e0fa3fbb04dda824184b60eb6f69052913b44127331da8901e1ef5e2c723989f5f1ccd4c28f3ffdae3f02e359cc4e6d288b5fe3')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   # build system expects the directory to be named "oomd"
   ln -sfT "${pkgname}-${pkgver}" "${srcdir}/${pkgname}"
 }
 
 build() {
   cd "${srcdir}/${pkgname}"
-  meson --prefix "${pkgdir}/usr" build && ninja -C build
+  meson build --prefix=/usr && ninja -C build
 }
 
 check() {
@@ -42,8 +37,6 @@ check() {
 
 package() {
   cd "${srcdir}/${pkgname}"
-  ninja -C build install
-  install -Dm644 "build/${pkgname}.json"        "${pkgdir}/etc/${pkgname}.json"
-  install -Dm644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
-  install -Dm644 "${srcdir}/${pkgname}.default" "${pkgdir}/etc/default/${pkgname}"
+  DESTDIR="${pkgdir}" ninja -C build install
 }
+
diff --git a/oomd.default b/oomd.default
deleted file mode 100644
index d25d8b3bdfcd..000000000000
--- a/oomd.default
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file (default: /etc/oomd.json)
-OOMD_CONFIG=/etc/oomd.json
-
-# Event loop polling interval (default: 5)
-OOMD_INTERVAL=5
diff --git a/oomd.install b/oomd.install
index c2e316b9955a..aae160884ac5 100644
--- a/oomd.install
+++ b/oomd.install
@@ -1,10 +1,11 @@
 post_install() {
     cat << EOF
-==> An example oomd configuration has been deployed to /etc/oomd.json, please modify it according to your needs.
-==> A systemd service is also available, it can be configured in /etc/default/oomd and started with:
+==> An example oomd configuration has been deployed to /etc/oomd/oomd.json, please modify it according to your needs.
+==> A systemd service is also available, it can be started with:
 ==>     $ sudo systemctl start oomd
 ==> ATTETION: add systemd.unified_cgroup_hierarchy=1 to your kernel cmdline for oomd to work correctly.
 ==> reference: https://github.com/facebookincubator/oomd/issues/67#issuecomment-524315033
 ==> Meanwhile, runc and other container runtimes may depend on cgroups v1 and need manual interventions to function.
 EOF
 }
+
diff --git a/oomd.service b/oomd.service
deleted file mode 100644
index 5eaeeec480fe..000000000000
--- a/oomd.service
+++ /dev/null
@@ -1,39 +0,0 @@
-[Unit]
-Description=userspace out-of-memory killer
-AssertDirectoryNotEmpty=/proc/pressure
-
-[Service]
-Type=simple
-Restart=always
-SyslogIdentifier=oomd
-MemoryLow=64M
-
-Environment=OOMD_CONFIG=/etc/oomd.json
-Environment=OOMD_INTERVAL=5
-EnvironmentFile=-/etc/default/oomd
-
-ExecStartPre=/usr/bin/oomd --check-config ${OOMD_CONFIG}
-ExecStart=/usr/bin/oomd --config ${OOMD_CONFIG} --interval ${OOMD_INTERVAL}
-
-CapabilityBoundingSet=
-NoNewPrivileges=yes
-DevicePolicy=closed
-DeviceAllow=/dev/kmsg
-ProtectHome=yes
-ProtectControlGroups=yes
-ProtectKernelModules=yes
-ProtectKernelTunables=yes
-RestrictAddressFamilies=AF_UNIX
-RestrictRealtime=yes
-RestrictNamespaces=yes
-MemoryDenyWriteExecute=yes
-LockPersonality=true
-SystemCallArchitectures=native
-SystemCallFilter=@system-service
-
-# See https://aur.archlinux.org/packages/oomd/#comment-711090
-# PrivateTmp=yes
-# ProtectSystem=strict
-
-[Install]
-WantedBy=multi-user.target