Sun Aug 28 23:14:35 UTC 2011

6 files changed, 57 insertions, 39 deletions

diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 1c1cd9e7e..4e225659c 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 129483 2011-06-28 07:59:13Z ibiru $
+# $Id: PKGBUILD 136355 2011-08-27 09:31:43Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=gdk-pixbuf2
-pkgver=2.23.5
+pkgver=2.24.0
 pkgrel=1
-pkgdesc="An image loading library for gtk2"
+pkgdesc="An image loading library"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 license=('GPL2')
@@ -11,8 +11,8 @@ depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
 makedepends=('gtk-doc' 'gobject-introspection')
 options=('!libtool')
 install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/2.23/gdk-pixbuf-${pkgver}.tar.xz)
-sha256sums=('7a6c3550426f38f6b0eeeb49295654d9e706ce8f1786a4d0932f9d2c0d0bc500')
+source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-${pkgver}.tar.xz)
+sha256sums=('67c11d3aa40441c1cea42c365bf2d6a9a9dd52fae2d359a707ad5e8abb4d28a7')
 
 build() {
   cd "${srcdir}/gdk-pixbuf-${pkgver}"
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index d139715da..ba793daa7 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134393 2011-08-03 15:08:59Z giovanni $
+# $Id: PKGBUILD 136368 2011-08-27 23:37:57Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=1.9.1
+pkgver=1.9.2
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=(http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz
         mercurial.profile)
-md5sums=('601990cc58af8316af4e1ea63e19d1be'
+md5sums=('0bda8040e2626e70d3d1a0654b0b03f2'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 893bb15dc..f2bf421bf 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 130774 2011-07-07 23:14:56Z foutrelis $
+# $Id: PKGBUILD 136364 2011-08-27 19:56:26Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.3.0
+pkgver=2.3.1
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
@@ -17,10 +17,8 @@ makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
 optdepends=('python2-numpy: Python 2.x interface'
             'eigen2')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2"
-        'pypkgpath_nondebian.patch')
-md5sums=('dea5e9df241ac37f4439da16559e420d'
-         'eb884bad665047276e80556e44043a43')
+source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2")
+md5sums=('827c9f8aa14384c531c73aa165f9b777')
 
 _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
             '-D CMAKE_INSTALL_PREFIX=/usr'
@@ -49,9 +47,6 @@ _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
 build() {
   cd "$srcdir/$_realname-$pkgver"
 
-  # fix upstream's assumption of "debian-based"
-  patch -Np1 -i "$srcdir/pypkgpath_nondebian.patch"
-
   # x64, i.e "Athlon64" and upwards, can use SSE3
   [ $CARCH = x86_64 ] && \
     _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
@@ -72,18 +67,24 @@ package_opencv() {
   install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
+  cd "$pkgdir/usr/share"
+
+  # prepare FSH-friendly dirs
+  if [ -d OpenCV ]; then
+    mv opencv/samples OpenCV/
+    rm -r opencv
+    mv OpenCV opencv
+  fi
+
   # separate docs package; also be -R friendly
-  [ -d "$pkgdir/usr/share/opencv/doc" ] && \
-    mv "$pkgdir/usr/share/opencv/doc" "$srcdir/opencv-doc"
+  [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc"
 
   # separate samples package
-  [ -d "$pkgdir/usr/share/opencv/samples" ] && \
-    mv "$pkgdir/usr/share/opencv/samples" "$srcdir/opencv-samples"
+  [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples"
 }
 
 package_opencv-docs() {
   pkgdesc+=" (documentation)"
-  #arch=('any')
   depends=()
   optdepends=()
   options=('docs')
@@ -96,7 +97,6 @@ package_opencv-docs() {
 
 package_opencv-samples() {
   pkgdesc+=" (samples)"
-  #arch=('any')
   depends=()
   optdepends=()
   options=()
diff --git a/extra/opencv/opencv.install b/extra/opencv/opencv.install
index 7709a9cc3..ae3f50d5c 100644
--- a/extra/opencv/opencv.install
+++ b/extra/opencv/opencv.install
@@ -1,8 +1,7 @@
 post_install() {
-	echo "==> Documentation and samples are in separate packages:"
-	echo
-	echo "* opencv-docs"
-	echo "* opencv-samples"
+	echo "  Documentation and samples are in separate packages:"
+	echo "    * opencv-docs"
+	echo "    * opencv-samples"
 }
 
 post_upgrade() {
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 26af8f5e3..8e51af587 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136328 2011-08-26 12:41:22Z tpowa $
+# $Id: PKGBUILD 136362 2011-08-27 15:46:49Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
@@ -8,7 +8,7 @@ pkgver=3.6.0
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.6.0
-pkgrel=4
+pkgrel=6
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
@@ -41,6 +41,7 @@ build() {
               --with-piddir=/var/run/samba \
               --with-logfilebase=/var/log/samba \
               --sysconfdir=/etc \
+              --with-dnsupdate \
               --with-pam \
               --with-pam_smbpass \
               --with-pammodulesdir=/lib/security \
@@ -71,8 +72,8 @@ depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprog
     ln -sf /usr/lib/$i.so.0  ${pkgdir}/usr/lib/$i.so
   done
   mkdir ${pkgdir}/usr/lib/libsmb
-  ln -sf /usr/lib/libsmb/libsmbclient.so.0  ${pkgdir}/usr/lib/libsmb/libsmbclient.so.0
-  ln -sf /usr/lib/libsmb/libsmbclient.so.0  ${pkgdir}/usr/lib/libsmb/libsmbclient.so
+  ln -sf /usr/lib/libsmbclient.so.0  ${pkgdir}/usr/lib/libsmb/libsmbclient.so.0
+  ln -sf /usr/lib/libsmbclient.so.0  ${pkgdir}/usr/lib/libsmb/libsmbclient.so
   for i in libndr-krb5pac libndr-standard libndr; do
     install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0.0.1
     ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so.0
@@ -104,14 +105,21 @@ backup=(etc/logrotate.d/samba
 depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
 optdepends=('python2: for python bindings')
   cd ${srcdir}/samba-${_realver}/source3
-  mkdir -p ${pkgdir}/etc/samba/private
-  chmod 700 ${pkgdir}/etc/samba/private
   ../buildtools/bin/waf install --destdir=${pkgdir}
+  # fix permission on include files
   chmod 644 ${pkgdir}/usr/include/*.h
+  # remove wrong var directory
   rm -rf ${pkgdir}/usr/var
+  # create missing directories
+  mkdir -p ${pkgdir}/etc/samba/private
+  chmod 700 ${pkgdir}/etc/samba/private
+  mkdir -p ${pkgdir}/var/{lib,cache}/samba
+  mkdir -p ${pkgdir}/var/nmbd
+  mkdir -p ${pkgdir}/lib/security
+  mkdir -p ${pkgdir}/etc/samba
+  # install config files
   install -D -m755 ${startdir}/samba ${pkgdir}/etc/rc.d/samba
   install -D -m644 ${startdir}/samba.conf.d ${pkgdir}/etc/conf.d/samba
-  mkdir -p ${pkgdir}/etc/samba
   cat ../examples/smb.conf.default | \
     sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default
   install -D -m644 ${startdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba
@@ -122,6 +130,13 @@ optdepends=('python2: for python bindings')
   sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default
   # fix logrotate
   sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default
+  # run various install scripts
+  script/./installman.sh ${pkgdir}/usr/share/man . C
+  script/./installmo.sh ${pkgdir}/usr/share locale .
+  script/./installdat.sh ${pkgdir}/usr/lib samba .
+  chmod 755 script/./installmsg.sh
+  script/./installmsg.sh ${pkgdir}/usr/lib samba .
+  script/./installswat.sh ${pkgdir}/usr/share/samba swat .
   # remove conflict files of smbclient
   for man in libsmbclient smbspool \
       mount.cifs net cifs.upcall; do
@@ -130,6 +145,11 @@ optdepends=('python2: for python bindings')
   for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so libtdb-wrap.so libaddns.so libcliauth.so libtevent.so.0.9.11 libtevent.so.0 libwinbind-client.so; do
       rm -f ${pkgdir}/usr/lib/samba/$i
   done
+  # move libs to correct place
+  mv ${pkgdir}/usr/lib/pam*.so ${pkgdir}/lib/security
+  mv ${pkgdir}/usr/lib/libnss* ${pkgdir}/lib/
+  ln -sf /lib/libnss_wins.so.2 ${pkgdir}/lib/libnss_wins.so
+  ln -sf /lib/libnss_winbind.so.2 ${pkgdir}/lib/libnss_winbind.so
   mv ${pkgdir}/usr/lib/samba/*.so ${pkgdir}/usr/lib
   for i in libndr-krb5pac.* libsmbconf.*  libndr-standard.* libndr.* libnetapi.* libwbclient.* libsmbclient.*; do
       rm -f ${pkgdir}/usr/lib/$i
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index d8572f361..0f4be9c87 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 135814 2011-08-18 15:04:55Z andyrtr $
+# $Id: PKGBUILD 136353 2011-08-27 08:38:05Z ibiru $
 # Maintainer: Guillaume ALAUX <guillaume at alaux dot net>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=(wireshark-cli wireshark-gtk)
 pkgbase=wireshark
 pkgver=1.6.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL2')
-makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'lua')
+makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua')
 url="http://www.wireshark.org/"
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
@@ -15,7 +15,6 @@ md5sums=('dc1e8c9800b64130674b120a183e2308')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  export CFLAGS="-fno-unit-at-a-time ${CFLAGS}"
 
   ./configure \
       --prefix=/usr \
@@ -27,7 +26,7 @@ build() {
 
 package_wireshark-cli() {
   pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version"
-  depends=('krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2' 'lua')
+  depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua')
   install=wireshark.install
   conflicts=(wireshark)