Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/sslwrap/files: sslwrap-2.0.6-build.patch
Date: Sun, 02 Dec 2012 04:45:55
Message-Id: 20121202044545.8558C2171D@flycatcher.gentoo.org
1 ssuominen 12/12/02 04:45:45
2
3 Modified: sslwrap-2.0.6-build.patch
4 Log:
5 Tidy, add bugzilla links to the patch
6
7 (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
8
9 Revision Changes Path
10 1.2 net-misc/sslwrap/files/sslwrap-2.0.6-build.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch?r1=1.1&r2=1.2
15
16 Index: sslwrap-2.0.6-build.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- sslwrap-2.0.6-build.patch 2 Dec 2012 04:41:01 -0000 1.1
23 +++ sslwrap-2.0.6-build.patch 2 Dec 2012 04:45:45 -0000 1.2
24 @@ -1,6 +1,9 @@
25 -diff -ur sslwrap206.orig/apps.h sslwrap206/apps.h
26 ---- sslwrap206.orig/apps.h 2000-11-12 00:01:25.000000000 +0200
27 -+++ sslwrap206/apps.h 2012-12-02 06:27:36.774823569 +0200
28 +http://bugs.gentoo.org/34151
29 +http://bugs.gentoo.org/146828
30 +http://bugs.gentoo.org/335001
31 +
32 +--- apps.h
33 ++++ apps.h
34 @@ -65,9 +65,9 @@
35 #include "../e_os.h"
36 #endif
37 @@ -14,9 +17,8 @@
38 /*#include "progs.h"*/
39
40 #ifdef WIN16
41 -diff -ur sslwrap206.orig/Makefile sslwrap206/Makefile
42 ---- sslwrap206.orig/Makefile 2000-11-12 00:01:25.000000000 +0200
43 -+++ sslwrap206/Makefile 2012-12-02 06:34:57.362496172 +0200
44 +--- Makefile
45 ++++ Makefile
46 @@ -1,28 +1,9 @@
47 -
48 SRC = s_server.c s_socket.c s_cb.c
49 @@ -49,9 +51,8 @@
50 -
51 -
52 -
53 -diff -ur sslwrap206.orig/s_cb.c sslwrap206/s_cb.c
54 ---- sslwrap206.orig/s_cb.c 2000-11-12 00:01:25.000000000 +0200
55 -+++ sslwrap206/s_cb.c 2012-12-02 06:27:36.078783978 +0200
56 +--- s_cb.c
57 ++++ s_cb.c
58 @@ -63,9 +63,9 @@
59 #include "apps.h"
60 #undef NON_MAIN
61 @@ -65,22 +66,8 @@
62 #include "s_apps.h"
63
64 int verify_depth=0;
65 -diff -ur sslwrap206.orig/s_server.c sslwrap206/s_server.c
66 ---- sslwrap206.orig/s_server.c 2000-11-12 00:11:18.000000000 +0200
67 -+++ sslwrap206/s_server.c 2012-12-02 06:27:36.080784083 +0200
68 -@@ -27,11 +27,7 @@
69 - * Version 2.0.5
70 - * Compatibility with OpenSSL 0.9.4
71 - *
72 -- * Version 2.0.6
73 -- * Changed Malloc to malloc and Free to free
74 -- * Changed #include "err.h" to #include OPENSSL"err.h"
75 -- *
76 -- * Copyright 1997-9, 2000 Rick R. Kaseguma
77 -+ * Copyright 1997-9 Rick R. Kaseguma
78 - * All rights reserved
79 - *
80 - * Feel free to use this as you want for commercial or non-commercial use,
81 +--- s_server.c
82 ++++ s_server.c
83 @@ -121,14 +117,14 @@
84 #ifdef WIN16
85 #define APPS_WIN16
86 @@ -129,9 +116,8 @@
87 }
88
89 return(ret);
90 -diff -ur sslwrap206.orig/s_socket.c sslwrap206/s_socket.c
91 ---- sslwrap206.orig/s_socket.c 2000-11-12 00:03:47.000000000 +0200
92 -+++ sslwrap206/s_socket.c 2012-12-02 06:27:36.081784132 +0200
93 +--- s_socket.c
94 ++++ s_socket.c
95 @@ -67,7 +67,7 @@
96 #undef USE_SOCKETS
97 #undef NON_MAIN