Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/jhead/PKGBUILD
	extra/qca-gnupg/PKGBUILD
	extra/qca-ossl/PKGBUILD
	extra/qca/PKGBUILD

13 files changed, 114 insertions, 179 deletions

diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD
index 08b64291c..bfe9bec07 100644
--- a/community/cclive/PKGBUILD
+++ b/community/cclive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83242 2013-01-28 16:49:28Z stephane $
+# $Id: PKGBUILD 84279 2013-02-15 14:08:16Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 # Contributor: nathan owe ndowens04 at gmail dot com
 
 pkgname=cclive
-pkgver=0.7.11
-pkgrel=2
+pkgver=0.7.12
+pkgrel=1
 pkgdesc='Commandline downloader for popular video websites.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://cclive.sourceforge.net/'
@@ -13,7 +13,7 @@ license=('GPL3')
 depends=('boost-libs' 'pcre' 'curl' 'libquvi')
 makedepends=('boost')
 source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz")
-md5sums=('b96cf74e846e3047e0b1db917070c6d0')
+md5sums=('f35a6fb3a9a08d59da7170c1330a24ce')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD
index f7c359639..7eda10886 100644
--- a/community/duplicity/PKGBUILD
+++ b/community/duplicity/PKGBUILD
@@ -1,27 +1,22 @@
-# $Id: PKGBUILD 79464 2012-11-05 20:16:41Z bgyorgy $
+# $Id: PKGBUILD 84281 2013-02-15 14:20:17Z lfleischer $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=duplicity
-pkgver=0.6.20
-pkgrel=2
+pkgver=0.6.21
+pkgrel=1
 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nongnu.org/duplicity/'
 license=('GPL')
 depends=('librsync' 'ncftp' 'python2' 'python2-boto' 'python2-gnupginterface' 'python2-paramiko')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
-        u1-ascii-error.patch)
-md5sums=('83a56c4c17fc50961c961943867deae4'
-         '2bd2d4a3a331ab728473f46963dc87da'
-         '7e19cc49547848ce847297b1880f5a8e')
+source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('4ade1de475e0af64211bb6933b593057'
+         '3521d679ba7dff46653313aa3b3e6855')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Fix ascii error in U1 backend
-  patch -Np0 -i "${srcdir}/u1-ascii-error.patch"
-
   # python2 fix
   for file in $(find . -name '*.py' -print); do
     sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
diff --git a/community/duplicity/u1-ascii-error.patch b/community/duplicity/u1-ascii-error.patch
deleted file mode 100644
index 0812653b9..000000000
--- a/community/duplicity/u1-ascii-error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'duplicity/backends/u1backend.py'
---- duplicity/backends/u1backend.py	2012-10-27 12:16:19 +0000
-+++ duplicity/backends/u1backend.py	2012-11-03 21:39:23 +0000
-@@ -207,7 +207,7 @@
-                    "Content-Type": content_type}
-         resp, content = self.client.request(remote_full,
-                                             method="PUT",
--                                            body=str(data),
-+                                            body=bytearray(data),
-                                             headers=headers)
- 
-     def get(self, filename, local_path):
-
diff --git a/community/fcgiwrap/PKGBUILD b/community/fcgiwrap/PKGBUILD
index f3d818fea..dd461bd70 100644
--- a/community/fcgiwrap/PKGBUILD
+++ b/community/fcgiwrap/PKGBUILD
@@ -1,29 +1,23 @@
-# $Id: PKGBUILD 79378 2012-11-03 21:00:27Z lfleischer $
+# $Id: PKGBUILD 84283 2013-02-15 14:33:33Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Aaron Bull Schaefer <aaron@elasticdog.com>
 # Contributor: Ron Huang <ronhuang+aur at gmail dot com>
 
 pkgname=fcgiwrap
