Wed Jan 25 23:14:53 UTC 2012

10 files changed, 463 insertions, 26 deletions

diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD
new file mode 100644
index 000000000..4762c277c
--- /dev/null
+++ b/testing/curl/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id: PKGBUILD 147206 2012-01-24 17:51:49Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=curl
+pkgver=7.24.0
+pkgrel=1
+pkgdesc="An URL retrival utility and library"
+arch=('i686' 'x86_64')
+url="http://curl.haxx.se"
+license=('MIT')
+depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
+options=('!libtool')
+source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+        fix-J-with-O-regression.patch
+        curlbuild.h)
+md5sums=('b93420f80a2baaa61a0f45214eddc2ba'
+         '710242df6bc318d16eea611e7d1b1410'
+         'aa4539ec4f4a2dad1663dc22dd3ab0a1'
+         '751bd433ede935c8fae727377625a8ae')
+
+ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
+case $ptrsize in
+  8) _curlbuild=curlbuild-64.h ;;
+  4) _curlbuild=curlbuild-32.h ;;
+  *) error "unknown pointer size for architecture: %s bytes" "$ptrsize"
+    exit 1
+    ;;
+esac
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+      --prefix=/usr \
+      --mandir=/usr/share/man \
+      --disable-dependency-tracking \
+      --disable-ldap \
+      --disable-ldaps \
+      --enable-ipv6 \
+      --enable-manual \
+      --enable-versioned-symbols \
+      --enable-threaded-resolver \
+      --without-libidn \
+      --with-random=/dev/urandom \
+      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # license
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+  # devel
+  install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4"
+  mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
+  install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
+}
diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h
new file mode 100644
index 000000000..b48862696
--- /dev/null
+++ b/testing/curl/curlbuild.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "curlbuild-32.h"
+#elif __WORDSIZE == 64
+#include "curlbuild-64.h"
+#else
+#error "Unknown word size"
+#endif
diff --git a/testing/curl/fix-J-with-O-regression.patch b/testing/curl/fix-J-with-O-regression.patch
new file mode 100644
index 000000000..4b7de1a23
--- /dev/null
+++ b/testing/curl/fix-J-with-O-regression.patch
@@ -0,0 +1,142 @@
+From c532604b137cae2e2814280778f914e4cd0460d1 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Sun, 20 Nov 2011 23:33:46 +0100
+Subject: [PATCH] -J -O: use -O name if no Content-Disposition header comes!
+
+A regression between 7.22.0 and 7.23.0 -- downloading a file with the
+flags -O and -J results in the content being written to stdout if and
+only if there was no Content-Disposition header in the http response. If
+there is a C-D header with a filename attribute, the output is correctly
+written.
+
+Reported by: Dave Reisner
+Bug: http://curl.haxx.se/mail/archive-2011-11/0030.html
+---
+ src/tool_cb_hdr.c      |    3 +-
+ src/tool_operate.c     |   59 ++++++++++++++++++++++----------------------
+ src/tool_operhlp.c     |   18 +++++++++++++
+ tests/data/Makefile.am |    2 +-
+ tests/data/test1210    |   63 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 112 insertions(+), 33 deletions(-)
+ create mode 100644 tests/data/test1210
+
+diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
+index fb24b45..dea7338 100644
+--- a/src/tool_cb_hdr.c
++++ b/src/tool_cb_hdr.c
+@@ -66,8 +66,7 @@ size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata)
+   }
+ #endif
+ 
+-  if(!outs->filename && (cb > 20) &&
+-    checkprefix("Content-disposition:", str)) {
++  if((cb > 20) && checkprefix("Content-disposition:", str)) {
+     const char *p = str + 20;
+ 
+     /* look for the 'filename=' parameter
+diff --git a/src/tool_operate.c b/src/tool_operate.c
+index 7ab815f..1e88120 100644
+--- a/src/tool_operate.c
++++ b/src/tool_operate.c
+@@ -576,41 +576,40 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
+ 
+           if((urlnode->flags & GETOUT_USEREMOTE)
+              && config->content_disposition) {
+-            /* Our header callback sets the filename */
++            /* Our header callback MIGHT set the filename */
+             DEBUGASSERT(!outs.filename);
+           }
+-          else {
+-            if(config->resume_from_current) {
+-              /* We're told to continue from where we are now. Get the size
+-                 of the file as it is now and open it for append instead */
+-              struct_stat fileinfo;
+-              /* VMS -- Danger, the filesize is only valid for stream files */
+-              if(0 == stat(outfile, &fileinfo))
+-                /* set offset to current file size: */
+-                config->resume_from = fileinfo.st_size;
+-              else
+-                /* let offset be 0 */
+-                config->resume_from = 0;
+-            }
+ 
+-            if(config->resume_from) {
+-              /* open file for output: */
+-              FILE *file = fopen(outfile, config->resume_from?"ab":"wb");
+-              if(!file) {
+-                helpf(config->errors, "Can't open '%s'!\n", outfile);
+-                res = CURLE_WRITE_ERROR;
+-                goto quit_urls;
+-              }
+-              outs.fopened = TRUE;
+-              outs.stream = file;
+-              outs.init = config->resume_from;
+-            }
+-            else {
+-              outs.stream = NULL; /* open when needed */
++          if(config->resume_from_current) {
++            /* We're told to continue from where we are now. Get the size
++               of the file as it is now and open it for append instead */
++            struct_stat fileinfo;
++            /* VMS -- Danger, the filesize is only valid for stream files */
++            if(0 == stat(outfile, &fileinfo))
++              /* set offset to current file size: */
++              config->resume_from = fileinfo.st_size;
++            else
++              /* let offset be 0 */
++              config->resume_from = 0;
++          }
++
++          if(config->resume_from) {
++            /* open file for output: */
++            FILE *file = fopen(outfile, config->resume_from?"ab":"wb");
++            if(!file) {
++              helpf(config->errors, "Can't open '%s'!\n", outfile);
++              res = CURLE_WRITE_ERROR;
++              goto quit_urls;
+             }
+-            outs.filename = outfile;
+-            outs.s_isreg = TRUE;
++            outs.fopened = TRUE;
++            outs.stream = file;
++            outs.init = config->resume_from;
++          }
++          else {
++            outs.stream = NULL; /* open when needed */
+           }
++          outs.filename = outfile;
++          outs.s_isreg = TRUE;
+         }
+ 
+         if(uploadfile && !stdin_upload(uploadfile)) {
+diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c
+index 808d2d5..4c1697b 100644
+--- a/src/tool_operhlp.c
++++ b/src/tool_operhlp.c
+@@ -178,6 +178,24 @@ CURLcode get_url_file_name(char **filename, const char *url)
+         return CURLE_OUT_OF_MEMORY;
+     }
+   }
++
++  /* in case we built debug enabled, we allow an environment variable
++   * named CURL_TESTDIR to prefix the given file name to put it into a
++   * specific directory
++   */
++#ifdef DEBUGBUILD
++  {
++    char *tdir = curlx_getenv("CURL_TESTDIR");
++    if(tdir) {
++      char buffer[512]; /* suitably large */
++      snprintf(buffer, sizeof(buffer), "%s/%s", tdir, *filename);
++      Curl_safefree(*filename);
++      *filename = strdup(buffer); /* clone the buffer */
++      curl_free(tdir);
++    }
++  }
++#endif
++
+   return CURLE_OK;
+ }
+ 
+-- 
+1.7.7.3
diff --git a/testing/libarchive/PKGBUILD b/testing/libarchive/PKGBUILD
index a40ad46f7..28229f186 100644
--- a/testing/libarchive/PKGBUILD
+++ b/testing/libarchive/PKGBUILD
@@ -1,16 +1,23 @@
-# $Id: PKGBUILD 146572 2012-01-13 16:55:27Z dreisner $
+# $Id: PKGBUILD 147250 2012-01-25 03:21:31Z dreisner $
 # Maintainer: Dan McGee <dan@archlinux.org>
