[packages/nx] - tiny fraction needed; contains nxssh which needs massive update to build
arekm
arekm at pld-linux.org
Tue Sep 25 19:56:20 CEST 2018
commit 886c72ec4edeeb697322e658dd7640ae2afc2b44
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Sep 25 19:56:06 2018 +0200
- tiny fraction needed; contains nxssh which needs massive update to build
nx.spec | 7 +++
openssl.patch | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 144 insertions(+)
---
diff --git a/nx.spec b/nx.spec
index 658b570..d20cae1 100644
--- a/nx.spec
+++ b/nx.spec
@@ -40,6 +40,7 @@ Patch0: nx-optflags.patch
Patch1: nx-syslibs.patch
Patch2: nx-libpng15.patch
Patch3: format-security.patch
+Patch4: openssl.patch
URL: http://www.nomachine.com/
#BuildRequires: Xaw3d-devel
BuildRequires: autoconf
@@ -92,6 +93,7 @@ zdalnych sesjach X11 nawet przy prędkosci 56k albo większej.
%patch1 -p1
%patch2 -p0
%patch3 -p1
+%patch4 -p1
cat <<EOF >>nx-X11/config/cf/host.def
#define UseRpath YES
@@ -106,6 +108,11 @@ export LDFLAGS="%{rpmldflags} -Wl,-rpath,%{_libdir}/NX"
perl -pi -e"s|CXXFLAGS=.-O.*|CXXFLAGS=\"$CXXFLAGS\"|" */configure
+cd nxssh
+%{__aclocal}
+%{__autoconf}
+cd ..
+
# build Compression Library and Proxy
for i in nxcomp nxcompshad nxproxy; do
cd $i
diff --git a/openssl.patch b/openssl.patch
new file mode 100644
index 0000000..533e0fe
--- /dev/null
+++ b/openssl.patch
@@ -0,0 +1,137 @@
+--- nx-3.5.0/nxssh/configure.ac~ 2007-10-02 19:02:50.000000000 +0200
++++ nx-3.5.0/nxssh/configure.ac 2018-09-25 18:55:05.265511819 +0200
+@@ -1908,7 +1908,7 @@ AC_RUN_IFELSE(
+ [AC_LANG_SOURCE([[
+ #include <string.h>
+ #include <openssl/opensslv.h>
+-int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); }
++int main(void) { exit(OpenSSL_version_num() == OPENSSL_VERSION_NUMBER ? 0 : 1); }
+ ]])],
+ [
+ AC_MSG_RESULT(yes)
+@@ -1933,36 +1933,6 @@ Also see contrib/findssl.sh for help ide
+ ]
+ )
+
+-AC_MSG_CHECKING([if programs using OpenSSL functions will link])
+-AC_LINK_IFELSE(
+- [AC_LANG_SOURCE([[
+-#include <openssl/evp.h>
+-int main(void) { SSLeay_add_all_algorithms(); }
+- ]])],
+- [
+- AC_MSG_RESULT(yes)
+- ],
+- [
+- AC_MSG_RESULT(no)
+- saved_LIBS="$LIBS"
+- LIBS="$LIBS -ldl"
+- AC_MSG_CHECKING([if programs using OpenSSL need -ldl])
+- AC_LINK_IFELSE(
+- [AC_LANG_SOURCE([[
+-#include <openssl/evp.h>
+-int main(void) { SSLeay_add_all_algorithms(); }
+- ]])],
+- [
+- AC_MSG_RESULT(yes)
+- ],
+- [
+- AC_MSG_RESULT(no)
+- LIBS="$saved_LIBS"
+- ]
+- )
+- ]
+-)
+-
+ AC_ARG_WITH(ssl-engine,
+ [ --with-ssl-engine Enable OpenSSL (hardware) ENGINE support ],
+ [ if test "x$withval" != "xno" ; then
+--- /dev/null 2018-05-15 12:27:28.000000000 +0200
++++ nx-3.5.0/nxssh/acinclude.m4 2018-09-25 19:02:24.088821361 +0200
+@@ -0,0 +1,86 @@
++dnl $Id: aclocal.m4,v 1.6 2005/09/19 16:33:39 tim Exp $
++dnl
++dnl OpenSSH-specific autoconf macros
++dnl
++
++
++dnl OSSH_CHECK_HEADER_FOR_FIELD(field, header, symbol)
++dnl Does AC_EGREP_HEADER on 'header' for the string 'field'
++dnl If found, set 'symbol' to be defined. Cache the result.
++dnl TODO: This is not foolproof, better to compile and read from there
++AC_DEFUN(OSSH_CHECK_HEADER_FOR_FIELD, [
++# look for field '$1' in header '$2'
++ dnl This strips characters illegal to m4 from the header filename
++ ossh_safe=`echo "$2" | sed 'y%./+-%__p_%'`
++ dnl
++ ossh_varname="ossh_cv_$ossh_safe""_has_"$1
++ AC_MSG_CHECKING(for $1 field in $2)
++ AC_CACHE_VAL($ossh_varname, [
++ AC_EGREP_HEADER($1, $2, [ dnl
++ eval "$ossh_varname=yes" dnl
++ ], [ dnl
++ eval "$ossh_varname=no" dnl
++ ]) dnl
++ ])
++ ossh_result=`eval 'echo $'"$ossh_varname"`
++ if test -n "`echo $ossh_varname`"; then
++ AC_MSG_RESULT($ossh_result)
++ if test "x$ossh_result" = "xyes"; then
++ AC_DEFINE($3, 1, [Define if you have $1 in $2])
++ fi
++ else
++ AC_MSG_RESULT(no)
++ fi
++])
++
++dnl OSSH_PATH_ENTROPY_PROG(variablename, command):
++dnl Tidiness function, sets 'undef' if not found, and does the AC_SUBST
++AC_DEFUN(OSSH_PATH_ENTROPY_PROG, [
++ AC_PATH_PROG($1, $2)
++ if test -z "[$]$1" ; then
++ $1="undef"
++ fi
++ AC_SUBST($1)
++])
++
++dnl Check for socklen_t: historically on BSD it is an int, and in
++dnl POSIX 1g it is a type of its own, but some platforms use different
++dnl types for the argument to getsockopt, getpeername, etc. So we
++dnl have to test to find something that will work.
++AC_DEFUN([TYPE_SOCKLEN_T],
++[
++ AC_CHECK_TYPE([socklen_t], ,[
++ AC_MSG_CHECKING([for socklen_t equivalent])
++ AC_CACHE_VAL([curl_cv_socklen_t_equiv],
++ [
++ # Systems have either "struct sockaddr *" or
++ # "void *" as the second argument to getpeername
++ curl_cv_socklen_t_equiv=
++ for arg2 in "struct sockaddr" void; do
++ for t in int size_t unsigned long "unsigned long"; do
++ AC_TRY_COMPILE([
++ #include <sys/types.h>
++ #include <sys/socket.h>
++
++ int getpeername (int, $arg2 *, $t *);
++ ],[
++ $t len;
++ getpeername(0,0,&len);
++ ],[
++ curl_cv_socklen_t_equiv="$t"
++ break
++ ])
++ done
++ done
++
++ if test "x$curl_cv_socklen_t_equiv" = x; then
++ AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
++ fi
++ ])
++ AC_MSG_RESULT($curl_cv_socklen_t_equiv)
++ AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
++ [type to use in place of socklen_t if not defined])],
++ [#include <sys/types.h>
++#include <sys/socket.h>])
++])
++
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nx.git/commitdiff/886c72ec4edeeb697322e658dd7640ae2afc2b44
More information about the pld-cvs-commit
mailing list