p910nd: Fix the lock directory use

The original code uses a subdir inside of /var/lock which is hard for
us to manage as it may be running in tmpfs; we did change it for avoid
the subdir so it just works.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Eric Bénard <eric@eukrea.com>

2 files changed, 33 insertions, 2 deletions

diff --git a/meta-oe/recipes-support/p910nd/p910nd/fix-var-lock.patch b/meta-oe/recipes-support/p910nd/p910nd/fix-var-lock.patch
new file mode 100644
index 000000000..aa84e180e
--- /dev/null
+++ b/meta-oe/recipes-support/p910nd/p910nd/fix-var-lock.patch
@@ -0,0 +1,30 @@
+Use /var/lock instead of /var/lock/subsys
+
+Upstream-Status: Inappropriate [configuration]
+
+Index: p910nd/p910nd.8
+===================================================================
+--- p910nd.orig/p910nd.8        2011-11-14 22:41:41.904615879 +0100
++++ p910nd/p910nd.8     2011-11-14 22:49:52.299047607 +0100
+@@ -83,7 +83,7 @@
+ .SH "SEE ALSO"
+ printcap(5), hosts_access(5)
+ .SH FILES
+-/var/run/p9100d.pid, /var/lock/subsys/p9100d, /etc/hosts.allow, /etc/hosts.deny
++/var/run/p9100d.pid, /var/lock/p9100d, /etc/hosts.allow, /etc/hosts.deny
+ .SH COPYRIGHT
+ .I p910nd
+ is under the GNU Public License Version 2
+Index: p910nd/p910nd.c
+===================================================================
+--- p910nd.orig/p910nd.c        2011-11-14 22:47:41.986401420 +0100
++++ p910nd/p910nd.c     2011-11-14 22:49:27.274923524 +0100
+@@ -122,7 +122,7 @@
+ #ifdef         LOCKFILE_DIR
+ #define                LOCKFILE        LOCKFILE_DIR "/p910%cd"
+ #else
+-#define                LOCKFILE        "/var/lock/subsys/p910%cd"
++#define                LOCKFILE        "/var/lock/p910%cd"
+ #endif
+ #ifndef                PRINTERFILE
+ #define         PRINTERFILE     "/dev/lp%c"
diff --git a/meta-oe/recipes-support/p910nd/p910nd_0.95.bb b/meta-oe/recipes-support/p910nd/p910nd_0.95.bb
index 29051475f..34401918e 100644
--- a/meta-oe/recipes-support/p910nd/p910nd_0.95.bb
+++ b/meta-oe/recipes-support/p910nd/p910nd_0.95.bb
@@ -4,9 +4,10 @@ SECTION = "console/utils"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/p910nd/p910nd-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/p910nd/p910nd-${PV}.tar.bz2 \
+           file://fix-var-lock.patch"
 
 SRC_URI[md5sum] = "c7ac6afdf7730ac8387a8e87198d4491"
 SRC_URI[sha256sum] = "7d78642c86dc247fbdef1ff85c56629dcdc6b2a457c786420299e284fffcb029"