From decke@bluelife.at  Fri Mar  7 21:01:35 2014
Return-Path: <decke@bluelife.at>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id C8BFC723
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  7 Mar 2014 21:01:35 +0000 (UTC)
Received: from mail-oa0-x234.google.com (mail-oa0-x234.google.com [IPv6:2607:f8b0:4003:c02::234])
	(using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 8DD9DE45
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  7 Mar 2014 21:01:35 +0000 (UTC)
Received: by mail-oa0-f52.google.com with SMTP id l6so4614701oag.25
        for <FreeBSD-gnats-submit@freebsd.org>; Fri, 07 Mar 2014 13:01:35 -0800 (PST)
Received: by 10.76.144.71 with HTTP; Fri, 7 Mar 2014 13:01:34 -0800 (PST)
Message-Id: <CAE-m3X3xNyoDYxYEEZro57J-Yovjo0nXiQqvjo1H_sA57yJ+3w@mail.gmail.com>
Date: Fri, 7 Mar 2014 22:01:34 +0100
From: =?ISO-8859-1?Q?Bernhard_Fr=F6hlich?= <decke@FreeBSD.org>
Sender: decke@bluelife.at
To: FreeBSD-gnats-submit@freebsd.org
Cc: jessekempf@gmail.com
Subject: [PATCH] devel/py-daemon: update to 1.6

>Number:         187355
>Category:       ports
>Synopsis:       [PATCH] devel/py-daemon: update to 1.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-python
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 07 21:10:00 UTC 2014
>Closed-Date:    Fri Mar 21 08:49:32 UTC 2014
>Last-Modified:  Fri Mar 21 08:50:01 UTC 2014
>Originator:     Bernhard Froehlich
>Release:        FreeBSD 10.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD eve.bluelife.at 10.0-STABLE FreeBSD 10.0-STABLE #0
r261138: Sat Jan 25 23:06:51 CET
>Description:
- Update to 1.6
- Remove non working patch for py-lockfile (upstream has fixed it now)

The included patch from that port is not working since the passed
parameters in daemon/runner.py don't seem to match the new __init__.
The result is:

Traceback (most recent call last):
  File "/usr/local/bin/cloudprint", line 9, in <module>
    load_entry_point('cloudprint==0.11', 'console_scripts', 'cloudprint')()
  File "/usr/local/lib/python2.7/site-packages/cloudprint/cloudprint.py",
line 508, in main
    daemon_runner = runner.DaemonRunner(app)
  File "/usr/local/lib/python2.7/site-packages/daemon/runner.py", line
87, in __init__
    app.pidfile_path, app.pidfile_timeout)
  File "/usr/local/lib/python2.7/site-packages/daemon/runner.py", line
205, in make_pidlockfile
    lockfile = pidlockfile.TimeoutPIDLockFile(path, acquire_timeout)
  File "/usr/local/lib/python2.7/site-packages/daemon/pidlockfile.py",
line 49, in __init__
    super(TimeoutPIDLockFile, self).__init__(path, *args, **kwargs)
TypeError: must be type, not classobj


Port maintainer (jessekempf@gmail.com) is cc'd.

Generated with FreeBSD Port Tools 1.00.2014.02.18 (mode: update, diff: suffix)
>How-To-Repeat:
>Fix:

--- py-daemon-1.6.patch begins here ---
diff -ruN ../py-daemon.old/Makefile ./Makefile
--- ../py-daemon.old/Makefile    2014-02-19 07:53:00.000000000 +0100
+++ ./Makefile    2014-03-08 21:56:42.758974900 +0100
@@ -2,8 +2,7 @@
 # $FreeBSD: head/devel/py-daemon/Makefile 345007 2014-02-19 06:53:00Z miwi $

 PORTNAME=    daemon
-PORTVERSION=    1.5.5
-PORTREVISION=    3
+PORTVERSION=    1.6
 CATEGORIES=    devel python
 MASTER_SITES=    CHEESESHOP
 PKGNAMEPREFIX=    ${PYTHON_PKGNAMEPREFIX}
@@ -19,5 +18,4 @@
 USE_PYDISTUTILS=    yes
 PYDISTUTILS_AUTOPLIST=    yes

-
 .include <bsd.port.mk>
diff -ruN ../py-daemon.old/distinfo ./distinfo
--- ../py-daemon.old/distinfo    2014-01-22 16:30:13.000000000 +0100
+++ ./distinfo    2014-03-08 21:52:59.969970232 +0100
@@ -1,2 +1,2 @@
-SHA256 (python-daemon-1.5.5.tar.gz) =
1406962e48ce03642c6057f40f9ffd49493792a7b34357fe9e264708748c83c0
-SIZE (python-daemon-1.5.5.tar.gz) = 41045
+SHA256 (python-daemon-1.6.tar.gz) =
1665fb16bfeae72f16aa2de40bc75661458bd42731a7d463a911a8d5eaf96c0b
+SIZE (python-daemon-1.6.tar.gz) = 41564
diff -ruN ../py-daemon.old/files/patch-daemon-pidlockfile.py
./files/patch-daemon-pidlockfile.py
--- ../py-daemon.old/files/patch-daemon-pidlockfile.py    2014-01-22
18:40:44.000000000 +0100
+++ ./files/patch-daemon-pidlockfile.py    1970-01-01 01:00:00.000000000 +0100
@@ -1,72 +0,0 @@
---- daemon/pidlockfile.py.orig    2010-08-24 16:57:37.753374406 +0000
-+++ daemon/pidlockfile.py    2010-08-24 16:58:57.825989360 +0000
-@@ -22,6 +22,7 @@
-     NotLocked, NotMyLock,
-     )
-
-+from lockfile.pidlockfile import PIDLockFile
-

- class PIDFileError(Exception):
-     """ Abstract base class for errors specific to PID files. """
-@@ -30,61 +31,6 @@
-     """ Raised when parsing contents of PID file fails. """
-
-

--class PIDLockFile(LinkFileLock, object):
--    """ Lockfile implemented as a Unix PID file.
--
--        The PID file is named by the attribute `path`. When locked,
--        the file will be created with a single line of text,
--        containing the process ID (PID) of the process that acquired
--        the lock.
--
--        The lock is acquired and maintained as per `LinkFileLock`.
--
--        """
--
--    def read_pid(self):
--        """ Get the PID from the lock file.
--            """
--        result = read_pid_from_pidfile(self.path)
--        return result
--
--    def acquire(self, *args, **kwargs):
--        """ Acquire the lock.
--
--            Locks the PID file then creates the PID file for this
--            lock. The `timeout` parameter is used as for the
--            `LinkFileLock` class.
--
--            """
--        super(PIDLockFile, self).acquire(*args, **kwargs)
--        try:
--            write_pid_to_pidfile(self.path)
--        except OSError, exc:
--            error = LockFailed("%(exc)s" % vars())
--            raise error
--
--    def release(self):
--        """ Release the lock.
--
--            Removes the PID file then releases the lock, or raises an
--            error if the current process does not hold the lock.
--
--            """
--        if self.i_am_locking():
--            remove_existing_pidfile(self.path)
--        super(PIDLockFile, self).release()
--
--    def break_lock(self):
--        """ Break an existing lock.
--
--            If the lock is held, breaks the lock and removes the PID
--            file.
--
--            """
--        super(PIDLockFile, self).break_lock()
--        remove_existing_pidfile(self.path)
--
--

- class TimeoutPIDLockFile(PIDLockFile):
-     """ Lockfile with default timeout, implemented as a Unix PID file.
-
--- py-daemon-1.6.patch ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-python 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Mar 7 21:10:10 UTC 2014 
Responsible-Changed-Why:  
freebsd-python@ wants this port PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187355 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Mar 7 21:10:12 UTC 2014 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187355 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: jessekempf@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/187355: [PATCH] devel/py-daemon: update to 1.6
Date: Fri, 7 Mar 2014 21:10:11 UT

 Maintainer of devel/py-daemon,
 
 Please note that PR ports/187355 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/187355
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: decke 
State-Changed-When: Fri Mar 21 08:49:31 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187355 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/187355: commit references a PR
Date: Fri, 21 Mar 2014 08:48:42 +0000 (UTC)

 Author: decke
 Date: Fri Mar 21 08:48:40 2014
 New Revision: 348733
 URL: http://svnweb.freebsd.org/changeset/ports/348733
 QAT: https://qat.redports.org/buildarchive/r348733/
 
 Log:
   - Update to 1.6
   - Remove non working patch for py-lockfile (upstream has fixed it now)
   - Pet portlint
   
   PR:		ports/187355
   Submitted by:	myself
   Approved by:	maintainer timeout (2 weeks)
 
 Deleted:
   head/devel/py-daemon/files/
 Modified:
   head/devel/py-daemon/Makefile
   head/devel/py-daemon/distinfo
 
 Modified: head/devel/py-daemon/Makefile
 ==============================================================================
 --- head/devel/py-daemon/Makefile	Fri Mar 21 08:15:26 2014	(r348732)
 +++ head/devel/py-daemon/Makefile	Fri Mar 21 08:48:40 2014	(r348733)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	daemon
 -PORTVERSION=	1.5.5
 -PORTREVISION=	3
 +PORTVERSION=	1.6
  CATEGORIES=	devel python
  MASTER_SITES=	CHEESESHOP
  PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 @@ -19,5 +18,4 @@ USE_PYTHON=	yes
  USE_PYDISTUTILS=	yes
  PYDISTUTILS_AUTOPLIST=	yes
  
 -
  .include <bsd.port.mk>
 
 Modified: head/devel/py-daemon/distinfo
 ==============================================================================
 --- head/devel/py-daemon/distinfo	Fri Mar 21 08:15:26 2014	(r348732)
 +++ head/devel/py-daemon/distinfo	Fri Mar 21 08:48:40 2014	(r348733)
 @@ -1,2 +1,2 @@
 -SHA256 (python-daemon-1.5.5.tar.gz) = 1406962e48ce03642c6057f40f9ffd49493792a7b34357fe9e264708748c83c0
 -SIZE (python-daemon-1.5.5.tar.gz) = 41045
 +SHA256 (python-daemon-1.6.tar.gz) = 1665fb16bfeae72f16aa2de40bc75661458bd42731a7d463a911a8d5eaf96c0b
 +SIZE (python-daemon-1.6.tar.gz) = 41564
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
