Sat May 18 02:12:59 PDT 2013

16 files changed, 62 insertions, 151 deletions

diff --git a/extra/cpio/PKGBUILD b/extra/cpio/PKGBUILD
index 959cb23dd..52275465c 100644
--- a/extra/cpio/PKGBUILD
+++ b/extra/cpio/PKGBUILD
@@ -1,16 +1,21 @@
-# $Id: PKGBUILD 149526 2012-02-08 11:43:48Z tpowa $
+# $Id: PKGBUILD 185699 2013-05-17 11:26:28Z tpowa $
 # Maintainer: judd <jvinet@zeroflux.org>
 pkgname=cpio
 pkgver=2.11
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool to copy files into or out of a cpio or tar archive"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.gnu.org/software/cpio"
 depends=('glibc')
-source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz)
+source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz
+        cpio-2.11-stdio.in.patch)
 install=cpio.install
-md5sums=('1112bb6c45863468b5496ba128792f6c')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/cpio-2.11-stdio.in.patch
+}
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -22,10 +27,11 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   rm -f ${pkgdir}/usr/bin/mt ${pkgdir}/pkg/usr/share/man/man1/mt.1
-  mv ${pkgdir}/usr/bin ${pkgdir}/bin
   rm -rf ${pkgdir}/usr/libexec
   # remove mt manpage it conflicts with mt-st from extra
   rm $pkgdir/usr/share/man/man1/mt.1 || return 1
   # remove infodir
   rm $pkgdir/usr/share/info/dir
 }
+md5sums=('1112bb6c45863468b5496ba128792f6c'
+         'd7e58f2a1ec286febd09ea75042cf96e')
diff --git a/extra/cpio/cpio-2.11-stdio.in.patch b/extra/cpio/cpio-2.11-stdio.in.patch
new file mode 100644
index 000000000..f7016ba71
--- /dev/null
+++ b/extra/cpio/cpio-2.11-stdio.in.patch
@@ -0,0 +1,13 @@
+diff -urNp cpio-2.11-orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h
+--- cpio-2.11-orig/gnu/stdio.in.h	2010-03-10 10:27:03.000000000 +0100
++++ cpio-2.11/gnu/stdio.in.h	2012-06-04 10:23:23.804471185 +0200
+@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not 
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 1b68f3dfd..abc48f82d 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185124 2013-05-11 09:39:43Z andyrtr $
+# $Id: PKGBUILD 185725 2013-05-17 17:33:15Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -9,7 +9,7 @@
 
 pkgname=dovecot
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
 url="http://dovecot.org/"
