[arch-commits] Commit in jhead/repos (8 files)

2012-03-16 Thread Eric Bélanger
Date: Friday, March 16, 2012 @ 23:19:37
  Author: eric
Revision: 153645

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  jhead/repos/extra-i686/LICENSE
(from rev 153644, jhead/trunk/LICENSE)
  jhead/repos/extra-i686/PKGBUILD
(from rev 153644, jhead/trunk/PKGBUILD)
  jhead/repos/extra-x86_64/LICENSE
(from rev 153644, jhead/trunk/LICENSE)
  jhead/repos/extra-x86_64/PKGBUILD
(from rev 153644, jhead/trunk/PKGBUILD)
Deleted:
  jhead/repos/extra-i686/LICENSE
  jhead/repos/extra-i686/PKGBUILD
  jhead/repos/extra-x86_64/LICENSE
  jhead/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/LICENSE|   24 +--
 extra-i686/PKGBUILD   |   58 
 extra-x86_64/LICENSE  |   24 +--
 extra-x86_64/PKGBUILD |   58 
 4 files changed, 82 insertions(+), 82 deletions(-)

Deleted: extra-i686/LICENSE
===
--- extra-i686/LICENSE  2012-03-17 03:19:24 UTC (rev 153644)
+++ extra-i686/LICENSE  2012-03-17 03:19:37 UTC (rev 153645)
@@ -1,12 +0,0 @@
-License:
-
-Jhead is public domain software - that is, you can do whatever you want
-with it, and include it software that is licensesed under the GNU or the 
-BSD license, or whatever other licence you chose, including proprietary
-closed source licenses.  Although not part of the liscense, I do expect
-common courtesy, please.
-
-If you do integrate the code into some software of yours, I'd appreciate
-knowing about it though. 
-
-Matthias Wandel

