mosquitto-1.4.2-1: updating version

3 files changed, 16 insertions, 54 deletions

diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD
index 8f49e4461..b11a40bb7 100644
--- a/pcr/mosquitto/PKGBUILD
+++ b/pcr/mosquitto/PKGBUILD
@@ -1,38 +1,33 @@
 # This is the PKGBUILD for mosquitto, an MQTT broker and example clients
 
-# Maintainer: Tomáš Mládek <tmladek{at}inventati{dt}org> 
-# Contributor: Dan Anderson <dan-anderson at cox dptnet>
+# Maintainer (Arch): Tomáš Mládek <tmladek{at}inventati{dt}org> 
+# Contributor (Arch): Dan Anderson <dan-anderson at cox dptnet>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=mosquitto
-pkgver=1.4
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="An Open Source MQTT v3.1 Broker"
-arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'mips64el')
+arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
 url="http://mosquitto.org/"
 depends=('openssl' 'c-ares')
 makedepends=('python' 'docbook-xsl' 'c-ares')
-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')
+conflicts=('mosquitto-hg')
+provides=('mosquitto')
+license=('BSD')
+source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" "$pkgname.install" "usr_move.patch")
 install=$pkgname.install
+sha256sums=('5ebc3800a0018bfbec62dcc3748fb29f628df068acd39c62c4ef651d9276647e'
+         'SKIP'
+         'b09c9852b5b438bad8dd54b3ac665bb0d05d1a9e4daf8c920956457c83622b64'
+         '877ce99413301b0525f40adb5322dc50e69e2f90092138bf495c393dec65d449'
+         'c436bcc5a61d923ab36d5b3f24e5f628bf18ef14c2f351633d58ca983b5f655c')
 validpgpkeys=('A0D6EEA1DCAE49A635A3B2F0779B22DFB3E717B7')
 
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  #patch -p1 < ../docbook.patch
-#  patch -p1 < ../usr_move.patch
-  sed "s,/sbin,/bin,g" -i src/Makefile
-}
-
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  
+  patch -p1 < ../usr_move.patch
 
   make
 }
@@ -48,6 +43,4 @@ package() {
 
   # license files
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -Dm644 epl-v10 "$pkgdir/usr/share/licenses/$pkgname/EPL-1.0"
-  install -Dm644 edl-v10 "$pkgdir/usr/share/licenses/$pkgname/EDL-1.0"
 }
diff --git a/pcr/mosquitto/binmerge.patch b/pcr/mosquitto/binmerge.patch
deleted file mode 100644
index d6d79041d..000000000
--- a/pcr/mosquitto/binmerge.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/Makefile.orig	2013-06-03 12:23:15.288586121 -0300
-+++ src/Makefile	2013-06-03 12:23:29.455571403 -0300
-@@ -90,15 +90,15 @@
- 	${CC} $(CFLAGS) ${CPPFLAGS} -c $< -o $@
- 
- install : all
--	$(INSTALL) -d ${DESTDIR}$(prefix)/sbin
--	$(INSTALL) -s mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
-+	$(INSTALL) -d ${DESTDIR}$(prefix)/bin
-+	$(INSTALL) -s 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
- 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
- 
diff --git a/pcr/mosquitto/docbook.patch b/pcr/mosquitto/docbook.patch
deleted file mode 100644
index b82a00789..000000000
--- a/pcr/mosquitto/docbook.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/man/manpage.xsl	2013-06-02 17:22:59.958307000 +0200
-+++ b/man/manpage.xsl	2013-06-02 17:34:17.441551534 +0200
-@@ -1,6 +1,6 @@
- <!-- Set parameters for manpage xsl -->
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
--	<xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl"/>
-+	<xsl:import href="/usr/share/xml/docbook/xsl-stylesheets-1.78.1/manpages/docbook.xsl"/>
- 	<!-- Don't display notes list of link urls. -->
- 	<xsl:param name="man.endnotes.list.enabled">0</xsl:param>
- 	<xsl:param name="man.endnotes.are.numbered">0</xsl:param>