@@ -38,8 +38,11 @@ build() {
   sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh
 
   # configure with openssl, mysql, and postgresql support
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-  	--libexecdir=/usr/lib  --with-moduledir=/usr/lib/dovecot/modules \
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --sbindir=/usr/bin \
+    --localstatedir=/var \
+  	--libexecdir=/usr/lib \
+  	--with-moduledir=/usr/lib/dovecot/modules \
   	--with-systemdsystemunitdir=/usr/lib/systemd/system \
 	--disable-static \
 	--with-nss \
diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD
index 5bfea48f6..bab08780d 100644
--- a/extra/gstreamer0.10-base/PKGBUILD
+++ b/extra/gstreamer0.10-base/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153257 2012-03-12 15:48:41Z jgc $
+# $Id: PKGBUILD 185705 2013-05-17 12:41:12Z foutrelis $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=('gstreamer0.10-base')
@@ -15,8 +15,13 @@ sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a')
 
 build() {
   cd "${srcdir}/gst-plugins-base-${pkgver}"
-  sed -i '/AC_PATH_XTRA/d' configure.ac
+  sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
+    configure.ac
   autoreconf
+}
+
+build() {
+  cd "${srcdir}/gst-plugins-base-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental --disable-gnome_vfs \
     --with-package-name="GStreamer Base Plugins (Archlinux)" \
diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD
index 43e9a1b9f..1caedc0b9 100644
--- a/extra/hylafax/PKGBUILD
+++ b/extra/hylafax/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 178774 2013-02-27 13:50:36Z tpowa $
+# $Id: PKGBUILD 185691 2013-05-17 10:55:17Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 pkgname=hylafax
 pkgver=6.0.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Fax Server"
 arch=('i686' 'x86_64')
 install='hylafax.install'
@@ -14,7 +14,6 @@ backup=(var/spool/hylafax/bin/{faxrcvd,notify}
 	usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules}
 	var/spool/hylafax/etc/hosts.hfaxd) 
 source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz 
-        hylafax 
         hylafax.cron.daily 
         config.local
         faxq.service
@@ -30,10 +29,9 @@ build () {
 
 package () {
   cd "$srcdir/${pkgname}-${pkgver}"
-  mkdir -p "$pkgdir"/usr/{bin,lib/fax,sbin,share/ghostscript/fonts}
+  mkdir -p "$pkgdir"/usr/{bin,lib/fax,share/ghostscript/fonts}
   mkdir -p "$pkgdir"/var/{spool/hylafax,lock}
   make ROOT="$pkgdir" install
-  install -D -m 755 "$srcdir"/hylafax "$pkgdir"/etc/rc.d/hylafax
   install -D -m 744 "$srcdir"/hylafax.cron.daily "$pkgdir"/etc/cron.daily/hylafax
   # add missing awk file for notify-4.1 script
   install -D -m 755 "$srcdir"/${pkgname}-${pkgver}/util/notify.awk \
@@ -47,15 +45,8 @@ package () {
   install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
 }
 md5sums=('d063d45049c8fcbabefe09d662313067'
-         '6602288a405324d8c8e3c5eac2bf19fd'
          '52beffe7dc296b4f9ce9fd0387f7804e'
-         '60f2a7e62c256ead4e9238cb31b35b90'
-         '832c8e8098e2dfa56040c975b554590c'
-         '38a00db6d9d765d130b2d8d3a98e5c24')
-md5sums=('d063d45049c8fcbabefe09d662313067'
-         '6602288a405324d8c8e3c5eac2bf19fd'
-         '52beffe7dc296b4f9ce9fd0387f7804e'
-         '60f2a7e62c256ead4e9238cb31b35b90'
+         '5f3a89fbfb10c47755d3ca19183b8a59'
          '832c8e8098e2dfa56040c975b554590c'
          '38a00db6d9d765d130b2d8d3a98e5c24'
          'fe10ea597e786fe8c09e4104fbdf16de')
diff --git a/extra/hylafax/config.local b/extra/hylafax/config.local
index 4ea0f3500..ab98c83db 100644
--- a/extra/hylafax/config.local
+++ b/extra/hylafax/config.local
@@ -62,7 +62,7 @@ DIR_LIBDATA="/usr/lib/fax"		# directory for client data
 DIR_LIBEXEC="/usr/lib/fax"		# directory for libraries&hidden apps
 DIR_MAN="/usr/share/man"		# directory for manual pages
 DIR_SPOOL="/var/spool/hylafax"		# directory for spooling area
-DIR_SBIN="/usr/sbin"		# directory for system apps
+DIR_SBIN="/usr/bin"		# directory for system apps
 DIR_LOCKS="/var/lock"		# directory for UUCP lock files
 FONTMAP="/usr/share/ghostscript/fonts"	# directorys containing Fontmap files
 DIR_LOCALE="/usr/share/locale"
diff --git a/extra/hylafax/hylafax.install b/extra/hylafax/hylafax.install
index 5dacf4045..c631cdaca 100644
--- a/extra/hylafax/hylafax.install
+++ b/extra/hylafax/hylafax.install
@@ -1,10 +1,6 @@
 
 print_install() {
   printf "\n"
-  echo "Add the following to /etc/inittab and run telinit q"
-  echo "  f1:2345:respawn:/usr/lib/fax/faxgetty ttyS0"
-  echo "faxgetty should now be running"
-  printf "\n"
   echo "Run faxsetup to configure and be sure to set..."
   echo "  The device to configure is usually ttyS0"
   echo "  The number of pages to accept to more than 25"
diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD
index ca20cdcb3..3d242f810 100644
--- a/extra/irqbalance/PKGBUILD
+++ b/extra/irqbalance/PKGBUILD
@@ -3,33 +3,26 @@
 
 pkgname=irqbalance
 pkgver=1.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="IRQ balancing daemon for SMP systems"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/irqbalance"
 license=('GPL')
 depends=(glib2 numactl libcap-ng)
 makedepends=(pkgconfig)
-backup=(etc/conf.d/irqbalance)
 source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz
-        irqbalance.conf.d
-        irqbalance.rc.d
         irqbalance.service)
 md5sums=('b6403fa067c96adce448a48c9993654d'
-         '336c1ee99818f9ecda1687e34c69fd6b'
-         'fb82fc5d267d39110baf720d81282a7c'
-         '9e82dc471128117982a8dd0c4bd5f246')
+         'a97ad17dc7df98b81acb500b27f931e5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make install DESTDIR="$pkgdir"
-  install -D -m644 ../irqbalance.conf.d "$pkgdir"/etc/conf.d/irqbalance
-  install -D -m755 ../irqbalance.rc.d "$pkgdir"/etc/rc.d/irqbalance
   install -D -m644 ../irqbalance.service "$pkgdir"/usr/lib/systemd/system/irqbalance.service
 }
diff --git a/extra/irqbalance/irqbalance.conf.d b/extra/irqbalance/irqbalance.conf.d
deleted file mode 100644
index ef1bdfd75..000000000
--- a/extra/irqbalance/irqbalance.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Settings for irqbalance daemon
-#
-
-# one shot mode - set to 1 if you have Pentium 4 with HT
-ONESHOT=0
diff --git a/extra/irqbalance/irqbalance.rc.d b/extra/irqbalance/irqbalance.rc.d
deleted file mode 100644
index 987c26b51..000000000
--- a/extra/irqbalance/irqbalance.rc.d
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-ONESHOT=0
-[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance
-
-if [ "$ONESHOT" -ne 0 ]; then
-	ONESHOT_CMD="--oneshot"
-fi
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/irqbalance`
-case "$1" in
-  start)
-    stat_busy "Starting IRQ balancing"
-    [ -z "$PID" ] && /usr/sbin/irqbalance $ONESHOT_CMD
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      if [ "$ONESHOT" -eq 0 ]; then
-        add_daemon irqbalance
-      fi
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping IRQ balancing"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon irqbalance
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/irqbalance/irqbalance.service b/extra/irqbalance/irqbalance.service
index 372ac0aa4..c9fced094 100644
--- a/extra/irqbalance/irqbalance.service
+++ b/extra/irqbalance/irqbalance.service
@@ -2,7 +2,7 @@
 Description=CPU Interrupt Request Balancer
 
 [Service]
-ExecStart=/usr/sbin/irqbalance --foreground
+ExecStart=/usr/bin/irqbalance --foreground
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index 342ed0e54..e72c8e08a 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178113 2013-02-16 16:08:30Z ronald $
+# $Id: PKGBUILD 185713 2013-05-17 13:46:00Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : shining <shiningxc.at.gmail.com>
 # Contributor : cyberdune <cyberdune@gmail.com>
 
 pkgname=octave
-pkgver=3.6.3
-pkgrel=2
+pkgver=3.6.4
+pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org"
@@ -14,20 +14,15 @@ depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'suitespars
 makedepends=('gcc-fortran' 'texlive-core')
 optdepends=('texinfo: for help-support in octave'
             'gnuplot: alternative plotting')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}
-        octave-gethelp.patch)
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig})
 options=('!emptydirs')
 install=octave.install
-sha1sums=('e8bd0c0b33ab9714ddb524f2258546c3536f0628'
-          'de009a9e6803de6b831cbd836cbc85c291de8a3c'
-          'd39d54763ac86114029f8bc5d60763d2adce27bb')
+sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4'
+          'SKIP')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-help.patch?view=log
-  patch -Np0 -i "${srcdir}/octave-gethelp.patch"
-
   autoreconf -vfi
 
   # http://www.nabble.com/Random-rounding-errors-td16010966.html
diff --git a/extra/openslp/PKGBUILD b/extra/openslp/PKGBUILD
index 241d2d0bd..e0720cdaa 100644
--- a/extra/openslp/PKGBUILD
+++ b/extra/openslp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165260 2012-08-14 16:48:24Z andyrtr $
+# $Id: PKGBUILD 185723 2013-05-17 17:27:12Z andyrtr $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=openslp
 pkgver=1.2.1
-pkgrel=5
+pkgrel=7
 pkgdesc="Open-source implementation of Service Location Protocol"
 arch=('i686' 'x86_64')
 url="http://www.openslp.org"
@@ -11,16 +11,16 @@ license=('BSD')
 depends=('bash' 'openssl')
 backup=('etc/slp.conf' 'etc/slp.reg' 'etc/slp.spi')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.slpd
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
         #https://github.com/lunar-linux/moonbase-other/commit/ae74b5873e639d50db0a563d2424114a530c01ae
         openslp.service)
 md5sums=('ff9999d1b44017281dd00ed2c4d32330'
-         '4f6889a5944894b8be2c01404a9566d2'
-         '296dc3c8f75e7a1823fcb9dd97ea0971')
+         '90eea4426492287ebfc01b2056a3ef9d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
+    --sbindir=/usr/bin \
     --disable-static \
     --enable-slpv1 \
     --enable-slpv2-security # service would fail to start without this
@@ -31,6 +31,5 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} DOC_DIR=/usr/share/doc/openslp-${pkgver} install
   install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  install -D -m755 $srcdir/rc.slpd ${pkgdir}/etc/rc.d/slpd
   install -D -m644 $srcdir/openslp.service ${pkgdir}/usr/lib/systemd/system/openslp.service
 }
diff --git a/extra/openslp/openslp.service b/extra/openslp/openslp.service
index e17eb3b1d..a3c306aa2 100644
--- a/extra/openslp/openslp.service
+++ b/extra/openslp/openslp.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi
+ExecStart=/usr/bin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/openslp/rc.slpd b/extra/openslp/rc.slpd
deleted file mode 100755
index 4330c3760..000000000
--- a/extra/openslp/rc.slpd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/slpd`
-case "$1" in
-  start)
-    stat_busy "Starting SLPD"
-    [ -z "$PID" ] && /usr/sbin/slpd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/slpd.pid
-      add_daemon slpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping SLPD"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/slpd.pid
-      rm_daemon slpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index ea8cf6be4..f76242d3b 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 182151 2013-04-08 10:27:26Z stephane $
+# $Id: PKGBUILD 185697 2013-05-17 11:13:51Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributer: Allan McRae <allan@archlinux.org>
 # Contributer: Jason Chu <jason@archlinux.org>
 
 pkgname=python2
-pkgver=2.7.4
+pkgver=2.7.5
 pkgrel=1
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
@@ -17,7 +17,7 @@ optdepends=('tk: for IDLE')
 conflicts=('python<3')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('08e78ebeb6d9c799644f6d787ca424291c0fe03e')
+sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"