Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre

Conflicts:
	libre/kernel26-libre-lts/PKGBUILD
	libre/kernel26-libre-lts/config.x86_64

44 files changed, 380 insertions, 405 deletions

diff --git a/.gitignore b/.gitignore
index f7fbb4a2e..9a6d4ab3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ src/
 pkg/
 *.pkg.tar.*
 *.src.tar.*
+namcap.log
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index aca8c9a8d..b29567abf 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=audacious-plugins-libre
 pkgver=2.4.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Plugins for Audacious without unfree plugins'
 arch=('i686' 'x86_64')
 url='http://audacious-media-player.org/'
@@ -63,15 +63,19 @@ mksource(){
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
+
+	sed 's/libavcore >= 0.12.0//g' -i configure # FS#23549
+
+	[[ $CARCH == x86_64 ]] && extraopts='' || extraopts='--disable-sse2'
 	./configure \
-		--build=$CHOST \
-		--host=$CHOST \
-		--target=$CHOST \
 		--prefix=/usr \
 		--enable-chardet \
 		--enable-amidiplug \
 		--disable-adplug \
-                --disable-psf  
+		--disable-psf \
+		$extraopts \
+		--disable-projectm # no support for projectm-2.0.1, cf. FS#21344
+		                   # would require libvisual-projectm in make/optdeps
 	make
 }
 
@@ -79,5 +83,4 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-
 md5sums=('df761a2d07e2ad1221c5fe61fa32dcb0')
diff --git a/libre/aufs2-libre/PKGBUILD b/libre/aufs2-libre/PKGBUILD
index 7e092717b..bd177ef9c 100644
--- a/libre/aufs2-libre/PKGBUILD
+++ b/libre/aufs2-libre/PKGBUILD
@@ -2,22 +2,23 @@
 # Maintainer: Paul Mattal <pjmattal@elys.com>
 
 pkgname=aufs2-libre
-pkgver=2.6.37_20110124
-pkgrel=3
+pkgver=2.6.38_20110314
+pkgrel=4
 #_kernver=${pkgver%_*}-LIBRE
-_kernver=2.6.37-LIBRE
+_kernver=2.6.38-LIBRE
 pkgdesc="Another Unionfs Implementation for the Linux-Libre kernel"
 arch=('i686' 'x86_64')
 url="http://aufs.sourceforge.net/"
 license=('GPL2')
-depends=('kernel26-libre>=2.6.37.3' 'kernel26-libre<2.6.38')
-makedepends=('kernel26-libre-headers>=2.6.37' 'kernel26-libre-headers<2.6.38')
+depends=('kernel26-libre>=2.6.38' 'kernel26-libre<2.6.39')
+makedepends=('kernel26-libre-headers>=2.6.38' 'kernel26-libre-headers<2.6.39')
 replaces=('aufs' 'aufs2')
 conflicts=('aufs2')
 provides=("aufs2=$pkgver")
 install=${pkgname}.install
 source=("ftp://ftp.archlinux.org/other/aufs2/${pkgname%-libre}-${pkgver}.tar.gz")
-options=('!makeflags')
+options=('!makeflags' '!strip')
+md5sums=('60649fa47d3f499dfbb4b68a2afde47c')
 
 build() {
   cd ${srcdir}/${pkgname%-libre}-${pkgver}
@@ -61,7 +62,3 @@ package() {
   # gzip -9 all modules to safe 100MB
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
 }
-
-md5sums=('fa64d7893490ef9c82310ebd5f730443')
-
-md5sums=('fa64d7893490ef9c82310ebd5f730443')
diff --git a/libre/aufs2-libre/aufs2-libre.install b/libre/aufs2-libre/aufs2-libre.install
index 4c95ad76e..883882a54 100644
--- a/libre/aufs2-libre/aufs2-libre.install
+++ b/libre/aufs2-libre/aufs2-libre.install
@@ -1,5 +1,5 @@
 post_install() {
-  KERNEL_VERSION=2.6.37-ARCH
+  KERNEL_VERSION=2.6.38-LIBRE
   depmod $KERNEL_VERSION
 }
 
diff --git a/libre/aufs2-libre/create-tarball.sh b/libre/aufs2-libre/create-tarball.sh
index a460a8b3b..6801f00bd 100644
--- a/libre/aufs2-libre/create-tarball.sh
+++ b/libre/aufs2-libre/create-tarball.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
-AUFS2VERSION="-37"
-KERNELVERSION=2.6.37
-GITSNAPSHOT=20110124
+AUFS2VERSION="-38"
+KERNELVERSION=2.6.38
+GITSNAPSHOT=20110314
 # aufs2 (no -xx) for the latest -rc version.
 git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2-standalone.git
 cd aufs2-standalone.git
-git checkout origin/aufs2.1${AUFS2VERSION}
-#git checkout origin/aufs2.1
+#git checkout origin/aufs2.1${AUFS2VERSION}
+git checkout origin/aufs2.1
 #*** apply "aufs2-base.patch" and "aufs2-standalone.patch" to your kernel source files.
 cd ..
 rm -rf aufs2-${KERNELVERSION}_${GITSNAPSHOT}
diff --git a/libre/ffmpeg-libre/PKGBUILD b/libre/ffmpeg-libre/PKGBUILD
index 3a66030ea..41c332dca 100644
--- a/libre/ffmpeg-libre/PKGBUILD
+++ b/libre/ffmpeg-libre/PKGBUILD
@@ -16,11 +16,10 @@ makedepends=('yasm' 'git')
 #git clone git://git.videolan.org/ffmpeg.git
 source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${pkgver}.tar.xz)
 md5sums=('dd682a876a496b9f9ae8afb3b3b70389')
-options=('force')
 #source=(http://ffmpeg.org/releases//releases/ffmpeg-${pkgver}.tar.bz2)
-provides=('ffmpeg')
+provides=("ffmpeg=$pkgver")
 conflicts=('ffmpeg')
-replaces=("ffmpeg=$pkgver")
+replaces=('ffmpeg')
 
 build() {
   cd "$srcdir/${pkgname%-libre}"
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index bdfbee155..7a9630c34 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -3,8 +3,8 @@
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 
 pkgname=filesystem
-pkgver=2010.12
-pkgrel=2
+pkgver=2011.04
+pkgrel=1.1
 pkgdesc='Base filesystem for Parabola'
 arch=('any')
 license=('GPL')
@@ -18,23 +18,6 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc
 source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
         'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'resolv.conf' 'shells'
         'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first')
