From 36d166efac6ae02e7d0c4296bde47e53fb4a0d19 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Mon, 26 Nov 2007 12:50:25 +0000 Subject: Fix nxloadconfig patch, bug #198927 Package-Manager: portage-2.1.4_rc3 --- net-misc/nxserver-freenx/ChangeLog | 7 ++++++- net-misc/nxserver-freenx/Manifest | 16 ++++++++-------- .../files/nxserver-freenx-0.7.1-nxloadconfig.patch | 9 +++++++++ 3 files changed, 23 insertions(+), 9 deletions(-) (limited to 'net-misc/nxserver-freenx') diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog index e633a0c1ff86..1316d70481f0 100644 --- a/net-misc/nxserver-freenx/ChangeLog +++ b/net-misc/nxserver-freenx/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/nxserver-freenx # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.37 2007/11/07 09:52:51 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.38 2007/11/26 12:50:25 voyageur Exp $ + + 26 Nov 2007; Bernard Cafarelli + files/nxserver-freenx-0.7.1-nxloadconfig.patch: + Fix nxloadconfig patch, thanks Bruno Redondi in + bug #198927 07 Nov 2007; Bernard Cafarelli nxserver-freenx-0.7.1.ebuild: diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest index d080190e05d9..c16e62361b66 100644 --- a/net-misc/nxserver-freenx/Manifest +++ b/net-misc/nxserver-freenx/Manifest @@ -26,10 +26,10 @@ AUX nxserver-freenx-0.7.1-nxdialog.patch 925 RMD160 fcc47c3eb9c24adf2512b928a85e MD5 f816207d20b72e2333e2b5b9639e4668 files/nxserver-freenx-0.7.1-nxdialog.patch 925 RMD160 fcc47c3eb9c24adf2512b928a85e6cc09252caff files/nxserver-freenx-0.7.1-nxdialog.patch 925 SHA256 49bc93ba623b4642827e01730d07e5e472705a0f9dd5058a5624c4040e29252c files/nxserver-freenx-0.7.1-nxdialog.patch 925 -AUX nxserver-freenx-0.7.1-nxloadconfig.patch 2603 RMD160 d6c24e4ff0b5eb5395d257272bb9df014fe7116c SHA1 daa1b66a7087e20d844f0b7c596a660f1d6c1b07 SHA256 3ae7c7b9933103f997680e0c7a0b4090c286cd699bff022ac517338f0563b23a -MD5 43c926c84c03af4e55a38c3e22466266 files/nxserver-freenx-0.7.1-nxloadconfig.patch 2603 -RMD160 d6c24e4ff0b5eb5395d257272bb9df014fe7116c files/nxserver-freenx-0.7.1-nxloadconfig.patch 2603 -SHA256 3ae7c7b9933103f997680e0c7a0b4090c286cd699bff022ac517338f0563b23a files/nxserver-freenx-0.7.1-nxloadconfig.patch 2603 +AUX nxserver-freenx-0.7.1-nxloadconfig.patch 2994 RMD160 2cf6468787eeb84f4f991e51e94bb815af497d4e SHA1 7974c161635aee269e682c4875181dc99fd8998f SHA256 85f309c54c372c230ba19c9904e3f51ab985289ea7b91e1e748b57195818f56e +MD5 4d0e8941b85a03d3d4ba502250ddd82c files/nxserver-freenx-0.7.1-nxloadconfig.patch 2994 +RMD160 2cf6468787eeb84f4f991e51e94bb815af497d4e files/nxserver-freenx-0.7.1-nxloadconfig.patch 2994 +SHA256 85f309c54c372c230ba19c9904e3f51ab985289ea7b91e1e748b57195818f56e files/nxserver-freenx-0.7.1-nxloadconfig.patch 2994 DIST freenx-0.7.0.tar.gz 57614 RMD160 a051d4fcb96fd80b167c5fdc526cb5a789732057 SHA1 243f0c98f02b1c84c59e5b324a5a7e6d3d3d8db3 SHA256 61aedd3f8d3fae02b0e13de5f4ee1cb7bc1397dd7a379a67752a188d1f0119c9 DIST freenx-0.7.1.tar.gz 63637 RMD160 853380a482243ccf7c5a4a2f51739248b6a382db SHA1 bceefe6910e54af662f5311ee3cb24d354b2f724 SHA256 7e846a288506353a78c2535d2b66b93ffe2f70c9c2868365f83c29ab71150cb6 EBUILD nxserver-freenx-0.7.0-r1.ebuild 3237 RMD160 00c106a37557322e79ce43f84844c3a53d6b4c16 SHA1 11692d3f677dbc10eb4900e313b2fe588eb9c7d5 SHA256 65c960edac88635d8f1402325c5aec7b87259a919ccfdb313da6d2eb6717a0ab @@ -40,10 +40,10 @@ EBUILD nxserver-freenx-0.7.1.ebuild 3627 RMD160 a106d5b2fca655e2700b66cacd7e0017 MD5 c3b94dee52df7e377240c7bf9b1e1b9c nxserver-freenx-0.7.1.ebuild 3627 RMD160 a106d5b2fca655e2700b66cacd7e0017647659da nxserver-freenx-0.7.1.ebuild 3627 SHA256 51e8fad24f5819411df48be694b4169ce6ff8418ec6d67c9e2674c92acd03076 nxserver-freenx-0.7.1.ebuild 3627 -MISC ChangeLog 8580 RMD160 967ff848ea246d612e9d2dc60b246b6d9c8ca51d SHA1 efb2db52c22bbeab9ef11b1ac6a11c0f37658096 SHA256 22af7d86eb897366fa98f6cd3e545d943404ce0c35cf7ea0658441e6629e3186 -MD5 d8ebe60b17d820a582085b1b39087005 ChangeLog 8580 -RMD160 967ff848ea246d612e9d2dc60b246b6d9c8ca51d ChangeLog 8580 -SHA256 22af7d86eb897366fa98f6cd3e545d943404ce0c35cf7ea0658441e6629e3186 ChangeLog 8580 +MISC ChangeLog 8778 RMD160 d38f4919d91b4a2b49ad593ce239c97ae20b6aaf SHA1 941b7eb44ef0bc5241fb7e3be71881aac645d9aa SHA256 473a9448001e3db5b91db1fceaf210fe307244cf4726fc03fd7a62684cc09865 +MD5 de103b732134d5b623600133f31ade39 ChangeLog 8778 +RMD160 d38f4919d91b4a2b49ad593ce239c97ae20b6aaf ChangeLog 8778 +SHA256 473a9448001e3db5b91db1fceaf210fe307244cf4726fc03fd7a62684cc09865 ChangeLog 8778 MISC metadata.xml 350 RMD160 53819424da8eb045d991b7d02b8a6d9e6d54369d SHA1 591b43c9210782070d5d9b30317b1cef3975ab7e SHA256 5cf73679195a2c8a5a960d30614cfd340b7aadabb2e4c684928f44527278500e MD5 433fa8974d44bd11845f96eb0be88ae7 metadata.xml 350 RMD160 53819424da8eb045d991b7d02b8a6d9e6d54369d metadata.xml 350 diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch index 74d7524ff19f..e793ab7c7191 100644 --- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch +++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch @@ -28,6 +28,15 @@ if [ -z "$ENABLE_2_0_0_BACKEND" ] then ENABLE_2_0_0_BACKEND="1" +@@ -301,7 +301,7 @@ + if [ -z "$ENABLE_2_0_0_BACKEND" ] + then + ENABLE_2_0_0_BACKEND="1" +- [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && ENABLE_2_0_0_BACKEND="0" ++ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && ENABLE_2_0_0_BACKEND="0" + fi + + if [ "$ENABLE_KDE_CUPS" = "1" ] @@ -326,7 +327,7 @@ ERROR="yes" && echo "Error: Invalid value \"PATH_BIN=$PATH_BIN\"" # Check for NX agents ... -- cgit v1.2.3-65-gdbad