From b57c1def9a907b81a49aa91eeb39c9321763c276 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 22 Jul 2011 23:13:01 +0000 Subject: Fri Jul 22 23:13:01 UTC 2011 --- community/exim/ChangeLog | 26 ++++ community/exim/PKGBUILD | 57 ++++---- community/exim/exim.Makefile | 24 ++-- community/exim/exim.logrotate | 1 + community/gmic/PKGBUILD | 8 +- community/goldendict/PKGBUILD | 9 +- community/gource/PKGBUILD | 8 +- community/gsasl/PKGBUILD | 6 +- community/htmldoc/PKGBUILD | 28 ++-- community/jshon/PKGBUILD | 4 +- community/nginx/PKGBUILD | 8 +- community/nodejs/PKGBUILD | 4 +- community/privoxy/PKGBUILD | 8 +- community/privoxy/privoxy.logrotate.d | 2 +- community/qmmp/PKGBUILD | 13 +- community/qmmp/qmmp.changelog | 3 + community/qmmp/qmmp.install | 1 + community/quvi/PKGBUILD | 6 +- community/springlobby/PKGBUILD | 9 +- community/stunnel/PKGBUILD | 11 +- community/texvc/PKGBUILD | 10 +- community/xmms2/PKGBUILD | 13 +- community/xmms2/xmms2d.rc | 11 +- community/xplanet/PKGBUILD | 22 ++- core/gmp/538dfce27f41.patch | 38 +++++ core/gmp/PKGBUILD | 12 +- core/inetutils/PKGBUILD | 8 +- core/iproute2/PKGBUILD | 11 +- core/iptables/PKGBUILD | 6 +- core/libgcrypt/PKGBUILD | 13 +- core/libgcrypt/libgcrypt.install | 2 +- core/nfs-utils/PKGBUILD | 11 +- core/openldap/PKGBUILD | 102 ++++++++++++++ core/openldap/ntlm.patch | 230 +++++++++++++++++++++++++++++++ core/openldap/openldap.install | 20 +++ core/openldap/slapd | 48 +++++++ core/openldap/slapd.default | 6 + core/openssh/PKGBUILD | 7 +- core/syslog-ng/PKGBUILD | 7 +- core/xinetd/PKGBUILD | 9 +- extra/archboot/PKGBUILD | 32 +++-- extra/esound/PKGBUILD | 22 +-- extra/gnome-disk-utility/PKGBUILD | 17 +-- extra/gnutls/PKGBUILD | 11 +- extra/icedtea-web/PKGBUILD | 8 +- extra/js/PKGBUILD | 6 +- extra/lablgtk2/PKGBUILD | 4 +- extra/libmpdclient/PKGBUILD | 20 +-- extra/mysql/PKGBUILD | 12 +- extra/net-snmp/PKGBUILD | 29 ++-- extra/nettle/PKGBUILD | 36 +++++ extra/nettle/nettle.install | 20 +++ extra/openjdk6/PKGBUILD | 6 +- extra/quota-tools/PKGBUILD | 33 +++-- extra/quota-tools/nulls.diff | 20 +++ extra/quota-tools/quotaon.diff | 216 +++++++++++++++++++++++++++++ extra/quota-tools/repquota.diff | 91 ++++++++++++ extra/quota-tools/system_inodes.diff | 18 +++ extra/rrdtool/PKGBUILD | 8 +- extra/socat/PKGBUILD | 15 +- extra/tftp-hpa/PKGBUILD | 28 ++-- extra/tftp-hpa/tftpd.rc | 4 +- extra/vsftpd/PKGBUILD | 7 +- libre/abs-libre/PKGBUILD | 38 +++++ libre/abs-libre/abs.install | 13 ++ multilib-testing/lib32-keyutils/PKGBUILD | 33 +++++ multilib-testing/lib32-mesa/PKGBUILD | 18 +-- multilib/lib32-libldap/PKGBUILD | 10 +- multilib/lib32-libldap/ntlm.patch | 8 +- testing/dash/PKGBUILD | 28 ++++ testing/keyutils/PKGBUILD | 24 ++++ testing/mesa/PKGBUILD | 18 +-- testing/r/PKGBUILD | 68 +++++++++ testing/r/r.desktop | 11 ++ testing/r/r.install | 12 ++ testing/r/r.png | Bin 0 -> 4771 bytes 76 files changed, 1457 insertions(+), 309 deletions(-) create mode 100644 community/exim/ChangeLog create mode 100644 core/gmp/538dfce27f41.patch create mode 100644 core/openldap/PKGBUILD create mode 100644 core/openldap/ntlm.patch create mode 100644 core/openldap/openldap.install create mode 100755 core/openldap/slapd create mode 100644 core/openldap/slapd.default create mode 100644 extra/nettle/PKGBUILD create mode 100644 extra/nettle/nettle.install create mode 100644 extra/quota-tools/nulls.diff create mode 100644 extra/quota-tools/quotaon.diff create mode 100644 extra/quota-tools/repquota.diff create mode 100644 extra/quota-tools/system_inodes.diff create mode 100644 libre/abs-libre/PKGBUILD create mode 100644 libre/abs-libre/abs.install create mode 100644 multilib-testing/lib32-keyutils/PKGBUILD create mode 100644 testing/dash/PKGBUILD create mode 100644 testing/keyutils/PKGBUILD create mode 100644 testing/r/PKGBUILD create mode 100644 testing/r/r.desktop create mode 100644 testing/r/r.install create mode 100644 testing/r/r.png diff --git a/community/exim/ChangeLog b/community/exim/ChangeLog new file mode 100644 index 000000000..16eab50c2 --- /dev/null +++ b/community/exim/ChangeLog @@ -0,0 +1,26 @@ +2011-07-15 Angel Velasquez + * Rebuilt without tcp_wrappers + * Fixing logrotate issue FS#25094 + * ChangeLog file changed name from exim.changelog to ChangeLog + +2011-06-16 Angel Velasquez + * Rebuilt against db 5.2.28 + +2010-05-09 Angel Velasquez + * Updated to 4.76 + * Removed previous patch since is no longer needed + * Removed newaliases script FS#22744 + * Removed sudo dependency + +2010-05-07 Angel Velasquez + * Adding patch for security issue see: http://goo.gl/QBict + +2010-05-06 Angel Velasquez + * Setting sticky id to deliver mail. Closes FS#24109 + +2010-04-30 Angel Velasquez + * exim 4.75 + * Config updated with the aliases path. Closes FS#22743 + * Removed sed hackings and added a exim.Makefile . Closes FS#22744 + * Replaced creation of the user at build time. Closes FS#22745 + diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD index d30452d45..023f9f86e 100644 --- a/community/exim/PKGBUILD +++ b/community/exim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49455 2011-06-16 18:57:50Z angvp $ +# $Id: PKGBUILD 51959 2011-07-18 17:27:22Z dreisner $ # Maintainer: Angel Velasquez # Maintainer: judd pkgname=exim pkgver=4.76 -pkgrel=2 +pkgrel=4 pkgdesc="A Message Transfer Agent" arch=(i686 x86_64) url="http://www.exim.org/" @@ -11,35 +11,34 @@ license=('GPL') backup=(etc/mail/aliases etc/mail/exim.conf \ etc/logrotate.d/exim etc/conf.d/exim) install=exim.install -changelog=exim.changelog -depends=('db' 'pcre' 'pam' 'tcp_wrappers' 'openssl' 'libldap') +changelog=ChangeLog +depends=('db' 'pcre' 'pam' 'openssl' 'libldap') provides=('smtp-server') conflicts=('smtp-server') options=('!makeflags') -source=(ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-${pkgver}.tar.bz2 - aliases - exim - exim.logrotate +source=(ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-$pkgver.tar.bz2 + aliases + exim + exim.logrotate exim.conf.d - exim.Makefile - ) + exim.Makefile) md5sums=('58e784b33c7a2ab335ec6400346d6362' '4874006f0585253ddab027d441009757' '9aed772e87223213e8da9ca5e7376869' - 'd788c26f86a9d72a0aebb3b849fe74f2' + 'e18a535218718c5eb394ed5c9296fe06' 'b75fe4c6e960a59a25b5f51e8f61ba3a' - '61e76543476f52f136c1d6c80ac1c5a1') + '5c2891dc3535c346982fa358fbba6d31') build() { - cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's|tail -1|tail -n -1|g' scripts/Configure-config.h + cd "$srcdir/$pkgname-$pkgver" + #sed -i 's|tail -1|tail -n -1|g' scripts/Configure-config.h # Make some configuration changes - cp ${srcdir}/${pkgname}.Makefile Local/Makefile + cp "$srcdir/$pkgname.Makefile" Local/Makefile make } package() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" install -D -m644 ../exim.logrotate ${pkgdir}/etc/logrotate.d/exim install -D -m644 ../exim.conf.d ${pkgdir}/etc/conf.d/exim install -D -m644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8 @@ -50,25 +49,23 @@ package() { cd build-Linux-* for i in exicyclog exim_checkaccess exim_dumpdb exim_lock\ exim_tidydb exipick exiqsumm exigrep exim_dbmbuild exim\ - exim_fixdb eximstats exinext exiqgrep exiwhat - do - install -m 0755 $i ${pkgdir}/usr/sbin + exim_fixdb eximstats exinext exiqgrep exiwhat; do + install -m 0755 "$i" "$pkgdir/usr/sbin" done - cd ${srcdir}/exim-${pkgver}/src - sed "s|/etc/aliases|/etc/mail/aliases|g" configure.default | \ - sed "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" \ - >${pkgdir}/etc/mail/exim.conf + cd "$srcdir/exim-$pkgver/src" + sed -e "s|/etc/aliases|/etc/mail/aliases|g" \ + -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" configure.default \ + >"$pkgdir/etc/mail/exim.conf" - cp ${srcdir}/aliases ${pkgdir}/etc/mail - cd ${pkgdir}/usr/sbin - for i in mailq rmail rsmtp runq sendmail - do - ln -s exim $i + cp "$srcdir/aliases" "$pkgdir/etc/mail" + cd "$pkgdir/usr/sbin" + for i in mailq rmail rsmtp runq sendmail; do + ln -s exim "$i" done # fhs compliancy ln -s ../sbin/exim ../lib/sendmail - mkdir -p ${pkgdir}/etc/rc.d - cp ${srcdir}/exim ${pkgdir}/etc/rc.d + mkdir -p "$pkgdir/etc/rc.d" + cp "$srcdir/exim" "$pkgdir/etc/rc.d" } diff --git a/community/exim/exim.Makefile b/community/exim/exim.Makefile index 125f87dfb..0a6397318 100644 --- a/community/exim/exim.Makefile +++ b/community/exim/exim.Makefile @@ -371,7 +371,7 @@ WITH_CONTENT_SCAN=yes # If you want to use the deprecated "demime" condition in the DATA ACL, # uncomment the line below. Doing so will also explicitly turn on the -WITH_CONTENT_SCAN=yes +# WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of # the "demime" condition. WITH_OLD_DEMIME=yes @@ -528,7 +528,7 @@ FIXED_NEVER_USERS=root # # As a strictly transient measure to ease migration to 4.73, the # WHITELIST_D_MACROS value definies a colon-separated list of macro-names -# which are permitted to be overriden from the command-line which will be +# which are permitted to be overridden from the command-line which will be # honoured by the Exim user. So these are macros that can persist to delivery # time. # Examples might be -DTLS or -DSPOOL=/some/dir. The values on the @@ -658,11 +658,11 @@ HEADERS_CHARSET="ISO-8859-1" SUPPORT_TLS=yes # Uncomment this setting if you are using OpenSSL -TLS_LIBS=-L/usr/lib -lssl -lcrypto +TLS_LIBS=-lssl -lcrypto # Uncomment these settings if you are using GnuTLS # USE_GNUTLS=yes -TLS_LIBS=-L/usr/lib -lssl -lcrypto +# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt # If you are running Exim as a server, note that just building it with TLS # support is not all you need to do. You also need to set up a suitable @@ -677,17 +677,17 @@ TLS_LIBS=-L/usr/lib -lssl -lcrypto # with all your other libraries. If they are in a special directory, you may # need something like -TLS_LIBS=-L/usr/lib -lssl -lcrypto +# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto # or -TLS_LIBS=-L/usr/lib -lssl -lcrypto +# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt -TLS_LIBS=-L/usr/lib -lssl -lcrypto +# TLS_LIBS is included only on the command for linking Exim itself, not on any # auxiliary programs. If the include files are not in a standard place, you can # set TLS_INCLUDE to specify where they are, for example: -TLS_INCLUDE=-I/usr/include/openssl +# TLS_INCLUDE=-I/usr/local/openssl/include/ # or -TLS_INCLUDE=-I/usr/include/openssl +# TLS_INCLUDE=-I/opt/gnu/include # You don't need to set TLS_INCLUDE if the relevant directories are already # specified in INCLUDE. @@ -884,12 +884,12 @@ SUPPORT_PAM=yes # this setting. See the manual section entitled "Use of tcpwrappers" in the # chapter on building and installing Exim. # -USE_TCP_WRAPPERS=yes +# USE_TCP_WRAPPERS=yes # # You may well also have to specify a local "include" file and an additional # library for TCP wrappers, so you probably need something like this: # -USE_TCP_WRAPPERS=yes +# USE_TCP_WRAPPERS=yes # CFLAGS=-O -I/usr/local/include # EXTRALIBS_EXIM=-L/usr/local/lib -lwrap # @@ -1223,5 +1223,5 @@ PID_FILE_PATH=/var/run/exim.pid HAVE_IPV6=YES LOOKUP_LIBS=-lldap -EXTRALIBS_EXIM=-lwrap -lpam +EXTRALIBS_EXIM=-lpam # End of EDITME for Exim 4. diff --git a/community/exim/exim.logrotate b/community/exim/exim.logrotate index ff38a1452..070ba4747 100644 --- a/community/exim/exim.logrotate +++ b/community/exim/exim.logrotate @@ -1,4 +1,5 @@ /var/log/exim/*log { + su exim exim missingok notifempty delaycompress diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 7ceabb443..a508a3029 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 49838 2011-06-21 10:30:54Z spupykin $ +# $Id: PKGBUILD 52163 2011-07-20 22:09:09Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jan "heftig" Steffens # Contributor: farid @@ -6,16 +6,16 @@ pkgbase=gmic pkgname=('gmic' 'gimp-plugin-gmic') -pkgver=1.4.9.5 +pkgver=1.5.0.0 pkgrel=1 -pkgdesc="GMIC image procession framework" +pkgdesc="image procession framework" arch=('i686' 'x86_64') license=('custom:CeCILL') url="http://gmic.sourceforge.net" makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick') options=('docs' '!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz") -md5sums=('52144b574562cb7cace75f814473f117') +md5sums=('6ea2d9b3be294d79cd83364c03303a96') build() { cd "$srcdir/gmic-$pkgver" diff --git a/community/goldendict/PKGBUILD b/community/goldendict/PKGBUILD index 237e20083..2af68e389 100644 --- a/community/goldendict/PKGBUILD +++ b/community/goldendict/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 48628 2011-06-03 15:58:27Z stephane $ +# $Id: PKGBUILD 52155 2011-07-20 20:14:39Z jlichtblau $ # Maintainer: Jaroslav Lichtblau # Contributor: m0rph pkgname=goldendict pkgver=1.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="Feature-rich dictionary lookup program" arch=('i686' 'x86_64') url="http://goldendict.berlios.de/" license=('GPL3') depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'openssl' 'phonon') makedepends=('patch') +provides=('stardict') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 \ $pkgname-paths.diff) -md5sums=('d56bb854936015104029d1f0b98b61bb' - '4488d4353e5522796c00785f0ce265e1') +sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6' + '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589') build(){ cd ${srcdir} diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index 2c357a634..a0fd143a3 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 47914 2011-05-26 01:27:25Z svenstaro $ +# $Id: PKGBUILD 52209 2011-07-21 16:34:07Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Jose Valecillos # Contributor: Olivier Ramonat pkgname=gource -pkgver=0.34 -pkgrel=2 +pkgver=0.35 +pkgrel=1 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64) url=http://code.google.com/p/gource/ depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew') source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('292a62d687874e871067e985d717d71a') +md5sums=('6d4f776d314da3ae5d309cb580b83a9f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gsasl/PKGBUILD b/community/gsasl/PKGBUILD index 35dac7cf4..7853bc4e5 100644 --- a/community/gsasl/PKGBUILD +++ b/community/gsasl/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 48291 2011-05-31 09:32:16Z spupykin $ +# $Id: PKGBUILD 52207 2011-07-21 16:33:45Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Orivej Desh # Maintainer: Orivej Desh pkgname=gsasl pkgver=1.6.1 -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' 'krb5') +depends=('gnutls' 'libidn' 'krb5' 'libgcrypt') source=("ftp://ftp.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz") md5sums=('7ae813eeb1f90ad52e9a781ac9e17f28') diff --git a/community/htmldoc/PKGBUILD b/community/htmldoc/PKGBUILD index 92622ac08..ded19e284 100644 --- a/community/htmldoc/PKGBUILD +++ b/community/htmldoc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 51081 2011-07-05 07:09:42Z spupykin $ +# $Id: PKGBUILD 52181 2011-07-21 12:03:40Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: tobias # Contributor: Simon Rutishauser @@ -10,25 +10,35 @@ pkgdesc="Produce PDF or Postscript from HTML documents including TOCs and Indice arch=(i686 x86_64) url="http://www.htmldoc.org" license=('GPL') -depends=('libjpeg' 'libpng' 'openssl' 'fltk' 'gcc' 'libxft' 'libxpm') +depends=('libjpeg' 'libpng' 'openssl' 'fltk' 'gcc-libs' 'libxft' 'libxpm') source=(ftp://ftp.easysw.com/pub/${pkgname}/${pkgver}/${pkgname}-$pkgver-source.tar.bz2) md5sums=('35589e7b8fe9c54e11be87cd5aec4dcc') build() { - cd ${startdir}/src/${pkgname}-${pkgver} + cd $srcdir/${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=${pkgdir}/usr/share/man - sed -i 's|^bindir.*$|bindir = ${prefix}/bin|' Makedefs make } package() { - cd ${startdir}/src/${pkgname}-${pkgver} - make prefix=${startdir}/pkg/usr install - # fix freedesktop stuff + cd $srcdir/${pkgname}-${pkgver} + + make install \ + prefix=${pkgdir}/usr \ + bindir=$pkgdir/usr/bin \ + datadir=$pkgdir/usr/share \ + datarootdir=$pkgdir/usr/share \ + docdir=$pkgdir/usr/share/doc/htmldoc \ + exec_prefix=$pkgdir/usr \ + mandir=$pkgdir/usr/share/man \ + prefix=$pkgdir/usr \ + sysconfdir=$pkgdir/etc + + # freedesktop stuff install -Dm 644 desktop/htmldoc-128.png \ - ${startdir}/pkg/usr/share/pixmaps/htmldoc.png + $pkgdir/usr/share/pixmaps/htmldoc.png echo "MimeType=application/vnd.htmldoc-book;" >> desktop/htmldoc.desktop sed -i 's|X-Red-Hat.*$||' desktop/htmldoc.desktop install -Dm 644 desktop/htmldoc.desktop \ - ${startdir}/pkg/usr/share/applications/htmldoc.desktop + $pkgdir/usr/share/applications/htmldoc.desktop } diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD index 646bd1f23..4c5266716 100644 --- a/community/jshon/PKGBUILD +++ b/community/jshon/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kyle Keen pkgname=jshon -pkgver=20110306 +pkgver=20110720 pkgrel=1 pkgdesc="A json parser for the shell." arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ depends=('jansson') makedepends=() optdepends=() source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('a047a6281147956a9422a25fdd97adf3') +md5sums=('c5f040e81fb0ba9932355f41de5112af') build() { cd "$srcdir/$pkgname" diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index c8db06edd..3c033eb3e 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 51647 2011-07-12 14:13:55Z spupykin $ +# $Id: PKGBUILD 52187 2011-07-21 14:19:08Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Miroslaw Szot @@ -11,8 +11,8 @@ _user=http _group=http pkgname=nginx -pkgver=1.0.4 -pkgrel=2 +pkgver=1.0.5 +pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64') depends=('pcre' 'zlib' 'openssl') @@ -27,7 +27,7 @@ backup=("etc/nginx/conf/nginx.conf" "etc/logrotate.d/nginx") source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz nginx) -md5sums=('d23f6e6b07b57ac061e790b1ed64bb98' +md5sums=('373c7761a7c682b92b164c8ee3d6d243' '7e7cafa43a59762b81c4da64e49eca69') build() { diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 8c368df2c..b29291f44 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.4.9 +pkgver=0.4.10 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ makedepends=('curl') # curl used for check() optdepends=('openssl: TLS support') conflicts=('nodejs-unstable') source=("http://nodejs.org/dist/node-v${pkgver}.tar.gz") -sha256sums=('f231ea6d19ea9ea4c7f8e7ff5061e7d301f1635bec7ed0ff1eef2512576ea442') +sha256sums=('57fa7ed5a818308ff485bb1c1a8ec8f1eb6a7800e14201dff65d88ce657da50a') build() { cd node-v${pkgver} diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD index e133f8029..814a776b7 100644 --- a/community/privoxy/PKGBUILD +++ b/community/privoxy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 46699 2011-05-10 18:48:15Z lfleischer $ +# $Id: PKGBUILD 52100 2011-07-20 08:15:14Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Juergen Hoetzel # Contributor: basilburn (basilburn), Paul Bredbury (brebs) pkgname=privoxy pkgver=3.0.17 -pkgrel=2 +pkgrel=3 pkgdesc='A web proxy with advanced filtering capabilities.' arch=('i686' 'x86_64') url='http://www.privoxy.org' @@ -23,7 +23,7 @@ source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src 'privoxy.conf.d') md5sums=('9d363d738a3f3d73e774d6dfeafdb15f' '1b4ed8c4e7e5b04b10ef41b597dc3f3b' - 'a364c34c8dc6eb78c9a6b777237932de' + '79480f311313cc43974f6cbe6b672927' '27830ef79418e277b90c1c1fa933f876') build() { @@ -60,5 +60,5 @@ package() { find "${pkgdir}/etc/privoxy/" -type d | xargs chmod 0770 find "${pkgdir}/etc/privoxy/" -type f | xargs chmod 0660 - chmod 0770 "${pkgdir}/var/log/privoxy" + chmod 0700 "${pkgdir}/var/log/privoxy" } diff --git a/community/privoxy/privoxy.logrotate.d b/community/privoxy/privoxy.logrotate.d index ce52108d3..386766c3e 100644 --- a/community/privoxy/privoxy.logrotate.d +++ b/community/privoxy/privoxy.logrotate.d @@ -1,4 +1,4 @@ -/var/log/privoxy/jarfile /var/log/privoxy/logfile { +/var/log/privoxy/* { create 660 root privoxy notifempty compress diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 2a4bc1cfe..0a67ad4cb 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,25 +1,28 @@ -#$Id: PKGBUILD 44116 2011-04-03 12:36:42Z jlichtblau $ +#$Id: PKGBUILD 52220 2011-07-21 20:27:20Z jlichtblau $ # Maintainer: Jaroslav Lichtblau pkgname=qmmp -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64') url="http://qmmp.ylsoftware.com/" license=('GPL') -depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg' 'qt>=4.3' 'taglib' 'xdg-utils') -makedepends=('cmake' 'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack') +depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg' 'qt' 'taglib' 'xdg-utils') +makedepends=('cmake' 'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack') optdepends=('flac: native FLAC support' 'jack: JACK sound output' 'libmpcdec: Musepack support' 'pulseaudio: PulseAudio output' + 'libcdio: Compact Disc input and control support' + 'libcddb: CDDB server support' + 'libmms: MMS stream protocol support' 'libmodplug: MOD playing library' 'libsndfile: sampled sound support' 'ffmpeg' 'libsamplerate' 'wavpack') install=$pkgname.install source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('0fc75012546744657c2cdcea7f30f1be371a9d812811b6901019faa9427f7ba9') +sha256sums=('16ab0334f368a5ef14d631a1d43d7cae876ee06b7185643377b5e9cfd6143099') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index 6e89defbd..92c7a2c27 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,6 @@ +2011-07-20 Jaroslav Lichtblau + * qmmp 0.5.1-1 + 2011-04-03 Jaroslav Lichtblau * qmmp 0.5.0-1 diff --git a/community/qmmp/qmmp.install b/community/qmmp/qmmp.install index b711352cb..4c0972beb 100644 --- a/community/qmmp/qmmp.install +++ b/community/qmmp/qmmp.install @@ -1,5 +1,6 @@ post_install() { which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + update-desktop-database -q } post_upgrade() { diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD index a124c5e8a..e6a4f6c98 100644 --- a/community/quvi/PKGBUILD +++ b/community/quvi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 48994 2011-06-09 14:59:59Z lfleischer $ +# $Id: PKGBUILD 52105 2011-07-20 08:21:04Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: joyfulgirl@archlinux.us pkgname=quvi -pkgver=0.2.16 +pkgver=0.2.18 pkgrel=1 pkgdesc='Command-line tool for parsing video download links.' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('LGPL') depends=('curl' 'pcre' 'lua') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('43ac4c1ecaace175e2e8b38f4566a710') +md5sums=('496bb7aad2f449c2a692aa48721b8a4a') build() { cd "${pkgname}-${pkgver}" diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index 2ccb51e50..9d269ff08 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47682 2011-05-24 19:40:45Z svenstaro $ +# $Id: PKGBUILD 52092 2011-07-20 05:49:04Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: DuGi pkgname=springlobby -pkgver=0.131 -pkgrel=2 +pkgver=0.134 +pkgrel=1 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64') url="http://springlobby.info/" @@ -15,7 +15,7 @@ makedepends=('boost' 'asio' 'cmake') source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 springlobby.desktop springlobby.png) -md5sums=('ea25f376a3fc48e3f3ff4de6d6637b5d' +md5sums=('0ca0519bc118eb41b4a3fec83e4419ba' '45f8b59d033931d02e734fe3bd7777dd' '1f388187539aeb0358b51995e26ed890') @@ -27,6 +27,7 @@ build() { sed -e 's|/usr/bin/awk|/bin/awk|g' $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk.bak>$srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt + sed -i '/curl\/types.h/d' $srcdir/$pkgname-$pkgver/src/utils/downloader.cpp cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DOPTION_SOUND=false diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index f617a4f3e..eb2a50995 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 43034 2011-03-23 21:42:21Z kchen $ +# $Id: PKGBUILD 51826 2011-07-16 00:11:50Z dreisner $ # Maintainer: Kaiting Chen # Contributor: Daniel J Griffiths # Contributor: Kevin Piche pkgname=stunnel -pkgver=4.35 +pkgver=4.39 pkgrel=1 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64') url="http://www.stunnel.org" license=('GPL') -depends=('openssl' 'tcp_wrappers') +depends=('openssl') install=stunnel.install options=('!libtool') source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz" 'Makefile.patch' 'stunnel.rc.d') -md5sums=('2c8e153caee9d954fb7d00980968b50d' +md5sums=('853739119a8364daea750154af6d7e79' 'f15398497e10e080c2406d2fc541660c' 'cb647c71ff4cb1e035b6e515d5f13ebf') @@ -27,7 +27,8 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-ipv6 + --enable-ipv6 \ + --disable-libwrap make } diff --git a/community/texvc/PKGBUILD b/community/texvc/PKGBUILD index f9da87dfd..13684c91b 100644 --- a/community/texvc/PKGBUILD +++ b/community/texvc/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 43585 2011-03-27 20:41:46Z spupykin $ +# $Id: PKGBUILD 52119 2011-07-20 10:22:26Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sergej Pupykin pkgname=texvc -pkgver=1.16.2 +pkgver=1.17.0 pkgrel=1 pkgdesc="tex to HTML/MathML/png converter used by mediawiki" arch=(i686 x86_64) url="http://www.mediawiki.org/" license=("GPL") -depends=(imagemagick ghostscript texlive-core) +depends=('imagemagick' 'ghostscript' 'texlive-core' 'texlive-latexextra') makedepends=('ocaml') -source=(http://download.wikimedia.org/mediawiki/1.16/mediawiki-$pkgver.tar.gz) -md5sums=('cc477d57d3df7b60558aa50a91dbca36') +source=(http://download.wikimedia.org/mediawiki/1.17/mediawiki-$pkgver.tar.gz) +md5sums=('871a00a8eb6dcae1b7b654ae635af7cd') build() { cd $srcdir/mediawiki-$pkgver/math diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 85d5ba1ae..e9fb57156 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 33390 2010-11-24 12:54:10Z spupykin $ +# $Id: PKGBUILD 52111 2011-07-20 09:27:48Z spupykin $ # Maintainer: Sergej Pupykin pkgname=xmms2 pkgver=0.7DrNo -pkgrel=8 +pkgrel=9 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64') url="http://xmms2.org/" @@ -50,27 +50,22 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 xmms2d.conf xmms2d.rc xmms2-helpers.patch - xmms2-ruby-1.9.patch vorbis-albumart.patch) md5sums=('60e50b591078acb6a85cd83de0f2b077' 'af13c937bf3c86b77ae6820107aab9b8' - '893371ba4dc7b428322e44329683211f' + '9d8e3e1a434f271423bdd228a1e9bd7c' 'eddb800ebcc495b8574044a110a34add' - '017eff634d755c98dd037cd41aecd652' 'c5a16da0c5a6ebe5e7f58afb6edfa87e') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 < ${srcdir}/xmms2-helpers.patch -# patch -Np1 < ${srcdir}/xmms2-ruby-1.9.patch -# sed -i -e 's#avcodec.h#libavcodec/avcodec.h#' src/plugins/avcodec/avcodec.c + patch -p1 <$srcdir/vorbis-albumart.patch # python2 fix sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf - patch -p1 <$srcdir/vorbis-albumart.patch - ./waf configure --prefix=/usr \ --with-optionals=python,cli,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli ./waf build diff --git a/community/xmms2/xmms2d.rc b/community/xmms2/xmms2d.rc index af931ec0a..9d4d2b7e9 100755 --- a/community/xmms2/xmms2d.rc +++ b/community/xmms2/xmms2d.rc @@ -8,7 +8,7 @@ PID=`pidof xmms2d xmms2-et` case "$1" in start) stat_busy "Starting xmms2d" - [ -z "$PID" ] && su -c 'xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null' - $XMMS2_USER + [ -z "$PID" ] && su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null' - $XMMS2_USER if [ $? -gt 0 ]; then stat_fail else @@ -18,12 +18,15 @@ case "$1" in ;; stop) stat_busy "Stopping xmms2d" - [ ! -z "$PID" ] && kill $PID &> /dev/null + [ ! -z "$PID" ] && su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER if [ $? -gt 0 ]; then stat_fail else - rm_daemon xmms2d - stat_done + for i in `seq 1 10`; do + [ -d /proc/$PID ] || { stat_done; rm_daemon xmms2d; exit 0; } + sleep 1 + done + stat_fail fi ;; restart) diff --git a/community/xplanet/PKGBUILD b/community/xplanet/PKGBUILD index 6f6aec1dd..be1d39f2e 100644 --- a/community/xplanet/PKGBUILD +++ b/community/xplanet/PKGBUILD @@ -1,26 +1,22 @@ -# $Id: PKGBUILD 8986 2010-01-23 01:24:16Z foutrelis $ +# $Id: PKGBUILD 52172 2011-07-21 07:16:17Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: dorphell # Committer: Judd Vinet pkgname=xplanet -pkgver=1.2.1 -pkgrel=3 +pkgver=1.2.2 +pkgrel=1 pkgdesc="An Xearth wannabe" arch=(i686 x86_64) url="http://xplanet.sourceforge.net/" license=('GPL') -depends=('pango' 'libungif' 'libtiff' 'perl' 'libxss') -source=(http://kent.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('5dca0369ca64fa3c006b616b72b5e1cf') +depends=('pango' 'libungif' 'libtiff' 'libxss') +source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz) +md5sums=('b38c3b4cfdd772643f876a9bb15f288b') build() { - cd $startdir/src/$pkgname-$pkgver - - sed -i '1,2i#include ' src/Satellite.cpp - sed -i '1,2i#include ' src/Separation.cpp - + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --with-freetype - make || return 1 - make prefix=$startdir/pkg/usr install + make + make prefix=$pkgdir/usr install } diff --git a/core/gmp/538dfce27f41.patch b/core/gmp/538dfce27f41.patch new file mode 100644 index 000000000..2e0a1af50 --- /dev/null +++ b/core/gmp/538dfce27f41.patch @@ -0,0 +1,38 @@ + +# HG changeset patch +# User Torbjorn Granlund +# Date 1310730221 -7200 +# Node ID 538dfce27f410b910d5e2f011119269e224d16a3 +# Parent 03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366 +(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right. + +diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c +--- a/mpn/generic/dcpi1_bdiv_q.c Thu Jun 16 12:22:24 2011 +0200 ++++ b/mpn/generic/dcpi1_bdiv_q.c Fri Jul 15 13:43:41 2011 +0200 +@@ -7,7 +7,7 @@ + SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES. IN FACT, IT IS ALMOST + GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE. + +-Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc. ++Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. + + This file is part of the GNU MP Library. + +@@ -28,7 +28,6 @@ + #include "gmp-impl.h" + + +- + mp_size_t + mpn_dcpi1_bdiv_q_n_itch (mp_size_t n) + { +@@ -130,7 +129,7 @@ + qn = nn - qn; + while (qn > dn) + { +- mpn_sub_1 (np + dn, np + dn, qn, cy); ++ mpn_sub_1 (np + dn, np + dn, qn - dn, cy); + cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp); + qp += dn; + np += dn; + diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD index 6092809d9..c8b486dec 100644 --- a/core/gmp/PKGBUILD +++ b/core/gmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123886 2011-05-14 03:40:36Z allan $ +# $Id: PKGBUILD 131961 2011-07-18 11:43:05Z allan $ # Maintainer: Allan McRae # Maintainer: Jan de Groot pkgname=gmp pkgver=5.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="A free library for arbitrary precision arithmetic" arch=('i686' 'x86_64') url="http://gmplib.org/" @@ -12,11 +12,15 @@ depends=('gcc-libs' 'sh') license=('LGPL3') options=(!libtool) install=gmp.install -source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2) -md5sums=('0bbaedc82fb30315b06b1588b9077cd3') +source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2 + 538dfce27f41.patch) +md5sums=('0bbaedc82fb30315b06b1588b9077cd3' + 'a769be9c41618ca9c35d83375e7097d0') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i $srcdir/538dfce27f41.patch + [ "${CARCH}" = "i686" ] && export ABI="32" ./configure --build=${CHOST} \ --prefix=/usr --infodir=/usr/share/info \ diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD index 4e8debe7d..19feb931e 100644 --- a/core/inetutils/PKGBUILD +++ b/core/inetutils/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 102693 2010-12-09 22:50:13Z eric $ +# $Id: PKGBUILD 131824 2011-07-15 23:53:22Z dan $ # Maintainer: Eric Belanger pkgname=inetutils pkgver=1.8 -pkgrel=2 +pkgrel=3 pkgdesc="A collection of common network programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/inetutils/" license=('GPL') -depends=('readline' 'ncurses' 'pam' 'tcp_wrappers') +depends=('readline' 'ncurses' 'pam') provides=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk') conflicts=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk') replaces=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk') @@ -31,7 +31,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \ --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-wrap --with-pam \ + --without-wrap --with-pam \ --enable-ftp --enable-ftpd \ --enable-telnet --enable-telnetd \ --enable-talk --enable-talkd \ diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index 57089f2c0..68f05ebac 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 127646 2011-06-17 12:59:11Z stephane $ +# $Id: PKGBUILD 131999 2011-07-18 20:47:01Z ronald $ # Maintainer: Ronald van Haren # Contributor: Judd Vinet pkgname=iproute2 -pkgver=2.6.38 -pkgrel=4 +pkgver=2.6.39 +pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') @@ -18,11 +18,12 @@ replaces=('iproute') options=('!makeflags') backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') -source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2 +source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.gz 'iproute2-fhs.patch') -sha1sums=('e9f6d457a06866a2a20a6cba6b3a039b2ec3e14a' +sha1sums=('9044ad0b4a34a377a54197724373330294d743c7' '2416b11252364d7a6c742eabb4a6924a75637a46') + build() { cd $srcdir/iproute2-${pkgver} diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index c2b812f85..b4d6939b4 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102057 2010-12-04 09:52:03Z allan $ +# $Id: PKGBUILD 131995 2011-07-18 20:27:00Z ronald $ # Maintainer: Ronald van Haren # Contributor: Thomas Baechler pkgname=iptables -pkgver=1.4.10 +pkgver=1.4.11.1 pkgrel=1 pkgdesc="A Linux kernel packet control tool" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ source=(http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar simple_firewall.rules iptables.conf.d) backup=(etc/conf.d/iptables) -sha1sums=('8190b8c9714a3eec825317e8ac1deeb3d11c6d29' +sha1sums=('2aa0d215485133f2817973b0914a132f628d9f3a' 'd7540316581bb66c5594885882a14ba394e95098' '70d70113e3a23f0fe99404c5536507a887a4ca5c' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD index 2ccdf36fd..974f69b8a 100644 --- a/core/libgcrypt/PKGBUILD +++ b/core/libgcrypt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121250 2011-04-29 21:23:37Z andyrtr $ +# $Id: PKGBUILD 130865 2011-07-08 14:06:03Z andyrtr $ # Maintainer: Andreas Radke pkgname=libgcrypt -pkgver=1.4.6 -pkgrel=3 +pkgver=1.5.0 +pkgrel=1 pkgdesc="a general purpose crypto library based on the code used" arch=(i686 x86_64) url="http://www.gnupg.org" @@ -14,19 +14,20 @@ install=$pkgname.install source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2 ) -md5sums=('dbf99425a4fe9217c84ce3a35d938634') +sha1sums=('3e776d44375dc1a710560b98ae8437d5da6e32cf') build() { cd ${srcdir}/${pkgname}-${pkgver} + [ "$CARCH" = "i686" ] && EXTRAFLAGS="--disable-aesni-support" ./configure --prefix=/usr \ --disable-static \ - --disable-padlock-support + --disable-padlock-support $EXTRAFLAGS make } check() { cd ${srcdir}/${pkgname}-${pkgver} - make check + make -k check } package() { diff --git a/core/libgcrypt/libgcrypt.install b/core/libgcrypt/libgcrypt.install index 83e0dcb27..79b878201 100644 --- a/core/libgcrypt/libgcrypt.install +++ b/core/libgcrypt/libgcrypt.install @@ -1,5 +1,5 @@ infodir=/usr/share/info -filelist=(gcrypt.info.gz) +filelist=(gcrypt.info.gz gcrypt.info-1.gz) post_install() { [ -x usr/bin/install-info ] || return 0 diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index e732cfa27..3adca96d4 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 123110 2011-05-08 13:46:17Z stephane $ +# $Id: PKGBUILD 131837 2011-07-16 00:22:48Z dreisner $ # Maintainer: Tobias Powalowski # Contributor: John Proctor # Contributor: dibblethewrecker @@ -7,13 +7,13 @@ pkgname=nfs-utils pkgver=1.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' license=('GPL') backup=(etc/{exports,idmapd.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) -depends=('glibc' 'tcp_wrappers' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue') +depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue') makedepends=('pkgconfig' 'autoconf' 'automake') source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 nfs-common @@ -46,7 +46,7 @@ build() { patch -Np0 -i $srcdir/start-statd.patch ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \ - --with-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc + --without-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc make } @@ -55,6 +55,9 @@ package() { cd $srcdir/${pkgname}-${pkgver} make DESTDIR=$pkgdir install + # support python2 (FS#25120) + sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats} + # NFS & NFSv4 init scripts install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD new file mode 100644 index 000000000..636e9a3ac --- /dev/null +++ b/core/openldap/PKGBUILD @@ -0,0 +1,102 @@ +# $Id: PKGBUILD 132145 2011-07-21 04:31:17Z eric $ +# Maintainer: + +pkgbase=openldap +pkgname=('libldap' 'openldap') +pkgver=2.4.26 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.openldap.org/" +license=('custom') +makedepends=('groff' 'libfetch' 'e2fsprogs' 'libtool' 'util-linux' 'libsasl') +source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz + slapd slapd.default ntlm.patch) +md5sums=('f36f3086031dd56ae94f722ffae8df5e' + '7ea596cc1d6cbcfe1deea29ec66ab317' + '6be69f6b7e522cb64cce8703da81ed32' + '4258ddbef923d1f29f2843bc050f8c56') + +build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -Np1 -i "${srcdir}"/ntlm.patch + sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in + sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h + sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf + sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in + + LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" + ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \ + --sysconfdir=/etc --localstatedir=/var/lib/openldap \ + --enable-ipv6 --enable-syslog --enable-local \ + --enable-bdb --enable-hdb \ + --enable-crypt --enable-dynamic \ + --with-threads --disable-wrappers \ + --enable-spasswd --with-cyrus-sasl \ + --enable-overlays=mod --enable-modules=yes + make +} + +check() { + cd "${srcdir}"/${pkgbase}-${pkgver} + make test +} + +package_libldap() { + pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries" + depends=('libsasl' 'libfetch' 'e2fsprogs') + backup=('etc/openldap/ldap.conf') + options=('!libtool') + + cd "${srcdir}"/${pkgbase}-${pkgver} + for dir in include libraries doc/man/man3 ; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5 + +# get rid of duplicate default conf files + rm "${pkgdir}"/etc/openldap/*.default + + ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2 + ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2 + + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_openldap() { + pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server" + depends=("libldap>=${pkgver}" 'libtool' 'util-linux') + backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd') + options=('!libtool' 'emptydirs') + install=openldap.install + + cd "${srcdir}"/${pkgbase}-${pkgver} + for dir in clients servers doc/man/man{1,5,8} ; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5 + +# get rid of duplicate default conf files + rm "${pkgdir}"/etc/openldap/*.default + + ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd + + install -dm700 "${pkgdir}"/var/lib/openldap + chown -R 439:439 "${pkgdir}"/var/lib/openldap + + install -dm755 "${pkgdir}"/run/openldap + chown 439:439 "${pkgdir}"/run/openldap + + chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} + chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} + + install -dm700 "${pkgdir}"/etc/openldap/slapd.d + chown 439:439 "${pkgdir}"/etc/openldap/slapd.d + + install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd + install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/core/openldap/ntlm.patch b/core/openldap/ntlm.patch new file mode 100644 index 000000000..6804b610d --- /dev/null +++ b/core/openldap/ntlm.patch @@ -0,0 +1,230 @@ +Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is +actually called by evolution-data-server, checked at version 1.12.2. +Without this patch, the Exchange addressbook integration uses simple binds +with cleartext passwords. + +Russ checked with openldap-software for upstream's opinion on this patch +on 2007-12-21. Upstream had never received it as a patch submission and +given that it's apparently only for older Exchange servers that can't do +SASL and DIGEST-MD5, it's not very appealing. + +Bug#457374 filed against evolution-data-server asking if this support is +still required on 2007-12-21. + +Index: trunk/include/ldap.h +=================================================================== +--- trunk.orig/include/ldap.h ++++ trunk/include/ldap.h +@@ -2461,5 +2461,25 @@ + LDAPControl **ctrls, + LDAPDerefRes **drp )); + ++/* ++ * hacks for NTLM ++ */ ++#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU) ++#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU) ++LDAP_F( int ) ++ldap_ntlm_bind LDAP_P(( ++ LDAP *ld, ++ LDAP_CONST char *dn, ++ ber_tag_t tag, ++ struct berval *cred, ++ LDAPControl **sctrls, ++ LDAPControl **cctrls, ++ int *msgidp )); ++LDAP_F( int ) ++ldap_parse_ntlm_bind_result LDAP_P(( ++ LDAP *ld, ++ LDAPMessage *res, ++ struct berval *challenge)); ++ + LDAP_END_DECL + #endif /* _LDAP_H */ +Index: trunk/libraries/libldap/ntlm.c +=================================================================== +--- /dev/null ++++ trunk/libraries/libldap/ntlm.c +@@ -0,0 +1,138 @@ ++/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ ++/* ++ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. ++ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file ++ */ ++ ++/* Mostly copied from sasl.c */ ++ ++#include "portable.h" ++ ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include "ldap-int.h" ++ ++int ++ldap_ntlm_bind( ++ LDAP *ld, ++ LDAP_CONST char *dn, ++ ber_tag_t tag, ++ struct berval *cred, ++ LDAPControl **sctrls, ++ LDAPControl **cctrls, ++ int *msgidp ) ++{ ++ BerElement *ber; ++ int rc; ++ ber_int_t id; ++ ++ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 ); ++ ++ assert( ld != NULL ); ++ assert( LDAP_VALID( ld ) ); ++ assert( msgidp != NULL ); ++ ++ if( msgidp == NULL ) { ++ ld->ld_errno = LDAP_PARAM_ERROR; ++ return ld->ld_errno; ++ } ++ ++ /* create a message to send */ ++ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) { ++ ld->ld_errno = LDAP_NO_MEMORY; ++ return ld->ld_errno; ++ } ++ ++ assert( LBER_VALID( ber ) ); ++ ++ LDAP_NEXT_MSGID( ld, id ); ++ rc = ber_printf( ber, "{it{istON}" /*}*/, ++ id, LDAP_REQ_BIND, ++ ld->ld_version, dn, tag, ++ cred ); ++ ++ /* Put Server Controls */ ++ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) { ++ ber_free( ber, 1 ); ++ return ld->ld_errno; ++ } ++ ++ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) { ++ ld->ld_errno = LDAP_ENCODING_ERROR; ++ ber_free( ber, 1 ); ++ return ld->ld_errno; ++ } ++ ++ /* send the message */ ++ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id ); ++ ++ if(*msgidp < 0) ++ return ld->ld_errno; ++ ++ return LDAP_SUCCESS; ++} ++ ++int ++ldap_parse_ntlm_bind_result( ++ LDAP *ld, ++ LDAPMessage *res, ++ struct berval *challenge) ++{ ++ ber_int_t errcode; ++ ber_tag_t tag; ++ BerElement *ber; ++ ber_len_t len; ++ ++ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 ); ++ ++ assert( ld != NULL ); ++ assert( LDAP_VALID( ld ) ); ++ assert( res != NULL ); ++ ++ if ( ld == NULL || res == NULL ) { ++ return LDAP_PARAM_ERROR; ++ } ++ ++ if( res->lm_msgtype != LDAP_RES_BIND ) { ++ ld->ld_errno = LDAP_PARAM_ERROR; ++ return ld->ld_errno; ++ } ++ ++ if ( ld->ld_error ) { ++ LDAP_FREE( ld->ld_error ); ++ ld->ld_error = NULL; ++ } ++ if ( ld->ld_matched ) { ++ LDAP_FREE( ld->ld_matched ); ++ ld->ld_matched = NULL; ++ } ++ ++ /* parse results */ ++ ++ ber = ber_dup( res->lm_ber ); ++ ++ if( ber == NULL ) { ++ ld->ld_errno = LDAP_NO_MEMORY; ++ return ld->ld_errno; ++ } ++ ++ tag = ber_scanf( ber, "{ioa" /*}*/, ++ &errcode, challenge, &ld->ld_error ); ++ ber_free( ber, 0 ); ++ ++ if( tag == LBER_ERROR ) { ++ ld->ld_errno = LDAP_DECODING_ERROR; ++ return ld->ld_errno; ++ } ++ ++ ld->ld_errno = errcode; ++ ++ return( ld->ld_errno ); ++} ++ +Index: trunk/libraries/libldap/Makefile.in +=================================================================== +--- trunk.orig/libraries/libldap/Makefile.in ++++ trunk/libraries/libldap/Makefile.in +@@ -27,7 +27,7 @@ + init.c options.c print.c string.c util-int.c schema.c \ + charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ + tls2.c tls_o.c tls_g.c tls_m.c \ +- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ ++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ + assertion.c deref.c ldif.c fetch.c + + OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ +@@ -40,7 +40,7 @@ + init.lo options.lo print.lo string.lo util-int.lo schema.lo \ + charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ + tls2.lo tls_o.lo tls_g.lo tls_m.lo \ +- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ ++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ + assertion.lo deref.lo ldif.lo fetch.lo + + LDAP_INCDIR= ../../include +Index: trunk/libraries/libldap_r/Makefile.in +=================================================================== +--- trunk.orig/libraries/libldap_r/Makefile.in ++++ trunk/libraries/libldap_r/Makefile.in +@@ -29,7 +29,7 @@ + init.c options.c print.c string.c util-int.c schema.c \ + charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ + tls2.c tls_o.c tls_g.c tls_m.c \ +- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ ++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ + assertion.c deref.c ldif.c fetch.c + SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \ + thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \ +@@ -47,7 +47,7 @@ + init.lo options.lo print.lo string.lo util-int.lo schema.lo \ + charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ + tls2.lo tls_o.lo tls_g.lo tls_m.lo \ +- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ ++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ + assertion.lo deref.lo ldif.lo fetch.lo + + LDAP_INCDIR= ../../include diff --git a/core/openldap/openldap.install b/core/openldap/openldap.install new file mode 100644 index 000000000..cf3cb9f25 --- /dev/null +++ b/core/openldap/openldap.install @@ -0,0 +1,20 @@ +post_install(){ + groupadd -g 439 ldap &>/dev/null + useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null + chown -R ldap:ldap var/lib/openldap &>/dev/null +} + +post_upgrade(){ + getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null + getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null + chown -R ldap:ldap var/lib/openldap &>/dev/null +} + +post_remove(){ + if getent passwd ldap >/dev/null 2>&1; then + userdel ldap + fi + if getent group ldap >/dev/null 2>&1; then + groupdel ldap + fi +} diff --git a/core/openldap/slapd b/core/openldap/slapd new file mode 100755 index 000000000..5156b4d61 --- /dev/null +++ b/core/openldap/slapd @@ -0,0 +1,48 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd + +PID=`pidof -o %PPID /usr/sbin/slapd` +case "$1" in + start) + stat_busy "Starting OpenLDAP" + if [ -z "$PID" ]; then + if [ -z "$SLAPD_SERVICES" ]; then + /usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS + else + /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS + fi + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + add_daemon slapd + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping OpenLDAP" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /run/openldap/slapd.pid + rm -f /run/openldap/slapd.args + rm_daemon slapd + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/core/openldap/slapd.default b/core/openldap/slapd.default new file mode 100644 index 000000000..72ae2a6a7 --- /dev/null +++ b/core/openldap/slapd.default @@ -0,0 +1,6 @@ +# slapd normally serves ldap only on all TCP-ports 389. slapd can also +# service requests on TCP-port 636 (ldaps) and requests via unix +# sockets. +# Example usage: +#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///" +SLAPD_OPTIONS="" diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 76f144bcc..bf45e6396 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 127399 2011-06-14 16:51:03Z bisson $ +# $Id: PKGBUILD 131644 2011-07-13 07:48:58Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Aaron Griffin # Contributor: judd pkgname=openssh pkgver=5.8p2 -pkgrel=8 +pkgrel=9 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' 'openssl' 'libedit') +depends=('krb5' 'openssl' 'libedit') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" 'authfile.c.patch' 'sshd.confd' @@ -32,7 +32,6 @@ build() { --prefix=/usr \ --libexecdir=/usr/lib/ssh \ --sysconfdir=/etc/ssh \ - --with-tcp-wrappers \ --with-privsep-user=nobody \ --with-md5-passwords \ --with-pam \ diff --git a/core/syslog-ng/PKGBUILD b/core/syslog-ng/PKGBUILD index c54007652..3c4bc0767 100644 --- a/core/syslog-ng/PKGBUILD +++ b/core/syslog-ng/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 129498 2011-06-28 13:40:42Z dreisner $ +# $Id: PKGBUILD 131638 2011-07-13 03:09:27Z dreisner $ # Maintainer: Dave Reisner # Maintainer: Eric Bélanger # Maintainer: Aaron Griffin pkgname=syslog-ng pkgver=3.2.4 -pkgrel=2 +pkgrel=3 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' 'awk') +depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk') makedepends=('flex' 'pkg-config') optdepends=('logrotate: for rotating log files') provides=('logger') @@ -49,6 +49,7 @@ build() { --enable-tcp-wrapper \ --with-pidfile-dir=/var/run \ --disable-spoof-source \ + --disable-tcp-wrapper \ --enable-systemd make diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD index 395cad6f1..27bf3b2a0 100644 --- a/core/xinetd/PKGBUILD +++ b/core/xinetd/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 99899 2010-11-19 13:00:23Z allan $ +# $Id: PKGBUILD 131821 2011-07-15 23:50:00Z dan $ # Maintainer: # Contributor: Judd pkgname=xinetd pkgver=2.3.14 -pkgrel=6 -pkgdesc="a secure replacement for inetd" +pkgrel=7 +pkgdesc="A secure replacement for inetd" arch=('i686' 'x86_64') url="http://www.xinetd.org/" license=('custom') -depends=('tcp_wrappers') optdepends=('perl: for xconv.pl script') backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services') source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz @@ -26,7 +25,7 @@ md5sums=('567382d7972613090215c6c54f9b82d9' build() { cd $srcdir/$pkgname-$pkgver sed -i "s#${prefix}/man#${prefix}/share/man#" configure - ./configure --prefix=/usr --with-libwrap + ./configure --prefix=/usr --without-libwrap make } diff --git a/extra/archboot/PKGBUILD b/extra/archboot/PKGBUILD index 8bc5854a3..c5ffb4711 100644 --- a/extra/archboot/PKGBUILD +++ b/extra/archboot/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 130388 2011-07-06 10:05:42Z tpowa $ +# $Id: PKGBUILD 132074 2011-07-19 20:24:15Z eric $ # Maintainer : Tobias Powalowski pkgname=archboot pkgver=2011.06 -pkgrel=1 +pkgrel=2 +_sourcerel=1 pkgdesc="Advanced, modular arch boot/install image creation utility" -arch=(i686 x86_64) -license=('GPL') +arch=('i686' 'x86_64') url="http://www.archlinux.org/" -depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'tcp_wrappers>=7.6-12' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1') +license=('GPL') +depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1') optdepends=('grub2-bios: for grub2 support' 'grub2-efi-i386: for grub2 support' 'grub2-efi-x86_64: for grub2 support' 'efibootmgr: for grub2 support' ) -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.bz2 vmware-detect.c) backup=('etc/archboot/allinone.conf' 'etc/archboot/allinone-lts.conf' 'etc/archboot/default.conf' @@ -31,18 +31,22 @@ backup=('etc/archboot/allinone.conf' 'etc/archboot/presets/pxelinux-ftp' ) install=archboot.install +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$_sourcerel.tar.bz2 vmware-detect.c) +md5sums=('eac77ae13bf2e6b5a92317b9885c69dd' + '7e2b03463747cb22ab388e79a09fa0cb') ### to bump the depends list use this: #for i in $(grep ^depends= PKGBUILD | sed -e 's/depends=(//g' -e 's/)//g'); do sed -i -e "s/$(echo $i)/$(echo $i | sed -e "s/>=.*/>=$(pacman -Qi $(echo $i | sed -e "s/'//g" -e 's/>=.*//g') | grep ^Version | sed -e 's/.*: //g')'/g")/g" PKGBUILD; done -build() +build() { - cd $srcdir/$pkgname-$pkgver-$pkgrel - mv * $pkgdir/ - # vmware-detect - cd $startdir/src + cd "$srcdir" gcc -o vmware-detect vmware-detect.c - install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect } -md5sums=('eac77ae13bf2e6b5a92317b9885c69dd' - '7e2b03463747cb22ab388e79a09fa0cb') + +package() +{ + cd "$srcdir/$pkgname-$pkgver-$_sourcerel" + mv * "$pkgdir/" + install -D -m 755 "$srcdir/vmware-detect" "$pkgdir/usr/bin/vmware-detect" +} diff --git a/extra/esound/PKGBUILD b/extra/esound/PKGBUILD index 70c636201..b6d035b22 100644 --- a/extra/esound/PKGBUILD +++ b/extra/esound/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 19660 2008-11-28 20:33:47Z jgc $ +# $Id: PKGBUILD 131830 2011-07-16 00:02:10Z dreisner $ # Maintainer: Jan de Groot pkgname=esound pkgver=0.2.41 -pkgrel=1 +pkgrel=2 pkgdesc="Enlightened Sound Daemon" arch=(i686 x86_64) license=('LGPL') -depends=('audiofile' 'tcp_wrappers' 'alsa-lib>=1.0.18') +depends=('audiofile' 'alsa-lib>=1.0.18') url="http://www.tux.org/~ricdude/EsounD.html" provides=("esd=${pkgver}") replaces=('esd') @@ -22,13 +22,17 @@ md5sums=('8d9aad3d94d15e0d59ba9dc0ea990c6c' build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/esd-0.2.38-alsa-drain.patch" || return 1 + patch -Np1 -i "${srcdir}/esd-0.2.38-alsa-drain.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ - --with-audiofile --with-libwrap \ - --enable-alsa --disable-artstest || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --with-audiofile --without-libwrap \ + --enable-alsa --disable-artstest + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 "${srcdir}/esd" "${pkgdir}/etc/rc.d/esd" || return 1 + install -m755 "${srcdir}/esd" "${pkgdir}/etc/rc.d/esd" } diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD index 3d0399d93..d0398bd9d 100644 --- a/extra/gnome-disk-utility/PKGBUILD +++ b/extra/gnome-disk-utility/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 130871 2011-07-08 15:15:27Z ibiru $ +# $Id: PKGBUILD 132112 2011-07-20 12:08:11Z ibiru $ # Maintainer: Jan de Groot pkgname=gnome-disk-utility -pkgver=3.0.0 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="GNOME libraries and applications for dealing with storage devices" arch=('i686' 'x86_64') license=('GPL') @@ -12,17 +12,14 @@ depends=('dbus-glib' 'libgnome-keyring' 'libunique3' 'udisks' 'libnotify' 'hicol makedepends=('gtk-doc' 'intltool') options=('!libtool' '!emptydirs') install=gnome-disk-utility.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - fix-freeze.patch - add-support-for-DeviceAutomountHint.patch) -sha256sums=('94d31142a5f488d034cd2954df4ab1c26bd053fb0d46d230fba91b4f8b3663fb' - '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526' - '1e2f8d2d8ea121d21ff2b2a1e208c0fd4af603a4ed0d024ad326a991ebc7a613') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz + fix-freeze.patch) +sha256sums=('7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5' + '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/fix-freeze.patch" - patch -Np1 -i "${srcdir}/add-support-for-DeviceAutomountHint.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/gnome-disk-utility \ --disable-scrollkeeper --disable-nautilus --disable-gtk-doc diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 1e814b88a..6f4fe2870 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 128504 2011-06-24 07:05:04Z andyrtr $ +# $Id: PKGBUILD 130900 2011-07-08 17:01:10Z andyrtr $ # Maintainer: Jan de Groot pkgname=gnutls pkgver=2.12.7 -pkgrel=1 +pkgrel=2 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') license=('GPL3' 'LGPL') url="http://www.gnu.org/software/gnutls/" install=gnutls.install options=('!libtool' '!zipman') -depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'libgcrypt') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2) md5sums=(4b48aa3119f549d30d550bf4162c721b'') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # Nettle is the default crypto back end. Use --with-libgcrypt to use the libgcrypt back end. - # we stay with libgcrypt for now. nettle would need to be moved from AUR to extra. ./configure --prefix=/usr \ --with-zlib \ - --with-libgcrypt \ --disable-static \ --disable-guile make @@ -29,7 +26,7 @@ build() { check() { cd "${srcdir}/${pkgname}-${pkgver}" #make check # passes all || /bin/true - make check || /bin/true # see https://lists.gnu.org/archive/html/gnutls-devel/2011-06/msg00007.html + make check # || /bin/true # see https://lists.gnu.org/archive/html/gnutls-devel/2011-06/msg00007.html } package() { diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index 95dbb9933..05bfa4ef9 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 127010 2011-06-09 16:03:05Z andyrtr $ +# $Id: PKGBUILD 132127 2011-07-20 16:03:07Z andyrtr $ # Maintainer: Andreas Radke pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') -pkgver=1.1 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('openjdk6' 'zip' 'xulrunner') source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) -md5sums=('a7d70cb446c38213e554d4bdfb926f63') +md5sums=('16017dc91f7216e0631b759db1eebecb') build() { _javaver=6 diff --git a/extra/js/PKGBUILD b/extra/js/PKGBUILD index 5d518186f..71d3ac492 100644 --- a/extra/js/PKGBUILD +++ b/extra/js/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 131990 2011-07-18 19:11:01Z ibiru $ +# $Id: PKGBUILD 132237 2011-07-21 21:43:04Z ibiru $ # Maintainer: Ionut Biru pkgname=js pkgver=1.8.5 -pkgrel=2 +pkgrel=3 pkgdesc="JavaScript interpreter and libraries" arch=(i686 x86_64) url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5" @@ -20,8 +20,6 @@ build() { patch -Np0 -i $srcdir/js185-destdir.patch - export CXXFLAGS="$CXXFLAGS -DJS_C_STRINGS_ARE_UTF8" - ./configure --prefix=/usr --with-system-nspr \ --enable-threadsafe diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD index 074e59069..a9f065c4e 100644 --- a/extra/lablgtk2/PKGBUILD +++ b/extra/lablgtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123211 2011-05-09 10:15:03Z jgc $ +# $Id: PKGBUILD 132150 2011-07-21 11:38:25Z tpowa $ #Maintainer: Tobias Powalowski pkgname=lablgtk2 pkgver=2.14.2 -pkgrel=2 +pkgrel=3 pkgdesc=" An Objective Caml interface to gtk2" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/libmpdclient/PKGBUILD b/extra/libmpdclient/PKGBUILD index b639ea6e0..faa1c8340 100644 --- a/extra/libmpdclient/PKGBUILD +++ b/extra/libmpdclient/PKGBUILD @@ -1,25 +1,29 @@ # $Id: PKGBUILD 50625 2009-08-30 03:02:23Z allan $ -# Maintainer: Andrea Scarpino +# Contributor: Andrea Scarpino +# Maintainer: Gaetan Bisson pkgname=libmpdclient -pkgver=2.4 +pkgver=2.5 pkgrel=1 -pkgdesc='An asynchronous API library for interfacing MPD in the C, C++ & Objective C languages' +pkgdesc='Asynchronous API library for interfacing MPD in the C, C++ & Objective C languages' arch=('i686' 'x86_64') url='http://mpd.wikia.com/wiki/ClientLib:libmpdclient' -license=('GPL2') -depends=('glibc') +license=('custom') options=('!libtool') -source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('fe240e56eb5cae082ea4894a810c1fdadc3d03a1') +source=("http://downloads.sourceforge.net/project/musicpd/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('a2e68352f2b7d55787d14a45ee0d902f2427b3dc') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + + cd "${pkgdir}" + install -d usr/share/licenses/libmpdclient + ln -s ../../doc/libmpdclient/COPYING usr/share/licenses/libmpdclient/COPYING } diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 2d61cac2e..54248034e 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130378 2011-07-06 07:48:11Z andrea $ +# $Id: PKGBUILD 131641 2011-07-13 07:03:22Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Douglas Soares de Andrade # Contributor: judd @@ -6,11 +6,11 @@ pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') pkgver=5.5.14 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL') url="http://www.mysql.com/" -makedepends=('cmake' 'openssl' 'tcp_wrappers' 'zlib') +makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' @@ -31,7 +31,6 @@ build() { cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DMANUFACTURER="Arch Linux" \ -DSYSCONFDIR=/etc/mysql \ -DMYSQL_DATADIR=/var/lib/mysql \ -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ @@ -51,7 +50,7 @@ build() { -DWITH_READLINE=ON \ -DWITH_ZLIB=system \ -DWITH_SSL=system \ - -DWITH_LIBWRAP=ON \ + -DWITH_LIBWRAP=OFF \ -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ -DWITH_EXTRA_CHARSETS=complex \ -DWITH_EMBEDDED_SERVER=ON \ @@ -67,7 +66,7 @@ build() { package_libmysqlclient(){ pkgdesc="MySQL client libraries" - depends=('openssl' 'gcc-libs' 'tcp_wrappers') + depends=('openssl') cd "${srcdir}"/build for dir in include libmysql libmysqld libservices; do @@ -105,6 +104,7 @@ package_mysql(){ install=mysql.install depends=('mysql-clients' 'net-tools') optdepends=('perl-dbi' 'perl-dbd-mysql') + options=('emptydirs') cd "${srcdir}"/build make DESTDIR="${pkgdir}" install diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index 42faa88a3..a1f72cb01 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,34 +1,39 @@ -# $Id: PKGBUILD 125239 2011-05-25 19:13:43Z foutrelis $ +# $Id: PKGBUILD 131650 2011-07-13 08:13:14Z andrea $ # Maintainer: Eric Belanger # Contributor: Dale Blount pkgname=net-snmp pkgver=5.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('i686' 'x86_64') url="http://www.net-snmp.org/" license=('custom') -depends=('openssl' 'tcp_wrappers' 'libnl') +depends=('openssl' 'libnl') makedepends=('setuptools') optdepends=('perl-term-readkey: for snmpcheck application' 'perl-tk: for snmpcheck and tkmib applications' - 'python2: for the python modules') + 'python2: for the python modules') provides=('ucd-snmp') options=('!libtool' '!makeflags' '!emptydirs') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'snmpd.rc') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'snmpd.rc') md5sums=('b4e30ead5783b0bb1d280172c6095ea4' '9f0d13676ba1fae1eb7eb178edd85b43') -sha1sums=('45bbf1295253d5379a5d1efd918593160387fd00' '2c679b564a2c319d9ce2714a9776aa0e6d89c60a') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \ - --enable-ucd-snmp-compatibility --enable-ipv6 --with-libwrap --with-python-modules \ - --with-default-snmp-version="3" --with-sys-contact="root@localhost" \ - --with-sys-location="Unknown" --with-logfile="/var/log/snmpd.log" \ + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --enable-ucd-snmp-compatibility \ + --enable-ipv6 \ + --with-python-modules \ + --with-default-snmp-version="3" \ + --with-sys-contact="root@localhost" \ + --with-sys-location="Unknown" \ + --with-logfile="/var/log/snmpd.log" \ --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ --with-persistent-directory="/var/net-snmp" \ PYTHONPROG=/usr/bin/python2 @@ -39,5 +44,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd" - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD new file mode 100644 index 000000000..085e98f5d --- /dev/null +++ b/extra/nettle/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 130897 2011-07-08 16:53:06Z andyrtr $ +# Maintainer: Andreas Radke +# Contributor: bender02 at gmx dot com + +pkgname=nettle +pkgver=2.1 +pkgrel=1 +pkgdesc="A low-level cryptographic library" +arch=('i686' 'x86_64') +url="http://www.lysator.liu.se/~nisse/nettle/" +license=('GPL2') +install=$pkgname.install +depends=('gmp') +source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz) +md5sums=('2bfaf16234a5d8deb96cd23f53a682bb') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --libdir=/usr/lib \ + --enable-shared \ + --disable-static # <-- seems not working now + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + + # remove static libs + rm -f ${pkgdir}/usr/lib/{libhogweed,libnettle}.a +} diff --git a/extra/nettle/nettle.install b/extra/nettle/nettle.install new file mode 100644 index 000000000..3d19b5f19 --- /dev/null +++ b/extra/nettle/nettle.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(nettle.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +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/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index 6b490bb32..32ce42ce0 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126852 2011-06-08 05:53:21Z andyrtr $ +# $Id: PKGBUILD 132227 2011-07-21 17:20:32Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Jan de Groot @@ -6,7 +6,7 @@ pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" #_date=20100715 _javaver=6 -_icedteaver=1.10.2 +_icedteaver=1.10.3 _openjdk_version=b22 _openjdk_date=28_feb_2011 #pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date} @@ -32,7 +32,7 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar openjdk6.profile openjdk6.profile.csh) noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz) -md5sums=('83041b2d0de66cb5289813cc6f05af11' +md5sums=('0a1301785e9826d7c87ed7e8b10a6985' '2d2bbbb0f9b81f1fec41ec730da8a933' 'ef7a8b3624ea904bf584bc46d79b5e75' '91adfd41e6f001add4f92ae31216b1e3' diff --git a/extra/quota-tools/PKGBUILD b/extra/quota-tools/PKGBUILD index cf88fa2f0..79bb209a4 100644 --- a/extra/quota-tools/PKGBUILD +++ b/extra/quota-tools/PKGBUILD @@ -1,25 +1,40 @@ -# $Id: PKGBUILD 122880 2011-05-07 02:23:54Z eric $ +# $Id: PKGBUILD 131802 2011-07-15 11:55:43Z eric $ # Maintainer: Eric Bélanger pkgname=quota-tools -pkgver=3.17 -pkgrel=2 +pkgver=4.00_pre1 +pkgrel=1 pkgdesc="Tools to manage kernel-level quotas in Linux" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/linuxquota/" license=('GPL' 'BSD') -depends=('e2fsprogs' 'tcp_wrappers') +depends=('e2fsprogs') backup=('etc/warnquota.conf' 'etc/quotatab' 'etc/quotagrpadmins') options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.tar.gz LICENSE) -md5sums=('cb3e98a039c0cf98e7c1ad4b50a5bda7' - 'dd792440e684043e4e4ef80963d0237b') -sha1sums=('8dc04ea803a43496dfe275a8260757f558a2d762' - '57297bdc9e638c500506169bbbe12eb89bcf7d07') +source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver/_/-}.tar.gz LICENSE \ + quotaon.diff system_inodes.diff repquota.diff nulls.diff) +md5sums=('ef9d66e8a968ecffd2d9df648fa8ada2' + 'dd792440e684043e4e4ef80963d0237b' + '9ac7ca4746de1ad057baee21474b7906' + '92d9f2a4b3e5e3adf2977051391785a7' + 'd1d70d4167e53d1414079b4391f1cfb8' + '094bce5226c4fd1c383bd0b75405ee2c') +sha1sums=('adf29b49dab449078eb6ffdfe8af51fe85419e28' + '57297bdc9e638c500506169bbbe12eb89bcf7d07' + '2304f03cddd06d8791167f621683f7ef54610673' + 'e2a33f1f95a3ff8c741a2067058e898f6054af09' + '8b00e7c4f7af2188ad49a50a616c1d71eee20459' + '0527f761aa869f5d9e463ceab4a3bf82881d05c2') build() { cd "${srcdir}/${pkgname}" + patch -p1 -i "${srcdir}/quotaon.diff" + patch -p1 -i "${srcdir}/system_inodes.diff" + patch -p1 -i "${srcdir}/repquota.diff" + patch -p1 -i "${srcdir}/nulls.diff" ./configure --prefix=/usr --sysconfdir=/etc + sed -i -e 's/#define HOSTS_ACCESS 1//' -e 's/HOSTS_ACCESS//' config.h + sed -i 's/-lwrap//' Makefile make } diff --git a/extra/quota-tools/nulls.diff b/extra/quota-tools/nulls.diff new file mode 100644 index 000000000..97c5bc482 --- /dev/null +++ b/extra/quota-tools/nulls.diff @@ -0,0 +1,20 @@ +#Description: Avoid memory corruption of NULL address +#Author: Petr Pisar + +--- quota/quotasys.c 2010-02-18 09:44:11.000000000 +0100 ++++ quota-tools/quotasys.c 2010-05-05 08:02:53.000000000 +0200 +@@ -746,9 +746,12 @@ + kernel_qfmt_num = 0; + if (!stat("/proc/fs/xfs/stat", &st)) + kernel_qfmt[kernel_qfmt_num++] = QF_XFS; +- else +- if (!quotactl(QCMD(Q_XGETQSTAT, 0), NULL, 0, NULL) || (errno != EINVAL && errno != ENOSYS)) ++ else { ++ fs_quota_stat_t dummy; ++ ++ if (!quotactl(QCMD(Q_XGETQSTAT, 0), "/dev/root", 0, (void *)&dummy) || (errno != EINVAL && errno != ENOSYS)) + kernel_qfmt[kernel_qfmt_num++] = QF_XFS; ++ } + /* Detect new kernel interface; Assume generic interface unless we can prove there is not one... */ + if (!stat("/proc/sys/fs/quota", &st) || errno != ENOENT) { + kernel_iface = IFACE_GENERIC; diff --git a/extra/quota-tools/quotaon.diff b/extra/quota-tools/quotaon.diff new file mode 100644 index 000000000..6a43cee6c --- /dev/null +++ b/extra/quota-tools/quotaon.diff @@ -0,0 +1,216 @@ +# Description: Fix quotaon to work with XFS and print all informational messages only in verbose mode +# Author: Jan Kara + +diff -u quota/quotaon.c quota-tools/quotaon.c +--- quota/quotaon.c 2010-07-28 11:14:02.000000000 +0200 ++++ quota-tools/quotaon.c 2010-06-15 10:11:30.000000000 +0200 +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + #include "quotaon.h" + #include "quota.h" +@@ -145,6 +146,19 @@ + } + } + ++int pinfo(char *fmt, ...) ++{ ++ va_list arg; ++ int ret; ++ ++ if (!(flags & FL_VERBOSE)) ++ return 0; ++ va_start(arg, fmt); ++ ret = vprintf(fmt, arg); ++ va_end(arg); ++ return ret; ++} ++ + /* + * Enable/disable rsquash on given filesystem + */ +@@ -171,10 +185,10 @@ + errstr(_("set root_squash on %s: %s\n"), quotadev, strerror(errno)); + return 1; + } +- if ((flags & STATEFLAG_VERBOSE) && (flags & STATEFLAG_OFF)) +- printf(_("%s: %s root_squash turned off\n"), quotadev, type2name(type)); +- else if ((flags & STATEFLAG_VERBOSE) && (flags & STATEFLAG_ON)) +- printf(_("%s: %s root_squash turned on\n"), quotadev, type2name(type)); ++ if (flags & STATEFLAG_OFF) ++ pinfo(_("%s: %s root_squash turned off\n"), quotadev, type2name(type)); ++ else if (flags & STATEFLAG_ON) ++ pinfo(_("%s: %s root_squash turned on\n"), quotadev, type2name(type)); + #endif + return 0; + } +@@ -195,8 +209,7 @@ + errstr(_("quotactl on %s [%s]: %s\n"), quotadev, quotadir, strerror(errno)); + return 1; + } +- if (flags & STATEFLAG_VERBOSE) +- printf(_("%s [%s]: %s quotas turned off\n"), quotadev, quotadir, type2name(type)); ++ pinfo(_("%s [%s]: %s quotas turned off\n"), quotadev, quotadir, type2name(type)); + return 0; + } + if (kernel_iface == IFACE_GENERIC) { +@@ -218,8 +231,7 @@ + errstr(_("Quota format not supported in kernel.\n")); + return 1; + } +- if (flags & STATEFLAG_VERBOSE) +- printf(_("%s [%s]: %s quotas turned on\n"), quotadev, quotadir, type2name(type)); ++ pinfo(_("%s [%s]: %s quotas turned on\n"), quotadev, quotadir, type2name(type)); + return 0; + } + +@@ -268,8 +280,6 @@ + int sflags, ret = 0; + + sflags = flags & FL_OFF ? STATEFLAG_OFF : STATEFLAG_ON; +- if (flags & FL_VERBOSE) +- sflags |= STATEFLAG_VERBOSE; + if (flags & FL_ALL) + sflags |= STATEFLAG_ALL; + +@@ -281,10 +291,7 @@ + errstr(_("Cannot change state of XFS quota. It's not compiled in kernel.\n")); + return 1; + } +- if ((flags & FL_OFF && (kern_quota_on(mnt->mnt_fsname, USRQUOTA, QF_XFS) != -1 +- || kern_quota_on(mnt->mnt_fsname, GRPQUOTA, QF_XFS) != -1)) +- || (!(flags & FL_OFF) && kern_quota_on(mnt->mnt_fsname, type, QF_XFS) == -1)) +- ret = xfs_newstate(mnt, type, extra, sflags); ++ ret = xfs_newstate(mnt, type, extra, sflags); + } + else if (meta_qf_fstype(mnt->mnt_type)) { + if (!hasquota(mnt, type, 0)) +@@ -376,7 +383,7 @@ + while ((mnt = get_next_mount())) { + if (nfs_fstype(mnt->mnt_type)) { + if (!(flags & FL_ALL)) +- fprintf(stderr, "%s: Quota cannot be turned on on NFS filesystem\n", mnt->mnt_fsname); ++ errstr(_("%s: Quota cannot be turned on on NFS filesystem\n"), mnt->mnt_fsname); + continue; + } + +diff -u quota/quotaon.h quota-tools/quotaon.h +--- quota/quotaon.h 2010-02-18 09:44:11.000000000 +0100 ++++ quota-tools/quotaon.h 2010-06-12 12:06:08.000000000 +0200 +@@ -13,7 +13,7 @@ + #define STATEFLAG_ON 0x01 + #define STATEFLAG_OFF 0x02 + #define STATEFLAG_ALL 0x04 +-#define STATEFLAG_VERBOSE 0x08 + + typedef int (newstate_t) (struct mntent * mnt, int type, char *file, int flags); + extern int xfs_newstate(struct mntent *mnt, int type, char *file, int flags); ++extern int pinfo(char *fmt, ...); +diff -u quota/quotaon_xfs.c quota-tools/quotaon_xfs.c +--- quota/quotaon_xfs.c 2010-07-26 18:48:24.000000000 +0200 ++++ quota-tools/quotaon_xfs.c 2010-06-15 10:11:30.000000000 +0200 +@@ -59,8 +59,8 @@ + return 1; + case Q_XFS_QUOTAON: + if (roothack) { +- printf(_("Enabling %s quota on root filesystem" +- " (reboot to take effect)\n"), type2name(type)); ++ pinfo(_("Enabling %s quota on root filesystem" ++ " (reboot to take effect)\n"), type2name(type)); + return 1; + } + errstr(_("Enable XFS %s quota accounting during mount\n"), +@@ -79,12 +79,12 @@ + return -1; + case Q_XFS_QUOTAON: + if (roothack) { +- printf(_("Enabling %s quota on root filesystem" +- " (reboot to take effect)\n"), type2name(type)); ++ pinfo(_("Enabling %s quota on root filesystem" ++ " (reboot to take effect)\n"), type2name(type)); + return 1; + } + if (xopts & XFS_QUOTA_UDQ_ENFD || xopts & XFS_QUOTA_GDQ_ENFD) { +- printf(_("Enabling %s quota enforcement on %s\n"), type2name(type), dev); ++ pinfo(_("Enabling %s quota enforcement on %s\n"), type2name(type), dev); + return 1; + } + errstr(_("Already accounting %s quota on %s\n"), +@@ -92,7 +92,7 @@ + return -1; + case Q_XFS_QUOTAOFF: + if (xopts & XFS_QUOTA_UDQ_ACCT || xopts & XFS_QUOTA_GDQ_ACCT) { +- printf(_("Disabling %s quota accounting on %s\n"), ++ pinfo(_("Disabling %s quota accounting on %s\n"), + type2name(type), dev); + return 1; + } +@@ -121,9 +121,9 @@ + return -1; + } + if (xopts & XFS_QUOTA_UDQ_ACCT || xopts & XFS_QUOTA_GDQ_ACCT) +- acctstr = _("and accounting "); +- printf(_("Disabling %s quota enforcement %son %s\n"), +- type2name(type), acctstr, dev); ++ acctstr = _("and accounting "); ++ pinfo(_("Disabling %s quota enforcement %son %s\n"), ++ type2name(type), acctstr, dev); + return 1; + } + break; +@@ -146,10 +146,10 @@ + errstr(_("quotactl on %s: %s\n"), dev, strerror(errno)); + return 1; + } +- if ((flags & STATEFLAG_VERBOSE) && qoff) +- printf(_("%s: %s quotas turned off\n"), dev, type2name(type)); +- else if ((flags & STATEFLAG_VERBOSE) && !qoff) +- printf(_("%s: %s quotas turned on\n"), dev, type2name(type)); ++ if (qoff) ++ pinfo(_("%s: %s quotas turned off\n"), dev, type2name(type)); ++ else ++ pinfo(_("%s: %s quotas turned on\n"), dev, type2name(type)); + return 0; + } + +@@ -168,8 +168,7 @@ + return 1; + } + +- if (flags & STATEFLAG_VERBOSE) +- printf(_("%s: deleted %s quota blocks\n"), dev, type2name(type)); ++ pinfo(_("%s: deleted %s quota blocks\n"), dev, type2name(type)); + return 0; + } + +@@ -208,16 +207,12 @@ + } + #endif /* XFS_ROOTHACK */ + +- if (xarg == NULL) { /* both acct & enfd on/off */ +- xopts |= (type == USRQUOTA) ? +- (XFS_QUOTA_UDQ_ACCT | XFS_QUOTA_UDQ_ENFD) : +- (XFS_QUOTA_GDQ_ACCT | XFS_QUOTA_GDQ_ENFD); ++ if (xarg == NULL) { /* only enfd on/off */ ++ xopts |= (type == USRQUOTA) ? XFS_QUOTA_UDQ_ENFD : ++ XFS_QUOTA_GDQ_ENFD; + err = xfs_onoff((char *)dev, type, flags, roothack, xopts); + } + else if (strcmp(xarg, "account") == 0) { +- /* only useful if we want root accounting only */ +- if (!roothack || !(flags & STATEFLAG_ON)) +- goto done; + xopts |= (type == USRQUOTA) ? XFS_QUOTA_UDQ_ACCT : XFS_QUOTA_GDQ_ACCT; + err = xfs_onoff((char *)dev, type, flags, roothack, xopts); + } +@@ -231,7 +226,6 @@ + } + else + die(1, _("Invalid argument \"%s\"\n"), xarg); +- done: + free((char *)dev); + return err; + } diff --git a/extra/quota-tools/repquota.diff b/extra/quota-tools/repquota.diff new file mode 100644 index 000000000..3d79497d9 --- /dev/null +++ b/extra/quota-tools/repquota.diff @@ -0,0 +1,91 @@ +# Description: fix repquota to get latest quota info header +# Author: Jan Kara + +diff -u quota/quotaio.c quota-tools/quotaio.c +--- quota/quotaio.c 2010-07-28 11:14:02.000000000 +0200 ++++ quota-tools/quotaio.c 2010-05-28 09:05:21.000000000 +0200 +@@ -147,6 +147,15 @@ + } + } + if (!QIO_ENABLED(h) || flags & IOI_OPENFILE) { /* Need to open file? */ ++ if (QIO_ENABLED(h)) { /* Kernel uses same file? */ ++ unsigned int cmd = ++ (kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC; ++ if (quotactl(QCMD(cmd, h->qh_type), h->qh_quotadev, ++ 0, NULL) < 0) { ++ die(4, _("Cannot sync quotas on device %s: %s\n"), ++ h->qh_quotadev, strerror(errno)); ++ } ++ } + /* We still need to open file for operations like 'repquota' */ + if ((fd = open(qfname, QIO_RO(h) ? O_RDONLY : O_RDWR)) < 0) { + errstr(_("Cannot open quotafile %s: %s\n"), +diff -u quota/quotaio_v1.c quota-tools/quotaio_v1.c +--- quota/quotaio_v1.c 2010-07-26 18:48:24.000000000 +0200 ++++ quota-tools/quotaio_v1.c 2010-05-28 09:05:23.000000000 +0200 +@@ -348,11 +348,6 @@ + struct dquot *dquot = get_empty_dquot(); + qid_t id = 0; + +- if (QIO_ENABLED(h)) /* Kernel uses same file? */ +- if (quotactl(QCMD((kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC, h->qh_type), +- h->qh_quotadev, 0, NULL) < 0) +- die(4, _("Cannot sync quotas on device %s: %s\n"), h->qh_quotadev, +- strerror(errno)); + memset(dquot, 0, sizeof(*dquot)); + dquot->dq_h = h; + lseek(h->qh_fd, 0, SEEK_SET); +diff -u quota/quotaio_v2.c quota-tools/quotaio_v2.c +--- quota/quotaio_v2.c 2010-02-18 09:44:11.000000000 +0100 ++++ quota-tools/quotaio_v2.c 2010-05-28 09:05:23.000000000 +0200 +@@ -484,11 +484,6 @@ + + static int v2_scan_dquots(struct quota_handle *h, int (*process_dquot) (struct dquot *, char *)) + { +- if (QIO_ENABLED(h)) /* Kernel uses same file? */ +- if (quotactl(QCMD((kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC, h->qh_type), +- h->qh_quotadev, 0, NULL) < 0) +- die(4, _("Cannot sync quotas on device %s: %s\n"), h->qh_quotadev, +- strerror(errno)); + return qtree_scan_dquots(h, process_dquot); + } + +diff -u quota/quotasys.c quota-tools/quotasys.c +--- quota/quotasys.c 2010-07-28 11:14:02.000000000 +0200 ++++ quota-tools/quotasys.c 2010-06-15 10:11:30.000000000 +0200 +@@ -861,22 +861,23 @@ + if (kernel_iface == IFACE_GENERIC) { + int actfmt; + +- if (quotactl(QCMD(Q_GETFMT, type), dev, 0, (void *)&actfmt) < 0) +- return -1; +- actfmt = kern2utilfmt(actfmt); +- if (actfmt < 0) +- return -1; +- return actfmt; ++ if (quotactl(QCMD(Q_GETFMT, type), dev, 0, ++ (void *)&actfmt) >= 0) { ++ actfmt = kern2utilfmt(actfmt); ++ if (actfmt >= 0) ++ return actfmt; ++ } ++ } else { ++ if ((fmt == -1 || fmt == QF_VFSV0) && ++ v2_kern_quota_on(dev, type)) /* VFSv0 quota format */ ++ return QF_VFSV0; ++ if ((fmt == -1 || fmt == QF_VFSOLD) && ++ v1_kern_quota_on(dev, type)) /* Old quota format */ ++ return QF_VFSOLD; + } +- if ((fmt == -1 || fmt == QF_VFSV0) && +- v2_kern_quota_on(dev, type)) /* VFSv0 quota format */ +- return QF_VFSV0; + if ((fmt == -1 || fmt == QF_XFS) && + xfs_kern_quota_on(dev, type)) /* XFS quota format */ + return QF_XFS; +- if ((fmt == -1 || fmt == QF_VFSOLD) && +- v1_kern_quota_on(dev, type)) /* Old quota format */ +- return QF_VFSOLD; + return -1; + } + diff --git a/extra/quota-tools/system_inodes.diff b/extra/quota-tools/system_inodes.diff new file mode 100644 index 000000000..94f4d66da --- /dev/null +++ b/extra/quota-tools/system_inodes.diff @@ -0,0 +1,18 @@ +# Description: Do not count system inodes into quota for ext[234] +# Author: Jan Kara + +--- quota/quotacheck.c 2010-02-18 09:44:10.000000000 +0100 ++++ quota-tools//quotacheck.c 2010-05-22 16:47:53.000000000 +0200 +@@ -455,8 +455,10 @@ + return -1; + } + +- while ((long)i_num) { +- if (inode.i_links_count) { ++ while (i_num) { ++ if ((i_num == EXT2_ROOT_INO || ++ i_num >= EXT2_FIRST_INO(fs->super)) && ++ inode.i_links_count) { + debug(FL_DEBUG, _("Found i_num %ld, blocks %ld\n"), (long)i_num, (long)inode.i_blocks); + if (flags & FL_VERBOSE) + blit(NULL); diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index 8c95ca2d4..2395df342 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 127048 2011-06-10 06:18:26Z eric $ +# $Id: PKGBUILD 131818 2011-07-15 23:27:54Z dan $ # Maintainer: Eric Bélanger pkgname=rrdtool pkgver=1.4.5 -pkgrel=2 +pkgrel=3 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64') url="http://www.rrdtool.org" license=('GPL' 'custom') -depends=('libpng' 'libxml2' 'pango' 'tcp_wrappers') +depends=('libpng' 'libxml2' 'pango') makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua') optdepends=('tcl: to use corresponding binding' \ 'python2: to use corresponding binding' \ @@ -26,7 +26,7 @@ build() { ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ --enable-ruby --enable-ruby-site-install --enable-python \ - --enable-lua --enable-lua-site-install --enable-tcl + --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap make } diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD index 1d1af26d0..458009ce3 100644 --- a/extra/socat/PKGBUILD +++ b/extra/socat/PKGBUILD @@ -1,31 +1,32 @@ -# $Id: PKGBUILD 125383 2011-05-26 13:02:11Z bisson $ +# $Id: PKGBUILD 131647 2011-07-13 08:01:50Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Juergen Hoetzel # Contributor: John Proctor pkgname=socat pkgver=1.7.1.3 -pkgrel=2 +pkgrel=3 pkgdesc='Multipurpose relay' url='http://www.dest-unreach.org/socat/' license=('GPL2') arch=('i686' 'x86_64') -depends=('readline' 'openssl' 'tcp_wrappers') -source=("http://www.dest-unreach.org/socat/download/$pkgname-$pkgver.tar.gz") +depends=('readline' 'openssl') +source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz") sha1sums=('5a42275da0d8a5182452b36535a74c3cdf21793b') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ + --disable-libwrap # only required while base/base-devel uses tcp_wrappers make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } diff --git a/extra/tftp-hpa/PKGBUILD b/extra/tftp-hpa/PKGBUILD index 33d44dae7..72034141e 100644 --- a/extra/tftp-hpa/PKGBUILD +++ b/extra/tftp-hpa/PKGBUILD @@ -1,29 +1,35 @@ -# $Id: PKGBUILD 42756 2009-06-18 19:44:52Z tpowa $ +# $Id: PKGBUILD 131856 2011-07-16 06:36:05Z tpowa $ # Maintainer: dorphell # Contributor: Jose Javier pkgname=tftp-hpa -pkgver=5.0 -pkgrel=3 +pkgver=5.1 +pkgrel=1 pkgdesc="Official tftp server" arch=('i686' 'x86_64') url="http://www.kernel.org/pub/software/network/tftp/" license=('BSD') -depends=('tcp_wrappers' 'readline>=6.0.00') +depends=('readline>=6.0.00') conflicts=('netkit-tftp') backup=('etc/conf.d/tftpd') source=(http://www.kernel.org/pub/software/network/tftp/$pkgname-$pkgver.tar.gz tftpd.rc tftpd.conf LICENSE) -md5sums=('1ae813a94670f0d8c294aafa9f5ecf65' 'a974d02526f19222146c8e3d3b598871'\ - '414a79dc891bced056d99a9bb790fc9e' '6ce21e27b6fdc1a1adf85c81e42aeecf') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make INSTALLROOT="${pkgdir}" install || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make INSTALLROOT="${pkgdir}" install install -d "${pkgdir}/etc/rc.d" install -d "${pkgdir}/var/tftpboot" - install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd" || return 1 - install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd" || return 1 + install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd" + install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd" rm "${pkgdir}/usr/share/man/man8/tftpd.8" install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } +md5sums=('d086b1bd6e5ed6375ad407e273afccdf' + '83fbb6f52205d95951a3c059e5351ca2' + '414a79dc891bced056d99a9bb790fc9e' + '6ce21e27b6fdc1a1adf85c81e42aeecf') diff --git a/extra/tftp-hpa/tftpd.rc b/extra/tftp-hpa/tftpd.rc index b21f87f5c..0222d1693 100755 --- a/extra/tftp-hpa/tftpd.rc +++ b/extra/tftp-hpa/tftpd.rc @@ -14,7 +14,7 @@ case "$1" in if [ $? -gt 0 ]; then stat_fail else - add_daemon in.tftpd + add_daemon tftpd stat_done fi ;; @@ -24,7 +24,7 @@ case "$1" in if [ $? -gt 0 ]; then stat_fail else - rm_daemon in.tftpd + rm_daemon tftpd stat_done fi ;; diff --git a/extra/vsftpd/PKGBUILD b/extra/vsftpd/PKGBUILD index df6037c93..c35fe02de 100644 --- a/extra/vsftpd/PKGBUILD +++ b/extra/vsftpd/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 130325 2011-07-05 09:57:35Z andrea $ +# $Id: PKGBUILD 131827 2011-07-15 23:59:43Z dreisner $ # Maintainer: Andreas Radke # Contributor: judd pkgname=vsftpd pkgver=2.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="Very Secure FTP daemon" arch=('i686' 'x86_64') url="https://security.appspot.com/vsftpd.html" license=('GPL2') -depends=('tcp_wrappers' 'openssl') +depends=('openssl') backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') install=vsftpd.install source=("https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz" @@ -25,7 +25,6 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" # build-time config sed \ - -e 's|^#undef VSF_BUILD_TCPWRAPPERS$|#define VSF_BUILD_TCPWRAPPERS|' \ -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \ -i builddefs.h make CFLAGS="${CFLAGS}" diff --git a/libre/abs-libre/PKGBUILD b/libre/abs-libre/PKGBUILD new file mode 100644 index 000000000..fa23952bd --- /dev/null +++ b/libre/abs-libre/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 101993 2010-12-03 13:48:19Z allan $ +# Maintainer: Allan McRae + +_pkgname=abs +pkgname=abs-libre +pkgver=2.4.2 +pkgrel=1 +pkgdesc="Utilities to download and work with the Arch Build System (ABS)" +arch=('i686' 'x86_64') +url="http://projects.archlinux.org/abs.git/" +license=('GPL') +depends=('bash' 'rsync') +backup=(etc/abs.conf) +install=abs.install +source=(ftp://ftp.archlinux.org/other/abs/${_pkgname}-${pkgver}.tar.gz) +md5sums=('7be7cfc67443cff62e20f27ca57dc17a') + +build() { + cd ${srcdir}/${_pkgname} + + make CONFDIR=/etc/ + make CONFDIR=/etc/ DESTDIR=${pkgdir} install + + # Add readme file, and make base /var/abs path + install -dm0755 ${pkgdir}/var/abs/local/ + install -Dm0644 ${srcdir}/abs/README ${pkgdir}/var/abs/README + + sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' ${pkgdir}/etc/abs.conf + + # make adjustments to abs.conf + if [[ $CARCH = "i686" ]]; then + sed -i -e 's| multilib||' -e 's| !multilib-testing||' ${pkgdir}/etc/abs.conf + fi + if [[ $CARCH = "x86_64" ]]; then + sed -i '/ARCH=/s|i686|x86_64|' ${pkgdir}/etc/abs.conf + fi +} + diff --git a/libre/abs-libre/abs.install b/libre/abs-libre/abs.install new file mode 100644 index 000000000..ac814c2fc --- /dev/null +++ b/libre/abs-libre/abs.install @@ -0,0 +1,13 @@ +pre_upgrade() { + if [ "$(vercmp $2 2.3.2-1)" -lt 0 ]; then + echo "==> Fixing potential ABS tree permission issues (this may take a while...)" + + for dir in core extra community testing; do + if [ -d /var/abs/$dir ]; then + find /var/abs/$dir -type d -exec chown root:root {} \; + find /var/abs/$dir -type d -exec chmod 755 {} \; + fi + done + fi +} + diff --git a/multilib-testing/lib32-keyutils/PKGBUILD b/multilib-testing/lib32-keyutils/PKGBUILD new file mode 100644 index 000000000..c77347239 --- /dev/null +++ b/multilib-testing/lib32-keyutils/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 116950 2011-03-26 15:07:29Z tpowa $ +# Maintainer: Tobias Powalowski +_pkgbasename=keyutils +pkgname=lib32-$_pkgbasename +pkgver=1.5.1 +pkgrel=1 +pkgdesc="Linux Key Management Utilities (32-bit)" +arch=(x86_64) +url="http://www.kernel.org" +license=('GPL2' 'LGPL2.1') +depends=(lib32-glibc $_pkgbasename) +makedepends=(gcc-multilib) +source=(http://people.redhat.com/~dhowells/$_pkgbasename/$_pkgbasename-$pkgver.tar.bz2) + +build() { + cd "$srcdir/$_pkgbasename-$pkgver" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + sed -i -e '/CFLAGS/s|:= -g -O2|+=|' Makefile + sed -i -e 's/^\(USR\)\?LIBDIR\s*:=.*$/\1LIBDIR=\/usr\/lib32/' Makefile + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +package() { + cd "$srcdir/$_pkgbasename-$pkgver" + make DESTDIR="$pkgdir" install + + rm -rf "${pkgdir}"/{usr/{include,share,bin,sbin},etc,{s,}bin} +} +md5sums=('3ab62455a37a20f73b2d6cc794aaba13') diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD index e06a2caa9..985f13d20 100644 --- a/multilib-testing/lib32-mesa/PKGBUILD +++ b/multilib-testing/lib32-mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 51770 2011-07-14 11:51:51Z lcarlier $ +# $Id: PKGBUILD 52124 2011-07-20 10:33:55Z lcarlier $ # Contributor: Jan de Groot # Contributor: Andreas Radke @@ -6,17 +6,17 @@ pkgbase=lib32-mesa pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri' 'lib32-nouveau-dri') -_git=true -#_git=false +#_git=true +_git=false if [ "${_git}" = "true" ]; then #pkgver=7.10.99.git20110709 - pkgver=7.11rc1 + pkgver=7.11rc2 else - pkgver=7.11rc1 + pkgver=7.11rc2 fi -pkgrel=3 +pkgrel=1 arch=(x86_64) makedepends=('glproto>=1.4.14' 'lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev' 'lib32-llvm') @@ -28,8 +28,8 @@ if [ "${_git}" = "true" ]; then source=(linking_fix.patch "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") md5sums=('887be83c01d126c2a4cb372af7d3b067' '817a63bb60b81f4f817ffc9ed0a3dddd') else - source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver/rc1/}/MesaLib-${pkgver/rc/-rc}.zip") - md5sums=('2246d97eb0cfb1f6d2bf8a54b533d07f') + source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver/rc2/}/MesaLib-${pkgver/rc/-rc}.tar.bz2") + md5sums=('caf5f553a4a3f98207bd3b30b3c7eb2e') fi build() { @@ -69,7 +69,7 @@ build() { --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ --with-gallium-drivers=r300,r600,nouveau,swrast \ --enable-gallium-llvm \ - --enable-gallium-egl \ + --enable-gallium-egl --enable-shared-glapi \ --enable-glx-tls \ --with-driver=dri \ --enable-xcb \ diff --git a/multilib/lib32-libldap/PKGBUILD b/multilib/lib32-libldap/PKGBUILD index 2ea6c2202..ed848d45d 100644 --- a/multilib/lib32-libldap/PKGBUILD +++ b/multilib/lib32-libldap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 26599 2010-09-15 22:40:16Z bluewind $ +# $Id: PKGBUILD 52217 2011-07-21 16:47:02Z bluewind $ # Maintainer: # Contributor: Judd Vinet _pkgbasename=libldap pkgname=lib32-$_pkgbasename -pkgver=2.4.22 -pkgrel=3 +pkgver=2.4.26 +pkgrel=1 pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries (32-bit)" arch=('x86_64') license=('custom') @@ -15,8 +15,8 @@ makedepends=(gcc-multilib) options=('!libtool') source=("ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz" 'ntlm.patch') -md5sums=('ef01b52255ce8e3fbf8aa34f6fe7598b' - 'dfa9eb6f2fd9d0a3dab0e1860923489e') +md5sums=('f36f3086031dd56ae94f722ffae8df5e' + '4258ddbef923d1f29f2843bc050f8c56') build() { export CC="gcc -m32" diff --git a/multilib/lib32-libldap/ntlm.patch b/multilib/lib32-libldap/ntlm.patch index a4fe4d45a..6804b610d 100644 --- a/multilib/lib32-libldap/ntlm.patch +++ b/multilib/lib32-libldap/ntlm.patch @@ -194,7 +194,7 @@ Index: trunk/libraries/libldap/Makefile.in tls2.c tls_o.c tls_g.c tls_m.c \ - turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ + turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c + assertion.c deref.c ldif.c fetch.c OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ @@ -40,7 +40,7 @@ @@ -203,7 +203,7 @@ Index: trunk/libraries/libldap/Makefile.in tls2.lo tls_o.lo tls_g.lo tls_m.lo \ - turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ + turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo + assertion.lo deref.lo ldif.lo fetch.lo LDAP_INCDIR= ../../include Index: trunk/libraries/libldap_r/Makefile.in @@ -216,7 +216,7 @@ Index: trunk/libraries/libldap_r/Makefile.in tls2.c tls_o.c tls_g.c tls_m.c \ - turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ + turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c + assertion.c deref.c ldif.c fetch.c SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \ thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \ @@ -47,7 +47,7 @@ @@ -225,6 +225,6 @@ Index: trunk/libraries/libldap_r/Makefile.in tls2.lo tls_o.lo tls_g.lo tls_m.lo \ - turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ + turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo + assertion.lo deref.lo ldif.lo fetch.lo LDAP_INCDIR= ../../include diff --git a/testing/dash/PKGBUILD b/testing/dash/PKGBUILD new file mode 100644 index 000000000..8105f73a3 --- /dev/null +++ b/testing/dash/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 132155 2011-07-21 15:03:34Z dan $ +# Maintainer: Dan McGee + +pkgname=dash +pkgver=0.5.7 +pkgrel=1 +pkgdesc="A POSIX compliant shell that aims to be as small as possible" +arch=('i686' 'x86_64') +url="http://gondor.apana.org.au/~herbert/dash/" +license=('BSD') +groups=('base') +depends=('glibc') +source=("http://gondor.apana.org.au/~herbert/dash/files/${pkgname}-${pkgver}.tar.gz") +sha1sums=('a3ebc16f2e2c7ae8adf64e5e62ae3dcb631717c6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man --exec-prefix="" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + # license + install -m644 -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} diff --git a/testing/keyutils/PKGBUILD b/testing/keyutils/PKGBUILD new file mode 100644 index 000000000..c533d134e --- /dev/null +++ b/testing/keyutils/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 132103 2011-07-20 10:53:54Z stephane $ +# Maintainer: Tobias Powalowski +pkgname=keyutils +pkgver=1.5.1 +pkgrel=1 +pkgdesc="Linux Key Management Utilities" +arch=(i686 x86_64) +url="http://www.kernel.org" +license=('GPL2' 'LGPL2.1') +depends=('glibc' 'sh') +backup=(etc/request-key.conf) +source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2) + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i "s|/lib64|/lib|g" Makefile + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} +md5sums=('3ab62455a37a20f73b2d6cc794aaba13') diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD index 9ad6ffe3a..e6fedf350 100644 --- a/testing/mesa/PKGBUILD +++ b/testing/mesa/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 131696 2011-07-13 15:20:52Z andyrtr $ +# $Id: PKGBUILD 132095 2011-07-20 07:12:09Z andyrtr $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke pkgbase=mesa pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri') -_git=true -#_git=false +#_git=true +_git=false if [ "${_git}" = "true" ]; then #pkgver=7.10.99.git20110709 - pkgver=7.11rc1 + pkgver=7.11rc2 else - pkgver=7.11rc1 + pkgver=7.11rc2 fi -pkgrel=4 +pkgrel=1 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.14' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev') @@ -28,12 +28,12 @@ if [ "${_git}" = "true" ]; then #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') source=(${source[@]} "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") else - source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver/rc1/}/MesaLib-${pkgver/rc/-rc}.zip" + source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver/rc2/}/MesaLib-${pkgver/rc/-rc}.tar.bz2" ) fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' '887be83c01d126c2a4cb372af7d3b067' - '817a63bb60b81f4f817ffc9ed0a3dddd') + 'caf5f553a4a3f98207bd3b30b3c7eb2e') build() { cd ${srcdir}/?esa-* @@ -65,7 +65,7 @@ if [ "${_git}" = "true" ]; then --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --with-gallium-drivers=r300,r600,nouveau,swrast \ --enable-gallium-llvm \ - --enable-gallium-egl \ + --enable-gallium-egl --enable-shared-glapi\ --enable-glx-tls \ --with-driver=dri \ --enable-xcb \ diff --git a/testing/r/PKGBUILD b/testing/r/PKGBUILD new file mode 100644 index 000000000..e6b7af9dc --- /dev/null +++ b/testing/r/PKGBUILD @@ -0,0 +1,68 @@ +# $Id: PKGBUILD 132100 2011-07-20 07:19:13Z ronald $ +# Maintainer: Ronald van Haren +# Contributor: Damir Perisa +# Contributor: K. Piche + +pkgname=r +pkgver=2.13.1 +pkgrel=1 +pkgdesc="Language and environment for statistical computing and graphics" +arch=('i686' 'x86_64') +license=('GPL') +url=('http://www.r-project.org/') +depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' + 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' + 'tk' 'libxt' 'libxmu' 'pango' 'xz') +makedepends=('openjdk6' 'gcc-fortran') +backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') +options=('!makeflags') +source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" + 'r.desktop' + 'r.png') +install=r.install +sha1sums=('8b9d48c7a654186064f369652ea34a085eff239b' + '13aa29219bcaa102e575de8c1c8e0833d233e836' + 'a69a07ec363440efc18ce0a7f2af103375dea978') +build() { + cd ${srcdir}/R-${pkgver} + sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c + ./configure --prefix=/usr \ + --libdir=/usr/lib \ + --sysconfdir=/etc/R \ + --datarootdir=/usr/share \ + rsharedir=/usr/share/R/ \ + rincludedir=/usr/include/R/ \ + rdocdir=/usr/share/doc/R/ \ + --with-x \ + --enable-R-shlib \ + --with-lapack \ + --with-blas \ + F77=gfortran \ + LIBnn=lib + make +} + +package() { + cd ${srcdir}/R-${pkgver} + make -j1 DESTDIR=${pkgdir} install + + # Fixup R wrapper scripts. + sed -i "s|${pkgdir} ||" ${pkgdir}/usr/bin/R + rm ${pkgdir}/usr/lib/R/bin/R + cd ${pkgdir}/usr/lib/R/bin + ln -s ../../../bin/R + + # install some freedesktop.org compatibility + install -Dm644 ${srcdir}/r.desktop \ + ${pkgdir}/usr/share/applications/r.desktop + install -Dm644 ${srcdir}/r.png \ + ${pkgdir}/usr/share/pixmaps/r.png + + # move the config directory to /etc and create symlinks + install -d ${pkgdir}/etc/R + cd ${pkgdir}/usr/lib/R/etc + for i in *; do + mv -f ${i} ${pkgdir}/etc/R + ln -s /etc/R/${i} ${i} + done +} diff --git a/testing/r/r.desktop b/testing/r/r.desktop new file mode 100644 index 000000000..68b49c447 --- /dev/null +++ b/testing/r/r.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=R +GenericName=environment for statistical computing +Comment=language and environment for statistical computing and graphics +Exec=R +Icon=/usr/share/pixmaps/r.png +DocPath=/usr/lib/R/doc/html/index.html +StartupNotify=true +Terminal=true +Type=Application +Categories=Education;Science;Math; diff --git a/testing/r/r.install b/testing/r/r.install new file mode 100644 index 000000000..d3289ab64 --- /dev/null +++ b/testing/r/r.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/testing/r/r.png b/testing/r/r.png new file mode 100644 index 000000000..1303ccdb9 Binary files /dev/null and b/testing/r/r.png differ -- cgit v1.2.3-54-g00ecf