push patch documentation to patches

6 files changed, 43 insertions, 37 deletions

diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-pgsql-include.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-pgsql-include.patch
index 90afd85147fd..0ee7236d4ab4 100644
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-pgsql-include.patch
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-pgsql-include.patch
@@ -1,5 +1,7 @@
---- configure.in.orig	2004-01-15 13:18:24.000000000 -0800
-+++ configure.in	2004-01-15 13:18:27.000000000 -0800
+Fix include path for newer PostgreSQL versions
+
+--- configure.in
++++ configure.in
 @@ -674,7 +674,9 @@
       LIB_PGSQL_DIR=$LIB_PGSQL
       LIB_PGSQL="$LIB_PGSQL -lpq"
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-checkpw.c.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-checkpw.c.patch
index f7bf44b79416..1779babaa71a 100644
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-checkpw.c.patch
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.19-checkpw.c.patch
@@ -1,6 +1,9 @@
-diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in
---- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in	2004-07-02 21:40:15.000000000 +0200
-+++ ./lib/Makefile.in	2004-09-07 13:21:22.746680576 +0200
+Support for crypted passwords
+
+http://bugs.gentoo.org/45181
+
+--- cyrus-sasl-2.1.19/lib/Makefile.in
++++ cyrus-sasl-2.1.19/lib/Makefile.in
 @@ -120,7 +120,7 @@
  JAVA_TRUE = @JAVA_TRUE@
  LDFLAGS = @LDFLAGS@
@@ -10,9 +13,8 @@ diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in
  LIBTOOL = @LIBTOOL@
  LIB_CRYPT = @LIB_CRYPT@
  LIB_DES = @LIB_DES@
-diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c
---- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c	2004-03-17 14:58:13.000000000 +0100
-+++ ./lib/checkpw.c	2004-09-07 13:21:12.645916147 +0200
+--- cyrus-sasl-2.1.19/lib/checkpw.c
++++ cyrus-sasl-2.1.19/lib/checkpw.c
 @@ -94,6 +94,23 @@
  # endif
  #endif
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-crypt.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-crypt.patch
index 8ac468794462..fd356327b4f2 100644
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-crypt.patch
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-crypt.patch
@@ -1,6 +1,7 @@
-diff -urpN cyrus-sasl-2.1.22-orig/lib/Makefile.am cyrus-sasl-2.1.22/lib/Makefile.am
---- cyrus-sasl-2.1.22-orig/lib/Makefile.am	2006-05-17 16:46:13.000000000 +0000
-+++ cyrus-sasl-2.1.22/lib/Makefile.am	2006-10-24 15:20:36.000000000 +0000
+http://bugs.gentoo.org/152544
+
+--- cyrus-sasl-2.1.22/lib/Makefile.am
++++ cyrus-sasl-2.1.22/lib/Makefile.am
 @@ -45,6 +45,7 @@ sasl_version = 2:22:0
  
  INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
@@ -9,9 +10,8 @@ diff -urpN cyrus-sasl-2.1.22-orig/lib/Makefile.am cyrus-sasl-2.1.22/lib/Makefile
  EXTRA_DIST = windlopen.c staticopen.h NTMakefile
  EXTRA_LIBRARIES = libsasl2.a
  noinst_LIBRARIES = @SASL_STATIC_LIBS@
-diff -urpN cyrus-sasl-2.1.22-orig/plugins/Makefile.am cyrus-sasl-2.1.22/plugins/Makefile.am
---- cyrus-sasl-2.1.22-orig/plugins/Makefile.am	2006-05-17 16:46:16.000000000 +0000
-+++ cyrus-sasl-2.1.22/plugins/Makefile.am	2006-10-24 15:19:38.000000000 +0000
+--- cyrus-sasl-2.1.22/plugins/Makefile.am
++++ cyrus-sasl-2.1.22/plugins/Makefile.am
 @@ -63,6 +63,7 @@ srp_version = 2:22:0
  
  INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
@@ -20,9 +20,8 @@ diff -urpN cyrus-sasl-2.1.22-orig/plugins/Makefile.am cyrus-sasl-2.1.22/plugins/
  
  COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
  
-diff -urpN cyrus-sasl-2.1.22-orig/sasldb/Makefile.am cyrus-sasl-2.1.22/sasldb/Makefile.am
---- cyrus-sasl-2.1.22-orig/sasldb/Makefile.am	2006-05-17 16:46:17.000000000 +0000
-+++ cyrus-sasl-2.1.22/sasldb/Makefile.am	2006-10-24 15:20:10.000000000 +0000
+--- cyrus-sasl-2.1.22/sasldb/Makefile.am
++++ cyrus-sasl-2.1.22/sasldb/Makefile.am
 @@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
  
  extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
@@ -31,9 +30,8 @@ diff -urpN cyrus-sasl-2.1.22-orig/sasldb/Makefile.am cyrus-sasl-2.1.22/sasldb/Ma
  EXTRA_DIST = NTMakefile
  
  noinst_LTLIBRARIES = libsasldb.la
