diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/avahi/PKGBUILD | 77 | ||||
-rw-r--r-- | extra/avahi/avahi-daemon-dbus.patch | 8 | ||||
-rw-r--r-- | extra/nx-common/PKGBUILD | 80 | ||||
-rw-r--r-- | extra/nx-common/nxcompsh-gcc43.patch | 19 | ||||
-rw-r--r-- | extra/nxserver/PKGBUILD | 112 | ||||
-rw-r--r-- | extra/openjdk6/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/openjdk6/nonreparenting-wm.diff | 16 | ||||
-rw-r--r-- | extra/qemu-kvm/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/unison/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/yp-tools/PKGBUILD | 11 | ||||
-rw-r--r-- | extra/ypbind-mt/PKGBUILD | 12 | ||||
-rw-r--r-- | extra/ypbind-mt/nisdomainname.conf | 4 | ||||
-rwxr-xr-x | extra/ypbind-mt/ypbind | 55 |
13 files changed, 213 insertions, 205 deletions
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 2cd51fe07..63f079778 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 118164 2011-04-05 16:57:59Z bisson $ +# $Id: PKGBUILD 126809 2011-06-07 12:12:31Z bisson $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.30 -pkgrel=2 +pkgrel=3 pkgdesc='A multicast/unicast DNS-SD framework' arch=('i686' 'x86_64') url='http://www.avahi.org/' @@ -27,54 +27,49 @@ conflicts=('howl' 'mdnsresponder') provides=('howl' 'mdnsresponder') replaces=('howl' 'mdnsresponder') options=('!libtool') -source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz - avahi-daemon-dbus.patch - gnome-nettool.png) +source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" + 'avahi-daemon-dbus.patch' + 'gnome-nettool.png') sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06' - '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61' + '36735096a6eeb3a4012fe14f875259ee8558e220' 'cf56387c88aed246b9f435efc182ef44de4d52f3') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf - patch -Np0 -i "${srcdir}/avahi-daemon-dbus.patch" + sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf + patch -p1 -i "../avahi-daemon-dbus.patch" - # pygtk requires python2; make it explicit in case other python are installed: FS#21865 - PYTHON=python2 \ - PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-monodoc \ - --disable-doxygen-doc \ - --disable-xmltoman \ - --enable-compat-libdns_sd \ - --enable-compat-howl \ - --with-distro=archlinux \ - --with-avahi-priv-access-group=network \ - --with-autoipd-user=avahi \ - --with-autoipd-group=avahi \ - --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999 + # pygtk requires python2; make it explicit in case other python are installed: FS#21865 + PYTHON=python2 \ + PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-monodoc \ + --disable-doxygen-doc \ + --disable-xmltoman \ + --enable-compat-libdns_sd \ + --enable-compat-howl \ + --with-distro=archlinux \ + --with-avahi-priv-access-group=network \ + --with-autoipd-user=avahi \ + --with-autoipd-group=avahi \ + --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999 - make + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png - make DESTDIR="${pkgdir}" install - - # howl and mdnsresponder compatability - cd "${pkgdir}"/usr/include - ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h - ln -s avahi-compat-howl howl - cd "${pkgdir}"/usr/lib/pkgconfig - ln -s avahi-compat-howl.pc howl.pc - - sed -i '1c #!/usr/bin/python2' "$pkgdir"/usr/bin/avahi-{bookmarks,discover} - - install -D -m 644 "${srcdir}"/gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png + cd "${pkgdir}" + sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} + # howl and mdnsresponder compatability + (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) + (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) } diff --git a/extra/avahi/avahi-daemon-dbus.patch b/extra/avahi/avahi-daemon-dbus.patch index a168f0387..ef7272082 100644 --- a/extra/avahi/avahi-daemon-dbus.patch +++ b/extra/avahi/avahi-daemon-dbus.patch @@ -1,11 +1,11 @@ ---- initscript/archlinux/avahi-daemon.in 2010-08-17 22:23:46.510293144 +0200 -+++ initscript/archlinux/avahi-daemon.in 2010-08-17 22:46:58.110163026 +0200 -@@ -33,6 +35,8 @@ +diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in +--- old/initscript/archlinux/avahi-daemon.in 2010-06-29 05:30:35.000000000 +0200 ++++ new/initscript/archlinux/avahi-daemon.in 2011-06-07 12:20:03.237701492 +0200 +@@ -33,6 +33,7 @@ case "$1" in start) + ck_daemon dbus && /etc/rc.d/dbus start -+ modprobe capability &> /dev/null stat_busy "Starting $DESC" $DAEMON -D > /dev/null 2>&1 if [ $? -gt 0 ]; then diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD index ae282c3c4..85fc78ce6 100644 --- a/extra/nx-common/PKGBUILD +++ b/extra/nx-common/PKGBUILD @@ -1,58 +1,54 @@ -# $Id: PKGBUILD 75689 2010-04-02 17:16:35Z andyrtr $ -# Maintainer Tobias Powalowski <tpowa@archlinux.org> +# $Id: PKGBUILD 126698 2011-06-06 18:56:52Z andyrtr $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> + pkgname=nx-common -pkgver=3.4.0 -pkgrel=4 +pkgver=3.5.0 +pkgrel=1 pkgdesc="NoMachine NX common package for client and server" arch=('i686' 'x86_64') license=('GPL') url="http://nomachine.com/" -depends=('libjpeg>=8' 'libpng>=1.4.0' 'openssl>=1.0.0' 'gcc-libs' 'audiofile' 'alsa-lib' 'bash') -source=(\ -#Compression libs and proxy sources -http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-7.tar.gz \ -http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz \ -# ESD Support -http://64.34.161.181/download/$pkgver/sources/nxesd-$pkgver-2.tar.gz -# 64bit fixes -NXproto.h.64bit.diff -nx-gcc44.patch) +depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.4.5' 'openssl>=1.0.0' 'gcc-libs' 'bash') +makedepends=('xorg-server-devel') +source=( #Compression libs and proxy sources + http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-1.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-1.tar.gz + nxcompsh-gcc43.patch) options=(!libtool) -md5sums=('cba926f2b855231a8fc3e0dabff52855' - '18b81d850223ea84de244f8a9509c4b1' - '65d55f2a86baa59343432261cabd52ec' - '58341ba70dfab92ff38570071fbbf88a' - 'c805442f1500d8d6de15ec224f63277e') +md5sums=('30a182146479004ec63b8a1b9adccfcf' + '84ade443b79ea079380b754aba9d392e' + '9f13262bc0bf5187fcc7e22924955bc7' + 'b6c279654dac421fc3dd1a27d66ff53c') build() { - cd ${srcdir} -# patch -Np1 -i ${srcdir}/nx-gcc44.patch - + # nxcomp + cd ${srcdir}/nxcomp + ./configure --prefix=/opt/NX + make + # nxcompsh + cd ${srcdir}/nxcompsh + patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch + ./configure --prefix=/opt/NX + make + # nxssh + cd ${srcdir}/nxssh + ./configure --prefix=/opt/NX + make +} + +package() { mkdir -p ${pkgdir}/opt/NX/bin mkdir -p ${pkgdir}/opt/NX/lib + # nxcomp cd ${srcdir}/nxcomp - if [ "$CARCH" = "x86_64" ]; then - patch -Np1 -i ../NXproto.h.64bit.diff || return 1 - fi - - ./configure --prefix=/opt/NX - make || return 1 - cp -a libXcomp.so.* ${pkgdir}/opt/NX/lib - cd ${pkgdir}/opt/NX/lib - ln -s libXcomp.so.1 libXcomp.so - + cp -a libXcomp.so* ${pkgdir}/opt/NX/lib + # nxcompsh + cd ${srcdir}/nxcompsh + cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib + # nxssh cd ${srcdir}/nxssh - ./configure --prefix=/opt/NX - make || return 1 install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh - - cd ${srcdir}/nxesd - ./configure --prefix=/opt/NX - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - # fix libxcomp linking - cd ${pkgdir}/opt/NX/lib - ln -s libXcomp.so.3 libXcomp.so.1 } diff --git a/extra/nx-common/nxcompsh-gcc43.patch b/extra/nx-common/nxcompsh-gcc43.patch new file mode 100644 index 000000000..681a0dab5 --- /dev/null +++ b/extra/nx-common/nxcompsh-gcc43.patch @@ -0,0 +1,19 @@ +--- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 ++++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 +@@ -18,10 +18,12 @@ + #ifndef Misc_H + #define Misc_H + +-#include <iostream.h> ++#include <iostream> + +-#include <errno.h> +-#include <string.h> ++#include <cerrno> ++#include <cstring> ++ ++using namespace std; + + // + // Error handling macros. + diff --git a/extra/nxserver/PKGBUILD b/extra/nxserver/PKGBUILD index 5609baf0b..99b5bc2aa 100644 --- a/extra/nxserver/PKGBUILD +++ b/extra/nxserver/PKGBUILD @@ -1,96 +1,92 @@ -# $Id: PKGBUILD 109665 2011-02-11 18:01:54Z andyrtr $ +# $Id: PKGBUILD 126704 2011-06-06 19:21:37Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> pkgname=nxserver -pkgver=3.4.0 -pkgrel=8 +pkgver=3.5.0 +pkgrel=1 pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme." arch=(i686 x86_64) url="http://nomachine.com/" license=('GPL') -depends=("nx-common>=$pkgver" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' +depends=("nx-common" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' #>=$pkgver 'libxpm' 'libpng>=1.4.0' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2' 'xorg-sessreg') makedepends=('imake') source=( #X11 support programs and libraries -http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-4.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-7.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-3.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-7.tar.gz +http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-1.tar.gz +http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-1.tar.gz +http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-1.tar.gz +http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-1.tar.gz # needed to provide NX.h and -LXcomp - part of nx-common #X11 Agent sources -http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-16.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-2.tar.gz +http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-2.tar.gz +http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz # needed to get X11 built - part of nx-common #Compression libs and proxy sources -http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-2.tar.gz +http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-1.tar.gz http://64.34.161.181/download/$pkgver/sources/nxcompext-$pkgver-1.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-3.tar.gz -#64bit fixes -NXproto.h.64bit.diff +http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz # gcc 43 fix -nxcompsh-gcc43.patch -nxcompshad-gcc43.patch -nx-gcc44.patch) +nxcompsh-gcc43.patch) options=(!libtool) -md5sums=('38a84d4521a41e5ff988a84181ddcaf5' - 'f45d183360067ede979c18fc964824ab' - 'bfb758edd51271b31aa6b902557fa0cc' - 'cba926f2b855231a8fc3e0dabff52855' - 'ec82183635a6ef627cb19d53d4a004ce' - 'f94501249ad7d4453524f88ef0cfb1ff' - '95ce93520d463a3d18cdd5d19c321e85' - '605a8e2a136f89477f0059a0d2af4582' - '15deba68e12e13b524a723b49e7ec813' - '58341ba70dfab92ff38570071fbbf88a' - 'b6c279654dac421fc3dd1a27d66ff53c' - '01cea8bc5997ae2c3790cbcb7d624c86' - 'c805442f1500d8d6de15ec224f63277e') +md5sums=('54ac7dd8806928b991b0819cf76b37dd' + '271cef5b5345b8de77b0f6a0ce1a3b0d' + 'cf38ec1e5a5f6453946cd387c14f2684' + '30a182146479004ec63b8a1b9adccfcf' + '7b0f60d5a3c54f22da7d81aac055836e' + '84ade443b79ea079380b754aba9d392e' + '488bb4d9b8e9f82dc272b4e6e9c57d30' + 'abde2ccc33e31fc695031c2cfb60f3dd' + '90a762dd9eb19c8c97876ad837923857' + 'b6c279654dac421fc3dd1a27d66ff53c') build() { cd ${srcdir} - mkdir -p ${pkgdir}/opt/NX/bin - mkdir -p ${pkgdir}/opt/NX/lib - patch -Np0 -i ${srcdir}/nxcompsh-gcc43.patch || return 1 - patch -Np0 -i ${srcdir}/nxcompshad-gcc43.patch || return 1 -# patch -Np1 -i ../nx-gcc44.patch || return 1 - + + # nxcomp cd ${srcdir}/nxcomp - if [ "$CARCH" = "x86_64" ]; then - patch -Np1 -i ../NXproto.h.64bit.diff || return 1 - fi ./configure --prefix=/opt/NX - make || return 1 - + make + # nxcompshad cd ${srcdir}/nxcompshad ./configure --prefix=/opt/NX - make || return 1 - cp -a libXcompshad.so* ${pkgdir}/opt/NX/lib - + make + # nxcompsh cd ${srcdir}/nxcompsh + patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch ./configure --prefix=/opt/NX - make || return 1 - cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib - + make + # nxproxy cd ${srcdir}/nxproxy ./configure --prefix=/opt/NX - make || return 1 - make prefix=${pkgdir}/opt/NX install || return 1 + make + # nx-X11 + cd ${srcdir}/nx-X11 + make World + # nxcompext + cd ${srcdir}/nxcompext + ./configure --prefix=/opt/NX + make +} +package() { + mkdir -p ${pkgdir}/opt/NX/bin + mkdir -p ${pkgdir}/opt/NX/lib + + # nxcompshad + cd ${srcdir}/nxcompshad + cp -a libXcompshad.so* ${pkgdir}/opt/NX/lib + # nxproxy + cd ${srcdir}/nxproxy + make prefix=${pkgdir}/opt/NX install + # nx-X11 cd ${srcdir}/nx-X11 - make World || return 1 cp -a lib/X11/libX11.so* ${pkgdir}/opt/NX/lib cp -a lib/Xext/libXext.so* ${pkgdir}/opt/NX/lib cp -a lib/Xrender/libXrender.so* ${pkgdir}/opt/NX/lib install -D -m755 programs/Xserver/nxagent ${pkgdir}/opt/NX/bin/nxagent install -D -m755 programs/nxauth/nxauth ${pkgdir}/opt/NX/bin/nxauth - + # nxcompext cd ${srcdir}/nxcompext - ./configure --prefix=/opt/NX - make || return 1 cp -a libXcompext.so* ${pkgdir}/opt/NX/lib - - # fix libXcompext linking - cd ${pkgdir}/opt/NX/lib - ln -s libXcompext.so.3 libXcompext.so.1 -} +}
\ No newline at end of file diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index 306b2e386..6b490bb32 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126340 2011-06-04 23:48:31Z andyrtr $ +# $Id: PKGBUILD 126852 2011-06-08 05:53:21Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -6,12 +6,12 @@ pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" #_date=20100715 _javaver=6 -_icedteaver=1.10.1 +_icedteaver=1.10.2 _openjdk_version=b22 _openjdk_date=28_feb_2011 #pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date} pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} -pkgrel=2 +pkgrel=1 url='http://icedtea.classpath.org' arch=('i686' 'x86_64') license=('custom') @@ -32,7 +32,7 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar openjdk6.profile openjdk6.profile.csh) noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz) -md5sums=('f3b31b9f591afc752372addacb1eb335' +md5sums=('83041b2d0de66cb5289813cc6f05af11' '2d2bbbb0f9b81f1fec41ec730da8a933' 'ef7a8b3624ea904bf584bc46d79b5e75' '91adfd41e6f001add4f92ae31216b1e3' @@ -40,7 +40,7 @@ md5sums=('f3b31b9f591afc752372addacb1eb335' '5da3e39fa60985576c4f37d1491efbe2' 'f7e7a212e50abb56a6ef1a2b1bd27405' 'ee1afda124d5927345014ab382ef581e' - '409812b5675f9678b1c9e1a12a945a9a' + '9b4d368f5ee08de248eaf029303a446c' '74c4a7adc782edd087802bf92ae3d6d0' 'fdf295e2f186dfa4d308691a3d7ac8c5') diff --git a/extra/openjdk6/nonreparenting-wm.diff b/extra/openjdk6/nonreparenting-wm.diff index ec890b434..65fa66e89 100644 --- a/extra/openjdk6/nonreparenting-wm.diff +++ b/extra/openjdk6/nonreparenting-wm.diff @@ -2,22 +2,16 @@ diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/solaris/clas index 68d1ff7..878327e 100644 --- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java +++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java -@@ -98,11 +98,14 @@ class XWM implements MWMConstants, XUtilConstants { - ICE_WM = 10, +@@ -99,7 +99,8 @@ METACITY_WM = 11, COMPIZ_WM = 12, -- LG3D_WM = 13; -+ LG3D_WM = 13, -+ OTHER_NONREPARENTING_WM = 14; + LG3D_WM = 13, +- MUTTER_WM = 14; ++ MUTTER_WM = 14, ++ OTHER_NONREPARENTING_WM = 15; public String toString() { switch (WMID) { case NO_WM: - return "NO WM"; -+ case OTHER_NONREPARENTING_WM: -+ return "Other non-reparenting WM"; - case OTHER_WM: - return "Other WM"; - case OPENLOOK_WM: @@ -564,7 +567,7 @@ class XWM implements MWMConstants, XUtilConstants { } diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index 8e1165edc..04b21679e 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 124173 2011-05-17 12:44:55Z tpowa $ +# $Id: PKGBUILD 126938 2011-06-08 20:01:54Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm -pkgver=0.14.0 +pkgver=0.14.1 pkgrel=2 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64) @@ -53,5 +53,5 @@ package() esac done } -md5sums=('4ea6f412d85a826e0b0690f5c4c59f13' +md5sums=('ed37a2c0b1981220b842920140574c63' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/unison/PKGBUILD b/extra/unison/PKGBUILD index 021950ef5..059ab98a2 100644 --- a/extra/unison/PKGBUILD +++ b/extra/unison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 110780 2011-02-22 07:48:24Z tpowa $ +# $Id: PKGBUILD 126943 2011-06-08 20:05:25Z tpowa $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=unison -pkgver=2.40.61 -pkgrel=1 +pkgver=2.40.63 +pkgrel=2 pkgdesc="Unison is a file-synchronization tool" arch=(i686 x86_64) license=('GPL2') @@ -42,5 +42,5 @@ build() { cd $startdir/pkg//usr/bin ln -s unison-gtk2 unison-x11 } -md5sums=('9d48796b115704321c6a4a50dd0928ee' +md5sums=('3281207850cf6f0a17fe73f371893bd3' '2daecba7705455a8e4b769e48b059872') diff --git a/extra/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD index 9d09fd38a..8cf4b6960 100644 --- a/extra/yp-tools/PKGBUILD +++ b/extra/yp-tools/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 91704 2010-09-27 17:42:28Z bisson $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 126193 2011-06-02 14:34:36Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=yp-tools pkgver=2.12 -pkgrel=1 +pkgrel=2 pkgdesc='Linux NIS Tools' arch=('i686' 'x86_64') url='http://www.linux-nis.org/nis/yp-tools/' license=('GPL2') -depends=('ypbind-mt' 'glibc') +depends=('ypbind-mt') source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz") sha1sums=('10b0ef5d4c5723e0716d7a1431a900c0ba6ef703') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --disable-domainname + ./configure --prefix=/usr make } diff --git a/extra/ypbind-mt/PKGBUILD b/extra/ypbind-mt/PKGBUILD index ddb807725..45cf58258 100644 --- a/extra/ypbind-mt/PKGBUILD +++ b/extra/ypbind-mt/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 123631 2011-05-11 23:05:30Z bisson $ +# $Id: PKGBUILD 126308 2011-06-04 12:37:21Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ypbind-mt pkgver=1.33 -pkgrel=1 +pkgrel=2 pkgdesc='Linux NIS daemon' arch=('i686' 'x86_64') url='http://www.linux-nis.org/nis/ypbind-mt/' license=('GPL2') depends=('rpcbind' 'openslp') -backup=('etc/yp.conf' 'etc/conf.d/ypbind') +optdepends=('yp-tools: to set a domain name') +backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname') source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz" + 'nisdomainname.conf' 'ypbind.conf' 'ypbind') sha1sums=('49f578d15aa5d4f4130a2e96cd9c0e519263fc88' + 'eb00aecc0679e25a36b007e797f4468b40cb3e8e' '07dee386d001fb9e9e6b76dda8af5b2092e5a4a2' - '66f6ea2f622e0724e6017bf835d4f7f4a5bf9534') + '112fc2aedfe3f761325b69647b7938bc1be5bfcd') build() { cd "$srcdir/$pkgname-$pkgver" @@ -31,5 +34,6 @@ package() { install -D -m644 etc/yp.conf "$pkgdir"/etc/yp.conf install -D -m755 ../ypbind "$pkgdir"/etc/rc.d/ypbind install -D -m644 ../ypbind.conf "$pkgdir"/etc/conf.d/ypbind + install -D -m644 ../nisdomainname.conf "$pkgdir"/etc/conf.d/nisdomainname install -d -m755 "$pkgdir"/var/yp/binding } diff --git a/extra/ypbind-mt/nisdomainname.conf b/extra/ypbind-mt/nisdomainname.conf new file mode 100644 index 000000000..bbbbf8fc7 --- /dev/null +++ b/extra/ypbind-mt/nisdomainname.conf @@ -0,0 +1,4 @@ +# +# NIS domain to be set in /etc/rc.d/ypbind +# +NISDOMAINNAME="" diff --git a/extra/ypbind-mt/ypbind b/extra/ypbind-mt/ypbind index 5ef5cf5b3..6a5ef11e3 100755 --- a/extra/ypbind-mt/ypbind +++ b/extra/ypbind-mt/ypbind @@ -2,35 +2,34 @@ . /etc/rc.conf . /etc/rc.d/functions + . /etc/conf.d/ypbind +. /etc/conf.d/nisdomainname + +name=ypbind +PID=$(pidof -o %PPID /usr/sbin/ypbind) case "$1" in - start) - stat_busy "Starting NIS Bind Daemon" - [ -f /etc/defaultdomain ] && /bin/domainname -F /etc/defaultdomain - /usr/sbin/ypbind $YPBIND_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ypbind - stat_done - fi - ;; - stop) - stat_busy "Stopping NIS Bind Daemon" - killall -q /usr/sbin/ypbind - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ypbind - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" +start) + stat_busy "Starting $name daemon" + [[ -n $NISDOMAINNAME ]] && /usr/bin/domainname "$NISDOMAINNAME" &>/dev/null + [[ -z "$PID" ]] && /usr/sbin/ypbind $YPBIND_ARGS &>/dev/null \ + && { add_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +stop) + stat_busy "Stopping $name daemon" + [[ -n "$PID" ]] && kill $PID &>/dev/null \ + && { rm_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +restart) + $0 stop + sleep 1 + $0 start + ;; +*) + echo "usage: $0 {start|stop|restart}" + exit 1 + ;; esac |