From da7c1514649611074e8bfc4ad2c8ab776d22670b Mon Sep 17 00:00:00 2001 From: Justus Ranvier Date: Tue, 4 Jun 2013 15:13:16 -0500 Subject: [PATCH 1/5] Update Makefile to correct sandbox violations when built via Portage (Gentoo) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6f415786..6485c2c9 100755 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ install: install -m 644 src/pyelliptic/*.py $(DEST_APP)/pyelliptic install -m 644 src/socks/*.py $(DEST_APP)/socks install -m 644 src/bitmessageqt/*.py $(DEST_APP)/bitmessageqt - install -m 755 debian/pybm /usr/bin/pybitmessage + install -m 755 debian/pybm $(DESTDIR)/usr/bin/$(APP) install -m 644 desktop/$(APP).desktop $(DEST_SHARE)/applications/$(APP).desktop install -m 644 src/images/can-icon-24px.png $(DEST_SHARE)/icons/hicolor/24x24/apps/$(APP).png -- 2.45.1 From 354c82d85b68ca155a5ae83b3f04b602e77505a4 Mon Sep 17 00:00:00 2001 From: Justus Ranvier Date: Tue, 4 Jun 2013 15:21:53 -0500 Subject: [PATCH 2/5] Ensure $(DESTDIR)/usr/bin exists --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 6485c2c9..d49f63fc 100755 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ source: tar -cvzf ../$(APP)_$(VERSION).orig.tar.gz ../$(APP)-$(VERSION) --exclude-vcs install: + mkdir -m 755 -p $(DESTDIR)/usr/bin mkdir -m 755 -p $(DEST_APP) mkdir -m 755 -p $(DEST_SHARE)/applications mkdir -m 755 -p $(DEST_APP)/images -- 2.45.1 From 41792697b63dfd1de242ac04d691e1ea01708b12 Mon Sep 17 00:00:00 2001 From: Justus Ranvier Date: Tue, 4 Jun 2013 15:32:14 -0500 Subject: [PATCH 3/5] Add missing trailing semicolons to pybitmessage.desktop --- desktop/pybitmessage.desktop | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/desktop/pybitmessage.desktop b/desktop/pybitmessage.desktop index 363908dd..2b1b6902 100644 --- a/desktop/pybitmessage.desktop +++ b/desktop/pybitmessage.desktop @@ -7,12 +7,12 @@ Comment=Send encrypted messages to another person or to many subscribers Exec=pybitmessage %U Icon=pybitmessage Terminal=false -Categories=Network;Email;Application -Keywords=Email;E-mail;Newsgroup;Messaging +Categories=Network;Email;Application; +Keywords=Email;E-mail;Newsgroup;Messaging; X-MessagingMenu-UsesChatSection=true X-Ubuntu-Gettext-Domain=pybitmessage -Actions=Send;Subscribe;AddressBook +Actions=Send;Subscribe;AddressBook; [Desktop Action Send] Name=Send @@ -27,4 +27,4 @@ OnlyShowIn=Unity; [Desktop Action AddressBook] Name=Address Book Exec=pybitmessage -a -OnlyShowIn=Unity; \ No newline at end of file +OnlyShowIn=Unity; -- 2.45.1 From 127ad53685dbf7ffe5393e8fcf8a90133b0ffe7f Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Fri, 7 Jun 2013 20:44:30 -0400 Subject: [PATCH 4/5] broadcastpending message status is obsolete, use broadcastqueued instead --- src/bitmessagemain.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index e618b4bd..f9f0950c 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -1143,7 +1143,7 @@ class receiveDataThread(threading.Thread): toAddress = '[Broadcast subscribers]' ripe = '' shared.sqlLock.acquire() - t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastpending',1,1,'sent',2) + t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastqueued',1,1,'sent',2) shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() @@ -2821,7 +2821,7 @@ class singleWorker(threading.Thread): def sendBroadcast(self): shared.sqlLock.acquire() - t = ('broadcastpending',) + t = ('broadcastqueued',) shared.sqlSubmitQueue.put('''SELECT fromaddress, subject, message, ackdata FROM sent WHERE status=? and folder='sent' ''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() @@ -2882,7 +2882,7 @@ class singleWorker(threading.Thread): #Update the status of the message in the 'sent' table to have a 'broadcastsent' status shared.sqlLock.acquire() - t = ('broadcastsent',int(time.time()),fromaddress, subject, body,'broadcastpending') + t = ('broadcastsent',int(time.time()),fromaddress, subject, body,'broadcastqueued') shared.sqlSubmitQueue.put('UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() @@ -2948,7 +2948,7 @@ class singleWorker(threading.Thread): #Update the status of the message in the 'sent' table to have a 'broadcastsent' status shared.sqlLock.acquire() - t = ('broadcastsent',int(time.time()),fromaddress, subject, body,'broadcastpending') + t = ('broadcastsent',int(time.time()),fromaddress, subject, body,'broadcastqueued') shared.sqlSubmitQueue.put('UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() @@ -3813,7 +3813,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): ripe = '' shared.sqlLock.acquire() - t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastpending',1,1,'sent',2) + t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastqueued',1,1,'sent',2) shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() -- 2.45.1 From e3927acb80636c232da786014285122782b20751 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Fri, 7 Jun 2013 20:50:39 -0400 Subject: [PATCH 5/5] broadcastpending message status is obsolete, use broadcastqueued instead --- src/bitmessageqt/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index bc971563..6617da3d 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -1129,7 +1129,7 @@ class MyForm(QtGui.QMainWindow): toAddress = self.str_broadcast_subscribers ripe = '' shared.sqlLock.acquire() - t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastpending',1,1,'sent',2) + t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastqueued',1,1,'sent',2) shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() -- 2.45.1