-diff -urpN cyrus-sasl-2.1.22-orig/utils/Makefile.am cyrus-sasl-2.1.22/utils/Makefile.am
---- cyrus-sasl-2.1.22-orig/utils/Makefile.am	2006-05-18 18:34:26.000000000 +0000
-+++ cyrus-sasl-2.1.22/utils/Makefile.am	2006-10-24 15:12:39.000000000 +0000
+--- cyrus-sasl-2.1.22/utils/Makefile.am
++++ cyrus-sasl-2.1.22/utils/Makefile.am
 @@ -42,7 +42,7 @@
  #
  ################################################################
@@ -43,9 +41,8 @@ diff -urpN cyrus-sasl-2.1.22-orig/utils/Makefile.am cyrus-sasl-2.1.22/utils/Make
  all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
  
  sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer
-diff -urpN cyrus-sasl-2.1.22-orig/sample/Makefile.am cyrus-sasl-2.1.22/sample/Makefile.am
---- cyrus-sasl-2.1.22-orig/sample/Makefile.am	2004-03-10 15:44:55.000000000 +0000
-+++ cyrus-sasl-2.1.22/sample/Makefile.am	2006-10-24 16:03:22.000000000 +0000
+--- cyrus-sasl-2.1.22/sample/Makefile.am
++++ cyrus-sasl-2.1.22/sample/Makefile.am
 @@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c
  server_SOURCES = server.c common.c common.h
  client_SOURCES = client.c common.c common.h
@@ -61,8 +58,8 @@ diff -urpN cyrus-sasl-2.1.22-orig/sample/Makefile.am cyrus-sasl-2.1.22/sample/Ma
 +sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
  
  EXTRA_DIST = NTMakefile
---- cyrus-sasl-2.1.22-orig/lib/Makefile.am	2006-10-24 16:51:41.000000000 +0000
-+++ cyrus-sasl-2.1.22/lib/Makefile.am	2006-10-24 16:51:10.000000000 +0000
+--- cyrus-sasl-2.1.22/lib/Makefile.am
++++ cyrus-sasl-2.1.22/lib/Makefile.am
 @@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la
  libsasl2_la_SOURCES = $(common_sources) $(common_headers)
  libsasl2_la_LDFLAGS = -version-info $(sasl_version)
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-db4.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-db4.patch
index 2ce8f79b4325..6d9930e67d4e 100644
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-db4.patch
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-db4.patch
@@ -1,5 +1,9 @@
---- cyrus-sasl-2.1.22/cmulocal/berkdb.m4.orig	2007-10-02 10:10:07.000000000 -0700
-+++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4	2007-10-02 10:28:14.000000000 -0700
+support new db versions
+
+http://bugs.gentoo.org/192753
+
+--- cyrus-sasl-2.1.22/cmulocal/berkdb.m4
++++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4
 @@ -213,7 +213,7 @@
  	fi
  
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch
index 0d4d2d2eac48..e2621278ba12 100644
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch
@@ -1,8 +1,9 @@
-Bug #248738
+fix warnings with gcc-4.4
 
-diff -Naurp cyrus-sasl-2.1.22-orig/plugins/digestmd5.c cyrus-sasl-2.1.22/plugins/digestmd5.c
---- cyrus-sasl-2.1.22-orig/plugins/digestmd5.c	2006-05-17 10:46:17.000000000 -0600
-+++ cyrus-sasl-2.1.22/plugins/digestmd5.c	2008-11-24 23:39:11.000000000 -0600
+http://bugs.gentoo.org/248738
+
+--- cyrus-sasl-2.1.22/plugins/digestmd5.c
++++ cyrus-sasl-2.1.22/plugins/digestmd5.c
 @@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv
  	"DIGEST-MD5",			/* mech_name */
  #ifdef WITH_RC4
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-qa.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-qa.patch
index 891eb47eba04..4f7b04f135a7 100644
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-qa.patch
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-qa.patch
@@ -1,6 +1,7 @@
-diff -urNp cyrus-sasl-2.1.22.org/lib/auxprop.c cyrus-sasl-2.1.22/lib/auxprop.c
---- cyrus-sasl-2.1.22.org/lib/auxprop.c	2006-03-14 16:23:55.000000000 +0200
-+++ cyrus-sasl-2.1.22/lib/auxprop.c	2007-02-03 16:28:26.000000000 +0200
+fix missing prototype warnings
+
+--- cyrus-sasl-2.1.22/lib/auxprop.c
++++ cyrus-sasl-2.1.22/lib/auxprop.c
 @@ -43,6 +43,7 @@
   */
  
@@ -9,9 +10,8 @@ diff -urNp cyrus-sasl-2.1.22.org/lib/auxprop.c cyrus-sasl-2.1.22/lib/auxprop.c
  #include <sasl.h>
  #include <prop.h>
  #include <ctype.h>
-diff -urNp cyrus-sasl-2.1.22.org/pwcheck/pwcheck_getspnam.c cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
---- cyrus-sasl-2.1.22.org/pwcheck/pwcheck_getspnam.c	1999-08-26 19:22:44.000000000 +0300
-+++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c	2007-02-03 16:29:34.000000000 +0200
+--- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
++++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
 @@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF
  ******************************************************************/