From 329684b59b8d55dd403c2c59f76d37210ba2f517 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 25 May 2018 23:29:36 +0000
Subject: Fri May 25 23:29:36 UTC 2018

patches/packages/glibc-zoneinfo-2018e-noarch-2_slack13.1.txz:  Rebuilt.
  Handle removal of US/Pacific-New timezone. If we see that the machine is
  using this, it will be automatically switched to US/Pacific.
---
 .../source/gnupg2/gnupg-2.0.14-encode-s2k.patch    | 65 ++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 patches/source/gnupg2/gnupg-2.0.14-encode-s2k.patch

(limited to 'patches/source/gnupg2/gnupg-2.0.14-encode-s2k.patch')

diff --git a/patches/source/gnupg2/gnupg-2.0.14-encode-s2k.patch b/patches/source/gnupg2/gnupg-2.0.14-encode-s2k.patch
new file mode 100644
index 000000000..26c798ee6
--- /dev/null
+++ b/patches/source/gnupg2/gnupg-2.0.14-encode-s2k.patch
@@ -0,0 +1,65 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+NotDashEscaped: You need GnuPG to verify this message
+
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+agent/
+2010-01-26  Werner Koch  <wk@g10code.com>
+
+	* protect.c (do_encryption): Encode the s2kcount and do not use a
+	static value of 96.
+
+--- agent/protect.c	(revision 5231)
++++ agent/protect.c	(working copy)
+@@ -360,19 +360,25 @@
+        
+      in canoncical format of course.  We use asprintf and %n modifier
+      and dummy values as placeholders.  */
+-  p = xtryasprintf
+-    ("(9:protected%d:%s((4:sha18:%n_8bytes_2:96)%d:%n%*s)%d:%n%*s)",
+-     (int)strlen (modestr), modestr,
+-     &saltpos, 
+-     blklen, &ivpos, blklen, "",
+-     enclen, &encpos, enclen, "");
+-  if (!p)
+-    {
+-      gpg_error_t tmperr = out_of_core ();
+-      xfree (iv);
+-      xfree (outbuf);
+-      return tmperr;
+-    }
++  {
++    char countbuf[35];
++
++    snprintf (countbuf, sizeof countbuf, "%lu", get_standard_s2k_count ());
++    p = xtryasprintf
++      ("(9:protected%d:%s((4:sha18:%n_8bytes_%u:%s)%d:%n%*s)%d:%n%*s)",
++       (int)strlen (modestr), modestr,
++       &saltpos, 
++       (unsigned int)strlen (countbuf), countbuf,
++       blklen, &ivpos, blklen, "",
++       enclen, &encpos, enclen, "");
++    if (!p)
++      {
++        gpg_error_t tmperr = out_of_core ();
++        xfree (iv);
++        xfree (outbuf);
++        return tmperr;
++      }
++  }
+   *resultlen = strlen (p);
+   *result = (unsigned char*)p;
+   memcpy (p+saltpos, iv+2*blklen, 8);
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.0-svn5201 (GNU/Linux)
+
+iJwEAQECAAYFAktmpLoACgkQU7Yg0BzgxjCj5wQAyZjQbZM77wdcXIgPgeLsG99W
+esWR89/5VM34dY5tOG+McCAiA4/0hl6CYUkkK/394wcfUXbvbZYARPjJg5wMoZsG
+VufEL+Uz+eLgkejYPVakOWzK00i7MHqDSjttOqHg0d8wSiy3LKk6CN6N19uPqxbI
+/1Io5f3gcroLGfEZlN0=
+=oP/V
+-----END PGP SIGNATURE-----
-- 
cgit v1.2.3-65-gdbad