diff options
| author | root <root@rshg047.dnsready.net> | 2011-05-12 22:37:15 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-05-12 22:37:15 +0000 |
| commit | 1982ae8d63ab142a2a16bdf1b055110d9c9f40fd (patch) | |
| tree | dbb34352753ef1b7e1893aa225490fad5306ba22 | |
| parent | 5c25d28847bcae8c3c51c1babcb09d36c7fbddba (diff) | |
Thu May 12 22:37:08 UTC 2011
91 files changed, 1944 insertions, 333 deletions
diff --git a/community/arch/PKGBUILD b/community/arch/PKGBUILD index 648f29206..2be3a270a 100644 --- a/community/arch/PKGBUILD +++ b/community/arch/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 75248 2010-04-01 04:38:12Z allan $ +# $Id: PKGBUILD 46342 2011-05-05 11:48:15Z spupykin $ # Maintainer: Judd Vinet <jvinet@zeroflux.org> -pkgname=arch +pkgname='arch' pkgver=1.3.5 -pkgrel=7 +pkgrel=8 pkgdesc="a modern and remarkable revision control system" arch=('i686' 'x86_64') license=('GPL') url="http://regexps.srparish.net/www/#Gnu-arch" -depends=('zlib' 'expat' 'heimdal') +depends=('zlib' 'expat' 'krb5') +options=('!makeflags') source=(ftp://ftp.gnu.org/gnu/gnu-arch/tla-$pkgver.tar.gz) md5sums=('db31ee89bc4788eef1eba1cee6c176ef') -options=('!makeflags') build() { cd "${srcdir}/tla-$pkgver/src" mkdir =build cd =build ../configure --prefix /usr - make || return 1 + make +} + +package() { + cd "${srcdir}/tla-$pkgver/src/=build" make prefix="${pkgdir}/usr" install } diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD index 6f03f7db5..11ac57ec1 100644 --- a/community/autofs/PKGBUILD +++ b/community/autofs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 41838 2011-03-09 17:53:24Z lfleischer $ +# $Id: PKGBUILD 46345 2011-05-05 11:57:37Z spupykin $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> @@ -6,12 +6,12 @@ pkgname=autofs pkgver=5.0.5 -pkgrel=5 +pkgrel=6 pkgdesc='A kernel-based automounter for Linux.' arch=('i686' 'x86_64') url='http://freshmeat.net/projects/autofs' license=('GPL2') -depends=('libldap' 'libxml2' 'heimdal') +depends=('libldap' 'libxml2' 'krb5') backup=('etc/autofs/auto.master' 'etc/autofs/auto.misc' 'etc/conf.d/autofs') @@ -21,21 +21,18 @@ source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgv 'autofs' 'autofs.conf.d' 'auto.master' - 'auto.misc' - 'heimdal.patch') + 'auto.misc') md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a' 'e307bf6d2638e46eeb916cf42fe029b2' '47f597c870410055e0fdb66103daf928' 'a6cefb591e77b31b79dbb7243646c96b' - 'd8a15ec9186c5c0b36e5cea1e2739e8a' - 'efd46b6406b940cb48f7c6197790fb8e') + 'd8a15ec9186c5c0b36e5cea1e2739e8a') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \ Makefile.rules - patch -Np1 -i "${srcdir}/heimdal.patch" ./configure --prefix=/usr --sysconfdir=/etc/autofs --with-mapdir=/etc/autofs --without-hesiod \ --enable-ignore-busy @@ -46,7 +43,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make INSTALLROOT="${pkgdir}" install - + install -Dm0644 "${srcdir}/auto.master" "${pkgdir}/etc/autofs/auto.master" install -Dm0644 "${srcdir}/auto.misc" "${pkgdir}/etc/autofs/auto.misc" install -Dm0755 "${srcdir}/autofs" "${pkgdir}/etc/rc.d/autofs" diff --git a/community/cadaver/PKGBUILD b/community/cadaver/PKGBUILD index e111b33b5..ec11fd70f 100644 --- a/community/cadaver/PKGBUILD +++ b/community/cadaver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 25264 2010-09-03 11:24:01Z spupykin $ +# $Id: PKGBUILD 46500 2011-05-07 23:09:15Z stephane $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=cadaver pkgver=0.23.3 -pkgrel=1 +pkgrel=2 pkgdesc="Command-line WebDAV client for Unix" arch=('i686' 'x86_64') url="http://www.webdav.org/cadaver" @@ -16,6 +16,10 @@ md5sums=('502ecd601e467f8b16056d2acca39a6f') build() { cd $srcdir/cadaver-$pkgver ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd $srcdir/cadaver-$pkgver make prefix=$pkgdir/usr install } diff --git a/community/docky/PKGBUILD b/community/docky/PKGBUILD index 8767c5d68..9cbc361dc 100644 --- a/community/docky/PKGBUILD +++ b/community/docky/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 42638 2011-03-18 21:02:48Z heftig $ +# $Id: PKGBUILD 46732 2011-05-11 08:50:44Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: dieghen89 <dieghen89@gmail.com> # Contributor: Alessio 'Bl@ster' Biancalana <dottorblaster@gmail.com> pkgname=docky -pkgver=2.1.1 +pkgver=2.1.2 pkgrel=1 pkgdesc="The finest dock no money can buy!" url="https://launchpad.net/docky" @@ -16,10 +16,8 @@ depends=(gnome-desktop-sharp gnome-keyring-sharp gtk2 mono-addins makedepends=(intltool) options=('!libtool' '!emptydirs') install=docky.install -source=("http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz" - "bzr-1798.diff") -md5sums=('628418e11088b96d47287dac6e838507' - 'e7fddf932967d37ad9bc060ba3bda15f') +source=("http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz") +md5sums=('a3597810198714b14dfbc9cfd1222fd2') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,8 +25,6 @@ build() { export MONO_SHARED_DIR="$srcdir/.wabi" mkdir -p "$MONO_SHARED_DIR" - patch -Np0 -i "$srcdir/bzr-1798.diff" - ./configure \ --prefix=/usr \ --sysconfdir=/etc diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index ed1322404..3727a8cb3 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,36 +1,41 @@ -# $Id: PKGBUILD 44168 2011-04-04 11:24:12Z spupykin $ +# $Id: PKGBUILD 45793 2011-04-29 10:36:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.1.10 -pkgrel=5 +pkgrel=6 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" license=("GPL") -depends=('openssl' 'heimdal' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam' \ +depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam' \ 'postgresql-libs>=9.0.3' 'libtool' 'libmysqlclient' 'gdbm' 'shadow') optdepends=('libpcap' 'unixodbc' 'python2') options=('!libtool' 'emptydirs' '!makeflags') install=$pkgname.install source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2 \ - radiusd) + radiusd + krb5-build-fix.patch) md5sums=('8ea2bd39460a06212decf2c14fdf3fb8' - 'f1a6530b1b69d2fa793aa45b2de379bb') + 'f1a6530b1b69d2fa793aa45b2de379bb' + 'c6a61de7576933f59154a53bfc12a2d2') build() { cd $srcdir/freeradius-server-$pkgver export CFLAGS="$CFLAGS -fno-strict-aliasing" - # Fix compilation with heimdal >= 1.3.1 - # Don't mess around with KRB5_DEPRECATED which is used internally :o sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in + patch -p1 <$srcdir/krb5-build-fix.patch ./configure --with-system-libtool --with-system-libltdl \ --prefix=/usr --enable-heimdal-krb5 \ --localstatedir=/var \ --sysconfdir=/etc \ --libdir=/usr/lib/freeradius make +} + +package() { + cd $srcdir/freeradius-server-$pkgver make install R=$pkgdir install -D -m755 ../radiusd $pkgdir/etc/rc.d/radiusd chmod o+r $pkgdir/etc/raddb/* diff --git a/community/freeradius/krb5-build-fix.patch b/community/freeradius/krb5-build-fix.patch new file mode 100644 index 000000000..11dae7090 --- /dev/null +++ b/community/freeradius/krb5-build-fix.patch @@ -0,0 +1,21 @@ +diff -wbBur freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c +--- freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c 2010-09-28 11:03:56.000000000 +0000 ++++ freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c 2011-04-29 09:26:10.000000000 +0000 +@@ -375,7 +375,7 @@ + * Heimdal krb5 verification + */ + radlog(L_AUTH, "rlm_krb5: Parsed name is: %s@%s\n", +- *userP->name.name_string.val, ++ "-" /* *userP->name.name_string.val*/, + userP->realm); + + krb5_cc_default(context, &id); +@@ -390,7 +390,7 @@ + + radlog(L_AUTH, "rlm_krb5: failed verify_user: %s (%s@%s )", + error_message(ret), +- *userP->name.name_string.val, ++ "-" /* *userP->name.name_string.val */, + userP->realm); + + return RLM_MODULE_REJECT; diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD index 9d4e3ed24..f845453fe 100644 --- a/community/freerdp/PKGBUILD +++ b/community/freerdp/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 32552 2010-11-14 16:59:14Z spupykin $ +# $Id: PKGBUILD 45796 2011-04-29 10:42:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stijn Segers <francesco dot borromini at gmail dot com> pkgname=freerdp pkgver=0.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Free RDP client" arch=('i686' 'x86_64') url="http://freerdp.sourceforge.net" license=('GPL') depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib') +makedepends=('krb5') conflicts=('freerdp-git') changelog=${pkgname}.changelog options=('!libtool') @@ -21,5 +22,9 @@ build() { [ -x configure ] || sh ./autogen.sh ./configure --prefix=/usr make +} + +package() { + cd `find ${srcdir}/ -type d -name freerdp-\*` make DESTDIR="${pkgdir}" install } diff --git a/community/grace/PKGBUILD b/community/grace/PKGBUILD index c0bd0d791..3a74d0fb0 100644 --- a/community/grace/PKGBUILD +++ b/community/grace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 32615 2010-11-15 22:22:27Z spupykin $ +# $Id: PKGBUILD 46737 2011-05-11 10:00:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: damir <damir@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=grace pkgver=5.1.22 -pkgrel=4 +pkgrel=5 pkgdesc="2D plotting tool" arch=(i686 x86_64) url="http://plasma-gate.weizmann.ac.il/Grace/" @@ -14,7 +14,6 @@ makedepends=('netcdf' 'fftw') license=('GPL') source=(ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/$pkgname-$pkgver.tar.gz) md5sums=('672356466f18fe59ed21a8fb44f9851d') -md5sums=('672356466f18fe59ed21a8fb44f9851d') build() { cd $srcdir/$pkgname-$pkgver @@ -23,6 +22,10 @@ build() { --includedir=/usr/include --libdir=/usr/lib \ -with-helpviewer="firefox %s" make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install cd $pkgdir/usr/share/grace && mv bin lib include ../../ } diff --git a/community/gsasl/PKGBUILD b/community/gsasl/PKGBUILD index c71b7ceb4..01c39c725 100644 --- a/community/gsasl/PKGBUILD +++ b/community/gsasl/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 32555 2010-11-14 16:59:49Z spupykin $ +# $Id: PKGBUILD 45799 2011-04-29 10:48:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Orivej Desh <smpuj@bk.ru> # Maintainer: Orivej Desh <smpuj@bk.ru> pkgname=gsasl pkgver=1.5.4 -pkgrel=1 +pkgrel=2 pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms" arch=("i686" "x86_64") url="http://josefsson.org/gsasl/" license=("GPL") -depends=(gnutls libidn heimdal) +depends=('gnutls' 'libidn' 'krb5') source=("ftp://alpha.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz") md5sums=('44cf5073a6ee2d77d526605bd6ab3904') @@ -18,6 +18,10 @@ build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install rm "$pkgdir/usr/share/info/dir" "$pkgdir/usr/lib/libgsasl.la" } diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD index fc17ae173..77a72f6df 100644 --- a/community/ipsec-tools/PKGBUILD +++ b/community/ipsec-tools/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 43019 2011-03-23 21:22:06Z spupykin $ +# $Id: PKGBUILD 45815 2011-04-29 12:08:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Allan Henriksen <allan.henriksen@gmail.com> pkgname=ipsec-tools pkgver=0.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="KAME IPSec tools ported to Linux" arch=('i686' 'x86_64') url="http://ipsec-tools.sourceforge.net/" -depends=('readline' 'openssl') +depends=('readline' 'openssl' 'krb5') license=('GPL') options=('!makeflags' '!libtool') source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2 racoon.rc ipsec.rc) md5sums=('b79aae3055a51f8de5c0f1b8ca6cf619' - 'a9d89177f0eecd1df4fbe21c201ee046' + '416b8e362d86987b8c55f7153cdafbeb' '90d0810267cbd847383ae3101699b192') build() { @@ -23,8 +23,12 @@ build() { sed -i 's#-Werror##' configure ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \ - --enable-adminport + --enable-adminport --enable-gssapi make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install install -Dm0755 $srcdir/racoon.rc $pkgdir/etc/rc.d/racoon install -Dm0755 $srcdir/ipsec.rc $pkgdir/etc/rc.d/ipsec diff --git a/community/ipsec-tools/racoon.rc b/community/ipsec-tools/racoon.rc index 92eccb4e7..1a67dcac5 100755 --- a/community/ipsec-tools/racoon.rc +++ b/community/ipsec-tools/racoon.rc @@ -30,6 +30,6 @@ case "$1" in $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac exit 0 diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD index 0064708a5..a95e65ca1 100644 --- a/community/mygui/PKGBUILD +++ b/community/mygui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 41951 2011-03-11 07:40:58Z ibiru $ +# $Id: PKGBUILD 46788 2011-05-11 17:19:25Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrew Belitsky <belitsky.a@gmail.com> pkgbase=mygui pkgname=('mygui' 'mygui-docs') pkgver=3.0.1 -pkgrel=6 +pkgrel=7 pkgdesc="A multilayer and overlappable GUI System for OGRE" arch=('i686' 'x86_64') url="http://mygui.info/" diff --git a/community/pam-krb5/PKGBUILD b/community/pam-krb5/PKGBUILD index c31c91ca4..5c9798514 100644 --- a/community/pam-krb5/PKGBUILD +++ b/community/pam-krb5/PKGBUILD @@ -1,18 +1,16 @@ -# $Id: PKGBUILD 36761 2011-01-07 19:49:35Z kchen $ +# $Id: PKGBUILD 46339 2011-05-05 11:43:20Z spupykin $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Ryan Corder <ryanc@greengrey.org> pkgname=pam-krb5 pkgver=4.4 -pkgrel=1 +pkgrel=2 pkgdesc='A PAM module providing Kerberos v5 support.' arch=('i686' 'x86_64') url='http://www.eyrie.org/~eagle/software/pam-krb5/' license=('custom') options=('!libtool') - -depends=('heimdal' 'pam') - +depends=('krb5' 'pam') source=("http://archives.eyrie.org/software/kerberos/$pkgname-$pkgver.tar.gz") md5sums=('a3f9a414fef102cd815a763c965b315c') @@ -20,6 +18,11 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --enable-reduced-depends - make; make DESTDIR=$pkgdir install + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=$pkgdir install install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/perl-gssapi/PKGBUILD b/community/perl-gssapi/PKGBUILD index 50c83fa41..ec1e50684 100644 --- a/community/perl-gssapi/PKGBUILD +++ b/community/perl-gssapi/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 35652 2010-12-21 23:13:32Z tdziedzic $ +# $Id: PKGBUILD 45801 2011-04-29 10:49:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-gssapi pkgver=0.28 -pkgrel=2 +pkgrel=3 pkgdesc="Perl/CPAN Module GSSAPI" arch=("i686" "x86_64") url="http://search.cpan.org/dist/GSSAPI" license=("GPL" "PerlArtistic") -depends=('heimdal') +depends=('krb5') source=("http://www.cpan.org/authors/id/A/AG/AGROLMS/GSSAPI-$pkgver.tar.gz") md5sums=('65f00a0749212af064289c8a05e59b3f') @@ -17,6 +17,10 @@ build() { cd $srcdir/GSSAPI-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/GSSAPI-$pkgver make install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD index d3f0a636b..117eb7521 100644 --- a/community/pgadmin3/PKGBUILD +++ b/community/pgadmin3/PKGBUILD @@ -1,31 +1,33 @@ -# $Id: PKGBUILD 36424 2011-01-02 00:33:59Z spupykin $ +# $Id: PKGBUILD 46331 2011-05-05 10:45:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Benjamin Andresen <benny@klapmuetz.org> # Contributor: bekks <eduard.warkentin@gmx.de> pkgname=pgadmin3 -pkgver=1.12.2 -_realver=1.12.2 +pkgver=1.12.3 +_realver=1.12.3 pkgrel=1 pkgdesc="A comprehensive design and management interface for PostgreSQL database" arch=('i686' 'x86_64') url="http://www.pgadmin.org" license=('custom') depends=('wxgtk' 'postgresql-libs>=8.4.1' 'libxslt') -makedepends=('libpqxx') +makedepends=('libpqxx' 'krb5') source=(ftp://ftp.de.postgresql.org/pub/packages/databases/PostgreSQL/pgadmin3/release/v${_realver}/src/pgadmin3-${_realver}.tar.gz pgadmin3.desktop) -md5sums=('5b0e7b0867c42a529ce2a41bc7f830c8' +md5sums=('0ff7a970a14757ee951a4e8b1a246a70' 'd07ba4df54baead30b66d19d7450bcad') build() { cd $srcdir/pgadmin3-${_realver} - unset LDFLAGS - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr make +} + +package() { + cd $srcdir/pgadmin3-${_realver} make DESTDIR=$pkgdir/ install install -D -m 644 i18n/$pkgname.lng $pkgdir/usr/share/pgadmin3/i18n diff --git a/community/splix/PKGBUILD b/community/splix/PKGBUILD index b77e8b012..9b8061ad5 100644 --- a/community/splix/PKGBUILD +++ b/community/splix/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 43927 2011-03-31 19:16:02Z heftig $ +# $Id: PKGBUILD 45807 2011-04-29 11:10:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: Francis Carroll (franciscarroll at gmail dot com) pkgname=splix pkgver=2.0.0 -pkgrel=8 +pkgrel=9 pkgdesc="CUPS drivers for SPL (Samsung Printer Language) printers" arch=('i686' 'x86_64') url="http://splix.ap2c.org/" license=('GPL') depends=('libcups' 'gcc-libs' 'ghostscript>=9.02') -makedepends=('libcups' 'jbigkit') +makedepends=('libcups' 'jbigkit' 'krb5') install=splix.install source=(http://downloads.sourceforge.net/splix/$pkgname-$pkgver.tar.bz2) md5sums=('f3aa735c22a926818b3d8b26c9964186') diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD new file mode 100644 index 000000000..4e3dd2c4f --- /dev/null +++ b/core/krb5/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 122855 2011-05-06 19:36:38Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> + +pkgname=krb5 +pkgver=1.9.1 +pkgrel=1 +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/krb5.conf' 'etc/krb5/kdc.conf') +source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar + kadmind.rc + krb5-kdc.rc) +sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066' + '640e3046c6558313d2be81cf2252afc8622892b0' + '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393') +options=('!emptydirs') + +build() { + tar zxvf ${pkgname}-${pkgver}.tar.gz + cd "${srcdir}/${pkgname}-${pkgver}/src" + + export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" + export CPPFLAGS+=" -I/usr/include/et" + ./configure --prefix=/usr \ + --sysconfdir=/etc/krb5 \ + --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 +} + +check() { + # We can't do this in the build directory. + cd "${srcdir}/${pkgname}-${pkgver}" + make -C src check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/src" + make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install + + install -D -m 644 config-files/kdc.conf "${pkgdir}"/etc/krb5/kdc.conf + install -D -m 644 config-files/krb5.conf "${pkgdir}"/etc/krb5/krb5.conf + + install -d -m 755 "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kdc.rc "${pkgdir}"/etc/rc.d + install -m 755 ../../kadmind.rc "${pkgdir}"/etc/rc.d + + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/core/krb5/kadmind.rc b/core/krb5/kadmind.rc new file mode 100644 index 000000000..45835e35b --- /dev/null +++ b/core/krb5/kadmind.rc @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kadmind` +case "$1" in + start) + stat_busy "Starting Kerberos Admin Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kadmind + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon kadmind + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Admin Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kadmind + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/core/krb5/krb5-kdc.rc b/core/krb5/krb5-kdc.rc new file mode 100644 index 000000000..05a03411e --- /dev/null +++ b/core/krb5/krb5-kdc.rc @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/krb5kdc` +case "$1" in + start) + stat_busy "Starting Kerberos Authentication" + if [ -z "$PID" ]; then + /usr/sbin/krb5kdc + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kdc + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Authentication" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kdc + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/core/librpcsecgss/PKGBUILD b/core/librpcsecgss/PKGBUILD index 56cfae7cf..c16ea175b 100644 --- a/core/librpcsecgss/PKGBUILD +++ b/core/librpcsecgss/PKGBUILD @@ -1,33 +1,22 @@ -# $Id: PKGBUILD 109603 2011-02-11 00:48:10Z stephane $ +# $Id: PKGBUILD 121187 2011-04-29 07:12:44Z stephane $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andrew Krawchyk <krawch_a@denison.edu>, Marco Lima <cipparello gmail com> pkgname=librpcsecgss pkgver=0.19 -pkgrel=4 +pkgrel=5 pkgdesc="Library for RPCSECGSS support" arch=('i686' 'x86_64') url="http://www.citi.umich.edu/projects/nfsv4/linux/" license=('GPL') -depends=('glibc' 'heimdal') +depends=('glibc' 'krb5' 'libgssglue') makedepends=('pkg-config' 'autoconf') options=('!libtool') -source=("http://www.citi.umich.edu/projects/nfsv4/linux/${pkgname}/${pkgname}-${pkgver}.tar.gz" - librpcsecgss-0.18-heimdal.patch) -md5sums=('b45ed565bdc3099023aa35830ec92997' - '0cfe088551d5776f5bc08c1741a34346') +source=("http://www.citi.umich.edu/projects/nfsv4/linux/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('b45ed565bdc3099023aa35830ec92997') build() { cd "${srcdir}/${pkgname}-${pkgver}" - - # Patch from gentoo for heimdal compatibility Bug #231395 - # http://bugs.gentoo.org/show_bug.cgi?id=231395 - patch -Np1 -i $srcdir/librpcsecgss-0.18-heimdal.patch - - rm -f config.guess config.sub ltmain.sh - autoreconf -i - - GSSAPI_CFLAGS='-I/usr/include/gssapi' \ ./configure --prefix=/usr make } diff --git a/core/libtirpc/PKGBUILD b/core/libtirpc/PKGBUILD index 952640dcb..b222249ff 100644 --- a/core/libtirpc/PKGBUILD +++ b/core/libtirpc/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 97756 2010-11-01 19:49:14Z tpowa $ +# $Id: PKGBUILD 121179 2011-04-29 06:50:46Z stephane $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libtirpc pkgver=0.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="Transport Independent RPC library (SunRPC replacement)" arch=(i686 x86_64) -depends=('glibc' 'libgssglue' 'heimdal') +depends=('glibc' 'libgssglue' 'krb5') url="http://libtirpc.sourceforge.net/" license=('GPL2') -source=(http://downloads.sourceforge.net/sourceforge/libtirpc/$pkgname-$pkgver.tar.bz2 +source=(http://downloads.sourceforge.net/sourceforge/libtirpc/${pkgname}-${pkgver}.tar.bz2 libtirpc-0.2.1-fortify.patch) backup=('etc/netconfig') options=(!libtool) build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" # fix http://bugs.gentoo.org/293593 # https://bugs.archlinux.org/task/20082 patch -Np1 -i ../libtirpc-0.2.1-fortify.patch ./configure --prefix=/usr --enable-gss - make || return 1 - make DESTDIR=$pkgdir install || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install # install netconfig - install -D -m644 doc/etc_netconfig $pkgdir/etc/netconfig + install -D -m644 doc/etc_netconfig "${pkgdir}"/etc/netconfig } md5sums=('d77eb15f464bf9d6e66259eaf78b2a4e' '2e5c067f1651469dfbbdc91d3c9c60e8') diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index 339d9a32a..e732cfa27 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 109322 2011-02-08 08:33:56Z ibiru $ +# $Id: PKGBUILD 123110 2011-05-08 13:46:17Z stephane $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> @@ -6,8 +6,8 @@ # Contributor: Marco Lima <cipparello gmail com> pkgname=nfs-utils -pkgver=1.2.2 -pkgrel=6 +pkgver=1.2.3 +pkgrel=2 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' @@ -23,49 +23,31 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn exports idmapd.conf start-statd.patch - nfs-utils-1.1.2-kerberos-ac.patch - nfs-utils-1.1.6-no_libgssapi.patch - nfs-utils-1.1.6-heimdal_functions.patch nfs-utils-1.1.4-mtab-sym.patch nfs-utils-1.1.4-no-exec.patch) install=nfs-utils.install -md5sums=('dad92f64db3266c7757f71bb53ee8f35' +md5sums=('1131dc5f27c4f3905a6e7ee0d594fd4d' 'fc508e10cdf5e8ddd80373b1b2bc99a1' 'f73f197a16b02c3e248488ec35c4cf43' '5ae080f6117cef3140f02bc162bdc755' - 'b9b334414baec31b97f0431d9ecdcfb9' + '2bf71def3263325643a09458635520f0' 'ff585faf410a62c4333a027c50b56bae' 'eb4f4027fab6fc1201f1ca04f5954c76' 'e24f81a8c8657672e262c61235d34b4a' - 'f3be115d392d9f9bb0f056e8d4341a14' - '20c6fae1c771b9d8e91c4973f16372e3' - 'e6fd3a8acfe97970a53db1b902c34f45' '7674106eaaa4c149bccd4f05fe3604e9' '4f4827dfc93008dfadd0a530ad0872b2') build() { cd $srcdir/${pkgname}-${pkgver} - # Patches from gentoo for heimdal compatibility Bug 231396 - # http://bugs.gentoo.org/show_bug.cgi?id=231396 - patch -Np1 -i ../nfs-utils-1.1.2-kerberos-ac.patch - patch -Np1 -i ../nfs-utils-1.1.6-no_libgssapi.patch - patch -Np0 -i ../nfs-utils-1.1.6-heimdal_functions.patch patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch # arch specific patch patch -Np0 -i $srcdir/start-statd.patch - rm -f config.guess config.sub ltmain.sh - autoreconf -i - - export GSSGLUE_CFLAGS='-I/usr/include/gssapi' - export GSSGLUE_LIBS='-lgssapi -ldl' - ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \ --with-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc - unset LDFLAGS make } diff --git a/core/nfs-utils/nfs-server.conf b/core/nfs-utils/nfs-server.conf index cf75fb6f9..4054d6b88 100644 --- a/core/nfs-utils/nfs-server.conf +++ b/core/nfs-utils/nfs-server.conf @@ -18,7 +18,7 @@ PROCNFSD_MOUNTOPTS="" # If you have a port-based firewall, you might want to set up # a fixed port here using the --port option. # See rpc.mountd(8) for more details. -MOUNTD_OPTS="--no-nfs-version 1 --no-nfs-version 2" +MOUNTD_OPTS="--no-nfs-version 2" # Do you want to start the svcgssd daemon? It is only required for Kerberos # exports. Valid alternatives are "yes" and "no"; the default is "no". diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 756c5cd60..e0f866502 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 123287 2011-05-09 17:39:25Z bisson $ +# $Id: PKGBUILD 123290 2011-05-09 17:45:14Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=5.8p2 -pkgrel=5 +pkgrel=6 pkgdesc='Free version of the SSH connectivity tools' arch=('i686' 'x86_64') license=('custom:BSD') url='http://www.openssh.org/portable.html' backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') -depends=('tcp_wrappers' 'heimdal' 'openssl' 'libedit') +depends=('tcp_wrappers' 'krb5' 'openssl' 'libedit') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" 'sshd.confd' 'sshd.pam' diff --git a/core/syslog-ng/PKGBUILD b/core/syslog-ng/PKGBUILD index e9ca12719..3a25d87e4 100644 --- a/core/syslog-ng/PKGBUILD +++ b/core/syslog-ng/PKGBUILD @@ -1,58 +1,52 @@ -# $Id: PKGBUILD 114715 2011-03-15 15:44:12Z tpowa $ +# $Id: PKGBUILD 123085 2011-05-08 03:28:44Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=syslog-ng -pkgver=3.2.2 -pkgrel=2 +pkgver=3.2.4 +pkgrel=1 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('i686' 'x86_64') license=('GPL2') groups=('base') url="http://www.balabit.com/network-security/syslog-ng/" -depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl' 'libcap') +depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl' 'libcap' 'awk') makedepends=('flex' 'pkg-config') optdepends=('logrotate: for rotating log files') provides=('logger') options=('!libtool') -backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') -source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${pkgver}/source/${pkgname}_${pkgver}.tar.gz - syslog-ng.conf - syslog-ng.logrotate - syslog-ng.rc - cap_syslog.patch) -md5sums=('ed8ebe559d52a63fb61e3e2db566643f' '344dddfff946300f5576b13a7e8ea19f'\ - '735636090be4582885974542d2a75855' 'b90f8f1ba0433e5a1518ac30f882560a') -sha1sums=('3a340f8e72b460cc0bc1ec1d4c86b74678912dd6' 'b9eb8c61f7cccda543fc5c97fe1d40a8d15e713f'\ - 'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' '253e59f4182fba46aea56bebc4b79a199fae32bc') - -build() { - cd "$srcdir/$pkgname-$pkgver" - # fix #22555 for kernels >=2.6.38 - patch -Np1 -i ../cap_syslog.patch - ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng \ - --libexecdir=/usr/lib --localstatedir=/var/lib/syslog-ng \ - --enable-tcp-wrapper \ - --with-pidfile-dir=/var/run \ - --disable-spoof-source - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d" - install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf" - install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng" - install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng" -} -md5sums=('ed8ebe559d52a63fb61e3e2db566643f' +backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \ + 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') +source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${pkgver}/source/${pkgname}_${pkgver}.tar.gz \ + syslog-ng.conf syslog-ng.logrotate syslog-ng.rc cap_syslog.patch) +md5sums=('5995f7dad0053a478b60a63f6f754203' '344dddfff946300f5576b13a7e8ea19f' '735636090be4582885974542d2a75855' - 'b90f8f1ba0433e5a1518ac30f882560a' + '8b4441343d859c2f01c2cf799a7e6f98' '46e5dcff71f820d497898331a3f608fe') -sha1sums=('3a340f8e72b460cc0bc1ec1d4c86b74678912dd6' +sha1sums=('ff732f7223bd2bd0424d4b9028b523cf62133af1' 'b9eb8c61f7cccda543fc5c97fe1d40a8d15e713f' 'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' - '253e59f4182fba46aea56bebc4b79a199fae32bc' + '4481819762fd1b6f25903016a8878e63c0058fcb' 'f093a09626a528d23f0f2aeece018cab15a735a9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" +# fix #22555 for kernels >=2.6.38 + patch -p1 -i ../cap_syslog.patch + ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng \ + --libexecdir=/usr/lib --localstatedir=/var/lib/syslog-ng \ + --enable-tcp-wrapper \ + --with-pidfile-dir=/var/run \ + --disable-spoof-source + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -dm755 "${pkgdir}/var/lib/syslog-ng" "${pkgdir}/etc/syslog-ng/patterndb.d" + install -Dm644 "${srcdir}/syslog-ng.conf" "${pkgdir}/etc/syslog-ng/syslog-ng.conf" + install -Dm644 "${srcdir}/syslog-ng.logrotate" "${pkgdir}/etc/logrotate.d/syslog-ng" + install -Dm755 "${srcdir}/syslog-ng.rc" "${pkgdir}/etc/rc.d/syslog-ng" +} diff --git a/core/syslog-ng/syslog-ng.rc b/core/syslog-ng/syslog-ng.rc index fbd41fc7b..bb5320b2c 100755 --- a/core/syslog-ng/syslog-ng.rc +++ b/core/syslog-ng/syslog-ng.rc @@ -3,10 +3,20 @@ . /etc/rc.conf . /etc/rc.d/functions +checkconfig() { + syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf + if [ $? -gt 0 ]; then + stat_busy "Configuration error. Please fix your config file (/etc/syslog-ng/syslog-ng.conf)." + stat_fail + exit 0 + fi +} + PID=`pidof -o %PPID /usr/sbin/syslog-ng` case "$1" in start) stat_busy "Starting Syslog-NG" + checkconfig [ -z "$PID" ] && /usr/sbin/syslog-ng if [ $? -gt 0 ]; then stat_fail @@ -17,7 +27,7 @@ case "$1" in ;; stop) stat_busy "Stopping Syslog-NG" - [ ! -z "$PID" ] && kill $PID &> /dev/null + [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else @@ -28,12 +38,26 @@ case "$1" in stat_done fi ;; + reload) + stat_busy "Reloading Syslog-NG configuration and re-opening log files" + if [ -z "$PID" ]; then + stat_fail + else + checkconfig + kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + fi + ;; restart) $0 stop sleep 1 $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart|reload}" esac exit 0 diff --git a/extra/alpine/PKGBUILD b/extra/alpine/PKGBUILD index ec3edad56..6b2f9ee73 100644 --- a/extra/alpine/PKGBUILD +++ b/extra/alpine/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 104455 2011-01-03 05:46:57Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 121113 2011-04-29 02:56:31Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=alpine pkgver=2.00 -pkgrel=12 +pkgrel=13 _patchlevel=79 pkgdesc="The Apache-licensed PINE (a tool for reading, sending, and managing electronic messages)" arch=('i686' 'x86_64') url="http://www.washington.edu/alpine/" license=('APACHE') -depends=('libldap' 'heimdal' 'gettext') +depends=('libldap' 'krb5' 'gettext') optdepends=('aspell: for spell-checking support') provides=('pine') conflicts=('pine') @@ -18,10 +18,14 @@ options=('!makeflags') source=(ftp://ftp.cac.washington.edu/${pkgname}/${pkgname}.tar.bz2 \ http://staff.washington.edu/chappa/alpine/patches/alpine-${pkgver}/all_${_patchlevel}.patch.gz \ 2.00-lpam.patch CVE-2008-5514.patch) -md5sums=('84e44cbf71ed674800a5d57eed9c1c52' 'd7dffd121c9a1cac4c458c0ff71df1ce'\ - 'cd3911c16fc6a072e853c0ccfc35857c' '1b52a54a656979116c09fb1d948a4325') -sha1sums=('dcbd3c5419954f484ccf706feaba31ce48cdebc4' 'd3acbf0e46c50feb2e822ef3bdc0a0f43c007294'\ - '1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3' 'bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb') +md5sums=('84e44cbf71ed674800a5d57eed9c1c52' + 'd7dffd121c9a1cac4c458c0ff71df1ce' + 'cd3911c16fc6a072e853c0ccfc35857c' + '1b52a54a656979116c09fb1d948a4325') +sha1sums=('dcbd3c5419954f484ccf706feaba31ce48cdebc4' + 'd3acbf0e46c50feb2e822ef3bdc0a0f43c007294' + '1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3' + 'bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index f6999d183..98a1c6730 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120797 2011-04-26 15:26:51Z ibiru $ +# $Id: PKGBUILD 122589 2011-05-04 18:41:26Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgname=anjuta pkgver=3.0.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD index 729822c12..9c33cefba 100644 --- a/extra/cifs-utils/PKGBUILD +++ b/extra/cifs-utils/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 117241 2011-03-30 13:34:45Z tpowa $ +# $Id: PKGBUILD 122574 2011-05-04 17:23:19Z ibiru $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=cifs-utils pkgver=4.9 -pkgrel=2 +pkgrel=3 pkgdesc="CIFS filesystem user-space tools" arch=(i686 x86_64) url="http://wiki.samba.org/index.php/LinuxCIFS_utils" license=('GPL') -depends=('libcap' 'keyutils' 'heimdal') +depends=('libcap' 'keyutils' 'krb5' 'talloc') source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2) +md5sums=('908d904e6b9e58f09f530de151a88ef8') build() { cd "$srcdir/$pkgname-$pkgver" @@ -23,4 +24,3 @@ package() { # set mount.cifs uid, to enable none root mounting form fstab chmod +s $pkgdir/sbin/mount.cifs } -md5sums=('908d904e6b9e58f09f530de151a88ef8') diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index ebf7f6ca7..64ab5d109 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 105161 2011-01-07 06:36:34Z andyrtr $ +# $Id: PKGBUILD 121078 2011-04-29 00:03:07Z stephane $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.4.6 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" -makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'heimdal>=1.3.1' 'gnutls>=2.8.3' 'poppler>=0.12.3' +makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3' 'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi' 'hicolor-icon-theme') source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-avahi.patch @@ -20,6 +20,8 @@ md5sums=('de8fb5a29c36554925c0c6a6e2c0dae1' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17') +# move client.conf man page for next update to the client pkg. + build() { cd ${srcdir}/${pkgbase}-${pkgver} # Avahi support in the dnssd backend. patch from Fedora @@ -40,7 +42,7 @@ build() { package_libcups() { pkgdesc="The CUPS Printing System - client libraries and headers" -depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'heimdal>=1.3.1' 'avahi') +depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi') cd ${srcdir}/${pkgbase}-${pkgver} make BUILDROOT=${pkgdir} install-headers install-libs || return 1 diff --git a/extra/cvs/PKGBUILD b/extra/cvs/PKGBUILD index 380e93f2e..76f71a2a1 100644 --- a/extra/cvs/PKGBUILD +++ b/extra/cvs/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 101751 2010-12-01 14:33:51Z stephane $ +# $Id: PKGBUILD 121072 2011-04-28 22:54:58Z stephane $ # Contributor: dorphell <dorphell@archlinux.org> pkgname=cvs pkgver=1.11.23 -pkgrel=6 +pkgrel=7 pkgdesc="Concurrent Versions System - a source control system" arch=(i686 x86_64) url="http://cvs.nongnu.org" license=('GPL') -depends=('heimdal>=1.3.1') +depends=('krb5') optdepends=('openssh: for using cvs over ssh' 'inetutils: for using cvs over rsh') install=cvs.install source=(ftp://ftp.gnu.org/non-gnu/cvs/source/stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2 @@ -34,6 +34,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install - rm ${pkgdir}/usr/share/info/dir + make DESTDIR="${pkgdir}" install + rm "${pkgdir}"/usr/share/info/dir } diff --git a/extra/cyrus-sasl-plugins/PKGBUILD b/extra/cyrus-sasl-plugins/PKGBUILD index a511d0fc2..5817bb657 100644 --- a/extra/cyrus-sasl-plugins/PKGBUILD +++ b/extra/cyrus-sasl-plugins/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 115177 2011-03-17 10:51:19Z andrea $ +# $Id: PKGBUILD 122144 2011-05-02 13:27:49Z stephane $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cyrus-sasl-plugins pkgver=2.1.23 -pkgrel=4 +pkgrel=5 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') url="http://cyrusimap.web.cmu.edu/" license=('custom') -depends=('postgresql-libs>=9.0.3' 'heimdal>=1.3.3' 'libldap>2.4' +depends=('postgresql-libs>=9.0.3' 'krb5' 'libldap>2.4' 'libmysqlclient>=5.5.10') source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz cyrus-sasl-2.1.22-gcc44.patch diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index a33001a96..6d42f9f75 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -1,33 +1,49 @@ -# $Id: PKGBUILD 75335 2010-04-01 10:43:20Z allan $ +# $Id: PKGBUILD 122168 2011-05-02 15:13:37Z stephane $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cyrus-sasl pkgver=2.1.23 -pkgrel=4 +pkgrel=5 pkgdesc="SASL authentication daemon" arch=('i686' 'x86_64') license=('custom') url="http://asg.web.cmu.edu/cyrus/download/" -depends=('pam>=1.0.1-2' 'heimdal>=1.3.1' 'libldap' 'cyrus-sasl-plugins>=2.1.22-7' 'db>=4.7') +depends=('pam>=1.0.1-2' 'krb5' 'libldap' 'cyrus-sasl-plugins' 'db>=5.0') replaces=(cyrus-sasl-mysql cyrus-sasl-pgsql) conflicts=(cyrus-sasl-mysql cyrus-sasl-pgsql) backup=(etc/conf.d/saslauthd) source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${pkgname}-${pkgver}.tar.gz - saslauthd - saslauthd.conf.d) + saslauthd + saslauthd.conf.d + cyrus-sasl-2.1.23-gcc4.patch + cyrus-sasl-2.1.23+db-5.0.patch) md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' '697dfb51206c398bc976ce9f4cffe72d' - '96d8a2f6189501f8044838e04d5cae7f') + '96d8a2f6189501f8044838e04d5cae7f' + '3a71688df7d5724cd55a8de17d74f34e' + '35c189c8e93ad37e3ae3c49386fdeb2c') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix building with db v5.x + patch -Np1 -i ../cyrus-sasl-2.1.23+db-5.0.patch + + # Fix error: #elif with no expression + patch -Np1 -i ../cyrus-sasl-2.1.23-gcc4.patch + ./configure --prefix=/usr --mandir=/usr/share/man \ - --with-ldap=/usr --with-saslauthd=/var/run/saslauthd + --with-ldap=/usr --with-saslauthd=/var/run/saslauthd \ + --disable-krb4 --with-gss_impl=mit --disable-otp cd saslauthd - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - make testsaslauthd || return 1 - install -m755 testsaslauthd "${pkgdir}/usr/sbin" || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/saslauthd" + make DESTDIR="${pkgdir}" install + make testsaslauthd + install -m755 testsaslauthd "${pkgdir}/usr/sbin" install -dm766 "${pkgdir}/var/run/saslauthd" install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd" diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch new file mode 100644 index 000000000..62df3e67e --- /dev/null +++ b/extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch @@ -0,0 +1,24 @@ +diff -Naur cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c cyrus-sasl-2.1.23/sasldb/db_berkeley.c +--- cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c 2009-04-28 08:09:18.000000000 -0700 ++++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c 2011-05-02 07:16:42.748675977 -0700 +@@ -100,7 +100,7 @@ + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); +diff -Naur cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c cyrus-sasl-2.1.23/utils/dbconverter-2.c +--- cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c 2003-02-13 11:56:17.000000000 -0800 ++++ cyrus-sasl-2.1.23/utils/dbconverter-2.c 2011-05-02 07:16:42.748675977 -0700 +@@ -214,7 +214,7 @@ + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch new file mode 100644 index 000000000..0d8627b1f --- /dev/null +++ b/extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch @@ -0,0 +1,21 @@ +diff -Naur cyrus-sasl-2.1.23.ori/plugins/digestmd5.c cyrus-sasl-2.1.23/plugins/digestmd5.c +--- cyrus-sasl-2.1.23.ori/plugins/digestmd5.c 2009-04-28 08:09:17.000000000 -0700 ++++ cyrus-sasl-2.1.23/plugins/digestmd5.c 2011-05-02 07:56:55.375403814 -0700 +@@ -2715,7 +2715,7 @@ + "DIGEST-MD5", /* mech_name */ + #ifdef WITH_RC4 + 128, /* max_ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, +@@ -4034,7 +4034,7 @@ + "DIGEST-MD5", + #ifdef WITH_RC4 /* mech_name */ + 128, /* max ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 5c37e7454..8d3718c07 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 119695 2011-04-13 19:29:24Z andyrtr $ +# $Id: PKGBUILD 123590 2011-05-11 17:20:39Z andyrtr $ # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> # Contributor: GARETTE Emmanuel <gnunux at laposte dot net> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=dovecot -pkgver=2.0.12 +pkgver=2.0.13 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=('heimdal>=1.3.3' 'openssl' 'sqlite3>=3.7.5' 'libmysqlclient>=5.5.10' +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') optdepends=('libldap: ldap plugin') @@ -25,7 +25,7 @@ backup=(etc/dovecot/dovecot.conf etc/ssl/dovecot-openssl.cnf) install=$pkgname.install source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh) -md5sums=('689e1a8863d4fb2fd252e1a6121dd181' +md5sums=('fd8a0702275a61332db7353dadff0f92' 'd020d43eab4ded6fb379dadc570a9490') build() { diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 798ec14fe..195be21c6 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 120574 2011-04-25 17:24:21Z ibiru $ +# $Id: PKGBUILD 122571 2011-05-04 16:49:38Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop" arch=('i686' 'x86_64') -depends=('libsoup' 'nss' 'libgnome-keyring' 'heimdal' 'libgweather' 'libical' 'db' 'libgdata') +depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') makedepends=('intltool' 'gperf' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org" diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD index 2364818a9..963b54508 100644 --- a/extra/evolution-exchange/PKGBUILD +++ b/extra/evolution-exchange/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120624 2011-04-25 18:31:36Z ibiru $ +# $Id: PKGBUILD 122586 2011-05-04 18:25:32Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-exchange pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Ximian Connector Exchange plugin for Evolution" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD index 8998e12c4..046dca618 100644 --- a/extra/exo/PKGBUILD +++ b/extra/exo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 106429 2011-01-16 21:30:41Z ibiru $ +# $Id: PKGBUILD 123595 2011-05-11 17:34:16Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=exo -pkgver=0.6.0 -pkgrel=2 +pkgver=0.6.1 +pkgrel=1 pkgdesc="Extensions to Xfce by os-cillation" arch=('i686' 'x86_64') license=('GPL2' 'LGPL') @@ -17,7 +17,7 @@ optdepends=('perl-uri: for mail-compose helper script') options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/xfce/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ac9deafdf9de426d8a03855ac549f424') +md5sums=('2ae3d9a9dedc3adebb748fa8724e02ce') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index d7489ad85..62c9797a6 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 120449 2011-04-23 22:47:50Z bisson $ +# $Id: PKGBUILD 123419 2011-05-11 10:13:28Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=1.13 +pkgver=1.14 pkgrel=1 pkgdesc='Fast, lightweight image viewer which uses imlib2' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama') optdepends=('perl: feh-cam, webcam wrapper for feh') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('8b2c8250137edbda630b920e5eb7ca7ba5818a5e') +sha1sums=('da8886b62aa46c8e85cbced73ef14d704ab66907') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gc/PKGBUILD b/extra/gc/PKGBUILD index 11898fa33..16f608ea1 100644 --- a/extra/gc/PKGBUILD +++ b/extra/gc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 18876 2008-11-09 22:41:09Z andyrtr $ +# $Id: PKGBUILD 123615 2011-05-11 19:36:33Z jgc $ # Maintainer: Daniel Isenmann <daniel [at] archlinux.org> # Contributor: dorphell <dorphell@gmx.net> pkgname=gc pkgver=7.1 -pkgrel=1 +pkgrel=3 pkgdesc="A garbage collector for C and C++" arch=(i686 x86_64) url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/" @@ -15,7 +15,16 @@ md5sums=('2ff9924c7249ef7f736ecfe6f08f3f9b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-cplusplus || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --enable-cplusplus + make + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/usr/share/gc" + install -m755 -d "${pkgdir}/usr/share/doc/gc" + install -m644 doc/README{,.{changes,contributors,environment,linux}} \ + "${pkgdir}/usr/share/doc/gc/" + + sed -i -e 's/GC_MALLOC 1L/gc 3/' doc/gc.man + install -m755 -d "${pkgdir}/usr/share/man/man3" + install -m644 doc/gc.man "${pkgdir}/usr/share/man/man3/gc.3" } diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD index 13b4ead43..bfbeec073 100644 --- a/extra/geoip/PKGBUILD +++ b/extra/geoip/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 40077 2009-05-27 06:02:01Z juergen $ +# $Id: PKGBUILD 123437 2011-05-11 11:45:24Z juergen $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Manolis Tzanidakis <manolis@archlinux.org> pkgname=geoip -pkgver=1.4.6 +pkgver=1.4.7 pkgrel=1 pkgdesc="Non-DNS IP-to-country resolver C library & utils" arch=(i686 x86_64) @@ -13,7 +13,7 @@ depends=('zlib') backup=(etc/geoip/GeoIP.conf) options=('!libtool') source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-${pkgver}.tar.gz) -md5sums=('cb14b1beeb40631a12676b11ca0c309a') +md5sums=('a802175d5b7e2b57b540a7dd308d9205') build() { cd ${startdir}/src/GeoIP-${pkgver} diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 97f803ce8..1031b6b1d 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 120905 2011-04-27 08:37:19Z ibiru $ +# $Id: PKGBUILD 122550 2011-05-04 14:36:21Z stephane $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center pkgver=3.0.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') -depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop') +depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'krb5') optdepends=('mesa-demos: provides glxinfo for graphics information' 'apg: adds password generation for user accounts') makedepends=('gnome-doc-utils' 'intltool' 'networkmanager') diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index a65f24d5a..06f71588b 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 120747 2011-04-26 10:46:20Z heftig $ +# $Id: PKGBUILD 122583 2011-05-04 18:20:31Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-settings-daemon pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' - 'libcanberra' 'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf' - 'pulseaudio' 'pulseaudio-alsa') + 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf' + 'dconf' 'pulseaudio' 'pulseaudio-alsa') makedepends=('intltool' 'gtk-doc') options=('!emptydirs' '!libtool') install=gnome-settings-daemon.install diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index e1f13a17a..34974115f 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123342 2011-05-10 13:48:13Z ibiru $ +# $Id: PKGBUILD 123600 2011-05-11 18:16:09Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell pkgver=3.0.1 -pkgrel=4 +pkgrel=5 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeShell" @@ -22,12 +22,14 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$p network_fixes_up_to_5090a4ccce.patch shell-xfixes-cursor_missing_free.patch st-private_fix_memory_leak.patch + st-private_correct_fix_memory_leak.patch 0001-Don-t-crash-when-removing-nameless-user.patch) sha256sums=('01f7ae942ba9687a5e67d62423843ed404d77b35f74acc212a5f391beed8e079' 'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db' '01bf41483d5d8935ed2dd6294ee04024f2d9bcb2ef13276b07331e485965c822' 'c8b92768c869d0d77595da3466cc0dba3b6f067ea5fac048f32a918bbe98bbf6' '8b80a0cec39c38a47521183a3030a782ab84bb6ea5e9cc58213589245288e718' + 'c676067fff399a87625187381db5331d82c44f6c14f51d409392851dbbeb5074' '291d1fa51344325e3dabc0c1287750cde98605c30f079ffad9b3523a3aba860d') build() { @@ -37,6 +39,7 @@ build() { patch -Np1 -i "${srcdir}/network_fixes_up_to_5090a4ccce.patch" patch -Np1 -i "${srcdir}/shell-xfixes-cursor_missing_free.patch" patch -Np1 -i "${srcdir}/st-private_fix_memory_leak.patch" + patch -Np1 -i "${srcdir}/st-private_correct_fix_memory_leak.patch" patch -Np1 -i "${srcdir}/0001-Don-t-crash-when-removing-nameless-user.patch" ./configure --prefix=/usr --sysconfdir=/etc \ diff --git a/extra/gnome-shell/st-private_correct_fix_memory_leak.patch b/extra/gnome-shell/st-private_correct_fix_memory_leak.patch new file mode 100644 index 000000000..d3f887c29 --- /dev/null +++ b/extra/gnome-shell/st-private_correct_fix_memory_leak.patch @@ -0,0 +1,52 @@ +From c975740f9228b2c53d79ac08ad704fca5f1c5b6e Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters@verbum.org> +Date: Wed, 11 May 2011 15:21:18 +0000 +Subject: st-private: Correct fix for memory leak + +The previous fix in 72f9f482d was wrong; we need to keep around +the buffer until cairo is done with the pattern. + +https://bugzilla.gnome.org/show_bug.cgi?id=649497 +--- +diff --git a/src/st/st-private.c b/src/st/st-private.c +index 51798a1..21ca09a 100644 +--- a/src/st/st-private.c ++++ b/src/st/st-private.c +@@ -667,6 +667,7 @@ cairo_pattern_t * + _st_create_shadow_cairo_pattern (StShadow *shadow_spec, + cairo_pattern_t *src_pattern) + { ++ static cairo_user_data_key_t shadow_pattern_user_data; + cairo_t *cr; + cairo_surface_t *src_surface; + cairo_surface_t *surface_in; +@@ -728,6 +729,8 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec, + width_out, + height_out, + rowstride_out); ++ cairo_surface_set_user_data (surface_out, &shadow_pattern_user_data, ++ pixels_out, (cairo_destroy_func_t) g_free); + + dst_pattern = cairo_pattern_create_for_surface (surface_out); + cairo_surface_destroy (surface_out); +@@ -745,8 +748,7 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec, + (width_out - width_in) / 2.0, + (height_out - height_in) / 2.0); + cairo_pattern_set_matrix (dst_pattern, &shadow_matrix); +- +- goto out; ++ return dst_pattern; + } + + /* Read all the code from the cairo_pattern_set_matrix call +@@ -784,8 +786,6 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec, + + cairo_pattern_set_matrix (dst_pattern, &shadow_matrix); + +- out: +- g_free (pixels_out); + return dst_pattern; + } + +-- +cgit v0.9 diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD index 39abc3f5e..3474b4c22 100644 --- a/extra/gnome-vfs/PKGBUILD +++ b/extra/gnome-vfs/PKGBUILD @@ -1,18 +1,15 @@ -# $Id: PKGBUILD 119776 2011-04-15 07:50:36Z jgc $ +# $Id: PKGBUILD 122580 2011-05-04 18:07:34Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-vfs pkgver=2.24.4 -pkgrel=2 +pkgrel=3 pkgdesc="The GNOME Virtual File System" arch=(i686 x86_64) license=('LGPL') -depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'heimdal' 'gnutls') +depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls') makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common') -options=('!libtool' '!emptydirs' '!makeflags') -conflicts=(gnome-vfs-samba) -provides=(gnome-vfs-samba) -replaces=(gnome-vfs-samba gnome-vfs-extras) +options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gnome-vfs.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2 @@ -36,6 +33,10 @@ build() { --enable-avahi --disable-howl \ --disable-openssl --enable-gnutls make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/gconf/schemas" diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 3fd2a00e1..120a3402d 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 110525 2011-02-19 18:19:40Z bisson $ +# $Id: PKGBUILD 123442 2011-05-11 13:08:33Z bisson $ # Maintainer: kevin <kevin@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz -pkgver=2.26.3 -pkgrel=3 +pkgver=2.28.0 +pkgrel=1 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') @@ -23,7 +24,7 @@ optdepends=('mono: sharp bindings' 'tcl: tcl bindings') source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" 'LICENSE') -sha1sums=('04503ac5a9eaa579859f0d017811fa245717edec' +sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d' 'e78277e502c29abb74b9587a5dc951ec392554ea') options=('!libtool') diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 08615d760..e67d63520 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 117444 2011-04-02 06:12:32Z ibiru $ +# $Id: PKGBUILD 122323 2011-05-03 20:18:27Z stephane $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') pkgver=2.24.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.gtk.org/" -makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'heimdal' 'gnutls' +makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection') options=('!libtool' '!docs') license=('LGPL') @@ -29,7 +29,7 @@ build() { package_gtk2() { pkgdesc="The GTK+ Toolkit (v2)" install=gtk2.install - depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'heimdal' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') + depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') backup=(etc/gtk-2.0/gtkrc) cd "${srcdir}/gtk+-${pkgver}" diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 7c3a55dba..5550647fc 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 119847 2011-04-15 22:42:57Z ibiru $ +# $Id: PKGBUILD 122547 2011-05-04 14:30:27Z stephane $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 pkgver=3.0.9 -pkgrel=1 +pkgrel=2 pkgdesc="The GTK+ Toolkit (v3)" arch=('i686' 'x86_64') url="http://www.gtk.org/" install=gtk3.install -depends=('atk' 'cairo' 'gtk-update-icon-cache' 'gnutls' 'heimdal' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info') +depends=('atk' 'cairo' 'gtk-update-icon-cache' 'gnutls' 'krb5' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info') makedepends=('gobject-introspection') options=('!libtool' '!docs') backup=(etc/gtk-3.0/settings.ini) diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD index 6d634fb80..602d12bb4 100644 --- a/extra/gutenprint/PKGBUILD +++ b/extra/gutenprint/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122412 2011-05-04 06:25:40Z andyrtr $ +# $Id: PKGBUILD 123069 2011-05-07 23:28:40Z stephane $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gutenprint pkgver=5.2.7 -pkgrel=1 +pkgrel=2 pkgdesc="Top quality printer drivers for POSIX systems" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD index b6a8f2be3..6e7524f53 100644 --- a/extra/icu/PKGBUILD +++ b/extra/icu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 114724 2011-03-15 19:35:12Z andyrtr $ +# $Id: PKGBUILD 123623 2011-05-11 21:09:44Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Art Gramlich <art@gramlich-net.com> pkgname=icu pkgver=4.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="International Components for Unicode library" arch=(i686 x86_64) url="http://www.icu-project.org/" @@ -12,11 +12,15 @@ license=('custom:"icu"') depends=('gcc-libs' 'sh') source=(http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz #http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz + icu.8198.revert.icu5431.patch ) -md5sums=('da64675d85f0c2191cef93a8cb5eea88') +md5sums=('da64675d85f0c2191cef93a8cb5eea88' + 'ebd5470fc969c75e52baf4af94a9ee82') build() { cd ${srcdir}/icu/source + # fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200 + patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man diff --git a/extra/icu/icu.8198.revert.icu5431.patch b/extra/icu/icu.8198.revert.icu5431.patch new file mode 100644 index 000000000..4c3e78b8e --- /dev/null +++ b/extra/icu/icu.8198.revert.icu5431.patch @@ -0,0 +1,129 @@ +Index: icu/trunk/source/layout/IndicReordering.cpp
+===================================================================
+--- icu/trunk/source/layout/IndicReordering.cpp (revision 25772)
++++ icu/trunk/source/layout/IndicReordering.cpp (revision 26090)
+@@ -126,4 +126,8 @@
+ FeatureMask fSMFeatures;
+
++ LEUnicode fPreBaseConsonant;
++ LEUnicode fPreBaseVirama;
++ le_int32 fPBCIndex;
++ FeatureMask fPBCFeatures;
+
+ void saveMatra(LEUnicode matra, le_int32 matraIndex, IndicClassTable::CharClass matraClass)
+@@ -172,5 +176,6 @@
+ fMatraFeatures(0), fMPreOutIndex(-1), fMPreFixups(mpreFixups),
+ fVMabove(0), fVMpost(0), fVMIndex(0), fVMFeatures(0),
+- fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0)
++ fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0),
++ fPreBaseConsonant(0), fPreBaseVirama(0), fPBCIndex(0), fPBCFeatures(0)
+ {
+ // nothing else to do...
+@@ -191,4 +196,6 @@
+ fVMabove = fVMpost = 0;
+ fSMabove = fSMbelow = 0;
++
++ fPreBaseConsonant = fPreBaseVirama = 0;
+ }
+
+@@ -386,4 +393,12 @@
+ }
+
++ void notePreBaseConsonant(le_uint32 index,LEUnicode PBConsonant, LEUnicode PBVirama, FeatureMask features)
++ {
++ fPBCIndex = index;
++ fPreBaseConsonant = PBConsonant;
++ fPreBaseVirama = PBVirama;
++ fPBCFeatures = features;
++ }
++
+ void noteBaseConsonant()
+ {
+@@ -465,4 +480,20 @@
+ }
+
++ void writePreBaseConsonant()
++ {
++ // The TDIL spec says that consonant + virama + RRA should produce a rakar in Malayalam. However,
++ // it seems that almost none of the fonts for Malayalam are set up to handle this.
++ // So, we're going to force the issue here by using the rakar as defined with RA in most fonts.
++
++ if (fPreBaseConsonant == 0x0d31) { // RRA
++ fPreBaseConsonant = 0x0d30; // RA
++ }
++
++ if (fPreBaseConsonant != 0) {
++ writeChar(fPreBaseConsonant, fPBCIndex, fPBCFeatures);
++ writeChar(fPreBaseVirama,fPBCIndex-1,fPBCFeatures);
++ }
++ }
++
+ le_int32 getOutputIndex()
+ {
+@@ -723,4 +754,5 @@
+ }
+
++
+ IndicClassTable::CharClass charClass = CC_RESERVED;
+ IndicClassTable::CharClass nextClass = CC_RESERVED;
+@@ -730,7 +762,9 @@
+ le_bool seenVattu = FALSE;
+ le_bool seenBelowBaseForm = FALSE;
++ le_bool seenPreBaseForm = FALSE;
+ le_bool hasNukta = FALSE;
+ le_bool hasBelowBaseForm = FALSE;
+ le_bool hasPostBaseForm = FALSE;
++ le_bool hasPreBaseForm = FALSE;
+
+ if (postBase < markStart && classTable->isNukta(chars[postBase])) {
+@@ -746,12 +780,20 @@
+ hasBelowBaseForm = IndicClassTable::hasBelowBaseForm(charClass) && !hasNukta;
+ hasPostBaseForm = IndicClassTable::hasPostBaseForm(charClass) && !hasNukta;
++ hasPreBaseForm = IndicClassTable::hasPreBaseForm(charClass) && !hasNukta;
+
+ if (IndicClassTable::isConsonant(charClass)) {
+ if (postBaseLimit == 0 || seenVattu ||
+ (baseConsonant > baseLimit && !classTable->isVirama(chars[baseConsonant - 1])) ||
+- !(hasBelowBaseForm || hasPostBaseForm)) {
++ !(hasBelowBaseForm || hasPostBaseForm || hasPreBaseForm)) {
+ break;
+ }
+
++ // Note any pre-base consonants
++ if ( baseConsonant == lastConsonant && lastConsonant > 0 &&
++ hasPreBaseForm && classTable->isVirama(chars[baseConsonant - 1])) {
++ output.notePreBaseConsonant(lastConsonant,chars[lastConsonant],chars[lastConsonant-1],tagArray2);
++ seenPreBaseForm = TRUE;
++
++ }
+ // consonants with nuktas are never vattus
+ seenVattu = IndicClassTable::isVattu(charClass) && !hasNukta;
+@@ -786,10 +828,12 @@
+
+ // write any pre-base consonants
++ output.writePreBaseConsonant();
++
+ le_bool supressVattu = TRUE;
+
+ for (i = baseLimit; i < baseConsonant; i += 1) {
+ LEUnicode ch = chars[i];
+- // Don't put 'blwf' on first consonant.
+- FeatureMask features = (i == baseLimit? tagArray2 : tagArray1);
++ // Don't put 'pstf' or 'blwf' on anything before the base consonant.
++ FeatureMask features = tagArray1 & ~( pstfFeatureMask | blwfFeatureMask );
+
+ charClass = classTable->getCharClass(ch);
+@@ -842,5 +886,5 @@
+
+ // write below-base consonants
+- if (baseConsonant != lastConsonant) {
++ if (baseConsonant != lastConsonant && !seenPreBaseForm) {
+ for (i = bcSpan + 1; i < postBase; i += 1) {
+ output.writeChar(chars[i], i, tagArray1);
+@@ -872,5 +916,5 @@
+ // write post-base consonants
+ // FIXME: does this put the right tags on post-base consonants?
+- if (baseConsonant != lastConsonant) {
++ if (baseConsonant != lastConsonant && !seenPreBaseForm) {
+ if (postBase <= lastConsonant) {
+ for (i = postBase; i <= lastConsonant; i += 1) {
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index fda93d318..0f4a867d4 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 122716 2011-05-06 07:29:37Z andrea $ +# $Id: PKGBUILD 122843 2011-05-06 11:48:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdelibs pkgver=4.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') -depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'heimdal' +depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5' 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee' 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils' 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor' diff --git a/extra/libgnomecups/PKGBUILD b/extra/libgnomecups/PKGBUILD index 2a510ccde..157e18f50 100644 --- a/extra/libgnomecups/PKGBUILD +++ b/extra/libgnomecups/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 75341 2010-04-01 10:56:43Z allan $ +# $Id: PKGBUILD 122592 2011-05-04 18:48:08Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Paulius Palevicius <paulius@birzai.com> pkgname=libgnomecups pkgver=0.2.3 -pkgrel=7 +pkgrel=8 pkgdesc="GNOME cups library" arch=(i686 x86_64) license=('LGPL' 'GPL') url="http://www.gnome.org" -depends=('libcups>=1.3.8-2' 'glib2>=2.16.4' 'heimdal>=1.3.1' 'gnutls>=2.4.1') +depends=('libcups' 'glib2' 'krb5' 'gnutls') makedepends=('perlxml') options=(!libtool) source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2 @@ -20,8 +20,12 @@ md5sums=('dc4920c15c9f886f73ea74fbff0ae48b' build() { cd "${srcdir}/${pkgname}-${pkgver}" # This avoids generating huge 'IPP request failed with status 1030' lines - patch -Np1 -i ${srcdir}/libgnomecups_0.2.3-ignore-ipp-not-found.patch || return 1 - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + patch -Np1 -i ${srcdir}/libgnomecups_0.2.3-ignore-ipp-not-found.patch + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libgnomeprint/PKGBUILD b/extra/libgnomeprint/PKGBUILD index af1265592..db2bfedcd 100644 --- a/extra/libgnomeprint/PKGBUILD +++ b/extra/libgnomeprint/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 91999 2010-09-28 16:38:45Z ibiru $ +# $Id: PKGBUILD 122595 2011-05-04 18:55:04Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgnomeprint pkgver=2.18.8 -pkgrel=1 +pkgrel=2 pkgdesc="Printing routines for GNOME" arch=(i686 x86_64) license=('LGPL' 'GPL') -depends=('pango>=1.28.1' 'libart-lgpl>=2.3.21' 'libxml2>=2.7.7' 'libgnomecups>=0.2.3-4' 'heimdal>=1.3.3' 'gnutls>=2.8.6') +depends=('pango' 'libart-lgpl' 'libxml2' 'libgnomecups' 'krb5' 'gnutls') makedepends=('intltool' 'pkgconfig') replaces=('libgnomeprint-cups') conflicts=('libgnomeprint-cups') @@ -20,5 +20,9 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index c9bc4d702..849b1bf09 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 122501 2011-05-04 10:25:04Z ronald $ +# $Id: PKGBUILD 123432 2011-05-11 11:09:27Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.24.0 -pkgrel=1 +pkgrel=2 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64') license=('GPL') url="http://maxima.sourceforge.net" -depends=('sbcl=1.0.47' 'texinfo' 'sh') +depends=('sbcl=1.0.48' 'texinfo' 'sh') makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') # needs rebuild when bash changes version diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD index 659fb1951..9a940857c 100644 --- a/extra/mutt/PKGBUILD +++ b/extra/mutt/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 116680 2011-03-24 21:41:03Z bisson $ +# $Id: PKGBUILD 121107 2011-04-29 00:34:05Z stephane $ # Contributor: tobias [tobias [at] archlinux.org] # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=mutt pkgver=1.5.21 -pkgrel=4 +pkgrel=5 pkgdesc='Small but very powerful text-based mail client' url='http://www.mutt.org/' license=('GPL') backup=('etc/Muttrc') arch=('i686' 'x86_64') -depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'heimdal') +depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5') source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz") sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9') diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 4add473fa..0f40309d1 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 120688 2011-04-25 23:12:25Z ibiru $ +# $Id: PKGBUILD 123610 2011-05-11 18:27:48Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A window manager for GNOME3" arch=(i686 x86_64) license=('GPL') @@ -15,11 +15,14 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6c3190789f935a2c982e78447726e87cf1d4b7af2f0b407cb6d6aca636e3d708') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + squash_some_leaks.patch) +sha256sums=('6c3190789f935a2c982e78447726e87cf1d4b7af2f0b407cb6d6aca636e3d708' + 'dda962cfd884ffbe2c3c4a86641964228d7b04ef30e19bb2894c4398fa4c296a') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/squash_some_leaks.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/mutter \ --localstatedir=/var --disable-static diff --git a/extra/mutter/squash_some_leaks.patch b/extra/mutter/squash_some_leaks.patch new file mode 100644 index 000000000..0e6b506bc --- /dev/null +++ b/extra/mutter/squash_some_leaks.patch @@ -0,0 +1,70 @@ +From 65963748860aec8e3d7ee939b3b16876f4117904 Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters@verbum.org> +Date: Thu, 05 May 2011 20:11:02 +0000 +Subject: region-utils.c: Squash a memory leak + +"chunk" was an allocated but unused variable. + +https://bugzilla.gnome.org/show_bug.cgi?id=649504 +--- +diff --git a/src/compositor/region-utils.c b/src/compositor/region-utils.c +index b4071ca..cf3c64e 100644 +--- a/src/compositor/region-utils.c ++++ b/src/compositor/region-utils.c +@@ -248,7 +248,6 @@ expand_region_inverse (cairo_region_t *region, + MetaRegionBuilder builder; + MetaRegionIterator iter; + cairo_rectangle_int_t extents; +- cairo_region_t *chunk; + + int last_x; + +@@ -268,16 +267,11 @@ expand_region_inverse (cairo_region_t *region, + extents.x, extents.y + extents.height, extents.width, 1, + x_amount, y_amount, flip); + +- chunk = NULL; +- + last_x = extents.x; + for (meta_region_iterator_init (&iter, region); + !meta_region_iterator_at_end (&iter); + meta_region_iterator_next (&iter)) + { +- if (chunk == NULL) +- chunk = cairo_region_create (); +- + if (iter.rectangle.x > last_x) + add_expanded_rect (&builder, + last_x, iter.rectangle.y, +-- +cgit v0.9 +From d0414a3ea697738dcdf2641b6a8000df35215862 Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters@verbum.org> +Date: Thu, 05 May 2011 20:46:00 +0000 +Subject: theme.c: Squash memory leak + +When converting a token to a different type, we need to free its +string. + +https://bugzilla.gnome.org/show_bug.cgi?id=649500 +--- +diff --git a/src/ui/theme.c b/src/ui/theme.c +index 0077388..9305645 100644 +--- a/src/ui/theme.c ++++ b/src/ui/theme.c +@@ -2639,11 +2639,13 @@ meta_theme_replace_constants (MetaTheme *theme, + { + if (meta_theme_lookup_int_constant (theme, t->d.v.name, &ival)) + { ++ g_free (t->d.v.name); + t->type = POS_TOKEN_INT; + t->d.i.val = ival; + } + else if (meta_theme_lookup_float_constant (theme, t->d.v.name, &dval)) + { ++ g_free (t->d.v.name); + t->type = POS_TOKEN_DOUBLE; + t->d.d.val = dval; + } +-- +cgit v0.9 diff --git a/extra/neon/PKGBUILD b/extra/neon/PKGBUILD index c87a5f0c2..c0fe650cf 100644 --- a/extra/neon/PKGBUILD +++ b/extra/neon/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 77208 2010-04-11 13:31:45Z pierre $ +# $Id: PKGBUILD 121086 2011-04-29 00:26:05Z stephane $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # KEEP LIBTOOL FILES! pkgname=neon pkgver=0.29.3 -pkgrel=2 +pkgrel=3 pkgdesc="HTTP and WebDAV client library with a C interface" arch=('i686' 'x86_64') license=('GPL' 'LGPL') -depends=('heimdal' 'expat' 'ca-certificates') +depends=('krb5' 'expat' 'ca-certificates') url="http://www.webdav.org/neon/" source=("http://www.webdav.org/neon/${pkgname}-${pkgver}.tar.gz") md5sums=('ba1015b59c112d44d7797b62fe7bee51') @@ -20,7 +20,7 @@ build() { ./configure --prefix=/usr \ --with-expat --enable-shared --disable-static \ --with-ssl=openssl --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt - make || return 1 + make } package() { diff --git a/extra/nss_ldap/PKGBUILD b/extra/nss_ldap/PKGBUILD index 299f8413e..0a1f93d38 100644 --- a/extra/nss_ldap/PKGBUILD +++ b/extra/nss_ldap/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 109106 2011-02-06 10:18:06Z andyrtr $ +# $Id: PKGBUILD 121171 2011-04-29 06:45:19Z stephane $ # Maintainer: Paul Mattal <paul@archlinux.org> # Contributor: Comete <la_comete@tiscali.fr> pkgname=nss_ldap pkgver=265 -pkgrel=1 +pkgrel=2 pkgdesc="The nss_ldap module provides the means for Linux and Solaris workstations to resolve the entities defined in RFC 2307 from LDAP directories." arch=(i686 x86_64) url="http://www.padl.com/OSS/nss_ldap.html" license=('LGPL') -depends=('libldap>=2.4.18' 'heimdal>=1.2.1') +depends=('libldap>=2.4.18' 'krb5') backup=("etc/nss_ldap.conf") source=(http://www.padl.com/download/${pkgname}-${pkgver}.tar.gz) md5sums=('c1cb02d1a85538cf16bca6f6a562abe4') diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 070c3f169..6bd883503 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 116932 2011-03-26 14:54:05Z tpowa $ +# $Id: PKGBUILD 122577 2011-05-04 17:48:52Z ibiru $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba @@ -8,16 +8,16 @@ pkgver=3.5.8 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=3.5.8 -pkgrel=2 +pkgrel=3 arch=(i686 x86_64) url="http://www.samba.org" license=('GPL3') -makedepends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' 'libcap>=2.16' 'heimdal>=1.2-1' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb') +makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb') options=(!makeflags) source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz - samba samba.logrotate - swat.xinetd - samba.pam + samba samba.logrotate + swat.xinetd + samba.pam samba.conf.d fix-ipv6-mount.patch) ### UNINSTALL dmapi package before building!!! @@ -44,12 +44,12 @@ build() { --disable-avahi \ --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \ --enable-external-libtdb - make || return 1 + make } package_smbclient () { pkgdesc="Tools to access a server's filespace and printers via SMB" -depends=('readline>=6.0.00' 'popt' 'libldap>=2.4.18-1' 'cifs-utils' 'libcap>=2.16' 'heimdal>=1.2-1' 'db>=4.7' 'e2fsprogs' 'tdb' 'talloc') +depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc') 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/ @@ -72,17 +72,17 @@ depends=('readline>=6.0.00' 'popt' 'libldap>=2.4.18-1' 'cifs-utils' 'libcap>=2.1 package_samba () { pkgdesc="Tools to access a server's filespace and printers via SMB" -backup=(etc/logrotate.d/samba - etc/pam.d/samba +backup=(etc/logrotate.d/samba + etc/pam.d/samba etc/samba/smb.conf etc/xinetd.d/swat etc/conf.d/samba) -depends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap>=2.16' 'heimdal>=1.2-1' 'pam' 'fam' 'gnutls>=2.4.1' 'e2fsprogs' 'tdb' 'talloc') +depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc') cd ${srcdir}/samba-${_realver}/source3 mkdir -p ${pkgdir}/var/log/samba mkdir -p ${pkgdir}/etc/samba/private chmod 700 ${pkgdir}/etc/samba/private - make DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} install chmod 644 ${pkgdir}/usr/include/*.h rm -rf ${pkgdir}/usr/var (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh) diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index c54bc6df9..e2e922778 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 117231 2011-03-30 10:39:06Z juergen $ +# $Id: PKGBUILD 123411 2011-05-11 09:13:37Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.0.47 +pkgver=1.0.48 pkgrel=1 pkgdesc="Steel Bank Common Lisp" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('glibc') provides=('common-lisp' 'cl-asdf') makedepends=('sbcl' 'texinfo') source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp") -md5sums=('2e90fca5ffec9ce19ed232b24f09cd0a' +md5sums=('f60f27bcc04d1c9241562aafe4ee5d4a' '7ac0c1936547f4278198b8bf7725204d') url="http://www.sbcl.org/" install=sbcl.install diff --git a/extra/sharutils/PKGBUILD b/extra/sharutils/PKGBUILD index 308051009..c04443584 100644 --- a/extra/sharutils/PKGBUILD +++ b/extra/sharutils/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 98391 2010-11-08 19:40:29Z andrea $ -# Maintainer: +# $Id: PKGBUILD 123635 2011-05-11 23:31:36Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sharutils -pkgver=4.10 +pkgver=4.11.1 pkgrel=1 -pkgdesc="GNU shar makes so-called shell archives out of many files" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/sharutils/" +pkgdesc='Makes so-called shell archives out of many files' +url='http://www.gnu.org/software/sharutils/' license=('GPL') +arch=('i686' 'x86_64') depends=('perl' 'gettext' 'texinfo') -install=${pkgname}.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('f918859228238d69e1ce78ccbec8f9e0') +source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('e9c9f869f8ecb3bcb30cc323e02e0a1266aeb109') + +install=install build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --disable-nls - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - rm ${pkgdir}/usr/share/info/dir - gzip ${pkgdir}/usr/share/info/* + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/sharutils/install b/extra/sharutils/install new file mode 100644 index 000000000..1de76964c --- /dev/null +++ b/extra/sharutils/install @@ -0,0 +1,18 @@ +infodir=/usr/share/info +filelist=(sharutils.info.gz) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir + done +} + +post_upgrade() { + post_install +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir + done +} diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 8465f232d..0f9c0a70a 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 103462 2010-12-19 17:12:50Z paul $ +# $Id: PKGBUILD 121110 2011-04-29 01:29:30Z stephane $ # Maintainer: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion pkgver=1.6.15 -pkgrel=1 +pkgrel=2 pkgdesc="Replacement for CVS, another versioning system (SVN)" arch=('i686' 'x86_64') license=('apache' 'bsd') depends=('neon' 'apr-util') -makedepends=('heimdal' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' +makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 'autoconf' 'sqlite3' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2 svnserve svn svnserve.conf svnmerge.py diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index 01b065caa..534995696 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123367 2011-05-10 16:31:02Z ibiru $ +# $Id: PKGBUILD 123605 2011-05-11 18:21:04Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Andreas Zwinkau <beza1e1@web.de> pkgname=telepathy-mission-control -pkgver=5.7.10 +pkgver=5.7.11 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-glib' 'libgnome-keyring') makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) -md5sums=('2793b7502c9a88dd1c7468c684bb7a5f') +md5sums=('d4b37aa43f391c34d033b1af5ab32e6d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 242452147..a83355164 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 120079 2011-04-19 13:10:40Z guillaume $ +# $Id: PKGBUILD 121168 2011-04-29 06:39:53Z stephane $ # 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.4.6 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL2') -makedepends=('bison' 'flex' 'gtk2' 'heimdal' 'libpcap' 'bash' 'gnutls' 'libcap') +makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap') url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) @@ -23,7 +23,7 @@ build() { package_wireshark-cli() { pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version" - depends=('heimdal' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2') + depends=('krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2') install=wireshark.install conflicts=(wireshark) diff --git a/extra/xfprint/PKGBUILD b/extra/xfprint/PKGBUILD index 71e48bd8d..1d622e190 100644 --- a/extra/xfprint/PKGBUILD +++ b/extra/xfprint/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 85560 2010-07-15 21:39:23Z andyrtr $ +# $Id: PKGBUILD 122851 2011-05-06 14:01:10Z stephane $ # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=xfprint pkgver=4.6.1 -pkgrel=4 +pkgrel=5 pkgdesc="A print dialog and a printer manager for Xfce" arch=(i686 x86_64) license=('GPL2') url="http://www.xfce.org/" groups=('xfce4') -depends=("libxfcegui4>=$pkgver" "xfconf>=$pkgver" 'libcups>=1.3.10' 'a2ps' 'heimdal>=1.3.1' +depends=("libxfcegui4>=$pkgver" "xfconf>=$pkgver" 'libcups>=1.3.10' 'a2ps' 'krb5' 'gnutls>=2.6.5' 'hicolor-icon-theme') makedepends=('pkgconfig' 'intltool') options=('!libtool') install=${pkgname}.install -source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2 - xfprint-manager-fix.diff) +source=(http://archive.xfce.org/xfce/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2 + xfprint-manager-fix.diff) md5sums=('d92fca97a42816085080baf07a99a62e' '69b3619a285e94d602a1d0ac08f4ca06') diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 29e055afe..7f859fa3f 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -42,7 +42,9 @@ package() { install -m755 ${_gitname}/abslibre-commit ${pkgdir}/usr/bin install -m755 ${_gitname}/add-mips64el ${pkgdir}/usr/bin + install -m755 ${_gitname}/aur ${pkgdir}/usr/bin install -m755 ${_gitname}/createworkdir ${pkgdir}/usr/bin/ + install -m755 ${_gitname}/diff-unfree ${pkgdir}/usr/bin install -m755 ${_gitname}/fullpkg ${pkgdir}/usr/bin install -m755 ${_gitname}/is_built ${pkgdir}/usr/bin install -m755 ${_gitname}/librechroot ${pkgdir}/usr/bin/ diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD new file mode 100644 index 000000000..78be6ccc6 --- /dev/null +++ b/multilib-testing/binutils-multilib/PKGBUILD @@ -0,0 +1,81 @@ +# $Id: PKGBUILD 46786 2011-05-11 15:43:26Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc + +pkgname=binutils-multilib +pkgver=2.21 +pkgrel=8 +_date=20110430 +pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib" +arch=('x86_64') +url="http://www.gnu.org/software/binutils/" +license=('GPL') +groups=('multilib-devel') +provides=("binutils=$pkgver-$pkgrel") +conflicts=('binutils') +depends=('glibc>=2.13' 'zlib') +makedepends=('dejagnu' 'gcc-multilib') # Make sure we compile this with gcc-multilib +options=('!libtool' '!distcc' '!ccache') +install=binutils.install +source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2 + binutils-2.21-strip-segfault.patch) +md5sums=('7b3e28fb35cb8bb371cc47291e1c6dec' + '98e8dfaf1c0ededa586823ebfb27825a') + +build() { + cd ${srcdir}/binutils + # http://sourceware.org/bugzilla/show_bug.cgi?id=12632 + patch -Np1 -i $srcdir/binutils-2.21-strip-segfault.patch + + cd ${srcdir} + mkdir binutils-build && cd binutils-build + + ${srcdir}/binutils/configure --prefix=/usr \ + --enable-ld=default --enable-gold \ + --enable-plugins --enable-threads \ + --enable-shared \ + --enable-64-bit-bfd --enable-multilib + + # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. + make configure-host + + make tooldir=${pkgdir}/usr +} + +check() { + cd ${srcdir}/binutils-build + + # do not abort on errors - manually check log files + make -k -j1 check || true +} + +package() { + cd ${srcdir}/binutils-build + make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install + + # Add some useful headers + install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include + install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include + + # Rebuild libiberty.a with -fPIC + make -C libiberty clean + make CFLAGS="$CFLAGS -fPIC" -C libiberty + install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib + + # Rebuild libbfd.a with -fPIC + make -C bfd clean + # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API + make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd + install -m644 bfd/libbfd.a ${pkgdir}/usr/lib + + # Remove Windows/Novell specific man pages + rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* + + # Remove these symlinks, they are not ABI stable. + # Programs should compile static to the .a file. + rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so + echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so + echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so +} diff --git a/multilib-testing/binutils-multilib/binutils-2.21-strip-segfault.patch b/multilib-testing/binutils-multilib/binutils-2.21-strip-segfault.patch new file mode 100644 index 000000000..0133d879b --- /dev/null +++ b/multilib-testing/binutils-multilib/binutils-2.21-strip-segfault.patch @@ -0,0 +1,96 @@ +diff --git a/binutils/objcopy.c b/binutils/objcopy.c +index 15c4f95..b64f3d0 100644 +--- a/binutils/objcopy.c ++++ b/binutils/objcopy.c +@@ -1,6 +1,6 @@ + /* objcopy.c -- copy object file from input to output, optionally massaging it. + Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +- 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ++ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Free Software Foundation, Inc. + + This file is part of GNU Binutils. +@@ -2024,6 +2024,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, + struct stat buf; + int stat_status = 0; + bfd_boolean del = TRUE; ++ bfd_boolean ok_object; + + /* Create an output file for this member. */ + output_name = concat (dir, "/", +@@ -2061,44 +2062,42 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, + l->obfd = NULL; + list = l; + +- if (bfd_check_format (this_element, bfd_object)) ++ ok_object = bfd_check_format (this_element, bfd_object); ++ if (!ok_object) ++ bfd_nonfatal_message (NULL, this_element, NULL, ++ _("Unable to recognise the format of file")); ++ ++ /* PR binutils/3110: Cope with archives ++ containing multiple target types. */ ++ if (force_output_target || !ok_object) ++ output_bfd = bfd_openw (output_name, output_target); ++ else ++ output_bfd = bfd_openw (output_name, bfd_get_target (this_element)); ++ ++ if (output_bfd == NULL) + { +- /* PR binutils/3110: Cope with archives +- containing multiple target types. */ +- if (force_output_target) +- output_bfd = bfd_openw (output_name, output_target); +- else +- output_bfd = bfd_openw (output_name, bfd_get_target (this_element)); ++ bfd_nonfatal_message (output_name, NULL, NULL, NULL); ++ status = 1; ++ return; ++ } ++ ++ if (ok_object) ++ { ++ del = !copy_object (this_element, output_bfd, input_arch); + +- if (output_bfd == NULL) ++ if (del && bfd_get_arch (this_element) == bfd_arch_unknown) ++ /* Try again as an unknown object file. */ ++ ok_object = FALSE; ++ else if (!bfd_close (output_bfd)) + { + bfd_nonfatal_message (output_name, NULL, NULL, NULL); ++ /* Error in new object file. Don't change archive. */ + status = 1; +- return; + } +- +- del = ! copy_object (this_element, output_bfd, input_arch); +- +- if (! del +- || bfd_get_arch (this_element) != bfd_arch_unknown) +- { +- if (!bfd_close (output_bfd)) +- { +- bfd_nonfatal_message (output_name, NULL, NULL, NULL); +- /* Error in new object file. Don't change archive. */ +- status = 1; +- } +- } +- else +- goto copy_unknown_element; + } +- else +- { +- bfd_nonfatal_message (NULL, this_element, NULL, +- _("Unable to recognise the format of file")); + +- output_bfd = bfd_openw (output_name, output_target); +-copy_unknown_element: ++ if (!ok_object) ++ { + del = !copy_unknown_object (this_element, output_bfd); + if (!bfd_close_all_done (output_bfd)) + { +-- +1.6.5.GIT + diff --git a/multilib-testing/binutils-multilib/binutils.install b/multilib-testing/binutils-multilib/binutils.install new file mode 100644 index 000000000..8bf9f3a47 --- /dev/null +++ b/multilib-testing/binutils-multilib/binutils.install @@ -0,0 +1,17 @@ +infodir=usr/share/info +filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD new file mode 100644 index 000000000..0d1d6a0bc --- /dev/null +++ b/testing/binutils/PKGBUILD @@ -0,0 +1,89 @@ +# $Id: PKGBUILD 123424 2011-05-11 10:41:25Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc + +pkgname=binutils +pkgver=2.21 +pkgrel=8 +_date=20110430 +pkgdesc="A set of programs to assemble and manipulate binary and object files" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/binutils/" +license=('GPL') +groups=('base') +depends=('glibc>=2.13' 'zlib') +makedepends=('dejagnu') +options=('!libtool' '!distcc' '!ccache') +install=binutils.install +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2 + binutils-2.21-strip-segfault.patch) +md5sums=('7b3e28fb35cb8bb371cc47291e1c6dec' + '98e8dfaf1c0ededa586823ebfb27825a') + +mksource() { + mkdir ${pkgname}-${_date} + cd ${pkgname}-${_date} + export _TAG=binutils-2_21-branch + export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src' + cvs -z9 co -r $_TAG binutils || return 1 + mv src binutils + tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/* +} + +build() { + cd ${srcdir}/binutils + # http://sourceware.org/bugzilla/show_bug.cgi?id=12632 + patch -Np1 -i $srcdir/binutils-2.21-strip-segfault.patch + + cd ${srcdir} + mkdir binutils-build && cd binutils-build + + [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" + + ${srcdir}/binutils/configure --prefix=/usr \ + --enable-ld=default --enable-gold \ + --enable-plugins --enable-threads \ + --enable-shared $CONFIGFLAG + + # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. + make configure-host + + make tooldir=${pkgdir}/usr +} + +check() { + cd ${srcdir}/binutils-build + + # do not abort on errors - manually check log files + make -k -j1 check || true +} + +package() { + cd ${srcdir}/binutils-build + make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install + + # Add some useful headers + install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include + install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include + + # Rebuild libiberty.a with -fPIC + make -C libiberty clean + make CFLAGS="$CFLAGS -fPIC" -C libiberty + install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib + + # Rebuild libbfd.a with -fPIC + make -C bfd clean + # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API + make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd + install -m644 bfd/libbfd.a ${pkgdir}/usr/lib + + # Remove Windows/Novell specific man pages + rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* + + # Remove these symlinks, they are not ABI stable. + # Programs should compile static to the .a file. + rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so + echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so + echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so +} diff --git a/testing/binutils/binutils-2.21-strip-segfault.patch b/testing/binutils/binutils-2.21-strip-segfault.patch new file mode 100644 index 000000000..0133d879b --- /dev/null +++ b/testing/binutils/binutils-2.21-strip-segfault.patch @@ -0,0 +1,96 @@ +diff --git a/binutils/objcopy.c b/binutils/objcopy.c +index 15c4f95..b64f3d0 100644 +--- a/binutils/objcopy.c ++++ b/binutils/objcopy.c +@@ -1,6 +1,6 @@ + /* objcopy.c -- copy object file from input to output, optionally massaging it. + Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +- 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ++ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Free Software Foundation, Inc. + + This file is part of GNU Binutils. +@@ -2024,6 +2024,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, + struct stat buf; + int stat_status = 0; + bfd_boolean del = TRUE; ++ bfd_boolean ok_object; + + /* Create an output file for this member. */ + output_name = concat (dir, "/", +@@ -2061,44 +2062,42 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, + l->obfd = NULL; + list = l; + +- if (bfd_check_format (this_element, bfd_object)) ++ ok_object = bfd_check_format (this_element, bfd_object); ++ if (!ok_object) ++ bfd_nonfatal_message (NULL, this_element, NULL, ++ _("Unable to recognise the format of file")); ++ ++ /* PR binutils/3110: Cope with archives ++ containing multiple target types. */ ++ if (force_output_target || !ok_object) ++ output_bfd = bfd_openw (output_name, output_target); ++ else ++ output_bfd = bfd_openw (output_name, bfd_get_target (this_element)); ++ ++ if (output_bfd == NULL) + { +- /* PR binutils/3110: Cope with archives +- containing multiple target types. */ +- if (force_output_target) +- output_bfd = bfd_openw (output_name, output_target); +- else +- output_bfd = bfd_openw (output_name, bfd_get_target (this_element)); ++ bfd_nonfatal_message (output_name, NULL, NULL, NULL); ++ status = 1; ++ return; ++ } ++ ++ if (ok_object) ++ { ++ del = !copy_object (this_element, output_bfd, input_arch); + +- if (output_bfd == NULL) ++ if (del && bfd_get_arch (this_element) == bfd_arch_unknown) ++ /* Try again as an unknown object file. */ ++ ok_object = FALSE; ++ else if (!bfd_close (output_bfd)) + { + bfd_nonfatal_message (output_name, NULL, NULL, NULL); ++ /* Error in new object file. Don't change archive. */ + status = 1; +- return; + } +- +- del = ! copy_object (this_element, output_bfd, input_arch); +- +- if (! del +- || bfd_get_arch (this_element) != bfd_arch_unknown) +- { +- if (!bfd_close (output_bfd)) +- { +- bfd_nonfatal_message (output_name, NULL, NULL, NULL); +- /* Error in new object file. Don't change archive. */ +- status = 1; +- } +- } +- else +- goto copy_unknown_element; + } +- else +- { +- bfd_nonfatal_message (NULL, this_element, NULL, +- _("Unable to recognise the format of file")); + +- output_bfd = bfd_openw (output_name, output_target); +-copy_unknown_element: ++ if (!ok_object) ++ { + del = !copy_unknown_object (this_element, output_bfd); + if (!bfd_close_all_done (output_bfd)) + { +-- +1.6.5.GIT + diff --git a/testing/binutils/binutils.install b/testing/binutils/binutils.install new file mode 100644 index 000000000..8bf9f3a47 --- /dev/null +++ b/testing/binutils/binutils.install @@ -0,0 +1,17 @@ +infodir=usr/share/info +filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + diff --git a/testing/file/PKGBUILD b/testing/file/PKGBUILD new file mode 100644 index 000000000..be9e1c172 --- /dev/null +++ b/testing/file/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 123428 2011-05-11 11:07:46Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> + +pkgname=file +pkgver=5.07 +pkgrel=1 +pkgdesc="File type identification utility" +arch=('i686' 'x86_64') +license=('custom') +groups=('base') +url="http://www.darwinsys.com/file/" +depends=('glibc' 'zlib') +options=('!libtool') +source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz + file-5.05-zip64.patch) +md5sums=('b8d1f9a8a644067bd0a703cebf3f4858' + '385f020467debd98bd2d8df6143f93d0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's#\$(datadir)/misc#\$(datadir)#' configure + + # identify zip64 files + patch -Np1 -i ${srcdir}/file-5.05-zip64.patch + + ./configure --prefix=/usr --datadir=/usr/share/file + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR=${pkgdir} install + install -dm755 ${pkgdir}/usr/share/misc + ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc + + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} diff --git a/testing/file/file-5.05-zip64.patch b/testing/file/file-5.05-zip64.patch new file mode 100644 index 000000000..2c9aede5f --- /dev/null +++ b/testing/file/file-5.05-zip64.patch @@ -0,0 +1,11 @@ +diff -Naur file-5.05-old//magic/Magdir/archive file-5.05/magic/Magdir/archive +--- file-5.05-old//magic/Magdir/archive 2011-01-08 06:24:25.000000000 +1000 ++++ file-5.05/magic/Magdir/archive 2011-01-19 14:37:47.766673895 +1000 +@@ -688,6 +688,7 @@ + >>4 byte 0x0b \b, at least v1.1 to extract + >>0x161 string WINZIP \b, WinZIP self-extracting + >>4 byte 0x14 \b, at least v2.0 to extract ++>>4 byte 0x2d \b, at least v3.0 to extract + + # Zoo archiver + 20 lelong 0xfdc4a7dc Zoo archive data diff --git a/testing/udev/80-drivers.rules b/testing/udev/80-drivers.rules new file mode 100644 index 000000000..56ac06cb4 --- /dev/null +++ b/testing/udev/80-drivers.rules @@ -0,0 +1,14 @@ +# do not edit this file, it will be overwritten on update + +ACTION=="remove", GOTO="drivers_end" + +DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}" +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd" +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms" +SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block" +SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block" +SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block" +SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg" +SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev" + +LABEL="drivers_end" diff --git a/testing/udev/81-arch.rules b/testing/udev/81-arch.rules new file mode 100644 index 000000000..21127a729 --- /dev/null +++ b/testing/udev/81-arch.rules @@ -0,0 +1,138 @@ +# Udev rules for Archlinux by Tobias Powalowski <tpowa@archlinux.org> +# do not edit this file, it will be overwritten on update +# +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %k the kernel name for the device. +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute. +# %% the '%' char itself. +# +# There are a number of modifiers that are allowed to be used in some of the +# fields. See the udev man page for a full description of them. +# global stuff +# + +##################################### +###### Hotplug rules - begin +# Only additional modules, +# which are not detectable, +# are loaded here! +##################################### +# check if the device has already been claimed by a driver +ACTION!="add", GOTO="drivers_end" + +# SOUND addon modules +SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-pcm-oss" +SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-seq-oss" + +#PNP addon modules +SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0800", RUN+="/lib/udev/load-modules.sh pcspkr" +SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP051[01]*", RUN+="/lib/udev/load-modules.sh irtty-sir" +SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNPb02f", RUN+="/lib/udev/load-modules.sh analog" + +# PARPORT addon modules +SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh lp" +SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh ppdev" + +# fix ide cdrom detection on old proliant servers +SUBSYSTEM=="pci", ENV{MODALIAS}=="pci:v00000E11d00000001sv00000000sd00000000bc06sc02i00", RUN+="/lib/udev/load-modules.sh ide-generic" + +LABEL="drivers_end" +##################################### +##### Hotplug rules - end +##################################### + +##################################### +###### CD/DVD symlinks - begin +##################################### +ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", IMPORT="cdrom_id --export $tempnode" +ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", IMPORT="cdrom_id --export $tempnode" +ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="scd[a-z]", IMPORT="cdrom_id --export $tempnode" +ENV{ID_CDROM}=="?*", SYMLINK+="cd/cdrom-%b" +ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cd/cdrw-%b" +ENV{ID_CDROM_DVD}=="?*", SYMLINK+="cd/dvd-%b" +ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="cd/dvdrw-%b" +ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", RUN+="cdsymlinks.sh" +ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" +ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" +ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="hd[a-z]", RUN+="cdsymlinks.sh" +ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sr[0-9]*", RUN+="cdsymlinks.sh" +ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sg[0-9]*", RUN+="cdsymlinks.sh" +##################################### +###### CD/DVD symlinks - end +##################################### + +##################################### +# Additional Archlinux +# Permissions and Symlinks - begin +##################################### + +# permission for sg devices +KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660" + +# permissions for IDE CD devices +SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical" + +# permissions for SCSI CD devices +SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", SYMLINK+="scd%n", GROUP="optical" +SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", GROUP="optical" + +# permissions for removable devices like cardreaders or sticks +KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="0", GROUP="storage" + +# permissions for firewire external drives +KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage" + +# permissions for usb to scsi external adapters +KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="7", GROUP="storage" + +# permissions for ide storage like pcmcia card readers +ACTION!="add", GOTO="pcmcia_end" +SUBSYSTEM!="block", GOTO="pcmcia_end" +KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" +KERNEL=="hd*", IMPORT{parent}=="ID_*" +KERNEL=="hd*", ENV{ID_TYPE}=="generic", GROUP="storage" +LABEL="pcmcia_end" + +# permissions for SCSI scanners +SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner" + +# mem +KERNEL=="ram0", SYMLINK+="ramdisk" +KERNEL=="ram1", SYMLINK+="ram" + +# video4linux + +KERNEL=="vbi0", SYMLINK+="vbi" +KERNEL=="radio0", SYMLINK+="radio" +KERNEL=="radio[0-9]*", GROUP="video" +KERNEL=="video0", SYMLINK+="video" +KERNEL=="vtx0", SYMLINK+="vtx" + +# video devices +### xorg resets those permissions, adjust your xorg.conf! +KERNEL=="3dfx*", GROUP="video" +KERNEL=="fb[0-9]*", GROUP="video" + +# misc +KERNEL=="sgi_fetchop", MODE="0666" +KERNEL=="sonypi", MODE="0666" + +# USB devices +KERNEL=="legousbtower*", MODE="0666" + +# kbd devices +KERNEL=="kbd", MODE="0664" + +# miscellaneous +KERNEL=="rtc|rtc0", GROUP="audio", MODE="0664" +####################################### +# Permissions and Symlinks - end +####################################### diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD new file mode 100644 index 000000000..44c2cf9d7 --- /dev/null +++ b/testing/udev/PKGBUILD @@ -0,0 +1,116 @@ +# $Id: PKGBUILD 123587 2011-05-11 16:38:57Z tomegun $ +# Maintainer: Aaron Griffin <aaron@archlinux.org> +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Maintainer: Thomas Bächler <thomas@archlinux.org> +# Maintainer: Tom Gundersen <teg@jklm.no> + +pkgbase="udev" +pkgname=('udev' 'udev-compat') +pkgver=168 +pkgrel=1 +arch=(i686 x86_64) +url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" +license=('GPL') +groups=('base') +# older initscripts versions required start_udev +options=(!makeflags !libtool) +makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') +source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 + 80-drivers.rules + 81-arch.rules + load-modules.sh + cdsymlinks.sh) + +build() { + cd $srcdir/$pkgbase-$pkgver + ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ + --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system + make +} + +package_udev() { + pkgdesc="The userspace dev tools (udev)" + depends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2' + 'module-init-tools>=3.11' 'pciutils') + install=udev.install + backup=(etc/udev/udev.conf + etc/modprobe.d/framebuffer_blacklist.conf) + conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07') + replaces=('devfsd') + + cd $srcdir/$pkgbase-$pkgver + make DESTDIR=${pkgdir} install + # Replace original 80-drivers.rules with custom one. + install -D -m644 $srcdir/80-drivers.rules $pkgdir/lib/udev/rules.d/80-drivers.rules + # Install our rule for permissions and symlinks + install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules + # install our module loading subsystem + install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh + # install cdsymlinks.sh + install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh + # disable error logging to prevent startup failures printed to vc on boot + sed -i -e 's|udev_log="err"|udev_log="0"|g' $pkgdir/etc/udev/udev.conf + # disable persistent cdromsymlinks and network by default + # and move it to /etc/udev/rules.d + mv $pkgdir/lib/udev/rules.d/75-persistent-net-generator.rules \ + $pkgdir/etc/udev/rules.d/75-persistent-net-generator.rules.optional + mv $pkgdir/lib/udev/rules.d/75-cd-aliases-generator.rules \ + $pkgdir/etc/udev/rules.d/75-cd-aliases-generator.rules.optional + + # create framebuffer blacklist + mkdir -p $pkgdir/etc/modprobe.d/ + for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz' -exec basename {} .ko.gz \;); do + echo "blacklist $mod" + done | sort -u > $pkgdir/etc/modprobe.d/framebuffer_blacklist.conf + + # create static devices in /lib/udev/devices/ + mkdir ${pkgdir}/lib/udev/devices/pts + mkdir ${pkgdir}/lib/udev/devices/shm + + mknod -m 0600 ${pkgdir}/lib/udev/devices/console c 5 1 + mknod -m 0666 ${pkgdir}/lib/udev/devices/null c 1 3 + mknod -m 0660 ${pkgdir}/lib/udev/devices/zero c 1 5 + mknod -m 0666 ${pkgdir}/lib/udev/devices/kmsg c 1 11 + + ln -snf /proc/self/fd ${pkgdir}/lib/udev/devices/fd + ln -snf /proc/self/fd/0 ${pkgdir}/lib/udev/devices/stdin + ln -snf /proc/self/fd/1 ${pkgdir}/lib/udev/devices/stdout + ln -snf /proc/self/fd/2 ${pkgdir}/lib/udev/devices/stderr + ln -snf /proc/kcore ${pkgdir}/lib/udev/devices/core + + # these static devices are created for convenience, to autoload the modules if necessary + # /dev/loop0 + mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0 + chgrp disk ${pkgdir}/lib/udev/devices/loop0 + # /dev/net/tun + mkdir ${pkgdir}/lib/udev/devices/net + mknod -m 0666 ${pkgdir}/lib/udev/devices/net/tun c 10 200 + # /dev/fuse + mknod -m 0666 ${pkgdir}/lib/udev/devices/fuse c 10 229 + # /dev/ppp + mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0 + + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group + for i in $pkgdir/lib/udev/rules.d/*.rules; do + sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; + s#GROUP="tape"#GROUP="storage"#g; + s#GROUP="cdrom"#GROUP="optical"#g' $i + done + + # Provided by the bluez package, remove this line when updating to udev>=169 + rm ${pkgdir}/lib/udev/hid2hci +} + +package_udev-compat() { + pkgdesc="The userspace dev tools (udev) - additional rules for older kernels" + depends=('udev') + groups=('') + cd $srcdir/$pkgbase-$pkgver + install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules +} +md5sums=('4a466078532ab5dd5c35acc3ea2ec9a1' + '4427855146513a4703ab5c7eb8a0156e' + 'f17c99779173ddc79f866cf3a5de5e68' + 'f91fddc67609b45b244a624977c4247b' + '2e808ee78d237c478b57af2a68d43769') diff --git a/testing/udev/cdsymlinks.sh b/testing/udev/cdsymlinks.sh new file mode 100755 index 000000000..498abda4a --- /dev/null +++ b/testing/udev/cdsymlinks.sh @@ -0,0 +1,44 @@ +#! /bin/sh +# Creates cdsymlinks in /dev +# for Archlinux by Tobias Powalowski <tpowa@archlinux.org> + +# check on cd/dvd drives and if persistant rules file is used +if [ -d /dev/cd -a ! -e /etc/udev/rules.d/75-persistent-cd.rules ]; then + # remove existing device files + rm /dev/cdrom* + rm /dev/cdrw* + rm /dev/dvd* + rm /dev/dvdrw* + # start creating symlinks + for i in /dev/cd/cdrom-*; do + if [ -h $i ]; then + [ "$CD_NUMBER" = "" ] && ln -s $i /dev/cdrom + [ "$CD_NUMBER" = "" ] && CD_NUMBER="-1" + ! [ "$CD_NUMBER" = "" ] && CD_NUMBER="$((CD_NUMBER+1))" && ln -s $i /dev/cdrom$CD_NUMBER + fi + done + + for i in /dev/cd/cdrw-*; do + if [ -h $i ]; then + [ "$CDRW_NUMBER" = "" ] && ln -s $i /dev/cdrw + [ "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="-1" + ! [ "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="$((CDRW_NUMBER+1))" && ln -s $i /dev/cdrw$CDRW_NUMBER + fi + done + + for i in /dev/cd/dvd-*; do + if [ -h $i ]; then + [ "$DVD_NUMBER" = "" ] && ln -s $i /dev/dvd + [ "$DVD_NUMBER" = "" ] && DVD_NUMBER="-1" + ! [ "$DVD_NUMBER" = "" ] && DVD_NUMBER="$((DVD_NUMBER+1))" && ln -s $i /dev/dvd$DVD_NUMBER + fi + done + + for i in /dev/cd/dvdrw-*; do + if [ -h $i ]; then + [ "$DVDRW_NUMBER" = "" ] && ln -s $i /dev/dvdrw + [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="-1" + ! [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="$((DVDRW_NUMBER+1))" && ln -s $i /dev/dvdrw$DVDRW_NUMBER + fi + done +fi diff --git a/testing/udev/load-modules.sh b/testing/udev/load-modules.sh new file mode 100755 index 000000000..1e2af913e --- /dev/null +++ b/testing/udev/load-modules.sh @@ -0,0 +1,80 @@ +#!/bin/bash +# Implement blacklisting for udev-loaded modules + +[ $# -ne 1 ] && exit 1 + +. /etc/rc.conf + +# grab modules from rc.conf +BLACKLIST="${MOD_BLACKLIST[@]}" +MODPROBE="/sbin/modprobe" +LOGGER="/usr/bin/logger" +RESOLVEALIAS="${MODPROBE} --resolve-alias" +USEBLACKLIST="--use-blacklist" + +if [ -f /proc/cmdline ]; then + for cmd in $(cat /proc/cmdline); do + case $cmd in + disablemodules=*) eval $cmd ;; + load_modules=off) exit ;; + esac + done + #parse cmdline entries of the form "disablemodules=x,y,z" + if [ -n "$disablemodules" ]; then + BLACKLIST="$BLACKLIST $(echo $disablemodules | sed 's|,| |g')" + fi +fi + +#MODULES entries in rc.conf that begin with ! are blacklisted +for mod in ${MODULES[@]}; do + if [ "${mod}" != "${mod#!}" ]; then + BLACKLIST="$BLACKLIST ${mod#!}" + fi +done + +if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then + if [ -n "${BLACKLIST}" ]; then + # If an alias name is on the blacklist, load no modules for this device + if echo "${BLACKLIST}" | /bin/grep -q -e " $1 " -e "^$1 " -e " $1\$"; then + $LOGGER -p info -t "$(basename $0)" "Not loading module alias '$1' because it is blacklisted" + exit + fi + #sanitize the blacklist + BLACKLIST="$(echo "$BLACKLIST" | sed -e 's|-|_|g')" + # Try to find all modules for the alias + mods=$($RESOLVEALIAS $1) + # If no modules could be found, try if the alias name is a module name + # In that case, omit the --use-blacklist parameter to imitate normal modprobe behaviour + [ -z "${mods}" ] && $MODPROBE -qni $1 && mods="$1" && USEBLACKLIST="" + [ -z "${mods}" ] && $LOGGER -p local0.debug -t "$(basename $0)" "'$1' is not a valid module or alias name" + for mod in ${mods}; do + # Find the module and all its dependencies + deps="$($MODPROBE -i --show-depends ${mod})" + [ $? -ne 0 ] && continue + + #sanitize the module names + deps="$(echo "$deps" | sed \ + -e "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" \ + -e 's|-|_|g')" + + # If the module or any of its dependencies is blacklisted, don't load it + for dep in $deps; do + if echo "${BLACKLIST}" | /bin/grep -q -e " ${dep} " -e "^${dep} " -e " ${dep}\$"; then + if [ "${dep}" = "${mod}" ]; then + $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because it is blacklisted" + else + $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because its dependency '${dep}' is blacklisted" + fi + continue 2 + fi + done + # modprobe usually uses the "blacklist" statements from modprobe.conf only to blacklist all aliases + # of a module, but not the module itself. We use --use-blacklist here so that modprobe also blacklists + # module names if we resolved alias names manually above + $MODPROBE $USEBLACKLIST ${mod} + done + else + $MODPROBE $USEBLACKLIST $1 + fi +fi +# vim: set et ts=4: diff --git a/testing/udev/udev.install b/testing/udev/udev.install new file mode 100644 index 000000000..e953ec743 --- /dev/null +++ b/testing/udev/udev.install @@ -0,0 +1,38 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_upgrade() { + if [ "$(vercmp $2 100)" -lt 0 ]; then + echo "ATTENTION UDEV:" + echo "----------" + echo "udev >=098 rules syntax has changed, please update your own rules." + echo "udev >=099 Added persistent network and CD/DVD Symlink generator rules." + echo "Please read the instructions carefully before reboot." + echo "They are located in /etc/udev/readme-udev-arch.txt" + echo "----------" + fi +} + +post_install() { + # If a ramfs is mounted, we still need to make sure that /dev/{console,null,zero} exist + # The Archlinux installer bind-mounts /dev to /mnt/dev, thus making the real /dev invisible + ROOTDIR="" + [ "$(stat -c %D /)" != "$(stat -c %D /dev)" ] && ROOTDIR=$(mktemp -d /tmp/udevinstall.XXXXXX) + [ -n "${ROOTDIR}" ] && mount --bind / ${ROOTDIR} + if [ ! -c ${ROOTDIR}/dev/console ]; then + rm -f ${ROOTDIR}/dev/console + mknod -m600 ${ROOTDIR}/dev/console c 5 1 + fi + if [ ! -c ${ROOTDIR}/dev/null ]; then + rm -f ${ROOTDIR}/dev/null + mknod -m644 ${ROOTDIR}/dev/null c 1 3 + fi + if [ ! -c ${ROOTDIR}/dev/zero ]; then + rm -f ${ROOTDIR}/dev/zero + mknod -m644 ${ROOTDIR}/dev/zero c 1 5 + fi + if [ -n "${ROOTDIR}" ]; then + umount ${ROOTDIR} + rmdir ${ROOTDIR} + fi +} diff --git a/testing/ypbind-mt/PKGBUILD b/testing/ypbind-mt/PKGBUILD new file mode 100644 index 000000000..ddb807725 --- /dev/null +++ b/testing/ypbind-mt/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 123631 2011-05-11 23:05:30Z 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 +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') +source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz" + 'ypbind.conf' + 'ypbind') +sha1sums=('49f578d15aa5d4f4130a2e96cd9c0e519263fc88' + '07dee386d001fb9e9e6b76dda8af5b2092e5a4a2' + '66f6ea2f622e0724e6017bf835d4f7f4a5bf9534') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --disable-dbus-nm + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + 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 -m755 "$pkgdir"/var/yp/binding +} diff --git a/testing/ypbind-mt/ypbind b/testing/ypbind-mt/ypbind new file mode 100755 index 000000000..5ef5cf5b3 --- /dev/null +++ b/testing/ypbind-mt/ypbind @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/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}" +esac diff --git a/testing/ypbind-mt/ypbind.conf b/testing/ypbind-mt/ypbind.conf new file mode 100644 index 000000000..fd0ebd491 --- /dev/null +++ b/testing/ypbind-mt/ypbind.conf @@ -0,0 +1,4 @@ +# +# Parameters to be passed to ypbind +# +YPBIND_ARGS="" diff --git a/testing/ypserv/PKGBUILD b/testing/ypserv/PKGBUILD new file mode 100644 index 000000000..4c6e2333b --- /dev/null +++ b/testing/ypserv/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 123628 2011-05-11 23:04:51Z bisson $ +# Maintainer: judd <jvinet@zeroflux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=ypserv +pkgver=2.25 +pkgrel=1 +pkgdesc='Linux NIS Server' +arch=('i686' 'x86_64') +url='http://www.linux-nis.org/nis/ypserv/' +license=('GPL2') +depends=('gdbm' 'openslp') +backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets') +source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz" \ + 'yppasswd' + 'ypserv') +sha1sums=('ab997022d25b6374ae21d39f7ff564be028d8736' + '96192b628afe36709496e4801d016c4bff343f0e' + 'b625381bfa6cf62345377a7df30b8f45935206c5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + install -D -m644 etc/netgroup "$pkgdir"/etc/netgroup + install -D -m644 etc/ypserv.conf "$pkgdir"/etc/ypserv.conf + install -D -m644 etc/securenets "$pkgdir"/var/yp/securenets + install -D -m755 ../ypserv "$pkgdir"/etc/rc.d/ypserv + install -D -m755 ../yppasswd "$pkgdir"/etc/rc.d/yppasswd +} diff --git a/testing/ypserv/yppasswd b/testing/ypserv/yppasswd new file mode 100755 index 000000000..c2b00b2ca --- /dev/null +++ b/testing/ypserv/yppasswd @@ -0,0 +1,34 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting NIS Password Daemon" + /usr/sbin/rpc.yppasswdd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon yppasswd + stat_done + fi + ;; + stop) + stat_busy "Stopping NIS Password Daemon" + killall -q /usr/sbin/rpc.yppasswdd + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon yppasswd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/testing/ypserv/ypserv b/testing/ypserv/ypserv new file mode 100755 index 000000000..c36e6901b --- /dev/null +++ b/testing/ypserv/ypserv @@ -0,0 +1,34 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting NIS Server" + /usr/sbin/ypserv + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon ypserv + stat_done + fi + ;; + stop) + stat_busy "Stopping NIS Server" + killall -q /usr/sbin/ypserv + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon ypserv + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac |