updpkg: Version 1.2

4 files changed, 55 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61d23f2e476e..cb3b00b7f06c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,22 @@
 # Generated by mksrcinfo v8
-# Mon Oct 24 00:33:51 UTC 2016
+# Mon Jan  9 15:08:08 UTC 2017
 pkgbase = memlockd
 	pkgdesc = A daemon that locks files into memory. It is meant to increase the chances of recovery from paging issues.
-	pkgver = 1.1
-	pkgrel = 6
+	pkgver = 1.2
+	pkgrel = 1
 	url = https://doc.coker.com.au/projects/memlockd/
 	install = memlockd.install
 	arch = i686
 	arch = x86_64
 	license = GPL
+	depends = glibc
 	backup = etc/memlockd.cfg
-	source = memlockd-1.1.tar.gz::https://www.coker.com.au/memlockd/memlockd_1.1.tar.gz
+	source = memlockd-1.2.tar.gz::https://www.coker.com.au/memlockd/memlockd_1.2.tar.gz
 	source = memlockd-sysusers.conf
-	source = memlockd-1.1.patch
-	sha512sums = 0f7a61dcf82d58f518d631f979f876e62f952ff80507a6dc1369b88e6a4d99aa94d48b1d54fcc3b02860239f189fa1d83a8a595b1b5a1bc9b5c051c5c0217784
+	source = memlockd-1.2.patch
+	sha512sums = 96879aca7dbc07f84f0eb3c022beecae27106dc2c15c239f0120d13cd868840dccb9aaef0bed74bb8987246ba3f802197f7dc712298b8688e85a07b44d6d04a3
 	sha512sums = 609fb89887a7d7cdc7a0aeae21dee54618162479ac6696d70e47e11213be6d678eba0963dc8b867a956e792c4f116e9d9ce57e7c9dcdbf126d7b0d6311dce35a
-	sha512sums = 39f694f740cafa4a2b314124c7fa6ebb5334c81130b2c5c7b7044637d6590b1d1df43de6d2e961edc295c7f3f41051795765a320d83a551b366d769e7379fd3f
+	sha512sums = 27da225c383a6e9067d76485319ec4350c6308a4190cc43747c552284151cdb92fc1cd74e6da0cd1a6ddb6dddd1ed12d11103ebf645d330074cac3e7d8866b2c
 
 pkgname = memlockd
 
diff --git a/PKGBUILD b/PKGBUILD
index cd6d15b88423..c2a0a8c41a05 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,21 @@
 # Maintainer: Giancarlo Razzolini <grazzolini@gmail.com>
 pkgname=memlockd
-pkgver=1.1
-pkgrel=6
+pkgver=1.2
+pkgrel=1
 pkgdesc="A daemon that locks files into memory. It is meant to increase the chances of recovery from paging issues."
 arch=('i686' 'x86_64')
 url="https://doc.coker.com.au/projects/memlockd/"
 license=('GPL')
+depends=('glibc')
 backup=(etc/memlockd.cfg)
 install=memlockd.install
 changelog=
 source=($pkgname-$pkgver.tar.gz::https://www.coker.com.au/$pkgname/$pkgname\_$pkgver.tar.gz
         memlockd-sysusers.conf
         $pkgname-$pkgver.patch)
-sha512sums=('0f7a61dcf82d58f518d631f979f876e62f952ff80507a6dc1369b88e6a4d99aa94d48b1d54fcc3b02860239f189fa1d83a8a595b1b5a1bc9b5c051c5c0217784'
+sha512sums=('96879aca7dbc07f84f0eb3c022beecae27106dc2c15c239f0120d13cd868840dccb9aaef0bed74bb8987246ba3f802197f7dc712298b8688e85a07b44d6d04a3'
             '609fb89887a7d7cdc7a0aeae21dee54618162479ac6696d70e47e11213be6d678eba0963dc8b867a956e792c4f116e9d9ce57e7c9dcdbf126d7b0d6311dce35a'
-            '39f694f740cafa4a2b314124c7fa6ebb5334c81130b2c5c7b7044637d6590b1d1df43de6d2e961edc295c7f3f41051795765a320d83a551b366d769e7379fd3f')
+            '27da225c383a6e9067d76485319ec4350c6308a4190cc43747c552284151cdb92fc1cd74e6da0cd1a6ddb6dddd1ed12d11103ebf645d330074cac3e7d8866b2c')
 
 prepare() {
 	cd "$pkgname-$pkgver"
diff --git a/memlockd-1.1.patch b/memlockd-1.1.patch
deleted file mode 100644
index 8c46b8385cc3..000000000000
--- a/memlockd-1.1.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -aur memlockd-1.1.pristine/memlockd.cfg memlockd-1.1.new/memlockd.cfg
---- memlockd-1.1.pristine/memlockd.cfg	2016-08-09 21:32:35.208273414 -0300
-+++ memlockd-1.1.new/memlockd.cfg	2016-08-10 07:51:06.397571265 -0300
-@@ -1,25 +1,22 @@
- +/bin/bash
--+/usr/sbin/sshd
--+/bin/busybox
--+/sbin/getty
--+/bin/login
-++/usr/bin/sshd
-++/usr/bin/agetty
-++/usr/bin/login
- /etc/passwd
- /etc/shadow
- /etc/group
- /etc/nsswitch.conf
- /etc/resolv.conf
--/etc/locale.alias
-+/etc/locale.conf
- /usr/lib/locale/locale-archive
- /etc/localtime
--?+/lib/i386-linux-gnu/libnss_files.so.2
--?+/lib/i386-linux-gnu/i686/nosegneg/libnss_files.so.2
--?+/lib/x86_64-linux-gnu/libnss_files.so.2
-+?+/usr/lib32/libnss_files.so.2
-+?+/usr/lib64/libnss_files.so.2
- /etc/ld.so.cache
--+/bin/ls
--+/bin/ps
-++/usr/bin/ls
-++/usr/bin/ps
- +/usr/bin/killall
- # even though I don't use NIS this is loaded
--?+/lib/i386-linux-gnu/libnss_nis.so.2
--?+/lib/i386-linux-gnu/i686/nosegneg/libnss_nis.so.2
--?+/lib/x86_64-linux-gnu/libnss_nis.so.2
-+?+/usr/lib32/libnss_nis.so.2
-+?+/usr/lib64/libnss_nis.so.2
- %/etc/memlockd.d
-diff -aur memlockd-1.1.pristine/memlockd.service memlockd-1.1.new/memlockd.service
---- memlockd-1.1.pristine/memlockd.service	2016-08-09 21:32:35.208273414 -0300
-+++ memlockd-1.1.new/memlockd.service	2016-08-09 21:33:10.415198193 -0300
-@@ -2,7 +2,7 @@
- Description=memlockd
- 
- [Service]
--ExecStart=/usr/sbin/memlockd -f -u memlockd
-+ExecStart=/usr/bin/memlockd -f -u memlockd
- ExecReload=/bin/kill -HUP $MAINPID
- Type=simple
- StandardOutput=syslog
diff --git a/memlockd-1.2.patch b/memlockd-1.2.patch
new file mode 100644
index 000000000000..67247eabcbd9
--- /dev/null
+++ b/memlockd-1.2.patch
@@ -0,0 +1,42 @@
+diff -aur memlockd-1.2.pristine/memlockd.cfg memlockd-1.2.new/memlockd.cfg
+--- memlockd-1.2.pristine/memlockd.cfg	2017-01-09 12:03:21.390602797 -0200
++++ memlockd-1.2.new/memlockd.cfg	2017-01-09 13:02:44.924073831 -0200
+@@ -1,28 +1,22 @@
+ +/bin/bash
+-+/usr/sbin/sshd
+-+/bin/busybox
+-+/sbin/getty
+-+/bin/login
+++/usr/bin/sshd
+++/usr/bin/agetty
+++/usr/bin/login
+ /etc/passwd
+ /etc/shadow
+ /etc/group
+ /etc/nsswitch.conf
+ /etc/resolv.conf
+-/etc/locale.alias
++/etc/locale.conf
+ /usr/lib/locale/locale-archive
+ /etc/localtime
+-?+/lib/i386-linux-gnu/i686/nosegneg/libnss_files.so.2
+-?+/lib/$ARCH-linux-gnu/libnss_files.so.2
++?+/usr/lib32/libnss_files.so.2
++?+/usr/lib64/libnss_files.so.2
+ /etc/ld.so.cache
+-+/bin/ls
+-+/bin/ps
+++/usr/bin/ls
+++/usr/bin/ps
+ +/usr/bin/killall
+ # even though I don't use NIS this is loaded
+-?+/lib/i386-linux-gnu/i686/nosegneg/libnss_nis.so.2
+-?+/lib/$ARCH-linux-gnu/libnss_nis.so.2
+-/lib/$ARCH-linux-gnu/libnss_nis-2.24.so
+-/lib/$ARCH-linux-gnu/libnss_files-2.24.so
+-/lib/$ARCH-linux-gnu/libnss_compat-2.24.so
+-/lib/$ARCH-linux-gnu/ld-2.24.so
+-/usr/lib/$ARCH-linux-gnu/gconv/gconv-modules.cache
++?+/usr/lib32/libnss_nis.so.2
++?+/usr/lib64/libnss_nis.so.2
+ %/etc/memlockd.d