[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/rdesktop/ rdesktop.patch rdesktop.spec open...
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2002-12-31 11:11:50
[Download RAW message or body]

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src openpkg-web          Date:   31-Dec-2002 12:11:50
  Branch: HEAD                             Handle: 2002123111114901

  Added files:
    openpkg-src/rdesktop    rdesktop.patch
  Modified files:
    openpkg-src/rdesktop    rdesktop.spec
    openpkg-web             news.txt

  Log:
    fix building under new OpenSSL 0.9.7 world order

  Summary:
    Revision    Changes     Path
    1.1         +54 -0      openpkg-src/rdesktop/rdesktop.patch
    1.13        +8  -7      openpkg-src/rdesktop/rdesktop.spec
    1.2477      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/rdesktop/rdesktop.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1 rdesktop.patch
  --- /dev/null	2002-12-31 12:11:50.000000000 +0100
  +++ rdesktop.patch	2002-12-31 12:11:50.000000000 +0100
  @@ -0,0 +1,54 @@
  +--- secure.c.orig	2002-12-31 11:58:07.000000000 +0100
  ++++ secure.c	2002-12-31 11:59:03.000000000 +0100
  +@@ -20,10 +20,10 @@
  + 
  + #include "rdesktop.h"
  + 
  +-#include <rc4.h>
  +-#include <md5.h>
  +-#include <sha.h>
  +-#include <bn.h>
  ++#include "openssl/rc4.h"
  ++#include "openssl/md5.h"
  ++#include "openssl/sha.h"
  ++#include "openssl/bn.h"
  + 
  + extern char *hostname;
  + extern int width;
  +@@ -280,7 +280,7 @@
  + sec_rsa_encrypt(uint8 *out, uint8 *in, int len,
  + 		uint8 *modulus, uint8 *exponent)
  + {
  +-	BN_CTX ctx;
  ++	BN_CTX *ctx;
  + 	BIGNUM mod, exp, x, y;
  + 	uint8 inr[SEC_MODULUS_SIZE];
  + 	int outlen;
  +@@ -290,7 +290,8 @@
  + 	memcpy(inr, in, len);
  + 	reverse(inr, len);
  + 
  +-	BN_CTX_init(&ctx);
  ++	ctx = BN_CTX_new();
  ++	BN_CTX_init(ctx);
  + 	BN_init(&mod);
  + 	BN_init(&exp);
  + 	BN_init(&x);
  +@@ -299,7 +300,7 @@
  + 	BN_bin2bn(modulus, SEC_MODULUS_SIZE, &mod);
  + 	BN_bin2bn(exponent, SEC_EXPONENT_SIZE, &exp);
  + 	BN_bin2bn(inr, len, &x);
  +-	BN_mod_exp(&y, &x, &exp, &mod, &ctx);
  ++	BN_mod_exp(&y, &x, &exp, &mod, ctx);
  + 	outlen = BN_bn2bin(&y, out);
  + 	reverse(out, outlen);
  + 	if (outlen < SEC_MODULUS_SIZE)
  +@@ -309,7 +310,7 @@
  + 	BN_clear_free(&x);
  + 	BN_free(&exp);
  + 	BN_free(&mod);
  +-	BN_CTX_free(&ctx);
  ++	BN_CTX_free(ctx);
  + }
  + 
  + 
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/rdesktop/rdesktop.spec
  ============================================================================
  $ cvs diff -u -r1.12 -r1.13 rdesktop.spec
  --- openpkg-src/rdesktop/rdesktop.spec	30 Dec 2002 22:06:27 -0000	1.12
  +++ openpkg-src/rdesktop/rdesktop.spec	31 Dec 2002 11:11:50 -0000	1.13
  @@ -37,17 +37,18 @@
   Group:        Terminal
   License:      GPL
   Version:      %{V_major}.%{V_patch_here}
  -Release:      20020517
  +Release:      20021231
   
   #   list of sources
   Source0:      http://osdn.dl.sourceforge.net/sourceforge/rdesktop/rdesktop-%{V_major}.tar.gz
   Patch0:       http://bibl4.oru.se/projects/rdesktop/rdesktop-unified-patch%{V_patch_real}.bz2
  +Patch1:       rdesktop.patch
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, make, gcc, X11, openssl
  -PreReq:       OpenPKG, openpkg >= 20020206, X11
  +BuildPreReq:  OpenPKG, openpkg >= 20021230, make, gcc, X11, openssl
  +PreReq:       OpenPKG, openpkg >= 20021230, X11
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -61,11 +62,10 @@
   
   %prep
       %setup -q -n rdesktop-%{V_major}
  -    %patch -p2
  +    %patch0 -p2
  +    %patch1 -p0
   
   %build
  -    CC="%{l_cc}" \
  -    CFLAGS="%{l_cflags -O}" \
       ./configure \
           --prefix=$RPM_BUILD_ROOT%{l_prefix} \
           --with-openssl=%{l_prefix} \
  @@ -74,7 +74,8 @@
           --with-gui=xwin \
           --with-gui-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
           --with-gui-libs=`%{l_prefix}/etc/rc --query x11_libdir`
  -    %{l_make} %{l_mflags} all
  +    %{l_make} %{l_mflags} all \
  +        CC="%{l_cc} %{l_cflags -O} %{l_cppflags}"
   
   %install
       rm -rf $RPM_BUILD_ROOT
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.2476 -r1.2477 news.txt
  --- openpkg-web/news.txt	31 Dec 2002 10:00:31 -0000	1.2476
  +++ openpkg-web/news.txt	31 Dec 2002 11:11:49 -0000	1.2477
  @@ -1,3 +1,4 @@
  +31-Dec-2002: Upgraded package: P<rdesktop-1.1.0.19.9.0-20021231>
   31-Dec-2002: Upgraded package: P<curl-7.10.2-20021231>
   31-Dec-2002: Upgraded package: P<openssl-0.9.7-20021231>
   31-Dec-2002: Upgraded package: P<perl-5.8.0-20021231>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org
[prev in list] [next in list] [prev in thread] [next in thread]