mosquitto: upgrade

3 files changed, 32 insertions, 19 deletions

diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD
index ebd2784d4..8f49e4461 100644
--- a/pcr/mosquitto/PKGBUILD
+++ b/pcr/mosquitto/PKGBUILD
@@ -1,25 +1,34 @@
 # This is the PKGBUILD for mosquitto, an MQTT broker and example clients
 
-# Maintainer: Alexander Rust <mail at alr dot st> 
+# Maintainer: Tomáš Mládek <tmladek{at}inventati{dt}org> 
 # Contributor: Dan Anderson <dan-anderson at cox dptnet>
 
 pkgname=mosquitto
-pkgver=1.3.5
+pkgver=1.4
 pkgrel=1
 pkgdesc="An Open Source MQTT v3.1 Broker"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'mips64el')
 url="http://mosquitto.org/"
 depends=('openssl' 'c-ares')
 makedepends=('python' 'docbook-xsl' 'c-ares')
-license=('custom:BSD' 'custom:OpenSSL')
-source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" "$pkgname.install" "docbook.patch" "usr_move.patch")
+license=('custom:EPL1.0' 'custom:EDL1.0')
+source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc}
+        "$pkgname.service" "$pkgname.install"
+        "docbook.patch" "usr_move.patch")
+md5sums=('cd879f5964311501ba8e2275add71484'
+         'SKIP'
+         'a44fa1a85964b7309f5fb6de774aaa07'
+         'bfabddbce1d8c856cbb52517a7917d4c'
+         '8e1c14e99d7eba210b874e80b5153f0d'
+         '89383ee1ce75263949543069e247ecd6')
 install=$pkgname.install
+validpgpkeys=('A0D6EEA1DCAE49A635A3B2F0779B22DFB3E717B7')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
   #patch -p1 < ../docbook.patch
 #  patch -p1 < ../usr_move.patch
-  sed "s/\/sbin/\/bin/g" -i src/Makefile
+  sed "s,/sbin,/bin,g" -i src/Makefile
 }
 
 build() {
@@ -39,11 +48,6 @@ package() {
 
   # license files
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -Dm644 LICENSE-3rd-party.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE-3rd-party"
+  install -Dm644 epl-v10 "$pkgdir/usr/share/licenses/$pkgname/EPL-1.0"
+  install -Dm644 edl-v10 "$pkgdir/usr/share/licenses/$pkgname/EDL-1.0"
 }
-md5sums=('55094ad4dc7c7985377f43d4fc3d09da'
-         'SKIP'
-         '83dcdd5318ffe33d112b4b7a55269f05'
-         'bfabddbce1d8c856cbb52517a7917d4c'
-         '8e1c14e99d7eba210b874e80b5153f0d'
-         'b37551bbdccf751cdc5ea5b25afd2f5a')
diff --git a/pcr/mosquitto/mosquitto.service b/pcr/mosquitto/mosquitto.service
index 388bcf7a9..9a0a7eca8 100644
--- a/pcr/mosquitto/mosquitto.service
+++ b/pcr/mosquitto/mosquitto.service
@@ -13,3 +13,4 @@ Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
+
diff --git a/pcr/mosquitto/usr_move.patch b/pcr/mosquitto/usr_move.patch
index 961ab8a36..4a5bb2e13 100644
--- a/pcr/mosquitto/usr_move.patch
+++ b/pcr/mosquitto/usr_move.patch
@@ -1,13 +1,21 @@
---- a/src/Makefile	2013-06-03 03:03:05.321690000 +0200
-+++ b/src/Makefile	2013-06-04 03:45:13.514436898 +0200
-@@ -96,8 +96,8 @@
- 	${CC} $(CFLAGS) ${CPPFLAGS} -c $< -o $@
+--- a/src/Makefile	2015-02-18 02:44:09.000000000 +0100
++++ a/src/Makefile	2015-02-20 17:15:30.180477359 +0100
+@@ -102,15 +102,15 @@
+ 	${CROSS_COMPILE}${CC} $(CFLAGS) ${CPPFLAGS} -c $< -o $@
  
  install : all
 -	$(INSTALL) -d ${DESTDIR}$(prefix)/sbin
--	$(INSTALL) -s mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
+-	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
 +	$(INSTALL) -d ${DESTDIR}$(prefix)/bin
-+	$(INSTALL) -s mosquitto ${DESTDIR}${prefix}/bin/mosquitto
++	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto ${DESTDIR}${prefix}/bin/mosquitto
  	$(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h
  ifeq ($(WITH_TLS),yes)
- 	$(INSTALL) -s mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
+ 	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
+ endif
+ 
+ uninstall :
+-	-rm -f ${DESTDIR}${prefix}/sbin/mosquitto
++	-rm -f ${DESTDIR}${prefix}/bin/mosquitto
+ 	-rm -f ${DESTDIR}${prefix}/include/mosquitto_plugin.h
+ 	-rm -f ${DESTDIR}${prefix}/bin/mosquitto_passwd
+