[Pkg-cyrus-sasl2-commits] r322 - in /cyrus-sasl-2.1/branches/heimdal/debian: ./ patches/
fabbe at users.alioth.debian.org
fabbe at users.alioth.debian.org
Mon Feb 18 15:29:09 UTC 2008
Author: fabbe
Date: Mon Feb 18 15:29:09 2008
New Revision: 322
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=322
Log:
Sync with main package.
Added:
cyrus-sasl-2.1/branches/heimdal/debian/patches/0016_pid_file_lock_creation_mask.dpatch
- copied unchanged from r321, cyrus-sasl-2.1/branches/heimdal/debian/patches/0016_pid_file_lock_creation_mask.dpatch
cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.6.dpatch
- copied unchanged from r321, cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.6.dpatch
cyrus-sasl-2.1/branches/heimdal/debian/patches/0018_auth_rimap_quotes.dpatch (with props)
cyrus-sasl-2.1/branches/heimdal/debian/patches/0019_ldap_deprecated.dpatch (with props)
cyrus-sasl-2.1/branches/heimdal/debian/patches/0020_saslauthd_manpage.dpatch (with props)
Modified:
cyrus-sasl-2.1/branches/heimdal/debian/changelog
cyrus-sasl-2.1/branches/heimdal/debian/control
cyrus-sasl-2.1/branches/heimdal/debian/patches/00list
Modified: cyrus-sasl-2.1/branches/heimdal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/changelog?rev=322&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/changelog (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/changelog Mon Feb 18 15:29:09 2008
@@ -4,8 +4,10 @@
[ Fabian Fagerholm ]
* debian/control: We conform to 3.7.3.0 of the Debian policy.
-
- -- Fabian Fagerholm <fabbe at debian.org> Mon, 07 Jan 2008 20:24:39 +0200
+ * debian/control: Change Vcs-Browser to point to human-readable interface.
+ * Version sync with main package.
+
+ -- Fabian Fagerholm <fabbe at debian.org> Mon, 18 Feb 2008 17:19:08 +0200
cyrus-sasl2-heimdal (2.1.22.dfsg1-17) unstable; urgency=low
Modified: cyrus-sasl-2.1/branches/heimdal/debian/control
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/control?rev=322&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/control (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/control Mon Feb 18 15:29:09 2008
@@ -6,7 +6,7 @@
Standards-Version: 3.7.3.0
Build-Depends: debhelper (>= 5.0.0), dpatch, autotools-dev, automake1.9, autoconf, libtool, libdb-dev (>= 4.6.21-1), libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient15-dev (>= 5.0.20-1), libopie-dev (>= 2.32-10), heimdal-dev, libsqlite0-dev (>= 2.8.16-1), libldap2-dev (>= 2.1.30-8), chrpath, groff-base
Build-Conflicts: libkrb5-dev
-Vcs-Browser: http://svn.debian.org/svn/pkg-cyrus-sasl2/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/
Vcs-Svn: svn://svn.debian.org/svn/pkg-cyrus-sasl2/
Package: libsasl2-modules-gssapi-heimdal
Added: cyrus-sasl-2.1/branches/heimdal/debian/patches/0018_auth_rimap_quotes.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/patches/0018_auth_rimap_quotes.dpatch?rev=322&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/patches/0018_auth_rimap_quotes.dpatch (added)
+++ cyrus-sasl-2.1/branches/heimdal/debian/patches/0018_auth_rimap_quotes.dpatch Mon Feb 18 15:29:09 2008
@@ -1,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0016_auth_rimap_quotes.dpatch by <fabbe at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Avoid infinite loop when username/password has a double quote character.
+## DP: Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13
+
+ at DPATCH@
+diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c
+--- etch~/saslauthd/auth_rimap.c 2007-03-29 15:16:20.000000000 +0300
++++ etch/saslauthd/auth_rimap.c 2008-02-13 13:42:53.000000000 +0200
+@@ -162,6 +162,7 @@
+ num_quotes = 0;
+ p1 = s;
+ while ((p1 = strchr(p1, '"')) != NULL) {
++ p1++;
+ num_quotes++;
+ }
+
+@@ -438,7 +439,7 @@
+ syslog(LOG_WARNING, "auth_rimap: writev: %m");
+ memset(qlogin, 0, strlen(qlogin));
+ free(qlogin);
+- memset(qpass, 0, strlen(qlogin));
++ memset(qpass, 0, strlen(qpass));
+ free(qpass);
+ (void)close(s);
+ return strdup(RESP_IERROR);
+@@ -447,7 +448,7 @@
+ /* don't need these any longer */
+ memset(qlogin, 0, strlen(qlogin));
+ free(qlogin);
+- memset(qpass, 0, strlen(qlogin));
++ memset(qpass, 0, strlen(qpass));
+ free(qpass);
+
+ /* read and parse the LOGIN response */
Propchange: cyrus-sasl-2.1/branches/heimdal/debian/patches/0018_auth_rimap_quotes.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: cyrus-sasl-2.1/branches/heimdal/debian/patches/0019_ldap_deprecated.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/patches/0019_ldap_deprecated.dpatch?rev=322&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/patches/0019_ldap_deprecated.dpatch (added)
+++ cyrus-sasl-2.1/branches/heimdal/debian/patches/0019_ldap_deprecated.dpatch Mon Feb 18 15:29:09 2008
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0019_ldap_deprecated.dpatch by dann frazier <dannf at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The function ldap_get_values, used in saslauthd/lak.c, is deprecated.
+## DP: Therefore, its prototype is not included by default when compiling
+## DP: against the ldap.h headers. As a result, the compiler cannot know the
+## DP: return type of the function at compile time, and will implicitly
+## DP: convert to a pointer. This has implications on 64-bit systems.
+## DP: This patch sets the deprecation mode on, so that the function prototype
+## DP: gets included when compiling.
+## DP: (Description by Fabian Fagerholm <fabbe at debian.org>)
+
+ at DPATCH@
+diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c
+--- trunk~/saslauthd/lak.c 2006-06-04 12:26:20.000000000 +0300
++++ trunk/saslauthd/lak.c 2008-02-15 14:32:11.000000000 +0200
+@@ -55,6 +55,7 @@
+ #include <openssl/des.h>
+ #endif
+
++#define LDAP_DEPRECATED 1
+ #include <ldap.h>
+ #include <lber.h>
+ #include <sasl.h>
Propchange: cyrus-sasl-2.1/branches/heimdal/debian/patches/0019_ldap_deprecated.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: cyrus-sasl-2.1/branches/heimdal/debian/patches/0020_saslauthd_manpage.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/patches/0020_saslauthd_manpage.dpatch?rev=322&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/patches/0020_saslauthd_manpage.dpatch (added)
+++ cyrus-sasl-2.1/branches/heimdal/debian/patches/0020_saslauthd_manpage.dpatch Mon Feb 18 15:29:09 2008
@@ -1,0 +1,139 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0020_saslauthd_manpage.dpatch by Thijs Kinkhorst <thijs at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Correct typos in saslauthd man page.
+
+ at DPATCH@
+diff -urNad trunk~/saslauthd/saslauthd.8 trunk/saslauthd/saslauthd.8
+--- trunk~/saslauthd/saslauthd.8 2006-06-04 12:26:20.000000000 +0300
++++ trunk/saslauthd/saslauthd.8 2008-02-18 13:31:32.000000000 +0200
+@@ -37,7 +37,7 @@
+
+ [1m-H [4m[22mhostname[0m
+ The remote host to be contacted by the rimap authentication mech-
+- anism. (Depricated, use -O instead)
++ anism. (Deprecated, use -O instead)
+
+ [1m-m [4m[22mpath[0m
+ Use [4mpath[24m as the pathname to the named socket to listen on for
+@@ -51,7 +51,7 @@
+ Use [4mthreads[24m processes for responding to authentication queries.
+ (default: 5) A value of zero will indicate that saslauthd should
+ fork an individual process for each connection. This can solve
+- leaks that occur in some deployments..
++ leaks that occur in some deployments.
+
+ [1m-s [4m[22msize[0m
+ Use [4msize[24m as the table size of the hash table (in kilobytes)
+@@ -64,7 +64,7 @@
+
+ [1m-h [22mShow usage information
+
+- [1m-c [22mEnable cacheing of authentication credentials
++ [1m-c [22mEnable caching of authentication credentials
+
+ [1m-l [22mDisable the use of a lock file for controlling access to
+ accept().
+@@ -72,7 +72,7 @@
+ [1m-r [22mCombine the realm with the login (with an '@' sign in between).
+ e.g. login: "foo" realm: "bar" will get passed as login:
+ "foo at bar". Note that the realm will still be passed, which may
+- lead to unexpected behavior.
++ lead to unexpected behaviour.
+
+ [1m-v [22mPrint the version number and available authentication mechanisms
+ on standard error, then exit.
+@@ -80,7 +80,7 @@
+ [1m-d [22mDebugging mode.
+
+ [1mLogging[0m
+- [1msaslauthd [22mlogs it's activities via [1msyslogd [22musing the LOG_AUTH facility.
++ [1msaslauthd [22mlogs its activities via [1msyslogd [22musing the LOG_AUTH facility.
+
+ [1mAUTHENTICATION MECHANISMS[0m
+ [1msaslauthd [22msupports one or more "authentication mechanisms", dependent
+@@ -96,7 +96,7 @@
+
+ Authenticate using the [1mgetpwent[22m() library function. Typically
+ this authenticates against the local password file. See your
+- systems getpwent(3) man page for details.
++ system's getpwent(3) man page for details.
+
+ kerberos4 [4m(All[24m [4mplatforms)[0m
+
+@@ -145,7 +145,7 @@
+ sasldb [4m(All[24m [4mplatforms)[0m
+
+ Authenticate against the SASL authentication database. Note
+- that this is probabally not what you want to be using, and is
++ that this is probably not what you want to be using, and is
+ even disabled at compile-time by default. If you want to use
+ sasldb with the SASL library, you probably want to use the
+ pwcheck_method of "auxprop" along with the sasldb auxprop plu-
+diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc
+--- trunk~/saslauthd/saslauthd.mdoc 2006-06-04 12:26:20.000000000 +0300
++++ trunk/saslauthd/saslauthd.mdoc 2008-02-18 13:33:12.000000000 +0200
+@@ -64,7 +64,7 @@
+ .It Fl H Ar hostname
+ The remote host to be contacted by the
+ .Li rimap
+-authentication mechanism. (Depricated, use -O instead)
++authentication mechanism. (Deprecated, use -O instead)
+ .It Fl m Ar path
+ Use
+ .Ar path
+@@ -79,7 +79,7 @@
+ processes for responding to authentication queries. (default: 5) A
+ value of zero will indicate that saslauthd should fork an individual
+ process for each connection. This can solve leaks that occur in some
+-deployments..
++deployments.
+ .It Fl s Ar size
+ Use
+ .Ar size
+@@ -93,13 +93,13 @@
+ .It Fl h
+ Show usage information
+ .It Fl c
+-Enable cacheing of authentication credentials
++Enable caching of authentication credentials
+ .It Fl l
+ Disable the use of a lock file for controlling access to accept().
+ .It Fl r
+ Combine the realm with the login (with an '@' sign in between). e.g.
+ login: "foo" realm: "bar" will get passed as login: "foo at bar". Note that
+-the realm will still be passed, which may lead to unexpected behavior.
++the realm will still be passed, which may lead to unexpected behaviour.
+ .It Fl v
+ Print the version number and available authentication
+ mechanisms on standard error, then exit.
+@@ -108,7 +108,7 @@
+ .El
+ .Ss Logging
+ .Nm
+-logs it's activities via
++logs its activities via
+ .Nm syslogd
+ using the
+ .Dv LOG_AUTH
+@@ -132,7 +132,7 @@
+ Authenticate using the
+ .Fn getpwent
+ library function. Typically this authenticates against the
+-local password file. See your systems
++local password file. See your system's
+ .Xr getpwent 3
+ man page for details.
+ .It Li kerberos4
+@@ -207,8 +207,8 @@
+ .Em (All platforms)
+ .Pp
+ Authenticate against the
+-SASL authentication database. Note that this is probabally not what you
+-want to be using, and is even disabled at compile-time by default.
++SASL authentication database. Note that this is probably not what you
++want to use, and is even disabled at compile-time by default.
+ If you want to use sasldb with the SASL library, you probably want to
+ use the pwcheck_method of "auxprop" along with the sasldb auxprop plugin
+ instead.
Propchange: cyrus-sasl-2.1/branches/heimdal/debian/patches/0020_saslauthd_manpage.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: cyrus-sasl-2.1/branches/heimdal/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/patches/00list?rev=322&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/patches/00list (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/patches/00list Mon Feb 18 15:29:09 2008
@@ -15,3 +15,6 @@
0015_saslutil_decode64_fix
0016_pid_file_lock_creation_mask
0017_db4.6
+0018_auth_rimap_quotes
+0019_ldap_deprecated
+0020_saslauthd_manpage
More information about the Pkg-cyrus-sasl2-commits
mailing list