svn commit: r423352 - in head/net: tigervnc tigervnc-devel tigervnc-devel/files tigervnc/files
John Marino
marino at FreeBSD.org
Wed Oct 5 15:38:18 UTC 2016
Author: marino
Date: Wed Oct 5 15:38:16 2016
New Revision: 423352
URL: https://svnweb.freebsd.org/changeset/ports/423352
Log:
net/tigervnc(-devel): runtime and stage-QA fix
Previous attempts to run tigervnc resulted in the server quitting:
vncserver: couldn't find "mcookie" on your PATH
With the attached patch, the vncserver now generates the "magic cookie".
While here, add the missing vietnamese translation to fix stage-QA checks.
The -devel version got the same fix and was revbumped even though it is
still ignored since it's no newer than the stable version.
PR: 213150
Reported by: Zane Bowers-Hadley (vvelox [at] vvelox.net)
Submitted by: maintainer
Modified:
head/net/tigervnc-devel/Makefile
head/net/tigervnc-devel/files/patch-unix_vncserver
head/net/tigervnc-devel/pkg-plist
head/net/tigervnc/Makefile
head/net/tigervnc/files/patch-unix_vncserver
head/net/tigervnc/pkg-plist
Modified: head/net/tigervnc-devel/Makefile
==============================================================================
--- head/net/tigervnc-devel/Makefile Wed Oct 5 15:23:40 2016 (r423351)
+++ head/net/tigervnc-devel/Makefile Wed Oct 5 15:38:16 2016 (r423352)
@@ -3,7 +3,7 @@
PORTNAME= tigervnc
PORTVERSION= 1.6.90
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= net x11-servers
PKGNAMESUFFIX= -devel
@@ -144,5 +144,6 @@ post-build:
post-install:
@cd ${WRKSRC}/unix/xserver/hw/vnc/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/Xvnc ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/libvnc.so
.include <bsd.port.post.mk>
Modified: head/net/tigervnc-devel/files/patch-unix_vncserver
==============================================================================
--- head/net/tigervnc-devel/files/patch-unix_vncserver Wed Oct 5 15:23:40 2016 (r423351)
+++ head/net/tigervnc-devel/files/patch-unix_vncserver Wed Oct 5 15:38:16 2016 (r423352)
@@ -1,6 +1,20 @@
---- unix/vncserver.orig 2012-05-27 21:16:41.000000000 +0900
-+++ unix/vncserver 2012-05-27 21:17:13.000000000 +0900
-@@ -422,7 +422,7 @@
+--- unix/vncserver.orig 2016-10-04 13:33:57.420501000 +0900
++++ unix/vncserver 2016-10-04 13:18:49.398064000 +0900
+@@ -240,7 +240,13 @@
+
+ # Make an X server cookie and set up the Xauthority file
+
++# mcookie is a part of util-linux, usually only GNU/Linux systems have it.
+ $cookie = `mcookie`;
++# Alternative method for cookie. For non GNU/Linux operating systems.
++$cookie ||= `dd if=/dev/urandom bs=16 count=1 2>/dev/null| od -x -An | tr -d ' '`;
++if ($cookie eq '') {
++ die "couldn't generate magic cookie.\n";
++}
+
+ open(XAUTH, "|xauth -f $xauthorityFile source -");
+ print XAUTH "add $host:$displayNumber . $cookie\n";
+@@ -470,7 +476,7 @@
socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n";
eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))';
@@ -9,7 +23,7 @@
close(S);
return 0;
}
-@@ -430,7 +430,7 @@
+@@ -478,7 +484,7 @@
socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n";
eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))';
@@ -18,3 +32,12 @@
close(S);
return 0;
}
+@@ -778,7 +784,7 @@
+ #
+
+ cmd:
+- foreach $cmd ("uname","mcookie","xauth") {
++ foreach $cmd ("uname","xauth") {
+ for (split(/:/,$ENV{PATH})) {
+ if (-x "$_/$cmd") {
+ next cmd;
Modified: head/net/tigervnc-devel/pkg-plist
==============================================================================
--- head/net/tigervnc-devel/pkg-plist Wed Oct 5 15:23:40 2016 (r423351)
+++ head/net/tigervnc-devel/pkg-plist Wed Oct 5 15:38:16 2016 (r423352)
@@ -29,6 +29,7 @@ man/man1/Xvnc.1.gz
%%NLS%%share/locale/sv/LC_MESSAGES/tigervnc.mo
%%NLS%%share/locale/tr/LC_MESSAGES/tigervnc.mo
%%NLS%%share/locale/uk/LC_MESSAGES/tigervnc.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/tigervnc.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/tigervnc.mo
%%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/LICENCE.TXT
Modified: head/net/tigervnc/Makefile
==============================================================================
--- head/net/tigervnc/Makefile Wed Oct 5 15:23:40 2016 (r423351)
+++ head/net/tigervnc/Makefile Wed Oct 5 15:38:16 2016 (r423352)
@@ -4,6 +4,7 @@
PORTNAME= tigervnc
PORTVERSION= 1.7.0
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= net x11-servers
MAINTAINER= meta+ports at vmeta.jp
@@ -141,5 +142,6 @@ post-build:
post-install:
@cd ${WRKSRC}/unix/xserver/hw/vnc/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/Xvnc ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/libvnc.so
.include <bsd.port.post.mk>
Modified: head/net/tigervnc/files/patch-unix_vncserver
==============================================================================
--- head/net/tigervnc/files/patch-unix_vncserver Wed Oct 5 15:23:40 2016 (r423351)
+++ head/net/tigervnc/files/patch-unix_vncserver Wed Oct 5 15:38:16 2016 (r423352)
@@ -1,6 +1,20 @@
---- unix/vncserver.orig 2012-05-27 21:16:41.000000000 +0900
-+++ unix/vncserver 2012-05-27 21:17:13.000000000 +0900
-@@ -422,7 +422,7 @@
+--- unix/vncserver.orig 2016-09-08 10:31:18 UTC
++++ unix/vncserver
+@@ -240,7 +240,13 @@ unlink($desktopLog);
+
+ # Make an X server cookie and set up the Xauthority file
+
++# mcookie is a part of util-linux, usually only GNU/Linux systems have it.
+ $cookie = `mcookie`;
++# Alternative method for cookie. For non GNU/Linux operating systems.
++$cookie ||= `dd if=/dev/urandom bs=16 count=1 2>/dev/null| od -x -An | tr -d ' '`;
++if ($cookie eq '') {
++ die "couldn't generate magic cookie.\n";
++}
+
+ open(XAUTH, "|xauth -f $xauthorityFile source -");
+ print XAUTH "add $host:$displayNumber . $cookie\n";
+@@ -470,7 +476,7 @@ sub CheckDisplayNumber
socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n";
eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))';
@@ -9,7 +23,7 @@
close(S);
return 0;
}
-@@ -430,7 +430,7 @@
+@@ -478,7 +484,7 @@ sub CheckDisplayNumber
socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n";
eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))';
@@ -18,3 +32,12 @@
close(S);
return 0;
}
+@@ -778,7 +784,7 @@ sub SanityCheck
+ #
+
+ cmd:
+- foreach $cmd ("uname","mcookie","xauth") {
++ foreach $cmd ("uname","xauth") {
+ for (split(/:/,$ENV{PATH})) {
+ if (-x "$_/$cmd") {
+ next cmd;
Modified: head/net/tigervnc/pkg-plist
==============================================================================
--- head/net/tigervnc/pkg-plist Wed Oct 5 15:23:40 2016 (r423351)
+++ head/net/tigervnc/pkg-plist Wed Oct 5 15:38:16 2016 (r423352)
@@ -29,6 +29,7 @@ man/man1/Xvnc.1.gz
%%NLS%%share/locale/sv/LC_MESSAGES/tigervnc.mo
%%NLS%%share/locale/tr/LC_MESSAGES/tigervnc.mo
%%NLS%%share/locale/uk/LC_MESSAGES/tigervnc.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/tigervnc.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/tigervnc.mo
%%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/LICENCE.TXT
More information about the svn-ports-head
mailing list