Fri Apr 15 04:55:43 UTC 2011

11 files changed, 231 insertions, 29 deletions

diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD
index 3d157e1d6..34c3e4448 100644
--- a/extra/dhcp/PKGBUILD
+++ b/extra/dhcp/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 118234 2011-04-06 07:14:19Z jgc $
+# $Id: PKGBUILD 119729 2011-04-14 10:22:18Z daniel $
 # Maintainer: Daniel Isenmann <daniel @archlinux.org>
 
 pkgbase=dhcp
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.0.2
-_pkgver=4.2.0-P2
+pkgver=4.2.1.1
+_pkgver=4.2.1-P1
 
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
 source=(http://ftp.isc.org/isc/${pkgbase}/${pkgbase}-${_pkgver}.tar.gz
-        dhcpd dhcp.conf.d
+        dhcp4 dhcp6 dhcp
         dhcp-4.1.1-missing-ipv6-not-fatal.patch
         dhclient-script-pathFixes.patch)
-md5sums=('a98f4ce3ca651e7e28a5a1ae6398689e'
-         'df22cffa7d7415ece7bb025b7bf774dd'
-         '49da3192e5c885e3c7d02f447c2dea5e'
+md5sums=('22e6f1eff6d5cfe2621a06cc62ba5b70'
+         'c49b1497837ba56c54e401a66e1bab9b'
+         '12c2f3ae47ed23eb698eb7f1bfd80f20'
+         '8f357e46e1efcbb746f38737a3f977a2'
          'fd64aeb4f399dcc41ea43089a3811094'
          'ddcc5cd576ec631ade6c4da21952b50b')
 
@@ -33,11 +34,13 @@ build() {
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
-      --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases
+      --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases \
+      --with-cli-lease-file=/var/state/dhclient/dhclient.leases \
+      --with-cli6-lease-file=/var/state/dhclient/dhclient6.leases
 
   make
 
-  patch -i ${srcdir}/dhclient-script-pathFixes.patch client/scripts/linux
+  patch -i ${srcdir}/dhclient-script-pathFixes.patch client/scripts/linux || return 1
 }
 
 package_dhcp(){
@@ -49,8 +52,9 @@ package_dhcp(){
   cd ${srcdir}/${pkgbase}-${_pkgver}
   make DESTDIR=${pkgdir} install
 
-  install -D -m755 ${srcdir}/dhcpd ${pkgdir}/etc/rc.d/dhcpd
-  install -D -m644 ${srcdir}/dhcp.conf.d ${pkgdir}/etc/conf.d/${pkgbase}
+  install -D -m755 ${srcdir}/dhcp4 ${pkgdir}/etc/rc.d/dhcp4
+  install -D -m755 ${srcdir}/dhcp6 ${pkgdir}/etc/rc.d/dhcp6
+  install -D -m644 ${srcdir}/dhcp ${pkgdir}/etc/conf.d/${pkgbase}
   mkdir -p ${pkgdir}/var/state/dhcp
 
   # Remove dhclient
@@ -62,16 +66,15 @@ package_dhcp(){
 
 package_dhclient(){
   pkgdesc="dhclient is standalone client from the dhcp package"
-  depends=('bash')
+  depends=('bash' 'iproute2')
 
   cd ${srcdir}/${pkgbase}-${_pkgver}
   make -C client DESTDIR=${pkgdir} install
 
   # move dhclient.conf to dhclient.conf.example
   mv ${pkgdir}/etc/dhclient.conf{,.example}
-
-  # directory needed for leasefiles
-  mkdir -p ${pkgdir}/var/lib/dhclient
+  
+  mkdir -p ${pkgdir}/var/state/dhclient
 
   # install dhclient linux script
   install -m755 -D client/scripts/linux ${pkgdir}/sbin/dhclient-script
diff --git a/extra/dhcp/dhcp b/extra/dhcp/dhcp
new file mode 100644
index 000000000..d4f228d9c
--- /dev/null
+++ b/extra/dhcp/dhcp
@@ -0,0 +1,10 @@
+#
+# Arguments to be passed to the DHCP server daemon
+#
+
+# ipv4 runtime parameters
+DHCP4_ARGS="-q"
+
+# ipv6 runtime parameters
+DHCP6_ARGS="-q"
+
diff --git a/extra/dhcp/dhcp.install b/extra/dhcp/dhcp.install
index c0ad39e36..5302be4b5 100644
--- a/extra/dhcp/dhcp.install
+++ b/extra/dhcp/dhcp.install
@@ -1,7 +1,14 @@
 # arg 1:  the new package version
 post_install() {
   [ -f var/state/dhcp/dhcpd.leases ] || : >var/state/dhcp/dhcpd.leases
+  [ -f var/state/dhcp/dhcpd6.leases ] || : >var/state/dhcp/dhcpd6.leases
   #echo "If dhcpd doesn't start, ensure the ipv6 kernel module is loaded."
+
+  echo
+  echo "==> The dhcp server has now two rc.d scripts."
+  echo "==> Use '/etc/rc.d/dhcp6' to use IPv6 dhcp server or"
+  echo "==> '/etc/rc.d/dhcp4' to use IPv4 dhcp server."
+  echo "==> Make sure that you change your DAEMONS array in '/etc/rc.conf'!"
 }
 
 # arg 1:  the new package version
diff --git a/extra/dhcp/dhcp4 b/extra/dhcp/dhcp4
new file mode 100644
index 000000000..8e1277a37
--- /dev/null
+++ b/extra/dhcp/dhcp4
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/dhcp
+
+PIDFILE="/var/run/dhcpd.pid"
+
+if [[ -f $PIDFILE ]]; then
+  read -r PID < "$PIDFILE"
+
+  # prevent stale pidfiles from hanging around
+  if [[ ! -d /proc/$PID ]]; then
+    echo 'pid not found. deleteing stale pidfile'
+    unset PID
+    rm -f "$PIDFILE"
+  fi
+fi
+
+case "$1" in
+  start)
+    stat_busy "Starting DHCPv4 Server"
+    if [[ $PID ]]; then
+      stat_fail
+      exit 1
+    fi
+    if /usr/sbin/dhcpd -4 -pf "$PIDFILE" $DHCP4_ARGS; then
+      add_daemon dhcp4
+      stat_done
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping DHCPv4 Server"
+    if [[ ! $PID ]]; then
+      stat_fail
+      exit 1
+    fi
+    if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then
+      rm_daemon dhcp4
+      stat_done
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+
diff --git a/extra/dhcp/dhcp6 b/extra/dhcp/dhcp6
new file mode 100644
index 000000000..6b4b4d359
--- /dev/null
+++ b/extra/dhcp/dhcp6
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/dhcp
+
+PIDFILE="/var/run/dhcp6.pid"
+
+if [[ -f $PIDFILE ]]; then
+  read -r PID < "$PIDFILE"
+
+  # prevent stale pidfiles from hanging around
+  if [[ ! -d /proc/$PID ]]; then
+    echo 'pid not found. deleteing stale pidfile'
+    unset PID
+    rm -f "$PIDFILE"
+  fi
+fi
+
+case "$1" in
+  start)
+    stat_busy "Starting DHCPv6 Server"
+    if [[ $PID ]]; then
+      stat_fail
+      exit 1
+    fi
+    if /usr/sbin/dhcpd -6 -pf "$PIDFILE" $DHCP6_ARGS; then
+      add_daemon dhcp6
+      stat_done
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping DHCPv6 Server"
+    if [[ ! $PID ]]; then
+      stat_fail
+      exit 1
+    fi
+    if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then
+      rm_daemon dhcp6
+      stat_done
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+
diff --git a/extra/lv2core/PKGBUILD b/extra/lv2core/PKGBUILD
index d483ab952..21cef7c66 100644
--- a/extra/lv2core/PKGBUILD
+++ b/extra/lv2core/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 116670 2011-03-24 20:31:38Z schiv $
+# $Id: PKGBUILD 119725 2011-04-14 07:21:19Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 
 pkgname=lv2core
 pkgver=4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="LV2: Successor to the LADSPA audio plug-in standard"
 url="http://lv2plug.in/"
 license=('LGPL' 'custom')
@@ -12,7 +12,7 @@ makedepends=('python2')
 provides=('lv2')
 changelog=$pkgname.changelog
 install=$pkgname.install
-source=(http://lv2plug.in/spec/$pkgname-$pkgver.tar.bz2)
+source=("http://lv2plug.in/spec/$pkgname-$pkgver.tar.bz2")
 md5sums=('5097d964f3559a1ecec2d2fc822ef53a')
 
 build() {
@@ -27,7 +27,16 @@ package() {
 
 	python2 waf install --destdir="$pkgdir"
 
-	install -Dm0644 COPYING \
+  # do the work of lv2config to own symlinks;
+  #   - generate lv2 headers
+  #   - see FS#23514
+  _ns=$(grep '^<http' manifest.ttl | sed 's|<http://\(.*\)>|\1|')
+  _name=${_ns/*\/}
+  _path="$pkgdir/usr/include/lv2/${_ns%/*}"
+  install -d "$_path"
+  ln -s "/usr/lib/lv2/$_name.lv2" "$_path/$_name"
+
+	install -Dm644 COPYING \
     "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
diff --git a/extra/lv2core/lv2core.changelog b/extra/lv2core/lv2core.changelog
index 618e5921f..415cd0b59 100644
--- a/extra/lv2core/lv2core.changelog
+++ b/extra/lv2core/lv2core.changelog
@@ -1,7 +1,13 @@
+14 Apr 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
+
+	* 4.0-2:
+	Do the work of lv2config in PKGBUILD manually
+	See https://bugs.archlinux.org/task/23514
+
 25 Mar 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
 
 	* 4.0-1 :
-	Upstream release 
+	Upstream release
 
 9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
 
diff --git a/extra/lv2core/lv2core.install b/extra/lv2core/lv2core.install
index 6a9fdf33b..dbd9898d3 100644
--- a/extra/lv2core/lv2core.install
+++ b/extra/lv2core/lv2core.install
@@ -1,6 +1,5 @@
 post_install() {
   \ldconfig
-  \lv2config
 }
 
 post_upgrade() {
@@ -8,7 +7,7 @@ post_upgrade() {
 }
 
 post_remove() {
-  \ldconfig
+  post_install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index 50a02686c..2dadb1ec3 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 110650 2011-02-21 01:06:01Z stephane $
+# $Id: PKGBUILD 119684 2011-04-13 16:35:24Z stephane $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributer: Jason Chu <jason@archlinux.org>
 
 pkgname=python2
 pkgver=2.7.1
-pkgrel=7
+pkgrel=8
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -17,15 +17,21 @@ optdepends=('tk: for IDLE')
 conflicts=('python<3')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
-        python-2.7-db51.diff)
+        python-2.7-db51.diff
+        python-2.7.1-fix-decimal-in-turkish-locale.patch)
 md5sums=('aa27bc25725137ba155910bd8e5ddc4f'
-         'd9b8161568ce17a305c1b71e61ccd4b5')
+         'd9b8161568ce17a305c1b71e61ccd4b5'
+         '5032449f1ff2abfe18d14cc674165b23')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
 
   patch -Np1 -i ../python-2.7-db51.diff
 
+  # Fix "import decimal" in the Turkish locale
+  # cf : https://bugzilla.redhat.com/show_bug.cgi?id=694928
+  patch -Np1 -i ../python-2.7.1-fix-decimal-in-turkish-locale.patch
+
   # Temporary workaround for FS#22322
   # See http://bugs.python.org/issue10835 for upstream report
   sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
diff --git a/extra/python2/python-2.7.1-fix-decimal-in-turkish-locale.patch b/extra/python2/python-2.7.1-fix-decimal-in-turkish-locale.patch
new file mode 100644
index 000000000..57f527f40
--- /dev/null
+++ b/extra/python2/python-2.7.1-fix-decimal-in-turkish-locale.patch
@@ -0,0 +1,48 @@
+diff -up Python-2.7.1/Lib/decimal.py.fix-decimal-in-turkish-locale Python-2.7.1/Lib/decimal.py
+--- Python-2.7.1/Lib/decimal.py.fix-decimal-in-turkish-locale	2010-07-08 17:22:54.000000000 -0400
++++ Python-2.7.1/Lib/decimal.py	2011-04-12 11:30:40.850350842 -0400
+@@ -1720,8 +1720,6 @@ class Decimal(object):
+         # here self was representable to begin with; return unchanged
+         return Decimal(self)
+
+-    _pick_rounding_function = {}
+-
+     # for each of the rounding functions below:
+     #   self is a finite, nonzero Decimal
+     #   prec is an integer satisfying 0 <= prec < len(self._int)
+@@ -1788,6 +1786,17 @@ class Decimal(object):
+         else:
+             return -self._round_down(prec)
+
++    _pick_rounding_function = dict(
++        ROUND_DOWN = '_round_down',
++        ROUND_UP = '_round_up',
++        ROUND_HALF_UP = '_round_half_up',
++        ROUND_HALF_DOWN = '_round_half_down',
++        ROUND_HALF_EVEN = '_round_half_even',
++        ROUND_CEILING = '_round_ceiling',
++        ROUND_FLOOR = '_round_floor',
++        ROUND_05UP = '_round_05up',
++    )
++
+     def fma(self, other, third, context=None):
+         """Fused multiply-add.
+
+@@ -3705,18 +3714,6 @@ _numbers.Number.register(Decimal)
+
+ ##### Context class #######################################################
+
+-
+-# get rounding method function:
+-rounding_functions = [name for name in Decimal.__dict__.keys()
+-                                    if name.startswith('_round_')]
+-for name in rounding_functions:
+-    # name is like _round_half_even, goes to the global ROUND_HALF_EVEN value.
+-    globalname = name[1:].upper()
+-    val = globals()[globalname]
+-    Decimal._pick_rounding_function[val] = name
+-
+-del name, val, globalname, rounding_functions
+-
+ class _ContextManager(object):
+     """Context manager class to support localcontext().
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index ba907af2b..333096f8f 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 119231 2011-04-11 12:45:51Z jgc $
+# $Id: PKGBUILD 119757 2011-04-14 20:01:07Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.14.903
+pkgver=2.15.0
 pkgrel=1
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ conflicts=('xorg-server<1.10.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('2c2e0f714fbfa1f3aabcfd3fd667f892996680c8')
+sha1sums=('78ec39a4470cfc0bf13d269fb915f6c5a498ee62')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"