Hello community,
here is the log from the commit of package python3-setproctitle for openSUSE:Factory checked in at 2015-01-08 23:02:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-setproctitle (Old)
and /work/SRC/openSUSE:Factory/.python3-setproctitle.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-setproctitle"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-setproctitle/python3-setproctitle.changes 2013-06-19 15:49:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python3-setproctitle.new/python3-setproctitle.changes 2015-01-08 23:02:53.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Jan 7 22:36:11 UTC 2015 - arun@gmx.de
+
+- specfile: update copyright year
+
+- update to version 1.1.8:
+ * Added support for Python "diehard" 2.4.
+ * Fixed build on Mac OS X 10.9 Maverick (issue #27).
+
+- changes from version 1.1.7:
+ * Added PyPy support, courtesy of Ozan Turksever (http://www.logsign.net).
+
+-------------------------------------------------------------------
Old:
----
setproctitle-1.1.6.tar.gz
New:
----
setproctitle-1.1.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-setproctitle.spec ++++++
--- /var/tmp/diff_new_pack.RtcTkw/_old 2015-01-08 23:02:54.000000000 +0100
+++ /var/tmp/diff_new_pack.RtcTkw/_new 2015-01-08 23:02:54.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python3-setproctitle
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: python3-setproctitle
-Version: 1.1.6
+Version: 1.1.8
Release: 0
Summary: Python module to allow customization of the process title
License: BSD-3-Clause
++++++ setproctitle-1.1.6.tar.gz -> setproctitle-1.1.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setproctitle-1.1.6/HISTORY.rst new/setproctitle-1.1.8/HISTORY.rst
--- old/setproctitle-1.1.6/HISTORY.rst 2012-04-27 12:01:06.000000000 +0200
+++ new/setproctitle-1.1.8/HISTORY.rst 2013-10-23 23:35:03.000000000 +0200
@@ -1,6 +1,19 @@
Releases history
----------------
+Version 1.1.8
+~~~~~~~~~~~~~
+
+- Added support for Python "diehard" 2.4.
+- Fixed build on Mac OS X 10.9 Maverick (issue #27).
+
+
+Version 1.1.7
+~~~~~~~~~~~~~
+
+- Added PyPy support, courtesy of Ozan Turksever (http://www.logsign.net).
+
+
Version 1.1.6
~~~~~~~~~~~~~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setproctitle-1.1.6/MANIFEST new/setproctitle-1.1.8/MANIFEST
--- old/setproctitle-1.1.6/MANIFEST 2012-04-27 12:04:31.000000000 +0200
+++ new/setproctitle-1.1.8/MANIFEST 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-# file GENERATED by distutils, do NOT edit
-COPYRIGHT
-HISTORY.rst
-MANIFEST
-Makefile
-README.rst
-setup.py
-src/c.h
-src/setproctitle.c
-src/spt.h
-src/spt_config.h
-src/spt_debug.c
-src/spt_python.h
-src/spt_setup.c
-src/spt_setup.h
-src/spt_status.c
-src/spt_status.h
-src/strlcpy.c
-tests/pyrun.c
-tests/setproctitle_test.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setproctitle-1.1.6/PKG-INFO new/setproctitle-1.1.8/PKG-INFO
--- old/setproctitle-1.1.6/PKG-INFO 2012-04-27 12:04:31.000000000 +0200
+++ new/setproctitle-1.1.8/PKG-INFO 2013-10-23 23:53:32.000000000 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: setproctitle
-Version: 1.1.6
+Version: 1.1.8
Summary: A library to allow customization of the process title.
Home-page: http://code.google.com/p/py-setproctitle/
Author: Daniele Varrazzo
@@ -142,6 +142,19 @@
Releases history
----------------
+ Version 1.1.8
+ ~~~~~~~~~~~~~
+
+ - Added support for Python "diehard" 2.4.
+ - Fixed build on Mac OS X 10.9 Maverick (issue #27).
+
+
+ Version 1.1.7
+ ~~~~~~~~~~~~~
+
+ - Added PyPy support, courtesy of Ozan Turksever (http://www.logsign.net).
+
+
Version 1.1.6
~~~~~~~~~~~~~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setproctitle-1.1.6/setup.py new/setproctitle-1.1.8/setup.py
--- old/setproctitle-1.1.6/setup.py 2012-04-27 12:00:47.000000000 +0200
+++ new/setproctitle-1.1.8/setup.py 2013-10-23 23:43:51.000000000 +0200
@@ -2,10 +2,10 @@
"""
setproctitle setup script.
-Copyright (c) 2009-2012 Daniele Varrazzo
+Copyright (c) 2009-2013 Daniele Varrazzo
"""
-VERSION = '1.1.6'
+VERSION = '1.1.8'
import os
import re
@@ -52,7 +52,7 @@
'src/spt_debug.c',
'src/spt_setup.c',
'src/spt_status.c',
- 'src/strlcpy.c', # TODO: not needed on some platform
+ 'src/spt_strlcpy.c',
])
# patch distutils if it can't cope with the "classifiers" or
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setproctitle-1.1.6/src/c.h new/setproctitle-1.1.8/src/c.h
--- old/setproctitle-1.1.6/src/c.h 2012-04-27 12:00:09.000000000 +0200
+++ new/setproctitle-1.1.8/src/c.h 2013-10-23 23:35:03.000000000 +0200
@@ -29,9 +29,8 @@
#include
-#if !HAVE_DECL_STRLCPY
-HIDDEN extern size_t strlcpy(char *dst, const char *src, size_t siz);
-#endif
+/* Let's use our version of strlcpy to avoid portability problems */
+size_t spt_strlcpy(char *dst, const char *src, size_t siz);
#ifdef WIN32
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setproctitle-1.1.6/src/spt_config.h new/setproctitle-1.1.8/src/spt_config.h
--- old/setproctitle-1.1.6/src/spt_config.h 2012-04-27 12:00:09.000000000 +0200
+++ new/setproctitle-1.1.8/src/spt_config.h 2013-10-23 23:35:03.000000000 +0200
@@ -13,10 +13,6 @@
/* Define to 1 if you have the header file. */
/* #undef HAVE_SYS_PRCTL_H */
-/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you
- don't. */
-#define HAVE_DECL_STRLCPY 0
-
/* GCC 4.0 and later have support for specifying symbol visibility */
#if __GNUC__ >= 4 && !defined(__MINGW32__)
# define HIDDEN __attribute__((visibility("hidden")))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setproctitle-1.1.6/src/spt_python.h new/setproctitle-1.1.8/src/spt_python.h
--- old/setproctitle-1.1.6/src/spt_python.h 2012-04-27 12:00:09.000000000 +0200
+++ new/setproctitle-1.1.8/src/spt_python.h 2013-03-26 10:26:07.000000000 +0100
@@ -18,6 +18,11 @@
#define IS_PY3K
#endif
+/* Detect pypy */
+#ifdef PYPY_VERSION
+#define IS_PYPY
+#endif
+
/* The type returned by Py_GetArgcArgv */
#ifdef IS_PY3K
typedef wchar_t argv_t;
@@ -49,6 +54,10 @@
#define Bytes_Size PyString_Size
#define Bytes_AsString PyString_AsString
+#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
+typedef int Py_ssize_t;
+#endif
+
#endif /* IS_PY3K > 2 */
#endif /* SPT_PYTHON_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setproctitle-1.1.6/src/spt_setup.c new/setproctitle-1.1.8/src/spt_setup.c
--- old/setproctitle-1.1.6/src/spt_setup.c 2012-04-27 12:00:47.000000000 +0200
+++ new/setproctitle-1.1.8/src/spt_setup.c 2013-02-20 00:34:08.000000000 +0100
@@ -368,8 +368,10 @@
char *arg0 = NULL;
int rv = -1;
+#ifndef IS_PYPY
spt_debug("reading argc/argv from Python main");
Py_GetArgcArgv(&argc, &argv_py);
+#endif
if (argc > 0) {
spt_debug("found %d arguments", argc);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setproctitle-1.1.6/src/spt_status.c new/setproctitle-1.1.8/src/spt_status.c
--- old/setproctitle-1.1.6/src/spt_status.c 2012-04-27 12:00:09.000000000 +0200
+++ new/setproctitle-1.1.8/src/spt_status.c 2013-10-23 23:35:03.000000000 +0200
@@ -336,7 +336,7 @@
#endif
/* Update ps_buffer to contain both fixed part and activity */
- strlcpy(ps_buffer + ps_buffer_fixed_size, activity,
+ spt_strlcpy(ps_buffer + ps_buffer_fixed_size, activity,
ps_buffer_size - ps_buffer_fixed_size);
/* Transmit new setting to kernel, if necessary */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setproctitle-1.1.6/src/spt_strlcpy.c new/setproctitle-1.1.8/src/spt_strlcpy.c
--- old/setproctitle-1.1.6/src/spt_strlcpy.c 1970-01-01 01:00:00.000000000 +0100
+++ new/setproctitle-1.1.8/src/spt_strlcpy.c 2013-10-23 23:35:03.000000000 +0200
@@ -0,0 +1,71 @@
+/*-------------------------------------------------------------------------
+ *
+ * strlcpy.c
+ * strncpy done right
+ *
+ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ * $PostgreSQL: pgsql/src/port/strlcpy.c,v 1.4 2007/01/05 22:20:03 momjian Exp $
+ *
+ * This file was taken from OpenBSD and is used on platforms that don't
+ * provide strlcpy(). The OpenBSD copyright terms follow.
+ *-------------------------------------------------------------------------
+ */
+
+/* $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $ */
+
+/*
+ * Copyright (c) 1998 Todd C. Miller
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "c.h"
+
+
+/*
+ * Copy src to string dst of size siz. At most siz-1 characters
+ * will be copied. Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ * Function creation history: http://www.gratisoft.us/todd/papers/strlcpy.html
+ */
+size_t
+spt_strlcpy(char *dst, const char *src, size_t siz)
+{
+ char *d = dst;
+ const char *s = src;
+ size_t n = siz;
+
+ /* Copy as many bytes as will fit */
+ if (n != 0)
+ {
+ while (--n != 0)
+ {
+ if ((*d++ = *s++) == '\0')
+ break;
+ }
+ }
+
+ /* Not enough room in dst, add NUL and traverse rest of src */
+ if (n == 0)
+ {
+ if (siz != 0)
+ *d = '\0'; /* NUL-terminate dst */
+ while (*s++)
+ ;
+ }
+
+ return (s - src - 1); /* count does not include NUL */
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setproctitle-1.1.6/src/strlcpy.c new/setproctitle-1.1.8/src/strlcpy.c
--- old/setproctitle-1.1.6/src/strlcpy.c 2012-04-27 12:00:09.000000000 +0200
+++ new/setproctitle-1.1.8/src/strlcpy.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * strlcpy.c
- * strncpy done right
- *
- * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
- *
- *
- * IDENTIFICATION
- * $PostgreSQL: pgsql/src/port/strlcpy.c,v 1.4 2007/01/05 22:20:03 momjian Exp $
- *
- * This file was taken from OpenBSD and is used on platforms that don't
- * provide strlcpy(). The OpenBSD copyright terms follow.
- *-------------------------------------------------------------------------
- */
-
-/* $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $ */
-
-/*
- * Copyright (c) 1998 Todd C. Miller
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "c.h"
-
-
-/*
- * Copy src to string dst of size siz. At most siz-1 characters
- * will be copied. Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- * Function creation history: http://www.gratisoft.us/todd/papers/strlcpy.html
- */
-size_t
-strlcpy(char *dst, const char *src, size_t siz)
-{
- char *d = dst;
- const char *s = src;
- size_t n = siz;
-
- /* Copy as many bytes as will fit */
- if (n != 0)
- {
- while (--n != 0)
- {
- if ((*d++ = *s++) == '\0')
- break;
- }
- }
-
- /* Not enough room in dst, add NUL and traverse rest of src */
- if (n == 0)
- {
- if (siz != 0)
- *d = '\0'; /* NUL-terminate dst */
- while (*s++)
- ;
- }
-
- return (s - src - 1); /* count does not include NUL */
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setproctitle-1.1.6/tests/setproctitle_test.py new/setproctitle-1.1.8/tests/setproctitle_test.py
--- old/setproctitle-1.1.6/tests/setproctitle_test.py 2012-04-27 12:00:09.000000000 +0200
+++ new/setproctitle-1.1.8/tests/setproctitle_test.py 2013-02-20 00:34:08.000000000 +0100
@@ -14,6 +14,7 @@
from subprocess import Popen, PIPE
IS_PY3K = sys.version_info[0] == 3
+IS_PYPY = '__pypy__' in sys.builtin_module_names
# SkipTest is available from Python 2.7 and in nose
try:
@@ -65,12 +66,11 @@
print os.getpid()
# ps can fail on kfreebsd arch
# (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=460331)
- print os.popen("ps -o pid,command 2> /dev/null").read()
+ print os.popen("ps -x -o pid,command 2> /dev/null").read()
""")
lines = filter(None, rv.splitlines())
pid = lines.pop(0)
pids = dict([r.strip().split(None, 1) for r in lines])
-
title = self._clean_up_title(pids[pid])
self.assertEqual(title, "Hello, world!")
@@ -162,7 +162,7 @@
import os
print os.getpid()
- print os.popen("ps -o pid,command 2> /dev/null").read()
+ print os.popen("ps -x -o pid,command 2> /dev/null").read()
""")))
finally:
f.close()
@@ -207,7 +207,7 @@
import locale
from subprocess import Popen, PIPE
print os.getpid()
- proc = Popen("ps -o pid,command 2> /dev/null", shell=True,
+ proc = Popen("ps -x -o pid,command 2> /dev/null", shell=True,
close_fds=True, stdout=PIPE, stderr=PIPE)
buf = proc.stdout.read()
print buf.decode(locale.getpreferredencoding(), 'replace')
@@ -240,7 +240,7 @@
import os
print os.getpid()
- print os.popen("ps -o pid,command 2> /dev/null").read()
+ print os.popen("ps -x -o pid,command 2> /dev/null").read()
""", args=u" ".join(["-", "hello", euro, snowman]))
except TypeError:
raise SkipTest(
@@ -275,7 +275,7 @@
import os
print os.getpid()
- print os.popen("ps -o pid,command 2> /dev/null").read()
+ print os.popen("ps -x -o pid,command 2> /dev/null").read()
""",
args=u" ".join(["-", "foo", "bar", "baz"]),
executable=exc)
@@ -291,6 +291,9 @@
def test_embedded(self):
"""Check the module works with embedded Python.
"""
+ if IS_PYPY:
+ raise SkipTest("skip test, pypy")
+
if not os.path.exists('/proc/%s/cmdline' % os.getpid()):
raise SkipTest("known failure: '/proc/PID/cmdline' not available")
@@ -305,7 +308,7 @@
import os
print os.getpid()
- print os.popen("ps -o pid,command 2> /dev/null").read()
+ print os.popen("ps -x -o pid,command 2> /dev/null").read()
""",
executable=exe)
lines = filter(None, rv.splitlines())
@@ -317,6 +320,9 @@
def test_embedded_many_args(self):
"""Check more complex cmdlines are handled in embedded env too."""
+ if IS_PYPY:
+ raise SkipTest("skip test, pypy")
+
if not os.path.exists('/proc/%s/cmdline' % os.getpid()):
raise SkipTest("known failure: '/proc/PID/cmdline' not available")
@@ -331,7 +337,7 @@
import os
print os.getpid()
- print os.popen("ps -o pid,command 2> /dev/null").read()
+ print os.popen("ps -x -o pid,command 2> /dev/null").read()
""",
executable=exe,
args=u" ".join(["foo", "bar", "baz"]))
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org