Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

6 files changed, 63 insertions, 14 deletions

diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index ca594501d..fc949d923 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -25,7 +25,7 @@ conflicts=('tetex' 'texlive-latex3' 'texlive-core')
 provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver")
 replaces=('tetex' 'texlive-latex3' 'texlive-core')
 url='http://tug.org/texlive/'
-source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip"
+source=("ftp://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip"
         "$_pkgname.maps")
 options=(!strip)
 install=texlive.install
diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
index 31ff6a3b4..cc6dd7509 100644
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -16,7 +16,7 @@ replaces=('texlive-fontsextra')
 conflicts=('texlive-fontsextra')
 provides=('texlive-fontsextra')
 url='http://tug.org/texlive/'
-source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
+source=("ftp://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
index b327d2f61..184adb743 100644
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -22,7 +22,7 @@ replaces=('texlive-latexextra')
 conflicts=('texlive-latexextra')
 groups=('texlive-most')
 url='http://tug.org/texlive/'
-source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
+source=("ftp://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD
index 0a7209f0b..652e75691 100644
--- a/pcr/mosquitto/PKGBUILD
+++ b/pcr/mosquitto/PKGBUILD
@@ -1,23 +1,24 @@
 # This is the PKGBUILD for mosquitto, an MQTT broker and example clients
-# Maintainer: Dan Anderson <dan-anderson@cox.net>
-# Contributor: Gordon JC Pearce <gordon@gjcp.net>
+# Maintainer: Alexander Rust <mail at alr dot st> 
+# Contributor: Dan Anderson <dan-anderson at cox dptnet>
 
 pkgname=mosquitto
-pkgver=1.1
-pkgrel=1
-pkgdesc="An MQTT broker and clients"
-arch=(i686 x86_64 mips64el)
+pkgver=1.1.3
+pkgrel=2
+pkgdesc="An Open Source MQTT v3.1 Broker"
+arch=('i686' 'x86_64' 'arm' 'armv6h' 'mips64el')
 url="http://mosquitto.org/"
 makedepends=('python')
 optdepends=('python: python support')
 license=('BSD')
-source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('ab51f64eb3f0041402073aa7865f3ec4'
-         '76fbc38a2eb0b8110caf7ac1f43d4057')
+source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" )
+md5sums=('fd0cae17221d778b0a002c31e6c3de9e'
+         'SKIP'
+         'b7cdd7a65d9a7ac5a8c2456f4b1f2d8f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-# Remove hardcoded prefix
+  #Remove hardcoded prefix
   find -name Makefile -exec sed '/prefix=/d' -i {} \;
 
   make prefix=/usr
@@ -26,7 +27,11 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make prefix=/usr DESTDIR="$pkgdir/" install
-
+  
+  # Systemd service file
+  install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+  
+  # 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
 }
diff --git a/pcr/mosquitto/mosquitto.service b/pcr/mosquitto/mosquitto.service
new file mode 100644
index 000000000..7e9ef7cc8
--- /dev/null
+++ b/pcr/mosquitto/mosquitto.service
@@ -0,0 +1,22 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Mosquitto MQTT Broker daemon
+ConditionPathExists=/etc/mosquitto/mosquitto.conf
+Requires=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf -d
+ExecStartPre=/bin/rm -f /var/run/mosquitto.pid
+PIDFile=/var/run/mosquitto.pid
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/pcr/uftp/PKGBUILD b/pcr/uftp/PKGBUILD
new file mode 100644
index 000000000..3aef7d164
--- /dev/null
+++ b/pcr/uftp/PKGBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Markus Jochim <ich@markusjochim.de>
+pkgname=uftp
+pkgver=4.0
+pkgrel=1
+pkgdesc="Multicast FTP software"
+arch=('i686' 'x86_64' 'mips64el')
+depends=('openssl')
+url="http://www.tcnj.edu/~bush/uftp.html"
+license=('GPL')
+source=(http://www.tcnj.edu/~bush/downloads/${pkgname}-${pkgver}.tar)
+md5sums=('475918421c000b59bfced1a3c21e3035')
+
+build() {
+	cd "$srcdir/${pkgname}-${pkgver}/"
+	make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+}
+
+package() {
+	cd "$srcdir/${pkgname}-${pkgver}/"
+	make DESTDIR="${pkgdir}" install
+}
+