-md5sums=('75c7e1770305e1f3b75c52785c137611'
-         '140787c0dc6f3f1272cfd381b92b0155'
-         '13753e4e0964f3652b0cc60a28528bdf'
-         '4c4540eeb748bf1f71d631b8c1dcf0b3'
-         'f28150d4c0b22a017be51b9f7f9977ed'
-         '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '8a9042a2cedf6b6b47eb8973f14289cb'
-         'b8355d9d2782f424f4cedcf682651be0'
-         'ef40305da5803ca69d22e428ffc2ab9b'
-         'e5d8323a4dbee7a6d0d2a19cbf4b819f'
-         '7bc65f234dfb6abf24e7c3b03e86f4ff'
-         'd41d8cd98f00b204e9800998ecf8427e'
-         '6f48288b6fcaf0065fcb7b0e525413e0'
-         '40dac0de4c6b99c8ca97effbd7527c84'
-         '59768b5f4080b96b67bcde5f66984ad5'
-         '51ac5c337236235bf8fe85a9b07b6db1'
-         '8098ffd9fbf890468d3198277596b85a')
 
 package() {
 	cd ${srcdir}
@@ -42,7 +25,7 @@ package() {
 	#
 	# setup root filesystem
 	#
-	for d in bin boot dev etc home lib/modules media mnt sbin usr var opt srv/http sys; do
+	for d in bin boot dev etc home lib/modules media mnt sbin usr var opt srv/http sys run; do
 		install -d -m755 ${pkgdir}/${d}
 	done
 	install -d -m555 ${pkgdir}/proc
@@ -93,3 +76,20 @@ package() {
 	done
 	ln -s ../man ${pkgdir}/usr/local/share/man
 }
+md5sums=('772fe869b921698cc3e6fde73c4ac85a'
+         '140787c0dc6f3f1272cfd381b92b0155'
+         '13753e4e0964f3652b0cc60a28528bdf'
+         '4c4540eeb748bf1f71d631b8c1dcf0b3'
+         'f28150d4c0b22a017be51b9f7f9977ed'
+         '6e488ffecc8ba142c0cf7e2d7aeb832e'
+         '8a9042a2cedf6b6b47eb8973f14289cb'
+         'b8355d9d2782f424f4cedcf682651be0'
+         'ef40305da5803ca69d22e428ffc2ab9b'
+         'e5d8323a4dbee7a6d0d2a19cbf4b819f'
+         '7bc65f234dfb6abf24e7c3b03e86f4ff'
+         'd41d8cd98f00b204e9800998ecf8427e'
+         '6f48288b6fcaf0065fcb7b0e525413e0'
+         '40dac0de4c6b99c8ca97effbd7527c84'
+         'd2dc4e39dbdea75b107f91789e3274ab'
+         'f3b6ae7db8adffaaa4bffc6099dcbd50'
+         '8098ffd9fbf890468d3198277596b85a')
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 4b2b261a4..640cd5c1d 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -2,6 +2,8 @@ post_install() {
 	[ -f var/log/lastlog ] ||  : >var/log/lastlog
 	[ -f var/log/wtmp ]    ||  : >var/log/wtmp
 	[ -f var/run/utmp ]    ||  : >var/run/utmp
+	chown root:20 var/run/utmp
+	chmod 664 var/run/utmp
 	[ -f var/log/btmp ]    || (: >var/log/btmp && bin/chmod 600 var/log/btmp)
 	# workaround for bug #7194
 	# readded due to bug #9465
@@ -32,6 +34,7 @@ post_upgrade() {
 	_addgroup floppy  -g 94
 	_addgroup storage -g 95
 	_addgroup log     -g 19
+	_addgroup utmp    -g 20
 	_addgroup power   -g 98
 	_addgroup network -g 90
 	_addgroup games   -g 50
diff --git a/libre/filesystem/group b/libre/filesystem/group
index 4bd635c47..261746d9e 100644
--- a/libre/filesystem/group
+++ b/libre/filesystem/group
@@ -13,6 +13,7 @@ ftp:x:11:
 mail:x:12:
 uucp:x:14:
 log:x:19:root
+utmp:x:20:
 locate:x:21:
 rfkill:x:24:
 smmsp:x:25:
diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow
index 06b488fe9..ed176823e 100644
--- a/libre/filesystem/gshadow
+++ b/libre/filesystem/gshadow
@@ -13,6 +13,7 @@ ftp:::
 mail:::
 uucp:::
 log:::root
+utmp:x::
 locate:::
 rfkill:x::
 smmsp:::
diff --git a/libre/filesystem/profile b/libre/filesystem/profile
index ccc07a4e5..3bc22db9f 100644
--- a/libre/filesystem/profile
+++ b/libre/filesystem/profile
@@ -10,7 +10,7 @@ export PATH
 # Load profiles from /etc/profile.d
 if test -d /etc/profile.d/; then
 	for profile in /etc/profile.d/*.sh; do
-		test -r $profile && . $profile
+		test -r "$profile" && . "$profile"
 	done
 	unset profile
 fi
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index 60582062a..4c2e4f7ec 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94631 2010-10-08 20:42:27Z andyrtr $
+# $Id$
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer (Parabola): xihh
 
 pkgname=ghostscript-libre
-pkgver=9.01
-pkgrel=2
+pkgver=9.02
+pkgrel=1
 pkgdesc="An interpreter for the PostScript language without non-free files"
 arch=('i686' 'x86_64')
 license=('GPL3') #non free files removed
@@ -16,43 +16,18 @@ conflicts=('ghostscript')
 replaces=('ghostscript-lrpng' 'ghostscript')
 provides=('ghostscript-lprng' "ghostscript=$pkgver")
 url="http://www.ghostscript.com/"
-source=(http://ghostscript.com/releases/ghostscript-${pkgver}.tar.bz2
-	ghostscript-fPIC.patch
-	ghostscript-system-jasper.patch
-	svn_rev11948.diff
-	ghostscript-gdevcups-691733.patch
-	gs_bug691759and691760.diff)
+source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
 options=('!libtool' '!makeflags')
-md5sums=('9824d6a21ad8b4a831f67601959f1181'
-         '766d44c47c693f96941b658e360c1277'
-         '03e27cd02471ab3b642c344fa06b623e'
-         '78f2b9c2d6a5a60891b2d8b593a15b00'
-         'e459d4cf897bdb54fefbba9d57bd2fa2'
-         '21841b0ea5bd67cf4b68ba64c5d5755b')
+md5sums=('f67151444bd56a7904579fc75a083dd6')
 
 build() {
   cd ${srcdir}/ghostscript-${pkgver}
+
   # force it to use system-libs
   rm -rf jpeg libpng zlib jasper expat tiff
   # delete non-free packages
   grep -l "are not altered" Resource/CMap/* | xargs rm -fv
 
-  # fix build with systems jasper
-#  patch -Np1 -i ${srcdir}/ghostscript-system-jasper.patch
-
-#  if [ "$CARCH" = "x86_64" ]; then
-#    patch -Np1 -i ${srcdir}/ghostscript-fPIC.patch
-#  fi
-
-  # part of https://bugs.archlinux.org/task/22006 - http://bugs.ghostscript.com/show_bug.cgi?id=691831
-#  patch -Np2 -i ${srcdir}/svn_rev11948.diff
-  # upstream fix for http://bugs.ghostscript.com/show_bug.cgi?id=691733 / part of https://bugs.archlinux.org/task/21388
-  # patch taken from Fedora RawHide master
-#  patch -Np1 -i ${srcdir}/ghostscript-gdevcups-691733.patch
-  # patch for http://bugs.ghostscript.com/show_bug.cgi?id=691760 and http://bugs.ghostscript.com/show_bug.cgi?id=691759 / part of https://bugs.archlinux.org/task/21388
-#  patch -Np2 -i ${srcdir}/gs_bug691759and691760.diff
-  
-#  ./autogen.sh
   ./configure --prefix=/usr \
 	--enable-dynamic \
 	--with-ijs \
diff --git a/libre/ghostscript-libre/ghostscript-fPIC.patch b/libre/ghostscript-libre/ghostscript-fPIC.patch
deleted file mode 100644
index 6f8999696..000000000
--- a/libre/ghostscript-libre/ghostscript-fPIC.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ghostscript-8.60-r8112/base/lib.mak.fPIC	2007-07-10 17:03:11.000000000 +0100
-+++ ghostscript-8.60-r8112/base/lib.mak	2007-07-10 17:05:56.000000000 +0100
-@@ -874,7 +874,7 @@
- $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\
-  $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\
-  $(gstypes_h)
--	$(GLCC) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
-+	$(GLCCSHARED) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
- 
- # Future replacement for gsparams.c
- $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(GXERR) $(memory__h)\
-@@ -1077,7 +1077,7 @@
- 
- # Provide a mapping between StandardEncoding and ISOLatin1Encoding.
- $(GLOBJ)gdevemap.$(OBJ) : $(GLSRC)gdevemap.c $(AK) $(std_h)
--	$(GLCC) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c
-+	$(GLCCSHARED) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c
- 
- ###### Create a pseudo-"feature" for the entire graphics library.
- 
diff --git a/libre/ghostscript-libre/ghostscript-gdevcups-691733.patch b/libre/ghostscript-libre/ghostscript-gdevcups-691733.patch
deleted file mode 100644
index 2f93f2e44..000000000
--- a/libre/ghostscript-libre/ghostscript-gdevcups-691733.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -up ghostscript-9.00/cups/gdevcups.c.gdevcups-691733 ghostscript-9.00/cups/gdevcups.c
---- ghostscript-9.00/cups/gdevcups.c.gdevcups-691733	2011-01-10 16:48:57.381703112 +0000
-+++ ghostscript-9.00/cups/gdevcups.c	2011-01-10 16:52:02.021813786 +0000
-@@ -2898,11 +2898,12 @@ cups_put_params(gx_device     *pdev,	/* 
-   int			margins_set;	/* Were the margins set? */
-   int			size_set;	/* Was the size set? */
-   int			color_set;	/* Were the color attrs set? */
--  gdev_prn_space_params	sp;		/* Space parameter data */
-+  gdev_prn_space_params	sp_old;	        /* Space parameter data */
-   int			width,		/* New width of page */
-                         height,		/* New height of page */
-                         width_old = 0,  /* Previous width of page */
-                         height_old = 0; /* Previous height of page */
-+  bool                  transp_old = 0; /* Previous transparency usage state */
-   ppd_attr_t            *backside = NULL,
-                         *backsiderequiresflippedmargins = NULL;
-   float                 swap;
-@@ -2996,11 +2997,23 @@ cups_put_params(gx_device     *pdev,	/* 
-     } \
-   }
- 
-+  sp_old = ((gx_device_printer *)pdev)->space_params;
-+  width_old = pdev->width;
-+  height_old = pdev->height;
-+  transp_old = cups->page_uses_transparency;
-   size_set    = param_read_float_array(plist, ".MediaSize", &arrayval) == 0 ||
-                 param_read_float_array(plist, "PageSize", &arrayval) == 0;
-   margins_set = param_read_float_array(plist, "Margins", &arrayval) == 0;
-   color_set   = param_read_int(plist, "cupsColorSpace", &intval) == 0 ||
-                 param_read_int(plist, "cupsBitsPerColor", &intval) == 0;
-+  /* We set the old dimensions to 1 if we have a color depth change, so
-+     that memory reallocation gets forced. This is perhaps not the correct
-+     approach to prevent crashes like in bug 690435. We keep it for the
-+     time being until we decide finally */
-+  if (color_set) {
-+    width_old = 1;
-+    height_old = 1;
-+  }
-   /* We also recompute page size and margins if we simply get onto a new
-      page without necessarily having a page size change in the PostScript
-      code, as for some printers margins have to be flipped on the back sides of
-@@ -3081,9 +3094,9 @@ cups_put_params(gx_device     *pdev,	/* 
-   stringoption(cupsPageSizeName, "cupsPageSizeName");
- #endif /* CUPS_RASTER_SYNCv1 */
- 
--  if ((code = param_read_string(plist, "cups->Profile", &stringval)) < 0)
-+  if ((code = param_read_string(plist, "cupsProfile", &stringval)) < 0)
-   {
--    param_signal_error(plist, "cups->Profile", code);
-+    param_signal_error(plist, "cupsProfile", code);
-     return (code);
-   }
-   else if (code == 0)
-@@ -3096,7 +3109,7 @@ cups_put_params(gx_device     *pdev,	/* 
- 
-   cups_set_color_info(pdev);
- 
-- /*
-+  /*
-   * Then process standard page device options...
-   */
- 
-@@ -3404,17 +3417,6 @@ cups_put_params(gx_device     *pdev,	/* 
-     * does not keep track of the margins in the bitmap size...
-     */
- 
--    /* We set the old dimensions to -1 if we have a color depth change, so
--       that memory reallocation gets forced. This is perhaps not the correct
--       approach to preven crashes like in bug 690435. We keep it for the
--       time being until we decide finally */
--    if (color_set) {
--      width_old = -1;
--      height_old = -1;
--    } else {
--      width_old = pdev->width;
--      height_old = pdev->height;
--    }
-     if (cups->landscape)
-     {
-       width  = (pdev->MediaSize[1] - pdev->HWMargins[1] - pdev->HWMargins[3]) *
-@@ -3457,11 +3459,10 @@ cups_put_params(gx_device     *pdev,	/* 
- 	       pdev->MediaSize[0], pdev->MediaSize[1], width, height);
- #endif /* DEBUG */
- 
--      sp = ((gx_device_printer *)pdev)->space_params;
--
--      if ((code = gdev_prn_maybe_realloc_memory((gx_device_printer *)pdev, &sp, 
-+      if ((code = gdev_prn_maybe_realloc_memory((gx_device_printer *)pdev,
-+                                                &sp_old, 
- 						width_old, height_old,
--						cups->page_uses_transparency))
-+						transp_old))
- 	  < 0)
- 	return (code);
- #ifdef DEBUG
-@@ -3642,6 +3643,10 @@ cups_set_color_info(gx_device *pdev)	/* 
-         cups->header.cupsBitsPerPixel   = cups->header.cupsBitsPerColor;
-         cups->color_info.depth          = cups->header.cupsBitsPerPixel;
-         cups->color_info.num_components = 1;
-+        cups->color_info.dither_grays = 1L << cups->header.cupsBitsPerColor;
-+        cups->color_info.dither_colors = 1L << cups->header.cupsBitsPerColor;
-+        cups->color_info.max_gray = cups->color_info.dither_grays - 1;
-+        cups->color_info.max_color = cups->color_info.dither_grays - 1;
-         break;
- 
-     case CUPS_CSPACE_CMY :
-
diff --git a/libre/ghostscript-libre/ghostscript-system-jasper.patch b/libre/ghostscript-libre/ghostscript-system-jasper.patch
deleted file mode 100644
index 444b76029..000000000
--- a/libre/ghostscript-libre/ghostscript-system-jasper.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up ghostscript-8.64/base/sjpx.c.system-jasper ghostscript-8.64/base/sjpx.c
---- ghostscript-8.64/base/sjpx.c.system-jasper	2008-08-21 00:22:49.000000000 +0100
-+++ ghostscript-8.64/base/sjpx.c	2009-02-04 11:35:56.000000000 +0000
-@@ -34,14 +34,6 @@ static void s_jpxd_set_defaults(stream_s
- private_st_jpxd_state(); /* creates a gc object for our state,
- 			    defined in sjpx.h */
- 
--/* error reporting callback for the jpx library */
--static void
--s_jpx_jas_error_cb(jas_error_t err, char *msg)
--{
--  dprintf2("jasper (code %d) %s", (int)err, msg);
--}
--
--
- /* initialize the steam.
-    this involves allocating the stream and image structures, and
-    initializing the decoder.
-@@ -59,7 +51,6 @@ s_jpxd_init(stream_state * ss)
-     }
- 
-     status = jas_init();
--    jas_set_error_cb(s_jpx_jas_error_cb);
- #ifdef JPX_DEBUG
-     /* raise the error reporting threshold from the default (0) */
-     jas_setdbglevel(1);
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 39259f447..b2af0eaf1 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -19,22 +19,20 @@
 # * Disabled ContentHandlers and other Google/Yahoo! related services
 
 pkgname=icecat
-pkgver=4.0rc1
-_pkgver=4.0-rc1
-pkgrel=2
-_xulver=2.0
+pkgver=4.0.1
+pkgrel=1
+_xulver=2.0.1
 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gnuzilla/"
 license=('GPL2' 'MPL' 'LGPL')
 depends=("xulrunner=${_xulver}" 'desktop-file-utils')
 makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa')
 provides=('firefox')
 conflicts=('firefox')
-replaces=("firefox=${_pkgver}")
+replaces=("firefox=${pkgver}")
 install=icecat.install
-#source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
-source=(ftp://alpha.gnu.org/gnu/gnuzilla/${_pkgver}/${pkgname}-${_pkgver}.tar.bz2
+source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
         mozconfig
         icecat.desktop
         icecat-safe.desktop
@@ -50,15 +48,15 @@ source=(ftp://alpha.gnu.org/gnu/gnuzilla/${_pkgver}/${pkgname}-${_pkgver}.tar.bz
         duck-duck-go-ssl.xml
         duck-duck-go-lite.xml
 # Default options
-	firefox.js
+        firefox.js
         region.properties)
 
 build() {
 
-  ICECATDIR="/usr/lib/${pkgname}-4.0" && export ICECATDIR
+  ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
 
   msg2 "Patching some files..."
-  cd "${srcdir}/${pkgname}-${_pkgver}/"
+  cd "${srcdir}/${pkgname}-${pkgver}/"
   patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
   patch -Np0 -i "${srcdir}/xulrunner-copy-stub.patch"
   
@@ -72,34 +70,35 @@ build() {
 
   export LDFLAGS="-Wl,-rpath,${ICECATDIR}"
 
-  #make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
   ./configure
   make MOZ_MAKE_FLAGS="${MAKEFLAGS}"
   msg2 "Build complete"
+
 }
 
 package() {
-  ICECATDIR="/usr/lib/${pkgname}-4.0" && export ICECATDIR
+  ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
 
-  cd "${srcdir}/${pkgname}-${_pkgver}/"
-  #make -j1 -f client.mk DESTDIR="${pkgdir}" install
+  cd "${srcdir}/${pkgname}-${pkgver}/"
   make install DESTDIR="${pkgdir}"
 
   msg2 "Finishing..."
-
   install -m755 -d ${pkgdir}/usr/share/applications
   install -m755 -d ${pkgdir}/usr/share/pixmaps
-  install -m644 ${srcdir}/${pkgname}-${_pkgver}/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png
+  install -m644 ${srcdir}/${pkgname}-${pkgver}/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png
   install -m644 ${srcdir}/icecat.desktop ${pkgdir}/usr/share/applications/
   install -m644 ${srcdir}/icecat-safe.desktop ${pkgdir}/usr/share/applications/
 
+  cd ${pkgdir}/usr/lib
+  ln -s ${ICECATDIR} icecat
+
   msg2 "Removing proprietary and anti-privacy search engines"
-  rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo}.xml
+  rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml
   msg2 "And provide better ones..."
   install -m755 -d ${pkgdir}${ICECATDIR}/searchplugins/
   install -m644 ${srcdir}/*.xml ${pkgdir}${ICECATDIR}/searchplugins/
 }
-md5sums=('0aefdb2b3fedf7eca5719939a25abf77'
+md5sums=('1b4d44ee5badc28fd332cba564ecde0a'
          '436db1f6167ffe82fcd71a53ffd80d0e'
          'e81ad01dbc16ba28bf92ba4b7c309ca7'
          'd93fe402b87cd000a869e1fd6badc6c9'
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index 886f106ff..0d7c0b367 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -1,36 +1,31 @@
-# $Id: PKGBUILD 100111 2010-11-20 11:25:37Z pierre $
+# $Id: PKGBUILD 120250 2011-04-21 17:00:05Z ibiru $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 
 pkgname=initscripts
-pkgver=2011.02.1
-pkgrel=1
+pkgver=2011.04.1
+pkgrel=1.1
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
 arch=('i686' 'x86_64')
 url="http://parabolagnulinux.org"
-license=('GPL')
+license=('GPL2')
 groups=('base')
 backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
-depends=('bash' 'awk' 'grep' 'coreutils' 'sed' 'udev'
+depends=('bash' 'grep' 'coreutils' 'udev'
          'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit')
 optdepends=('bridge-utils: Network bridging support'
             'dhcpcd: DHCP network configuration'
             'wireless_tools: Wireless networking')
 install=initscripts.install
-source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz"
-        'wireless.conf.d'
-        'parabola-branding.patch')
-md5sums=('22dcf8fc052deef0894d5caa0981419a'
-         '027576534885b8d5dded9be546057b12'
-         '030deb770293ea5a1e632934095af412')
+source=("http://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2"
+        'wireless.conf.d')
+md5sums=('9c9cca84f5601700f3f1d0303aa1e058'
+         '027576534885b8d5dded9be546057b12')
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-
-  msg2 "Rebranding for Parabola"
-  patch -Np1 -i ${srcdir}/parabola-branding.patch
-
   DESTDIR=${pkgdir} ./install.sh
   install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD
index d913988b9..55cde1f43 100644
--- a/libre/kernel26-libre-lts/PKGBUILD
+++ b/libre/kernel26-libre-lts/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts k
 _kernelname=${pkgname#kernel26-libre}
 _basekernel=2.6.32
 _preset=kernel26-lts.preset
-pkgver=${_basekernel}.36
+pkgver=${_basekernel}.39
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -18,13 +18,9 @@ source=(http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/${pkg
         config.i686 config.x86_64
         # standard config files for mkinitcpio ramdisk
         ${_preset}
-        ${pkgname}.install)
-md5sums=('ad33db040de641a00c60726531192413'
-         '30851deee235a7486bd408cbe8eb2d71'
-         '8061d2986b33c052153edebaee435b8f'
-         'aa1feef81f058ab623ef5aeac40af00d'
-         '2cbfeb3e2a18d45f82f613e97fc23355'
-         'fbfc7a1af3208c7b729055d91e1c149a')
+        ${pkgname}.install
+        buildfix-gcc46.diff)
+options=(!strip)
 
 build() {
   cd ${srcdir}/linux-$pkgver
@@ -32,8 +28,10 @@ build() {
   # fix 22343 udev crashes
   patch -Np1 -i ${srcdir}/libata-alignment.patch
 
-  cat ../config.$CARCH >./.config
+  # fix build with gcc46 - http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.38.y.git;a=commitdiff;h=b1d670f1#patch1
+  patch -Np1 -i ${srcdir}/buildfix-gcc46.diff
 
+  cat ../config.$CARCH >./.config
   if [ "${_kernelname}" != "" ]; then
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
   fi
@@ -123,7 +121,7 @@ package_kernel26-libre-lts-headers() {
     ${pkgdir}/usr/src/linux-${_kernver}/.config
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include
 
-  for i in acpi asm-{generic,x86} config linux math-emu media net pcmcia scsi sound trace video; do
+  for i in acpi asm-{generic,x86} config crypto drm linux math-emu media net pcmcia scsi sound trace video; do
     cp -a include/$i ${pkgdir}/usr/src/linux-${_kernver}/include/
   done
 
@@ -194,20 +192,7 @@ package_kernel26-libre-lts-headers() {
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/mm
   cp fs/xfs/xfs_sb.h ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h
-  # add headers vor virtualbox
-  # in reference to:
-  # http://bugs.archlinux.org/task/14568
-  cp -a include/drm $pkgdir/usr/src/linux-${_kernver}/include/
 
-  # add headers for broadcom wl
-  # in reference to:
-  # http://bugs.archlinux.org/task/14568
-  cp -a include/trace $pkgdir/usr/src/linux-${_kernver}/include/
-  # add headers for crypto modules
-  # in reference to:
-  # http://bugs.archlinux.org/task/22081
-  cp -a include/crypto $pkgdir/usr/src/linux-${_kernver}/include/
-  
   # copy in Kconfig files
   for i in `find . -name "Kconfig*"`; do 
     mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'`
@@ -234,3 +219,10 @@ package_kernel26-libre-lts-headers() {
   # remove unneeded architectures
   rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
+md5sums=('9502a2248b2024da4f30a5d52a90322d'
+         '30851deee235a7486bd408cbe8eb2d71'
+         '3298f542840c52a8b8abc1b3795e455b'
+         'cd1a62e81eb9e910779f3eb18a6e28c6'
+         '2cbfeb3e2a18d45f82f613e97fc23355'
+         'fbfc7a1af3208c7b729055d91e1c149a'
+         'bb7410d7b740dfad0385a07b66e6621f')
diff --git a/libre/kernel26-libre-lts/config.i686 b/libre/kernel26-libre-lts/config.i686
index ada856765..2865c58fa 100644
--- a/libre/kernel26-libre-lts/config.i686
+++ b/libre/kernel26-libre-lts/config.i686
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Tue Mar 15 11:13:21 2011
+# Mon Apr 18 12:31:05 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2308,9 +2308,9 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_TOUCHSCREEN_WM97XX=m
-# CONFIG_TOUCHSCREEN_WM9705 is not set
-# CONFIG_TOUCHSCREEN_WM9712 is not set
-# CONFIG_TOUCHSCREEN_WM9713 is not set
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
@@ -2324,10 +2324,10 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
 CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
-# CONFIG_TOUCHSCREEN_USB_E2I is not set
+CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_PCAP=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_APANEL=m
@@ -2371,7 +2371,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_DEVKMEM=y
+# CONFIG_DEVKMEM is not set
 CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_COMPUTONE is not set
 CONFIG_ROCKETPORT=m
@@ -4457,7 +4457,7 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64
index 494bb3eff..30cc5aefa 100644
--- a/libre/kernel26-libre-lts/config.x86_64
+++ b/libre/kernel26-libre-lts/config.x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Mon Mar 21 12:20:44 2011
+# Mon Apr 18 14:25:56 2011
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -2188,9 +2188,9 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_TOUCHSCREEN_WM97XX=m
-# CONFIG_TOUCHSCREEN_WM9705 is not set
-# CONFIG_TOUCHSCREEN_WM9712 is not set
-# CONFIG_TOUCHSCREEN_WM9713 is not set
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
@@ -2204,10 +2204,10 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
 CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
-# CONFIG_TOUCHSCREEN_USB_E2I is not set
+CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_PCAP=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_APANEL=m
@@ -4270,7 +4270,7 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=2048
diff --git a/libre-testing/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD
index 3c45cc49e..d891a2c46 100644
--- a/libre-testing/kernel26-libre/PKGBUILD
+++ b/libre/kernel26-libre/PKGBUILD
@@ -1,12 +1,12 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 pkgbase="kernel26-libre"
 pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Build stock -LIBRE kernel
+
 _kernelname=${pkgname#kernel26-libre}
 _basekernel=2.6.38
-pkgver=${_basekernel}.1
+pkgver=${_basekernel}.5
 pkgrel=1
 makedepends=('xmlto' 'docbook-xsl')
 _patchname="patch-${pkgver}-${pkgrel}-LIBRE"
@@ -130,7 +130,8 @@ package_kernel26-libre-headers() {
     ${pkgdir}/usr/src/linux-${_kernver}/.config
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include
 
-  for i in acpi asm-generic config generated linux math-emu media net pcmcia scsi sound trace video xen; do
+  for i in acpi asm-generic config crypto drm generated linux math-emu \
+    media net pcmcia scsi sound trace video xen; do
     cp -a include/$i ${pkgdir}/usr/src/linux-${_kernver}/include/
   done
 
@@ -203,18 +204,6 @@ package_kernel26-libre-headers() {
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/mm
   cp fs/xfs/xfs_sb.h ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h
-  # add headers vor virtualbox
-  # in reference to:
-  # http://bugs.archlinux.org/task/14568
-  cp -a include/drm $pkgdir/usr/src/linux-${_kernver}/include/
-  # add headers for broadcom wl
-  # in reference to:
-  # http://bugs.archlinux.org/task/14568
-  cp -a include/trace $pkgdir/usr/src/linux-${_kernver}/include/
-  # add headers for crypto modules
-  # in reference to:
-  # http://bugs.archlinux.org/task/22081
-  cp -a include/crypto $pkgdir/usr/src/linux-${_kernver}/include/
   # copy in Kconfig files
   for i in `find . -name "Kconfig*"`; do 
     mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'`
@@ -252,15 +241,9 @@ find $pkgdir -type d -exec chmod 755 {} \;
 # remove a file already in kernel26 package
 rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
 }
-md5sums=('21911d61ac22d66e71697a3d5ae092ba'
-         '35512d97c980ad876f5ab09f0f2488bc'
-         '23254a165ff9ee68f1f9d7a28d1c5318'
-         '8839a83dc7f3b90056691efbd67438d1'
-         '25584700a0a679542929c4bed31433b6'
-         '1bff12f1ba69206b1abee2bba4b7619c')
-md5sums=('343617f67979845d9320b890437af930'
-         '95528a6936c31baf71ccb799f7914356'
-         '8f709c91e3ed2f9808e7cef4cbd8150b'
-         '38e5d9db7fecbb60433d8ca443829bd6'
+md5sums=('53f12d40086282b858531e583fa02107'
+         '3753b5f0b812bd548aca6abafb0e6520'
+         'a6b673aead69b12f50b8ca53d1f14b14'
+         'fa7d6abea1e2163b1ab2b1acfe117f51'
          '25584700a0a679542929c4bed31433b6'
-         '1bff12f1ba69206b1abee2bba4b7619c')
+         '2d68b4cf4caedd1f0188f4877eca1d43')
diff --git a/libre-testing/kernel26-libre/config.i686 b/libre/kernel26-libre/config.i686
index 541db489e..2269fd1d3 100644
--- a/libre-testing/kernel26-libre/config.i686
+++ b/libre/kernel26-libre/config.i686
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/i386 2.6.38 Kernel Configuration
-# Thu Mar 24 10:43:26 2011
+# Fri Apr 22 17:32:05 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2576,11 +2576,11 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_TOUCHSCREEN_WM97XX=m
-# CONFIG_TOUCHSCREEN_WM9705 is not set
-# CONFIG_TOUCHSCREEN_WM9712 is not set
-# CONFIG_TOUCHSCREEN_WM9713 is not set
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-# CONFIG_TOUCHSCREEN_MC13783 is not set
+CONFIG_TOUCHSCREEN_MC13783=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2593,13 +2593,13 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
 CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
-# CONFIG_TOUCHSCREEN_USB_E2I is not set
+CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_PCAP=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
@@ -5211,7 +5211,7 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
@@ -5320,6 +5320,7 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
 # CONFIG_KMEMCHECK is not set
+CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
diff --git a/libre-testing/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64
index 83184b9ef..d89904aa7 100644
--- a/libre-testing/kernel26-libre/config.x86_64
+++ b/libre/kernel26-libre/config.x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/x86_64 2.6.38 Kernel Configuration
-# Thu Mar 24 10:23:04 2011
+# Fri Apr 22 19:25:29 2011
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -2428,11 +2428,11 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_TOUCHSCREEN_WM97XX=m
-# CONFIG_TOUCHSCREEN_WM9705 is not set
-# CONFIG_TOUCHSCREEN_WM9712 is not set
-# CONFIG_TOUCHSCREEN_WM9713 is not set
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-# CONFIG_TOUCHSCREEN_MC13783 is not set
+CONFIG_TOUCHSCREEN_MC13783=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2445,13 +2445,13 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
 CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
-# CONFIG_TOUCHSCREEN_USB_E2I is not set
+CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_PCAP=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
@@ -4954,7 +4954,7 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=2048
@@ -5061,6 +5061,7 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
 # CONFIG_KMEMCHECK is not set
+CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
diff --git a/libre-testing/kernel26-libre/get_configs b/libre/kernel26-libre/get_configs
index 624ea1048..624ea1048 100644..100755
--- a/libre-testing/kernel26-libre/get_configs
+++ b/libre/kernel26-libre/get_configs
diff --git a/libre-testing/kernel26-libre/kernel26.install b/libre/kernel26-libre/kernel26.install
index 1292f1f3b..fc84323fc 100644
--- a/libre-testing/kernel26-libre/kernel26.install
+++ b/libre/kernel26-libre/kernel26.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=2.6.37-LIBRE
+KERNEL_VERSION=2.6.38-LIBRE
 
 post_install () {
   # updating module dependencies
diff --git a/libre-testing/kernel26-libre/kernel26.preset b/libre/kernel26-libre/kernel26.preset
index 742a44239..742a44239 100644
--- a/libre-testing/kernel26-libre/kernel26.preset
+++ b/libre/kernel26-libre/kernel26.preset
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index b424a9405..a0d3f1497 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libretools
 pkgver=$(date -u +%Y%m%d)
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Scripts for easing Parabola's tasks"
 arch=('any')
 url="http://parabolagnulinux.org"
@@ -50,9 +50,11 @@ package() {
   install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/
+  install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin
   install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/mipsrelease ${pkgdir}/usr/bin
   install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin/
+  install -m755 ${_gitname}/toru ${pkgdir}/usr/bin
   install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin
-
+  
 } 
\ No newline at end of file
diff --git a/libre/licenses-libre/PKGBUILD b/libre/licenses-libre/PKGBUILD
index 574fe6d84..6097d67b8 100644
--- a/libre/licenses-libre/PKGBUILD
+++ b/libre/licenses-libre/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 
 pkgname=licenses-libre
-pkgver=2.6
+pkgver=2.8
 pkgrel=1
 pkgdesc="The standard licenses distribution package"
 arch=('any')
@@ -19,6 +19,7 @@ source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt
         cc-readme.txt
         cddl-1.0.txt
         eclipse-1.0.txt
+        http://www.gnu.org/licenses/agpl-3.0.txt
         http://www.gnu.org/licenses/gpl-2.0.txt
         http://www.gnu.org/licenses/gpl-3.0.txt
         http://www.gnu.org/licenses/lgpl-2.1.txt
@@ -28,39 +29,28 @@ source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt
         http://www.latex-project.org/lppl.txt
         http://www.mozilla.org/MPL/MPL-1.1.txt
         perlartistic.txt
+        http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt
         php-3.0.txt::http://www.php.net/license/3_0.txt
         ruby-license.txt::http://www.ruby-lang.org/en/LICENSE.txt
         cpl-1.0.txt
         python-2.txt
         ZopePublicLicense.txt)
-md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
-         'ffb24d1bbf8b83d373f0b8edc3feb0c6'
-         '5367190077e12a7f55403d531ef3998e'
-         '77651e5c686cbc0f8cec5ac7e6504235'
-         '6cb35f3976cd093011967fa1abbce386'
-         'f300afd598546add034364cd0a533261'
-         'b234ee4d69f5fce4486a80fdaf4a4263'
-         'd32239bcb673463ab874e80d47fae504'
-         '4fbd65380cdd255951079008b364516c'
-         'e6a600fd5e1d9cbde2d983680233ad02'
-         '24ea4c7092233849b4394699333b5c56'
-         '10b9de612d532fdeeb7fe8fcd1435cc6'
-         '9f4337828d782bdea41f03dd2ad1b808'
-         'bfe1f75d606912a4111c90743d6c7325'
-         'd09c120ca7db95ef2aeecec0cb08293b'
-         'a45bb1bbeed9e26b26c5763df1d3913d'
-         '68d59ff8306e3a9f5f1c01462c77a317'
-         'f083e41c43db25e18f36c91e57750b64'
-         'a055911c32fb4ed6e96c453ceaeba857'
-         'dc8502850eab9e1ff330a12d7ca18a19')
 
 build() {
   cd $pkgdir
   mkdir -p usr/share/licenses/common
   cd usr/share/licenses/common
 
-  mkdir APACHE
-  cp $srcdir/apache-2.0.txt APACHE/license.txt
+  mkdir AGPL3
+  cp $srcdir/agpl-3.0.txt AGPL3/license.txt
+  ln -s AGPL3 AGPL
+
+  mkdir Apache
+  cp $srcdir/apache-2.0.txt Apache/license.txt
+  ln -s Apache APACHE
+
+  mkdir Artistic2.0
+  cp $srcdir/artistic-2_0.txt Artistic2.0/license.txt
 
   mkdir CCPL
   cp $srcdir/cc-by-3.0.txt CCPL/
@@ -112,3 +102,25 @@ build() {
   mkdir ZPL
   cp $srcdir/ZopePublicLicense.txt ZPL/license.txt
 }
+md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
+         'ffb24d1bbf8b83d373f0b8edc3feb0c6'
+         '5367190077e12a7f55403d531ef3998e'
+         '77651e5c686cbc0f8cec5ac7e6504235'
+         '6cb35f3976cd093011967fa1abbce386'
+         'f300afd598546add034364cd0a533261'
+         '73f1eb20517c55bf9493b7dd6e480788'
+         'b234ee4d69f5fce4486a80fdaf4a4263'
+         'd32239bcb673463ab874e80d47fae504'
+         '4fbd65380cdd255951079008b364516c'
+         'e6a600fd5e1d9cbde2d983680233ad02'
+         '24ea4c7092233849b4394699333b5c56'
+         '10b9de612d532fdeeb7fe8fcd1435cc6'
+         '9f4337828d782bdea41f03dd2ad1b808'
+         'bfe1f75d606912a4111c90743d6c7325'
+         'd09c120ca7db95ef2aeecec0cb08293b'
+         'b4a94da2a1f918b217ef5156634fc9e0'
+         'a45bb1bbeed9e26b26c5763df1d3913d'
+         '68d59ff8306e3a9f5f1c01462c77a317'
+         'f083e41c43db25e18f36c91e57750b64'
+         'a055911c32fb4ed6e96c453ceaeba857'
+         'dc8502850eab9e1ff330a12d7ca18a19')
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 87139f7fa..238fa973b 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -13,12 +13,12 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'l
          'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'speex' 'fribidi' 'desktop-file-utils')
 license=('GPL')
 url="http://www.mplayerhq.hu/"
-makedepends=('unzip' 'mesa' 'live-media' 'yasm')
+makedepends=('unzip' 'mesa' 'live-media' 'yasm' 'git')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 source=(ftp://ftp.archlinux.org/other/${pkgname%-libre}/${pkgname%-libre}-${pkgver}.tar.xz mplayer.desktop mplayer.png)
 provides=("mplayer=$pkgver")
 conflicts=('mplayer')
-replaces=("mplayer=$pkgver")
+replaces=('mplayer')
 md5sums=('caedcdc1e50b5575c38c2a85f9c53afc'
          '647b9f4ab5284a7fef3f84f992214e77'
          'd00874ccc644b7f43d6ef1c942fcef28')
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 2f1028119..22517928e 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -18,9 +18,9 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl'
          'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger'
          'libvpx' 'libpulse' 'fribidi' 'libva' 'desktop-file-utils')
 makedepends=('unzip' 'mesa' 'live-media>=2010.01.13' 'yasm')
-provides=("mplayer-vaapi=$pkgver")
+provides=("mplayer-vaapi=$pkgver" 'mplayer')
 conflicts=('mplayer' 'mplayer-vaapi')
-replaces=("mplayer-vaapi=$pkgver")
+replaces=('mplayer-vaapi')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 source=(http://pkgbuild.com/~foutrelis/mplayer-$pkgver.tar.xz
         http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/mplayer-vaapi-$_vaapi_version.tar.bz2
diff --git a/libre/thunderbird-libre/rePKGBUILD b/libre/thunderbird-libre/rePKGBUILD
new file mode 100644
index 000000000..ef2de693e
--- /dev/null
+++ b/libre/thunderbird-libre/rePKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Joshua Haase <hahj87@gmail.com>
+_pkgbase=thunderbird
+pkgname=thunderbird-libre
+_pkgver=3.1
+pkgver=3.1.9
+_pkgrel=2
+pkgrel=$_pkgrel.1
+pkgdesc="Standalone Mail/News reader, with GNUZilla addons"
+arch=('i686' 'x86_64')
+license=('MPL' 'GPL')
+url="http://www.mozilla.org/projects/thunderbird"
+depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3>=3.7.4' 'desktop-file-utils')
+makedepends=()
+optdepends=('libcanberra: for sound support')
+replaces=('thunderbird')
+conflicts=('thunderbird')
+provides=("thunderbird=$pkgver")
+install=thunderbird.install
+source=(http://mirrors.kernel.org/archlinux/extra/os/$CARCH/$_pkgbase-$pkgver-$_pkgrel-$CARCH.pkg.tar.xz
+        gnuzilla-addons.patch)
+
+build() {
+  cd "${srcdir}/"
+  rm .{INSTALL,PKGINFO} $_pkgbase-$pkgver-$_pkgrel-$CARCH.pkg.tar.xz
+  pushd usr/lib/${_pkgbase}-${_pkgver}/defaults/pref/ >/dev/null
+  patch -Np0 -i "${srcdir}/gnuzilla-addons.patch"
+  popd >/dev/null
+  rm "${srcdir}/gnuzilla-addons.patch"
+}
+
+package() {
+  cp -a ./* ${pkgdir}
+}
diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD
new file mode 100644
index 000000000..eacbfdbb4
--- /dev/null
+++ b/libre/unarchiver/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Cedric Girard <girard.cedric@gmail.com>
+pkgname=unarchiver
+pkgver=2.7
+pkgrel=1
+pkgdesc="An Objective-C application for uncompressing archive files"
+arch=('x86_64' 'i686')
+url="http://wakaba.c3.cx/s/apps/unarchiver.html"
+license=('LGPL')
+depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
+makedepends=('gcc-objc')
+source=(http://theunarchiver.googlecode.com/files/TheUnarchiver"$pkgver"_src.zip)
+md5sums=('c6aed2fcb2b68d86a9d9d4fc39c4ea41')
+replaces=('unrar')
+conflicts=('unrar')
+
+build() {
+  cd "$srcdir/The Unarchiver/XADMaster"
+
+  . /usr/share/GNUstep/Makefiles/GNUstep.sh
+  make -f Makefile.linux
+}
+
+package() {
+  cd "$srcdir/The Unarchiver/XADMaster"
+  install -d "$pkgdir/usr/bin/"
+  cp unar lsar "$pkgdir/usr/bin/"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/xorg-fonts-100dpi-libre/PKGBUILD b/libre/xorg-fonts-100dpi-libre/PKGBUILD
index 13832bb91..3f88f1cee 100644
--- a/libre/xorg-fonts-100dpi-libre/PKGBUILD
+++ b/libre/xorg-fonts-100dpi-libre/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 pkgname=xorg-fonts-100dpi-libre
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org 100dpi fonts"
 arch=(any)
 url="http://xorg.freedesktop.org/"
diff --git a/libre/xorg-fonts-100dpi-libre/xfonts.install b/libre/xorg-fonts-100dpi-libre/xfonts.install
index 3eb0455c9..5c5e8a2b4 100644
--- a/libre/xorg-fonts-100dpi-libre/xfonts.install
+++ b/libre/xorg-fonts-100dpi-libre/xfonts.install
@@ -1,8 +1,8 @@
 post_install() {
   echo -n "Updating font cache... "
   fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/Type1
-  mkfontdir /usr/share/fonts/Type1
+  mkfontscale /usr/share/fonts/100dpi
+  mkfontdir /usr/share/fonts/100dpi
   echo "done."
 }
 
@@ -13,8 +13,3 @@ post_upgrade() {
 post_remove() {
   post_install $1
 }
-
-op=$1
-shift
-
-$op $*
diff --git a/libre/xorg-fonts-75dpi-libre/PKGBUILD b/libre/xorg-fonts-75dpi-libre/PKGBUILD
index 5266bd550..c262229fc 100644
--- a/libre/xorg-fonts-75dpi-libre/PKGBUILD
+++ b/libre/xorg-fonts-75dpi-libre/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-fonts-75dpi-libre
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org 75dpi fonts"
 arch=(any)
 url="http://xorg.freedesktop.org/"
diff --git a/libre/xorg-fonts-75dpi-libre/xfonts.install b/libre/xorg-fonts-75dpi-libre/xfonts.install
index 3eb0455c9..e52603946 100644
--- a/libre/xorg-fonts-75dpi-libre/xfonts.install
+++ b/libre/xorg-fonts-75dpi-libre/xfonts.install
@@ -1,8 +1,8 @@
 post_install() {
   echo -n "Updating font cache... "
   fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/Type1
-  mkfontdir /usr/share/fonts/Type1
+  mkfontscale /usr/share/fonts/75dpi
+  mkfontdir /usr/share/fonts/75dpi
   echo "done."
 }
 
@@ -13,8 +13,3 @@ post_upgrade() {
 post_remove() {
   post_install $1
 }
-
-op=$1
-shift
-
-$op $*
diff --git a/libre/xorg-fonts-type1-libre/xfonts.install b/libre/xorg-fonts-type1-libre/xfonts.install
index 3eb0455c9..51688a1d1 100644
--- a/libre/xorg-fonts-type1-libre/xfonts.install
+++ b/libre/xorg-fonts-type1-libre/xfonts.install
@@ -13,8 +13,3 @@ post_upgrade() {
 post_remove() {
   post_install $1
 }
-
-op=$1
-shift
-
-$op $*
diff --git a/social/bitcoin-daemon/PKGBUILD b/social/bitcoin-daemon/PKGBUILD
index 4728160d0..c00439328 100644
--- a/social/bitcoin-daemon/PKGBUILD
+++ b/social/bitcoin-daemon/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgname=bitcoin-daemon
 _pkgname=bitcoin
-pkgver=0.3.20.2
-_bcver=0.3.20
+pkgver=0.3.21
+_bcver=0.3.21
 pkgrel=1
 pkgdesc="Bitcoin is a peer-to-peer network based digital currency."
 arch=('i686' 'x86_64')
@@ -19,10 +19,6 @@ source=(http://ufpr.dl.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-$_bcver/b
         makefile.archlinux
         bitcoin-daemon.install
         rc.bitcoind)
-md5sums=('f527a2669f4cfe82abf1fe9bea070c64'
-         '8e2ff558c2538e53c177513ad7d8b9a5'
-         'a388684057de2bb543cb7f795dc693cf'
-         '4a9ab4997487bb5f8e3c6b1d580045af')
 
 build() {
 	cd $srcdir/${_pkgname}-${pkgver}/src
@@ -53,3 +49,7 @@ package() {
 	chown -R 8333:8333 $pkgdir/var/lib/$pkgname
 	chmod -R 700 $pkgdir/var/lib/$pkgname
 }
+md5sums=('19e530a9b60e3a0987998a87b30d8cdc'
+         '8e2ff558c2538e53c177513ad7d8b9a5'
+         'a388684057de2bb543cb7f795dc693cf'
+         '4a9ab4997487bb5f8e3c6b1d580045af')
diff --git a/social/inadyn-opendns/PKGBUILD b/social/inadyn-opendns/PKGBUILD
new file mode 100644
index 000000000..75e8dc1ae
--- /dev/null
+++ b/social/inadyn-opendns/PKGBUILD
@@ -0,0 +1,32 @@
+# Contributor: Bug <Bug2000@gmail.com>
+# Maintainer: Bug <Bug2000@gmail.com>
+pkgname=inadyn-opendns
+pkgver=1.99
+pkgrel=3
+pkgdesc="Simple dynamic DNS client with SSL support"
+arch=('i686')
+url="http://www.opendns.com/account/dynamic_dns/downloads"
+license=('GPL')
+makedepends=('unzip')
+depends=('curl')
+conflicts=('inadyn')
+provides=('inadyn')
+backup=('etc/inadyn.conf')
+install=('inadyn-opendns.install')
+source=("http://www.opendns.com/support/ddns_files/inadyn.source.v$pkgver.zip"
+	'inadyn.rc-script')
+md5sums=('0f2cf9c3ea3482c03e1c42f8480f1c55'
+	 '73c61f9939546c28119242a1e12ffcff')
+
+build() {
+  cd "$srcdir/inadyn.source.v$pkgver"
+
+  make || return 1
+
+  install -Dm755 bin/linux/inadyn $pkgdir/usr/sbin/inadyn
+  install -Dm644 man/inadyn.8 $pkgdir/usr/share/man/man8/inadyn.8
+  install -Dm644 man/inadyn.conf.5 $pkgdir/usr/share/man/man5/inadyn.conf.5
+  install -Dm644 readme.html $pkgdir/usr/share/doc/inadyn/readme.html
+  install -Dm755 $srcdir/inadyn.rc-script $pkgdir/etc/rc.d/inadyn
+  install -Dm644 inadyn.conf $pkgdir/etc/inadyn.conf
+}
diff --git a/social/inadyn-opendns/inadyn-opendns.install b/social/inadyn-opendns/inadyn-opendns.install
new file mode 100644
index 000000000..e1a842430
--- /dev/null
+++ b/social/inadyn-opendns/inadyn-opendns.install
@@ -0,0 +1,17 @@
+post_install() {
+/bin/true
+echo Please remember to change the /etc/inadyn.conf file for your settings.
+}
+
+post_upgrade() {
+/bin/true
+}
+
+pre_remove() {
+/bin/true
+}
+
+op=$1
+shift
+
+$op "$@"
\ No newline at end of file
diff --git a/social/inadyn-opendns/inadyn.rc-script b/social/inadyn-opendns/inadyn.rc-script
new file mode 100644
index 000000000..2ee29d59e
--- /dev/null
+++ b/social/inadyn-opendns/inadyn.rc-script
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/inadyn`
+case "$1" in
+  start)
+    stat_busy "Starting INADYN Daemon"
+    [ -z "$PID" ] && /usr/sbin/inadyn --background --input_file /etc/inadyn.conf >>/var/log/inadyn 2>&1
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      PID=`pidof -o %PPID /usr/sbin/inadyn`
+      echo $PID >/var/run/inadyn.pid
+      add_daemon inadyn
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping INADYN Daemon"
+    [ ! -z "$PID" ]  && kill $PID &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon inadyn
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
+
diff --git a/social/liblockfile/PKGBUILD b/social/liblockfile/PKGBUILD
new file mode 100644
index 000000000..e3428763c
--- /dev/null
+++ b/social/liblockfile/PKGBUILD
@@ -0,0 +1,30 @@
+# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
+
+pkgname=liblockfile
+pkgver=1.08_4
+pkgrel=1
+pkgdesc="a library with NFS-safe locking functions"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://packages.debian.org/unstable/libs/liblockfile1"
+depends=('glibc')
+makedepends=()
+source=(http://ftp.debian.org/debian/pool/main/libl/$pkgname/${pkgname}_1.08.orig.tar.gz
+	http://ftp.debian.org/debian/pool/main/libl/$pkgname/${pkgname}_${pkgver/_/-}.debian.tar.bz2)
+
+build() {
+    cd $startdir/src/$pkgname-1.08
+
+    for p in `cat ../debian/patches/series` ; do
+	patch -p1 < ../debian/patches/$p
+    done
+
+    ./configure --prefix=/usr --mandir=/usr/share/man || return 1
+    make || return 1
+
+    mkdir -p $startdir/pkg/usr/{lib,bin,include,share/man/man1,share/man/man3} 
+    make install prefix=$startdir/pkg/usr mandir=$startdir/pkg/usr/share/man  || return 1
+}
+
+md5sums=('c24e2dfb4a2aab0263fe5ac1564d305e'
+         '50c0c049d2838704f5720f5fd9eaddac')
diff --git a/social/lockfile-progs/PKGBUILD b/social/lockfile-progs/PKGBUILD
index 3fced1597..57d833952 100644
--- a/social/lockfile-progs/PKGBUILD
+++ b/social/lockfile-progs/PKGBUILD
@@ -8,7 +8,7 @@ arch=('i686' 'x86_64')
 license=('GPL')
 url="http://packages.debian.org/unstable/misc/lockfile-progs"
 depends=('glibc')
-makedepends=('gcc' 'make' 'liblockfile')
+makedepends=('liblockfile')
 source=(http://ftp.debian.org/debian/pool/main/l/lockfile-progs/${pkgname}_${pkgver}.tar.gz)
 
 build() {
diff --git a/social/monkeysphere/PKGBUILD b/social/monkeysphere/PKGBUILD
index 33c1bcf1b..c804b8409 100644
--- a/social/monkeysphere/PKGBUILD
+++ b/social/monkeysphere/PKGBUILD
@@ -12,6 +12,7 @@ license=('GPL3')
 depends=('gnupg' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1')
 source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz)
 install=monkeysphere.install
+md5sums=('481ac14c9fdef0ccd1944c593bd4f517')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -19,5 +20,3 @@ build() {
   make DESTDIR="$pkgdir/" install
   mkdir -p $pkgdir/var/lib/monkeysphere
 } 
-md5sums=()
-md5sums=('481ac14c9fdef0ccd1944c593bd4f517')