ports/162750: audio/pianobar update to 2011.11.11
John Hixson
john at ixsystems.com
Tue Nov 22 07:50:11 UTC 2011
>Number: 162750
>Category: ports
>Synopsis: audio/pianobar update to 2011.11.11
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 22 07:50:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: John Hixson
>Release: 10.0-CURRENT
>Organization:
iXsystems
>Environment:
FreeBSD thinkbsd 9.9-CURRENT FreeBSD 10.0-CURRENT #18: Thu Sep 29 16:45:22 PDT 2011 john at thinkbsd:/usr/obj/usr/src/sys/THINKBSD amd64
>Description:
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN /usr/ports/audio/pianobar/Makefile pianobar/Makefile
--- /usr/ports/audio/pianobar/Makefile 2011-09-25 20:33:07.000000000 -0700
+++ pianobar/Makefile 2011-11-21 23:40:38.000000000 -0800
@@ -2,11 +2,11 @@
# Date created: 8 October 2010
# Whom: John Hixson <john at pcbsd.org>
#
-# $FreeBSD: ports/audio/pianobar/Makefile,v 1.6 2011/09/26 03:33:07 jpaetzel Exp $
+# $FreeBSD: ports/audio/pianobar/Makefile,v 1.2 2010/11/08 18:23:57 jpaetzel Exp $
#
PORTNAME= pianobar
-PORTVERSION= 2011.09.22
+PORTVERSION= 2011.11.11
CATEGORIES= audio
MASTER_SITES= http://6xq.net/static/projects/${PORTNAME}/
@@ -15,7 +15,8 @@
LIB_DEPENDS= ao:${PORTSDIR}/audio/libao \
faad:${PORTSDIR}/audio/faad \
- mad:${PORTSDIR}/audio/libmad
+ mad:${PORTSDIR}/audio/libmad \
+ gnutls:${PORTSDIR}/security
LICENSE= MIT
diff -urN /usr/ports/audio/pianobar/distinfo pianobar/distinfo
--- /usr/ports/audio/pianobar/distinfo 2011-09-25 20:33:07.000000000 -0700
+++ pianobar/distinfo 2011-11-21 22:37:45.000000000 -0800
@@ -1,2 +1,2 @@
-SHA256 (pianobar-2011.09.22.tar.bz2) = 6e54d4881e7ada6b0443611b0853215e9e54253667a58310d96dfe38be258ed3
-SIZE (pianobar-2011.09.22.tar.bz2) = 65436
+SHA256 (pianobar-2011.11.11.tar.bz2) = c1f5df7813b543992b79ac1558d27ff3fb0198f7bfb2d5d2e39173df4fae951b
+SIZE (pianobar-2011.11.11.tar.bz2) = 67778
diff -urN /usr/ports/audio/pianobar/files/patch-waitress.c pianobar/files/patch-waitress.c
--- /usr/ports/audio/pianobar/files/patch-waitress.c 1969-12-31 16:00:00.000000000 -0800
+++ pianobar/files/patch-waitress.c 2011-11-21 23:37:59.000000000 -0800
@@ -0,0 +1,57 @@
+--- src/libwaitress/waitress.c.orig 2011-11-11 03:37:58.000000000 -0800
++++ src/libwaitress/waitress.c 2011-11-21 23:34:11.000000000 -0800
+@@ -443,10 +443,11 @@
+ * @param write count bytes
+ * @return number of written bytes or -1 on error
+ */
+-static ssize_t WaitressPollWrite (WaitressHandle_t *waith,
+- const char *buf, size_t count) {
++static ssize_t WaitressPollWrite (void *wptr, const void *bptr, size_t count) {
+ int pollres = -1;
+ ssize_t retSize;
++ WaitressHandle_t *waith = wptr;
++ const char *buf = bptr;
+
+ assert (waith != NULL);
+ assert (buf != NULL);
+@@ -489,10 +490,11 @@
+ * @param buffer size
+ * @return number of read bytes or -1 on error
+ */
+-static ssize_t WaitressPollRead (WaitressHandle_t *waith, char *buf,
+- size_t count) {
++static ssize_t WaitressPollRead (void *wptr, void *bptr, size_t count) {
+ int pollres = -1;
+ ssize_t retSize;
++ WaitressHandle_t *waith = wptr;
++ char *buf = bptr;
+
+ assert (waith != NULL);
+ assert (buf != NULL);
+@@ -515,7 +517,7 @@
+ }
+
+ static WaitressReturn_t WaitressOrdinaryRead (WaitressHandle_t *waith,
+- char *buf, const size_t size, size_t *retSize) {
++ char *buf, const size_t size, ssize_t *retSize) {
+ const ssize_t ret = WaitressPollRead (waith, buf, size);
+ if (ret != -1) {
+ *retSize = ret;
+@@ -524,7 +526,7 @@
+ }
+
+ static WaitressReturn_t WaitressGnutlsRead (WaitressHandle_t *waith,
+- char *buf, const size_t size, size_t *retSize) {
++ char *buf, const size_t size, ssize_t *retSize) {
+ ssize_t ret = gnutls_record_recv (waith->request.tlsSession, buf, size);
+ if (ret < 0) {
+ return WAITRESS_RET_TLS_READ_ERR;
+@@ -809,7 +811,7 @@
+ /* set up proxy tunnel */
+ if (WaitressProxyEnabled (waith)) {
+ char buf[256];
+- size_t size;
++ ssize_t size;
+ snprintf (buf, sizeof (buf), "CONNECT %s:%s HTTP/"
+ WAITRESS_HTTP_VERSION "\r\n\r\n",
+ waith->url.host, WaitressDefaultPort (&waith->url));
diff -urN /usr/ports/audio/pianobar/files/patch-waitress.h pianobar/files/patch-waitress.h
--- /usr/ports/audio/pianobar/files/patch-waitress.h 1969-12-31 16:00:00.000000000 -0800
+++ pianobar/files/patch-waitress.h 2011-11-21 23:38:13.000000000 -0800
@@ -0,0 +1,25 @@
+--- src/libwaitress/waitress.h.orig 2011-11-11 03:37:58.000000000 -0800
++++ src/libwaitress/waitress.h 2011-11-21 23:34:09.000000000 -0800
+@@ -82,7 +82,8 @@
+
+ /* reusable handle
+ */
+-typedef struct {
++struct WaitressHandle_t;
++typedef struct WaitressHandle_t {
+ WaitressUrl_t url;
+ WaitressMethod_t method;
+ const char *extraHeaders;
+@@ -102,9 +103,9 @@
+ char *buf;
+ gnutls_session_t tlsSession;
+ /* first argument is WaitressHandle_t, but that's not defined here */
+- WaitressHandlerReturn_t (*dataHandler) (void *, char *, const size_t);
+- ssize_t (*read) (void *, char *, const size_t, ssize_t *);
+- ssize_t (*write) (void *, const char *, const size_t);
++ WaitressHandlerReturn_t (*dataHandler) (struct WaitressHandle_t *, char *, const size_t);
++ WaitressReturn_t (*read) (struct WaitressHandle_t *, char *, const size_t, ssize_t *);
++ WaitressReturn_t (*write) (struct WaitressHandle_t *, const char *, const size_t);
+ /* temporary return value storage */
+ WaitressReturn_t readWriteRet;
+ } request;
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list