net-misc/nxproxy: Initial checkin
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2261 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
parent
849590076e
commit
9aa435438b
11
net-misc/nxproxy/ChangeLog
Normal file
11
net-misc/nxproxy/ChangeLog
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
# ChangeLog for net-misc/nxproxy
|
||||||
|
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
|
||||||
|
# $Header: $
|
||||||
|
|
||||||
|
14 Jun 2010; Mario Fetka <mario.fetka@gmail.com>
|
||||||
|
+files/nxproxy-3.2.0-read_from_stdin.patch,
|
||||||
|
+files/nxproxy-3.3.0-cflags.patch, +nxproxy-3.4.0_p2.ebuild,
|
||||||
|
+files/nxproxy-3.4.0-build_destdir.patch,
|
||||||
|
+files/nxproxy-3.4.0-no-local-nxcomp-1.patch, +metadata.xml:
|
||||||
|
Initial checkin
|
||||||
|
|
8
net-misc/nxproxy/Manifest
Normal file
8
net-misc/nxproxy/Manifest
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
AUX nxproxy-3.2.0-read_from_stdin.patch 1489 RMD160 1827237979616a9eb99456233b790caa0144eb0a SHA1 4d2bdbc762f70420416d904fcda9cc5ed9b1b83e SHA256 758f5149ce2df91913e65193380613ba97353126a782c67327e4516af5c55606
|
||||||
|
AUX nxproxy-3.3.0-cflags.patch 361 RMD160 eed5ce03b97776e010800ac8cd84a3b84c0a931d SHA1 bccbed2625998e9d1344a2f9043d2f0f698651a8 SHA256 48dd9bab2bf90f31f6a6b0e960c754ae699cbb14adceb1480845b1cbf4be6279
|
||||||
|
AUX nxproxy-3.4.0-build_destdir.patch 539 RMD160 88c302435b9200b55c3ffc9415cd452d287d90ff SHA1 9b2f49e687781caa5ff5f8ef765a6f60cb767316 SHA256 6cf7d5c2be7793cd65f2d9f5a7c01dfd0e2e76ef587e9130187f8b70fec8f8d1
|
||||||
|
AUX nxproxy-3.4.0-no-local-nxcomp-1.patch 951 RMD160 66eb8a7877e89fb4fdcfaba75fb45458705f6c56 SHA1 14a543080e5ef2406ce0f84ce632e71a37c736aa SHA256 51c2dbfeca919ca84e6fd7b89f87c5b32395107ba7ce71f968583c7e70e39fb0
|
||||||
|
DIST nxproxy-3.4.0-2.tar.gz 80209 RMD160 137fc074cb7690fa87db17ab048f3435adecd6cb SHA1 7d359c3e50708c4e774b126cc1e646c5f6ed3c3a SHA256 ecf740db00f2a223f520809f6cf5623d05eb2709e2ea8eadfb9a97b906fabfa6
|
||||||
|
EBUILD nxproxy-3.4.0_p2.ebuild 1018 RMD160 75d6f5619a2b4e8d7bc4266945304856d2729e7f SHA1 49b4ded1952eb44b829b6a6a505d481e271b04b4 SHA256 7311951687a8314d91332e0ab41cd38e6887c14b08f6c284973d3e92cf3bca8f
|
||||||
|
MISC ChangeLog 403 RMD160 da3c255ca0c8769f196df311eef3c2dbf0881725 SHA1 bf3ec031acab864e5dedd417342e6124c1fe449f SHA256 530e685164565618a4b56403d627607644289e01b981fb00b2462b1eed3d1e93
|
||||||
|
MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
|
70
net-misc/nxproxy/files/nxproxy-3.2.0-read_from_stdin.patch
Normal file
70
net-misc/nxproxy/files/nxproxy-3.2.0-read_from_stdin.patch
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
Index: nxproxy/Main.c
|
||||||
|
===================================================================
|
||||||
|
--- nxproxy.orig/Main.c 2007-01-19 14:34:34.000000000 -0200
|
||||||
|
+++ nxproxy/Main.c 2010-03-27 12:47:28.872040679 -0300
|
||||||
|
@@ -36,28 +36,48 @@
|
||||||
|
int result = -1;
|
||||||
|
|
||||||
|
char *options = NULL;
|
||||||
|
-
|
||||||
|
+
|
||||||
|
+ char *nx_commfd_str = NULL;
|
||||||
|
+
|
||||||
|
options = getenv("NX_DISPLAY");
|
||||||
|
-
|
||||||
|
- if (NXTransParseCommandLine(argc, argv) < 0)
|
||||||
|
+
|
||||||
|
+ if ((nx_commfd_str = getenv("NX_COMMFD")) != NULL)
|
||||||
|
{
|
||||||
|
- NXTransCleanup();
|
||||||
|
- }
|
||||||
|
+ int nx_commfd = atoi(nx_commfd_str);
|
||||||
|
|
||||||
|
- if (NXTransParseEnvironment(options, 0) < 0)
|
||||||
|
- {
|
||||||
|
- NXTransCleanup();
|
||||||
|
+ if (result)
|
||||||
|
+ result = NXTransCreate(nx_commfd, NX_MODE_SERVER, options);
|
||||||
|
+
|
||||||
|
+ // go into endless loop
|
||||||
|
+
|
||||||
|
+ if (result)
|
||||||
|
+ {
|
||||||
|
+ while (NXTransRunning(NX_FD_ANY))
|
||||||
|
+ result = NXTransContinue(NULL);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ if (NXTransParseCommandLine(argc, argv) < 0)
|
||||||
|
+ {
|
||||||
|
+ NXTransCleanup();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (NXTransParseEnvironment(options, 0) < 0)
|
||||||
|
+ {
|
||||||
|
+ NXTransCleanup();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * This should not return...
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+ #ifdef TEST
|
||||||
|
+ fprintf(stderr, "Main: Yielding control to NX entry point.\n");
|
||||||
|
+ #endif
|
||||||
|
|
||||||
|
- /*
|
||||||
|
- * This should not return...
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
- #ifdef TEST
|
||||||
|
- fprintf(stderr, "Main: Yielding control to NX entry point.\n");
|
||||||
|
- #endif
|
||||||
|
-
|
||||||
|
- result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
|
||||||
|
+ result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
/*
|
||||||
|
* ...So these should not be called.
|
14
net-misc/nxproxy/files/nxproxy-3.3.0-cflags.patch
Normal file
14
net-misc/nxproxy/files/nxproxy-3.3.0-cflags.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
--- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100
|
||||||
|
+++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100
|
||||||
|
@@ -5,11 +5,6 @@
|
||||||
|
AC_INIT(Main.c)
|
||||||
|
AC_PREREQ(2.13)
|
||||||
|
|
||||||
|
-dnl Reset default compilation flags.
|
||||||
|
-
|
||||||
|
-CXXFLAGS="-O3"
|
||||||
|
-CPPFLAGS="-O3"
|
||||||
|
-
|
||||||
|
dnl Prefer headers and libraries from nx-X11 if present.
|
||||||
|
|
||||||
|
if test -d "../nx-X11/exports/include" ; then
|
15
net-misc/nxproxy/files/nxproxy-3.4.0-build_destdir.patch
Normal file
15
net-misc/nxproxy/files/nxproxy-3.4.0-build_destdir.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
Index: nxproxy/Makefile.in
|
||||||
|
===================================================================
|
||||||
|
--- nxproxy.orig/Makefile.in 2010-03-27 14:32:09.462039266 -0300
|
||||||
|
+++ nxproxy/Makefile.in 2010-03-27 15:18:00.842087362 -0300
|
||||||
|
@@ -87,8 +87,8 @@
|
||||||
|
install: install.bin install.man
|
||||||
|
|
||||||
|
install.bin: $(PROGRAM)
|
||||||
|
- $(srcdir)/mkinstalldirs $(bindir)
|
||||||
|
- $(INSTALL) $(PROGRAM) $(bindir)/$(PROGRAM)
|
||||||
|
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
|
||||||
|
+ $(INSTALL) $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
|
||||||
|
|
||||||
|
install.man:
|
||||||
|
$(srcdir)/mkinstalldirs $(man1dir)
|
28
net-misc/nxproxy/files/nxproxy-3.4.0-no-local-nxcomp-1.patch
Normal file
28
net-misc/nxproxy/files/nxproxy-3.4.0-no-local-nxcomp-1.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
|
||||||
|
Date: 2010-06-14
|
||||||
|
Initial Package Version: 3.4.0
|
||||||
|
Origin: me
|
||||||
|
Upstream Status: unknown
|
||||||
|
Description: search for the lib and the includes location
|
||||||
|
|
||||||
|
diff -Naur nxproxy.orig/Makefile.in nxproxy/Makefile.in
|
||||||
|
--- nxproxy.orig/Makefile.in 2010-06-14 19:25:40.832707544 +0000
|
||||||
|
+++ nxproxy/Makefile.in 2010-06-14 19:27:44.083957268 +0000
|
||||||
|
@@ -15,14 +15,14 @@
|
||||||
|
-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
|
||||||
|
-Wmissing-declarations -Wnested-externs
|
||||||
|
|
||||||
|
-CXXINCLUDES = -I. -I../nxcomp
|
||||||
|
+CXXINCLUDES = -I. -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1
|
||||||
|
|
||||||
|
CC = @CC@
|
||||||
|
CCFLAGS = $(CXXFLAGS)
|
||||||
|
-CCINCLUDES = -I. -I../nxcomp
|
||||||
|
+CCINCLUDES = -I. -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1
|
||||||
|
CCDEFINES =
|
||||||
|
|
||||||
|
-LDFLAGS = @LDFLAGS@
|
||||||
|
+LDFLAGS = @LDFLAGS@ -L/usr/lib/nx/
|
||||||
|
LIBS = @LIBS@
|
||||||
|
|
||||||
|
#
|
34
net-misc/nxproxy/metadata.xml
Normal file
34
net-misc/nxproxy/metadata.xml
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||||
|
<!--
|
||||||
|
$Header: /var/cvsroot/gentoo-x86/skel.metadata.xml,v 1.18 2008/07/28 19:27:05 cardoe Exp $
|
||||||
|
|
||||||
|
This is the example metadata file.
|
||||||
|
The root element of this file is <pkgmetadata>. Within this element a
|
||||||
|
number of subelements are allowed: herd, maintainer, and
|
||||||
|
longdescription. herd is a required subelement.
|
||||||
|
|
||||||
|
For a full description look at:
|
||||||
|
http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml?part=2&chap=4
|
||||||
|
|
||||||
|
|
||||||
|
Before committing, please remove the comments from this file. They are
|
||||||
|
not relevant for general metadata.xml files.
|
||||||
|
-->
|
||||||
|
<pkgmetadata>
|
||||||
|
<herd>no-herd</herd>
|
||||||
|
<maintainer>
|
||||||
|
<email>@gentoo.org</email>
|
||||||
|
<!-- <description>Description of the maintainership</description> -->
|
||||||
|
</maintainer>
|
||||||
|
<!-- <longdescription>Long description of the package</longdescription> -->
|
||||||
|
<!--
|
||||||
|
<use>
|
||||||
|
<flag name='flag'>Description of how USE='flag' affects this package</flag>
|
||||||
|
<flag name='userland_GNU'>Description of how USERLAND='GNU' affects this
|
||||||
|
package</flag>
|
||||||
|
<flag name='aspell'>Uses <pkg>app-text/aspell</pkg> for spell checking.
|
||||||
|
Requires an installed dictionary from <cat>app-dicts</cat></flag>
|
||||||
|
</use>
|
||||||
|
-->
|
||||||
|
</pkgmetadata>
|
43
net-misc/nxproxy/nxproxy-3.4.0_p2.ebuild
Normal file
43
net-misc/nxproxy/nxproxy-3.4.0_p2.ebuild
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
# Copyright 1999-2010 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: $
|
||||||
|
|
||||||
|
EAPI=2
|
||||||
|
|
||||||
|
MY_P=${P/_p/-}
|
||||||
|
MY_PV=${PV/_p*/}
|
||||||
|
|
||||||
|
inherit autotools eutils multilib
|
||||||
|
|
||||||
|
DESCRIPTION="NX compression technology core libraries"
|
||||||
|
HOMEPAGE="http://www.nomachine.com/developers.php"
|
||||||
|
SRC_URI="http://web04.nomachine.com/download/${MY_PV}/sources/${MY_P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
RDEPEND="!<net-misc/nx-${MY_PV}
|
||||||
|
>=net-misc/nxcomp-${MY_PV}"
|
||||||
|
|
||||||
|
DEPEND="${RDEPEND}"
|
||||||
|
|
||||||
|
S=${WORKDIR}/nxproxy
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
# RESPECT cflags
|
||||||
|
epatch "${FILESDIR}"/nxproxy-3.3.0-cflags.patch
|
||||||
|
# read from stdin from the x2go nxproxy
|
||||||
|
epatch "${FILESDIR}"/nxproxy-3.2.0-read_from_stdin.patch
|
||||||
|
# make isnatll with DESTDIR
|
||||||
|
epatch "${FILESDIR}"/nxproxy-3.4.0-build_destdir.patch
|
||||||
|
# non local nxcomp
|
||||||
|
epatch "${FILESDIR}"/nxproxy-3.4.0-no-local-nxcomp-1.patch
|
||||||
|
# Run autoreconf in all neeed folders
|
||||||
|
eautoreconf
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
emake DESTDIR="${D}" install || die "Install failed"
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user