1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
This patch contains the differences between the upstream tarball and
the sources actually used for building the package.
Option single-debian-patch is used as the changes are tracked in git.
--- pushpin-1.15.0.orig/configure
+++ pushpin-1.15.0/configure
@@ -826,7 +826,9 @@ QStringList qc_splitflags(const QString
bool escaped = false;
QChar quote, backslash = QLatin1Char('\\\\');
QString buf;
+#ifdef PATH_MAX
buf.reserve(PATH_MAX);
+#endif
for (int i=0; i < flags.length(); i++) {
if (searchStart && flags[i].isSpace()) {
continue;
--- pushpin-1.15.0.orig/examples/config/pushpin.conf
+++ pushpin-1.15.0/examples/config/pushpin.conf
@@ -13,7 +13,7 @@ port_offset=0
[runner]
# services to start
-services=mongrel2,m2adapter,zurl,pushpin-proxy,pushpin-handler
+services=mongrel2,m2adapter,pushpin-proxy,pushpin-handler
# plain HTTP port that mongrel2 should listen on
http_port=7999
@@ -75,7 +75,11 @@ sockjs_url=http://cdn.jsdelivr.net/sockj
# pushpin will output a log message when a new version is available. report
# mode helps the pushpin project build credibility, so please enable it if you
# enjoy this software :)
-updates_check=report
+#
+# NOTE: Upstream enables this feature by default. The debian package
+# disables it for privacy reasons. please consider to enable it by setting
+# updates_check to 'report'.
+updates_check=off
# use this field to identify your organization in updates requests. if left
# blank, updates requests will be anonymous
--- pushpin-1.15.0.orig/src/proxy/app.cpp
+++ pushpin-1.15.0/src/proxy/app.cpp
@@ -281,7 +281,7 @@ public:
QByteArray sigKey = parse_key(settings.value("proxy/sig_key").toString());
QByteArray upstreamKey = parse_key(settings.value("proxy/upstream_key").toString());
QString sockJsUrl = settings.value("proxy/sockjs_url").toString();
- QString updatesCheck = settings.value("proxy/updates_check").toString();
+ QString updatesCheck = settings.value("proxy/updates_check","off").toString();
QString organizationName = settings.value("proxy/organization_name").toString();
QList<QByteArray> origHeadersNeedMark;
--- pushpin-1.15.0.orig/src/pushpin/internal.conf
+++ pushpin-1.15.0/src/pushpin/internal.conf
@@ -9,13 +9,13 @@ m2a_in_stream_specs=ipc://{rundir}/{ipc_
m2a_out_specs=ipc://{rundir}/{ipc_prefix}m2zhttp-in,ipc://{rundir}/{ipc_prefix}m2zws-in
# list of connect PUSH for sending zurl HTTP/WS requests
-zurl_out_specs=ipc://{rundir}/{ipc_prefix}zurl-in
+zurl_out_specs=ipc:///var/run/zurl/zurl-in
# list of connect ROUTER for continuing zurl HTTP/WS requests
-zurl_out_stream_specs=ipc://{rundir}/{ipc_prefix}zurl-in-stream
+zurl_out_stream_specs=ipc:///var/run/zurl/zurl-in-stream
# list of connect SUB for receiving zurl HTTP/WS responses
-zurl_in_specs=ipc://{rundir}/{ipc_prefix}zurl-out
+zurl_in_specs=ipc:///var/run/zurl/zurl-out
# bind DEALER for requesting inspection info (internal, used with handler)
handler_inspect_spec=ipc://{rundir}/{ipc_prefix}inspect
|
