From 3f7a594e5ed077eadf16cad40d023c4835c68501 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 6 May 2011 20:17:18 +0000 Subject: Fri May 6 20:17:18 UTC 2011 --- community-staging/arch/PKGBUILD | 27 + community-staging/autofs/PKGBUILD | 51 ++ community-staging/autofs/auto.master | 6 + community-staging/autofs/auto.misc | 7 + community-staging/autofs/autofs | 50 ++ community-staging/autofs/autofs.conf.d | 4 + community-staging/autofs/autofs.install | 4 + community-staging/autofs/heimdal.patch | 44 ++ community-staging/pam-krb5/PKGBUILD | 28 + community-staging/pgadmin3/PKGBUILD | 12 +- community/libparserutils/PKGBUILD | 14 +- community/mupdf/PKGBUILD | 4 +- community/perl-datetime/PKGBUILD | 7 +- community/ude/PKGBUILD | 16 +- extra/elfutils/PKGBUILD | 32 + extra/fvwm-devel/PKGBUILD | 9 +- extra/fvwm/PKGBUILD | 8 +- extra/git/PKGBUILD | 40 +- extra/gnome-shell/PKGBUILD | 11 +- .../network_fixes_up_to_5090a4ccce.patch | 814 +++++++++++++++++++++ extra/imagemagick/PKGBUILD | 21 +- extra/lm_sensors/PKGBUILD | 8 +- extra/nautilus/PKGBUILD | 6 +- extra/racket/PKGBUILD | 18 +- extra/sysklogd/PKGBUILD | 50 +- extra/sysklogd/sysklogd-debian.patch | 21 + multilib/lib32-qt/PKGBUILD | 6 +- staging/openssh/PKGBUILD | 8 +- testing/iproute2/PKGBUILD | 8 +- testing/openssh/PKGBUILD | 56 ++ testing/openssh/sshd | 48 ++ testing/openssh/sshd.confd | 4 + testing/openssh/sshd.pam | 10 + 33 files changed, 1340 insertions(+), 112 deletions(-) create mode 100644 community-staging/arch/PKGBUILD create mode 100644 community-staging/autofs/PKGBUILD create mode 100644 community-staging/autofs/auto.master create mode 100644 community-staging/autofs/auto.misc create mode 100644 community-staging/autofs/autofs create mode 100644 community-staging/autofs/autofs.conf.d create mode 100644 community-staging/autofs/autofs.install create mode 100644 community-staging/autofs/heimdal.patch create mode 100644 community-staging/pam-krb5/PKGBUILD create mode 100644 extra/elfutils/PKGBUILD create mode 100644 extra/gnome-shell/network_fixes_up_to_5090a4ccce.patch create mode 100644 extra/sysklogd/sysklogd-debian.patch create mode 100644 testing/openssh/PKGBUILD create mode 100755 testing/openssh/sshd create mode 100644 testing/openssh/sshd.confd create mode 100644 testing/openssh/sshd.pam diff --git a/community-staging/arch/PKGBUILD b/community-staging/arch/PKGBUILD new file mode 100644 index 000000000..2be3a270a --- /dev/null +++ b/community-staging/arch/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 46342 2011-05-05 11:48:15Z spupykin $ +# Maintainer: Judd Vinet + +pkgname='arch' +pkgver=1.3.5 +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' 'krb5') +options=('!makeflags') +source=(ftp://ftp.gnu.org/gnu/gnu-arch/tla-$pkgver.tar.gz) +md5sums=('db31ee89bc4788eef1eba1cee6c176ef') + +build() { + cd "${srcdir}/tla-$pkgver/src" + mkdir =build + cd =build + ../configure --prefix /usr + make +} + +package() { + cd "${srcdir}/tla-$pkgver/src/=build" + make prefix="${pkgdir}/usr" install +} diff --git a/community-staging/autofs/PKGBUILD b/community-staging/autofs/PKGBUILD new file mode 100644 index 000000000..11ac57ec1 --- /dev/null +++ b/community-staging/autofs/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 46345 2011-05-05 11:57:37Z spupykin $ +# Maintainer: Lukas Fleischer +# Contributor: Andrea Scarpino +# Contributor: Dale Blount +# Contributor: Manolis Tzanidakis + +pkgname=autofs +pkgver=5.0.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' 'krb5') +backup=('etc/autofs/auto.master' + 'etc/autofs/auto.misc' + 'etc/conf.d/autofs') +options=(!makeflags) +install='autofs.install' +source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2" + 'autofs' + 'autofs.conf.d' + 'auto.master' + 'auto.misc') +md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a' + 'e307bf6d2638e46eeb916cf42fe029b2' + '47f597c870410055e0fdb66103daf928' + 'a6cefb591e77b31b79dbb7243646c96b' + 'd8a15ec9186c5c0b36e5cea1e2739e8a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \ + Makefile.rules + + ./configure --prefix=/usr --sysconfdir=/etc/autofs --with-mapdir=/etc/autofs --without-hesiod \ + --enable-ignore-busy + make +} + +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" + install -Dm0644 "${srcdir}/autofs.conf.d" "${pkgdir}/etc/conf.d/autofs" +} diff --git a/community-staging/autofs/auto.master b/community-staging/autofs/auto.master new file mode 100644 index 000000000..be4ea73ae --- /dev/null +++ b/community-staging/autofs/auto.master @@ -0,0 +1,6 @@ +# Sample auto.master file +# Format of this file: +# mountpoint map options +# For details of the format look at autofs(5). + +#/media /etc/autofs/auto.media diff --git a/community-staging/autofs/auto.misc b/community-staging/autofs/auto.misc new file mode 100644 index 000000000..569156626 --- /dev/null +++ b/community-staging/autofs/auto.misc @@ -0,0 +1,7 @@ +# This is an automounter map and it has the following format +# key [ -mount-options-separated-by-comma ] location +# Details may be found in the autofs(5) manpage + +cdrom -fstype=iso9660,ro,nodev,nosuid :/dev/cdrom +floppy -fstype=auto,async,nodev,nosuid,umask=000 :/dev/fl +usbstick -fstype=auto,async,nodev,nosuid,umask=000 :/dev/sda1 diff --git a/community-staging/autofs/autofs b/community-staging/autofs/autofs new file mode 100644 index 000000000..08bd3e133 --- /dev/null +++ b/community-staging/autofs/autofs @@ -0,0 +1,50 @@ +#!/bin/bash + +daemon_name=autofs + +. /etc/rc.conf +. /etc/rc.d/functions + +# source application-specific settings +[ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs + +if [ ! -z "$TIMEOUT" ]; then + daemonoptions="--timeout=$TIMEOUT $daemonoptions" +fi + +PID=`cat /var/run/autofs-running 2> /dev/null` +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon $daemon_name + stat_done + fi + ;; + stop) + stat_busy "Stopping $daemon_name daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon $daemon_name + stat_done + fi + ;; + restart) + stat_busy "Restarting $daemon_name daemon" + $0 stop + sleep 1 + $0 start + ;; + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + *) + echo "usage: $0 {start|stop|restart|status}" +esac +exit 0 diff --git a/community-staging/autofs/autofs.conf.d b/community-staging/autofs/autofs.conf.d new file mode 100644 index 000000000..bc82491e7 --- /dev/null +++ b/community-staging/autofs/autofs.conf.d @@ -0,0 +1,4 @@ +#localoptions='rsize=8192,wsize=8192' + +# e.g. --timeout=60 +daemonoptions='' diff --git a/community-staging/autofs/autofs.install b/community-staging/autofs/autofs.install new file mode 100644 index 000000000..34ae75f1e --- /dev/null +++ b/community-staging/autofs/autofs.install @@ -0,0 +1,4 @@ +post_install(){ + echo "> In autofs5 --ghost option isn't valid. In order to start autofs you" + echo "> must remove that option from your /etc/conf.d/autofs." +} diff --git a/community-staging/autofs/heimdal.patch b/community-staging/autofs/heimdal.patch new file mode 100644 index 000000000..4aa321834 --- /dev/null +++ b/community-staging/autofs/heimdal.patch @@ -0,0 +1,44 @@ +--- autofs-5.0.5/modules/cyrus-sasl.c~ 2010-03-03 01:38:41.582901786 +0100 ++++ autofs-5.0.5/modules/cyrus-sasl.c 2010-03-03 01:41:32.313704755 +0100 +@@ -66,6 +66,15 @@ + #endif + #endif + ++/** ++ * The type of a principal is different for MIT Krb5 and Heimdal. ++ * These macros are provided by Heimdal, and introduced here for MIT. ++ */ ++#ifndef krb5_realm_length ++#define krb5_realm_length(r) ((r).length) ++#define krb5_realm_data(r) ((r).data) ++#endif ++ + /* + * Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME + * environment variable so that the library knows where to find it. +@@ -452,11 +452,11 @@ + + /* setup a principal for the ticket granting service */ + ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ, +- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, +- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, ++ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), ++ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), + strlen(KRB5_TGS_NAME), KRB5_TGS_NAME, +- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, +- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, ++ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), ++ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), + 0); + if (ret) { + error(logopt, +--- autofs-5.0.5/modules/Makefile~ 2010-03-03 01:42:18.532868539 +0100 ++++ autofs-5.0.5/modules/Makefile 2010-03-03 01:42:35.360367371 +0100 +@@ -43,7 +43,7 @@ + ifeq ($(SASL), 1) + SASL_OBJ = cyrus-sasl.o + LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE +- LIBLDAP += $(LIBSASL) $(XML_LIBS) ++ LIBLDAP += $(LIBSASL) $(XML_LIBS) -lkrb5 + endif + endif \ No newline at end of file diff --git a/community-staging/pam-krb5/PKGBUILD b/community-staging/pam-krb5/PKGBUILD new file mode 100644 index 000000000..5c9798514 --- /dev/null +++ b/community-staging/pam-krb5/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 46339 2011-05-05 11:43:20Z spupykin $ +# Maintainer: Kaiting Chen +# Contributor: Ryan Corder + +pkgname=pam-krb5 +pkgver=4.4 +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=('krb5' 'pam') +source=("http://archives.eyrie.org/software/kerberos/$pkgname-$pkgver.tar.gz") +md5sums=('a3f9a414fef102cd815a763c965b315c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --enable-reduced-depends + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=$pkgdir install + install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community-staging/pgadmin3/PKGBUILD b/community-staging/pgadmin3/PKGBUILD index e9da012df..117eb7521 100644 --- a/community-staging/pgadmin3/PKGBUILD +++ b/community-staging/pgadmin3/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 45809 2011-04-29 11:11:02Z spupykin $ +# $Id: PKGBUILD 46331 2011-05-05 10:45:23Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Douglas Soares de Andrade # Contributor: Benjamin Andresen # Contributor: bekks pkgname=pgadmin3 -pkgver=1.12.2 -_realver=1.12.2 -pkgrel=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" @@ -16,14 +16,12 @@ depends=('wxgtk' 'postgresql-libs>=8.4.1' 'libxslt') 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 } diff --git a/community/libparserutils/PKGBUILD b/community/libparserutils/PKGBUILD index 0f91f8d8d..88550cc62 100644 --- a/community/libparserutils/PKGBUILD +++ b/community/libparserutils/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 22542 2010-07-22 12:13:40Z lcarlier $ +# $Id: PKGBUILD 46354 2011-05-06 03:07:02Z bfanella $ +# Maintainer: Brad Fanella # Contributor: Paulo Matias -# Maintainer: Daniel J Griffiths +# Contributor: Daniel J Griffiths pkgname=libparserutils -pkgver=0.0.2 +pkgver=0.1.0 pkgrel=1 pkgdesc="Library for building efficient parsers" arch=('i686' 'x86_64') url="http://www.netsurf-browser.org/projects/libparserutils" license=('MIT') source=("http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz") -md5sums=('5b2e4ddeebe451cc801ccd6e7da06f87') +md5sums=('eb415317925a0fb12a4ff8f849d2fe92') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver}-src + sed 's/-Wall/ /' -i Makefile make PREFIX=/usr } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver}-src make install PREFIX=/usr DESTDIR=${pkgdir} install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index 69c92cbc7..3fefacf7e 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: xduugu (.desktop and install files) pkgname=mupdf -pkgver=0.8.15 +pkgver=0.8.165 pkgrel=1 pkgdesc="lightweight PDF viewer and toolkit written in portable C" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL3') depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext') install=mupdf.install source=("http://mupdf.com/download/$pkgname-$pkgver-source.tar.gz") -md5sums=('ba6159fab82999599d36534cda07957f') +md5sums=('a95813737924e60d87a944d52b6a5120') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD index c25f27d05..ff0dc14aa 100644 --- a/community/perl-datetime/PKGBUILD +++ b/community/perl-datetime/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 46151 2011-05-04 08:34:55Z spupykin $ +# $Id: PKGBUILD 46321 2011-05-05 10:16:29Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: François Charette pkgname=perl-datetime pkgver=0.69 -pkgrel=1 +pkgrel=2 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DateTime" license=('GPL' 'PerlArtistic') -depends=('perl-datetime-timezone>=0.59' 'perl-datetime-locale>=0.41' 'perl-params-validate>=0.76') +depends=('perl-datetime-timezone>=0.59' 'perl-datetime-locale>=0.41' + 'perl-params-validate>=0.76' 'perl-math-round') LC_NUMERIC=C provides=("perl-datetime=`printf %.4f $pkgver`") options=('!emptydirs') diff --git a/community/ude/PKGBUILD b/community/ude/PKGBUILD index bf99313e3..9202bd979 100644 --- a/community/ude/PKGBUILD +++ b/community/ude/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 12299 2010-03-01 11:14:18Z spupykin $ +# $Id: PKGBUILD 46324 2011-05-05 10:17:03Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: eric # Contributor: dorphell pkgname=ude -pkgver=0.2.10 +pkgver=0.2.10a pkgrel=1 -pkgdesc="UDE, the Unix Desktop Environment, is a GUI desktop environment" +pkgdesc="Unix Desktop Environment is a GUI desktop environment" arch=('i686' 'x86_64') license=('GPL') depends=('libjpeg' 'libxmu' 'libxpm') url="http://udeproject.sourceforge.net/index.shtml" source=(http://downloads.sourceforge.net/udeproject/uwm-$pkgver.tar.gz \ $pkgname.desktop) -md5sums=('efb3392591ad976d20bd7ac6f174a5a3' +md5sums=('1370418179f56612ffe63d6ed0c89d13' '84f94253ea284258c4465cd76edf599f') build() { cd $srcdir/uwm-$pkgver - mkdir -p $pkgdir/etc/X11/sessions ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd $srcdir/uwm-$pkgver + mkdir -p $pkgdir/etc/X11/sessions make prefix=$pkgdir/usr install cp $srcdir/$pkgname.desktop $pkgdir/etc/X11/sessions } diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD new file mode 100644 index 000000000..7aef0c8f6 --- /dev/null +++ b/extra/elfutils/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 114401 2011-03-13 10:05:11Z allan $ +# Maintainer: Allan McRae +# Contributor: Andrej Gelenberg + +pkgname=elfutils +pkgver=0.152 +pkgrel=1 +pkgdesc="Collection of libraries and utilities for working with ELF object files and DWARF debugging information" +arch=('i686' 'x86_64') +url="https://fedorahosted.org/elfutils/" +license=('GPL2') +depends=('glibc') +#optdepends=('zlib' 'xz' 'bzip2') +provides=('libelf') +replaces=('libelf') +conflicts=('libelf') +source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2) +md5sums=('39739ed58a0fa1862eff8735f111fe5c') + +build() +{ + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --program-prefix="eu-" + make + make check +} + +package() +{ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/extra/fvwm-devel/PKGBUILD b/extra/fvwm-devel/PKGBUILD index 66d4180dd..42ea9293f 100644 --- a/extra/fvwm-devel/PKGBUILD +++ b/extra/fvwm-devel/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 119857 2011-04-16 04:00:46Z eric $ +# $Id: PKGBUILD 122676 2011-05-06 03:54:22Z eric $ # Maintainer: Eric Bélanger pkgname=fvwm-devel pkgver=2.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64') url="http://www.fvwm.org" license=('GPL' 'custom') -depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'readline' 'librsvg') -makedepends=('pkg-config') +depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor') +makedepends=('libxslt') conflicts=('fvwm') provides=("fvwm=${pkgver}") +options=('!emptydirs') source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-${pkgver}.tar.bz2 fvwm-devel.desktop) md5sums=('c7dbb0c067f570e478005edb95dcccc3' '3f5bcb246e035ff29aa5bf54487a3db4') diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD index 3ae19849a..bd7af2998 100644 --- a/extra/fvwm/PKGBUILD +++ b/extra/fvwm/PKGBUILD @@ -1,15 +1,17 @@ -# $Id: PKGBUILD 119981 2011-04-18 00:06:29Z eric $ +# $Id: PKGBUILD 122671 2011-05-06 03:51:25Z eric $ # Maintainer: Eric Bélanger pkgname=fvwm pkgver=2.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64') url="http://www.fvwm.org" license=('GPL' 'custom') -depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'readline' 'librsvg') +depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor') +makedepends=('libxslt') conflicts=('fvwm-devel') +options=('!emptydirs') source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/${pkgname}-${pkgver}.tar.bz2 fvwm2.desktop) md5sums=('fbbbed1bb41fa0878b17ee209947602d' 'e52a6ef25a936dcf3ad0e58f2e9ed0ea') diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 63b14b164..213ff2908 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 120940 2011-04-27 15:41:06Z dan $ +# $Id: PKGBUILD 122647 2011-05-05 13:19:03Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.7.5 +pkgver=1.7.5.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) url="http://git-scm.com/" license=('GPL2') depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.12.2') -makedepends=('python2') +makedepends=('python2' 'emacs') optdepends=('tk: gitk and git gui' 'perl-libwww: git svn' 'perl-term-readkey: git svn' @@ -31,19 +31,24 @@ changelog=ChangeLog build() { export PYTHON_PATH='/usr/bin/python2' cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr gitexecdir=/usr/lib/git-core + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" + + cd contrib/emacs + make prefix=/usr } package() { export PYTHON_PATH='/usr/bin/python2' cd "$srcdir/$pkgname-$pkgver" make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ NO_CROSS_DIRECTORY_HARDLINKS=1 \ - INSTALLDIRS=vendor DESTDIR=${pkgdir} install + INSTALLDIRS=vendor DESTDIR="$pkgdir" install # bash completion mkdir -p $pkgdir/etc/bash_completion.d/ - install -m644 ./contrib/completion/git-completion.bash $pkgdir/etc/bash_completion.d/git + install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git # more contrib stuff cp -a ./contrib $pkgdir/usr/share/git/ # scripts are for python 2.x @@ -52,30 +57,29 @@ package() { "$pkgdir"/usr/share/git/{fast-import/git-p4,gitview/gitview} # emacs interface - mkdir -p $pkgdir/usr/share/emacs/site-lisp - mv $pkgdir/usr/share/git/emacs $pkgdir/usr/share/emacs/site-lisp/git - rm $pkgdir/usr/share/emacs/site-lisp/git/.gitignore + cd contrib/emacs + make prefix=/usr DESTDIR="$pkgdir" install # how 'bout some manpages? for mansect in man1 man5 man7; do - for manpage in $srcdir/$mansect/*; do - install -D -m644 $manpage $pkgdir/usr/share/man/$mansect/$(basename $manpage) + for manpage in "$srcdir"/$mansect/*; do + install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage) done done # remove perllocal.pod, .packlist, and empty directories. - rm -rf $pkgdir/usr/lib/perl5 + rm -rf "$pkgdir"/usr/lib/perl5 # git daemon script - install -D -m755 $srcdir/git-daemon $pkgdir/etc/rc.d/git-daemon - install -D -m644 $srcdir/git-daemon.conf $pkgdir/etc/conf.d/git-daemon.conf + install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon + install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('7f0bc26a6e87d251c9b09fa05a186ed3' - '94cf18c292f0db30046092ef306bf57c' +md5sums=('a49291116e3b0564e069ae989e4db6fb' + 'cb0ec1095fbdf5b4935d5c43194b976a' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('7d293c5c0e544188d9b9ea94036cc56b39fbe045ead6f8ced00ad02a8854142d' - 'ced2319cbb48a4aa10bc5b1e1167a5de3b694eb9d256e68d978dbe86d997bee9' +sha256sums=('a1d4a1c59300e68fbc493a2cbe9257048d4d6f4363924bf34f38c413a825f80c' + '9d8ab1487df85ca596f3f6718d6a7831868abd9b98035a65c71d7f45af4aac8e' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 847a2570b..cbef4fbb6 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120693 2011-04-25 23:29:13Z ibiru $ +# $Id: PKGBUILD 122633 2011-05-05 11:05:07Z ibiru $ # Maintainer: Ionut Biru # Contributor: Flamelab +Date: Wed, 06 Apr 2011 16:11:23 +0000 +Subject: NetworkMenu: keep wirelesss networks in predictable order + +Adds a function that compares wireless networks and keeps them sorted +at all times. Order is: first already configured connections, then +first secure networks, then alphabtic. Also, the appearance of a new access +point no longer causes the whole menu to be rebuilt (but it still linear +searches for the position, I guess that could be skipped), which caused +the addition of more code for tracking the active access point. + +https://bugzilla.gnome.org/show_bug.cgi?id=646580 +--- +(limited to 'js/ui/status/network.js') + +diff --git a/js/ui/status/network.js b/js/ui/status/network.js +index 6fa5642..49cb3f0 100644 +--- a/js/ui/status/network.js ++++ b/js/ui/status/network.js +@@ -42,6 +42,10 @@ const NM80211Mode = NetworkManager['80211Mode']; + const NM80211ApFlags = NetworkManager['80211ApFlags']; + const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags']; + ++// number of wireless networks that should be visible ++// (the remaining are placed into More...) ++const NUM_VISIBLE_NETWORKS = 5; ++ + function macToArray(string) { + return string.split(':').map(function(el) { + return parseInt(el, 16); +@@ -1036,6 +1040,7 @@ NMDeviceWireless.prototype = { + item: null, + accessPoints: [ ap ] + }; ++ obj.ssidText = NetworkManager.utils_ssid_to_utf8(obj.ssid); + this._networks.push(obj); + } + +@@ -1048,6 +1053,14 @@ NMDeviceWireless.prototype = { + } + } + } ++ if (this.device.active_access_point) { ++ this._activeNetwork = this._networks[this._findNetwork(this.device.active_access_point)]; ++ } else { ++ this._activeNetwork = null; ++ } ++ this._networks.sort(this._networkSortFunction); ++ ++ this._apChangedId = device.connect('notify::active-access-point', Lang.bind(this, this._activeApChanged)); + this._apAddedId = device.connect('access-point-added', Lang.bind(this, this._accessPointAdded)); + this._apRemovedId = device.connect('access-point-removed', Lang.bind(this, this._accessPointRemoved)); + +@@ -1055,8 +1068,13 @@ NMDeviceWireless.prototype = { + }, + + destroy: function() { +- if (this._apAddedId) { ++ if (this._apChangedId) { + // see above for this HACK ++ GObject.Object.prototype.disconnect.call(this.device, this._apChangedId); ++ this._apChangedId = 0; ++ } ++ ++ if (this._apAddedId) { + GObject.Object.prototype.disconnect.call(this.device, this._apAddedId); + this._apAddedId = 0; + } +@@ -1122,6 +1140,19 @@ NMDeviceWireless.prototype = { + } + }, + ++ _activeApChanged: function() { ++ this._activeNetwork = null; ++ ++ let activeAp = this.device.active_access_point; ++ ++ if (activeAp) { ++ let pos = this._findNetwork(activeAp); ++ this._activeNetwork = this._networks[pos]; ++ } ++ ++ // we don't refresh the view here, setActiveConnection will ++ }, ++ + _getApSecurityType: function(accessPoint) { + if (accessPoint._secType) + return accessPoint._secType; +@@ -1151,6 +1182,32 @@ NMDeviceWireless.prototype = { + return type; + }, + ++ _networkSortFunction: function(one, two) { ++ let oneHasConnection = one.connections.length != 0; ++ let twoHasConnection = two.connections.length != 0; ++ ++ // place known connections first ++ // (-1 = good order, 1 = wrong order) ++ if (oneHasConnection && !twoHasConnection) ++ return -1; ++ else if (!oneHasConnection && twoHasConnection) ++ return 1; ++ ++ let oneHasSecurity = one.security != NMAccessPointSecurity.NONE; ++ let twoHasSecurity = two.security != NMAccessPointSecurity.NONE; ++ ++ // place secure connections first ++ // (we treat WEP/WPA/WPA2 the same as there is no way to ++ // take them apart from the UI) ++ if (oneHasSecurity && !twoHasSecurity) ++ return -1; ++ else if (!oneHasSecurity && twoHasSecurity) ++ return 1; ++ ++ // sort alphabetically ++ return GLib.utf8_collate(one.ssidText, two.ssidText); ++ }, ++ + _networkCompare: function(network, accessPoint) { + if (!ssidCompare(network.ssid, accessPoint.get_ssid())) + return false; +@@ -1173,6 +1230,8 @@ NMDeviceWireless.prototype = { + _accessPointAdded: function(device, accessPoint) { + let pos = this._findNetwork(accessPoint); + let apObj; ++ let needsupdate = false; ++ + if (pos != -1) { + apObj = this._networks[pos]; + if (apObj.accessPoints.indexOf(accessPoint) != -1) { +@@ -1181,6 +1240,8 @@ NMDeviceWireless.prototype = { + } + + apObj.accessPoints.push(accessPoint); ++ if (apObj.item) ++ apObj.item.updateAccessPoints(apObj.accessPoints); + } else { + apObj = { ssid: accessPoint.get_ssid(), + mode: accessPoint.mode, +@@ -1189,7 +1250,8 @@ NMDeviceWireless.prototype = { + item: null, + accessPoints: [ accessPoint ] + }; +- this._networks.push(apObj); ++ apObj.ssidText = NetworkManager.utils_ssid_to_utf8(apObj.ssid); ++ needsupdate = true; + } + + // check if this enables new connections for this group +@@ -1198,12 +1260,44 @@ NMDeviceWireless.prototype = { + if (this._connectionValidForAP(connection, accessPoint) && + apObj.connections.indexOf(connection) == -1) { + apObj.connections.push(connection); ++ ++ // this potentially changes the order ++ needsupdate = true; + } + } + +- // update everything +- this._clearSection(); +- this._createSection(); ++ if (needsupdate) { ++ if (apObj.item) ++ apObj.item.destroy(); ++ ++ if (pos != -1) ++ this._networks.splice(pos, 1); ++ ++ if (this._networks.length == 0) { ++ // only network in the list ++ this._networks.push(apObj); ++ this._clearSection(); ++ this._createSection(); ++ return; ++ } ++ ++ // skip networks that should appear earlier ++ let menuPos = 0; ++ for (pos = 0; ++ pos < this._networks.length && ++ this._networkSortFunction(this._networks[i], apObj) < 0; ++pos) { ++ if (this._networks[pos] != this._activeNetwork) ++ menuPos++; ++ } ++ ++ // (re-)add the network ++ this._networks.splice(pos, 0, apObj); ++ ++ if (this._shouldShowConnectionList()) { ++ menuPos += (this._activeConnectionItem ? 1 : 0); ++ this._createNetworkItem(apObj, menuPos); ++ } ++ } + }, + + _accessPointRemoved: function(device, accessPoint) { +@@ -1315,6 +1409,12 @@ NMDeviceWireless.prototype = { + // remove the connection from the access point group + connections.splice(k); + anyauto = connections.length == 0; ++ ++ if (anyauto) { ++ // this potentially changes the sorting order ++ forceupdate = true; ++ break; ++ } + if (apObj.item) { + if (apObj.item instanceof PopupMenu.PopupSubMenuMenuItem) { + let items = apObj.item.menu.getMenuItems(); +@@ -1340,6 +1440,7 @@ NMDeviceWireless.prototype = { + } + + if (forceupdate || anyauto) { ++ this._networks.sort(this._networkSortFunction); + this._clearSection(); + this._createSection(); + } +@@ -1355,42 +1456,24 @@ NMDeviceWireless.prototype = { + this._connections.push(obj); + + // find an appropriate access point +- let any = false, forceupdate = false; ++ let forceupdate = false; + for (let i = 0; i < this._networks.length; i++) { + let apObj = this._networks[i]; + + // Check if connection is valid for any of these access points +- let any = false; + for (let k = 0; k < apObj.accessPoints.length; k++) { + let ap = apObj.accessPoints[k]; + if (this._connectionValidForAP(connection, ap)) { + apObj.connections.push(connection); +- any = true; ++ // this potentially changes the sorting order ++ forceupdate = true; + break; + } + } +- +- if (any && this._shouldShowConnectionList()) { +- // we need to show this connection +- if (apObj.item && apObj.item.menu) { +- // We're already showing the submenu for this access point +- apObj.item.menu.addMenuItem(this._createAPItem(connection, apObj, true)); +- } else { +- if (apObj.item) +- apObj.item.destroy(); +- if (apObj.connections.length == 1) { +- apObj.item = this._createAPItem(connection, apObj, false); +- this.section.addMenuItem(apObj.item); +- } else { +- apObj.item = null; +- // we need to force an update to create the submenu +- forceupdate = true; +- } +- } +- } + } + + if (forceupdate) { ++ this._networks.sort(this._networkSortFunction); + this._clearSection(); + this._createSection(); + } +@@ -1473,6 +1556,37 @@ NMDeviceWireless.prototype = { + return connection; + }, + ++ _createNetworkItem: function(apObj, position) { ++ if(apObj.connections.length > 0) { ++ if (apObj.connections.length == 1) ++ apObj.item = this._createAPItem(apObj.connections[0], apObj, false); ++ else { ++ let title = apObj.ssidText; ++ apObj.item = new PopupMenu.PopupSubMenuMenuItem(title); ++ apObj.item._apObj = apObj; ++ for (let i = 0; i < apObj.connections.length; i++) ++ apObj.item.menu.addMenuItem(this._createAPItem(apObj.connections[i], apObj, true)); ++ } ++ } else { ++ apObj.item = new NMNetworkMenuItem(apObj.accessPoints); ++ apObj.item._apObj = apObj; ++ apObj.item.connect('activate', Lang.bind(this, function() { ++ let connection = this._createAutomaticConnection(apObj); ++ let accessPoints = sortAccessPoints(apObj.accessPoints); ++ this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null) ++ })); ++ } ++ if (position < NUM_VISIBLE_NETWORKS) ++ this.section.addMenuItem(apObj.item); ++ else { ++ if (!this._overflowItem) { ++ this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More...")); ++ this.section.addMenuItem(this._overflowItem); ++ } ++ this._overflowItem.menu.addMenuItem(apObj.item, position - NUM_VISIBLE_NETWORKS); ++ } ++ }, ++ + _createSection: function() { + if (!this._shouldShowConnectionList()) + return; +@@ -1482,47 +1596,14 @@ NMDeviceWireless.prototype = { + this.section.addMenuItem(this._activeConnectionItem); + } + +- let activeAp = this.device.active_access_point; +- let activeApSsid = activeAp ? activeAp.get_ssid() : null; +- +- // we want five access points in the menu, including the active one +- let numItems = this._activeConnection ? 4 : 5; ++ let activeOffset = this._activeConnectionItem ? 1 : 0; + + for(let j = 0; j < this._networks.length; j++) { + let apObj = this._networks[j]; +- if(activeAp && ssidCompare(apObj.ssid, activeApSsid)) ++ if (apObj == this._activeNetwork) + continue; + +- let menuItem; +- if(apObj.connections.length > 0) { +- if (apObj.connections.length == 1) +- apObj.item = this._createAPItem(apObj.connections[0], apObj, false); +- else { +- let title = NetworkManager.utils_ssid_to_utf8(apObj.ssid) || _(""); +- apObj.item = new PopupMenu.PopupSubMenuMenuItem(title); +- apObj.item._apObj = apObj; +- for (let i = 0; i < apObj.connections.length; i++) +- apObj.item.menu.addMenuItem(this._createAPItem(apObj.connections[i], apObj, true)); +- } +- } else { +- apObj.item = new NMNetworkMenuItem(apObj.accessPoints); +- apObj.item._apObj = apObj; +- apObj.item.connect('activate', Lang.bind(this, function() { +- let connection = this._createAutomaticConnection(apObj); +- let accessPoints = sortAccessPoints(apObj.accessPoints); +- this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null) +- })); +- } +- +- if (j < numItems) +- this.section.addMenuItem(apObj.item); +- else { +- if (!this._overflowItem) { +- this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More...")); +- this.section.addMenuItem(this._overflowItem); +- } +- this._overflowItem.menu.addMenuItem(apObj.item); +- } ++ this._createNetworkItem(apObj, j + activeOffset); + } + }, + }; +-- +cgit v0.9 +From 42a5531f1588ae3063e7d8ff7642e9f81c13afbd Mon Sep 17 00:00:00 2001 +From: Dan Winship +Date: Wed, 27 Apr 2011 13:05:39 +0000 +Subject: network: fix a variable name + +--- +(limited to 'js/ui/status/network.js') + +diff --git a/js/ui/status/network.js b/js/ui/status/network.js +index 49cb3f0..d56c0b1 100644 +--- a/js/ui/status/network.js ++++ b/js/ui/status/network.js +@@ -1285,7 +1285,7 @@ NMDeviceWireless.prototype = { + let menuPos = 0; + for (pos = 0; + pos < this._networks.length && +- this._networkSortFunction(this._networks[i], apObj) < 0; ++pos) { ++ this._networkSortFunction(this._networks[pos], apObj) < 0; ++pos) { + if (this._networks[pos] != this._activeNetwork) + menuPos++; + } +-- +cgit v0.9 +From c31109800b3267df433841bff08c9383a5d669cb Mon Sep 17 00:00:00 2001 +From: Dan Williams +Date: Mon, 25 Apr 2011 22:13:12 +0000 +Subject: network: simplify connection sorting by using libnm-glib functions + +Instead of rolling our own code, use new libnm-glib functions to do +the same thing. Requires libnm-glib as of +779215c742bbe29a2c66202ec7e2e6d43edeb8ff (which will be part of 0.9). + +Fixes https://bugzilla.gnome.org/show_bug.cgi?id=648648 +--- +(limited to 'js/ui/status/network.js') + +diff --git a/js/ui/status/network.js b/js/ui/status/network.js +index d56c0b1..bf8e272 100644 +--- a/js/ui/status/network.js ++++ b/js/ui/status/network.js +@@ -505,7 +505,7 @@ NMDevice.prototype = { + }, + + connectionValid: function(connection) { +- throw new TypeError('Invoking pure virtual function NMDevice.connectionValid'); ++ return this.device.connection_valid(connection); + }, + + setEnabled: function(enabled) { +@@ -723,17 +723,6 @@ NMDeviceWired.prototype = { + NMDevice.prototype._init.call(this, client, device, connections); + }, + +- connectionValid: function(connection) { +- if (connection._type != NetworkManager.SETTING_WIRED_SETTING_NAME) +- return false; +- +- let ethernetSettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRED_SETTING_NAME); +- let fixedMac = ethernetSettings.get_mac_address(); +- if (fixedMac) +- return macCompare(fixedMac, macToArray(this.device.perm_hw_address)); +- return true; +- }, +- + _createSection: function() { + NMDevice.prototype._createSection.call(this); + +@@ -876,10 +865,6 @@ NMDeviceModem.prototype = { + NMDevice.prototype._clearSection.call(this); + }, + +- connectionValid: function(connection) { +- return connection._type == this._connectionType; +- }, +- + _createAutomaticConnection: function() { + // FIXME: we need to summon the mobile wizard here + // or NM will not have the necessary parameters to complete the connection +@@ -913,18 +898,6 @@ NMDeviceBluetooth.prototype = { + NMDevice.prototype._init.call(this, client, device, connections); + }, + +- connectionValid: function(connection) { +- if (connection._type != NetworkManager.SETTING_BLUETOOTH_SETTING_NAME) +- return false; +- +- let bluetoothSettings = connection.get_setting_by_name(NetworkManager.SETTING_BLUETOOTH_SETTING_NAME); +- let fixedBdaddr = bluetoothSettings.get_bdaddr(); +- if (fixedBdaddr) +- return macCompare(fixedBdaddr, macToArray(this.device.hw_address)); +- +- return true; +- }, +- + _createAutomaticConnection: function() { + let connection = new NetworkManager.Connection; + connection._uuid = NetworkManager.utils_uuid_generate(); +@@ -1047,7 +1020,7 @@ NMDeviceWireless.prototype = { + // Check if some connection is valid for this AP + for (let j = 0; j < validConnections.length; j++) { + let connection = validConnections[j]; +- if (this._connectionValidForAP(connection, ap) && ++ if (ap.connection_valid(connection) && + obj.connections.indexOf(connection) == -1) { + obj.connections.push(connection); + } +@@ -1121,7 +1094,7 @@ NMDeviceWireless.prototype = { + if (best) { + for (let i = 0; i < bestApObj.accessPoints.length; i++) { + let ap = bestApObj.accessPoints[i]; +- if (this._connectionValidForAP(best, ap)) { ++ if (ap.connection_valid(best)) { + this._client.activate_connection(best, this.device, ap.dbus_path, null); + break; + } +@@ -1257,7 +1230,7 @@ NMDeviceWireless.prototype = { + // check if this enables new connections for this group + for (let i = 0; i < this._connections.length; i++) { + let connection = this._connections[i].connection; +- if (this._connectionValidForAP(connection, accessPoint) && ++ if (accessPoint.connection_valid(connection) && + apObj.connections.indexOf(connection) == -1) { + apObj.connections.push(connection); + +@@ -1337,7 +1310,7 @@ NMDeviceWireless.prototype = { + item.connect('activate', Lang.bind(this, function() { + let accessPoints = sortAccessPoints(accessPointObj.accessPoints); + for (let i = 0; i < accessPoints.length; i++) { +- if (this._connectionValidForAP(connection, accessPoints[i])) { ++ if (accessPoints[i].connection_valid(connection)) { + this._client.activate_connection(connection, this.device, accessPoints[i].dbus_path, null); + break; + } +@@ -1346,40 +1319,6 @@ NMDeviceWireless.prototype = { + return item; + }, + +- connectionValid: function(connection) { +- if (connection._type != NetworkManager.SETTING_WIRELESS_SETTING_NAME) +- return false; +- +- let wirelessSettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SETTING_NAME); +- let wirelessSecuritySettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SECURITY_SETTING_NAME); +- +- let fixedMac = wirelessSettings.get_mac_address(); +- if (fixedMac && !macCompare(fixedMac, macToArray(this.device.perm_hw_address))) +- return false; +- +- if (wirelessSecuritySettings && +- wirelessSecuritySettings.key_mgmt != 'none' && +- wirelessSecuritySettings.key_mgmt != 'ieee8021x') { +- let capabilities = this.device.wireless_capabilities; +- if (!(capabilities & NetworkManager.DeviceWifiCapabilities.WPA) || +- !(capabilities & NetworkManager.DeviceWifiCapabilities.CIPHER_TKIP)) +- return false; +- if (wirelessSecuritySettings.get_num_protos() == 1 && +- wirelessSecuritySettings.get_proto(0) == 'rsn' && +- !(capabilities & NetworkManager.DeviceWifiCapabilities.RSN)) +- return false; +- if (wirelessSecuritySettings.get_num_pairwise() == 1 && +- wirelessSecuritySettings.get_pairwise(0) == 'ccmp' && +- !(capabilities & NetworkManager.DeviceWifiCapabilities.CIPHER_CCMP)) +- return false; +- if (wirelessSecuritySettings.get_num_groups() == 1 && +- wirelessSecuritySettings.get_group(0) == 'ccmp' && +- !(capabilities & NetworkManager.DeviceWifiCapabilities.CIPHER_CCMP)) +- return false; +- } +- return true; +- }, +- + _clearSection: function() { + NMDevice.prototype._clearSection.call(this); + +@@ -1463,7 +1402,7 @@ NMDeviceWireless.prototype = { + // Check if connection is valid for any of these access points + for (let k = 0; k < apObj.accessPoints.length; k++) { + let ap = apObj.accessPoints[k]; +- if (this._connectionValidForAP(connection, ap)) { ++ if (ap.connection_valid(connection)) { + apObj.connections.push(connection); + // this potentially changes the sorting order + forceupdate = true; +@@ -1479,37 +1418,6 @@ NMDeviceWireless.prototype = { + } + }, + +- _connectionValidForAP: function(connection, ap) { +- // copied and adapted from nm-applet +- let wirelessSettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SETTING_NAME); +- if (!ssidCompare(wirelessSettings.get_ssid(), ap.get_ssid())) +- return false; +- +- let wirelessSecuritySettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SECURITY_SETTING_NAME); +- +- let fixedBssid = wirelessSettings.get_bssid(); +- if (fixedBssid && !macCompare(fixedBssid, macToArray(ap.hw_address))) +- return false; +- +- let fixedBand = wirelessSettings.band; +- if (fixedBand) { +- let freq = ap.frequency; +- if (fixedBand == 'a' && (freq < 4915 || freq > 5825)) +- return false; +- if (fixedBand == 'bg' && (freq < 2412 || freq > 2484)) +- return false; +- } +- +- let fixedChannel = wirelessSettings.channel; +- if (fixedChannel && fixedChannel != NetworkManager.utils_wifi_freq_to_channel(ap.frequency)) +- return false; +- +- if (!wirelessSecuritySettings) +- return true; +- +- return wirelessSettings.ap_security_compatible(wirelessSecuritySettings, ap.flags, ap.wpa_flags, ap.rsn_flags, ap.mode); +- }, +- + _createActiveConnectionItem: function() { + let activeAp = this.device.active_access_point; + let icon, title; +-- +cgit v0.9 +From 101a07a3d79223cc153a6c65f22acd76cbae4818 Mon Sep 17 00:00:00 2001 +From: Dan Williams +Date: Tue, 03 May 2011 17:21:45 +0000 +Subject: network: fix handling of AP flags and enhance for 802.1x + +All WPA APs were getting set as WPA2 due to the check for privacy; +WPA/WPA2 APs *must* set the Privacy bit according to the standard, +so we'd never end up in the case for NMAccessPointSecurity.WPA. + +Fix that, and also add flags for WPA[2] Enterprise which we'll +use a bit later for the first-time connect case for 802.1x enabled +access points. +--- +(limited to 'js/ui/status/network.js') + +diff --git a/js/ui/status/network.js b/js/ui/status/network.js +index bf8e272..6f0cdac 100644 +--- a/js/ui/status/network.js ++++ b/js/ui/status/network.js +@@ -33,8 +33,10 @@ const NMAccessPointSecurity = { + UNKNOWN: 0, + NONE: 1, + WEP: 2, +- WPA: 3, +- WPA2: 4 ++ WPA_PSK: 3, ++ WPA2_PSK: 4, ++ WPA_ENT: 5, ++ WPA2_ENT: 6 + }; + + // small optimization, to avoid using [] all the time +@@ -1129,26 +1131,28 @@ NMDeviceWireless.prototype = { + _getApSecurityType: function(accessPoint) { + if (accessPoint._secType) + return accessPoint._secType; +- // XXX: have this checked by someone familiar with IEEE 802.1x + + let flags = accessPoint.flags; + let wpa_flags = accessPoint.wpa_flags; + let rsn_flags = accessPoint.rsn_flags; + let type; +- if ( !(flags & NM80211ApFlags.PRIVACY) +- && (wpa_flags == NM80211ApSecurityFlags.NONE) +- && (rsn_flags == NM80211ApSecurityFlags.NONE)) +- type = NMAccessPointSecurity.NONE; +- else if ( (flags & NM80211ApFlags.PRIVACY) +- && (wpa_flags == NM80211ApSecurityFlags.NONE) +- && (rsn_flags == NM80211ApSecurityFlags.NONE)) +- type = NMAccessPointSecurity.WEP; +- else if ( !(flags & NM80211ApFlags.PRIVACY) +- && (wpa_flags != NM80211ApSecurity.NONE) +- && (rsn_flags != NM80211ApSecurity.NONE)) +- type = NMAccessPointSecurity.WPA; +- else +- type = NMAccessPointSecurity.WPA2; ++ if (rsn_flags != NM80211ApSecurityFlags.NONE) { ++ /* RSN check first so that WPA+WPA2 APs are treated as RSN/WPA2 */ ++ if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X) ++ type = NMAccessPointSecurity.WPA2_ENT; ++ else if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK) ++ type = NMAccessPointSecurity.WPA2_PSK; ++ } else if (wpa_flags != NM80211ApSecurityFlags.NONE) { ++ if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X) ++ type = NMAccessPointSecurity.WPA_ENT; ++ else if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK) ++ type = NMAccessPointSecurity.WPA_PSK; ++ } else { ++ if (flags & NM80211ApFlags.PRIVACY) ++ type = NMAccessPointSecurity.WEP; ++ else ++ type = NMAccessPointSecurity.NONE; ++ } + + // cache the found value to avoid checking flags all the time + accessPoint._secType = type; +-- +cgit v0.9 +From ae0652d13fc2d7caa3d64f2b87d174253cae5901 Mon Sep 17 00:00:00 2001 +From: Dan Williams +Date: Tue, 03 May 2011 18:31:45 +0000 +Subject: network: fix initial connections to WPA[2] Enterprise APs + +Call out to nm-applet to do the dirty work since the dialog of +doom is pretty complicated and we don't have a JS equivalent +of it for now. + +Fixes https://bugzilla.gnome.org/show_bug.cgi?id=648171 +--- +(limited to 'js/ui/status/network.js') + +diff --git a/js/ui/status/network.js b/js/ui/status/network.js +index 6f0cdac..ca4facf 100644 +--- a/js/ui/status/network.js ++++ b/js/ui/status/network.js +@@ -48,6 +48,16 @@ const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags']; + // (the remaining are placed into More...) + const NUM_VISIBLE_NETWORKS = 5; + ++const NMAppletHelperInterface = { ++ name: 'org.gnome.network_manager_applet', ++ methods: [ ++ { name: 'ConnectToHiddenNetwork', inSignature: '', outSignature: '' }, ++ { name: 'CreateWifiNetwork', inSignature: '', outSignature: '' }, ++ { name: 'ConnectTo8021xNetwork', inSignature: 'oo', outSignature: '' } ++ ], ++}; ++const NMAppletProxy = DBus.makeProxyClass(NMAppletHelperInterface); ++ + function macToArray(string) { + return string.split(':').map(function(el) { + return parseInt(el, 16); +@@ -991,6 +1001,10 @@ NMDeviceWireless.prototype = { + this._overflowItem = null; + this._networks = [ ]; + ++ this._applet_proxy = new NMAppletProxy(DBus.session, ++ 'org.gnome.network_manager_applet', ++ '/org/gnome/network_manager_applet'); ++ + // breaking the layers with this, but cannot call + // this.connectionValid until I have a device + this.device = device; +@@ -1483,9 +1497,20 @@ NMDeviceWireless.prototype = { + apObj.item = new NMNetworkMenuItem(apObj.accessPoints); + apObj.item._apObj = apObj; + apObj.item.connect('activate', Lang.bind(this, function() { +- let connection = this._createAutomaticConnection(apObj); + let accessPoints = sortAccessPoints(apObj.accessPoints); +- this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null) ++ if ( (accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT) ++ || (accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) { ++ // 802.1x-enabled APs get handled by nm-applet for now... ++ this._applet_proxy.ConnectTo8021xNetworkRemote(this.device.get_path(), ++ accessPoints[0].dbus_path, ++ Lang.bind(this, function(results, err) { ++ if (err) ++ log(err); ++ })); ++ } else { ++ let connection = this._createAutomaticConnection(apObj); ++ this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null) ++ } + })); + } + if (position < NUM_VISIBLE_NETWORKS) +-- +cgit v0.9 +From 5090a4ccce87643081138272fb8a2fe687f1ed0a Mon Sep 17 00:00:00 2001 +From: Dan Williams +Date: Tue, 03 May 2011 19:48:10 +0000 +Subject: network: request that nm-applet show the mobile broadband wizard + +Use nm-applet 0.8.999 API to call the mobile broadband wizard and +activate the new connection. + +Fixes https://bugzilla.gnome.org/show_bug.cgi?id=649318 +--- +(limited to 'js/ui/status/network.js') + +diff --git a/js/ui/status/network.js b/js/ui/status/network.js +index ca4facf..756b27f 100644 +--- a/js/ui/status/network.js ++++ b/js/ui/status/network.js +@@ -53,7 +53,8 @@ const NMAppletHelperInterface = { + methods: [ + { name: 'ConnectToHiddenNetwork', inSignature: '', outSignature: '' }, + { name: 'CreateWifiNetwork', inSignature: '', outSignature: '' }, +- { name: 'ConnectTo8021xNetwork', inSignature: 'oo', outSignature: '' } ++ { name: 'ConnectTo8021xNetwork', inSignature: 'oo', outSignature: '' }, ++ { name: 'ConnectTo3gNetwork', inSignature: 'o', outSignature: '' } + ], + }; + const NMAppletProxy = DBus.makeProxyClass(NMAppletHelperInterface); +@@ -440,7 +441,8 @@ NMDevice.prototype = { + this._client.activate_connection(this._connections[0].connection, this.device, null, null); + } else if (this._autoConnectionName) { + let connection = this._createAutomaticConnection(); +- this._client.add_and_activate_connection(connection, this.device, null, null); ++ if (connection) ++ this._client.add_and_activate_connection(connection, this.device, null, null); + } + }, + +@@ -620,7 +622,8 @@ NMDevice.prototype = { + this._autoConnectionItem = new PopupMenu.PopupMenuItem(this._autoConnectionName); + this._autoConnectionItem.connect('activate', Lang.bind(this, function() { + let connection = this._createAutomaticConnection(); +- this._client.add_and_activate_connection(connection, this.device, null, null); ++ if (connection) ++ this._client.add_and_activate_connection(connection, this.device, null, null); + })); + this.section.addMenuItem(this._autoConnectionItem); + } +@@ -777,6 +780,10 @@ NMDeviceModem.prototype = { + this.mobileDevice = null; + this._connectionType = 'ppp'; + ++ this._applet_proxy = new NMAppletProxy(DBus.session, ++ 'org.gnome.network_manager_applet', ++ '/org/gnome/network_manager_applet'); ++ + this._capabilities = device.current_capabilities; + if (this._capabilities & NetworkManager.DeviceModemCapabilities.GSM_UMTS) { + is_wwan = true; +@@ -878,19 +885,13 @@ NMDeviceModem.prototype = { + }, + + _createAutomaticConnection: function() { +- // FIXME: we need to summon the mobile wizard here +- // or NM will not have the necessary parameters to complete the connection +- // pending a DBus method on nm-applet +- +- let connection = new NetworkManager.Connection; +- connection._uuid = NetworkManager.utils_uuid_generate(); +- connection.add_setting(new NetworkManager.SettingConnection({ +- uuid: connection._uuid, +- id: this._autoConnectionName, +- type: this._connectionType, +- autoconnect: false +- })); +- return connection; ++ // Mobile wizard is handled by nm-applet for now... ++ this._applet_proxy.ConnectTo3gNetworkRemote(this.device.get_path(), ++ Lang.bind(this, function(results, err) { ++ if (err) ++ log(err); ++ })); ++ return null; + } + }; + +-- +cgit v0.9 diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index c3b409026..fd6e7d1b6 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 119490 2011-04-11 18:49:40Z jgc $ +# $Id: PKGBUILD 122661 2011-05-05 21:34:04Z eric $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.6.9.4 +pkgver=6.6.9.8 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -12,24 +12,18 @@ depends=('libtool' 'lcms' 'libxt' 'gcc-libs' 'bzip2' 'xz' 'freetype2' 'fontconfi 'libxext' 'libjpeg-turbo') makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ - libpng_mmx_patch_x86_64.patch perlmagick.rpath.patch) -md5sums=('e9355aa38daa1d2c42d7e37108bc0dfa' - '069980fc2590c02aed86420996259302' + perlmagick.rpath.patch) +md5sums=('8cd5fe2bc5a29b38c24a6f9576518319' 'ff9974decbfe9846f8e347239d87e4eb') -sha1sums=('e3cbf6d61bf29ec8be6796c89b04f10495a6e52d' - 'e42f3acbe85b6098af75c5cecc9a254baaa0482c' +sha1sums=('f5fb5844934e23bffbd0ab2a36ea4914eab0dcd0' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - if [ "${CARCH}" = 'x86_64' ]; then - patch -Np1 -i ../libpng_mmx_patch_x86_64.patch - fi - - patch -Np0 -i ../perlmagick.rpath.patch sed '/AC_PATH_XTRA/d' -i configure.ac autoreconf + patch -Np0 -i ../perlmagick.rpath.patch ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ --enable-openmp --with-wmf --with-openexr --with-xml \ @@ -62,10 +56,11 @@ package_imagemagick() { 'etc/ImageMagick/type-dejavu.xml' 'etc/ImageMagick/type-ghostscript.xml' 'etc/ImageMagick/type-windows.xml') - options=('!makeflags' '!docs') + options=('!makeflags' '!docs' 'libtool') cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} make DESTDIR="${pkgdir}" install + chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index 105c9f1b5..4e08276b3 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,14 +1,16 @@ -# $Id: PKGBUILD 117144 2011-03-29 01:07:42Z eric $ +# $Id: PKGBUILD 122622 2011-05-05 07:25:15Z eric $ # Maintainer: Eric Bélanger pkgname=lm_sensors pkgver=3.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64') url="http://www.lm-sensors.org/" license=('GPL' 'LGPL') -depends=('perl' 'sysfsutils' 'rrdtool') +depends=('perl' 'sysfsutils') +makedepends=('rrdtool') +optdepends=('rrdtool: for logging with sensord') backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord') options=('!emptydirs') source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \ diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index 086ad1392..8f783d3c8 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 122052 2011-05-02 05:12:25Z heftig $ +# $Id: PKGBUILD 122655 2011-05-05 16:31:11Z ibiru $ # Maintainer: Jan de Groot pkgname=nautilus pkgver=3.0.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME shell and file manager" arch=('i686' 'x86_64') license=('GPL') -depends=('libexif' 'gnome-desktop' 'exempi' 'gtk3' 'hicolor-icon-theme' 'gvfs' 'desktop-file-utils' 'gsettings-desktop-schemas' 'shared-mime-info') +depends=('libexif' 'gnome-desktop' 'exempi' 'gtk3' 'hicolor-icon-theme' 'gvfs' 'desktop-file-utils' 'gsettings-desktop-schemas' 'shared-mime-info' 'gnome-themes-standard') makedepends=('intltool' 'gobject-introspection') replaces=('gnome-volume-manager') url="http://www.gnome.org" diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD index 21345b269..97e42ea39 100644 --- a/extra/racket/PKGBUILD +++ b/extra/racket/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 110163 2011-02-17 06:55:24Z eric $ +# $Id: PKGBUILD 122617 2011-05-05 05:05:42Z eric $ # Maintainer: Eric Bélanger pkgname=racket -pkgver=5.1 +pkgver=5.1.1 pkgrel=1 pkgdesc="PLT Racket (a variant of Scheme) Environment" arch=('i686' 'x86_64') url="http://racket-lang.org/" license=('LGPL') -depends=('gtk2' 'libjpeg' 'desktop-file-utils') +depends=('gtk2' 'libjpeg' 'libffi' 'desktop-file-utils') +makedepends=('gsfonts') provides=('drscheme') conflicts=('drscheme') replaces=('drscheme') options=('!strip') install=racket.install source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \ - drracket.desktop jpeg-version.patch) -md5sums=('c3b0bffb998ad530c06512d045a59f15' '9223c9736ead677431542b41271c7b3c'\ - '0aae72b6f19963c569d20fa8793482e1') -sha1sums=('6c314a71bab77eb48efad8f6c9fa597b6a5a305d' 'a20808f6b250225704856f82a544681a962a299d'\ - 'afa13f3ef66f5434b209f545f82545a869ada2b2') + drracket.desktop) +md5sums=('26d6b320218497dba71630b9ad4dcf59' + '9223c9736ead677431542b41271c7b3c') +sha1sums=('be339495aef3334530ea8fc63ef4014ad8a4b0b2' + 'a20808f6b250225704856f82a544681a962a299d') build() { cd "${srcdir}/${pkgname}-${pkgver}/src" - (cd ..; patch -p1 -i "${srcdir}/jpeg-version.patch") ./configure --prefix=/usr make } diff --git a/extra/sysklogd/PKGBUILD b/extra/sysklogd/PKGBUILD index a548a165c..76a376889 100644 --- a/extra/sysklogd/PKGBUILD +++ b/extra/sysklogd/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Eric Belanger -# Contributor: judd +# $Id: PKGBUILD 122666 2011-05-05 23:43:52Z eric $ +# Maintainer: Eric Bélanger pkgname=sysklogd pkgver=1.5 -pkgrel=2 +pkgrel=3 pkgdesc="System and kernel log daemons" arch=('i686' 'x86_64') url="http://www.infodrom.org/projects/sysklogd/" license=('GPL' 'BSD') depends=('glibc' 'logrotate') provides=('logger') -backup=(etc/syslog.conf) -source=(http://www.infodrom.org/projects/sysklogd/download/$pkgname-$pkgver.tar.gz \ - syslog.conf syslog.logrotate syslogd klogd LICENSE) -md5sums=('e053094e8103165f98ddafe828f6ae4b' 'b8bc568494359fa932b7a5e17c4ba4de'\ - 'fb3fdb03959ff62ede00487c853bb950' '92531ee64cdc0ca978bbe9a81c269211'\ - 'c2fe75c82c35371972b6ceda72d6a861' '7930f7ff5038e1318511624e348581cc') +backup=('etc/syslog.conf' 'etc/logrotate.d/syslog') +source=(http://www.infodrom.org/projects/sysklogd/download/${pkgname}-${pkgver}.tar.gz \ + sysklogd-debian.patch syslog.conf syslog.logrotate syslogd klogd LICENSE) +md5sums=('e053094e8103165f98ddafe828f6ae4b' + '1759e667ecf07ba23297f2c05b8dbe3f' + 'b8bc568494359fa932b7a5e17c4ba4de' + 'fb3fdb03959ff62ede00487c853bb950' + '92531ee64cdc0ca978bbe9a81c269211' + 'c2fe75c82c35371972b6ceda72d6a861' + '7930f7ff5038e1318511624e348581cc') sha1sums=('070cce745b023f2ce7ca7d9888af434d6d61c236' + '7a7320b8e4e21d85cfc9a5aa478a8b013b8afe96' '35b4cb76109a6ffe9269021a6bfb4f8da614a4eb' 'e67c0f78f13c94507d3f686b4e5b8340db4624fd' '848beb23b9ca4de19c6022df03878dbe57e04c0a' @@ -25,15 +29,19 @@ sha1sums=('070cce745b023f2ce7ca7d9888af434d6d61c236' 'c416bcefd3d3d618139cc7912310caddf34c0c0b') build() { - cd $startdir/src/$pkgname-$pkgver - sed -i "s/-O3/${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE/" Makefile || return 1 - make || return 1 - install -d $startdir/pkg/usr/sbin - install -d $startdir/pkg/usr/share/man/{man5,man8} - make INSTALL=/bin/install prefix=$startdir/pkg install - install -D -m644 ../syslog.conf $startdir/pkg/etc/syslog.conf - install -D -m644 ../syslog.logrotate $startdir/pkg/etc/logrotate.d/syslog - install -D -m755 ../syslogd $startdir/pkg/etc/rc.d/syslogd - install -D -m755 ../klogd $startdir/pkg/etc/rc.d/klogd - install -D -m644 ../LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../sysklogd-debian.patch + sed -i "s/-O3/${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE/" Makefile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -d "${pkgdir}/usr/sbin" "${pkgdir}"/usr/share/man/{man5,man8} + make INSTALL=/bin/install prefix="${pkgdir}" install + install -D -m644 ../syslog.conf "${pkgdir}/etc/syslog.conf" + install -D -m644 ../syslog.logrotate "${pkgdir}/etc/logrotate.d/syslog" + install -D -m755 ../syslogd "${pkgdir}/etc/rc.d/syslogd" + install -D -m755 ../klogd "${pkgdir}/etc/rc.d/klogd" + install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/sysklogd/sysklogd-debian.patch b/extra/sysklogd/sysklogd-debian.patch new file mode 100644 index 000000000..0117af5f2 --- /dev/null +++ b/extra/sysklogd/sysklogd-debian.patch @@ -0,0 +1,21 @@ +--- sysklogd-1.5.orig/syslogd.c ++++ sysklogd-1.5/syslogd.c +@@ -2392,7 +2392,7 @@ + if (*p == '\0' || *p == '#') + continue; + #if CONT_LINE +- strcpy(cline, p); ++ memmove(cline, p, strlen(p)+1); + #endif + for (p = strchr(cline, '\0'); isspace(*--p);); + #if CONT_LINE +--- sysklogd-1.5.orig/ksym_mod.c ++++ sysklogd-1.5/ksym_mod.c +@@ -189,7 +189,6 @@ + else + Syslog(LOG_ERR, "Error loading kernel symbols " \ + "- %s\n", strerror(errno)); +- fclose(ksyms); + return(0); + } + diff --git a/multilib/lib32-qt/PKGBUILD b/multilib/lib32-qt/PKGBUILD index ca494b37f..388a9a17e 100644 --- a/multilib/lib32-qt/PKGBUILD +++ b/multilib/lib32-qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 32045 2010-11-09 15:51:29Z bluewind $ +# $Id: PKGBUILD 46350 2011-05-05 17:50:49Z bluewind $ # Maintainer: Florian Pritz # Contributor: Andrea Scarpino # Contributor: Pierre Schmitz _pkgbasename=qt pkgname=lib32-$_pkgbasename -pkgver=4.7.1 +pkgver=4.7.3 pkgrel=1 pkgdesc='A cross-platform application and UI framework (32-bit)' arch=('x86_64') @@ -20,7 +20,7 @@ makedepends=(cups gcc-multilib lib32-{mesa,libcups,libxfixes,gtk2}) options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz") -md5sums=('6f88d96507c84e9fea5bf3a71ebeb6d7') +md5sums=('49b96eefb1224cc529af6fe5608654fe') build() { unset QMAKESPEC diff --git a/staging/openssh/PKGBUILD b/staging/openssh/PKGBUILD index d00f114f3..beb09369d 100644 --- a/staging/openssh/PKGBUILD +++ b/staging/openssh/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 122205 2011-05-03 02:22:30Z bisson $ +# $Id: PKGBUILD 122642 2011-05-05 12:30:25Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Aaron Griffin # Contributor: judd pkgname=openssh pkgver=5.8p2 -pkgrel=2 +pkgrel=4 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' 'krb5' 'libedit') +depends=('tcp_wrappers' 'krb5' 'openssl' 'libedit') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" 'sshd.confd' 'sshd.pam' 'sshd') -sha1sums=('e610270e0c5484fb291cd81bbcbefbeb5e391a62' +sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' '660092c57bde28bed82078f74011f95fc51c2293' '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5') diff --git a/testing/iproute2/PKGBUILD b/testing/iproute2/PKGBUILD index 04c32a2fa..de6d0365a 100644 --- a/testing/iproute2/PKGBUILD +++ b/testing/iproute2/PKGBUILD @@ -1,15 +1,17 @@ -# $Id: PKGBUILD 122514 2011-05-04 11:14:51Z ronald $ +# $Id: PKGBUILD 122628 2011-05-05 08:47:16Z ronald $ # Maintainer: Ronald van Haren # Contributor: Judd Vinet pkgname=iproute2 pkgver=2.6.38 -pkgrel=1 +pkgrel=2 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') url="http://www.linux-foundation.org/en/Net:Iproute2" -depends=('linux-atm' 'perl') +depends=('perl') +makedepends=('linux-atm') +optdepends=('linux-atm: ATM support') provides=('iproute') conflicts=('iproute') replaces=('iproute') diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD new file mode 100644 index 000000000..3e5e7d9e3 --- /dev/null +++ b/testing/openssh/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 122639 2011-05-05 12:22:20Z bisson $ +# Maintainer: Gaetan Bisson +# Contributor: Aaron Griffin +# Contributor: judd + +pkgname=openssh +pkgver=5.8p2 +pkgrel=3 +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' 'libedit') +source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" + 'sshd.confd' + 'sshd.pam' + 'sshd') +sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5' + 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' + '660092c57bde28bed82078f74011f95fc51c2293' + '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --libexecdir=/usr/lib/ssh \ + --sysconfdir=/etc/ssh --with-tcp-wrappers --with-privsep-user=nobody \ + --with-md5-passwords --with-pam --with-mantype=man --mandir=/usr/share/man \ + --with-xauth=/usr/bin/xauth --with-kerberos5=/usr --with-ssl-engine \ + --with-libedit=/usr/lib --disable-strip # stripping is done by makepkg + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd + install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd + install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd + install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" + + rm "${pkgdir}"/usr/share/man/man1/slogin.1 + ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz + + # additional contrib scripts that we like + install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh + install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id + install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 + + # PAM is a common, standard feature to have + sed -i -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ + -e '/^#UsePAM no$/c UsePAM yes' \ + "$pkgdir"/etc/ssh/sshd_config +} diff --git a/testing/openssh/sshd b/testing/openssh/sshd new file mode 100755 index 000000000..2ee1091f0 --- /dev/null +++ b/testing/openssh/sshd @@ -0,0 +1,48 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/sshd + +PIDFILE=/var/run/sshd.pid +PID=$(cat $PIDFILE 2>/dev/null) +if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then + PID= + rm $PIDFILE 2>/dev/null +fi + +case "$1" in + start) + stat_busy "Starting Secure Shell Daemon" + [ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; } + [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; } + [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; } + [ -f /etc/ssh/ssh_host_ecdsa_key ] || { /usr/bin/ssh-keygen -t ecdsa -N "" -f /etc/ssh/ssh_host_ecdsa_key >/dev/null; } + [ -d /var/empty ] || mkdir -p /var/empty + [ -z "$PID" ] && /usr/sbin/sshd $SSHD_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon sshd + stat_done + fi + ;; + stop) + stat_busy "Stopping Secure Shell Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon sshd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd new file mode 100644 index 000000000..5ce7c0079 --- /dev/null +++ b/testing/openssh/sshd.confd @@ -0,0 +1,4 @@ +# +# Parameters to be passed to sshd +# +SSHD_ARGS="" diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam new file mode 100644 index 000000000..ae028ceb5 --- /dev/null +++ b/testing/openssh/sshd.pam @@ -0,0 +1,10 @@ +#%PAM-1.0 +#auth required pam_securetty.so #Disable remote root +auth required pam_unix.so +auth required pam_env.so +account required pam_nologin.so +account required pam_unix.so +account required pam_time.so +password required pam_unix.so +session required pam_unix_session.so +session required pam_limits.so -- cgit v1.2.3-54-g00ecf