Tidy, add bugzilla links to the patch

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

2 files changed, 22 insertions, 36 deletions

diff --git a/net-misc/sslwrap/Manifest b/net-misc/sslwrap/Manifest
index 5d1c91b6f09e..ebf5c2bc6f05 100644
--- a/net-misc/sslwrap/Manifest
+++ b/net-misc/sslwrap/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX 2.0.6-openssl-0.9.7.patch 459 SHA256 742968e1c4b73b50930e84908e4043e47735b97ed8c4d5e9156dc8e78352ebd1 SHA512 c7fe25f8e3e95a1e89bd50bc225625d60081650b82dc013426bda205391f81fcf8bc8beaae4e062585ede485c580e0d4cb0e54945583aba330a716c6dd9ca1d7 WHIRLPOOL 486bb18d0765abf43fc782283cc88826f4d8961051f353524fc55add3242ae39a35e48bb520c7d2b2ed821bde78c5339183f58634416f8c14bf1f616ca3ed8ef
-AUX sslwrap-2.0.6-build.patch 4071 SHA256 3a270182e17cf80f712f266df29d87f72f77222ef20bbdc79ae51f251245866b SHA512 f8018bac13a692469bbee036b69cc888b090b42dc3414e86ab73c9161996e27b34875c6aaac463123189253b1ce6512da7fad2985612af6196c345647e0e956f WHIRLPOOL cf829c74de9a37de3807d2351fd9a22c3eb27f91ccf7cc9e94125d75f6b36b768bed50a823020336992d5c877d2341a5c6bfd8e8df5a4183233b94017e59636d
+AUX sslwrap-2.0.6-build.patch 3008 SHA256 4b0fac341cb8be7756706d56afe3df47ad593e43227cb315c60ba7becdb87c55 SHA512 fa6fe2bd63c37d772eb7a943558f1d1ef1db4376532467d6c6f6483f94098df8143868d01c16271c4672e6736b627c969eed001da6d492df780c7e6ba41fe937 WHIRLPOOL 9460c0752256f04b338bf4208c00bb3950bfcd2d600fecdcb558075c1f2bb0390936df74b70ef764829b0ef06fb433832ea88dc7ffcec6c6fe38917a486da234
 DIST sslwrap-2.0.6.tar.gz 21170 SHA256 596a1bf61a457662e754b9fcfec6b3df7fb2f6c88498bd76ef8027f08c3af336 SHA512 627c25bdf45245f9b3e8d03272fc46a0ef8d1c356e2b7990898b07267c2bbb28efd13d5ca97d330ce7369eedd2d20b5fa781f2e1a00ac732407e06d0b3a8890d WHIRLPOOL 8d3c6843413d8a77830a3533aa972cc676bf2aa934cb259b3b04a485aedc052551914668efbcff071fcd50fd0f21ea9cd57c702f95d803f06315d92e79fafc89
 DIST sslwrap-gentoo.tar.bz2 10886 SHA256 17e6d7edf48b1b8b6edbf72cbc4b545079192a0f5637317dfbe175e373662a3f SHA512 b08ac8c937ec23842dc6ea32e78a77c21f569c32369a2d73ab7e60acec6a1ff80c7e0cb7f308096cc9c2d67648b4f99df337ca656a6853a50ebc2ac104d55852 WHIRLPOOL dfd06fb56a791b3240d46b36caa76d33698849b748e795d373c45d62664bd578960c39e4850292d56b41200c7c5bdf63dbcb4c190ca76bb06f5860073675cd87
 DIST sslwrap206.tar.gz 21170 SHA256 596a1bf61a457662e754b9fcfec6b3df7fb2f6c88498bd76ef8027f08c3af336
@@ -13,11 +13,11 @@ MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQutveAAoJEEdUh39IaPFNlCIH/iNWqH/Lf4SoS6TB0k6kdKLf
-16rilqjl25iW47eBNTFHwluvGq9g7vDi3X0aWYZa0bac1hOGvJSk/s3GsZ1vjyAi
-8nw17Q1uDrCTkn/qSUV2YE9JAiTJ1I0VWk4ifGujP4SyBIPDMF2cIccVhm5FVM9q
-xBmJNAKSYfiFj+R5b30zXFhuXOYOSpyC5UTogSdQp5LHvRhHU6pLJJ2bOHW6xfkk
-nOMOaU9Veu7cnHEdXvZnPGvy1My+kfk5Khi+lEsNAVOEZztC0mOSsjAelrnqD5bS
-XZ49Pfb3yE0Gnxj65CM41mntTFG77yOP4Zt9T37Mpxm3cNIHAv60FoJTqJ/MrGU=
-=7WQM
+iQEcBAEBCAAGBQJQutz1AAoJEEdUh39IaPFNyc8H/2Rk6lKLX3wDHLp0lc5cv6Ld
+gk7URudW0GQtC56NwAKB3Ky6jR0rxwqtTgk2lPi2QaTUgZwRMFRKS+ACOSORViGO
+Oz2BBk+UV3VDTkVDJuuwFw7sTLwqWMuvvhX+CXKqtqY03JYY/BbCHJTuL7/YDXhp
+9FFRlureaZ6xGV/gc9+6Yp74x7i9Y//Vni75YGQzxP946JGcqredqAj/ggZtVc0+
+n2BLNR7VY/Nmnw4mrQHK6b1nfzs8NUXRsa35ignxtTDRVS9FZuFmL7J77k+mnmGb
+D8oJWqKHmUIO/yZUSPdWkBswGJc0qDvRPmbPYGcl3poq1H0cel8ru36zRr7eIIE=
+=O9Wa
 -----END PGP SIGNATURE-----
diff --git a/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch b/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch
index 7d6ce0c46db3..a797c00b152c 100644
--- a/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch
+++ b/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch
@@ -1,6 +1,9 @@
-diff -ur sslwrap206.orig/apps.h sslwrap206/apps.h
---- sslwrap206.orig/apps.h	2000-11-12 00:01:25.000000000 +0200
-+++ sslwrap206/apps.h	2012-12-02 06:27:36.774823569 +0200
+http://bugs.gentoo.org/34151
+http://bugs.gentoo.org/146828
+http://bugs.gentoo.org/335001
+
+--- apps.h
++++ apps.h
 @@ -65,9 +65,9 @@
  #include "../e_os.h"
  #endif
@@ -14,9 +17,8 @@ diff -ur sslwrap206.orig/apps.h sslwrap206/apps.h
  /*#include "progs.h"*/
  
  #ifdef WIN16
-diff -ur sslwrap206.orig/Makefile sslwrap206/Makefile
---- sslwrap206.orig/Makefile	2000-11-12 00:01:25.000000000 +0200
-+++ sslwrap206/Makefile	2012-12-02 06:34:57.362496172 +0200
+--- Makefile
++++ Makefile
 @@ -1,28 +1,9 @@
 -
  SRC = s_server.c s_socket.c s_cb.c
@@ -49,9 +51,8 @@ diff -ur sslwrap206.orig/Makefile sslwrap206/Makefile
 -
 -
 -
-diff -ur sslwrap206.orig/s_cb.c sslwrap206/s_cb.c
---- sslwrap206.orig/s_cb.c	2000-11-12 00:01:25.000000000 +0200
-+++ sslwrap206/s_cb.c	2012-12-02 06:27:36.078783978 +0200
+--- s_cb.c
++++ s_cb.c
 @@ -63,9 +63,9 @@
  #include "apps.h"
  #undef NON_MAIN
@@ -65,22 +66,8 @@ diff -ur sslwrap206.orig/s_cb.c sslwrap206/s_cb.c
  #include "s_apps.h"
  
  int verify_depth=0;
-diff -ur sslwrap206.orig/s_server.c sslwrap206/s_server.c
---- sslwrap206.orig/s_server.c	2000-11-12 00:11:18.000000000 +0200
-+++ sslwrap206/s_server.c	2012-12-02 06:27:36.080784083 +0200
-@@ -27,11 +27,7 @@
-  * Version 2.0.5
-  * Compatibility with OpenSSL 0.9.4
-  *
-- * Version 2.0.6
-- * Changed Malloc to malloc and Free to free
-- * Changed #include "err.h" to #include OPENSSL"err.h"
-- *
-- * Copyright 1997-9, 2000 Rick R. Kaseguma
-+ * Copyright 1997-9 Rick R. Kaseguma
-  * All rights reserved
-  *
-  * Feel free to use this as you want for commercial or non-commercial use,
+--- s_server.c
++++ s_server.c
 @@ -121,14 +117,14 @@
  #ifdef WIN16
  #define APPS_WIN16
@@ -129,9 +116,8 @@ diff -ur sslwrap206.orig/s_server.c sslwrap206/s_server.c
  		}
  
  	return(ret);
-diff -ur sslwrap206.orig/s_socket.c sslwrap206/s_socket.c
---- sslwrap206.orig/s_socket.c	2000-11-12 00:03:47.000000000 +0200
-+++ sslwrap206/s_socket.c	2012-12-02 06:27:36.081784132 +0200
+--- s_socket.c
++++ s_socket.c
 @@ -67,7 +67,7 @@
  #undef USE_SOCKETS
  #undef NON_MAIN