Copied: jhead/repos/extra-i686/LICENSE (from rev 153644, jhead/trunk/LICENSE)
===
--- extra-i686/LICENSE  (rev 0)
+++ extra-i686/LICENSE  2012-03-17 03:19:37 UTC (rev 153645)
@@ -0,0 +1,12 @@
+License:
+
+Jhead is public domain software - that is, you can do whatever you want
+with it, and include it software that is licensesed under the GNU or the 
+BSD license, or whatever other licence you chose, including proprietary
+closed source licenses.  Although not part of the liscense, I do expect
+common courtesy, please.
+
+If you do integrate the code into some software of yours, I'd appreciate
+knowing about it though. 
+
+Matthias Wandel

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-17 03:19:24 UTC (rev 153644)
+++ extra-i686/PKGBUILD 2012-03-17 03:19:37 UTC (rev 153645)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: François Charette 
-# Contributor: Giovanni Scafora 
-
-pkgname=jhead
-pkgver=2.93
-pkgrel=1
-pkgdesc="EXIF JPEG info parser and thumbnail remover"
-url="http://www.sentex.net/~mwandel/jhead/";
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('glibc')
-optdepends=('libjpeg: to up-right images according to rotation tag')
-source=(http://www.sentex.net/~mwandel/${pkgname}/${pkgname}-${pkgver}.tar.gz 
-LICENSE)
-md5sums=('23ac51b4aea2df663d684744e282eb7d'
- '1f0db611d2642a981719f45252762a45')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -D -m755 jhead "${pkgdir}/usr/bin/jhead"
-  install -D -m644 jhead.1 "${pkgdir}/usr/share/man/man1/jhead.1"
-  install -D -m644 ${srcdir}/LICENSE 
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: jhead/repos/extra-i686/PKGBUILD (from rev 153644, jhead/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-17 03:19:37 UTC (rev 153645)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: François Charette 
+# Contributor: Giovanni Scafora 
+
+pkgname=jhead
+pkgver=2.95
+pkgrel=1
+pkgdesc="EXIF JPEG info parser and thumbnail remover"
+url="http://www.sentex.net/~mwandel/jhead/";
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('glibc')
+optdepends=('libjpeg: to up-right images according to rotation tag')
+source=(http://www.sentex.net/~mwandel/${pkgname}/${pkgname}-${pkgver}.tar.gz 
+LICENSE)
+md5sums=('49599697ffc1830648b057916165a192'
+ '1f0db611d2642a981719f45252762a45')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -D -m755 jhead "${pkgdir}/usr/bin/jhead"
+  install -D -m644 jhead.1 "${pkgdir}/usr/share/man/man1/jhead.1"
+  install -D -m644 ${srcdir}/LICENSE 
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Deleted: extra-x86_64/LICENSE
===
--- extra-x86_64/LICENSE2012-03-17 03:19:24 UTC (rev 153644)
+++ extra-x86_64/LICENSE2012-03-17 03:19:37 UTC (rev 153645)
@@ -1,12 +0,0 @@
-License:
-
-Jhead is public domain software - that is, you can do whateve

[arch-commits] Commit in jhead/trunk (PKGBUILD)

2012-03-16 Thread Eric Bélanger
Date: Friday, March 16, 2012 @ 23:19:24
  Author: eric
Revision: 153644

upgpkg: jhead 2.95-1

Upstream update

Modified:
  jhead/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-17 02:47:43 UTC (rev 153643)
+++ PKGBUILD2012-03-17 03:19:24 UTC (rev 153644)
@@ -3,7 +3,7 @@
 # Contributor: Giovanni Scafora 
 
 pkgname=jhead
-pkgver=2.93
+pkgver=2.95
 pkgrel=1
 pkgdesc="EXIF JPEG info parser and thumbnail remover"
 url="http://www.sentex.net/~mwandel/jhead/";
@@ -13,7 +13,7 @@
 optdepends=('libjpeg: to up-right images according to rotation tag')
 source=(http://www.sentex.net/~mwandel/${pkgname}/${pkgname}-${pkgver}.tar.gz 
 LICENSE)
-md5sums=('23ac51b4aea2df663d684744e282eb7d'
+md5sums=('49599697ffc1830648b057916165a192'
  '1f0db611d2642a981719f45252762a45')
 
 build() {



[arch-commits] Commit in psmisc/repos (4 files)

2012-03-16 Thread Eric Bélanger
Date: Friday, March 16, 2012 @ 22:47:43
  Author: eric
Revision: 153643

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  psmisc/repos/testing-i686/
  psmisc/repos/testing-i686/PKGBUILD
(from rev 153642, psmisc/trunk/PKGBUILD)
  psmisc/repos/testing-x86_64/
  psmisc/repos/testing-x86_64/PKGBUILD
(from rev 153642, psmisc/trunk/PKGBUILD)

-+
 testing-i686/PKGBUILD   |   25 +
 testing-x86_64/PKGBUILD |   25 +
 2 files changed, 50 insertions(+)

Copied: psmisc/repos/testing-i686/PKGBUILD (from rev 153642, 
psmisc/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-03-17 02:47:43 UTC (rev 153643)
@@ -0,0 +1,25 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=psmisc
+pkgver=22.16
+pkgrel=1
+pkgdesc="Miscellaneous procfs tools"
+arch=('i686' 'x86_64')
+url="http://psmisc.sourceforge.net/index.html";
+license=('GPL')
+groups=('base')
+depends=('ncurses')
+source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('27f1c8deab06e79101af1914ff81a9d561f2fcfe')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Copied: psmisc/repos/testing-x86_64/PKGBUILD (from rev 153642, 
psmisc/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-03-17 02:47:43 UTC (rev 153643)
@@ -0,0 +1,25 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=psmisc
+pkgver=22.16
+pkgrel=1
+pkgdesc="Miscellaneous procfs tools"
+arch=('i686' 'x86_64')
+url="http://psmisc.sourceforge.net/index.html";
+license=('GPL')
+groups=('base')
+depends=('ncurses')
+source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('27f1c8deab06e79101af1914ff81a9d561f2fcfe')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}



[arch-commits] Commit in psmisc/trunk (COMM_LEN-to-18.patch PKGBUILD)

2012-03-16 Thread Eric Bélanger
Date: Friday, March 16, 2012 @ 22:47:18
  Author: eric
Revision: 153642

upgpkg: psmisc 22.16-1

Upstream update, Remove old patch

Modified:
  psmisc/trunk/PKGBUILD
Deleted:
  psmisc/trunk/COMM_LEN-to-18.patch

--+
 COMM_LEN-to-18.patch |   85 -
 PKGBUILD |8 +---
 2 files changed, 3 insertions(+), 90 deletions(-)

Deleted: COMM_LEN-to-18.patch
===
--- COMM_LEN-to-18.patch2012-03-17 02:44:42 UTC (rev 153641)
+++ COMM_LEN-to-18.patch2012-03-17 02:47:18 UTC (rev 153642)
@@ -1,85 +0,0 @@
-From: Craig Small 
-Date: Fri, 27 Jan 2012 01:02:48 + (+1100)
-Subject: Set COMM_LEN to 18 to include brackets in name
-X-Git-Url: 
http://psmisc.git.sourceforge.net/git/gitweb.cgi?p=psmisc%2Fpsmisc;a=commitdiff_plain;h=340f81524cb097d814fcf344a3743de17f988e3d
-
-Set COMM_LEN to 18 to include brackets in name
-
-Also use strncpy in case the command names grow.

-
-diff --git a/src/comm.h b/src/comm.h
-index 956383d..2b780b0 100644
 a/src/comm.h
-+++ b/src/comm.h
-@@ -1,18 +1,37 @@
--/* comm.h - command name length definition */
--
--/* Copyright 1995 Werner Almesberger. See file COPYING for details. */
--
-+/*
-+ * comm.h - command name length definition 
-+ *
-+ * Copyright 1995 Werner Almesberger
-+ * Copyright 2012 Craig Small 
-+ *
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
- 
- #ifndef COMM_H
- #define COMM_H
- 
--#if 0 /* broken in 1.3.xx */
--#include 
--#define COMM_LEN sizeof(dummy.comm)
--extern struct task_struct dummy;
--#else
--#define COMM_LEN 16   /* synchronize with size of comm in struct 
task_struct in
-- /usr/include/linux/sched.h */
-+#ifdef HAVE_CONFIG_H
-+#include 
- #endif
- 
-+/*
-+ * COMM_LEN should be the same size as TASK_COMM_LEN in the Linux source
-+ * at include/linux/sched.h
-+ * However, that doesn't include the brackets that may be in the field.
-+ */
-+#define COMM_LEN 18
-+
- #endif
-diff --git a/src/pstree.c b/src/pstree.c
-index 452f823..3129f76 100644
 a/src/pstree.c
-+++ b/src/pstree.c
-@@ -264,7 +264,7 @@ static PROC *new_proc(const char *comm, pid_t pid, uid_t 
uid)
- perror("malloc");
- exit(1);
- }
--strcpy(new->comm, comm);
-+strncpy(new->comm, comm, COMM_LEN);
- new->pid = pid;
- new->uid = uid;
- new->flags = 0;
-@@ -352,7 +352,7 @@ add_proc(const char *comm, pid_t pid, pid_t ppid, uid_t 
uid,
- this = new_proc(comm, pid, uid);
- #endif/*WITH_SELINUX */
- else {
--strcpy(this->comm, comm);
-+strncpy(this->comm, comm, COMM_LEN);
- this->uid = uid;
- }
- if (args)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-17 02:44:42 UTC (rev 153641)
+++ PKGBUILD2012-03-17 02:47:18 UTC (rev 153642)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=psmisc
-pkgver=22.15
+pkgver=22.16
 pkgrel=1
 pkgdesc="Miscellaneous procfs tools"
 arch=('i686' 'x86_64')
@@ -10,13 +10,11 @@
 license=('GPL')
 groups=('base')
 depends=('ncurses')
-source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz 
COMM_LEN-to-18.patch)
-sha1sums=('06f507d889afab70ac7ff20fbd419ca2ffcf90c0'
-  '6f45338fc34e453bea5273691a0cf81ed3e20fb8')
+source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('27f1c8deab06e79101af1914ff81a9d561f2fcfe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ../COMM_LEN-to-18.patch
   ./configure --prefix=/usr
   make
 }



[arch-commits] Commit in systemd/repos (10 files)

2012-03-16 Thread Dave Reisner
Date: Friday, March 16, 2012 @ 22:44:42
  Author: dreisner
Revision: 153641

db-move: moved systemd from [testing] to [extra] (x86_64)

Added:
  
systemd/repos/extra-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(from rev 153639, 
systemd/repos/testing-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch)
  systemd/repos/extra-x86_64/PKGBUILD
(from rev 153639, systemd/repos/testing-x86_64/PKGBUILD)
  systemd/repos/extra-x86_64/cpp-compat.patch
(from rev 153639, systemd/repos/testing-x86_64/cpp-compat.patch)
  systemd/repos/extra-x86_64/os-release
(from rev 153639, systemd/repos/testing-x86_64/os-release)
  systemd/repos/extra-x86_64/systemd.install
(from rev 153639, systemd/repos/testing-x86_64/systemd.install)
Deleted:
  systemd/repos/extra-x86_64/PKGBUILD
  systemd/repos/extra-x86_64/cpp-compat.patch
  systemd/repos/extra-x86_64/os-release
  systemd/repos/extra-x86_64/systemd.install
  systemd/repos/testing-x86_64/

-+
 0001-util-never-follow-symlinks-in-rm_rf_children.patch |   32 ++
 PKGBUILD|  212 +++---
 cpp-compat.patch|   38 +-
 os-release  |   10 
 systemd.install |  106 +++
 5 files changed, 215 insertions(+), 183 deletions(-)

Copied: 
systemd/repos/extra-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
 (from rev 153639, 
systemd/repos/testing-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch)
===
--- extra-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(rev 0)
+++ extra-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
2012-03-17 02:44:42 UTC (rev 153641)
@@ -0,0 +1,32 @@
+From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt 
+Date: Fri, 2 Mar 2012 10:39:10 +0100
+Subject: [PATCH] util: never follow symlinks in rm_rf_children()
+
+The function checks if the entry is a directory before recursing, but
+there is a window between the check and the open, during which the
+directory could be replaced with a symlink.
+
+CVE-2012-1174
+https://bugzilla.redhat.com/show_bug.cgi?id=803358
+---
+ src/util.c |3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/util.c b/src/util.c
+index 20cbc2b..dfc1dc6 100644
+--- a/src/util.c
 b/src/util.c
+@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool 
honour_sticky) {
+ if (is_dir) {
+ int subdir_fd;
+ 
+-if ((subdir_fd = openat(fd, de->d_name, 
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) {
++subdir_fd = openat(fd, de->d_name, 
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
++if (subdir_fd < 0) {
+ if (ret == 0 && errno != ENOENT)
+ ret = -errno;
+ continue;
+-- 
+1.7.9.4
+

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-03-17 02:44:41 UTC (rev 153640)
+++ extra-x86_64/PKGBUILD   2012-03-17 02:44:42 UTC (rev 153641)
@@ -1,106 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner 
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd')
-pkgver=43
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd";
-license=('GPL2')
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
- 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
-options=('!libtool')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz";
-"os-release" "cpp-compat.patch")
-md5sums=('446cc6db7625617af67e2d8e5f503a49'
- '752636def0db3c03f121f8b4f44a63cd'
- '414968aa314ced0b0ab4b2207e46aa69')
-
-build() {
-  cd "$pkgname-$pkgver"
-  
-  # Fix C++ compile error when including sd-login.h
-  # http://comments.gmane.org/gmane.comp.sysutils.systemd.devel/4514
-  patch -p1 -i ../cpp-compat.patch
-
-  ./configure --sysconfdir=/etc \
-  --libexecdir=/usr/lib \
-  --libdir=/usr/lib \
-  --with-pamlibdir=/lib/security \
-  --localstatedir=/var \
-  --with-rootprefix= \
-  --with-distro=arch
-
-  make
-}
-
-package_systemd() {
-  pkgdesc="systemd and service manager"
-  depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 
'util-linux' 'udev' 'xz')
-  optdepends=('cryptsetup: required for encrypted block devices'
-  'dbus-python: systemd-analyze'
-  'initscripts: legacy support for hostname and vconsole setup'
-  'ini

[arch-commits] Commit in systemd/repos (10 files)

2012-03-16 Thread Dave Reisner
Date: Friday, March 16, 2012 @ 22:44:41
  Author: dreisner
Revision: 153640

db-move: moved systemd from [testing] to [extra] (i686)

Added:
  
systemd/repos/extra-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(from rev 153639, 
systemd/repos/testing-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch)
  systemd/repos/extra-i686/PKGBUILD
(from rev 153639, systemd/repos/testing-i686/PKGBUILD)
  systemd/repos/extra-i686/cpp-compat.patch
(from rev 153639, systemd/repos/testing-i686/cpp-compat.patch)
  systemd/repos/extra-i686/os-release
(from rev 153639, systemd/repos/testing-i686/os-release)
  systemd/repos/extra-i686/systemd.install
(from rev 153639, systemd/repos/testing-i686/systemd.install)
Deleted:
  systemd/repos/extra-i686/PKGBUILD
  systemd/repos/extra-i686/cpp-compat.patch
  systemd/repos/extra-i686/os-release
  systemd/repos/extra-i686/systemd.install
  systemd/repos/testing-i686/

-+
 0001-util-never-follow-symlinks-in-rm_rf_children.patch |   32 ++
 PKGBUILD|  212 +++---
 cpp-compat.patch|   38 +-
 os-release  |   10 
 systemd.install |  106 +++
 5 files changed, 215 insertions(+), 183 deletions(-)

Copied: 
systemd/repos/extra-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
 (from rev 153639, 
systemd/repos/testing-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch)
===
--- extra-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch  
(rev 0)
+++ extra-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch  
2012-03-17 02:44:41 UTC (rev 153640)
@@ -0,0 +1,32 @@
+From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt 
+Date: Fri, 2 Mar 2012 10:39:10 +0100
+Subject: [PATCH] util: never follow symlinks in rm_rf_children()
+
+The function checks if the entry is a directory before recursing, but
+there is a window between the check and the open, during which the
+directory could be replaced with a symlink.
+
+CVE-2012-1174
+https://bugzilla.redhat.com/show_bug.cgi?id=803358
+---
+ src/util.c |3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/util.c b/src/util.c
+index 20cbc2b..dfc1dc6 100644
+--- a/src/util.c
 b/src/util.c
+@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool 
honour_sticky) {
+ if (is_dir) {
+ int subdir_fd;
+ 
+-if ((subdir_fd = openat(fd, de->d_name, 
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) {
++subdir_fd = openat(fd, de->d_name, 
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
++if (subdir_fd < 0) {
+ if (ret == 0 && errno != ENOENT)
+ ret = -errno;
+ continue;
+-- 
+1.7.9.4
+

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-17 02:01:43 UTC (rev 153639)
+++ extra-i686/PKGBUILD 2012-03-17 02:44:41 UTC (rev 153640)
@@ -1,106 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner 
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd')
-pkgver=43
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd";
-license=('GPL2')
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
- 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
-options=('!libtool')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz";
-"os-release" "cpp-compat.patch")
-md5sums=('446cc6db7625617af67e2d8e5f503a49'
- '752636def0db3c03f121f8b4f44a63cd'
- '414968aa314ced0b0ab4b2207e46aa69')
-
-build() {
-  cd "$pkgname-$pkgver"
-  
-  # Fix C++ compile error when including sd-login.h
-  # http://comments.gmane.org/gmane.comp.sysutils.systemd.devel/4514
-  patch -p1 -i ../cpp-compat.patch
-
-  ./configure --sysconfdir=/etc \
-  --libexecdir=/usr/lib \
-  --libdir=/usr/lib \
-  --with-pamlibdir=/lib/security \
-  --localstatedir=/var \
-  --with-rootprefix= \
-  --with-distro=arch
-
-  make
-}
-
-package_systemd() {
-  pkgdesc="systemd and service manager"
-  depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 
'util-linux' 'udev' 'xz')
-  optdepends=('cryptsetup: required for encrypted block devices'
-  'dbus-python: systemd-analyze'
-  'initscripts: legacy support for hostname and vconsole setup'
-  'initscripts-systemd: native boot and initialization scripts'
-   

[arch-commits] Commit in systemd/repos (12 files)

2012-03-16 Thread Dave Reisner
Date: Friday, March 16, 2012 @ 22:01:43
  Author: dreisner
Revision: 153639

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  systemd/repos/testing-i686/
  
systemd/repos/testing-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(from rev 153638, 
systemd/trunk/0001-util-never-follow-symlinks-in-rm_rf_children.patch)
  systemd/repos/testing-i686/PKGBUILD
(from rev 153638, systemd/trunk/PKGBUILD)
  systemd/repos/testing-i686/cpp-compat.patch
(from rev 153638, systemd/trunk/cpp-compat.patch)
  systemd/repos/testing-i686/os-release
(from rev 153638, systemd/trunk/os-release)
  systemd/repos/testing-i686/systemd.install
(from rev 153638, systemd/trunk/systemd.install)
  systemd/repos/testing-x86_64/
  
systemd/repos/testing-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(from rev 153638, 
systemd/trunk/0001-util-never-follow-symlinks-in-rm_rf_children.patch)
  systemd/repos/testing-x86_64/PKGBUILD
(from rev 153638, systemd/trunk/PKGBUILD)
  systemd/repos/testing-x86_64/cpp-compat.patch
(from rev 153638, systemd/trunk/cpp-compat.patch)
  systemd/repos/testing-x86_64/os-release
(from rev 153638, systemd/trunk/os-release)
  systemd/repos/testing-x86_64/systemd.install
(from rev 153638, systemd/trunk/systemd.install)

+
 testing-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch   |   32 
+++
 testing-i686/PKGBUILD  |  106 
++
 testing-i686/cpp-compat.patch  |   19 +
 testing-i686/os-release|5 
 testing-i686/systemd.install   |   53 
+
 testing-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch |   32 
+++
 testing-x86_64/PKGBUILD|  106 
++
 testing-x86_64/cpp-compat.patch|   19 +
 testing-x86_64/os-release  |5 
 testing-x86_64/systemd.install |   53 
+
 10 files changed, 430 insertions(+)

Copied: 
systemd/repos/testing-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
 (from rev 153638, 
systemd/trunk/0001-util-never-follow-symlinks-in-rm_rf_children.patch)
===
--- testing-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(rev 0)
+++ testing-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
2012-03-17 02:01:43 UTC (rev 153639)
@@ -0,0 +1,32 @@
+From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt 
+Date: Fri, 2 Mar 2012 10:39:10 +0100
+Subject: [PATCH] util: never follow symlinks in rm_rf_children()
+
+The function checks if the entry is a directory before recursing, but
+there is a window between the check and the open, during which the
+directory could be replaced with a symlink.
+
+CVE-2012-1174
+https://bugzilla.redhat.com/show_bug.cgi?id=803358
+---
+ src/util.c |3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/util.c b/src/util.c
+index 20cbc2b..dfc1dc6 100644
+--- a/src/util.c
 b/src/util.c
+@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool 
honour_sticky) {
+ if (is_dir) {
+ int subdir_fd;
+ 
+-if ((subdir_fd = openat(fd, de->d_name, 
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) {
++subdir_fd = openat(fd, de->d_name, 
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
++if (subdir_fd < 0) {
+ if (ret == 0 && errno != ENOENT)
+ ret = -errno;
+ continue;
+-- 
+1.7.9.4
+

Copied: systemd/repos/testing-i686/PKGBUILD (from rev 153638, 
systemd/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-03-17 02:01:43 UTC (rev 153639)
@@ -0,0 +1,106 @@
+# $Id$
+# Maintainer: Dave Reisner 
+
+pkgbase=systemd
+pkgname=('systemd' 'libsystemd')
+pkgver=44
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/systemd";
+license=('GPL2')
+makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
+ 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
+options=('!libtool')
+source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz";
+"os-release"
+0001-util-never-follow-symlinks-in-rm_rf_children.patch)
+md5sums=('11f44ff74c87850064e4351518bcff17'
+ '752636def0db3c03f121f8b4f44a6

[arch-commits] Commit in systemd/trunk (2 files)

2012-03-16 Thread Dave Reisner
Date: Friday, March 16, 2012 @ 22:01:24
  Author: dreisner
Revision: 153638

upgpkg: systemd 44-1

Added:
  systemd/trunk/0001-util-never-follow-symlinks-in-rm_rf_children.patch
Modified:
  systemd/trunk/PKGBUILD

-+
 0001-util-never-follow-symlinks-in-rm_rf_children.patch |   32 ++
 PKGBUILD|   18 +++
 2 files changed, 41 insertions(+), 9 deletions(-)

Added: 0001-util-never-follow-symlinks-in-rm_rf_children.patch
===
--- 0001-util-never-follow-symlinks-in-rm_rf_children.patch 
(rev 0)
+++ 0001-util-never-follow-symlinks-in-rm_rf_children.patch 2012-03-17 
02:01:24 UTC (rev 153638)
@@ -0,0 +1,32 @@
+From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt 
+Date: Fri, 2 Mar 2012 10:39:10 +0100
+Subject: [PATCH] util: never follow symlinks in rm_rf_children()
+
+The function checks if the entry is a directory before recursing, but
+there is a window between the check and the open, during which the
+directory could be replaced with a symlink.
+
+CVE-2012-1174
+https://bugzilla.redhat.com/show_bug.cgi?id=803358
+---
+ src/util.c |3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/util.c b/src/util.c
+index 20cbc2b..dfc1dc6 100644
+--- a/src/util.c
 b/src/util.c
+@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool 
honour_sticky) {
+ if (is_dir) {
+ int subdir_fd;
+ 
+-if ((subdir_fd = openat(fd, de->d_name, 
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) {
++subdir_fd = openat(fd, de->d_name, 
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
++if (subdir_fd < 0) {
+ if (ret == 0 && errno != ENOENT)
+ ret = -errno;
+ continue;
+-- 
+1.7.9.4
+

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 22:34:40 UTC (rev 153637)
+++ PKGBUILD2012-03-17 02:01:24 UTC (rev 153638)
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd')
-pkgver=43
-pkgrel=4
+pkgver=44
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd";
 license=('GPL2')
@@ -12,18 +12,18 @@
  'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
 options=('!libtool')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz";
-"os-release" "cpp-compat.patch")
-md5sums=('446cc6db7625617af67e2d8e5f503a49'
+"os-release"
+0001-util-never-follow-symlinks-in-rm_rf_children.patch)
+md5sums=('11f44ff74c87850064e4351518bcff17'
  '752636def0db3c03f121f8b4f44a63cd'
- '414968aa314ced0b0ab4b2207e46aa69')
+ 'b5863d6d4b47e2b5bda8eb57bde0d327')
 
 build() {
   cd "$pkgname-$pkgver"
-  
-  # Fix C++ compile error when including sd-login.h
-  # http://comments.gmane.org/gmane.comp.sysutils.systemd.devel/4514
-  patch -p1 -i ../cpp-compat.patch
 
+  # https://bugzilla.redhat.com/show_bug.cgi?id=803358
+  patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch"
+
   ./configure --sysconfdir=/etc \
   --libexecdir=/usr/lib \
   --libdir=/usr/lib \



[arch-commits] Commit in util-linux/repos (5 files)

2012-03-16 Thread Tom Gundersen
Date: Friday, March 16, 2012 @ 18:34:40
  Author: tomegun
Revision: 153637

db-move: moved util-linux from [testing] to [core] (x86_64)

Added:
  util-linux/repos/core-x86_64/PKGBUILD
(from rev 153631, util-linux/repos/testing-x86_64/PKGBUILD)
  util-linux/repos/core-x86_64/stable-fixes-2.21.patch
(from rev 153631, util-linux/repos/testing-x86_64/stable-fixes-2.21.patch)
Deleted:
  util-linux/repos/core-x86_64/PKGBUILD
  util-linux/repos/core-x86_64/stable-fixes-2.21.patch
  util-linux/repos/testing-x86_64/

-+
 PKGBUILD|  103 -
 stable-fixes-2.21.patch | 3032 +++---
 2 files changed, 1568 insertions(+), 1567 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 153636:153637 to see the changes.


[arch-commits] Commit in util-linux/repos (5 files)

2012-03-16 Thread Tom Gundersen
Date: Friday, March 16, 2012 @ 18:34:38
  Author: tomegun
Revision: 153636

db-move: moved util-linux from [testing] to [core] (i686)

Added:
  util-linux/repos/core-i686/PKGBUILD
(from rev 153631, util-linux/repos/testing-i686/PKGBUILD)
  util-linux/repos/core-i686/stable-fixes-2.21.patch
(from rev 153631, util-linux/repos/testing-i686/stable-fixes-2.21.patch)
Deleted:
  util-linux/repos/core-i686/PKGBUILD
  util-linux/repos/core-i686/stable-fixes-2.21.patch
  util-linux/repos/testing-i686/

-+
 PKGBUILD|  103 -
 stable-fixes-2.21.patch | 3032 +++---
 2 files changed, 1568 insertions(+), 1567 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 153635:153636 to see the changes.


[arch-commits] Commit in pcmciautils/repos (3 files)

2012-03-16 Thread Tom Gundersen
Date: Friday, March 16, 2012 @ 18:34:37
  Author: tomegun
Revision: 153635

db-move: moved pcmciautils from [testing] to [core] (x86_64)

Added:
  pcmciautils/repos/core-x86_64/PKGBUILD
(from rev 153631, pcmciautils/repos/testing-x86_64/PKGBUILD)
Deleted:
  pcmciautils/repos/core-x86_64/PKGBUILD
  pcmciautils/repos/testing-x86_64/

--+
 PKGBUILD |   56 +---
 1 file changed, 29 insertions(+), 27 deletions(-)

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2012-03-16 22:34:34 UTC (rev 153634)
+++ core-x86_64/PKGBUILD2012-03-16 22:34:37 UTC (rev 153635)
@@ -1,27 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski 
-pkgname=pcmciautils
-pkgver=018
-pkgrel=1
-pkgdesc="Utilities for inserting and removing PCMCIA cards"
-arch=(i686 x86_64)
-url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html";
-license=('GPL')
-groups=('base')
-# sysfsutils will not be required in the next release
-depends=('udev' 'sysfsutils')
-conflicts=('pcmcia-cs')
-source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${pkgver}.tar.bz2)
-options=(!makeflags)
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's,/usr/bin/install,/bin/install,g' Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('5d85669b3440baa4532363da6caaf1b4')

Copied: pcmciautils/repos/core-x86_64/PKGBUILD (from rev 153631, 
pcmciautils/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2012-03-16 22:34:37 UTC (rev 153635)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor: Tobias Powalowski 
+pkgname=pcmciautils
+pkgver=018
+pkgrel=2
+pkgdesc="Utilities for inserting and removing PCMCIA cards"
+arch=(i686 x86_64)
+url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html";
+license=('GPL')
+groups=('base')
+# sysfsutils will not be required in the next release
+depends=('udev' 'sysfsutils')
+conflicts=('pcmcia-cs')
+# 
source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2)
 broken due to breakin
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+options=(!makeflags)
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i -e 's,/usr/bin/install,/bin/install,g' Makefile
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+md5sums=('964c802994677a71b38ec56554aa229f')



[arch-commits] Commit in pcmciautils/repos (3 files)

2012-03-16 Thread Tom Gundersen
Date: Friday, March 16, 2012 @ 18:34:34
  Author: tomegun
Revision: 153634

db-move: moved pcmciautils from [testing] to [core] (i686)

Added:
  pcmciautils/repos/core-i686/PKGBUILD
(from rev 153631, pcmciautils/repos/testing-i686/PKGBUILD)
Deleted:
  pcmciautils/repos/core-i686/PKGBUILD
  pcmciautils/repos/testing-i686/

--+
 PKGBUILD |   56 +---
 1 file changed, 29 insertions(+), 27 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2012-03-16 22:34:33 UTC (rev 153633)
+++ core-i686/PKGBUILD  2012-03-16 22:34:34 UTC (rev 153634)
@@ -1,27 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski 
-pkgname=pcmciautils
-pkgver=018
-pkgrel=1
-pkgdesc="Utilities for inserting and removing PCMCIA cards"
-arch=(i686 x86_64)
-url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html";
-license=('GPL')
-groups=('base')
-# sysfsutils will not be required in the next release
-depends=('udev' 'sysfsutils')
-conflicts=('pcmcia-cs')
-source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${pkgver}.tar.bz2)
-options=(!makeflags)
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's,/usr/bin/install,/bin/install,g' Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('5d85669b3440baa4532363da6caaf1b4')

Copied: pcmciautils/repos/core-i686/PKGBUILD (from rev 153631, 
pcmciautils/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2012-03-16 22:34:34 UTC (rev 153634)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor: Tobias Powalowski 
+pkgname=pcmciautils
+pkgver=018
+pkgrel=2
+pkgdesc="Utilities for inserting and removing PCMCIA cards"
+arch=(i686 x86_64)
+url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html";
+license=('GPL')
+groups=('base')
+# sysfsutils will not be required in the next release
+depends=('udev' 'sysfsutils')
+conflicts=('pcmcia-cs')
+# 
source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2)
 broken due to breakin
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+options=(!makeflags)
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i -e 's,/usr/bin/install,/bin/install,g' Makefile
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+md5sums=('964c802994677a71b38ec56554aa229f')



[arch-commits] Commit in udev/repos (10 files)

2012-03-16 Thread Tom Gundersen
Date: Friday, March 16, 2012 @ 18:34:33
  Author: tomegun
Revision: 153633

db-move: moved udev from [testing] to [core] (x86_64)

Added:
  udev/repos/core-x86_64/0001-reinstate-TIMEOUT-handling.patch
(from rev 153631, 
udev/repos/testing-x86_64/0001-reinstate-TIMEOUT-handling.patch)
  udev/repos/core-x86_64/PKGBUILD
(from rev 153631, udev/repos/testing-x86_64/PKGBUILD)
  udev/repos/core-x86_64/initcpio-hooks-udev
(from rev 153631, udev/repos/testing-x86_64/initcpio-hooks-udev)
  udev/repos/core-x86_64/initcpio-install-udev
(from rev 153631, udev/repos/testing-x86_64/initcpio-install-udev)
  udev/repos/core-x86_64/udev.install
(from rev 153631, udev/repos/testing-x86_64/udev.install)
Deleted:
  udev/repos/core-x86_64/PKGBUILD
  udev/repos/core-x86_64/initcpio-hooks-udev
  udev/repos/core-x86_64/initcpio-install-udev
  udev/repos/core-x86_64/udev.install
  udev/repos/testing-x86_64/

---+
 0001-reinstate-TIMEOUT-handling.patch |  126 +++
 PKGBUILD  |  128 
 initcpio-hooks-udev   |   18 ++--
 initcpio-install-udev |   52 ++---
 udev.install  |  118 ++---
 5 files changed, 286 insertions(+), 156 deletions(-)

Copied: udev/repos/core-x86_64/0001-reinstate-TIMEOUT-handling.patch (from rev 
153631, udev/repos/testing-x86_64/0001-reinstate-TIMEOUT-handling.patch)
===
--- core-x86_64/0001-reinstate-TIMEOUT-handling.patch   
(rev 0)
+++ core-x86_64/0001-reinstate-TIMEOUT-handling.patch   2012-03-16 22:34:33 UTC 
(rev 153633)
@@ -0,0 +1,126 @@
+From 86617453cd78bf88d347f0e75a5be8b5ebac6c2e Mon Sep 17 00:00:00 2001
+From: Tom Gundersen 
+Date: Thu, 15 Mar 2012 02:12:43 +0100
+Subject: [PATCH] reinstate TIMEOUT= handling
+
+This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and
+57c6f8ae5f52a6e8ffc66a54966346f733dded39.
+
+Signed-off-by: Tom Gundersen 
+---
+ src/libudev-device.c  |   19 +++
+ src/libudev-private.h |1 +
+ src/udevd.c   |   13 ++---
+ 3 files changed, 30 insertions(+), 3 deletions(-)
+
+diff --git a/src/libudev-device.c b/src/libudev-device.c
+index 10f28b8..639c367 100644
+--- a/src/libudev-device.c
 b/src/libudev-device.c
+@@ -68,6 +68,7 @@ struct udev_device {
+ struct udev_list tags_list;
+ unsigned long long int seqnum;
+ unsigned long long int usec_initialized;
++int timeout;
+ int devlink_priority;
+ int refcount;
+ dev_t devnum;
+@@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct udev_device 
*udev_device, dev_t devnum)
+ return 0;
+ }
+ 
++int udev_device_get_timeout(struct udev_device *udev_device)
++{
++return udev_device->timeout;
++}
++
++static int udev_device_set_timeout(struct udev_device *udev_device, int 
timeout)
++{
++char num[32];
++
++udev_device->timeout = timeout;
++snprintf(num, sizeof(num), "%u", timeout);
++udev_device_add_property(udev_device, "TIMEOUT", num);
++return 0;
++}
++
+ const char *udev_device_get_devpath_old(struct udev_device *udev_device)
+ {
+ return udev_device->devpath_old;
+@@ -414,6 +430,8 @@ void udev_device_add_property_from_string_parse(struct 
udev_device *udev_device,
+ udev_device_set_devpath_old(udev_device, &property[12]);
+ } else if (strncmp(property, "SEQNUM=", 7) == 0) {
+ udev_device_set_seqnum(udev_device, strtoull(&property[7], 
NULL, 10));
++} else if (strncmp(property, "TIMEOUT=", 8) == 0) {
++udev_device_set_timeout(udev_device, strtoull(&property[8], 
NULL, 10));
+ } else if (strncmp(property, "IFINDEX=", 8) == 0) {
+ udev_device_set_ifindex(udev_device, strtoull(&property[8], 
NULL, 10));
+ } else if (strncmp(property, "DEVMODE=", 8) == 0) {
+@@ -599,6 +617,7 @@ struct udev_device *udev_device_new(struct udev *udev)
+ udev_list_init(udev, &udev_device->sysattr_value_list, true);
+ udev_list_init(udev, &udev_device->sysattr_list, false);
+ udev_list_init(udev, &udev_device->tags_list, true);
++udev_device->timeout = -1;
+ udev_device->watch_handle = -1;
+ /* copy global properties */
+ udev_list_entry_foreach(list_entry, 
udev_get_properties_list_entry(udev))
+diff --git a/src/libudev-private.h b/src/libudev-private.h
+index 5f5c64a..ec63b67 100644
+--- a/src/libudev-private.h
 b/src/libudev-private.h
+@@ -87,6 +87,7 @@ const char *udev_device_get_id_filename(struct udev_device 
*udev_device);
+ void udev_device_set_is_initialized(struct udev_device *udev_device);
+ int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
+ void udev_device_cleanup_tags_list(struct udev_device *

[arch-commits] Commit in udev/repos (10 files)

2012-03-16 Thread Tom Gundersen
Date: Friday, March 16, 2012 @ 18:34:32
  Author: tomegun
Revision: 153632

db-move: moved udev from [testing] to [core] (i686)

Added:
  udev/repos/core-i686/0001-reinstate-TIMEOUT-handling.patch
(from rev 153631, 
udev/repos/testing-i686/0001-reinstate-TIMEOUT-handling.patch)
  udev/repos/core-i686/PKGBUILD
(from rev 153631, udev/repos/testing-i686/PKGBUILD)
  udev/repos/core-i686/initcpio-hooks-udev
(from rev 153631, udev/repos/testing-i686/initcpio-hooks-udev)
  udev/repos/core-i686/initcpio-install-udev
(from rev 153631, udev/repos/testing-i686/initcpio-install-udev)
  udev/repos/core-i686/udev.install
(from rev 153631, udev/repos/testing-i686/udev.install)
Deleted:
  udev/repos/core-i686/PKGBUILD
  udev/repos/core-i686/initcpio-hooks-udev
  udev/repos/core-i686/initcpio-install-udev
  udev/repos/core-i686/udev.install
  udev/repos/testing-i686/

---+
 0001-reinstate-TIMEOUT-handling.patch |  126 +++
 PKGBUILD  |  128 
 initcpio-hooks-udev   |   18 ++--
 initcpio-install-udev |   52 ++---
 udev.install  |  118 ++---
 5 files changed, 286 insertions(+), 156 deletions(-)

Copied: udev/repos/core-i686/0001-reinstate-TIMEOUT-handling.patch (from rev 
153631, udev/repos/testing-i686/0001-reinstate-TIMEOUT-handling.patch)
===
--- core-i686/0001-reinstate-TIMEOUT-handling.patch 
(rev 0)
+++ core-i686/0001-reinstate-TIMEOUT-handling.patch 2012-03-16 22:34:32 UTC 
(rev 153632)
@@ -0,0 +1,126 @@
+From 86617453cd78bf88d347f0e75a5be8b5ebac6c2e Mon Sep 17 00:00:00 2001
+From: Tom Gundersen 
+Date: Thu, 15 Mar 2012 02:12:43 +0100
+Subject: [PATCH] reinstate TIMEOUT= handling
+
+This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and
+57c6f8ae5f52a6e8ffc66a54966346f733dded39.
+
+Signed-off-by: Tom Gundersen 
+---
+ src/libudev-device.c  |   19 +++
+ src/libudev-private.h |1 +
+ src/udevd.c   |   13 ++---
+ 3 files changed, 30 insertions(+), 3 deletions(-)
+
+diff --git a/src/libudev-device.c b/src/libudev-device.c
+index 10f28b8..639c367 100644
+--- a/src/libudev-device.c
 b/src/libudev-device.c
+@@ -68,6 +68,7 @@ struct udev_device {
+ struct udev_list tags_list;
+ unsigned long long int seqnum;
+ unsigned long long int usec_initialized;
++int timeout;
+ int devlink_priority;
+ int refcount;
+ dev_t devnum;
+@@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct udev_device 
*udev_device, dev_t devnum)
+ return 0;
+ }
+ 
++int udev_device_get_timeout(struct udev_device *udev_device)
++{
++return udev_device->timeout;
++}
++
++static int udev_device_set_timeout(struct udev_device *udev_device, int 
timeout)
++{
++char num[32];
++
++udev_device->timeout = timeout;
++snprintf(num, sizeof(num), "%u", timeout);
++udev_device_add_property(udev_device, "TIMEOUT", num);
++return 0;
++}
++
+ const char *udev_device_get_devpath_old(struct udev_device *udev_device)
+ {
+ return udev_device->devpath_old;
+@@ -414,6 +430,8 @@ void udev_device_add_property_from_string_parse(struct 
udev_device *udev_device,
+ udev_device_set_devpath_old(udev_device, &property[12]);
+ } else if (strncmp(property, "SEQNUM=", 7) == 0) {
+ udev_device_set_seqnum(udev_device, strtoull(&property[7], 
NULL, 10));
++} else if (strncmp(property, "TIMEOUT=", 8) == 0) {
++udev_device_set_timeout(udev_device, strtoull(&property[8], 
NULL, 10));
+ } else if (strncmp(property, "IFINDEX=", 8) == 0) {
+ udev_device_set_ifindex(udev_device, strtoull(&property[8], 
NULL, 10));
+ } else if (strncmp(property, "DEVMODE=", 8) == 0) {
+@@ -599,6 +617,7 @@ struct udev_device *udev_device_new(struct udev *udev)
+ udev_list_init(udev, &udev_device->sysattr_value_list, true);
+ udev_list_init(udev, &udev_device->sysattr_list, false);
+ udev_list_init(udev, &udev_device->tags_list, true);
++udev_device->timeout = -1;
+ udev_device->watch_handle = -1;
+ /* copy global properties */
+ udev_list_entry_foreach(list_entry, 
udev_get_properties_list_entry(udev))
+diff --git a/src/libudev-private.h b/src/libudev-private.h
+index 5f5c64a..ec63b67 100644
+--- a/src/libudev-private.h
 b/src/libudev-private.h
+@@ -87,6 +87,7 @@ const char *udev_device_get_id_filename(struct udev_device 
*udev_device);
+ void udev_device_set_is_initialized(struct udev_device *udev_device);
+ int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
+ void udev_device_cleanup_tags_list(struct udev_device *udev_device);
++int udev_device_get_

[arch-commits] Commit in (happy)

2012-03-16 Thread Thomas Dziedzic
Date: Friday, March 16, 2012 @ 14:40:43
  Author: tdziedzic
Revision: 153631

extra2community: Moving happy from extra to community

Deleted:
  happy/



[arch-commits] Commit in happy/repos (extra-x86_64)

2012-03-16 Thread Thomas Dziedzic
Date: Friday, March 16, 2012 @ 14:40:31
  Author: tdziedzic
Revision: 153630

db-remove: happy removed by tdziedzic

Deleted:
  happy/repos/extra-x86_64/



[arch-commits] Commit in happy/repos (extra-i686)

2012-03-16 Thread Thomas Dziedzic
Date: Friday, March 16, 2012 @ 14:40:21
  Author: tdziedzic
Revision: 153629

db-remove: happy removed by tdziedzic

Deleted:
  happy/repos/extra-i686/



[arch-commits] Commit in ghc/trunk (PKGBUILD)

2012-03-16 Thread Thomas Dziedzic
Date: Friday, March 16, 2012 @ 14:35:54
  Author: tdziedzic
Revision: 153628

add !makeflags to fix lots of tests, todo: figure out wtf

Modified:
  ghc/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 18:24:30 UTC (rev 153627)
+++ PKGBUILD2012-03-16 18:35:54 UTC (rev 153628)
@@ -19,6 +19,8 @@
 checkdepends=('python2')
 install='ghc.install'
 groups=('haskell')
+# keep this otherwise a lot of tests will show as unexpected failures... need 
to investigate why using -jn for n > 1 does this...
+options=('!makeflags')
 # missing rtl?
 provides=('haskell-array=0.4.0.0'
   'haskell-base=4.5.0.0'
@@ -96,7 +98,8 @@
   sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate 
testsuite/timeout/timeout.py
 
   # note: there is one test failure on i686 only: 
http://hackage.haskell.org/trac/ghc/ticket/5856
-  make THREADS=9 test
+  #make THREADS=9 test
+  make test
   # might be some failures
   #make fulltest
 }



[arch-commits] Commit in xf86-video-mga/repos (6 files)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 14:24:30
  Author: andyrtr
Revision: 153627

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  xf86-video-mga/repos/testing-i686/
  xf86-video-mga/repos/testing-i686/PKGBUILD
(from rev 153626, xf86-video-mga/trunk/PKGBUILD)
  xf86-video-mga/repos/testing-i686/git-fixes.patch
(from rev 153626, xf86-video-mga/trunk/git-fixes.patch)
  xf86-video-mga/repos/testing-x86_64/
  xf86-video-mga/repos/testing-x86_64/PKGBUILD
(from rev 153626, xf86-video-mga/trunk/PKGBUILD)
  xf86-video-mga/repos/testing-x86_64/git-fixes.patch
(from rev 153626, xf86-video-mga/trunk/git-fixes.patch)

+
 testing-i686/PKGBUILD  |   34 
 testing-i686/git-fixes.patch   | 5192 +++
 testing-x86_64/PKGBUILD|   34 
 testing-x86_64/git-fixes.patch | 5192 +++
 4 files changed, 10452 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 153626:153627 to see the changes.


[arch-commits] Commit in bftpd/repos (24 files)

2012-03-16 Thread Thomas Bächler
Date: Friday, March 16, 2012 @ 14:21:58
  Author: thomas
Revision: 153626

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  bftpd/repos/extra-i686/PKGBUILD
(from rev 153625, bftpd/trunk/PKGBUILD)
  bftpd/repos/extra-i686/bftpd.install
(from rev 153625, bftpd/trunk/bftpd.install)
  bftpd/repos/extra-i686/bftpd.logrotate
(from rev 153625, bftpd/trunk/bftpd.logrotate)
  bftpd/repos/extra-i686/bftpd.pam
(from rev 153625, bftpd/trunk/bftpd.pam)
  bftpd/repos/extra-i686/bftpd.rc
(from rev 153625, bftpd/trunk/bftpd.rc)
  bftpd/repos/extra-i686/bftpd.xinetd
(from rev 153625, bftpd/trunk/bftpd.xinetd)
  bftpd/repos/extra-x86_64/PKGBUILD
(from rev 153625, bftpd/trunk/PKGBUILD)
  bftpd/repos/extra-x86_64/bftpd.install
(from rev 153625, bftpd/trunk/bftpd.install)
  bftpd/repos/extra-x86_64/bftpd.logrotate
(from rev 153625, bftpd/trunk/bftpd.logrotate)
  bftpd/repos/extra-x86_64/bftpd.pam
(from rev 153625, bftpd/trunk/bftpd.pam)
  bftpd/repos/extra-x86_64/bftpd.rc
(from rev 153625, bftpd/trunk/bftpd.rc)
  bftpd/repos/extra-x86_64/bftpd.xinetd
(from rev 153625, bftpd/trunk/bftpd.xinetd)
Deleted:
  bftpd/repos/extra-i686/PKGBUILD
  bftpd/repos/extra-i686/bftpd.install
  bftpd/repos/extra-i686/bftpd.logrotate
  bftpd/repos/extra-i686/bftpd.pam
  bftpd/repos/extra-i686/bftpd.rc
  bftpd/repos/extra-i686/bftpd.xinetd
  bftpd/repos/extra-x86_64/PKGBUILD
  bftpd/repos/extra-x86_64/bftpd.install
  bftpd/repos/extra-x86_64/bftpd.logrotate
  bftpd/repos/extra-x86_64/bftpd.pam
  bftpd/repos/extra-x86_64/bftpd.rc
  bftpd/repos/extra-x86_64/bftpd.xinetd

--+
 extra-i686/PKGBUILD  |  112 +
 extra-i686/bftpd.install |   22 
 extra-i686/bftpd.logrotate   |   10 +--
 extra-i686/bftpd.pam |6 +-
 extra-i686/bftpd.rc  |   88 
 extra-i686/bftpd.xinetd  |   22 
 extra-x86_64/PKGBUILD|  112 +
 extra-x86_64/bftpd.install   |   22 
 extra-x86_64/bftpd.logrotate |   10 +--
 extra-x86_64/bftpd.pam   |6 +-
 extra-x86_64/bftpd.rc|   88 
 extra-x86_64/bftpd.xinetd|   22 
 12 files changed, 266 insertions(+), 254 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-16 18:21:20 UTC (rev 153625)
+++ extra-i686/PKGBUILD 2012-03-16 18:21:58 UTC (rev 153626)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Thomas Baechler 
-
-pkgname=bftpd
-pkgver=3.6
-pkgrel=1
-pkgdesc="Small, easy-to-configure FTP server"
-arch=(i686 x86_64)
-url="http://bftpd.sourceforge.net/";
-license=('GPL')
-depends=('glibc' 'pam')
-install=bftpd.install
-backup=(etc/bftpd.conf
-etc/logrotate.d/bftpd
-etc/pam.d/bftpd
-etc/xinetd.d/bftpd)
-source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz
-bftpd.rc
-bftpd.logrotate
-bftpd.pam
-bftpd.xinetd)
-md5sums=('7c45b158646e3b266530bf46778fc2d0'
- '56a1bf7738a6db2b2cff89e611f4f11a'
- '853680dad0df39d0b4d2fb43d4be430a'
- '96f82c38f3f540b53f3e5144900acf17'
- 'ff70fd962666f4d74749a1c68167a966')
-
-build() {
-  cd "${srcdir}"/$pkgname
-  # The bftpd author keeps screwing up the release tarballs
-  rm -f config.{cache,status}
-  ./configure --prefix=/usr --enable-pam --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname
-  install -d -m755 "${pkgdir}"/usr/{sbin,share/man/man8}
-  install -d -m755 "${pkgdir}"/var/log
-  install -D -m644 "${srcdir}"/bftpd.logrotate 
"${pkgdir}"/etc/logrotate.d/bftpd
-  install -D -m755 "${srcdir}"/bftpd.rc "${pkgdir}"/etc/rc.d/bftpd
-  make DESTDIR="${pkgdir}" install
-  # Remove log file and /var/run from the package
-  rm -f "${pkgdir}"/var/log/bftpd.log
-  rmdir "${pkgdir}"/var/{run/bftpd,run,log,}
-  # Install PAM file
-  mkdir -p "${pkgdir}"/etc/pam.d
-  cp "${srcdir}"/bftpd.pam "${pkgdir}"/etc/pam.d/bftpd
-  # Install xinetd file
-  install -D -m644 "${srcdir}"/bftpd.xinetd "${pkgdir}"/etc/xinetd.d/bftpd
-  # Fix default in config file
-  sed 's|#ROOTDIR="/path/for/anonymous/user"|# bftpd interprets ROOTDIR="%h" 
(the default), as ROOTDIR="/" for the anonymous user, override it\n  
ROOTDIR="/srv/ftp"|' -i "${pkgdir}"/etc/bftpd.conf
-}

Copied: bftpd/repos/extra-i686/PKGBUILD (from rev 153625, bftpd/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-16 18:21:58 UTC (rev 153626)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Thomas Bächler 
+
+pkgname=bftpd
+pkgver=3.7
+pkgrel=1
+pkgdesc="Small, easy-to-configure FTP server"
+arch=(i686 x86_64)
+url="http://bftpd.sourceforge.net/";
+license=('GPL')
+depends=('glibc' 'pam')
+install=bftpd.install
+backup=(et

[arch-commits] Commit in bftpd/trunk (PKGBUILD)

2012-03-16 Thread Thomas Bächler
Date: Friday, March 16, 2012 @ 14:21:20
  Author: thomas
Revision: 153625

upgpkg: bftpd 3.7-1: upstream update, work around Makefile screwups in this 
release

Modified:
  bftpd/trunk/PKGBUILD

--+
 PKGBUILD |   20 +---
 1 file changed, 13 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 18:19:24 UTC (rev 153624)
+++ PKGBUILD2012-03-16 18:21:20 UTC (rev 153625)
@@ -1,8 +1,8 @@
 # $Id$
-# Maintainer: Thomas Baechler 
+# Maintainer: Thomas Bächler 
 
 pkgname=bftpd
-pkgver=3.6
+pkgver=3.7
 pkgrel=1
 pkgdesc="Small, easy-to-configure FTP server"
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@
 bftpd.logrotate
 bftpd.pam
 bftpd.xinetd)
-md5sums=('7c45b158646e3b266530bf46778fc2d0'
+md5sums=('6614e25ef1864ad80d92724d03832407'
  '56a1bf7738a6db2b2cff89e611f4f11a'
  '853680dad0df39d0b4d2fb43d4be430a'
  '96f82c38f3f540b53f3e5144900acf17'
@@ -29,25 +29,31 @@
   cd "${srcdir}"/$pkgname
   # The bftpd author keeps screwing up the release tarballs
   rm -f config.{cache,status}
-  ./configure --prefix=/usr --enable-pam --mandir=/usr/share/man
+  ./configure --prefix=/usr \
+  --enable-pam \
+  --mandir=/usr/share/man \
+  --sysconfdir=/etc
   make
 }
 
 package() {
   cd "${srcdir}"/$pkgname
   install -d -m755 "${pkgdir}"/usr/{sbin,share/man/man8}
-  install -d -m755 "${pkgdir}"/var/log
   install -D -m644 "${srcdir}"/bftpd.logrotate 
"${pkgdir}"/etc/logrotate.d/bftpd
   install -D -m755 "${srcdir}"/bftpd.rc "${pkgdir}"/etc/rc.d/bftpd
   make DESTDIR="${pkgdir}" install
   # Remove log file and /var/run from the package
-  rm -f "${pkgdir}"/var/log/bftpd.log
-  rmdir "${pkgdir}"/var/{run/bftpd,run,log,}
+  # This guy keeps messing up his Makefile, /usr/var, wtf?
+  rm -f "${pkgdir}"/usr/var/log/bftpd.log
+  rmdir "${pkgdir}"/usr/var/{run/bftpd,run,log,}
   # Install PAM file
   mkdir -p "${pkgdir}"/etc/pam.d
   cp "${srcdir}"/bftpd.pam "${pkgdir}"/etc/pam.d/bftpd
   # Install xinetd file
   install -D -m644 "${srcdir}"/bftpd.xinetd "${pkgdir}"/etc/xinetd.d/bftpd
+  # Did I mention this guy keeps messing up his Makefiles?
+  mv "${pkgdir}"/usr/etc/bftpd.conf "${pkgdir}"/etc/
+  rmdir "${pkgdir}"/usr/etc
   # Fix default in config file
   sed 's|#ROOTDIR="/path/for/anonymous/user"|# bftpd interprets ROOTDIR="%h" 
(the default), as ROOTDIR="/" for the anonymous user, override it\n  
ROOTDIR="/srv/ftp"|' -i "${pkgdir}"/etc/bftpd.conf
 }



[arch-commits] Commit in xf86-video-mga/trunk (PKGBUILD git-fixes.patch)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 14:19:24
  Author: andyrtr
Revision: 153624

upgpkg: xf86-video-mga 1.4.13-6

update to latest git commits

Modified:
  xf86-video-mga/trunk/PKGBUILD
  xf86-video-mga/trunk/git-fixes.patch

-+
 PKGBUILD|6 
 git-fixes.patch | 4830 +++---
 2 files changed, 4614 insertions(+), 222 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 153623:153624 to see the changes.


[arch-commits] Commit in dovecot/repos (12 files)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 14:05:31
  Author: andyrtr
Revision: 153623

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  dovecot/repos/extra-i686/PKGBUILD
(from rev 153622, dovecot/trunk/PKGBUILD)
  dovecot/repos/extra-i686/dovecot.install
(from rev 153622, dovecot/trunk/dovecot.install)
  dovecot/repos/extra-i686/dovecot.sh
(from rev 153622, dovecot/trunk/dovecot.sh)
  dovecot/repos/extra-x86_64/PKGBUILD
(from rev 153622, dovecot/trunk/PKGBUILD)
  dovecot/repos/extra-x86_64/dovecot.install
(from rev 153622, dovecot/trunk/dovecot.install)
  dovecot/repos/extra-x86_64/dovecot.sh
(from rev 153622, dovecot/trunk/dovecot.sh)
Deleted:
  dovecot/repos/extra-i686/PKGBUILD
  dovecot/repos/extra-i686/dovecot.install
  dovecot/repos/extra-i686/dovecot.sh
  dovecot/repos/extra-x86_64/PKGBUILD
  dovecot/repos/extra-x86_64/dovecot.install
  dovecot/repos/extra-x86_64/dovecot.sh

--+
 extra-i686/PKGBUILD  |  134 +++
 extra-i686/dovecot.install   |  116 +-
 extra-i686/dovecot.sh|  138 -
 extra-x86_64/PKGBUILD|  134 +++
 extra-x86_64/dovecot.install |  116 +-
 extra-x86_64/dovecot.sh  |  138 -
 6 files changed, 388 insertions(+), 388 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-16 18:04:41 UTC (rev 153622)
+++ extra-i686/PKGBUILD 2012-03-16 18:05:31 UTC (rev 153623)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke 
-# Contributor: Paul Mattal 
-# Contributor: Federico Quagliata (quaqo) 
-# Contributor: GARETTE Emmanuel 
-
-pkgname=dovecot
-pkgver=2.1.2
-pkgrel=1
-pkgdesc="An IMAP and POP3 server written with security primarily in mind"
-arch=('i686' 'x86_64')
-url="http://dovecot.org/";
-license=("LGPL")
-depends=('krb5' 'openssl' 'sqlite3>=3.7.5' 'libmysqlclient>=5.5.10'
-'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl')
-makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene')
-optdepends=('libldap: ldap plugin'
-   'clucene: alternative FTS indexer')
-provides=('imap-server' 'pop3-server')
-options=('!libtool')
-install=$pkgname.install
-source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} 
dovecot.sh)
-md5sums=('6ab61b962ff7e732ea9faa0fa41a28cb'
- 'fb097826d991cd70894a914d01b0e2a1'
- '587159e84e2da6f83d70b3c706ba87cc')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  # configure with openssl, mysql, and postgresql support
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-   --libexecdir=/usr/lib  --with-moduledir=/usr/lib/dovecot/modules \
-   --disable-static \
-   --with-nss \
-   --with-pam \
-   --with-mysql \
-   --with-pgsql \
-   --with-sqlite \
-   --with-ssl=openssl --with-ssldir=/etc/dovecot/ssl \
-   --with-gssapi \
-   --with-ldap=plugin \
-   --with-zlib --with-bzlib \
-   --with-libcap \
-   --with-solr \
-   --with-lucene \
-   --with-docs
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-
-  # install the launch script
-  install -D -m755 ${srcdir}/$pkgname.sh ${pkgdir}/etc/rc.d/$pkgname
-
-  # install example conf files and ssl.conf
-  install -d -m755 ${pkgdir}/etc/dovecot/conf.d
-  install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/dovecot.conf 
${pkgdir}/etc/dovecot/dovecot.conf.sample
-  install -d -m755 ${pkgdir}/etc/ssl
-  install -m 644  ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf 
${pkgdir}/etc/ssl/dovecot-openssl.cnf.sample
-
-  # install mkcert helper script
-  install -m 755  ${srcdir}/$pkgname-$pkgver/doc/mkcert.sh 
${pkgdir}/usr/lib/dovecot/mkcert.sh
-
-  rm ${pkgdir}/etc/dovecot/README
-}

Copied: dovecot/repos/extra-i686/PKGBUILD (from rev 153622, 
dovecot/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-16 18:05:31 UTC (rev 153623)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Andreas Radke 
+# Contributor: Paul Mattal 
+# Contributor: Federico Quagliata (quaqo) 
+# Contributor: GARETTE Emmanuel 
+
+pkgname=dovecot
+pkgver=2.1.3
+pkgrel=1
+pkgdesc="An IMAP and POP3 server written with security primarily in mind"
+arch=('i686' 'x86_64')
+url="http://dovecot.org/";
+license=("LGPL")
+depends=('krb5' 'openssl' 'sqlite3>=3.7.5' 'libmysqlclient>=5.5.10'
+'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl')
+makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene')
+optdepends=('libldap: ldap plugin'
+   'clucene: alternative FTS indexer')
+provides=('imap-server' 'pop3-server')
+options=('!libtool')
+install=$pkgname.install
+source=

[arch-commits] Commit in dovecot/trunk (PKGBUILD)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 14:04:41
  Author: andyrtr
Revision: 153622

upgpkg: dovecot 2.1.3-1

upstream update 2.1.3

Modified:
  dovecot/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 17:56:02 UTC (rev 153621)
+++ PKGBUILD2012-03-16 18:04:41 UTC (rev 153622)
@@ -5,7 +5,7 @@
 # Contributor: GARETTE Emmanuel 
 
 pkgname=dovecot
-pkgver=2.1.2
+pkgver=2.1.3
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
@@ -20,8 +20,8 @@
 options=('!libtool')
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} 
dovecot.sh)
-md5sums=('6ab61b962ff7e732ea9faa0fa41a28cb'
- 'fb097826d991cd70894a914d01b0e2a1'
+md5sums=('a0e25243862c61de6274cf7d682a76ec'
+ '85c2737b822e095b1120e322f13ce3ad'
  '587159e84e2da6f83d70b3c706ba87cc')
 
 build() {



[arch-commits] Commit in xf86-input-synaptics/repos (6 files)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 13:56:02
  Author: andyrtr
Revision: 153621

db-move: moved xf86-input-synaptics from [testing] to [extra] (x86_64)

Added:
  xf86-input-synaptics/repos/extra-x86_64/10-synaptics.conf
(from rev 153619, 
xf86-input-synaptics/repos/testing-x86_64/10-synaptics.conf)
  xf86-input-synaptics/repos/extra-x86_64/PKGBUILD
(from rev 153619, xf86-input-synaptics/repos/testing-x86_64/PKGBUILD)
  
xf86-input-synaptics/repos/extra-x86_64/synaptics-Fix-inverted-circular-scrolling-direction.patch
(from rev 153619, 
xf86-input-synaptics/repos/testing-x86_64/synaptics-Fix-inverted-circular-scrolling-direction.patch)
Deleted:
  xf86-input-synaptics/repos/extra-x86_64/10-synaptics.conf
  xf86-input-synaptics/repos/extra-x86_64/PKGBUILD
  xf86-input-synaptics/repos/testing-x86_64/

---+
 10-synaptics.conf |   18 +-
 PKGBUILD  |   89 ++--
 synaptics-Fix-inverted-circular-scrolling-direction.patch |   40 +
 3 files changed, 95 insertions(+), 52 deletions(-)

Deleted: extra-x86_64/10-synaptics.conf
===
--- extra-x86_64/10-synaptics.conf  2012-03-16 17:56:01 UTC (rev 153620)
+++ extra-x86_64/10-synaptics.conf  2012-03-16 17:56:02 UTC (rev 153621)
@@ -1,9 +0,0 @@
-Section "InputClass"
-Identifier "touchpad catchall"
-Driver "synaptics"
-MatchIsTouchpad "on"
-MatchDevicePath "/dev/input/event*"
-Option "TapButton1" "1"
-Option "TapButton2" "2"
-Option "TapButton3" "3"
-EndSection

Copied: xf86-input-synaptics/repos/extra-x86_64/10-synaptics.conf (from rev 
153619, xf86-input-synaptics/repos/testing-x86_64/10-synaptics.conf)
===
--- extra-x86_64/10-synaptics.conf  (rev 0)
+++ extra-x86_64/10-synaptics.conf  2012-03-16 17:56:02 UTC (rev 153621)
@@ -0,0 +1,9 @@
+Section "InputClass"
+Identifier "touchpad catchall"
+Driver "synaptics"
+MatchIsTouchpad "on"
+MatchDevicePath "/dev/input/event*"
+Option "TapButton1" "1"
+Option "TapButton2" "2"
+Option "TapButton3" "3"
+EndSection

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-03-16 17:56:01 UTC (rev 153620)
+++ extra-x86_64/PKGBUILD   2012-03-16 17:56:02 UTC (rev 153621)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot 
-# Contributor: Tobias Powalowski  
-# Contributor: Thomas Bächler 
-# Contributor: Alexander Baldeck 
-
-pkgname=xf86-input-synaptics
-pkgver=1.5.99.901
-pkgrel=1
-pkgdesc="Synaptics driver for notebook touchpads"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/";
-depends=('libxtst' 'mtdev')
-makedepends=('xorg-server-devel>=1.11.99.902' 'libxi' 'libx11')
-conflicts=('xorg-server<1.11.99.902')
-replaces=('synaptics')
-provides=('synaptics')
-conflicts=('synaptics')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
-source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-10-synaptics.conf)
-sha1sums=('8836b1c2bf443b2c11f38457e203c5309698d9d0'
-  '68e1f4ef5e1038231d210eb422fa4d18c5922f0f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  rm -rf "${pkgdir}/usr/share/X11"
-}

Copied: xf86-input-synaptics/repos/extra-x86_64/PKGBUILD (from rev 153619, 
xf86-input-synaptics/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-03-16 17:56:02 UTC (rev 153621)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jan de Groot 
+# Contributor: Tobias Powalowski  
+# Contributor: Thomas Bächler 
+# Contributor: Alexander Baldeck 
+
+pkgname=xf86-input-synaptics
+pkgver=1.5.99.901
+pkgrel=2
+pkgdesc="Synaptics driver for notebook touchpads"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/";
+depends=('libxtst' 'mtdev')
+makedepends=('xorg-server-devel>=1.11.99.902' 'libxi' 'libx11')
+conflicts=('xorg-server<1.11.99.902')
+replaces=('synaptics')
+provides=('synaptics')
+conflicts=('synaptics')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
+source=(http://xorg.freedesktop.org/

[arch-commits] Commit in xf86-input-synaptics/repos (6 files)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 13:56:01
  Author: andyrtr
Revision: 153620

db-move: moved xf86-input-synaptics from [testing] to [extra] (i686)

Added:
  xf86-input-synaptics/repos/extra-i686/10-synaptics.conf
(from rev 153619, xf86-input-synaptics/repos/testing-i686/10-synaptics.conf)
  xf86-input-synaptics/repos/extra-i686/PKGBUILD
(from rev 153619, xf86-input-synaptics/repos/testing-i686/PKGBUILD)
  
xf86-input-synaptics/repos/extra-i686/synaptics-Fix-inverted-circular-scrolling-direction.patch
(from rev 153619, 
xf86-input-synaptics/repos/testing-i686/synaptics-Fix-inverted-circular-scrolling-direction.patch)
Deleted:
  xf86-input-synaptics/repos/extra-i686/10-synaptics.conf
  xf86-input-synaptics/repos/extra-i686/PKGBUILD
  xf86-input-synaptics/repos/testing-i686/

---+
 10-synaptics.conf |   18 +-
 PKGBUILD  |   89 ++--
 synaptics-Fix-inverted-circular-scrolling-direction.patch |   40 +
 3 files changed, 95 insertions(+), 52 deletions(-)

Deleted: extra-i686/10-synaptics.conf
===
--- extra-i686/10-synaptics.conf2012-03-16 17:50:36 UTC (rev 153619)
+++ extra-i686/10-synaptics.conf2012-03-16 17:56:01 UTC (rev 153620)
@@ -1,9 +0,0 @@
-Section "InputClass"
-Identifier "touchpad catchall"
-Driver "synaptics"
-MatchIsTouchpad "on"
-MatchDevicePath "/dev/input/event*"
-Option "TapButton1" "1"
-Option "TapButton2" "2"
-Option "TapButton3" "3"
-EndSection

Copied: xf86-input-synaptics/repos/extra-i686/10-synaptics.conf (from rev 
153619, xf86-input-synaptics/repos/testing-i686/10-synaptics.conf)
===
--- extra-i686/10-synaptics.conf(rev 0)
+++ extra-i686/10-synaptics.conf2012-03-16 17:56:01 UTC (rev 153620)
@@ -0,0 +1,9 @@
+Section "InputClass"
+Identifier "touchpad catchall"
+Driver "synaptics"
+MatchIsTouchpad "on"
+MatchDevicePath "/dev/input/event*"
+Option "TapButton1" "1"
+Option "TapButton2" "2"
+Option "TapButton3" "3"
+EndSection

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-16 17:50:36 UTC (rev 153619)
+++ extra-i686/PKGBUILD 2012-03-16 17:56:01 UTC (rev 153620)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot 
-# Contributor: Tobias Powalowski  
-# Contributor: Thomas Bächler 
-# Contributor: Alexander Baldeck 
-
-pkgname=xf86-input-synaptics
-pkgver=1.5.99.901
-pkgrel=1
-pkgdesc="Synaptics driver for notebook touchpads"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/";
-depends=('libxtst' 'mtdev')
-makedepends=('xorg-server-devel>=1.11.99.902' 'libxi' 'libx11')
-conflicts=('xorg-server<1.11.99.902')
-replaces=('synaptics')
-provides=('synaptics')
-conflicts=('synaptics')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
-source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-10-synaptics.conf)
-sha1sums=('8836b1c2bf443b2c11f38457e203c5309698d9d0'
-  '68e1f4ef5e1038231d210eb422fa4d18c5922f0f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  rm -rf "${pkgdir}/usr/share/X11"
-}

Copied: xf86-input-synaptics/repos/extra-i686/PKGBUILD (from rev 153619, 
xf86-input-synaptics/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-16 17:56:01 UTC (rev 153620)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jan de Groot 
+# Contributor: Tobias Powalowski  
+# Contributor: Thomas Bächler 
+# Contributor: Alexander Baldeck 
+
+pkgname=xf86-input-synaptics
+pkgver=1.5.99.901
+pkgrel=2
+pkgdesc="Synaptics driver for notebook touchpads"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/";
+depends=('libxtst' 'mtdev')
+makedepends=('xorg-server-devel>=1.11.99.902' 'libxi' 'libx11')
+conflicts=('xorg-server<1.11.99.902')
+replaces=('synaptics')
+provides=('synaptics')
+conflicts=('synaptics')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
+source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+

[arch-commits] Commit in samba/repos (13 files)

2012-03-16 Thread Stéphane Gaudreault
Date: Friday, March 16, 2012 @ 13:50:36
  Author: stephane
Revision: 153619

db-move: moved samba from [testing] to [extra] (x86_64)

Added:
  samba/repos/extra-x86_64/PKGBUILD
(from rev 153617, samba/repos/testing-x86_64/PKGBUILD)
  samba/repos/extra-x86_64/samba
(from rev 153617, samba/repos/testing-x86_64/samba)
  samba/repos/extra-x86_64/samba.conf.d
(from rev 153617, samba/repos/testing-x86_64/samba.conf.d)
  samba/repos/extra-x86_64/samba.logrotate
(from rev 153617, samba/repos/testing-x86_64/samba.logrotate)
  samba/repos/extra-x86_64/samba.pam
(from rev 153617, samba/repos/testing-x86_64/samba.pam)
  samba/repos/extra-x86_64/swat.xinetd
(from rev 153617, samba/repos/testing-x86_64/swat.xinetd)
Deleted:
  samba/repos/extra-x86_64/PKGBUILD
  samba/repos/extra-x86_64/samba
  samba/repos/extra-x86_64/samba.conf.d
  samba/repos/extra-x86_64/samba.logrotate
  samba/repos/extra-x86_64/samba.pam
  samba/repos/extra-x86_64/swat.xinetd
  samba/repos/testing-x86_64/

-+
 PKGBUILD|  306 +++---
 samba   |  114 ++--
 samba.conf.d|   14 +-
 samba.logrotate |   18 +--
 samba.pam   |6 -
 swat.xinetd |   20 +--
 6 files changed, 239 insertions(+), 239 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-03-16 17:50:34 UTC (rev 153618)
+++ extra-x86_64/PKGBUILD   2012-03-16 17:50:36 UTC (rev 153619)
@@ -1,153 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski 
-# Contributor: judd 
-pkgbase=samba
-pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=3.6.3
-# We use the 'A' to fake out pacman's version comparators.  Samba chooses
-# to append 'a','b',etc to their subsequent releases, which pamcan
-# misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.3
-pkgrel=2
-arch=(i686 x86_64)
-url="http://www.samba.org";
-license=('GPL3')
-makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 
'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb')
-source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
-samba samba.logrotate
-swat.xinetd
-samba.pam
-samba.conf.d)
-### UNINSTALL dmapi package before building!!!
-
-build() {
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  ./configure --prefix=/usr \
-  --libdir=/usr/lib/ \
-  --localstatedir=/var \
-  --with-configdir=/etc/samba \
-  --with-lockdir=/var/cache/samba \
-  --with-piddir=/var/run/samba \
-  --with-fhs \
-  --with-pam \
-  --with-pam_smbpass \
-  --with-pammodulesdir=/lib/security \
-  --with-dnsupdate \
-  --with-automount \
-  --with-quotas \
-  --with-ads \
-  --with-acl-support \
-  --with-libsmbclient \
-  --with-syslog \
-  --enable-external-libtalloc \
-  --disable-dnssd \
-  --disable-avahi \
-  
--with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
-  --enable-external-libtdb
-  make
-}
-
-package_libwbclient () {
-pkgdesc="Samba winbind client library"
-depends=('glibc')
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  mkdir -p ${pkgdir}/usr/lib  
-  for i in libwbclient*; do
-  cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
-  done
-}
-
-package_smbclient () {
-pkgdesc="Tools to access a server's filespace and printers via SMB"
-depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 
'e2fsprogs' 'tdb' 'talloc' 'libwbclient')
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
-  install -m755 
bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup}
 ${pkgdir}/usr/bin/
-  for i in libnetapi* libsmbclient*;do
-  cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
-  done
-  install -m755 script/smbtar ${pkgdir}/usr/bin/
-  mkdir -p ${pkgdir}/usr/lib/cups/backend
-  ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
-  mkdir -p ${pkgdir}/usr/include
-  install -m644 include/libsmbclient.h ${pkgdir}/usr/include/
-  install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/
-  mkdir -p ${pkgdir}/usr/share/man/man{1,7}
-  for man in rpcclient smbcacls smbclient smbcquotas smbget \
-  smbtree smbtar nmblookup; do
-  install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/
-  done
-  install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/
-}
-
-package_samba () {
-pkgdesc="Tools to access a server's filespace and printers via SMB"
-backup=(etc/logrotate.d/samba
-etc/pam.d/samba
-etc/samba/smb.conf
-etc/xinetd.d/swat
-etc/conf.d/samba)
-depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 
'krb5' 'pam' 'gamin' 'gnutls' 'e

[arch-commits] Commit in samba/repos (13 files)

2012-03-16 Thread Stéphane Gaudreault
Date: Friday, March 16, 2012 @ 13:50:34
  Author: stephane
Revision: 153618

db-move: moved samba from [testing] to [extra] (i686)

Added:
  samba/repos/extra-i686/PKGBUILD
(from rev 153617, samba/repos/testing-i686/PKGBUILD)
  samba/repos/extra-i686/samba
(from rev 153617, samba/repos/testing-i686/samba)
  samba/repos/extra-i686/samba.conf.d
(from rev 153617, samba/repos/testing-i686/samba.conf.d)
  samba/repos/extra-i686/samba.logrotate
(from rev 153617, samba/repos/testing-i686/samba.logrotate)
  samba/repos/extra-i686/samba.pam
(from rev 153617, samba/repos/testing-i686/samba.pam)
  samba/repos/extra-i686/swat.xinetd
(from rev 153617, samba/repos/testing-i686/swat.xinetd)
Deleted:
  samba/repos/extra-i686/PKGBUILD
  samba/repos/extra-i686/samba
  samba/repos/extra-i686/samba.conf.d
  samba/repos/extra-i686/samba.logrotate
  samba/repos/extra-i686/samba.pam
  samba/repos/extra-i686/swat.xinetd
  samba/repos/testing-i686/

-+
 PKGBUILD|  306 +++---
 samba   |  114 ++--
 samba.conf.d|   14 +-
 samba.logrotate |   18 +--
 samba.pam   |6 -
 swat.xinetd |   20 +--
 6 files changed, 239 insertions(+), 239 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-16 17:46:18 UTC (rev 153617)
+++ extra-i686/PKGBUILD 2012-03-16 17:50:34 UTC (rev 153618)
@@ -1,153 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski 
-# Contributor: judd 
-pkgbase=samba
-pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=3.6.3
-# We use the 'A' to fake out pacman's version comparators.  Samba chooses
-# to append 'a','b',etc to their subsequent releases, which pamcan
-# misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.3
-pkgrel=2
-arch=(i686 x86_64)
-url="http://www.samba.org";
-license=('GPL3')
-makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 
'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb')
-source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
-samba samba.logrotate
-swat.xinetd
-samba.pam
-samba.conf.d)
-### UNINSTALL dmapi package before building!!!
-
-build() {
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  ./configure --prefix=/usr \
-  --libdir=/usr/lib/ \
-  --localstatedir=/var \
-  --with-configdir=/etc/samba \
-  --with-lockdir=/var/cache/samba \
-  --with-piddir=/var/run/samba \
-  --with-fhs \
-  --with-pam \
-  --with-pam_smbpass \
-  --with-pammodulesdir=/lib/security \
-  --with-dnsupdate \
-  --with-automount \
-  --with-quotas \
-  --with-ads \
-  --with-acl-support \
-  --with-libsmbclient \
-  --with-syslog \
-  --enable-external-libtalloc \
-  --disable-dnssd \
-  --disable-avahi \
-  
--with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
-  --enable-external-libtdb
-  make
-}
-
-package_libwbclient () {
-pkgdesc="Samba winbind client library"
-depends=('glibc')
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  mkdir -p ${pkgdir}/usr/lib  
-  for i in libwbclient*; do
-  cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
-  done
-}
-
-package_smbclient () {
-pkgdesc="Tools to access a server's filespace and printers via SMB"
-depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 
'e2fsprogs' 'tdb' 'talloc' 'libwbclient')
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
-  install -m755 
bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup}
 ${pkgdir}/usr/bin/
-  for i in libnetapi* libsmbclient*;do
-  cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
-  done
-  install -m755 script/smbtar ${pkgdir}/usr/bin/
-  mkdir -p ${pkgdir}/usr/lib/cups/backend
-  ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
-  mkdir -p ${pkgdir}/usr/include
-  install -m644 include/libsmbclient.h ${pkgdir}/usr/include/
-  install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/
-  mkdir -p ${pkgdir}/usr/share/man/man{1,7}
-  for man in rpcclient smbcacls smbclient smbcquotas smbget \
-  smbtree smbtar nmblookup; do
-  install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/
-  done
-  install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/
-}
-
-package_samba () {
-pkgdesc="Tools to access a server's filespace and printers via SMB"
-backup=(etc/logrotate.d/samba
-etc/pam.d/samba
-etc/samba/smb.conf
-etc/xinetd.d/swat
-etc/conf.d/samba)
-depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 
'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
-  cd ${srcdir}/samba-${_realver

[arch-commits] Commit in krb5/repos (12 files)

2012-03-16 Thread Stéphane Gaudreault
Date: Friday, March 16, 2012 @ 13:46:18
  Author: stephane
Revision: 153617

db-move: moved krb5 from [testing] to [core] (x86_64)

Added:
  krb5/repos/core-x86_64/PKGBUILD
(from rev 153615, krb5/repos/testing-x86_64/PKGBUILD)
  krb5/repos/core-x86_64/krb5-kadmind
(from rev 153615, krb5/repos/testing-x86_64/krb5-kadmind)
  krb5/repos/core-x86_64/krb5-kdc
(from rev 153615, krb5/repos/testing-x86_64/krb5-kdc)
  krb5/repos/core-x86_64/krb5-kpropd
(from rev 153615, krb5/repos/testing-x86_64/krb5-kpropd)
Deleted:
  krb5/repos/core-x86_64/PKGBUILD
  krb5/repos/core-x86_64/krb5-1.9.1-2011-007.patch
  krb5/repos/core-x86_64/krb5-1.9.1-canonicalize-fallback.patch
  krb5/repos/core-x86_64/krb5-1.9.1-config-script.patch
  krb5/repos/core-x86_64/krb5-kadmind
  krb5/repos/core-x86_64/krb5-kdc
  krb5/repos/core-x86_64/krb5-kpropd
  krb5/repos/testing-x86_64/

+
 PKGBUILD   |  161 +--
 krb5-1.9.1-2011-007.patch  |   40 ---
 krb5-1.9.1-canonicalize-fallback.patch |   58 ---
 krb5-1.9.1-config-script.patch |   27 -
 krb5-kadmind   |   80 +++
 krb5-kdc   |   80 +++
 krb5-kpropd|   80 +++
 7 files changed, 191 insertions(+), 335 deletions(-)

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2012-03-16 17:46:16 UTC (rev 153616)
+++ core-x86_64/PKGBUILD2012-03-16 17:46:18 UTC (rev 153617)
@@ -1,90 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault 
-
-pkgname=krb5
-pkgver=1.9.2
-pkgrel=2
-pkgdesc="The Kerberos network authentication system"
-arch=('i686' 'x86_64')
-url="http://web.mit.edu/kerberos/";
-license=('custom')
-depends=('e2fsprogs' 'libldap' 'keyutils')
-makedepends=('perl')
-provides=('heimdal')
-replaces=('heimdal')
-conflicts=('heimdal')
-backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
-source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
-krb5-kadmind
-krb5-kdc
-krb5-kpropd
-krb5-1.9.1-config-script.patch
-krb5-1.9.1-2011-007.patch)
-sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92'
-  '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
-  '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
-  '7f402078fa65bb9ff1beb6c017450df78560'
-  '7342410760cf44bfa01bb99bb4c49e12496cb46f'
-  'ec917dd1d1c96fa331f512331d5aa37c2e9b9df7')
-options=('!emptydirs')
-
-build() {
-   tar zxvf ${pkgname}-${pkgver}.tar.gz
-   cd "${srcdir}/${pkgname}-${pkgver}/src"
-
-   # - Make krb5-config suppress CFLAGS output when called with --libs
-   #   cf https://bugzilla.redhat.com/show_bug.cgi?id=544391
-   #
-   # - Omit extra libraries because their interfaces are not exposed to 
applications
-   #   by libkrb5, unless do_deps is set to 1, which indicates that the caller
-   #   wants the whole list.
-   #
-   #   Patch from upstream :
-   #   
http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236
-   patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch
-
-   # Apply upstream patch to fix a null pointer dereference when processing 
TGS requests
-   # CVE-2011-1530
-   # see http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-007.txt
-   patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-007.patch
-
-   # FS#25384
-   sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
-
-   export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
-   export CPPFLAGS+=" -I/usr/include/et"
-   ./configure --prefix=/usr \
-   --mandir=/usr/share/man \
-   --localstatedir=/var/lib \
-   --enable-shared \
-   --with-system-et \
-   --with-system-ss \
-   --disable-rpath \
-   --without-tcl \
-   --enable-dns-for-realm \
-   --with-ldap
-   make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}/src"
-   make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" 
install
-
-   # Sample KDC config file
-   install -dm 755 "${pkgdir}"/var/lib/krb5kdc
-   install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf
-
-   # Default configuration file
-   install -dm 755 "${pkgdir}"/etc
-   install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
-
-   install -dm 755 "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kdc  "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kadmind  "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kpropd   "${pkgdir}"/etc/rc.d
-
-   install -dm 755 "${pkgdir}"/usr/share/aclocal
-   install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal
-
-   install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: krb5/repos/core-x86_64/PKG

[arch-commits] Commit in krb5/repos (12 files)

2012-03-16 Thread Stéphane Gaudreault
Date: Friday, March 16, 2012 @ 13:46:16
  Author: stephane
Revision: 153616

db-move: moved krb5 from [testing] to [core] (i686)

Added:
  krb5/repos/core-i686/PKGBUILD
(from rev 153615, krb5/repos/testing-i686/PKGBUILD)
  krb5/repos/core-i686/krb5-kadmind
(from rev 153615, krb5/repos/testing-i686/krb5-kadmind)
  krb5/repos/core-i686/krb5-kdc
(from rev 153615, krb5/repos/testing-i686/krb5-kdc)
  krb5/repos/core-i686/krb5-kpropd
(from rev 153615, krb5/repos/testing-i686/krb5-kpropd)
Deleted:
  krb5/repos/core-i686/PKGBUILD
  krb5/repos/core-i686/krb5-1.9.1-2011-007.patch
  krb5/repos/core-i686/krb5-1.9.1-canonicalize-fallback.patch
  krb5/repos/core-i686/krb5-1.9.1-config-script.patch
  krb5/repos/core-i686/krb5-kadmind
  krb5/repos/core-i686/krb5-kdc
  krb5/repos/core-i686/krb5-kpropd
  krb5/repos/testing-i686/

+
 PKGBUILD   |  161 +--
 krb5-1.9.1-2011-007.patch  |   40 ---
 krb5-1.9.1-canonicalize-fallback.patch |   58 ---
 krb5-1.9.1-config-script.patch |   27 -
 krb5-kadmind   |   80 +++
 krb5-kdc   |   80 +++
 krb5-kpropd|   80 +++
 7 files changed, 191 insertions(+), 335 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2012-03-16 17:16:34 UTC (rev 153615)
+++ core-i686/PKGBUILD  2012-03-16 17:46:16 UTC (rev 153616)
@@ -1,90 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault 
-
-pkgname=krb5
-pkgver=1.9.2
-pkgrel=2
-pkgdesc="The Kerberos network authentication system"
-arch=('i686' 'x86_64')
-url="http://web.mit.edu/kerberos/";
-license=('custom')
-depends=('e2fsprogs' 'libldap' 'keyutils')
-makedepends=('perl')
-provides=('heimdal')
-replaces=('heimdal')
-conflicts=('heimdal')
-backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
-source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
-krb5-kadmind
-krb5-kdc
-krb5-kpropd
-krb5-1.9.1-config-script.patch
-krb5-1.9.1-2011-007.patch)
-sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92'
-  '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
-  '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
-  '7f402078fa65bb9ff1beb6c017450df78560'
-  '7342410760cf44bfa01bb99bb4c49e12496cb46f'
-  'ec917dd1d1c96fa331f512331d5aa37c2e9b9df7')
-options=('!emptydirs')
-
-build() {
-   tar zxvf ${pkgname}-${pkgver}.tar.gz
-   cd "${srcdir}/${pkgname}-${pkgver}/src"
-
-   # - Make krb5-config suppress CFLAGS output when called with --libs
-   #   cf https://bugzilla.redhat.com/show_bug.cgi?id=544391
-   #
-   # - Omit extra libraries because their interfaces are not exposed to 
applications
-   #   by libkrb5, unless do_deps is set to 1, which indicates that the caller
-   #   wants the whole list.
-   #
-   #   Patch from upstream :
-   #   
http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236
-   patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch
-
-   # Apply upstream patch to fix a null pointer dereference when processing 
TGS requests
-   # CVE-2011-1530
-   # see http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-007.txt
-   patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-007.patch
-
-   # FS#25384
-   sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
-
-   export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
-   export CPPFLAGS+=" -I/usr/include/et"
-   ./configure --prefix=/usr \
-   --mandir=/usr/share/man \
-   --localstatedir=/var/lib \
-   --enable-shared \
-   --with-system-et \
-   --with-system-ss \
-   --disable-rpath \
-   --without-tcl \
-   --enable-dns-for-realm \
-   --with-ldap
-   make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}/src"
-   make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" 
install
-
-   # Sample KDC config file
-   install -dm 755 "${pkgdir}"/var/lib/krb5kdc
-   install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf
-
-   # Default configuration file
-   install -dm 755 "${pkgdir}"/etc
-   install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
-
-   install -dm 755 "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kdc  "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kadmind  "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kpropd   "${pkgdir}"/etc/rc.d
-
-   install -dm 755 "${pkgdir}"/usr/share/aclocal
-   install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal
-
-   install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE 
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: krb5/repos/core-i686/PKGBUILD (from rev 153615, 
krb5/repos/testing-i686/PKGBU

[arch-commits] Commit in linux/repos (19 files)

2012-03-16 Thread Tobias Powalowski
Date: Friday, March 16, 2012 @ 13:16:34
  Author: tpowa
Revision: 153615

db-move: moved linux from [testing] to [core] (x86_64)

Added:
  linux/repos/core-x86_64/PKGBUILD
(from rev 153613, linux/repos/testing-x86_64/PKGBUILD)
  linux/repos/core-x86_64/change-default-console-loglevel.patch
(from rev 153613, 
linux/repos/testing-x86_64/change-default-console-loglevel.patch)
  linux/repos/core-x86_64/config
(from rev 153613, linux/repos/testing-x86_64/config)
  linux/repos/core-x86_64/config.x86_64
(from rev 153613, linux/repos/testing-x86_64/config.x86_64)
  linux/repos/core-x86_64/ext4-options.patch
(from rev 153613, linux/repos/testing-x86_64/ext4-options.patch)
  linux/repos/core-x86_64/i915-fix-ghost-tv-output.patch
(from rev 153613, linux/repos/testing-x86_64/i915-fix-ghost-tv-output.patch)
  linux/repos/core-x86_64/i915-gpu-finish.patch
(from rev 153613, linux/repos/testing-x86_64/i915-gpu-finish.patch)
  linux/repos/core-x86_64/linux.install
(from rev 153613, linux/repos/testing-x86_64/linux.install)
  linux/repos/core-x86_64/linux.preset
(from rev 153613, linux/repos/testing-x86_64/linux.preset)
Deleted:
  linux/repos/core-x86_64/PKGBUILD
  linux/repos/core-x86_64/change-default-console-loglevel.patch
  linux/repos/core-x86_64/config
  linux/repos/core-x86_64/config.x86_64
  linux/repos/core-x86_64/ext4-options.patch
  linux/repos/core-x86_64/i915-fix-ghost-tv-output.patch
  linux/repos/core-x86_64/i915-gpu-finish.patch
  linux/repos/core-x86_64/linux.install
  linux/repos/core-x86_64/linux.preset
  linux/repos/testing-x86_64/

---+
 PKGBUILD  |  606 -
 change-default-console-loglevel.patch |   24 
 config|11758 
 config.x86_64 |11276 +++---
 ext4-options.patch|   98 
 i915-fix-ghost-tv-output.patch|   52 
 i915-gpu-finish.patch |  110 
 linux.install |  124 
 linux.preset  |   28 
 9 files changed, 12038 insertions(+), 12038 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 153614:153615 to see the changes.


[arch-commits] Commit in linux/repos (19 files)

2012-03-16 Thread Tobias Powalowski
Date: Friday, March 16, 2012 @ 13:16:32
  Author: tpowa
Revision: 153614

db-move: moved linux from [testing] to [core] (i686)

Added:
  linux/repos/core-i686/PKGBUILD
(from rev 153613, linux/repos/testing-i686/PKGBUILD)
  linux/repos/core-i686/change-default-console-loglevel.patch
(from rev 153613, 
linux/repos/testing-i686/change-default-console-loglevel.patch)
  linux/repos/core-i686/config
(from rev 153613, linux/repos/testing-i686/config)
  linux/repos/core-i686/config.x86_64
(from rev 153613, linux/repos/testing-i686/config.x86_64)
  linux/repos/core-i686/ext4-options.patch
(from rev 153613, linux/repos/testing-i686/ext4-options.patch)
  linux/repos/core-i686/i915-fix-ghost-tv-output.patch
(from rev 153613, linux/repos/testing-i686/i915-fix-ghost-tv-output.patch)
  linux/repos/core-i686/i915-gpu-finish.patch
(from rev 153613, linux/repos/testing-i686/i915-gpu-finish.patch)
  linux/repos/core-i686/linux.install
(from rev 153613, linux/repos/testing-i686/linux.install)
  linux/repos/core-i686/linux.preset
(from rev 153613, linux/repos/testing-i686/linux.preset)
Deleted:
  linux/repos/core-i686/PKGBUILD
  linux/repos/core-i686/change-default-console-loglevel.patch
  linux/repos/core-i686/config
  linux/repos/core-i686/config.x86_64
  linux/repos/core-i686/ext4-options.patch
  linux/repos/core-i686/i915-fix-ghost-tv-output.patch
  linux/repos/core-i686/i915-gpu-finish.patch
  linux/repos/core-i686/linux.install
  linux/repos/core-i686/linux.preset
  linux/repos/testing-i686/

---+
 PKGBUILD  |  606 -
 change-default-console-loglevel.patch |   24 
 config|11758 
 config.x86_64 |11276 +++---
 ext4-options.patch|   98 
 i915-fix-ghost-tv-output.patch|   52 
 i915-gpu-finish.patch |  110 
 linux.install |  124 
 linux.preset  |   28 
 9 files changed, 12038 insertions(+), 12038 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 153613:153614 to see the changes.


[arch-commits] Commit in xf86-input-mouse/repos (4 files)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 13:12:24
  Author: andyrtr
Revision: 153613

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xf86-input-mouse/repos/extra-i686/PKGBUILD
(from rev 153612, xf86-input-mouse/trunk/PKGBUILD)
  xf86-input-mouse/repos/extra-x86_64/PKGBUILD
(from rev 153612, xf86-input-mouse/trunk/PKGBUILD)
Deleted:
  xf86-input-mouse/repos/extra-i686/PKGBUILD
  xf86-input-mouse/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   60 
 extra-x86_64/PKGBUILD |   60 
 2 files changed, 60 insertions(+), 60 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-16 17:11:48 UTC (rev 153612)
+++ extra-i686/PKGBUILD 2012-03-16 17:12:24 UTC (rev 153613)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot 
-
-pkgname=xf86-input-mouse
-pkgver=1.7.1
-pkgrel=3
-pkgdesc="X.org mouse input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/";
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: xf86-input-mouse/repos/extra-i686/PKGBUILD (from rev 153612, 
xf86-input-mouse/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-16 17:12:24 UTC (rev 153613)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot 
+
+pkgname=xf86-input-mouse
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="X.org mouse input driver"
+arch=(i686 x86_64)
+license=('custom')
+url="http://xorg.freedesktop.org/";
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.11.99.902')
+conflicts=('xorg-server<1.11.99.902')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('0da6390c6f3d7d636110a52f08193739929ae4ae')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-03-16 17:11:48 UTC (rev 153612)
+++ extra-x86_64/PKGBUILD   2012-03-16 17:12:24 UTC (rev 153613)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot 
-
-pkgname=xf86-input-mouse
-pkgver=1.7.1
-pkgrel=3
-pkgdesc="X.org mouse input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/";
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: xf86-input-mouse/repos/extra-x86_64/PKGBUILD (from rev 153612, 
xf86-input-mouse/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-03-16 17:12:24 UTC (rev 153613)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot 
+
+pkgname=xf86-input-mouse
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="X.org mouse input driver"
+arch=(i686 x86_64)
+license=('custom')
+url="http://xorg.freedesktop.org/";
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.11.99.902')
+conflicts=('xorg-server<1.11.99.902')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('0da6390c6f3d7d636110a52f08193739929ae4ae')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/lic

[arch-commits] Commit in xf86-input-mouse/trunk (PKGBUILD)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 13:11:48
  Author: andyrtr
Revision: 153612

upgpkg: xf86-input-mouse 1.7.2-1

upstream update 1.7.2

Modified:
  xf86-input-mouse/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 17:10:15 UTC (rev 153611)
+++ PKGBUILD2012-03-16 17:11:48 UTC (rev 153612)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot 
 
 pkgname=xf86-input-mouse
-pkgver=1.7.1
-pkgrel=3
+pkgver=1.7.2
+pkgrel=1
 pkgdesc="X.org mouse input driver"
 arch=(i686 x86_64)
 license=('custom')
@@ -14,7 +14,7 @@
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed')
+sha1sums=('0da6390c6f3d7d636110a52f08193739929ae4ae')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"



[arch-commits] Commit in xproto/repos/extra-any (PKGBUILD PKGBUILD)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 13:10:15
  Author: andyrtr
Revision: 153611

archrelease: copy trunk to extra-any

Added:
  xproto/repos/extra-any/PKGBUILD
(from rev 153610, xproto/trunk/PKGBUILD)
Deleted:
  xproto/repos/extra-any/PKGBUILD

--+
 PKGBUILD |   52 ++--
 1 file changed, 26 insertions(+), 26 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2012-03-16 17:09:53 UTC (rev 153610)
+++ PKGBUILD2012-03-16 17:10:15 UTC (rev 153611)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot 
-
-pkgname=xproto
-pkgver=7.0.22
-pkgrel=1
-pkgdesc="X11 core wire protocol and auxiliary headers"
-arch=(any)
-license=('custom')
-url="http://xorg.freedesktop.org/";
-makedepends=('xorg-util-macros')
-source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('96d9b37d15591412a94dd0d3620008e20ef500ca')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: xproto/repos/extra-any/PKGBUILD (from rev 153610, xproto/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2012-03-16 17:10:15 UTC (rev 153611)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Jan de Groot 
+
+pkgname=xproto
+pkgver=7.0.23
+pkgrel=1
+pkgdesc="X11 core wire protocol and auxiliary headers"
+arch=(any)
+license=('custom')
+url="http://xorg.freedesktop.org/";
+makedepends=('xorg-util-macros')
+source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('5d7f00d1dbe6cf8e725841ef663f0ee2491ba5b2')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}



[arch-commits] Commit in xproto/trunk (PKGBUILD)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 13:09:53
  Author: andyrtr
Revision: 153610

upgpkg: xproto 7.0.23-1

upstream update 7.0.23

Modified:
  xproto/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 17:09:01 UTC (rev 153609)
+++ PKGBUILD2012-03-16 17:09:53 UTC (rev 153610)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=xproto
-pkgver=7.0.22
+pkgver=7.0.23
 pkgrel=1
 pkgdesc="X11 core wire protocol and auxiliary headers"
 arch=(any)
@@ -10,7 +10,7 @@
 url="http://xorg.freedesktop.org/";
 makedepends=('xorg-util-macros')
 source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('96d9b37d15591412a94dd0d3620008e20ef500ca')
+sha1sums=('5d7f00d1dbe6cf8e725841ef663f0ee2491ba5b2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"



[arch-commits] Commit in libxt/repos (6 files)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 13:09:01
  Author: andyrtr
Revision: 153609

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libxt/repos/extra-i686/PKGBUILD
(from rev 153608, libxt/trunk/PKGBUILD)
  libxt/repos/extra-x86_64/PKGBUILD
(from rev 153608, libxt/trunk/PKGBUILD)
Deleted:
  libxt/repos/extra-i686/PKGBUILD
  
libxt/repos/extra-i686/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff
  libxt/repos/extra-x86_64/PKGBUILD
  
libxt/repos/extra-x86_64/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff

---+
 extra-i686/PKGBUILD   
|   62 --
 extra-i686/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff   
|   40 --
 extra-x86_64/PKGBUILD 
|   62 --
 extra-x86_64/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff 
|   40 --
 4 files changed, 58 insertions(+), 146 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-16 17:08:24 UTC (rev 153608)
+++ extra-i686/PKGBUILD 2012-03-16 17:09:01 UTC (rev 153609)
@@ -1,33 +0,0 @@
-# $Id$
-#Maintainer: Jan de Groot 
-
-pkgname=libxt
-pkgver=1.1.2
-pkgrel=2
-pkgdesc="X11 toolkit intrinsics library"
-arch=('i686' 'x86_64')
-url="http://xorg.freedesktop.org/";
-license=('custom')
-depends=('libsm' 'libx11')
-makedepends=('xorg-util-macros')
-options=('!libtool')
-source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2"
-Revert_treat_unexpected_returned_events_from_poll_as_errors.diff)
-sha1sums=('9e84b807419d78bda4acbd7aea05aed2ab0556cf'
-  'bebadf4b90f6a49530b5600a12a9385253e0daa6')
-
-build() {
-  cd "${srcdir}/libXt-${pkgver}"
-  # revert broken commit, see https://bugs.archlinux.org/task/28844 + 
https://bugs.archlinux.org/task/28875 + 
https://bugs.freedesktop.org/show_bug.cgi?id=47203
-  patch -Np1 -R -i 
${srcdir}/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/libXt-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: libxt/repos/extra-i686/PKGBUILD (from rev 153608, libxt/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-16 17:09:01 UTC (rev 153609)
@@ -0,0 +1,29 @@
+# $Id$
+#Maintainer: Jan de Groot 
+
+pkgname=libxt
+pkgver=1.1.3
+pkgrel=1
+pkgdesc="X11 toolkit intrinsics library"
+arch=('i686' 'x86_64')
+url="http://xorg.freedesktop.org/";
+license=('custom')
+depends=('libsm' 'libx11')
+makedepends=('xorg-util-macros')
+options=('!libtool')
+source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2")
+sha1sums=('2cef068bc4d7170e31b89b5c06aeaf4451a7699a')
+
+build() {
+  cd "${srcdir}/libXt-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/libXt-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Deleted: 
extra-i686/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff
===
--- extra-i686/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff 
2012-03-16 17:08:24 UTC (rev 153608)
+++ extra-i686/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff 
2012-03-16 17:09:01 UTC (rev 153609)
@@ -1,40 +0,0 @@
-From 70bb9e28d37fff4ead4d0a2c672af77059765fa4 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston 
-Date: Wed, 04 Jan 2012 18:33:29 +
-Subject: Treat unexpected returned events from poll as errors
-
-Inspired by libxcb's f0565e8f06aadf760a9065a97b8cf5ab9cbd18de
-
-Resolves https://bugs.freedesktop.org/show_bug.cgi?id=20048
-
-Signed-off-by: Jeremy Huddleston 

-diff --git a/src/NextEvent.c b/src/NextEvent.c
-index b1f7bc7..c8c9dd5 100644
 a/src/NextEvent.c
-+++ b/src/NextEvent.c
-@@ -356,7 +356,21 @@ static int IoWait (
- return Select (wf->nfds, &wf->rmask, &wf->wmask, &wf->emask,
-  wt->wait_time_ptr);
- #else
--return poll (wf->fdlist, wf->fdlistlen, wt->poll_wait);
-+int ret = poll (wf->fdlist, wf->fdlistlen, wt->poll_wait);
-+/* If poll() returns an event we didn't expect, such as POLLNVAL, treat
-+ * it as if it failed. */
-+if(ret >= 0) {
-+nfds_t i;
-+for (i=0; i < wf->fdlistlen; i++) {
-+struct pollfd *fd = &wf->fdlist[i];
-+if (fd->revents & ~fd->events) {
-+ret = -1;
-+ 

[arch-commits] Commit in libxt/trunk (2 files)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 13:08:24
  Author: andyrtr
Revision: 153608

upgpkg: libxt 1.1.3-1

upstream update 1.1.3

Modified:
  libxt/trunk/PKGBUILD
Deleted:
  libxt/trunk/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff

--+
 PKGBUILD |   12 +--
 Revert_treat_unexpected_returned_events_from_poll_as_errors.diff |   40 
--
 2 files changed, 4 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 17:04:23 UTC (rev 153607)
+++ PKGBUILD2012-03-16 17:08:24 UTC (rev 153608)
@@ -2,8 +2,8 @@
 #Maintainer: Jan de Groot 
 
 pkgname=libxt
-pkgver=1.1.2
-pkgrel=2
+pkgver=1.1.3
+pkgrel=1
 pkgdesc="X11 toolkit intrinsics library"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/";
@@ -11,15 +11,11 @@
 depends=('libsm' 'libx11')
 makedepends=('xorg-util-macros')
 options=('!libtool')
-source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2"
-Revert_treat_unexpected_returned_events_from_poll_as_errors.diff)
-sha1sums=('9e84b807419d78bda4acbd7aea05aed2ab0556cf'
-  'bebadf4b90f6a49530b5600a12a9385253e0daa6')
+source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2")
+sha1sums=('2cef068bc4d7170e31b89b5c06aeaf4451a7699a')
 
 build() {
   cd "${srcdir}/libXt-${pkgver}"
-  # revert broken commit, see https://bugs.archlinux.org/task/28844 + 
https://bugs.archlinux.org/task/28875 + 
https://bugs.freedesktop.org/show_bug.cgi?id=47203
-  patch -Np1 -R -i 
${srcdir}/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }

Deleted: Revert_treat_unexpected_returned_events_from_poll_as_errors.diff
===
--- Revert_treat_unexpected_returned_events_from_poll_as_errors.diff
2012-03-16 17:04:23 UTC (rev 153607)
+++ Revert_treat_unexpected_returned_events_from_poll_as_errors.diff
2012-03-16 17:08:24 UTC (rev 153608)
@@ -1,40 +0,0 @@
-From 70bb9e28d37fff4ead4d0a2c672af77059765fa4 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston 
-Date: Wed, 04 Jan 2012 18:33:29 +
-Subject: Treat unexpected returned events from poll as errors
-
-Inspired by libxcb's f0565e8f06aadf760a9065a97b8cf5ab9cbd18de
-
-Resolves https://bugs.freedesktop.org/show_bug.cgi?id=20048
-
-Signed-off-by: Jeremy Huddleston 

-diff --git a/src/NextEvent.c b/src/NextEvent.c
-index b1f7bc7..c8c9dd5 100644
 a/src/NextEvent.c
-+++ b/src/NextEvent.c
-@@ -356,7 +356,21 @@ static int IoWait (
- return Select (wf->nfds, &wf->rmask, &wf->wmask, &wf->emask,
-  wt->wait_time_ptr);
- #else
--return poll (wf->fdlist, wf->fdlistlen, wt->poll_wait);
-+int ret = poll (wf->fdlist, wf->fdlistlen, wt->poll_wait);
-+/* If poll() returns an event we didn't expect, such as POLLNVAL, treat
-+ * it as if it failed. */
-+if(ret >= 0) {
-+nfds_t i;
-+for (i=0; i < wf->fdlistlen; i++) {
-+struct pollfd *fd = &wf->fdlist[i];
-+if (fd->revents & ~fd->events) {
-+ret = -1;
-+errno = EIO;
-+break;
-+}
-+}
-+}
-+return ret;
- #endif
- }
- 
---
-cgit v0.9.0.2-2-gbebe



[arch-commits] Commit in libx11/repos (12 files)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 13:04:23
  Author: andyrtr
Revision: 153607

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libx11/repos/extra-i686/PKGBUILD
(from rev 153606, libx11/trunk/PKGBUILD)
  libx11/repos/extra-i686/xorg.csh
(from rev 153606, libx11/trunk/xorg.csh)
  libx11/repos/extra-i686/xorg.sh
(from rev 153606, libx11/trunk/xorg.sh)
  libx11/repos/extra-x86_64/PKGBUILD
(from rev 153606, libx11/trunk/PKGBUILD)
  libx11/repos/extra-x86_64/xorg.csh
(from rev 153606, libx11/trunk/xorg.csh)
  libx11/repos/extra-x86_64/xorg.sh
(from rev 153606, libx11/trunk/xorg.sh)
Deleted:
  libx11/repos/extra-i686/PKGBUILD
  libx11/repos/extra-i686/xorg.csh
  libx11/repos/extra-i686/xorg.sh
  libx11/repos/extra-x86_64/PKGBUILD
  libx11/repos/extra-x86_64/xorg.csh
  libx11/repos/extra-x86_64/xorg.sh

---+
 extra-i686/PKGBUILD   |   82 
 extra-i686/xorg.csh   |   30 -
 extra-i686/xorg.sh|   30 -
 extra-x86_64/PKGBUILD |   82 
 extra-x86_64/xorg.csh |   30 -
 extra-x86_64/xorg.sh  |   30 -
 6 files changed, 142 insertions(+), 142 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-16 17:03:38 UTC (rev 153606)
+++ extra-i686/PKGBUILD 2012-03-16 17:04:23 UTC (rev 153607)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot 
-
-pkgname=libx11
-pkgver=1.4.99.1
-pkgrel=1
-pkgdesc="X11 client-side library"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/";
-depends=('libxcb' 'xproto' 'kbproto')
-makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto')
-options=('!libtool')
-license=('custom')
-source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2
-xorg.sh
-xorg.csh)
-sha1sums=('317e0112926926a52c13f56f71c1ec9e4540cf4d '
-  '4b756387426afb2a5bb7a155631ec42348abf5c1'
-  '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8')
-
-build() {
-  cd "${srcdir}/libX11-${pkgver}"
-  ./configure --prefix=/usr --disable-static --disable-xf86bigfont
-  make
-}
-
-package() {
-  cd "${srcdir}/libX11-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/libX11-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/profile.d"
-  install -m755 "${srcdir}/"xorg.{sh,csh} "${pkgdir}/etc/profile.d/"
-
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: libx11/repos/extra-i686/PKGBUILD (from rev 153606, 
libx11/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-16 17:04:23 UTC (rev 153607)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Jan de Groot 
+
+pkgname=libx11
+pkgver=1.4.99.901
+pkgrel=1
+pkgdesc="X11 client-side library"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/";
+depends=('libxcb' 'xproto' 'kbproto')
+makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto')
+options=('!libtool')
+license=('custom')
+source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2
+xorg.sh
+xorg.csh)
+sha1sums=('af10b064c1c64ee9e7daae0a7f1f9719eb7e965a'
+  '4b756387426afb2a5bb7a155631ec42348abf5c1'
+  '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8')
+
+build() {
+  cd "${srcdir}/libX11-${pkgver}"
+  ./configure --prefix=/usr --disable-static --disable-xf86bigfont
+  make
+}
+
+package() {
+  cd "${srcdir}/libX11-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/libX11-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/etc/profile.d"
+  install -m755 "${srcdir}/"xorg.{sh,csh} "${pkgdir}/etc/profile.d/"
+
+  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Deleted: extra-i686/xorg.csh
===
--- extra-i686/xorg.csh 2012-03-16 17:03:38 UTC (rev 153606)
+++ extra-i686/xorg.csh 2012-03-16 17:04:23 UTC (rev 153607)
@@ -1,15 +0,0 @@
-setenv XDG_DATA_HOME ${HOME}/.local/share
-setenv XDG_CONFIG_HOME ${HOME}/.config
-setenv XDG_CACHE_HOME ${HOME}/.cache
-
-if (! ($?XDG_DATA_DIRS) ) then
-   setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/
-else
-   setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/:${XDG_DATA_DIRS}
-endif
-
-if (! ($?XDG_CONFIG_DIRS) ) then
-   setenv XDG_CONFIG_DIRS /etc/xdg
-else
-   setenv XDG_CONFIG_DIRS /etc/xdg:${XDG_CONFIG_DIRS}
-endif

Copied: libx11/repos/extra-i686/xorg.csh (from rev 153606, 
libx11/trunk/xorg.csh)
===
--- extra-i686/xorg.csh (rev 0)
+++ extra-i686/xorg.csh 2012-03-16 17:04:23 UTC (rev 153607)
@

[arch-commits] Commit in libx11/trunk (PKGBUILD)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 13:03:38
  Author: andyrtr
Revision: 153606

upgpkg: libx11 1.4.99.901-1

upstream update 1.4.99.901

Modified:
  libx11/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 15:27:06 UTC (rev 153605)
+++ PKGBUILD2012-03-16 17:03:38 UTC (rev 153606)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=libx11
-pkgver=1.4.99.1
+pkgver=1.4.99.901
 pkgrel=1
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@
 source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2
 xorg.sh
 xorg.csh)
-sha1sums=('317e0112926926a52c13f56f71c1ec9e4540cf4d '
+sha1sums=('af10b064c1c64ee9e7daae0a7f1f9719eb7e965a'
   '4b756387426afb2a5bb7a155631ec42348abf5c1'
   '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8')
 



[arch-commits] Commit in libreoffice-i18n/repos (4 files)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 11:27:06
  Author: andyrtr
Revision: 153605

db-move: moved libreoffice-i18n from [testing] to [extra] (any)

Added:
  libreoffice-i18n/repos/extra-any/PKGBUILD
(from rev 153602, libreoffice-i18n/repos/testing-any/PKGBUILD)
Deleted:
  libreoffice-i18n/repos/extra-any/PKGBUILD
  libreoffice-i18n/repos/extra-any/PKGBUILD_newstable
  libreoffice-i18n/repos/testing-any/

+
 PKGBUILD   | 3037 +--
 PKGBUILD_newstable | 1521 -
 2 files changed, 1516 insertions(+), 3042 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 153604:153605 to see the changes.


[arch-commits] Commit in libreoffice/repos (16 files)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 11:27:04
  Author: andyrtr
Revision: 153604

db-move: moved libreoffice from [testing] to [extra] (x86_64)

Added:
  libreoffice/repos/extra-x86_64/PKGBUILD
(from rev 153602, libreoffice/repos/testing-x86_64/PKGBUILD)
  libreoffice/repos/extra-x86_64/buildfix_boost.diff
(from rev 153602, libreoffice/repos/testing-x86_64/buildfix_boost.diff)
  libreoffice/repos/extra-x86_64/buildfix_ct2n.diff
(from rev 153602, libreoffice/repos/testing-x86_64/buildfix_ct2n.diff)
  libreoffice/repos/extra-x86_64/gcc462_buildfix.diff
(from rev 153602, libreoffice/repos/testing-x86_64/gcc462_buildfix.diff)
  libreoffice/repos/extra-x86_64/libreoffice.install
(from rev 153602, libreoffice/repos/testing-x86_64/libreoffice.install)
  libreoffice/repos/extra-x86_64/scp2-more-reasonable-file-access-rights.diff
(from rev 153602, 
libreoffice/repos/testing-x86_64/scp2-more-reasonable-file-access-rights.diff)
  libreoffice/repos/extra-x86_64/vbahelper.visibility.patch
(from rev 153602, 
libreoffice/repos/testing-x86_64/vbahelper.visibility.patch)
Deleted:
  libreoffice/repos/extra-x86_64/PKGBUILD
  libreoffice/repos/extra-x86_64/PKGBUILD.next_stable
  libreoffice/repos/extra-x86_64/buildfix_boost.diff
  libreoffice/repos/extra-x86_64/buildfix_ct2n.diff
  libreoffice/repos/extra-x86_64/gcc462_buildfix.diff
  libreoffice/repos/extra-x86_64/libreoffice.install
  libreoffice/repos/extra-x86_64/scp2-more-reasonable-file-access-rights.diff
  libreoffice/repos/extra-x86_64/vbahelper.visibility.patch
  libreoffice/repos/testing-x86_64/

--+
 PKGBUILD | 1579 ++---
 PKGBUILD.next_stable |  631 -
 buildfix_boost.diff  |   80 -
 buildfix_ct2n.diff   |   34 
 gcc462_buildfix.diff |  276 ++--
 libreoffice.install  |   97 -
 scp2-more-reasonable-file-access-rights.diff |   30 
 vbahelper.visibility.patch   |   66 -
 8 files changed, 952 insertions(+), 1841 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 153603:153604 to see the changes.


[arch-commits] Commit in libreoffice/repos (16 files)

2012-03-16 Thread andyrtr
Date: Friday, March 16, 2012 @ 11:27:01
  Author: andyrtr
Revision: 153603

db-move: moved libreoffice from [testing] to [extra] (i686)

Added:
  libreoffice/repos/extra-i686/PKGBUILD
(from rev 153602, libreoffice/repos/testing-i686/PKGBUILD)
  libreoffice/repos/extra-i686/buildfix_boost.diff
(from rev 153602, libreoffice/repos/testing-i686/buildfix_boost.diff)
  libreoffice/repos/extra-i686/buildfix_ct2n.diff
(from rev 153602, libreoffice/repos/testing-i686/buildfix_ct2n.diff)
  libreoffice/repos/extra-i686/gcc462_buildfix.diff
(from rev 153602, libreoffice/repos/testing-i686/gcc462_buildfix.diff)
  libreoffice/repos/extra-i686/libreoffice.install
(from rev 153602, libreoffice/repos/testing-i686/libreoffice.install)
  libreoffice/repos/extra-i686/scp2-more-reasonable-file-access-rights.diff
(from rev 153602, 
libreoffice/repos/testing-i686/scp2-more-reasonable-file-access-rights.diff)
  libreoffice/repos/extra-i686/vbahelper.visibility.patch
(from rev 153602, libreoffice/repos/testing-i686/vbahelper.visibility.patch)
Deleted:
  libreoffice/repos/extra-i686/PKGBUILD
  libreoffice/repos/extra-i686/PKGBUILD.next_stable
  libreoffice/repos/extra-i686/buildfix_boost.diff
  libreoffice/repos/extra-i686/buildfix_ct2n.diff
  libreoffice/repos/extra-i686/gcc462_buildfix.diff
  libreoffice/repos/extra-i686/libreoffice.install
  libreoffice/repos/extra-i686/scp2-more-reasonable-file-access-rights.diff
  libreoffice/repos/extra-i686/vbahelper.visibility.patch
  libreoffice/repos/testing-i686/

--+
 PKGBUILD | 1579 ++---
 PKGBUILD.next_stable |  631 -
 buildfix_boost.diff  |   80 -
 buildfix_ct2n.diff   |   34 
 gcc462_buildfix.diff |  276 ++--
 libreoffice.install  |   97 -
 scp2-more-reasonable-file-access-rights.diff |   30 
 vbahelper.visibility.patch   |   66 -
 8 files changed, 952 insertions(+), 1841 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 153602:153603 to see the changes.


[arch-commits] Commit in ghc/trunk (PKGBUILD)

2012-03-16 Thread Thomas Dziedzic
Date: Friday, March 16, 2012 @ 11:12:36
  Author: tdziedzic
Revision: 153602

happy is not needed for the src distribution build

Modified:
  ghc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 15:10:42 UTC (rev 153601)
+++ PKGBUILD2012-03-16 15:12:36 UTC (rev 153602)
@@ -15,7 +15,7 @@
 license=('custom')
 # libffi might be needed in the future: 
http://hackage.haskell.org/trac/ghc/ticket/4496
 depends=('perl' 'gmp>=5.0' 'gcc') # 'libffi')
-makedepends=('ghc' 'happy' 'perl' 'libxslt' 'docbook-xsl')
+makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl')
 checkdepends=('python2')
 install='ghc.install'
 groups=('haskell')



[arch-commits] Commit in e2fsprogs/repos (9 files)

2012-03-16 Thread Ronald van Haren
Date: Friday, March 16, 2012 @ 11:10:42
  Author: ronald
Revision: 153601

db-move: moved e2fsprogs from [testing] to [core] (x86_64)

Added:
  e2fsprogs/repos/core-x86_64/MIT-LICENSE
(from rev 153599, e2fsprogs/repos/testing-x86_64/MIT-LICENSE)
  e2fsprogs/repos/core-x86_64/PKGBUILD
(from rev 153599, e2fsprogs/repos/testing-x86_64/PKGBUILD)
  e2fsprogs/repos/core-x86_64/e2fsprogs.install
(from rev 153599, e2fsprogs/repos/testing-x86_64/e2fsprogs.install)
  e2fsprogs/repos/core-x86_64/mke2fs.conf
(from rev 153599, e2fsprogs/repos/testing-x86_64/mke2fs.conf)
Deleted:
  e2fsprogs/repos/core-x86_64/MIT-LICENSE
  e2fsprogs/repos/core-x86_64/PKGBUILD
  e2fsprogs/repos/core-x86_64/e2fsprogs.install
  e2fsprogs/repos/core-x86_64/mke2fs.conf
  e2fsprogs/repos/testing-x86_64/

---+
 MIT-LICENSE   |   50 +--
 PKGBUILD  |   95 ++--
 e2fsprogs.install |   40 ++---
 mke2fs.conf   |   52 ++--
 4 files changed, 119 insertions(+), 118 deletions(-)

Deleted: core-x86_64/MIT-LICENSE
===
--- core-x86_64/MIT-LICENSE 2012-03-16 15:10:41 UTC (rev 153600)
+++ core-x86_64/MIT-LICENSE 2012-03-16 15:10:42 UTC (rev 153601)
@@ -1,25 +0,0 @@
-Copyright (c) 2003-2007 Theodore Ts'o 
-Copyright (c) 1997-2003 Yann Dirson 
-Copyright (c) 2001 Alcove 
-Copyright (c) 1997 Klee Dienes
-Copyright (c) 1995-1996 Michael Nonweiler 
-
-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.

Copied: e2fsprogs/repos/core-x86_64/MIT-LICENSE (from rev 153599, 
e2fsprogs/repos/testing-x86_64/MIT-LICENSE)
===
--- core-x86_64/MIT-LICENSE (rev 0)
+++ core-x86_64/MIT-LICENSE 2012-03-16 15:10:42 UTC (rev 153601)
@@ -0,0 +1,25 @@
+Copyright (c) 2003-2007 Theodore Ts'o 
+Copyright (c) 1997-2003 Yann Dirson 
+Copyright (c) 2001 Alcove 
+Copyright (c) 1997 Klee Dienes
+Copyright (c) 1995-1996 Michael Nonweiler 
+
+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.

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2012-03-16 15:10:41 UTC (rev 153600)
+++ core-x86_64/PKGBUILD2012-03-16 15:10:42 UTC (rev 153601)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren  
-# Contributor: judd 
-
-pkgname=e2fsprogs
-pkgver=1.42
-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-ng')
-makedepends=('bc')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz";
-'MIT-LICENSE')
-backup=('etc/mke2fs.conf')
-install=${pkgname}.install
-sha1sums=('e69bc63bc319e4d1e4242cc278bfd442a60646e6'
-

[arch-commits] Commit in e2fsprogs/repos (9 files)

2012-03-16 Thread Ronald van Haren
Date: Friday, March 16, 2012 @ 11:10:41
  Author: ronald
Revision: 153600

db-move: moved e2fsprogs from [testing] to [core] (i686)

Added:
  e2fsprogs/repos/core-i686/MIT-LICENSE
(from rev 153599, e2fsprogs/repos/testing-i686/MIT-LICENSE)
  e2fsprogs/repos/core-i686/PKGBUILD
(from rev 153599, e2fsprogs/repos/testing-i686/PKGBUILD)
  e2fsprogs/repos/core-i686/e2fsprogs.install
(from rev 153599, e2fsprogs/repos/testing-i686/e2fsprogs.install)
  e2fsprogs/repos/core-i686/mke2fs.conf
(from rev 153599, e2fsprogs/repos/testing-i686/mke2fs.conf)
Deleted:
  e2fsprogs/repos/core-i686/MIT-LICENSE
  e2fsprogs/repos/core-i686/PKGBUILD
  e2fsprogs/repos/core-i686/e2fsprogs.install
  e2fsprogs/repos/core-i686/mke2fs.conf
  e2fsprogs/repos/testing-i686/

---+
 MIT-LICENSE   |   50 +--
 PKGBUILD  |   95 ++--
 e2fsprogs.install |   40 ++---
 mke2fs.conf   |   52 ++--
 4 files changed, 119 insertions(+), 118 deletions(-)

Deleted: core-i686/MIT-LICENSE
===
--- core-i686/MIT-LICENSE   2012-03-16 14:50:09 UTC (rev 153599)
+++ core-i686/MIT-LICENSE   2012-03-16 15:10:41 UTC (rev 153600)
@@ -1,25 +0,0 @@
-Copyright (c) 2003-2007 Theodore Ts'o 
-Copyright (c) 1997-2003 Yann Dirson 
-Copyright (c) 2001 Alcove 
-Copyright (c) 1997 Klee Dienes
-Copyright (c) 1995-1996 Michael Nonweiler 
-
-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.

Copied: e2fsprogs/repos/core-i686/MIT-LICENSE (from rev 153599, 
e2fsprogs/repos/testing-i686/MIT-LICENSE)
===
--- core-i686/MIT-LICENSE   (rev 0)
+++ core-i686/MIT-LICENSE   2012-03-16 15:10:41 UTC (rev 153600)
@@ -0,0 +1,25 @@
+Copyright (c) 2003-2007 Theodore Ts'o 
+Copyright (c) 1997-2003 Yann Dirson 
+Copyright (c) 2001 Alcove 
+Copyright (c) 1997 Klee Dienes
+Copyright (c) 1995-1996 Michael Nonweiler 
+
+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.

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2012-03-16 14:50:09 UTC (rev 153599)
+++ core-i686/PKGBUILD  2012-03-16 15:10:41 UTC (rev 153600)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren  
-# Contributor: judd 
-
-pkgname=e2fsprogs
-pkgver=1.42
-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-ng')
-makedepends=('bc')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz";
-'MIT-LICENSE')
-backup=('etc/mke2fs.conf')
-install=${pkgname}.install
-sha1sums=('e69bc63bc319e4d1e4242cc278bfd442a60646e6'
-  'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')
-b

[arch-commits] Commit in kdebindings-python/repos (4 files)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 10:50:09
  Author: andrea
Revision: 153599

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  kdebindings-python/repos/extra-i686/PKGBUILD
(from rev 153598, kdebindings-python/trunk/PKGBUILD)
  kdebindings-python/repos/extra-x86_64/PKGBUILD
(from rev 153598, kdebindings-python/trunk/PKGBUILD)
Deleted:
  kdebindings-python/repos/extra-i686/PKGBUILD
  kdebindings-python/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |  136 
 extra-x86_64/PKGBUILD |  136 
 2 files changed, 136 insertions(+), 136 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-16 14:20:47 UTC (rev 153598)
+++ extra-i686/PKGBUILD 2012-03-16 14:50:09 UTC (rev 153599)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino 
-
-pkgbase=kdebindings-python
-pkgname=('kdebindings-python'
- 'kdebindings-python2')
-pkgver=4.8.1
-pkgrel=2
-url='http://kde.org/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 
'qscintilla')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz";)
-sha1sums=('b9ef35269d2e08578ba20d01822dbdbed72bffb8')
-
-build() {
-  export PYTHONDONTWRITEBYTECODE="TRUE"
-
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../pykde4-${pkgver} \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr \
--DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0
-  make
-  cd ..
-
-  mkdir build-python2
-  cd build-python2
-  cmake ../pykde4-${pkgver} \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr \
--DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package_kdebindings-python() {
-  desc="A set of Python 3.x bindings for KDE"
-  depends=('kdepim-runtime' 'pyqt' 'qscintilla')
-
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-python2() {
-  desc="A set of Python 2.x bindings for KDE"
-  depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-  conflicts=('kdebindings-python<4.8.1-2')
- 
-  cd "${srcdir}"/build-python2
-  make DESTDIR="${pkgdir}" install
-
-  # Fix conflicts
-  rm "${pkgdir}"/usr/bin/pykdeuic4
-  ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
-"${pkgdir}"/usr/bin/python2-pykdeuic4
-
-  mv "${pkgdir}"/usr/share/apps/pykde4/examples \
-"${pkgdir}"/usr/share/apps/pykde4/python2-examples
-
-  mv "${pkgdir}"/usr/share/sip/PyKDE4 \
-"${pkgdir}"/usr/share/sip/python2-PyKDE4
-
-  # Use the python2 executable
-  find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env 
python|#!/usr/bin/env python2|'
-}

Copied: kdebindings-python/repos/extra-i686/PKGBUILD (from rev 153598, 
kdebindings-python/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-16 14:50:09 UTC (rev 153599)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+
+pkgbase=kdebindings-python
+pkgname=('kdebindings-python'
+ 'kdebindings-python2')
+pkgver=4.8.1
+pkgrel=3
+url='http://kde.org/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 
'qscintilla')
+source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz";)
+sha1sums=('b9ef35269d2e08578ba20d01822dbdbed72bffb8')
+
+build() {
+  export PYTHONDONTWRITEBYTECODE="TRUE"
+
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../pykde4-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0
+  make
+  cd ..
+
+  mkdir build-python2
+  cd build-python2
+  cmake ../pykde4-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DPYTHON_EXECUTABLE=/usr/bin/python2
+  make
+}
+
+package_kdebindings-python() {
+  pkgdesc="A set of Python 3.x bindings for KDE"
+  depends=('kdepim-runtime' 'pyqt' 'qscintilla')
+
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
+
+package_kdebindings-python2() {
+  pkgdesc="A set of Python 2.x bindings for KDE"
+  depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
+  conflicts=('kdebindings-python<4.8.1-2')
+ 
+  cd "${srcdir}"/build-python2
+  make DESTDIR="${pkgdir}" install
+
+  # Fix conflicts
+  rm "${pkgdir}"/usr/bin/pykdeuic4
+  ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
+"${pkgdir}"/usr/bin/python2-pykdeuic4
+
+  mv "${pkgdir}"/usr/share/apps/pykde4/examples \
+"${pkgdir}"/usr/share/apps/pykde4/python2-examples
+
+  mv "${pkgdir}"/usr/share/sip/PyKDE4 \
+"${pkgdir}"/usr/share/sip/python2-PyKDE4
+
+  # Use the python2 executable
+  find "${pkgdir}" -name '*.py' | xargs sed

[arch-commits] Commit in kdebindings-python/trunk (PKGBUILD)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 10:20:47
  Author: andrea
Revision: 153598

Fix description

Modified:
  kdebindings-python/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 13:00:51 UTC (rev 153597)
+++ PKGBUILD2012-03-16 14:20:47 UTC (rev 153598)
@@ -5,7 +5,7 @@
 pkgname=('kdebindings-python'
  'kdebindings-python2')
 pkgver=4.8.1
-pkgrel=2
+pkgrel=3
 url='http://kde.org/'
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
@@ -37,7 +37,7 @@
 }
 
 package_kdebindings-python() {
-  desc="A set of Python 3.x bindings for KDE"
+  pkgdesc="A set of Python 3.x bindings for KDE"
   depends=('kdepim-runtime' 'pyqt' 'qscintilla')
 
   cd "${srcdir}"/build
@@ -45,7 +45,7 @@
 }
 
 package_kdebindings-python2() {
-  desc="A set of Python 2.x bindings for KDE"
+  pkgdesc="A set of Python 2.x bindings for KDE"
   depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
   conflicts=('kdebindings-python<4.8.1-2')
  



[arch-commits] Commit in iptraf-ng/repos (4 files)

2012-03-16 Thread Ionut Biru
Date: Friday, March 16, 2012 @ 09:00:51
  Author: ibiru
Revision: 153597

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  iptraf-ng/repos/extra-i686/PKGBUILD
(from rev 153596, iptraf-ng/trunk/PKGBUILD)
  iptraf-ng/repos/extra-x86_64/PKGBUILD
(from rev 153596, iptraf-ng/trunk/PKGBUILD)
Deleted:
  iptraf-ng/repos/extra-i686/PKGBUILD
  iptraf-ng/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   61 +++-
 extra-x86_64/PKGBUILD |   61 +++-
 2 files changed, 60 insertions(+), 62 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-16 12:59:34 UTC (rev 153596)
+++ extra-i686/PKGBUILD 2012-03-16 13:00:51 UTC (rev 153597)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru 
-# Maintainer: sh0 
-
-pkgname=iptraf-ng
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="A console-based network monitoring utility (a fork of original 
iptraf)"
-url="https://fedorahosted.org/iptraf-ng/";
-arch=('i686' 'x86_64')
-depends=('ncurses')
-license=('GPL2')
-replaces=('iptraf')
-options=('!libtool')
-source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('a48c30c186aafc1e8921b611236b732b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed s/ncurses5-config/ncursesw5-config/ -i configure.ac
-  autoreconf -fi
-  ./configure --prefix=/usr --sysconfdir=/etc \
-  --localstatedir=/var
-  make CFLAGS="$CFLAGS"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR=$pkgdir install
-  install -dm755 "$pkgdir/var/lib/iptraf"
-}

Copied: iptraf-ng/repos/extra-i686/PKGBUILD (from rev 153596, 
iptraf-ng/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-16 13:00:51 UTC (rev 153597)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Ionut Biru 
+# Maintainer: sh0 
+
+pkgname=iptraf-ng
+pkgver=1.1.1
+pkgrel=2
+pkgdesc="A console-based network monitoring utility (a fork of original 
iptraf)"
+url="https://fedorahosted.org/iptraf-ng/";
+arch=('i686' 'x86_64')
+depends=('ncurses')
+license=('GPL2')
+replaces=('iptraf')
+options=('!libtool')
+source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('a48c30c186aafc1e8921b611236b732b')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed s/ncurses5-config/ncursesw5-config/ -i configure.ac
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc \
+  --localstatedir=/var
+  make CFLAGS="$CFLAGS"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR=$pkgdir install
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-03-16 12:59:34 UTC (rev 153596)
+++ extra-x86_64/PKGBUILD   2012-03-16 13:00:51 UTC (rev 153597)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru 
-# Maintainer: sh0 
-
-pkgname=iptraf-ng
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="A console-based network monitoring utility (a fork of original 
iptraf)"
-url="https://fedorahosted.org/iptraf-ng/";
-arch=('i686' 'x86_64')
-depends=('ncurses')
-license=('GPL2')
-replaces=('iptraf')
-options=('!libtool')
-source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('a48c30c186aafc1e8921b611236b732b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed s/ncurses5-config/ncursesw5-config/ -i configure.ac
-  autoreconf -fi
-  ./configure --prefix=/usr --sysconfdir=/etc \
-  --localstatedir=/var
-  make CFLAGS="$CFLAGS"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR=$pkgdir install
-  install -dm755 "$pkgdir/var/lib/iptraf"
-}

Copied: iptraf-ng/repos/extra-x86_64/PKGBUILD (from rev 153596, 
iptraf-ng/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-03-16 13:00:51 UTC (rev 153597)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Ionut Biru 
+# Maintainer: sh0 
+
+pkgname=iptraf-ng
+pkgver=1.1.1
+pkgrel=2
+pkgdesc="A console-based network monitoring utility (a fork of original 
iptraf)"
+url="https://fedorahosted.org/iptraf-ng/";
+arch=('i686' 'x86_64')
+depends=('ncurses')
+license=('GPL2')
+replaces=('iptraf')
+options=('!libtool')
+source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('a48c30c186aafc1e8921b611236b732b')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed s/ncurses5-config/ncursesw5-config/ -i configure.ac
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc \
+  --localstatedir=/var
+  make CFLAGS="$CFLAGS"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR=$pkgdir install
+}



[arch-commits] Commit in iptraf-ng/trunk (PKGBUILD)

2012-03-16 Thread Ionut Biru
Date: Friday, March 16, 2012 @ 08:59:34
  Author: ibiru
Revision: 153596

this directory is not needed anymore. FS#28944

Modified:
  iptraf-ng/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 11:45:06 UTC (rev 153595)
+++ PKGBUILD2012-03-16 12:59:34 UTC (rev 153596)
@@ -4,7 +4,7 @@
 
 pkgname=iptraf-ng
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A console-based network monitoring utility (a fork of original 
iptraf)"
 url="https://fedorahosted.org/iptraf-ng/";
 arch=('i686' 'x86_64')
@@ -27,5 +27,4 @@
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR=$pkgdir install
-  install -dm755 "$pkgdir/var/lib/iptraf"
 }



[arch-commits] Commit in kdesdk/repos (40 files)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 07:45:06
  Author: andrea
Revision: 153595

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  kdesdk/repos/extra-i686/PKGBUILD
(from rev 153594, kdesdk/trunk/PKGBUILD)
  kdesdk/repos/extra-i686/fix-python2-path.patch
(from rev 153594, kdesdk/trunk/fix-python2-path.patch)
  kdesdk/repos/extra-i686/kdesdk-cervisia.install
(from rev 153594, kdesdk/trunk/kdesdk-cervisia.install)
  kdesdk/repos/extra-i686/kdesdk-kcachegrind.install
(from rev 153594, kdesdk/trunk/kdesdk-kcachegrind.install)
  kdesdk/repos/extra-i686/kdesdk-kompare.install
(from rev 153594, kdesdk/trunk/kdesdk-kompare.install)
  kdesdk/repos/extra-i686/kdesdk-kuiviewer.install
(from rev 153594, kdesdk/trunk/kdesdk-kuiviewer.install)
  kdesdk/repos/extra-i686/kdesdk-lokalize.install
(from rev 153594, kdesdk/trunk/kdesdk-lokalize.install)
  kdesdk/repos/extra-i686/kdesdk-okteta.install
(from rev 153594, kdesdk/trunk/kdesdk-okteta.install)
  kdesdk/repos/extra-i686/kdesdk-umbrello.install
(from rev 153594, kdesdk/trunk/kdesdk-umbrello.install)
  kdesdk/repos/extra-i686/kdesdk.install
(from rev 153594, kdesdk/trunk/kdesdk.install)
  kdesdk/repos/extra-x86_64/PKGBUILD
(from rev 153594, kdesdk/trunk/PKGBUILD)
  kdesdk/repos/extra-x86_64/fix-python2-path.patch
(from rev 153594, kdesdk/trunk/fix-python2-path.patch)
  kdesdk/repos/extra-x86_64/kdesdk-cervisia.install
(from rev 153594, kdesdk/trunk/kdesdk-cervisia.install)
  kdesdk/repos/extra-x86_64/kdesdk-kcachegrind.install
(from rev 153594, kdesdk/trunk/kdesdk-kcachegrind.install)
  kdesdk/repos/extra-x86_64/kdesdk-kompare.install
(from rev 153594, kdesdk/trunk/kdesdk-kompare.install)
  kdesdk/repos/extra-x86_64/kdesdk-kuiviewer.install
(from rev 153594, kdesdk/trunk/kdesdk-kuiviewer.install)
  kdesdk/repos/extra-x86_64/kdesdk-lokalize.install
(from rev 153594, kdesdk/trunk/kdesdk-lokalize.install)
  kdesdk/repos/extra-x86_64/kdesdk-okteta.install
(from rev 153594, kdesdk/trunk/kdesdk-okteta.install)
  kdesdk/repos/extra-x86_64/kdesdk-umbrello.install
(from rev 153594, kdesdk/trunk/kdesdk-umbrello.install)
  kdesdk/repos/extra-x86_64/kdesdk.install
(from rev 153594, kdesdk/trunk/kdesdk.install)
Deleted:
  kdesdk/repos/extra-i686/PKGBUILD
  kdesdk/repos/extra-i686/fix-python2-path.patch
  kdesdk/repos/extra-i686/kdesdk-cervisia.install
  kdesdk/repos/extra-i686/kdesdk-kcachegrind.install
  kdesdk/repos/extra-i686/kdesdk-kompare.install
  kdesdk/repos/extra-i686/kdesdk-kuiviewer.install
  kdesdk/repos/extra-i686/kdesdk-lokalize.install
  kdesdk/repos/extra-i686/kdesdk-okteta.install
  kdesdk/repos/extra-i686/kdesdk-umbrello.install
  kdesdk/repos/extra-i686/kdesdk.install
  kdesdk/repos/extra-x86_64/PKGBUILD
  kdesdk/repos/extra-x86_64/fix-python2-path.patch
  kdesdk/repos/extra-x86_64/kdesdk-cervisia.install
  kdesdk/repos/extra-x86_64/kdesdk-kcachegrind.install
  kdesdk/repos/extra-x86_64/kdesdk-kompare.install
  kdesdk/repos/extra-x86_64/kdesdk-kuiviewer.install
  kdesdk/repos/extra-x86_64/kdesdk-lokalize.install
  kdesdk/repos/extra-x86_64/kdesdk-okteta.install
  kdesdk/repos/extra-x86_64/kdesdk-umbrello.install
  kdesdk/repos/extra-x86_64/kdesdk.install

-+
 extra-i686/PKGBUILD |  524 +++---
 extra-i686/fix-python2-path.patch   |   64 +--
 extra-i686/kdesdk-cervisia.install  |   24 -
 extra-i686/kdesdk-kcachegrind.install   |   24 -
 extra-i686/kdesdk-kompare.install   |   24 -
 extra-i686/kdesdk-kuiviewer.install |   24 -
 extra-i686/kdesdk-lokalize.install  |   24 -
 extra-i686/kdesdk-okteta.install|   24 -
 extra-i686/kdesdk-umbrello.install  |   24 -
 extra-i686/kdesdk.install   |   22 -
 extra-x86_64/PKGBUILD   |  524 +++---
 extra-x86_64/fix-python2-path.patch |   64 +--
 extra-x86_64/kdesdk-cervisia.install|   24 -
 extra-x86_64/kdesdk-kcachegrind.install |   24 -
 extra-x86_64/kdesdk-kompare.install |   24 -
 extra-x86_64/kdesdk-kuiviewer.install   |   24 -
 extra-x86_64/kdesdk-lokalize.install|   24 -
 extra-x86_64/kdesdk-okteta.install  |   24 -
 extra-x86_64/kdesdk-umbrello.install|   24 -
 extra-x86_64/kdesdk.install |   22 -
 20 files changed, 778 insertions(+), 778 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 153594:153595 to see the changes.


[arch-commits] Commit in kdesdk/trunk (PKGBUILD)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 07:29:59
  Author: andrea
Revision: 153594

kdebindings-python has been renamed

Modified:
  kdesdk/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 10:49:54 UTC (rev 153593)
+++ PKGBUILD2012-03-16 11:29:59 UTC (rev 153594)
@@ -23,7 +23,7 @@
  'kdesdk-strigi-analyzer'
  'kdesdk-umbrello')
 pkgver=4.8.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -183,7 +183,7 @@
 
 package_kdesdk-lokalize() {
pkgdesc='Computer-Aided Translation System'
-   depends=('kdebase-runtime' 'kdebindings-python')
+   depends=('kdebase-runtime' 'kdebindings-python2')
url="http://kde.org/applications/development/lokalize/";
optdepends=('translate-toolkit: enable extra python script')
install='kdesdk-lokalize.install'



[arch-commits] Commit in libffado/trunk (PKGBUILD)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 06:49:54
  Author: andrea
Revision: 153593

pkgname is python2-pyqt

Modified:
  libffado/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 10:49:23 UTC (rev 153592)
+++ PKGBUILD2012-03-16 10:49:54 UTC (rev 153593)
@@ -12,9 +12,9 @@
 license=('GPL')
 depends=('libiec61883' 'libavc1394' 'libsigc++'
   'libxml++' 'alsa-lib' 'dbus')
-makedepends=('scons' 'python2-qt')
+makedepends=('scons' 'python2-pyqt')
 optdepends=('python2: ffado-diag'
-'python2-qt: mixer applet')
+'python2-pyqt: mixer applet')
 provides=('ffado')
 source=("http://www.ffado.org/files/$pkgname-$pkgver.tar.gz";
 '60-ffado.rules')



[arch-commits] Commit in qtiplot/trunk (PKGBUILD)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 06:49:23
  Author: andrea
Revision: 153592

pkgname is python2-pyqt

Modified:
  qtiplot/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 10:48:52 UTC (rev 153591)
+++ PKGBUILD2012-03-16 10:49:23 UTC (rev 153592)
@@ -9,7 +9,7 @@
 arch=('i686' 'x86_64')
 url="http://soft.proindependent.com/qtiplot.html";
 pkgdesc="Data analysis and scientific plotting - free clone of Origin"
-depends=('muparser' 'gsl' 'python2-qt' 'boost-libs' 'shared-mime-info' 'mesa' 
'liborigin2' 'qt-assistant-compat' 'tamu-anova')
+depends=('muparser' 'gsl' 'python2-pyqt' 'boost-libs' 'shared-mime-info' 
'mesa' 'liborigin2' 'qt-assistant-compat' 'tamu-anova')
 # build against qwtplot3d provided in the package ...
 # build against qwt provided in the package ...
 # as systemwide one doesn't provide all needed functions



[arch-commits] Commit in hplip/trunk (PKGBUILD)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 06:48:52
  Author: andrea
Revision: 153591

pkgname is python2-pyqt

Modified:
  hplip/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 10:44:31 UTC (rev 153590)
+++ PKGBUILD2012-03-16 10:48:52 UTC (rev 153591)
@@ -12,7 +12,7 @@
 license=('GPL')
 depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
 'net-snmp>=5.7.1')
-makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
 optdepends=('cups: for printing support'
 'dbus-python: for dbus support'
 'sane: for scanner support'



[arch-commits] Commit in kdegames/repos (52 files)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 06:44:31
  Author: andrea
Revision: 153590

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  kdegames/repos/extra-i686/PKGBUILD
(from rev 153589, kdegames/trunk/PKGBUILD)
  kdegames/repos/extra-i686/kdegames-kbattleship.install
(from rev 153589, kdegames/trunk/kdegames-kbattleship.install)
  kdegames/repos/extra-i686/kdegames-kfourinline.install
(from rev 153589, kdegames/trunk/kdegames-kfourinline.install)
  kdegames/repos/extra-i686/kdegames-kigo.install
(from rev 153589, kdegames/trunk/kdegames-kigo.install)
  kdegames/repos/extra-i686/kdegames-kolf.install
(from rev 153589, kdegames/trunk/kdegames-kolf.install)
  kdegames/repos/extra-i686/kdegames-kpatience.install
(from rev 153589, kdegames/trunk/kdegames-kpatience.install)
  kdegames/repos/extra-i686/kdegames-kreversi.install
(from rev 153589, kdegames/trunk/kdegames-kreversi.install)
  kdegames/repos/extra-i686/kdegames-kspaceduel.install
(from rev 153589, kdegames/trunk/kdegames-kspaceduel.install)
  kdegames/repos/extra-i686/kdegames-ksquares.install
(from rev 153589, kdegames/trunk/kdegames-ksquares.install)
  kdegames/repos/extra-i686/kdegames-ktuberling.install
(from rev 153589, kdegames/trunk/kdegames-ktuberling.install)
  kdegames/repos/extra-i686/kdegames-lskat.install
(from rev 153589, kdegames/trunk/kdegames-lskat.install)
  kdegames/repos/extra-i686/kdegames-palapeli.install
(from rev 153589, kdegames/trunk/kdegames-palapeli.install)
  kdegames/repos/extra-i686/kdegames.install
(from rev 153589, kdegames/trunk/kdegames.install)
  kdegames/repos/extra-x86_64/PKGBUILD
(from rev 153589, kdegames/trunk/PKGBUILD)
  kdegames/repos/extra-x86_64/kdegames-kbattleship.install
(from rev 153589, kdegames/trunk/kdegames-kbattleship.install)
  kdegames/repos/extra-x86_64/kdegames-kfourinline.install
(from rev 153589, kdegames/trunk/kdegames-kfourinline.install)
  kdegames/repos/extra-x86_64/kdegames-kigo.install
(from rev 153589, kdegames/trunk/kdegames-kigo.install)
  kdegames/repos/extra-x86_64/kdegames-kolf.install
(from rev 153589, kdegames/trunk/kdegames-kolf.install)
  kdegames/repos/extra-x86_64/kdegames-kpatience.install
(from rev 153589, kdegames/trunk/kdegames-kpatience.install)
  kdegames/repos/extra-x86_64/kdegames-kreversi.install
(from rev 153589, kdegames/trunk/kdegames-kreversi.install)
  kdegames/repos/extra-x86_64/kdegames-kspaceduel.install
(from rev 153589, kdegames/trunk/kdegames-kspaceduel.install)
  kdegames/repos/extra-x86_64/kdegames-ksquares.install
(from rev 153589, kdegames/trunk/kdegames-ksquares.install)
  kdegames/repos/extra-x86_64/kdegames-ktuberling.install
(from rev 153589, kdegames/trunk/kdegames-ktuberling.install)
  kdegames/repos/extra-x86_64/kdegames-lskat.install
(from rev 153589, kdegames/trunk/kdegames-lskat.install)
  kdegames/repos/extra-x86_64/kdegames-palapeli.install
(from rev 153589, kdegames/trunk/kdegames-palapeli.install)
  kdegames/repos/extra-x86_64/kdegames.install
(from rev 153589, kdegames/trunk/kdegames.install)
Deleted:
  kdegames/repos/extra-i686/PKGBUILD
  kdegames/repos/extra-i686/kdegames-kbattleship.install
  kdegames/repos/extra-i686/kdegames-kfourinline.install
  kdegames/repos/extra-i686/kdegames-kigo.install
  kdegames/repos/extra-i686/kdegames-kolf.install
  kdegames/repos/extra-i686/kdegames-kpatience.install
  kdegames/repos/extra-i686/kdegames-kreversi.install
  kdegames/repos/extra-i686/kdegames-kspaceduel.install
  kdegames/repos/extra-i686/kdegames-ksquares.install
  kdegames/repos/extra-i686/kdegames-ktuberling.install
  kdegames/repos/extra-i686/kdegames-lskat.install
  kdegames/repos/extra-i686/kdegames-palapeli.install
  kdegames/repos/extra-i686/kdegames.install
  kdegames/repos/extra-x86_64/PKGBUILD
  kdegames/repos/extra-x86_64/kdegames-kbattleship.install
  kdegames/repos/extra-x86_64/kdegames-kfourinline.install
  kdegames/repos/extra-x86_64/kdegames-kigo.install
  kdegames/repos/extra-x86_64/kdegames-kolf.install
  kdegames/repos/extra-x86_64/kdegames-kpatience.install
  kdegames/repos/extra-x86_64/kdegames-kreversi.install
  kdegames/repos/extra-x86_64/kdegames-kspaceduel.install
  kdegames/repos/extra-x86_64/kdegames-ksquares.install
  kdegames/repos/extra-x86_64/kdegames-ktuberling.install
  kdegames/repos/extra-x86_64/kdegames-lskat.install
  kdegames/repos/extra-x86_64/kdegames-palapeli.install
  kdegames/repos/extra-x86_64/kdegames.install

---+
 extra-i686/PKGBUILD   | 1036 ++--
 extra-i686/kdegames-kbattleship.install   |   48 -
 extra-i686/kdegames-kfourinline.install   |   24 
 extra-i686/kdegames-kigo.install  |   24 
 extra-i686/kdegames-kolf.install  |   24 
 extra-i686/kdegames-kpatience.install |   24 
 extra-i686/kdegames-kreversi.install  |   44 -
 extra-i686/kdegames-kspaceduel.install|   24 

[arch-commits] Commit in kdegames/trunk (PKGBUILD)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 06:42:58
  Author: andrea
Revision: 153589

upgpkg: kdegames 4.8.1-2

kdebindings-python has been renamed

Modified:
  kdegames/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 10:27:43 UTC (rev 153588)
+++ PKGBUILD2012-03-16 10:42:58 UTC (rev 153589)
@@ -44,12 +44,12 @@
  'kdegames-lskat'
  'kdegames-palapeli')
 pkgver=4.8.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
-makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 
'kdebindings-python'
+makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 
'kdebindings-python2'
  'openal')
 
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz";)
 sha1sums=('bcf764fd1f2f8083c388c17f26b83eeac568b1d5')
@@ -101,7 +101,7 @@
 
 package_kdegames-kajongg() {
pkgdesc='The ancient Chinese board game for 4 players'
-   depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 
'kdebindings-python' 'twisted')
+   depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 
'kdebindings-python2' 'twisted')
 url="http://www.kde.org/applications/games/kajongg/";
install='kdegames.install'
cd $srcdir/build/kajongg



[arch-commits] Commit in kdeadmin/repos (12 files)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 06:27:43
  Author: andrea
Revision: 153588

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  kdeadmin/repos/extra-i686/PKGBUILD
(from rev 153587, kdeadmin/trunk/PKGBUILD)
  kdeadmin/repos/extra-i686/kdeadmin.install
(from rev 153587, kdeadmin/trunk/kdeadmin.install)
  kdeadmin/repos/extra-i686/syslog-path.patch
(from rev 153587, kdeadmin/trunk/syslog-path.patch)
  kdeadmin/repos/extra-x86_64/PKGBUILD
(from rev 153587, kdeadmin/trunk/PKGBUILD)
  kdeadmin/repos/extra-x86_64/kdeadmin.install
(from rev 153587, kdeadmin/trunk/kdeadmin.install)
  kdeadmin/repos/extra-x86_64/syslog-path.patch
(from rev 153587, kdeadmin/trunk/syslog-path.patch)
Deleted:
  kdeadmin/repos/extra-i686/PKGBUILD
  kdeadmin/repos/extra-i686/kdeadmin.install
  kdeadmin/repos/extra-i686/syslog-path.patch
  kdeadmin/repos/extra-x86_64/PKGBUILD
  kdeadmin/repos/extra-x86_64/kdeadmin.install
  kdeadmin/repos/extra-x86_64/syslog-path.patch

+
 extra-i686/PKGBUILD|  161 +++
 extra-i686/kdeadmin.install|   22 ++---
 extra-i686/syslog-path.patch   |   22 ++---
 extra-x86_64/PKGBUILD  |  161 +++
 extra-x86_64/kdeadmin.install  |   22 ++---
 extra-x86_64/syslog-path.patch |   22 ++---
 6 files changed, 204 insertions(+), 206 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-16 10:27:08 UTC (rev 153587)
+++ extra-i686/PKGBUILD 2012-03-16 10:27:43 UTC (rev 153588)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino 
-# Contributor: Pierre Schmitz 
-
-pkgbase=kdeadmin
-pkgname=('kdeadmin-kcron'
- 'kdeadmin-ksystemlog'
- 'kdeadmin-kuser'
- 'kdeadmin-system-config-printer-kde')
-pkgver=4.8.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeadmin')
-makedepends=('cmake' 'automoc4' 'kdebindings-python' 
'system-config-printer-common')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz";
-'syslog-path.patch')
-sha1sums=('0ee44575bfb45159ced6d4d046b07323ebab00e7'
-  '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
-
-build() {
-   cd ${srcdir}/${pkgbase}-${pkgver}
-   patch -p1 -i ${srcdir}/syslog-path.patch
-
-   cd ${srcdir}
-   mkdir build
-   cd build
-   cmake ../${pkgbase}-${pkgver} \
-   -DCMAKE_BUILD_TYPE=Release \
-   -DCMAKE_SKIP_RPATH=ON \
-   -DCMAKE_INSTALL_PREFIX=/usr \
-   -DBUILD_strigi-analyzer=OFF \
--DPYTHON_EXECUTABLE=/usr/bin/python2
-   make
-}
-
-package_kdeadmin-kcron() {
-   pkgdesc='Configure and schedule tasks'
-   depends=('kdelibs')
-   cd $srcdir/build/kcron
-   make DESTDIR=$pkgdir install
-   cd $srcdir/build/doc/kcron
-   make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-ksystemlog() {
-   pkgdesc='System log viewer tool'
-   depends=('kdebase-runtime')
-   url="http://kde.org/applications/system/ksystemlog/";
-   cd $srcdir/build/ksystemlog
-   make DESTDIR=$pkgdir install
-   cd $srcdir/build/doc/ksystemlog
-   make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-kuser() {
-   pkgdesc='User Manager'
-   depends=('kdepim-runtime')
-   url="http://kde.org/applications/system/kuser/";
-   install='kdeadmin.install'
-   cd $srcdir/build/kuser
-   make DESTDIR=$pkgdir install
-   cd $srcdir/build/doc/kuser
-   make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-system-config-printer-kde() {
-   pkgdesc='Configure local and remote Printers'
-   depends=('kdebindings-python' 'system-config-printer-common' 
'python2-pyqt'
- 'cups' 'python2-gobject2')
-   url="http://kde.org/applications/system/printerapplet/";
-   cd $srcdir/build/system-config-printer-kde
-   make DESTDIR=$pkgdir install
-
-# Use the python2 executable
-sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-  
"${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py
-sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-  "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py
-}

Copied: kdeadmin/repos/extra-i686/PKGBUILD (from rev 153587, 
kdeadmin/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-16 10:27:43 UTC (rev 153588)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+# Contributor: Pierre Schmitz 
+
+pkgbase=kdeadmin
+pkgname=('kdeadmin-kcron'
+ 'kdeadmin-ksystemlog'
+ 'kdeadmin-kuser'
+ 'kdeadmin-system-config-printer-kde')
+pkgver=4.8.1
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license

[arch-commits] Commit in kdeadmin/trunk (PKGBUILD)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 06:27:08
  Author: andrea
Revision: 153587

upgpkg: kdeadmin 4.8.1-2

kdebindings-python has been renamed

Modified:
  kdeadmin/trunk/PKGBUILD

--+
 PKGBUILD |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 10:21:34 UTC (rev 153586)
+++ PKGBUILD2012-03-16 10:27:08 UTC (rev 153587)
@@ -8,12 +8,12 @@
  'kdeadmin-kuser'
  'kdeadmin-system-config-printer-kde')
 pkgver=4.8.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeadmin')
-makedepends=('cmake' 'automoc4' 'kdebindings-python' 
'system-config-printer-common')
+makedepends=('cmake' 'automoc4' 'kdebindings-python2' 
'system-config-printer-common')
 
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz";
 'syslog-path.patch')
 sha1sums=('0ee44575bfb45159ced6d4d046b07323ebab00e7'
@@ -67,15 +67,14 @@
 
 package_kdeadmin-system-config-printer-kde() {
pkgdesc='Configure local and remote Printers'
-   depends=('kdebindings-python' 'system-config-printer-common' 
'python2-pyqt'
- 'cups' 'python2-gobject2')
+   depends=('kdebindings-python2' 'system-config-printer-common' 'cups' 
'python2-gobject2')
url="http://kde.org/applications/system/printerapplet/";
cd $srcdir/build/system-config-printer-kde
make DESTDIR=$pkgdir install
 
-# Use the python2 executable
-sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-  
"${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py
-sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-  "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py
+# Use the python2 executable
+sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+
"${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+"${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py
 }



[arch-commits] Commit in kdeutils-printer-applet/repos (extra-i686 extra-x86_64)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 06:21:34
  Author: andrea
Revision: 153586

cleanup

Deleted:
  kdeutils-printer-applet/repos/extra-i686/
  kdeutils-printer-applet/repos/extra-x86_64/



[arch-commits] Commit in kdeutils-printer-applet/repos (extra-any extra-any/PKGBUILD)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 06:20:14
  Author: andrea
Revision: 153585

archrelease: copy trunk to extra-any

Added:
  kdeutils-printer-applet/repos/extra-any/
  kdeutils-printer-applet/repos/extra-any/PKGBUILD
(from rev 153584, kdeutils-printer-applet/trunk/PKGBUILD)

--+
 PKGBUILD |   38 ++
 1 file changed, 38 insertions(+)

Copied: kdeutils-printer-applet/repos/extra-any/PKGBUILD (from rev 153584, 
kdeutils-printer-applet/trunk/PKGBUILD)
===
--- extra-any/PKGBUILD  (rev 0)
+++ extra-any/PKGBUILD  2012-03-16 10:20:14 UTC (rev 153585)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+
+pkgname=kdeutils-printer-applet
+pkgver=4.8.1
+pkgrel=2
+pkgdesc='System tray icon for managing print jobs'
+url='http://kde.org/applications/system/printerapplet/'
+arch=('any')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-runtime' 'kdebindings-python2' 
'system-config-printer-common')
+makedepends=('cmake' 'automoc4')
+groups=('kde' 'kdeutils')
+source=("http://download.kde.org/stable/${pkgver}/src/printer-applet-${pkgver}.tar.xz";)
+sha1sums=('c3002fea0382386256c3acaebd907a41db0ccc4e')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../printer-applet-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DPYTHON_EXECUTABLE=/usr/bin/python2
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+
+  # Fix python 2 path
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+
"${pkgdir}"/usr/share/apps/printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
+}



[arch-commits] Commit in kdeutils-printer-applet/trunk (PKGBUILD)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 06:19:59
  Author: andrea
Revision: 153584

upgpkg: kdeutils-printer-applet 4.8.1-2

kdebindings-python has been renamed; switch to arch any

Modified:
  kdeutils-printer-applet/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 10:16:43 UTC (rev 153583)
+++ PKGBUILD2012-03-16 10:19:59 UTC (rev 153584)
@@ -3,13 +3,13 @@
 
 pkgname=kdeutils-printer-applet
 pkgver=4.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc='System tray icon for managing print jobs'
 url='http://kde.org/applications/system/printerapplet/'
-arch=('i686' 'x86_64')
+arch=('any')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
+depends=('kdebase-runtime' 'kdebindings-python2' 
'system-config-printer-common')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 
source=("http://download.kde.org/stable/${pkgver}/src/printer-applet-${pkgver}.tar.xz";)



[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 06:16:43
  Author: andrea
Revision: 153583

kdebindings-python has been renamed

Modified:
  kdebase-workspace/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 10:16:10 UTC (rev 153582)
+++ PKGBUILD2012-03-16 10:16:43 UTC (rev 153583)
@@ -19,7 +19,7 @@
  'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
  'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst'
  'xorg-xrandr')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager')
+makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
 optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
 replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde'
   'kdebase-kinfocenter')



[arch-commits] Commit in kdebindings-python/repos (4 files)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 06:16:10
  Author: andrea
Revision: 153582

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  kdebindings-python/repos/extra-i686/PKGBUILD
(from rev 153581, kdebindings-python/trunk/PKGBUILD)
  kdebindings-python/repos/extra-x86_64/PKGBUILD
(from rev 153581, kdebindings-python/trunk/PKGBUILD)
Deleted:
  kdebindings-python/repos/extra-i686/PKGBUILD
  kdebindings-python/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |  102 
 extra-x86_64/PKGBUILD |  102 
 2 files changed, 136 insertions(+), 68 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-16 10:15:37 UTC (rev 153581)
+++ extra-i686/PKGBUILD 2012-03-16 10:16:10 UTC (rev 153582)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino 
-
-pkgname=kdebindings-python
-pkgver=4.8.1
-pkgrel=1
-pkgdesc="KDE bindings for Python"
-url="http://kde.org/";
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz";)
-sha1sums=('b9ef35269d2e08578ba20d01822dbdbed72bffb8')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../pykde4-${pkgver} \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr \
--DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  # Use the python2 executable
-  find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env 
python|#!/usr/bin/env python2|'
-}

Copied: kdebindings-python/repos/extra-i686/PKGBUILD (from rev 153581, 
kdebindings-python/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-16 10:16:10 UTC (rev 153582)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+
+pkgbase=kdebindings-python
+pkgname=('kdebindings-python'
+ 'kdebindings-python2')
+pkgver=4.8.1
+pkgrel=2
+url='http://kde.org/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 
'qscintilla')
+source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz";)
+sha1sums=('b9ef35269d2e08578ba20d01822dbdbed72bffb8')
+
+build() {
+  export PYTHONDONTWRITEBYTECODE="TRUE"
+
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../pykde4-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0
+  make
+  cd ..
+
+  mkdir build-python2
+  cd build-python2
+  cmake ../pykde4-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DPYTHON_EXECUTABLE=/usr/bin/python2
+  make
+}
+
+package_kdebindings-python() {
+  desc="A set of Python 3.x bindings for KDE"
+  depends=('kdepim-runtime' 'pyqt' 'qscintilla')
+
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
+
+package_kdebindings-python2() {
+  desc="A set of Python 2.x bindings for KDE"
+  depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
+  conflicts=('kdebindings-python<4.8.1-2')
+ 
+  cd "${srcdir}"/build-python2
+  make DESTDIR="${pkgdir}" install
+
+  # Fix conflicts
+  rm "${pkgdir}"/usr/bin/pykdeuic4
+  ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
+"${pkgdir}"/usr/bin/python2-pykdeuic4
+
+  mv "${pkgdir}"/usr/share/apps/pykde4/examples \
+"${pkgdir}"/usr/share/apps/pykde4/python2-examples
+
+  mv "${pkgdir}"/usr/share/sip/PyKDE4 \
+"${pkgdir}"/usr/share/sip/python2-PyKDE4
+
+  # Use the python2 executable
+  find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env 
python|#!/usr/bin/env python2|'
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-03-16 10:15:37 UTC (rev 153581)
+++ extra-x86_64/PKGBUILD   2012-03-16 10:16:10 UTC (rev 153582)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino 
-
-pkgname=kdebindings-python
-pkgver=4.8.1
-pkgrel=1
-pkgdesc="KDE bindings for Python"
-url="http://kde.org/";
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz";)
-sha1sums=('b9ef35269d2e08578ba20d01822dbdbed72bffb8')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../pykde4-${pkgver} \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr \
--DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package() {
-  cd "${srcdir}"/bu

[arch-commits] Commit in kdebindings-python/trunk (PKGBUILD)

2012-03-16 Thread Andrea Scarpino
Date: Friday, March 16, 2012 @ 06:15:37
  Author: andrea
Revision: 153581

upgpkg: kdebindings-python 4.8.1-2

Provide python3 bindings (FS#28911); keep python2 bindings for compatibility

Modified:
  kdebindings-python/trunk/PKGBUILD

--+
 PKGBUILD |   48 +---
 1 file changed, 41 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 08:10:00 UTC (rev 153580)
+++ PKGBUILD2012-03-16 10:15:37 UTC (rev 153581)
@@ -1,34 +1,68 @@
 # $Id$
 # Maintainer: Andrea Scarpino 
 
-pkgname=kdebindings-python
+pkgbase=kdebindings-python
+pkgname=('kdebindings-python'
+ 'kdebindings-python2')
 pkgver=4.8.1
-pkgrel=1
-pkgdesc="KDE bindings for Python"
-url="http://kde.org/";
+pkgrel=2
+url='http://kde.org/'
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
-depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-makedepends=('cmake' 'automoc4' 'boost')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 
'qscintilla')
 source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz";)
 sha1sums=('b9ef35269d2e08578ba20d01822dbdbed72bffb8')
 
 build() {
+  export PYTHONDONTWRITEBYTECODE="TRUE"
+
   cd "${srcdir}"
   mkdir build
   cd build
   cmake ../pykde4-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
+-DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0
+  make
+  cd ..
+
+  mkdir build-python2
+  cd build-python2
+  cmake ../pykde4-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
 -DPYTHON_EXECUTABLE=/usr/bin/python2
   make
 }
 
-package() {
+package_kdebindings-python() {
+  desc="A set of Python 3.x bindings for KDE"
+  depends=('kdepim-runtime' 'pyqt' 'qscintilla')
+
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
+}
 
+package_kdebindings-python2() {
+  desc="A set of Python 2.x bindings for KDE"
+  depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
+  conflicts=('kdebindings-python<4.8.1-2')
+ 
+  cd "${srcdir}"/build-python2
+  make DESTDIR="${pkgdir}" install
+
+  # Fix conflicts
+  rm "${pkgdir}"/usr/bin/pykdeuic4
+  ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
+"${pkgdir}"/usr/bin/python2-pykdeuic4
+
+  mv "${pkgdir}"/usr/share/apps/pykde4/examples \
+"${pkgdir}"/usr/share/apps/pykde4/python2-examples
+
+  mv "${pkgdir}"/usr/share/sip/PyKDE4 \
+"${pkgdir}"/usr/share/sip/python2-PyKDE4
+
   # Use the python2 executable
   find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env 
python|#!/usr/bin/env python2|'
 }



[arch-commits] Commit in gnome-screensaver/trunk (PKGBUILD gnome-screensaver.pam)

2012-03-16 Thread Ionut Biru
Date: Friday, March 16, 2012 @ 04:10:00
  Author: ibiru
Revision: 153580

allow empty password when unlocking screen. FS#28908

Modified:
  gnome-screensaver/trunk/PKGBUILD
  gnome-screensaver/trunk/gnome-screensaver.pam

---+
 PKGBUILD  |2 +-
 gnome-screensaver.pam |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 08:05:55 UTC (rev 153579)
+++ PKGBUILD2012-03-16 08:10:00 UTC (rev 153580)
@@ -18,7 +18,7 @@
 
source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
gnome-screensaver.pam)
 sha256sums=('7839ca0e034c4ecf40c8abe64296c4b0c95f3e04f28e3034fca861ebfe3d06b2'
-'2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2')
+'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb')
 
 build() {
   cd ${pkgname}-${pkgver}

Modified: gnome-screensaver.pam
===
--- gnome-screensaver.pam   2012-03-16 08:05:55 UTC (rev 153579)
+++ gnome-screensaver.pam   2012-03-16 08:10:00 UTC (rev 153580)
@@ -1,3 +1,3 @@
 #%PAM-1.0
-authrequired pam_unix_auth.so
+authrequired pam_unix_auth.so nullok
 authoptional pam_gnome_keyring.so



[arch-commits] Commit in mplayer/trunk (PKGBUILD)

2012-03-16 Thread Ionut Biru
Date: Friday, March 16, 2012 @ 04:05:55
  Author: ibiru
Revision: 153579

drop cdparanoia, we are using now libcdio

Modified:
  mplayer/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-16 06:20:51 UTC (rev 153578)
+++ PKGBUILD2012-03-16 08:05:55 UTC (rev 153579)
@@ -7,7 +7,7 @@
 pkgver=34799
 pkgrel=1
 arch=('i686' 'x86_64')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 
'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 
'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 
'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
 'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 
'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio')
 license=('GPL')
@@ -52,7 +52,7 @@
 install=mplayer.install
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 
'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  
'libgl'
-'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 
'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 
'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 
'libxxf86vm' 'libbluray' 'libcdio')
 
 cd "$srcdir/$pkgbase"
@@ -69,7 +69,7 @@
 
 package_mencoder() {
 pkgdesc="Free command line video decoding, encoding and filtering tool"
-depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 
'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 
'cdparanoia'
+depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 
'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 
'mpg123' 'libass' 'libbluray' 'libcdio')
 
 cd "$srcdir/$pkgbase"