From e663fa0a699b56a6d1e27d0f6e98dcae8a91035a Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 2 Nov 2014 13:21:51 +0000 Subject: [PATCH 1/2] Updates for Ubuntu PPA --- Makefile | 11 ++++++----- arch.sh | 10 +++++----- archpackage/PKGBUILD | 4 ++-- debian.sh | 2 +- debian/changelog | 30 ++++++++++++++++++++++++++++++ ebuild.sh | 8 ++++---- generate.sh | 2 +- puppy.sh | 4 ++-- rpm.sh | 16 ++++++++-------- rpmpackage/pybitmessage.spec | 26 +++++++++++++++++++++++++- slack.sh | 4 ++-- 11 files changed, 86 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index d3818f4d..8898efe7 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,12 @@ APP=pybitmessage -VERSION=0.4.2 +VERSION=0.4.4 RELEASE=1 ARCH_TYPE=`uname -m` PREFIX?=/usr/local +LIBDIR=lib all: debug: -sourcedeb: - tar -cvf ../${APP}_${VERSION}.orig.tar ../${APP}-${VERSION} --exclude-vcs --exclude 'debian' - gzip -f9n ../${APP}_${VERSION}.orig.tar source: tar -cvf ../${APP}_${VERSION}.orig.tar ../${APP}-${VERSION} --exclude-vcs gzip -f9n ../${APP}_${VERSION}.orig.tar @@ -31,7 +29,6 @@ install: mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/icons/hicolor/24x24/apps install -m 644 desktop/${APP}.desktop ${DESTDIR}${PREFIX}/share/applications/${APP}.desktop install -m 644 desktop/icon24.png ${DESTDIR}${PREFIX}/share/icons/hicolor/24x24/apps/${APP}.png - install -m 644 desktop/can-icon.svg ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${APP}.svg cp -rf src/* ${DESTDIR}${PREFIX}/share/${APP} echo '#!/bin/sh' > ${DESTDIR}${PREFIX}/bin/${APP} echo 'if [ -d ${DESTDIR}/usr/local/share/${APP} ]; then' >> ${DESTDIR}${PREFIX}/bin/${APP} @@ -54,3 +51,7 @@ clean: rm -f ../${APP}*.deb ../${APP}*.changes ../${APP}*.asc ../${APP}*.dsc rm -f rpmpackage/*.src.rpm archpackage/*.gz archpackage/*.xz rm -f puppypackage/*.gz puppypackage/*.pet slackpackage/*.txz + +sourcedeb: + tar -cvf ../${APP}_${VERSION}.orig.tar ../${APP}-${VERSION} --exclude-vcs --exclude 'debian' + gzip -f9n ../${APP}_${VERSION}.orig.tar diff --git a/arch.sh b/arch.sh index 64c903a7..96d2e8d8 100755 --- a/arch.sh +++ b/arch.sh @@ -1,8 +1,8 @@ #!/bin/bash APP=pybitmessage -PREV_VERSION=0.4.2 -VERSION=0.4.2 +PREV_VERSION=0.4.4 +VERSION=0.4.4 RELEASE=1 ARCH_TYPE=any CURRDIR=`pwd` @@ -24,14 +24,14 @@ sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links make clean rm -f archpackage/*.gz -# Having the root directory called name-version seems essential +# having the root directory called name-version seems essential mv ../${APP} ../${APP}-${VERSION} tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs -# Rename the root directory without the version number +# rename the root directory without the version number mv ../${APP}-${VERSION} ../${APP} -# Calculate the MD5 checksum +# calculate the MD5 checksum CHECKSM=$(md5sum ${SOURCE}) sed -i "s/md5sums[^)]*)/md5sums=(${CHECKSM%% *})/g" archpackage/PKGBUILD diff --git a/archpackage/PKGBUILD b/archpackage/PKGBUILD index 33eed270..5c2c78eb 100644 --- a/archpackage/PKGBUILD +++ b/archpackage/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Bob Mottram (4096 bits) pkgname=pybitmessage -pkgver=0.4.2 +pkgver=0.4.4 pkgrel=1 pkgdesc="Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide "non-content" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs." arch=('any') @@ -19,7 +19,7 @@ install= changelog= source=($pkgname-$pkgver.tar.gz) noextract=() -md5sums=(0ee9bcb11dc606788fde94c7857e8720) +md5sums=() build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr diff --git a/debian.sh b/debian.sh index 117d863c..3a4edbe5 100755 --- a/debian.sh +++ b/debian.sh @@ -2,7 +2,7 @@ APP=pybitmessage PREV_VERSION=0.4.2 -VERSION=0.4.2 +VERSION=0.4.4 RELEASE=1 ARCH_TYPE=all DIR=${APP}-${VERSION} diff --git a/debian/changelog b/debian/changelog index 6677ea9d..415dc400 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +pybitmessage (0.4.4-1) utopic; urgency=low + + * Added ability to limit network transfer rate + * Updated to Protocol Version 3 + * Removed use of memoryview so that we can support python 2.7.3 + * Make use of l10n for localizations + + -- Bob Mottram (4096 bits) Sun, 2 November 2014 12:55:00 +0100 + +pybitmessage (0.4.3-1) saucy; urgency=low + + * Support pyelliptic's updated HMAC algorithm. We'll remove support for the old method after an upgrade period. + * Improved version check + * Refactored decodeBase58 function + * Ignore duplicate messages + * Added bytes received/sent counts and rate on the network information tab + * Fix unicode handling in 'View HTML code as formatted text' + * Refactor handling of packet headers + * Use pointMult function instead of arithmetic.privtopub since it is faster + * Fixed issue where client wasn't waiting for a verack before continuing on with the conversation + * Fixed CPU hogging by implementing tab-based refresh improvements + * Added curses interface + * Added support for IPv6 + * Added a 'trustedpeer' option to keys.dat + * Limit maximum object size to 20 MB + * Support email-like > quote characters and reply-below-quote + * Added Japanese and Dutch language files; updated Norwegian and Russian languages files + + -- Bob Mottram (4096 bits) Thu, 6 March 2014 20:23:00 +0100 + pybitmessage (0.4.2-1) saucy; urgency=low * Exclude debian directory from orig.tar.gz diff --git a/ebuild.sh b/ebuild.sh index e5550355..11a6f5be 100755 --- a/ebuild.sh +++ b/ebuild.sh @@ -1,8 +1,8 @@ #!/bin/bash APP=pybitmessage -PREV_VERSION=0.4.2 -VERSION=0.4.2 +PREV_VERSION=0.4.4 +VERSION=0.4.4 RELEASE=1 SOURCEDIR=. ARCH_TYPE=`uname -m` @@ -21,13 +21,13 @@ sed -i "s/|${PREV_VERSION}|/|${VERSION}|/g" puppypackage/*.specs sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' puppypackage/pinstall.sh puppypackage/puninstall.sh sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links -# Create the source code in the SOURCES directory +# create the source code in the SOURCES directory make clean mkdir -p ~/ebuild rm -f ${SOURCE} mv ../${APP} ../${APP}-${VERSION} tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs -# Rename the root directory without the version number +# rename the root directory without the version number mv ../${APP}-${VERSION} ../${APP} diff --git a/generate.sh b/generate.sh index 933c08e9..c8f0e393 100755 --- a/generate.sh +++ b/generate.sh @@ -4,7 +4,7 @@ rm -f Makefile rpmpackage/*.spec -packagemonkey -n "PyBitmessage" --version "0.4.2" --dir "." -l "mit" \ +packagemonkey -n "PyBitmessage" --version "0.4.4" --dir "." -l "mit" \ -e "Bob Mottram (4096 bits) " \ --brief "Send encrypted messages" \ --desc "Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide \"non-content\" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs." \ diff --git a/puppy.sh b/puppy.sh index 6107ff4a..48832734 100755 --- a/puppy.sh +++ b/puppy.sh @@ -1,8 +1,8 @@ #!/bin/bash APP=pybitmessage -PREV_VERSION=0.4.2 -VERSION=0.4.2 +PREV_VERSION=0.4.4 +VERSION=0.4.4 RELEASE=1 BUILDDIR=~/petbuild CURRDIR=`pwd` diff --git a/rpm.sh b/rpm.sh index 9b67ba61..52fb0465 100755 --- a/rpm.sh +++ b/rpm.sh @@ -1,8 +1,8 @@ #!/bin/bash APP=pybitmessage -PREV_VERSION=0.4.2 -VERSION=0.4.2 +PREV_VERSION=0.4.4 +VERSION=0.4.4 RELEASE=1 SOURCEDIR=. ARCH_TYPE=`uname -m` @@ -24,25 +24,25 @@ sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links sudo yum groupinstall "Development Tools" sudo yum install rpmdevtools -# Setup the rpmbuild directory tree +# setup the rpmbuild directory tree rpmdev-setuptree -# Create the source code in the SOURCES directory +# create the source code in the SOURCES directory make clean mkdir -p ~/rpmbuild/SOURCES rm -f ${SOURCE} -# Having the root directory called name-version seems essential +# having the root directory called name-version seems essential mv ../${APP} ../${APP}-${VERSION} tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs -# Rename the root directory without the version number +# rename the root directory without the version number mv ../${APP}-${VERSION} ../${APP} -# Copy the spec file into the SPECS directory +# copy the spec file into the SPECS directory cp -f rpmpackage/${APP}.spec ~/rpmbuild/SPECS -# Build +# build cd ~/rpmbuild/SPECS rpmbuild -ba ${APP}.spec cd ${CURRDIR} diff --git a/rpmpackage/pybitmessage.spec b/rpmpackage/pybitmessage.spec index c30bbe0d..258636f8 100644 --- a/rpmpackage/pybitmessage.spec +++ b/rpmpackage/pybitmessage.spec @@ -1,5 +1,5 @@ Name: pybitmessage -Version: 0.4.2 +Version: 0.4.4 Release: 1%{?dist} Summary: Send encrypted messages License: MIT @@ -69,6 +69,30 @@ make install -B DESTDIR=%{buildroot} PREFIX=/usr %attr(644,root,root) /usr/share/icons/hicolor/24x24/apps/%{name}.png %changelog +* Sun Nov 2 2014 Bob Mottram (4096 bits) - 0.4.4-1 +- Added ability to limit network transfer rate +- Updated to Protocol Version 3 +- Removed use of memoryview so that we can support python 2.7.3 +- Make use of l10n for localizations + +* Thu Mar 6 2014 Bob Mottram (4096 bits) - 0.4.3-1 +- Support pyelliptic's updated HMAC algorithm. We'll remove support for the old method after an upgrade period. +- Improved version check +- Refactored decodeBase58 function +- Ignore duplicate messages +- Added bytes received/sent counts and rate on the network information tab +- Fix unicode handling in 'View HTML code as formatted text' +- Refactor handling of packet headers +- Use pointMult function instead of arithmetic.privtopub since it is faster +- Fixed issue where client wasn't waiting for a verack before continuing on with the conversation +- Fixed CPU hogging by implementing tab-based refresh improvements +- Added curses interface +- Added support for IPv6 +- Added a 'trustedpeer' option to keys.dat +- Limit maximum object size to 20 MB +- Support email-like > quote characters and reply-below-quote +- Added Japanese and Dutch language files; updated Norwegian and Russian languages files + * Thu Mar 6 2014 Bob Mottram (4096 bits) - 0.4.2-1 - Exclude debian directory from orig.tar.gz - Added Norwegian, Chinese, and Arabic translations diff --git a/slack.sh b/slack.sh index 9b6d70f7..c19ff954 100755 --- a/slack.sh +++ b/slack.sh @@ -1,8 +1,8 @@ #!/bin/bash APP=pybitmessage -PREV_VERSION=0.4.2 -VERSION=0.4.2 +PREV_VERSION=0.4.4 +VERSION=0.4.4 RELEASE=1 ARCH_TYPE=`uname -m` BUILDDIR=~/slackbuild From 4e6f6c0bdcc8b78acf4df632410c734c9593cfdf Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 2 Nov 2014 13:48:50 +0000 Subject: [PATCH 2/2] Improve the Makefile --- Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8898efe7..3078ee94 100644 --- a/Makefile +++ b/Makefile @@ -31,12 +31,16 @@ install: install -m 644 desktop/icon24.png ${DESTDIR}${PREFIX}/share/icons/hicolor/24x24/apps/${APP}.png cp -rf src/* ${DESTDIR}${PREFIX}/share/${APP} echo '#!/bin/sh' > ${DESTDIR}${PREFIX}/bin/${APP} - echo 'if [ -d ${DESTDIR}/usr/local/share/${APP} ]; then' >> ${DESTDIR}${PREFIX}/bin/${APP} - echo ' cd ${DESTDIR}/usr/local/share/${APP}' >> ${DESTDIR}${PREFIX}/bin/${APP} + echo "if [ -d ${PREFIX}/share/${APP} ]; then" >> ${DESTDIR}${PREFIX}/bin/${APP} + echo " cd ${PREFIX}/share/${APP}" >> ${DESTDIR}${PREFIX}/bin/${APP} echo 'else' >> ${DESTDIR}${PREFIX}/bin/${APP} - echo ' cd ${DESTDIR}/usr/share/pybitmessage' >> ${DESTDIR}${PREFIX}/bin/${APP} + echo " cd /usr/share/pybitmessage" >> ${DESTDIR}${PREFIX}/bin/${APP} + echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP} + echo 'if [ -d /opt/openssl-compat-bitcoin/lib ]; then' >> ${DESTDIR}${PREFIX}/bin/${APP} + echo ' LD_LIBRARY_PATH="/opt/openssl-compat-bitcoin/lib/" exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP} + echo 'else' >> ${DESTDIR}${PREFIX}/bin/${APP} + echo ' exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP} echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP} - echo 'LD_LIBRARY_PATH="/opt/openssl-compat-bitcoin/lib/" exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP} chmod +x ${DESTDIR}${PREFIX}/bin/${APP} uninstall: rm -f ${PREFIX}/share/man/man1/${APP}.1.gz