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

8 files changed, 95 insertions, 35 deletions

diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD
index 851470439..b03b2935e 100644
--- a/pcr/libquvi-scripts-current/PKGBUILD
+++ b/pcr/libquvi-scripts-current/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=libquvi-scripts-current
 _pkgname=libquvi-scripts
 provides=(libquvi-scripts)
-pkgver=0.9.20131104
+pkgver=0.9.20131130
 pkgrel=1
 pkgdesc='Library for parsing video download links.'
 arch=('any')
@@ -24,5 +24,5 @@ package() {
   cd "${_pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('0ddb9e392b46cee0e7a4af260bc1a1a3'
+md5sums=('46ddfd887260a515199c2e1ba8c46d8a'
          'SKIP')
diff --git a/pcr/plowshare/PKGBUILD b/pcr/plowshare/PKGBUILD
index 7f40c9b96..11291ef4a 100644
--- a/pcr/plowshare/PKGBUILD
+++ b/pcr/plowshare/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: breakdown <breakdown(at)archlinux(dot)us>
 
 pkgname=plowshare
-pkgver=snapshot_git20131102.b72c58d
+pkgver=snapshot_git20131130.3c63b19
 pkgrel=1
 pkgdesc="Command-line downloader and uploader for Rapidshare, Mediafire and other file sharing websites."
 arch=('any')
@@ -31,4 +31,4 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('fdb52ad0a07c1a23aeef3960ebb18916')
+md5sums=('1e2468cad043a7225c3092290d844163')
diff --git a/~lukeshu/wdiff/PKGBUILD b/pcr/wdiff/PKGBUILD
index 41bee9679..41bee9679 100644
--- a/~lukeshu/wdiff/PKGBUILD
+++ b/pcr/wdiff/PKGBUILD
diff --git a/pcr/xrdp/PKGBUILD b/pcr/xrdp/PKGBUILD
new file mode 100644
index 000000000..1cf561115
--- /dev/null
+++ b/pcr/xrdp/PKGBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Tomasz Zok <tomasz.zok [at] gmail.com>
+# Maintainer: techryda <techryda at silentdome dot com>
+# Contributor: Mathias R. <pu154r@overlinux.org>
+# Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
+
+pkgname=xrdp
+pkgver=0.6.1
+pkgrel=1
+pkgdesc="An open source remote desktop protocol (RDP) server"
+url="http://xrdp.sourceforge.net/"
+arch=('i686' 'x86_64' 'armv6h')
+license=('GPL')
+depends=('tigervnc')
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-v$pkgver.tar.gz"
+        'xrdp.service'
+        'xrdp-sesman.service')
+md5sums=('26099c6588943262023607c1b4e774d8'
+         '0cb760b3e8a34f9bdf4daa871444d74c'
+         '58eb44bdc7ca5bb436d6fd66826f9b0f')
+
+prepare() {
+    cd "${pkgname}-v${pkgver}"
+    # Fix path in xrdp.sh file
+    sed -i 's|/usr/local/sbin|/usr/bin|' instfiles/xrdp.sh
+}
+
+build() {
+    cd "${pkgname}-v${pkgver}"
+    ./bootstrap
+    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
+    make
+}
+
+package() {
+    cd "${pkgname}-v${pkgver}"
+    make DESTDIR="$pkgdir" install
+    cd ${pkgdir}
+    # Install systemd service files
+    mkdir -p usr/lib/systemd/system
+    cp ${srcdir}/*.service usr/lib/systemd/system
+}
diff --git a/pcr/xrdp/xrdp-sesman.service b/pcr/xrdp/xrdp-sesman.service
new file mode 100644
index 000000000..8222069b9
--- /dev/null
+++ b/pcr/xrdp/xrdp-sesman.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=xrdp session manager
+After=syslog.target network.target
+StopWhenUnneeded=true
+
+[Service]
+Type=forking
+PIDFile=/var/run/xrdp-sesman.pid
+EnvironmentFile=/etc/xrdp/xrdp.ini
+ExecStart=/usr/bin/xrdp-sesman $SESMAN_OPTIONS
+ExecStop=/usr/bin/xrdp-sesman $SESMAN_OPTIONS --kill
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/pcr/xrdp/xrdp.service b/pcr/xrdp/xrdp.service
new file mode 100644
index 000000000..269dff87b
--- /dev/null
+++ b/pcr/xrdp/xrdp.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=xrdp daemon
+Requires=xrdp-sesman.service
+After=syslog.target network.target xrdp-sesman.service
+
+[Service]
+Type=forking
+PIDFile=/var/run/xrdp.pid
+EnvironmentFile=/etc/xrdp/xrdp.ini
+ExecStart=/usr/bin/xrdp $XRDP_OPTIONS
+ExecStop=/usr/bin/xrdp $XRDP_OPTIONS --kill
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 2c1087fee..2d0046f1e 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.11.29
+pkgver=2013.12.03
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -28,5 +28,5 @@ package() {
     "${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
-md5sums=('5a03df2c239f3cd2ed9f6c0c64afdb40'
+md5sums=('54f68459d5463d7cde0379a2b9394734'
          'SKIP')
diff --git a/~lukeshu/thingutils-git/PKGBUILD b/~lukeshu/thingutils-git/PKGBUILD
index d3d13925a..23683bc52 100644
--- a/~lukeshu/thingutils-git/PKGBUILD
+++ b/~lukeshu/thingutils-git/PKGBUILD
@@ -2,16 +2,20 @@
 
 _pkgname=thingutils
 pkgname=$_pkgname-git
+
+pkgver=20131203
+_gitver=aa2d5a3a4363ff4f4ca23f4c6716613c4be66ecd
+pkgdesc=""
+url="https://gitorious.org/thingutils"
+license=('MIT')
+
 provides=($_pkgname)
 conflicts=($_pkgname)
-pkgver=20120117
 pkgrel=1
-pkgdesc=""
 arch=('i686' 'x86_64')
-url="https://gitorious.org/thingutils"
-license=('MIT')
+
 depends=(
-    'php' # roll, urldecode
+    'php' # urldecode
     'bash' # daemon, newegg, sysfiles
     'emacs' # emacsmail, emacsterm, e
     'wget' # whatismyip
@@ -21,36 +25,22 @@ depends=(
     'wdiff' # chardiff
     'acpi' # batterymon, tempmon
 )
-makedepends=('git')
+makedepends=('go')
 
-_gitroot=https://git.gitorious.org/thingutils/thingutils.git
-_gitname=$_pkgname
+source=("libre://$pkgname-$pkgver.tar.gz")
+
+mkdepends=('git')
+mksource=("$pkgname-$pkgver::git://gitorious.org/$_pkgname/$_pkgname.git#commit=$_gitver")
+mkmd5sums=('SKIP')
 
 build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [[ -d "$_gitname" ]]; then
-    cd "$_gitname" && git pull origin
-    msg "The local files are updated."
-  else
-    git clone "$_gitroot" "$_gitname"
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
-
-  #
-  # BUILD HERE
-  #
+  cd "$srcdir/$pkgname-$pkgver"
   make prefix=/usr
 }
 
 package() {
-  cd "$srcdir/$_gitname-build"
+  cd "$srcdir/$pkgname-$pkgver"
   make install prefix=/usr DESTDIR="$pkgdir"
 }
+
+md5sums=('7991e689263698f3d9a6470184f97ed1')