Mon May 21 00:02:00 UTC 2012

8 files changed, 180 insertions, 15 deletions

diff --git a/testing/e2fsprogs/MIT-LICENSE b/testing/e2fsprogs/MIT-LICENSE
new file mode 100644
index 000000000..d849b28f2
--- /dev/null
+++ b/testing/e2fsprogs/MIT-LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2003-2007 Theodore Ts'o <tytso@mit.edu>
+Copyright (c) 1997-2003 Yann Dirson <dirson@debian.org>
+Copyright (c) 2001 Alcove <http://www.alcove.com/>
+Copyright (c) 1997 Klee Dienes
+Copyright (c) 1995-1996 Michael Nonweiler <mrn20@cam.ac.uk>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/testing/e2fsprogs/PKGBUILD b/testing/e2fsprogs/PKGBUILD
new file mode 100644
index 000000000..d9e0bc575
--- /dev/null
+++ b/testing/e2fsprogs/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 159257 2012-05-19 19:11:50Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org> 
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=e2fsprogs
+pkgver=1.42.3
+pkgrel=1
+pkgdesc="Ext2/3/4 filesystem utilities"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'MIT')
+url="http://e2fsprogs.sourceforge.net"
+groups=('base')
+depends=('sh' 'util-linux')
+makedepends=('bc')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'MIT-LICENSE')
+backup=('etc/mke2fs.conf')
+install=${pkgname}.install
+sha1sums=('0da8c787604876fe23b0f608389c3854ae1a2420'
+          'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Remove unnecessary init.d directory
+  sed -i '/init\.d/s|^|#|' misc/Makefile.in
+
+  ./configure --prefix=/usr --with-root-prefix="" --libdir=/usr/lib \
+      --enable-elf-shlibs --disable-fsck --disable-uuidd \
+      --disable-libuuid --disable-libblkid
+
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install install-libs
+
+  sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et"
+  
+  # remove references to build directory
+  sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds"
+  sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et"
+
+  # install MIT license
+  install -Dm644 "${srcdir}/MIT-LICENSE" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE"
+}
diff --git a/testing/e2fsprogs/e2fsprogs.install b/testing/e2fsprogs/e2fsprogs.install
new file mode 100644
index 000000000..1a7fe20d7
--- /dev/null
+++ b/testing/e2fsprogs/e2fsprogs.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(libext2fs.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/e2fsprogs/mke2fs.conf b/testing/e2fsprogs/mke2fs.conf
new file mode 100644
index 000000000..92464e3b4
--- /dev/null
+++ b/testing/e2fsprogs/mke2fs.conf
@@ -0,0 +1,26 @@
+[defaults]
+	base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr
+	blocksize = 4096
+	inode_size = 128
+	inode_ratio = 16384
+
+[fs_types]
+	small = {
+		blocksize = 1024
+		inode_size = 128
+		inode_ratio = 4096
+	}
+	floppy = {
+		blocksize = 1024
+		inode_size = 128
+		inode_ratio = 8192
+	}
+	news = {
+		inode_ratio = 4096
+	}
+	largefile = {
+		inode_ratio = 1048576
+	}
+	largefile4 = {
+		inode_ratio = 4194304
+	}
diff --git a/testing/libssh2/PKGBUILD b/testing/libssh2/PKGBUILD
new file mode 100644
index 000000000..d6c09c9cd
--- /dev/null
+++ b/testing/libssh2/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 159245 2012-05-19 04:14:54Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: ice-man <icemanf@gmail.com>
+
+pkgname=libssh2
+pkgver=1.4.2
+pkgrel=1
+pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts"
+url="http://www.libssh2.org/"
+arch=('i686' 'x86_64')
+license=('BSD')
+depends=('openssl')
+makedepends=('zlib')
+provides=('libssh2.so')
+options=('!libtool')
+source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc})
+md5sums=('42e2b3796ac07fc1dbafc7abcc002cd3'
+         '872cfb1d61dbd5acd0481ab030e8f130')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD
index ec1a68163..c57cb8528 100644
--- a/testing/udev/PKGBUILD
+++ b/testing/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157979 2012-04-30 12:31:14Z tomegun $
+# $Id: PKGBUILD 159251 2012-05-19 14:53:31Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=udev
 pkgver=182
-pkgrel=2
+pkgrel=3
 pkgdesc="The userspace dev tools (udev)"
 depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl')
 install=udev.install
@@ -22,6 +22,11 @@ url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
 backup=(etc/udev/udev.conf)
 groups=('base')
 options=(!makeflags !libtool)
+md5sums=('023877e6cc0d907994b8c648beab542b'
+         '0fa3eac115ad0140af1582d941b15f2c'
+         '94b816896bf23275c0598fc8e07270c3'
+         'e433c11d38cf4f877b41d06e2753ebe0'
+         'e6faf4c3fe456f10d8efd2487d5e3cb7')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -67,8 +72,3 @@ package() {
                s#GROUP="cdrom"#GROUP="optical"#g' $i
   done
 }
-md5sums=('023877e6cc0d907994b8c648beab542b'
-         '0fa3eac115ad0140af1582d941b15f2c'
-         '94b816896bf23275c0598fc8e07270c3'
-         'a4dd853050bf2e0ae6b2e3d2c75499c2'
-         'd2b16edc6d806b5dafdbbad43ae5a3de')
diff --git a/testing/udev/initcpio-hooks-udev b/testing/udev/initcpio-hooks-udev
index 87aa7960f..313a88130 100644
--- a/testing/udev/initcpio-hooks-udev
+++ b/testing/udev/initcpio-hooks-udev
@@ -1,9 +1,20 @@
-# vim: set ft=sh:
-run_hook ()
-{
-    msg -n ":: Triggering uevents..."
+#!/usr/bin/ash
+
+run_earlyhook() {
+    /usr/lib/udev/udevd --daemon --resolve-names=never
+    udevd_running=1
+}
+
+run_hook() {
+    msg ":: Triggering uevents..."
     udevadm trigger --action=add --type=subsystems
     udevadm trigger --action=add --type=devices
     udevadm settle
-    msg "done."
 }
+
+run_cleanuphook() {
+    udevadm control --exit
+    udevadm info --cleanup-db
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/udev/initcpio-install-udev b/testing/udev/initcpio-install-udev
index 6bc9cfb28..e33664459 100644
--- a/testing/udev/initcpio-install-udev
+++ b/testing/udev/initcpio-install-udev
@@ -1,9 +1,7 @@
 #!/bin/bash
 
 build() {
-    FILES="/etc/udev/udev.conf"
-    SCRIPT="udev"
-
+    add_file "/etc/udev/udev.conf"
     add_binary /usr/lib/udev/udevd
     add_binary /usr/bin/udevadm
 
@@ -13,6 +11,8 @@ build() {
     for tool in ata_id scsi_id; do
         add_file "/usr/lib/udev/$tool"
     done
+
+    add_runscript
 }
 
 help() {