[Python-modules-commits] [python-udatetime] 05/07: Update d/patches

[Ilias Tsitsimpis]

This is an automated email from the git hooks/post-receive script.

iliastsi-guest pushed a commit to branch debian/master
in repository python-udatetime.

commit 66dd80b93c992ba990fab2f304baf72521b56c8a
Author: Ilias Tsitsimpis <iliastsi at debian.org>
Date:   Sat Sep 16 11:16:44 2017 +0300

    Update d/patches
    
    - Drop Move-rfc3339-module-under-udatetime, applied upstream
    - Drop Fix-out-of-bounds-read, applied upstream
---
 .../0001-Move-rfc3339-module-under-udatetime.patch | 81 ----------------------
 debian/patches/0002-Fix-out-of-bounds-read.patch   | 28 --------
 debian/patches/series                              |  2 -
 3 files changed, 111 deletions(-)

diff --git a/debian/patches/0001-Move-rfc3339-module-under-udatetime.patch b/debian/patches/0001-Move-rfc3339-module-under-udatetime.patch
deleted file mode 100644
index 8c64317..0000000
--- a/debian/patches/0001-Move-rfc3339-module-under-udatetime.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 5a73920f21b04d1a6f17d739bb2e252cc767bb8c Mon Sep 17 00:00:00 2001
-From: Ilias Tsitsimpis <iliastsi at debian.org>
-Date: Thu, 3 Aug 2017 19:33:41 +0300
-Subject: Move rfc3339 module under udatetime
-
-There is already an rfc3339 module, provided by the rfc3339 Python
-package, so move ours under udatetime.
-
-Bug: https://github.com/freach/udatetime/issues/19
----
- setup.py              | 2 +-
- src/rfc3339.c         | 8 ++++----
- udatetime/__init__.py | 2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 97ddf04..3269288 100644
---- a/setup.py
-+++ b/setup.py
-@@ -30,7 +30,7 @@ elif sys.version_info.major == 3:
-     macros.append(('_PYTHON3', '1'))
- 
- rfc3339 = Extension(
--    'rfc3339',
-+    'udatetime.rfc3339',
-     ['./src/rfc3339.c'],
-     define_macros=macros,
-     extra_compile_args=['-Ofast', '-std=c99']
-diff --git a/src/rfc3339.c b/src/rfc3339.c
-index e637c4f..16b80ed 100644
---- a/src/rfc3339.c
-+++ b/src/rfc3339.c
-@@ -615,7 +615,7 @@ static PyMethodDef FixedOffset_methods[] = {
- #ifdef _PYTHON3
- static PyTypeObject FixedOffset_type = {
-     PyVarObject_HEAD_INIT(NULL, 0)
--    "rfc3339.FixedOffset_type",             /* tp_name */
-+    "udatetime.rfc3339.FixedOffset_type",   /* tp_name */
-     sizeof(FixedOffset),                    /* tp_basicsize */
-     0,                                      /* tp_itemsize */
-     0,                                      /* tp_dealloc */
-@@ -640,7 +640,7 @@ static PyTypeObject FixedOffset_type = {
- static PyTypeObject FixedOffset_type = {
-     PyObject_HEAD_INIT(NULL)
-     0,                         /*ob_size*/
--    "rfc3339.FixedOffset_type", /*tp_name*/
-+    "udatetime.rfc3339.FixedOffset_type", /*tp_name*/
-     sizeof(FixedOffset),       /*tp_basicsize*/
-     0,                         /*tp_itemsize*/
-     0,                         /*tp_dealloc*/
-@@ -973,7 +973,7 @@ static PyMethodDef rfc3339_methods[] = {
- #ifdef _PYTHON3
- static struct PyModuleDef Python3_module = {
-     PyModuleDef_HEAD_INIT,
--    "rfc3339",
-+    "udatetime.rfc3339",
-     NULL,
-     -1,
-     rfc3339_methods,
-@@ -1001,7 +1001,7 @@ initrfc3339(void)
- #ifdef _PYTHON3
-     m = PyModule_Create(&Python3_module);
- #else
--    m = Py_InitModule("rfc3339", rfc3339_methods);
-+    m = Py_InitModule("udatetime.rfc3339", rfc3339_methods);
- #endif
- 
-     if (m == NULL)
-diff --git a/udatetime/__init__.py b/udatetime/__init__.py
-index 5e71a2e..ca6fd42 100644
---- a/udatetime/__init__.py
-+++ b/udatetime/__init__.py
-@@ -17,7 +17,7 @@ if __pypy__:
-         TZFixedOffset
-     )
- else:
--    from rfc3339 import (
-+    from udatetime.rfc3339 import (
-         utcnow,
-         now,
-         from_rfc3339_string as from_string,
diff --git a/debian/patches/0002-Fix-out-of-bounds-read.patch b/debian/patches/0002-Fix-out-of-bounds-read.patch
deleted file mode 100644
index 904fb36..0000000
--- a/debian/patches/0002-Fix-out-of-bounds-read.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a054d1bc0b7df936f11ef7c6cbcbb8a516efe4f9 Mon Sep 17 00:00:00 2001
-From: Ilias Tsitsimpis <iliastsi at debian.org>
-Date: Sun, 6 Aug 2017 11:11:30 +0300
-Subject: Fix out-of-bounds read
-
-Increase the size of the fractions buffer to 7, to include the
-terminating null byte ('\0'). Otherwise sscanf() will read past the
-buffer area with unpredictable results.
-
-Forwarded: https://github.com/freach/udatetime/pull/20
-Bug-Debian: https://bugs.debian.org/870887
----
- src/rfc3339.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rfc3339.c b/src/rfc3339.c
-index 16b80ed..1ca8717 100644
---- a/src/rfc3339.c
-+++ b/src/rfc3339.c
-@@ -256,7 +256,7 @@ static void _parse_time(char *time_string, time_struct *t) {
-     // check for fractions
-     if (*tokens == '.') {
-         tokens++;
--        char fractions[6] = {0};
-+        char fractions[7] = {0};
- 
-         // Substring fractions, max 6 digits for usec
-         for (unsigned int i = 0; i < 6; i++) {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 24ba091..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Move-rfc3339-module-under-udatetime.patch
-0002-Fix-out-of-bounds-read.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-udatetime.git