Fri Aug 5 23:14:36 UTC 2011

11 files changed, 222 insertions, 7 deletions

diff --git a/testing/dirmngr/PKGBUILD b/testing/dirmngr/PKGBUILD
index 49f81d6f4..f2f6b60e5 100644
--- a/testing/dirmngr/PKGBUILD
+++ b/testing/dirmngr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 131241 2011-07-12 07:38:53Z tpowa $
+# $Id: PKGBUILD 134465 2011-08-04 06:40:27Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=dirmngr
 pkgver=1.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A daemon to handle CRL and certificate requests"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/testing/file/PKGBUILD b/testing/file/PKGBUILD
new file mode 100644
index 000000000..4d7b9cf95
--- /dev/null
+++ b/testing/file/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 134479 2011-08-04 09:59:01Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=file
+pkgver=5.08
+pkgrel=1
+pkgdesc="File type identification utility"
+arch=('i686' 'x86_64')
+license=('custom')
+groups=('base')
+url="http://www.darwinsys.com/file/"
+depends=('glibc' 'zlib')
+options=('!libtool')
+source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('6a2a263c20278f01fe3bb0f720b27d4e')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's#\$(datadir)/misc#\$(datadir)#' configure
+  
+  ./configure --prefix=/usr --datadir=/usr/share/file
+  make 
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR=${pkgdir} install
+  install -dm755 ${pkgdir}/usr/share/misc
+  ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc
+  
+  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}
diff --git a/testing/gnupg2/PKGBUILD b/testing/gnupg2/PKGBUILD
new file mode 100644
index 000000000..d286b8504
--- /dev/null
+++ b/testing/gnupg2/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 134457 2011-08-04 06:36:59Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=gnupg2
+pkgver=2.0.17
+pkgrel=2
+pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool"
+arch=('i686' 'x86_64')
+depends=('libldap' 'curl' 'bzip2' 'zlib' 'libksba' 'libgcrypt'
+	'pth' 'libusb-compat' 'libassuan' 'texinfo' 'readline' 'pinentry' 'dirmngr')
+license=('GPL')
+url="http://www.gnupg.org/"
+install=${pkgname}.install
+source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2)
+
+build() {
+  cd ${srcdir}/gnupg-$pkgver
+  ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg2 #$EXTRAOPTS
+  make
+}
+
+package() {
+  cd ${srcdir}/gnupg-$pkgver
+  make DESTDIR=${pkgdir} install
+  # move conflicting files
+  mv ${pkgdir}/usr/share/gnupg{,2}
+  rm -f ${pkgdir}/usr/share/info/dir
+}
+md5sums=('123af099740fd159c73a0352a274ec81')
diff --git a/testing/gnupg2/gnupg2-2.0.16-security.patch b/testing/gnupg2/gnupg2-2.0.16-security.patch
new file mode 100644
index 000000000..b265c1532
--- /dev/null
+++ b/testing/gnupg2/gnupg2-2.0.16-security.patch
@@ -0,0 +1,11 @@
+--- kbx/keybox-blob.c   (revision 5367)
++++ kbx/keybox-blob.c   (working copy)
+@@ -898,6 +898,7 @@
+               rc = gpg_error_from_syserror ();
+               goto leave;
+             }
++          names = tmp;
+         }
+       names[blob->nuids++] = p;
+       if (!i && (p=x509_email_kludge (p)))
+
diff --git a/testing/gnupg2/gnupg2.install b/testing/gnupg2/gnupg2.install
new file mode 100644
index 000000000..27c121ffd
--- /dev/null
+++ b/testing/gnupg2/gnupg2.install
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(gnupg.info gnupg.info-1 gnupg.info-2)
+
+post_install() {
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/libksba/PKGBUILD b/testing/libksba/PKGBUILD
index b70d1b1fd..51f23e123 100644
--- a/testing/libksba/PKGBUILD
+++ b/testing/libksba/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 131238 2011-07-12 07:37:20Z tpowa $
+# $Id: PKGBUILD 134460 2011-08-04 06:38:08Z tpowa $
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=libksba
-pkgver=1.0.8
-pkgrel=2
-pkgdesc="Libksba is a CMS and X.509 access library"
+pkgver=1.2.0
+pkgrel=1
+pkgdesc="A CMS and X.509 access library"
 arch=(i686 x86_64)
 license=('GPL')
 url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba"
@@ -20,4 +20,4 @@ build() {
   make
   make DESTDIR=$startdir/pkg install
 }
-md5sums=('8acac0b3cbd0030dfc6d0f6a58c9b5b2')
+md5sums=('e797f370b69b4dc776499d6a071ae137')
diff --git a/testing/lilo/PKGBUILD b/testing/lilo/PKGBUILD
new file mode 100644
index 000000000..c1c2863cf
--- /dev/null
+++ b/testing/lilo/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 134470 2011-08-04 06:48:32Z tpowa $
+# Maintainer: Eric Belanger <eric@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=lilo
+pkgver=23.2
+pkgrel=2
+pkgdesc="A bootloader for Linux"
+arch=('i686' 'x86_64')
+url="https://alioth.debian.org/projects/lilo/"
+license=('BSD')
+# While lilo should stay in the base category,
+# it usually makes no sense if it is installed
+# with pacman -S base, therefore, don't add
+# the base group here.
+#groups=('base')
+backup=('etc/lilo.conf')
+depends=('device-mapper' 'coreutils')
+makedepends=('bin86' 'sharutils')
+optdepends=('perl: to use keytab-lilo')
+install=lilo.install
+options=('!makeflags')
+source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz"
+        'lilo.conf')
+md5sums=('51b9b9db665d3b8724919e3d46054d12'
+         '4ae5986fe2f6bb7e20771ac7fea5343d')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  export LC_ALL=C
+  make all
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -D -m644 "${srcdir}/lilo.conf" "${pkgdir}/etc/lilo.conf"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/testing/lilo/lilo.conf b/testing/lilo/lilo.conf
new file mode 100644
index 000000000..146a2b58b
--- /dev/null
+++ b/testing/lilo/lilo.conf
@@ -0,0 +1,28 @@
+#
+# /etc/lilo.conf
+#
+
+boot=/dev/hda
+# This line often fixes L40 errors on bootup
+# disk=/dev/hda bios=0x80
+
+default=arch
+timeout=50
+lba32
+prompt
+
+image=/boot/vmlinuz-linux
+	label=arch
+	root=/dev/hda3
+	initrd=/boot/initramfs-vmlinuz.img
+	read-only
+
+image=/boot/vmlinuz-linux
+	label=arch-fallback
+	root=/dev/hda3
+	initrd=/boot/initramfs-linux-fallback.img
+	read-only
+
+#other=/dev/hda1
+#	label=dos
+
diff --git a/testing/lilo/lilo.install b/testing/lilo/lilo.install
new file mode 100644
index 000000000..7375fddf8
--- /dev/null
+++ b/testing/lilo/lilo.install
@@ -0,0 +1,5 @@
+post_upgrade() {
+  echo
+  echo "If you use the LILO bootloader, you should run 'lilo' after upgrading."
+  echo
+}
diff --git a/testing/xf86-input-wacom/70-wacom.rules b/testing/xf86-input-wacom/70-wacom.rules
new file mode 100644
index 000000000..f6aa20835
--- /dev/null
+++ b/testing/xf86-input-wacom/70-wacom.rules
@@ -0,0 +1,12 @@
+ACTION!="add|change", GOTO="wacom_end"
+
+# Match all serial wacom tablets with a serial ID starting with WACf
+# Notes: We assign NAME though we shouldn't, but currently the server requires it
+#        We assign the lot to subsystem pnp too because server reads NAME from
+#        the parent device. Once all that's fixed, as simple SUBSYSTEM="tty"
+#        will do and the ENV{NAME} can be removed.
+SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
+SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
+
+LABEL="wacom_end"
+
diff --git a/testing/xf86-input-wacom/PKGBUILD b/testing/xf86-input-wacom/PKGBUILD
new file mode 100644
index 000000000..5eee08b5b
--- /dev/null
+++ b/testing/xf86-input-wacom/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 134510 2011-08-04 18:20:04Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: M Rawash <mrawash@gmail.com>
+
+pkgname=xf86-input-wacom
+pkgver=0.11.1
+pkgrel=2
+pkgdesc="X.Org Wacom tablet driver"
+arch=('i686' 'x86_64')
+url="http://linuxwacom.sourceforge.net/"
+license=('GPL')
+backup=('etc/X11/xorg.conf.d/50-wacom.conf')
+depends=('libxi' 'libxrandr')
+makedepends=('xorg-server-devel' 'libxext' 'libxi')
+conflicts=('xorg-server<1.10.0')
+options=(!libtool)
+source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        70-wacom.rules)
+md5sums=('0aec4a338cc583ed497b6af68d6d80ab'
+         '10db4f8272286690255c1bcc18bfdd92')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/lib/udev/rules.d"
+  install -m644 "${srcdir}/70-wacom.rules"  "${pkgdir}/lib/udev/rules.d/"
+}