This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2005-11-08 10:25:16 UTC Jakub Bogusz <qboosh@pld-linux.org> '- updated to 1.2.9'
Cherrypick from master 2004-06-21 20:02:36 UTC Jakub Bogusz <qboosh@pld-linux.org> '- updated for 1.0.14':
    gnutls-fix.patch -> 1.3

diff --git a/gnutls-fix.patch b/gnutls-fix.patch
new file mode 100644 (file)
index 0000000..54d05ce
--- /dev/null
+++ b/gnutls-fix.patch
@@ -0,0 +1,38 @@
+--- gnutls-1.0.14/doc/manpages/srptool.1.orig  2004-05-08 12:52:29.000000000 +0200
++++ gnutls-1.0.14/doc/manpages/srptool.1       2004-06-21 21:48:33.859329624 +0200
+@@ -2,6 +2,8 @@
+ .SH NAME
+ srptool \- Simple SRP password tool
+ .SH SYNOPSIS
++srptool [\fIoptions\fR]
++.PP
+ gnutls\-srpcrypt [\fIoptions\fR]
+ .SH DESCRIPTION
+ Very simple program that emulates the programs in the Stanford SRP
+@@ -34,7 +36,7 @@
+ 
+ .RS
+ .nf
+-$ gnutls\-srpcrypt \-\-create\-conf /etc/tpasswd.conf
++$ srptool \-\-create\-conf /etc/tpasswd.conf
+ .fi
+ .RE
+ 
+@@ -44,7 +46,7 @@
+ 
+ .RS
+ .nf
+-$ gnutls\-srpcrypt \-\-passwd /etc/tpasswd \\
++$ srptool \-\-passwd /etc/tpasswd \\
+     \-\-passwd\-conf /etc/tpasswd.conf \-u test
+ .fi
+ .RE
+@@ -54,7 +56,7 @@
+ 
+ .RS
+ .nf
+-$ gnutls\-srpcrypt \-\-passwd /etc/tpasswd \\
++$ srptool \-\-passwd /etc/tpasswd \\
+     \-\-passwd\-conf /etc/tpasswd.conf \-\-verify \-u test
+ .fi
+ .RE