[Pkg-fedora-ds-maintainers] 389-ds-base: Changes to 'master'

Timo Aaltonen tjaalton at moszumanska.debian.org
Mon Aug 28 12:22:36 UTC 2017


 debian/changelog              |    6 ++++++
 debian/patches/ftbfs-fix.diff |   38 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |    1 +
 3 files changed, 45 insertions(+)

New commits:
commit 5ec24d82826d902c9d42506f603ddff1c3279b30
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Mon Aug 28 15:09:15 2017 +0300

    releasing package 389-ds-base version 1.3.6.7-3

diff --git a/debian/changelog b/debian/changelog
index 8d31576..d937ea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-389-ds-base (1.3.6.7-3) UNRELEASED; urgency=medium
+389-ds-base (1.3.6.7-3) unstable; urgency=medium
 
   * ftbfs-fix.diff: Fix build. (Closes: #873120)
 
- -- Timo Aaltonen <tjaalton at debian.org>  Fri, 25 Aug 2017 08:30:44 +0300
+ -- Timo Aaltonen <tjaalton at debian.org>  Mon, 28 Aug 2017 15:09:02 +0300
 
 389-ds-base (1.3.6.7-2) unstable; urgency=medium
 

commit 1bfa6945244f004af24e43c95b4af89242fb3747
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Mon Aug 28 15:09:00 2017 +0300

    ftbfs-fix.diff: Fix build. (Closes: #873120)

diff --git a/debian/changelog b/debian/changelog
index f91bea5..8d31576 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+389-ds-base (1.3.6.7-3) UNRELEASED; urgency=medium
+
+  * ftbfs-fix.diff: Fix build. (Closes: #873120)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Fri, 25 Aug 2017 08:30:44 +0300
+
 389-ds-base (1.3.6.7-2) unstable; urgency=medium
 
   * control: Bump policy to 4.1.0, no changes.
diff --git a/debian/patches/ftbfs-fix.diff b/debian/patches/ftbfs-fix.diff
new file mode 100644
index 0000000..4ef1721
--- /dev/null
+++ b/debian/patches/ftbfs-fix.diff
@@ -0,0 +1,38 @@
+From 8c0fcc3c262b2ac167509b50776dfacfbedcbdce Mon Sep 17 00:00:00 2001
+From: William Brown <firstyear at redhat.com>
+Date: Mon, 28 Aug 2017 10:05:06 +1000
+Subject: [PATCH] Ticket 49364 - incorrect function declaration.
+
+Bug Description:  The pbkdf2 calculate iterations function had a missing
+argument in the header definition. This would not affect 64bit platforms
+but did affect 32bit environments because of the way that uint64_t is
+structured on these platforms.
+
+Fix Description:  Correct the header definition to include the time
+argument.
+
+https://pagure.io/389-ds-base/issue/49364
+
+Author: wibrown
+
+Review by: ???
+---
+ ldap/servers/plugins/pwdstorage/pwdstorage.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ldap/servers/plugins/pwdstorage/pwdstorage.h b/ldap/servers/plugins/pwdstorage/pwdstorage.h
+index ad877df..f495349 100644
+--- a/ldap/servers/plugins/pwdstorage/pwdstorage.h
++++ b/ldap/servers/plugins/pwdstorage/pwdstorage.h
+@@ -95,7 +95,7 @@ int pbkdf2_sha256_pw_cmp(const char *userpwd, const char *dbpwd);
+ 
+ /* For testing pbkdf2 only */
+ uint64_t pbkdf2_sha256_benchmark_iterations();
+-PRUint32 pbkdf2_sha256_calculate_iterations();
++PRUint32 pbkdf2_sha256_calculate_iterations(uint64_t time_nsec);
+ 
+ /* Utility functions */
+ PRUint32 pwdstorage_base64_decode_len(const char *encval, PRUint32 enclen);
+-- 
+1.8.3.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 065ba16..fd2f267 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fix-obsolete-target.diff
 fix-saslpath.diff
 reproducible-build.diff
 fix-systemctl-path.diff
+ftbfs-fix.diff



More information about the Pkg-fedora-ds-maintainers mailing list