+
 pkgname=libarchive
 pkgver=3.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="library that can create and read several streaming archive formats"
 arch=('i686' 'x86_64')
 url="http://libarchive.googlecode.com/"
 license=('BSD')
 depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz")
-md5sums=('ca4090f0099432a9ac5a8b6618dc3892')
-sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7')
+source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz"
+        'interpret-non-posix-zips.patch'
+        'test-with-zip-mtime.patch')
+md5sums=('ca4090f0099432a9ac5a8b6618dc3892'
+         'f02b88eb10877c7a7d527ed89c662e44'
+         '8366def6d7d70d424fa28a986c78c015')
+sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7'
+            '9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc'
+            'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
@@ -18,6 +25,12 @@ PKGEXT='.pkg.tar.gz'
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # http://code.google.com/p/libarchive/issues/detail?id=225
+  patch -Np0 <"$srcdir/interpret-non-posix-zips.patch"
+
+  # http://code.google.com/p/libarchive/issues/detail?id=231
+  patch -Np0 <"$srcdir/test-with-zip-mtime.patch"
+
   ./configure --prefix=/usr --without-xml2
   make
 }
@@ -25,8 +38,7 @@ build() {
 check() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # currently fails on i686 in a minor test involving atime updates (#60)
-  make check || :
+  make check
 }
 
 package() {
diff --git a/testing/libarchive/interpret-non-posix-zips.patch b/testing/libarchive/interpret-non-posix-zips.patch
new file mode 100644
index 000000000..63bc439d9
--- /dev/null
+++ b/testing/libarchive/interpret-non-posix-zips.patch
@@ -0,0 +1,165 @@
+Index: libarchive/archive_read_support_format_zip.c
+===================================================================
+--- libarchive/archive_read_support_format_zip.c	(revision 4189)
++++ libarchive/archive_read_support_format_zip.c	(revision 4190)
+@@ -217,14 +217,13 @@
+ }
+ 
+ /*
+- * TODO: This is a performance sink because it forces
+- * the read core to drop buffered data from the start
+- * of file, which will then have to be re-read again
+- * if this bidder loses.
++ * TODO: This is a performance sink because it forces the read core to
++ * drop buffered data from the start of file, which will then have to
++ * be re-read again if this bidder loses.
+  *
+- * Consider passing in the winning bid value to subsequent
+- * bidders so that this bidder in particular can avoid
+- * seeking if it knows it's going to lose anyway.
++ * We workaround this a little by passing in the best bid so far so
++ * that later bidders can do nothing if they know they'll never
++ * outbid.  But we can certainly do better...
+  */
+ static int
+ archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid)
+@@ -311,19 +310,29 @@
+ 		external_attributes = archive_le32dec(p + 38);
+ 		zip_entry->local_header_offset = archive_le32dec(p + 42);
+ 
++		/* If we can't guess the mode, leave it zero here;
++		   when we read the local file header we might get
++		   more information. */
++		zip_entry->mode = 0;
+ 		if (zip_entry->system == 3) {
+ 			zip_entry->mode = external_attributes >> 16;
+-		} else {
+-			zip_entry->mode = AE_IFREG | 0777;
+ 		}
+ 
+-		/* Do we need to parse filename here? */
+-		/* Or can we wait until we read the local header? */
++		/* We don't read the filename until we get to the
++		   local file header.  Reading it here would speed up
++		   table-of-contents operations (removing the need to
++		   find and read local file header to get the
++		   filename) at the cost of requiring a lot of extra
++		   space. */
++		/* We don't read the extra block here.  We assume it
++		   will be duplicated at the local file header. */
+ 		__archive_read_consume(a,
+ 		    46 + filename_length + extra_length + comment_length);
+ 	}
+ 
+-	/* TODO: Sort zip entries. */
++	/* TODO: Sort zip entries by file offset so that we
++	   can optimize get_next_header() to use skip instead of
++	   seek. */
+ 
+ 	return ARCHIVE_OK;
+ }
+@@ -434,6 +443,11 @@
+ 			return (30);
+ 	}
+ 
++	/* TODO: It's worth looking ahead a little bit for a valid
++	 * PK signature.  In particular, that would make it possible
++	 * to read some UUEncoded SFX files or SFX files coming from
++	 * a network socket. */
++
+ 	return (0);
+ }
+ 
+Index: libarchive/test/test_compat_zip_6.zip.uu
+===================================================================
+--- libarchive/test/test_compat_zip_6.zip.uu	(revision 0)
++++ libarchive/test/test_compat_zip_6.zip.uu	(revision 4190)
+@@ -0,0 +1,10 @@
++begin 755 test_compat_zip_6.zip
++M4$L#!`H``````'@3-T`````````````````6````3F5W($9O;&1E<B].97<@
++M1F]L9&5R+U!+`P0*``````!\$S=`%4-8OPL````+````*P```$YE=R!&;VQD
++M97(O3F5W($9O;&1E<B].97<@5&5X="!$;V-U;65N="YT>'1S;VUE('1E>'0-
++M"E!+`0(4"PH``````'@3-T`````````````````6````````````$```````
++M``!.97<@1F]L9&5R+TYE=R!&;VQD97(O4$L!`A0+"@``````?!,W0!5#6+\+
++M````"P```"L``````````0`@````-````$YE=R!&;VQD97(O3F5W($9O;&1E
++M<B].97<@5&5X="!$;V-U;65N="YT>'102P4&``````(``@"=````B```````
++`
++end
+Index: libarchive/test/test_compat_zip.c
+===================================================================
+--- libarchive/test/test_compat_zip.c	(revision 4189)
++++ libarchive/test/test_compat_zip.c	(revision 4190)
+@@ -348,6 +348,53 @@
+ 	free(p);
+ }
+ 
++/*
++ * Issue 225: Errors extracting MSDOS Zip archives with directories.
++ */
++static void
++compat_zip_6_verify(struct archive *a)
++{
++	struct archive_entry *ae;
++
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
++	assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae));
++	assertEqualInt(AE_IFDIR, archive_entry_filetype(ae));
++	assertEqualInt(1327314468, archive_entry_mtime(ae));
++	assertEqualInt(0, archive_entry_size(ae));
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
++	assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae));
++	assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
++	assertEqualInt(1327314476, archive_entry_mtime(ae));
++	assertEqualInt(11, archive_entry_size(ae));
++	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
++}
++
++static void
++test_compat_zip_6(void)
++{
++	const char *refname = "test_compat_zip_6.zip";
++	struct archive *a;
++	void *p;
++	size_t s;
++
++	extract_reference_file(refname);
++	p = slurpfile(&s, refname);
++
++	assert((a = archive_read_new()) != NULL);
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
++	assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 7));
++	compat_zip_6_verify(a);
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
++
++	assert((a = archive_read_new()) != NULL);
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
++	assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, p, s, 7));
++	compat_zip_6_verify(a);
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
++}
++
+ DEFINE_TEST(test_compat_zip)
+ {
+ 	test_compat_zip_1();
+@@ -355,6 +402,7 @@
+ 	test_compat_zip_3();
+ 	test_compat_zip_4();
+ 	test_compat_zip_5();
++	test_compat_zip_6();
+ }
+ 
+ 
+Index: Makefile.am
+===================================================================
+--- Makefile.am	(revision 4189)
++++ Makefile.am	(revision 4190)
+@@ -462,6 +462,7 @@
+ 	libarchive/test/test_compat_zip_3.zip.uu			\
+ 	libarchive/test/test_compat_zip_4.zip.uu			\
+ 	libarchive/test/test_compat_zip_5.zip.uu			\
++	libarchive/test/test_compat_zip_6.zip.uu			\
+ 	libarchive/test/test_fuzz_1.iso.Z.uu				\
+ 	libarchive/test/test_fuzz.cab.uu				\
+ 	libarchive/test/test_fuzz.lzh.uu				\
diff --git a/testing/libarchive/test-with-zip-mtime.patch b/testing/libarchive/test-with-zip-mtime.patch
new file mode 100644
index 000000000..79e2f3c7e
--- /dev/null
+++ b/testing/libarchive/test-with-zip-mtime.patch
@@ -0,0 +1,23 @@
+Index: libarchive/test/test_compat_zip.c
+===================================================================
+--- libarchive/test/test_compat_zip.c	(revision 4197)
++++ libarchive/test/test_compat_zip.c	(revision 4198)
+@@ -359,12 +359,16 @@
+ 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ 	assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae));
+ 	assertEqualInt(AE_IFDIR, archive_entry_filetype(ae));
+-	assertEqualInt(1327314468, archive_entry_mtime(ae));
++	/* Zip timestamps are local time, so vary by time zone. */
++	/* TODO: A more complex assert would work here; we could
++	   verify that it's within +/- 24 hours of a particular value. */
++	/* assertEqualInt(1327314468, archive_entry_mtime(ae)); */
+ 	assertEqualInt(0, archive_entry_size(ae));
+ 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ 	assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae));
+ 	assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
+-	assertEqualInt(1327314476, archive_entry_mtime(ae));
++	/* Zip timestamps are local time, so vary by time zone. */
++	/* assertEqualInt(1327314476, archive_entry_mtime(ae)); */
+ 	assertEqualInt(11, archive_entry_size(ae));
+ 	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+ }
diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD
index f1cfcbd5f..4e1d95a74 100644
--- a/testing/systemd/PKGBUILD
+++ b/testing/systemd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146660 2012-01-15 17:04:30Z dreisner $
+# $Id: PKGBUILD 147240 2012-01-25 01:22:21Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=systemd
-pkgver=38
-pkgrel=3
+pkgver=39
+pkgrel=1
 pkgdesc="Session and Startup manager"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -16,7 +16,6 @@ optdepends=('cryptsetup: required for encrypted block devices'
             'initscripts-systemd: native boot and initialization scripts'
             'python2-cairo: systemd-analyze'
             'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
-groups=('systemd')
 options=('!libtool')
 backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
         etc/dbus-1/system.d/org.freedesktop.hostname1.conf
@@ -28,13 +27,9 @@ backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
         etc/systemd/systemd-logind.conf)
 install=systemd.install
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        "os-release"
-        '0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch'
-        '0001-units-make-sure-syslog-socket-goes-away-early-during.patch')
-md5sums=('68c66dce5a28c0efd7c210af5d11efed'
-         '752636def0db3c03f121f8b4f44a63cd'
-         '07437e70be65ef14fd4f13c5ec5bd1fe'
-         'c567ce597f68c07b9bc5b7e835f80f7d')
+        "os-release")
+md5sums=('7179b34f6f6553d2a36551ac1dec5f0d'
+         '752636def0db3c03f121f8b4f44a63cd')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -44,9 +39,6 @@ build() {
   sed -i -e '/^Environ.*LANG/s/^/#/' \
          -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4
 
-  patch -Np1 < "$srcdir/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch"
-  patch -Np1 < "$srcdir/0001-units-make-sure-syslog-socket-goes-away-early-during.patch"
-
   ./configure --sysconfdir=/etc \
               --libexecdir=/usr/lib \
               --libdir=/usr/lib \
diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install
index 4850c879e..f31642e13 100644
--- a/testing/systemd/systemd.install
+++ b/testing/systemd/systemd.install
@@ -2,7 +2,7 @@
 
 checkgroups() {
   if ! getent group lock >/dev/null; then
-    sbin/groupadd -g 54 lock
+    groupadd -g 54 lock
   fi
 }
 
diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD
index 2a3787ae9..2a30f0dce 100644
--- a/testing/udev/PKGBUILD
+++ b/testing/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147057 2012-01-21 10:00:01Z tpowa $
+# $Id: PKGBUILD 147236 2012-01-24 23:31:40Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgbase="udev"
 pkgname=('udev' 'udev-compat')
-pkgver=178
+pkgver=179
 pkgrel=1
 arch=(i686 x86_64)
 url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
@@ -15,7 +15,6 @@ groups=('base')
 options=(!makeflags !libtool)
 makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod')
 source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz)
-md5sums=('173cc6061e3a82dd6e9a1a5cf767a858')
 
 build() {
   cd $srcdir/$pkgbase-$pkgver
@@ -100,4 +99,4 @@ package_udev-compat() {
   mknod cpu/microcode c 10 184
   
 }
-md5sums=('173cc6061e3a82dd6e9a1a5cf767a858')
+md5sums=('7d2880f66ea39146aae928f19ff3ca09')
diff --git a/testing/wireless_tools/PKGBUILD b/testing/wireless_tools/PKGBUILD
new file mode 100644
index 000000000..16062dd2a
--- /dev/null
+++ b/testing/wireless_tools/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 147204 2012-01-24 11:13:02Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Jason Chu <jchu@xentac.net>
+
+pkgname=wireless_tools
+pkgver=29
+pkgrel=6
+pkgdesc='Wireless Tools'
+url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
+arch=('i686' 'x86_64')
+license=('GPL')
+source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz")
+sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710')
+
+build() {
+	cd "${srcdir}/${pkgname}.${pkgver}"
+	make CFLAGS="${CFLAGS} -Wall -Wextra -I." LDFLAGS="${LDFLAGS}"
+}
+
+package() {
+	cd "${srcdir}/${pkgname}.${pkgver}"
+	make \
+		INSTALL_DIR="${pkgdir}/usr/sbin" \
+		INSTALL_LIB="${pkgdir}/usr/lib" \
+		INSTALL_INC="${pkgdir}/usr/include" \
+		INSTALL_MAN="${pkgdir}/usr/share/man" \
+		install
+}