-pkgver=1.0.3
-_gitrev='b9f03e6'
-pkgrel=4
+pkgver=1.1.0
+pkgrel=1
 pkgdesc='A simple server for running CGI applications over FastCGI.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://nginx.localdomain.pl/wiki/FcgiWrap'
 license=('MIT')
 depends=('fcgi' 'systemd')
-backup=('etc/conf.d/fcgiwrap')
-source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${_gitrev}.tar.gz"
-        'fcgiwrap.conf.d'
-        'fcgiwrap.rc.d'
+source=("https://github.com/gnosek/fcgiwrap/archive/${pkgver}.tar.gz"
         'LICENSE')
-md5sums=('96d5f5a82b96f6eb7b4117fbab5e1e58'
-         '9fbb5b0e861ffea74e655143a4c1a8f9'
-         '71ea12f43aebca39f73ff2e0b684f361'
+md5sums=('d14f56bda6758a6e02aa7b3fb125cbce'
          '5aee62c27b4308f25ab32f05da387366')
 
 build() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   autoreconf --install
   ./configure --prefix=/usr --mandir=/share/man
@@ -31,10 +25,8 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
-  install -Dm0644 ../fcgiwrap.conf.d "${pkgdir}/etc/conf.d/${pkgname}"
-  install -Dm0755 ../fcgiwrap.rc.d "${pkgdir}/etc/rc.d/${pkgname}"
   install -Dm0644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/community/fcgiwrap/fcgiwrap.conf.d b/community/fcgiwrap/fcgiwrap.conf.d
deleted file mode 100644
index 906f597a0..000000000
--- a/community/fcgiwrap/fcgiwrap.conf.d
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# parameters for fcgiwrap daemon
-#
-
-SPAWNER='/usr/bin/spawn-fcgi'
-
-FCGI_ADDRESS='127.0.0.1'
-FCGI_PORT='9001'
-FCGI_USER='http'
-FCGI_GROUP='http'
-FCGI_EXTRA_OPTIONS=''
-
-SPAWNER_ARGS="-a $FCGI_ADDRESS -p $FCGI_PORT -u $FCGI_USER -g $FCGI_GROUP $FCGI_EXTRA_OPTIONS -- /usr/sbin/fcgiwrap"
diff --git a/community/fcgiwrap/fcgiwrap.rc.d b/community/fcgiwrap/fcgiwrap.rc.d
deleted file mode 100644
index 42787d149..000000000
--- a/community/fcgiwrap/fcgiwrap.rc.d
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON=fcgiwrap
-
-# source application-specific settings
-[ -f /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON
-
-# set defaults if settings are missing
-[ -z "$SPAWNER" ] && SPAWNER='/usr/bin/spawn-fcgi'
-[ -z "$SPAWNER_ARGS" ] && SPAWNER_ARGS='-a 127.0.0.1 -p 9001 -u http -g http -- /usr/sbin/fcgiwrap'
-
-get_pid() {
-  pidof -o %PPID $DAEMON
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $DAEMON daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$DAEMON.pid ] && rm -f /var/run/$DAEMON.pid
-      # RUN
-      $SPAWNER $SPAWNER_ARGS &> /dev/null
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$DAEMON.pid
-        add_daemon $DAEMON
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $DAEMON daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$DAEMON.pid &> /dev/null
-      rm_daemon $DAEMON
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $DAEMON status";
-    ck_status $DAEMON
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/community/jhead/PKGBUILD b/community/jhead/PKGBUILD
index 9619fd27a..3dc0e1518 100644
--- a/community/jhead/PKGBUILD
+++ b/community/jhead/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 73309 2012-07-06 06:23:17Z andrea $
-# Maintainer: François Charette <francois ατ archlinux δοτ org>
+# $Id: PKGBUILD 84285 2013-02-15 14:37:36Z lfleischer $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: François Charette <francois ατ archlinux δοτ org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=jhead
-pkgver=2.96
-pkgrel=1.1
-pkgdesc="EXIF JPEG info parser and thumbnail remover"
+pkgver=2.97
+pkgrel=1
+pkgdesc='EXIF JPEG info parser and thumbnail remover'
 url="http://www.sentex.net/~mwandel/jhead/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('glibc')
 optdepends=('libjpeg: to up-right images according to rotation tag')
-source=(http://www.sentex.net/~mwandel/${pkgname}/${pkgname}-${pkgver}.tar.gz 
+source=("http://www.sentex.net/~mwandel/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         LICENSE)
-md5sums=('562b45d4d82f64196debed8c520c1cab'
+md5sums=('23b037d0c54211973a3951e41a97c924'
          '1f0db611d2642a981719f45252762a45')
 
 build() {
@@ -23,7 +24,8 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  install -D -m755 jhead "${pkgdir}/usr/bin/jhead"
-  install -D -m644 jhead.1 "${pkgdir}/usr/share/man/man1/jhead.1"
-  install -D -m644 ${srcdir}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  install -Dm755 jhead "${pkgdir}/usr/bin/jhead"
+  install -Dm644 jhead.1 "${pkgdir}/usr/share/man/man1/jhead.1"
+  install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD
index 68b402fa9..36a37689f 100644
--- a/community/ngircd/PKGBUILD
+++ b/community/ngircd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81560 2012-12-24 04:07:48Z kkeen $
+# $Id: PKGBUILD 84301 2013-02-15 22:17:20Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ngircd
-pkgver=20
+pkgver=20.2
 pkgrel=1
 pkgdesc="Next Generation IRC Daemon"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('openssl' 'libident')
 source=("http://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.gz"
         ngircd.sh
         ngircd.service)
-sha256sums=('948b6ee9217bf0833958390513ba1ca2b2e8ddef809c226b889e7591f680c3d8'
+sha256sums=('306c0ef0d2ceac0836a84ecf871a6bc4dd16c25683aa87c0f172b6e68b93357d'
             'f8c28546090af8ce67471b9b4d577f6926007615356dd11afd2bc16f61d698d5'
             '13ffad9647ef42d1a9c8f01f6208bef9dfe9e0f86dce9a01f72711d813d720a0')
 
diff --git a/community/pv/PKGBUILD b/community/pv/PKGBUILD
index 83b573890..525dc8f3e 100644
--- a/community/pv/PKGBUILD
+++ b/community/pv/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 80922 2012-12-06 22:11:43Z lfleischer $
+# $Id: PKGBUILD 84287 2013-02-15 14:40:03Z lfleischer $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=pv
-pkgver=1.4.0
+pkgver=1.4.6
 pkgrel=1
 pkgdesc='A terminal-based tool for monitoring the progress of data through a pipeline.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url='http://www.ivarch.com/programs/pv.shtml'
 license=('custom:Artistic 2.0')
 depends=('glibc')
 source=("http://www.ivarch.com/programs/sources/$pkgname-$pkgver.tar.bz2")
-md5sums=('2403d1bc130b0f481344bd2b2470b17d')
+md5sums=('d55ff76f5caa83efc23aa527dbb0b191')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/surf/PKGBUILD b/community/surf/PKGBUILD
index 49087f052..4607ece1c 100644
--- a/community/surf/PKGBUILD
+++ b/community/surf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74178 2012-07-22 18:33:06Z lfleischer $
+# $Id: PKGBUILD 84289 2013-02-15 14:50:43Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Pierre Chapuis <catwell at archlinux dot us>
 # Contributor: Ray Kohler <ataraxia937 at gmail dot com>
@@ -6,7 +6,7 @@
 # Contributor: Raphael Proust <raphlalou at gmail dot com>
 
 pkgname=surf
-pkgver=0.5
+pkgver=0.6
 pkgrel=1
 pkgdesc='A simple web browser based on WebKit/GTK+.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,8 +21,8 @@ makedepends=('pkgconfig')
 install='surf.install'
 source=("http://dl.suckless.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'config.h')
-md5sums=('dc735a380d01203861b987b5f4c3c59c'
-         'd11435f6a67af46a0d19d18a95a1620b')
+md5sums=('aeeed723b562a30cc6a2b3ea18f6d99a'
+         '15c2c911658e2e6085e4c4fa7a7b01c1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/surf/config.h b/community/surf/config.h
index 8f8561a71..a221c86e3 100644
--- a/community/surf/config.h
+++ b/community/surf/config.h
@@ -1,49 +1,95 @@
 /* modifier 0 means no modifier */
-static char *useragent      = "Surf/"VERSION" (X11; U; Unix; en-US) AppleWebKit/531.2+ Compatible (Safari)";
-static char *progress       = "#0066FF";
-static char *progress_untrust = "#FF6600";
+static char *useragent      = "Mozilla/5.0 (X11; U; Unix; en-US) "
+	"AppleWebKit/537.15 (KHTML, like Gecko) Chrome/24.0.1295.0 "
+	"Safari/537.15 Surf/"VERSION;
+static char *progress       = "#0000FF";
+static char *progress_untrust = "#FF0000";
 static char *progress_trust = "#00FF00";
-static char *stylefile      = ".surf/style.css";
-static char *scriptfile     = ".surf/script.js";
-static char *cookiefile     = ".surf/cookies.txt";
+static char *progress_proxy = "#FFFF00";
+static char *progress_proxy_trust = "#66FF00";
+static char *progress_proxy_untrust = "#FF6600";
+static char *stylefile      = "~/.surf/style.css";
+static char *scriptfile     = "~/.surf/script.js";
+static char *cookiefile     = "~/.surf/cookies.txt";
 static time_t sessiontime   = 3600;
 static char *cafile         = "/etc/ssl/certs/ca-certificates.crt";
 static char *strictssl      = FALSE; /* Refuse untrusted SSL connections */
-#define HIDE_BACKGROUND FALSE
-#define SPATIAL_BROWSING TRUE
-
-#define SETPROP(p, q)     { .v = (char *[]){ "/bin/sh", "-c", \
-	"prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
-	"xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
-	p, q, winid, NULL } }
-#define DOWNLOAD(d) {			  \
+static int   indicator_thickness = 2;
+
+/* Webkit default features */
+static Bool enablespatialbrowsing = TRUE;
+static Bool enableplugins = TRUE;
+static Bool enablescripts = TRUE;
+static Bool enableinspector = TRUE;
+static Bool loadimages = TRUE;
+static Bool hidebackground  = FALSE;
+
+#define SETPROP(p, q) { \
+	.v = (char *[]){ "/bin/sh", "-c", \
+		"prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
+		"xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
+		p, q, winid, NULL \
+	} \
+}
+
+/* DOWNLOAD(URI, referer) */
+#define DOWNLOAD(d, r) { \
 	.v = (char *[]){ "/bin/sh", "-c", \
-	"xterm -e \"wget '$0' \
---load-cookies ~/.surf/cookies.txt \
---user-agent '$1' ; sleep 5\"", d, useragent, NULL } }
+		"st -e /bin/sh -c \"curl -J -O --user-agent '$1'" \
+		" --referer '$2'" \
+		" -b ~/.surf/cookies.txt -c ~/.surf/cookies.txt '$0';" \
+		" sleep 5;\"", \
+		d, useragent, r, NULL \
+	} \
+}
+
 #define MODKEY GDK_CONTROL_MASK
+
+/* hotkeys */
+/*
+ * If you use anything else but MODKEY and GDK_SHIFT_MASK, don't forget to
+ * edit the CLEANMASK() macro.
+ */
 static Key keys[] = {
     /* modifier	            keyval      function    arg             Focus */
     { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE } },
     { MODKEY,               GDK_r,      reload,     { .b = FALSE } },
     { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 } },
+
     { MODKEY,               GDK_p,      clipboard,  { .b = TRUE } },
     { MODKEY,               GDK_y,      clipboard,  { .b = FALSE } },
+
     { MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 } },
     { MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_i,      zoom,       { .i = 0  } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_q,      zoom,       { .i = 0  } },
+    { MODKEY,               GDK_minus,  zoom,       { .i = -1 } },
+    { MODKEY,               GDK_plus,   zoom,       { .i = +1 } },
+
     { MODKEY,               GDK_l,      navigate,   { .i = +1 } },
     { MODKEY,               GDK_h,      navigate,   { .i = -1 } },
+
     { MODKEY,               GDK_j,           scroll_v,   { .i = +1 } },
     { MODKEY,               GDK_k,           scroll_v,   { .i = -1 } },
     { MODKEY,               GDK_b,           scroll_v,   { .i = -10000 } },
     { MODKEY,               GDK_space,       scroll_v,   { .i = +10000 } },
     { MODKEY,               GDK_i,           scroll_h,   { .i = +1 } },
     { MODKEY,               GDK_u,           scroll_h,   { .i = -1 } },
+
+    { 0,                    GDK_F11,    fullscreen, { 0 } },
     { 0,                    GDK_Escape, stop,       { 0 } },
     { MODKEY,               GDK_o,      source,     { 0 } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_o,      inspector,  { 0 } },
+
     { MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
     { MODKEY,               GDK_f,      spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
+    { MODKEY,               GDK_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
+
     { MODKEY,               GDK_n,      find,       { .b = TRUE } },
     { MODKEY|GDK_SHIFT_MASK,GDK_n,      find,       { .b = FALSE } },
+
+    { MODKEY|GDK_SHIFT_MASK,GDK_c,      toggle,     { .v = "enable-caret-browsing" } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_i,      toggle,     { .v = "auto-load-images" } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_s,      toggle,     { .v = "enable-scripts" } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_v,      toggle,     { .v = "enable-plugins" } },
 };
+
diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD
index e5e46d471..3cf196895 100644
--- a/community/tomoyo-tools/PKGBUILD
+++ b/community/tomoyo-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74852 2012-08-07 13:20:49Z spupykin $
+# $Id: PKGBUILD 84271 2013-02-15 10:11:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
 
 pkgname=tomoyo-tools
 _basever=2.5.0
-_timestamp=20120805
+_timestamp=20130214
 _file=53357
 pkgver=${_basever}.${_timestamp}
 pkgrel=1
@@ -17,7 +17,7 @@ depends=('ncurses')
 conflicts=('ccs-tools')
 install=tomoyo-tools.install
 source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz")
-md5sums=('cccc7cb7f9492dc53063065f7ccf7b21')
+md5sums=('ffff6b531ed9ac32b01722a9cd749a2f')
 
 build() {
   cd "${srcdir}/${pkgname}"
diff --git a/community/wyrd/PKGBUILD b/community/wyrd/PKGBUILD
index 30e04b55f..a81260f41 100644
--- a/community/wyrd/PKGBUILD
+++ b/community/wyrd/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Daniel J Griffiths <griffithsdj@archlinux.us>
 
 pkgname=wyrd
-pkgver=1.4.5
-pkgrel=3
+pkgver=1.4.6
+pkgrel=1
 pkgdesc='A text-based front-end to Remind.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pessimization.com/software/wyrd/'
@@ -12,16 +12,16 @@ license=('GPL')
 depends=('remind' 'ncurses')
 makedepends=('ocaml')
 source=("http://pessimization.com/software/wyrd/${pkgname}-${pkgver}.tar.gz")
-md5sums=('3f39fa83a54d2d890823094aba9ca3cc')
+md5sums=('2fc561482fdac4daac0cb6735d934ebe')
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-	./configure --prefix=/usr --sysconfdir=/etc --enable-utf8
-	make
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-utf8
+  make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }