Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Apr 2012 23:13:21 GMT
From:      John Hixson <john@pcbsd.org>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/167347: pianobar update to pianobar-2012.04.24
Message-ID:  <201204262313.q3QNDLfS002160@red.freebsd.org>
Resent-Message-ID: <201204262320.q3QNKC3N044572@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         167347
>Category:       ports
>Synopsis:       pianobar update to pianobar-2012.04.24
>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:   Thu Apr 26 23:20:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     John Hixson
>Release:        10-CURRENT
>Organization:
iXsystems
>Environment:
FreeBSD thinkbsd 9.9-CURRENT FreeBSD 10.0-CURRENT #24: Tue Apr 17 19:09:03 PDT 2012     john@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	2012-01-11 21:43:46.000000000 -0800
+++ pianobar/Makefile	2012-04-26 16:08:52.000000000 -0700
@@ -6,20 +6,20 @@
 #
 
 PORTNAME=	pianobar
-PORTVERSION=	2012.01.10
+PORTVERSION=	2012.04.24
 CATEGORIES=	audio
-MASTER_SITES=	http://6xq.net/static/projects/${PORTNAME}/
+MASTER_SITES=	http://6xq.net/projects/${PORTNAME}/
 
 MAINTAINER=	john@pcbsd.org
 COMMENT=	Command line Pandora player
 
-LICENSE=	MIT
-
 LIB_DEPENDS=	ao:${PORTSDIR}/audio/libao \
 		faad:${PORTSDIR}/audio/faad \
 		mad:${PORTSDIR}/audio/libmad \
 		gnutls.47:${PORTSDIR}/security/gnutls
 
+LICENSE=	MIT
+
 MAN1=		pianobar.1
 MAN_COMPRESSED=	no
 
diff -urN /usr/ports/audio/pianobar/distinfo pianobar/distinfo
--- /usr/ports/audio/pianobar/distinfo	2012-01-11 21:43:46.000000000 -0800
+++ pianobar/distinfo	2012-04-26 16:08:59.000000000 -0700
@@ -1,2 +1,2 @@
-SHA256 (pianobar-2012.01.10.tar.bz2) = 6d19e5abde542bcdf8b9cfa50448fbe95c1e113f59e54065c9f4e0fbf78690f9
-SIZE (pianobar-2012.01.10.tar.bz2) = 68839
+SHA256 (pianobar-2012.04.24.tar.bz2) = 1286005b14ef58ea5b7baece054e772761e6351fdeceadd3a69e0a7c8b9bf28e
+SIZE (pianobar-2012.04.24.tar.bz2) = 69538
diff -urN /usr/ports/audio/pianobar/files/patch-main.c pianobar/files/patch-main.c
--- /usr/ports/audio/pianobar/files/patch-main.c	1969-12-31 16:00:00.000000000 -0800
+++ pianobar/files/patch-main.c	2012-04-26 16:08:13.000000000 -0700
@@ -0,0 +1,36 @@
+--- src/main.c.orig	2012-04-24 11:09:20.000000000 -0700
++++ src/main.c	2012-04-26 16:07:03.000000000 -0700
+@@ -77,10 +77,32 @@
+ 	WaitressReturn_t wRet;
+ 	PianoRequestDataLogin_t reqData;
+ 	bool ret;
++	WaitressHandle_t waithSync;
++	char *syncTime;
++	unsigned long int syncTimeInt;
++
++	/* skip sync step by fetching time from somewhere else */
++	WaitressInit (&waithSync);
++	WaitressSetUrl (&waithSync, "http://ridetheclown.com/s2/synctime.php");
++	if (app->settings.proxy != NULL && strlen (app->settings.proxy) > 0) {
++		WaitressSetProxy (&waithSync, app->settings.proxy);
++	}
++	wRet = WaitressFetchBuf (&waithSync, &syncTime);
++	WaitressFree (&waithSync);
++	if (wRet != WAITRESS_RET_OK) {
++		BarUiMsg (&app->settings, MSG_ERR, "Unable to sync: %s\n",
++			WaitressErrorToStr (wRet));
++		return false;
++	}
++
++	syncTimeInt = strtoul (syncTime, NULL, 0);
++	app->ph.timeOffset = time (NULL) - syncTimeInt;
++	free (syncTime);
++
+ 
+ 	reqData.user = app->settings.username;
+ 	reqData.password = app->settings.password;
+-	reqData.step = 0;
++	reqData.step = 1;
+ 
+ 	BarUiMsg (&app->settings, MSG_INFO, "Login... ");
+ 	ret = BarUiPianoCall (app, PIANO_REQUEST_LOGIN, &reqData, &pRet, &wRet);
diff -urN /usr/ports/audio/pianobar/files/patch-piano.c pianobar/files/patch-piano.c
--- /usr/ports/audio/pianobar/files/patch-piano.c	1969-12-31 16:00:00.000000000 -0800
+++ pianobar/files/patch-piano.c	2012-04-26 16:08:33.000000000 -0700
@@ -0,0 +1,19 @@
+--- src/libpiano/piano.c.orig	2012-04-24 11:09:20.000000000 -0700
++++ src/libpiano/piano.c	2012-04-26 16:05:39.000000000 -0700
+@@ -42,7 +42,7 @@
+ #include "crypt.h"
+ #include "config.h"
+ 
+-#define PIANO_PROTOCOL_VERSION "33"
++#define PIANO_PROTOCOL_VERSION "34"
+ #define PIANO_RPC_HOST "www.pandora.com"
+ #define PIANO_RPC_PORT "80"
+ #define PIANO_RPC_PATH "/radio/xmlrpc/v" PIANO_PROTOCOL_VERSION "?"
+@@ -272,6 +272,7 @@
+ 							"<?xml version=\"1.0\"?><methodCall>"
+ 							"<methodName>listener.authenticateListener</methodName>"
+ 							"<params><param><value><int>%lu</int></value></param>"
++							"<param><value><string></string></value></param>"
+ 							/* user */
+ 							"<param><value><string>%s</string></value></param>"
+ 							/* password */


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204262313.q3QNDLfS002160>