Thu May 10 00:01:50 UTC 2012

7 files changed, 75 insertions, 34 deletions

diff --git a/community/lazarus/ChangeLog b/community/lazarus/ChangeLog
index 0a843b0ec..d435cb744 100644
--- a/community/lazarus/ChangeLog
+++ b/community/lazarus/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-08  BlackIkeEagle
+	* fix FS#29807
+	* should not have removed Makefiles
+
 2012-04-30  BlackIkeEagle
 	* split pkgbuild
 	* lazarus (can be used for compiling)
diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD
index 6b3e8d720..0c471d0ed 100644
--- a/community/lazarus/PKGBUILD
+++ b/community/lazarus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70224 2012-05-02 13:40:21Z idevolder $
+# $Id: PKGBUILD 70466 2012-05-08 18:21:20Z idevolder $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jens Adam (byte/jra) <j_adam@web.de>
 # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
@@ -6,7 +6,7 @@
 pkgbase=lazarus
 pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt')
 pkgver=0.9.30.4
-pkgrel=2
+pkgrel=3
 url='http://www.lazarus.freepascal.org/'
 license=('GPL2' 'MPL' 'custom:LGPL')
 arch=('i686' 'x86_64')
@@ -54,8 +54,7 @@ package_lazarus() {
     --exclude=".xvpics" --exclude="*.compiled" \
     --exclude="killme*" --exclude=".gdb_hist*" \
     --exclude="debian"  --exclude="COPYING*" \
-    --exclude="*.app"   --exclude="Makefile*" \
-    --exclude="tools/install" \
+    --exclude="*.app"   --exclude="tools/install" \
     . "$pkgdir"/usr/lib/lazarus
 
   #remove some stuff, not needed or for in other package
diff --git a/community/mosh/PKGBUILD b/community/mosh/PKGBUILD
new file mode 100644
index 000000000..49a766641
--- /dev/null
+++ b/community/mosh/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Christian Neukirchen <chneukirchen@gmail.com>
+# Contributor: Thomas Weißschuh <thomas_weissschuh lavabit.com>
+
+pkgname=mosh
+pkgver=1.2
+pkgrel=1
+pkgdesc='Mobile shell, surviving disconnects with local echo and line editing'
+arch=('x86_64' 'i686')
+url="http://mosh.mit.edu/"
+license=('GPL3')
+depends=('protobuf' 'ncurses' 'zlib' 'openssh' 'perl' 'perl-io-tty')
+#optdepends=('libutempter: record of session in {u,t}wmp (recompile mosh afterwards)')
+conflicts=('mosh-git')
+source=("$pkgname-$pkgver.tgz::https://nodeload.github.com/keithw/mosh/tarball/master")
+sha1sums=('690e301560808f13a8a7b19bd7740d81fecac262')
+
+build() {
+  cd "$srcdir/keithw-mosh-"*
+
+  ./autogen.sh
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/keithw-mosh-"*
+
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD
index b7d2648f2..4e8ddf8f0 100644
--- a/community/roxterm/PKGBUILD
+++ b/community/roxterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69819 2012-04-23 17:44:21Z ttopper $
+# $Id: PKGBUILD 70468 2012-05-08 20:11:39Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=roxterm
-pkgver=2.6.2
+pkgver=2.6.3
 pkgrel=1
 pkgdesc="Tabbed, VTE-based terminal emulator"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm')
 makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg')
 install=roxterm.install
 source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2")
-sha1sums=('eca312666a1ff1412df2cddf93a12631c01d1a3a')
-md5sums=('5e5dc51b3341855fdb392f736476d89d')
+sha1sums=('f6f64cf35163338e539bdbc952d470b4a9217f9a')
+md5sums=('3089fc54b3c9bb8f8e087280bf96b037')
 
 
 build() {
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD
index adac2e46a..7b4254d11 100644
--- a/community/sslh/PKGBUILD
+++ b/community/sslh/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 69659 2012-04-22 00:48:23Z seblu $
+# $Id: PKGBUILD 70458 2012-05-08 13:27:24Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
 # Contributor: Jason Rodriguez <jason-aur@catloaf.net>
 
 pkgname=sslh
-pkgver=1.11
+pkgver=1.12
 pkgrel=1
 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
 arch=('i686' 'x86_64')
 url='http://www.rutschle.net/tech/sslh.shtml'
 license=('GPL2')
-backup=('etc/conf.d/sslh')
+depends=('libconfig')
+backup=('etc/conf.d/sslh' 'etc/sslh.conf')
 source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz"
         'sslh.rc'
         'sslh.conf'
         'sslh.service')
-md5sums=('4ea599f0fa31ae235646e5a200b8f8fb'
-         'f64da291e97f1a99c33cb6ebf939b95b'
-         'a098fb6b03a3435b223e16aed0e65e0b'
+md5sums=('265014ecdae4512eacca91aaff0b9a81'
+         'e1c44f8160b7fef397f81db63eec8421'
+         'c51c63d2b28080bae4c1c7a0c469bab7'
          'ee8a4fcfc1f6839f7c93deb6f59f7fd6')
 
 build() {
   cd $pkgname-$pkgver
   # fix archlinux path in manpage
-  sed -i -e "s/init.d/rc.d/" sslh.pod
-  sed -i -e "s+/etc/default+/etc/conf.d+" sslh.pod
+  sed -i 's/init.d/rc.d/' sslh.pod
+  sed -i 's+/etc/default+/etc/conf.d+' sslh.pod
+  # remove default pidfile in example
+  sed -i '/pidfile:/d' example.cfg
+  # daemon mode by default (as not overridable in command line)
+  sed -i 's/foreground: true;/foreground: false;/' example.cfg
   make
 }
 
@@ -40,6 +45,7 @@ package() {
   install -Dm 0755 sslh-select "$pkgdir/usr/bin/sslh-select"
   ln -s sslh-fork "$pkgdir/usr/bin/sslh"
   install -Dm 0644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz"
+  install -Dm 0644 example.cfg "$pkgdir/etc/sslh.conf"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/sslh/sslh.conf b/community/sslh/sslh.conf
index b22a325ef..d3a46d053 100644
--- a/community/sslh/sslh.conf
+++ b/community/sslh/sslh.conf
@@ -1,3 +1,3 @@
 # vim:set ts=2 sw=2 ft=sh noet:
 
-DAEMON_OPTS='-p 192.168.0.1:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443 -u nobody'
+DAEMON_OPTS='-F /etc/sslh.conf'
diff --git a/community/sslh/sslh.rc b/community/sslh/sslh.rc
index 9c31435a0..cd5397cad 100644
--- a/community/sslh/sslh.rc
+++ b/community/sslh/sslh.rc
@@ -4,31 +4,30 @@
 . /etc/rc.d/functions
 . /etc/conf.d/${0##*/}
 
-NAME=sslh
 DAEMON=/usr/bin/sslh
 PID=$(pidof -o %PPID $DAEMON)
 
 case "$1" in
-	start)
-		stat_busy "Starting $NAME daemon"
-		[[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
+  start)
+    stat_busy "Starting ${0##*/} daemon"
+    [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0
+    stat_fail
+  ;;
   stop)
-		stat_busy "Stopping $NAME daemon"
-		[[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
+    stat_busy "Stopping ${0##*/} daemon"
+    [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
+    stat_fail
+  ;;
   restart)
-		$0 stop
-		$0 start
-		exit 0
-	;;
+    $0 stop
+    $0 start
+    exit 0
+  ;;
   *)
-		echo "usage: ${0##*/} {start|stop|restart}" >&2
-	;;
+    echo "usage: ${0##*/} {start|stop|restart}" >&2
+  ;;
 esac
 
 exit 1
 
-# vim:set ts=2 sw=2 ft=sh noet:
+# vim:set ts=2 sw=2 ft=sh et: