[92390] trunk/dports/audio/pianobar

ryandesign at macports.org ryandesign at macports.org
Fri Apr 27 11:01:07 PDT 2012


Revision: 92390
          https://trac.macports.org/changeset/92390
Author:   ryandesign at macports.org
Date:     2012-04-27 11:01:04 -0700 (Fri, 27 Apr 2012)
Log Message:
-----------
pianobar: maintainer update to 2012.04.24 and fix protocol errors; see #34210

Modified Paths:
--------------
    trunk/dports/audio/pianobar/Portfile

Added Paths:
-----------
    trunk/dports/audio/pianobar/files/patch-src-libpiano-piano.c.diff
    trunk/dports/audio/pianobar/files/patch-src-main.c.diff

Modified: trunk/dports/audio/pianobar/Portfile
===================================================================
--- trunk/dports/audio/pianobar/Portfile	2012-04-27 17:47:23 UTC (rev 92389)
+++ trunk/dports/audio/pianobar/Portfile	2012-04-27 18:01:04 UTC (rev 92390)
@@ -4,7 +4,7 @@
 PortSystem                  1.0
 
 name                        pianobar
-version                     2012.01.10
+version                     2012.04.24
 categories                  audio
 platforms                   darwin
 maintainers                 gmail.com:aguynamedryan+pianobar
@@ -22,11 +22,14 @@
                             configure keybindings, last.fm scrobbling, \
                             proxy support for listening outside of USA.
 
-checksums                   sha256  6d19e5abde542bcdf8b9cfa50448fbe95c1e113f59e54065c9f4e0fbf78690f9 \
-                            rmd160  60573b71376d3494b4b46421c5ba24369136f025
+checksums                   sha256  1286005b14ef58ea5b7baece054e772761e6351fdeceadd3a69e0a7c8b9bf28e \
+                            rmd160  118a7a7b2f91df85a8b8d0ef46fa57fba39152a5
 
 depends_lib                 port:gnutls
 
+patchfiles                  patch-src-libpiano-piano.c.diff \
+                            patch-src-main.c.diff
+
 configure.cflags-append     -std=c99
 
 use_configure               no

Added: trunk/dports/audio/pianobar/files/patch-src-libpiano-piano.c.diff
===================================================================
--- trunk/dports/audio/pianobar/files/patch-src-libpiano-piano.c.diff	                        (rev 0)
+++ trunk/dports/audio/pianobar/files/patch-src-libpiano-piano.c.diff	2012-04-27 18:01:04 UTC (rev 92390)
@@ -0,0 +1,19 @@
+--- src/libpiano/piano.c.orig	2012-04-27 07:52:09.000000000 -0700
++++ src/libpiano/piano.c	2012-04-27 07:52:24.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 */

Added: trunk/dports/audio/pianobar/files/patch-src-main.c.diff
===================================================================
--- trunk/dports/audio/pianobar/files/patch-src-main.c.diff	                        (rev 0)
+++ trunk/dports/audio/pianobar/files/patch-src-main.c.diff	2012-04-27 18:01:04 UTC (rev 92390)
@@ -0,0 +1,35 @@
+--- src/main.c.orig	2012-04-27 07:52:18.000000000 -0700
++++ src/main.c	2012-04-27 07:52:24.000000000 -0700
+@@ -77,10 +77,31 @@
+ 	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);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120427/404b5146/attachment-0001.html>


More information about the macports-changes mailing list