[Pkg-cyrus-sasl2-commits] r303 - in /cyrus-sasl-2.1/branches/heimdal/debian: changelog control copyright patches/0016_pid_file_lock_creation_mask.dpatch patches/0017_db4.6.dpatch patches/00list
fabbe at users.alioth.debian.org
fabbe at users.alioth.debian.org
Mon Jan 7 17:19:46 UTC 2008
Author: fabbe
Date: Mon Jan 7 17:19:46 2008
New Revision: 303
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=303
Log:
Sync with main package.
Added:
cyrus-sasl-2.1/branches/heimdal/debian/patches/0016_pid_file_lock_creation_mask.dpatch (with props)
cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.6.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/copyright
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=303&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/changelog (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/changelog Mon Jan 7 17:19:46 2008
@@ -1,9 +1,12 @@
-cyrus-sasl2-heimdal (2.1.22.dfsg1-17) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
+cyrus-sasl2-heimdal (2.1.22.dfsg1-17) unstable; urgency=low
+
+ [ Roberto C. Sanchez ]
* debian/control: Add Vcs-Broswer and Vcs-Svn tags.
- -- Roberto C. Sanchez <roberto at connexer.com> Wed, 31 Oct 2007 10:31:45 -0400
+ [ Fabian Fagerholm ]
+ * Version sync with main package.
+
+ -- Fabian Fagerholm <fabbe at debian.org> Mon, 07 Jan 2008 19:12:13 +0200
cyrus-sasl2-heimdal (2.1.22.dfsg1-16) 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=303&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/control (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/control Mon Jan 7 17:19:46 2008
@@ -4,7 +4,7 @@
Maintainer: Debian Cyrus SASL Team <pkg-cyrus-sasl2-debian-devel at lists.alioth.debian.org>
Uploaders: Fabian Fagerholm <fabbe at debian.org>, Roberto C. Sanchez <roberto at connexer.com>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5.0.0), dpatch, autotools-dev, automake1.9, autoconf, libtool, libdb4.2-dev (>= 4.2.52-24), 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-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-Svn: svn://svn.debian.org/svn/pkg-cyrus-sasl2/
Modified: cyrus-sasl-2.1/branches/heimdal/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/copyright?rev=303&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/copyright (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/copyright Mon Jan 7 17:19:46 2008
@@ -47,3 +47,18 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+
+The saslfinger utility was downaloaded from
+http://postfix.state-of-mind.de/patrick.koetter/saslfinger/
+
+The following copyright and license terms apply:
+
+Copyright © 2004 Patrick Koetter
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
+
+On Debian systems, the complete text of the GNU General Public License,
+version 3, can be found in /usr/share/common-licenses/GPL-3.
Added: cyrus-sasl-2.1/branches/heimdal/debian/patches/0016_pid_file_lock_creation_mask.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/patches/0016_pid_file_lock_creation_mask.dpatch?rev=303&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/patches/0016_pid_file_lock_creation_mask.dpatch (added)
+++ cyrus-sasl-2.1/branches/heimdal/debian/patches/0016_pid_file_lock_creation_mask.dpatch Mon Jan 7 17:19:46 2008
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar <sam at zoy.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: pid_file_lock is created with a mask of 644 instead of 0644.
+## DP: This patch fixes this octal/decimal confusion as well as the
+## DP: (harmless) one in the previous umask() call.
+
+ at DPATCH@
+diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c
+--- trunk~/saslauthd/saslauthd-main.c 2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/saslauthd-main.c 2007-06-26 12:07:10.000000000 +0300
+@@ -276,7 +276,7 @@
+ exit(1);
+ }
+
+- umask(077);
++ umask(0077);
+
+ pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1;
+ if ((pid_file_lock = malloc(pid_file_size)) == NULL) {
+@@ -287,7 +287,7 @@
+ strlcpy(pid_file_lock, run_path, pid_file_size);
+ strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size);
+
+- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) {
++ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) {
+ rc = errno;
+ logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock);
+ logger(L_ERR, L_FUNC, "open: %s", strerror(rc));
Propchange: cyrus-sasl-2.1/branches/heimdal/debian/patches/0016_pid_file_lock_creation_mask.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.6.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.6.dpatch?rev=303&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.6.dpatch (added)
+++ cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.6.dpatch Mon Jan 7 17:19:46 2008
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0017_db4.6.dpatch by <martin.pitt at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Support and build against db4.6.
+
+ at DPATCH@
+diff -urNad trunk~/aclocal.m4 trunk/aclocal.m4
+--- trunk~/aclocal.m4 2008-01-07 13:15:47.000000000 +0200
++++ trunk/aclocal.m4 2008-01-07 13:18:00.000000000 +0200
+@@ -1691,7 +1691,7 @@
+ fi
+
+ saved_LIBS=$LIBS
+- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++ for dbname in db-4.6 db4.6 db46 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+ do
+ LIBS="$saved_LIBS -l$dbname"
+ AC_TRY_LINK([#include <db.h>],
+diff -urNad trunk~/cmulocal/berkdb.m4 trunk/cmulocal/berkdb.m4
+--- trunk~/cmulocal/berkdb.m4 2008-01-07 13:15:48.000000000 +0200
++++ trunk/cmulocal/berkdb.m4 2008-01-07 13:18:01.000000000 +0200
+@@ -213,7 +213,7 @@
+ fi
+
+ saved_LIBS=$LIBS
+- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++ for dbname in db-4.6 db4.6 db46 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+ do
+ LIBS="$saved_LIBS -l$dbname"
+ AC_TRY_LINK([#include <db.h>],
+diff -urNad trunk~/saslauthd/aclocal.m4 trunk/saslauthd/aclocal.m4
+--- trunk~/saslauthd/aclocal.m4 2008-01-07 13:17:52.000000000 +0200
++++ trunk/saslauthd/aclocal.m4 2008-01-07 13:18:23.000000000 +0200
+@@ -2016,7 +2016,7 @@
+ fi
+
+ saved_LIBS=$LIBS
+- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++ for dbname in db-4.6 db4.6 db46 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+ do
+ LIBS="$saved_LIBS -l$dbname"
+ AC_TRY_LINK([#include <db.h>],
Propchange: cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.6.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=303&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/patches/00list (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/patches/00list Mon Jan 7 17:19:46 2008
@@ -13,3 +13,5 @@
0013_fix_hurd_build
0014_avoid_pic_overwrite
0015_saslutil_decode64_fix
+0016_pid_file_lock_creation_mask
+0017_db4.6
More information about the Pkg-cyrus-sasl2-commits
mailing list