diff options
65 files changed, 1646 insertions, 252 deletions
diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index 1738cdeee..a84ef9665 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 53615 2011-08-07 02:05:15Z svenstaro $ +# $Id: PKGBUILD 54827 2011-08-26 18:55:23Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=clanlib -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' makedepends=('doxygen' 'graphviz') options=('!libtool') source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz) -md5sums=('af9f16543fa3da43f49b4a52634d2e82') +md5sums=('9a51aae432ec71e50fb753f30f6b73fd') build() { cd ${srcdir}/ClanLib-${pkgver} diff --git a/community/courier-imap/PKGBUILD b/community/courier-imap/PKGBUILD index 2ddfbbda1..400ed830f 100644 --- a/community/courier-imap/PKGBUILD +++ b/community/courier-imap/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 49375 2011-06-15 09:29:55Z svenstaro $ +# $Id: PKGBUILD 54864 2011-08-26 22:00:47Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: tobias <tobias@archlinux.org> # Committer: Manolis Tzanidakis <manolis@archlinux.org> pkgname=courier-imap pkgver=4.9.3 -pkgrel=2 +pkgrel=4 pkgdesc="IMAP(s)/POP3(s) Server" arch=('i686' 'x86_64') license=('GPL2') url="http://www.courier-mta.org/imap/" -depends=('courier-maildrop>=2.5.0' 'gcc-libs' 'fam' 'gdbm' 'openssl') +depends=('courier-maildrop>=2.5.0' 'gcc-libs' 'gamin' 'gdbm' 'openssl') backup=('etc/courier-imap/imapd.cnf' 'etc/courier-imap/pop3d.cnf' \ 'etc/courier-imap/imapd' 'etc/courier-imap/imapd-ssl' \ 'etc/courier-imap/pop3d' 'etc/courier-imap/pop3d-ssl'\ @@ -18,6 +18,7 @@ backup=('etc/courier-imap/imapd.cnf' 'etc/courier-imap/pop3d.cnf' \ conflicts=('courier-mta') provides=('imap-server' 'pop3-server') options=('!libtool') +install=$pkgname.install source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgname}-${pkgver}.tar.bz2 courier-imap.conf.d courier-imap.rc.d @@ -27,12 +28,11 @@ source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgnam pop3d-ssl.rc.d) md5sums=('703ddbb090569436dbda61d0d62b1eb8' '3e08f017f6c5a52dea28f6f0dbd50b86' - '3e4910c5a34af68dfdeed932e573a9f9' - 'ca799c7014d002fb9f8ff671610337bd' - '268693ccf3f081897b78490a70cf3211' - 'c2e65d9b136f59eb0cf5377e7c46de88' - 'e07c43fdf2e5ae6d73fc3281f6332b62') -install=$pkgname.install + '500c37831974f4676b67e650c67a59f6' + '6574c8046e44698efa7452c4b445d88e' + '437167a58efddc523f25180df284da20' + '1be23fb224bde93b23da6e771bd1cf01' + 'a326309b02fed3d7226d9aac88add7f2') # MIGRATION NOTE: # In 2012, support for courier-imap.conf.d and courier-imap.rc.d will be removed. diff --git a/community/courier-imap/courier-imap.install b/community/courier-imap/courier-imap.install index cf73119e2..9046777a7 100644 --- a/community/courier-imap/courier-imap.install +++ b/community/courier-imap/courier-imap.install @@ -8,7 +8,7 @@ post_upgrade() { echo "Example prior to this change:" echo " DAEMONS=( ... courier-imap ...)" echo "Example after this change:" - echo " DAEMONS=( ... authdaemond imapd imapd-ssl pop3d pop3d-ssl .. )" + echo " DAEMONS=( ... authdaemond imapd imapd-ssl pop3d pop3d-ssl ... )" echo "This allows better control over the daemons and will generate" echo "correct entries in /run/daemons" echo "An old configuration will keep working but please do migrate in time" diff --git a/community/courier-imap/courier-imap.rc.d b/community/courier-imap/courier-imap.rc.d index 1389221f8..8876fe401 100644 --- a/community/courier-imap/courier-imap.rc.d +++ b/community/courier-imap/courier-imap.rc.d @@ -18,7 +18,7 @@ case "$1" in /etc/rc.d/authdaemond start sleep ${AUTO_AUTHDAEMON_LAG} fi - if [ ! -f /var/run/daemons/authdaemond ]; then + if ck_daemon authdaemond; then echo "ERROR: authdaemond is not running" stat_fail exit 1 diff --git a/community/courier-imap/imapd-ssl.rc.d b/community/courier-imap/imapd-ssl.rc.d index 3430bd73e..6730d452c 100644 --- a/community/courier-imap/imapd-ssl.rc.d +++ b/community/courier-imap/imapd-ssl.rc.d @@ -9,7 +9,7 @@ case "$1" in [ -d /var/run/courier ] || mkdir -p /var/run/courier chown courier:courier /var/run/courier - if [ ! -f /var/run/daemons/authdaemond ]; then + if ck_daemon authdaemond; then echo "ERROR: authdaemond is not running" stat_fail exit 1 diff --git a/community/courier-imap/imapd.rc.d b/community/courier-imap/imapd.rc.d index ec4df03f5..867b52b78 100644 --- a/community/courier-imap/imapd.rc.d +++ b/community/courier-imap/imapd.rc.d @@ -9,7 +9,7 @@ case "$1" in [ -d /var/run/courier ] || mkdir -p /var/run/courier chown courier:courier /var/run/courier - if [ ! -f /var/run/daemons/authdaemond ]; then + if ck_daemon authdaemond; then echo "ERROR: authdaemond is not running" stat_fail exit 1 diff --git a/community/courier-imap/pop3d-ssl.rc.d b/community/courier-imap/pop3d-ssl.rc.d index 8b147ff32..aab0f6a95 100644 --- a/community/courier-imap/pop3d-ssl.rc.d +++ b/community/courier-imap/pop3d-ssl.rc.d @@ -9,7 +9,7 @@ case "$1" in [ -d /var/run/courier ] || mkdir -p /var/run/courier chown courier:courier /var/run/courier - if [ ! -f /var/run/daemons/authdaemond ]; then + if ck_daemon authdaemond; then echo "ERROR: authdaemond is not running" stat_fail exit 1 diff --git a/community/courier-imap/pop3d.rc.d b/community/courier-imap/pop3d.rc.d index 6a2c66ad0..7b73c5a7a 100644 --- a/community/courier-imap/pop3d.rc.d +++ b/community/courier-imap/pop3d.rc.d @@ -9,7 +9,7 @@ case "$1" in [ -d /var/run/courier ] || mkdir -p /var/run/courier chown courier:courier /var/run/courier - if [ ! -f /var/run/daemons/authdaemond ]; then + if ck_daemon authdaemond; then echo "ERROR: authdaemond is not running" stat_fail exit 1 diff --git a/community/courier-maildrop/PKGBUILD b/community/courier-maildrop/PKGBUILD index c678c2198..7ac0627a9 100644 --- a/community/courier-maildrop/PKGBUILD +++ b/community/courier-maildrop/PKGBUILD @@ -6,12 +6,12 @@ pkgname=courier-maildrop _srcname=maildrop pkgver=2.5.4 -pkgrel=1 +pkgrel=2 pkgdesc="mail delivery agent - procmail like but nicer syntax" arch=('i686' 'x86_64') license=('GPL2') url="http://courier-mta.org/maildrop/" -depends=('courier-authlib>=0.63.0' 'fam' 'pcre' 'gdbm') +depends=('courier-authlib>=0.63.0' 'gamin' 'pcre' 'gdbm') conflicts=('courier-mta') options=(!libtool) source=(http://downloads.sourceforge.net/project/courier/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.bz2) diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD index ced394074..7b4722108 100644 --- a/community/courier-mta/PKGBUILD +++ b/community/courier-mta/PKGBUILD @@ -6,10 +6,9 @@ # ----------- NOTE TO ALL USERS ------------ # Go read http://www.courier-mta.org/install.html b4 running or building courier - pkgname=courier-mta pkgver=0.66.3 -pkgrel=1 +pkgrel=3 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" arch=(i686 x86_64) license=('GPL2') @@ -22,9 +21,9 @@ backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \ 'etc/courier/webadmin/password' 'etc/courier/esmtpauthclient' \ 'etc/conf.d/courier-mta') url="http://courier-mta.org" -depends=('courier-authlib>=0.63.0' 'fam' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates') +depends=('courier-authlib>=0.63.0' 'gamin' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates') optdepends=('libldap') -makedepends=('apache>=2.2.9-3' 'pam>=1.0.1-2' 'expect' 'gnupg' 'libldap' 'fam') +makedepends=('apache>=2.2.9-3' 'pam>=1.0.1-2' 'expect' 'gnupg' 'libldap' 'gamin') provides=('smtp-server' 'smtp-forwarder' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop') conflicts=('courier-imap' 'smtp-forwarder' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp') options=('!libtool') @@ -41,16 +40,16 @@ source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/couri pop3d-ssl.rc.d webmaild.rc.d) md5sums=('3b28f14afe3db09b74b4845323c3e982' - 'bc2bdbc2f5c95cee8304f98a3b3a4895' - 'e140f320968e57cfe459cd7a3b4017e0' + '9055ba622efd37603186ce1f37277224' + '5cbeb5c323706058e545f74ad7752ebe' 'f3ff70b40c7a1f7a017e8c4cc4d92f4f' - '799ddd56ff6c9cff132e8c771dde23d9' - 'c3b634ea6a671b660bf6a660cef57138' - 'd7c951a7e55674778077d5123ec41006' - 'dabac9fa0e46872049c02ef6bf83b1f0' - '6e9e176eb966759a1f2e3838fccf4e3c' - '5c0ddedca1cf2298182dbbb461c189bf' - 'ec5c0383d617c1f4877ebba9a9727ef4') + 'caabce8c7b66296b602316aa5af5d4c5' + '1c8b1b66ebafa4ff09ffc0106a9dc82c' + 'd0cc5eab5d3e0ec33dadd0392421f63e' + '5873a96aa149edda281730010fb4db34' + 'faa09e06a5dc41ee89ab1f8fa6886b63' + '520501daa66c0a94f2e9844ce4919a09' + '33a93f400c3e87bcd207295b7d7333ca') # MIGRATION NOTE: # In 2012, support for courier-mta.conf.d and courier-mta.rc.d will be removed. diff --git a/community/courier-mta/courier-mta.rc.d b/community/courier-mta/courier-mta.rc.d index 6c5fbc914..416946a5a 100644 --- a/community/courier-mta/courier-mta.rc.d +++ b/community/courier-mta/courier-mta.rc.d @@ -18,7 +18,7 @@ case "$1" in /etc/rc.d/authdaemond start sleep ${AUTO_AUTHDAEMON_LAG} fi - if [ ! -f /var/run/daemons/authdaemond ]; then + if ck_daemon authdaemond; then echo "ERROR: authdaemond is not running" stat_fail exit 1 diff --git a/community/courier-mta/courier.rc.d b/community/courier-mta/courier.rc.d index 7c321d452..7c581a24a 100644 --- a/community/courier-mta/courier.rc.d +++ b/community/courier-mta/courier.rc.d @@ -9,7 +9,7 @@ case "$1" in [ -d /var/run/courier ] || mkdir -p /var/run/courier chown courier:courier /var/run/courier - if [ ! -f /var/run/daemons/authdaemond ]; then + if ck_daemon authdaemond; then echo "ERROR: authdaemond is not running" stat_fail exit 1 diff --git a/community/courier-mta/esmtpd-ssl.rc.d b/community/courier-mta/esmtpd-ssl.rc.d index 78001332f..2a13be03f 100644 --- a/community/courier-mta/esmtpd-ssl.rc.d +++ b/community/courier-mta/esmtpd-ssl.rc.d @@ -9,7 +9,7 @@ case "$1" in [ -d /var/run/courier ] || mkdir -p /var/run/courier chown courier:courier /var/run/courier - if [ ! -f /var/run/daemons/authdaemond ]; then + if ck_daemon authdaemond; then echo "ERROR: authdaemond is not running" stat_fail exit 1 diff --git a/community/courier-mta/esmtpd.rc.d b/community/courier-mta/esmtpd.rc.d index 951aa3e6e..dbaa9d680 100644 --- a/community/courier-mta/esmtpd.rc.d +++ b/community/courier-mta/esmtpd.rc.d @@ -9,7 +9,7 @@ case "$1" in [ -d /var/run/courier ] || mkdir -p /var/run/courier chown courier:courier /var/run/courier - if [ ! -f /var/run/daemons/authdaemond ]; then + if ck_daemon authdaemond; then echo "ERROR: authdaemond is not running" stat_fail exit 1 diff --git a/community/courier-mta/imapd-ssl.rc.d b/community/courier-mta/imapd-ssl.rc.d index 7b21fda76..3dc74cfdf 100644 --- a/community/courier-mta/imapd-ssl.rc.d +++ b/community/courier-mta/imapd-ssl.rc.d @@ -9,7 +9,7 @@ case "$1" in [ -d /var/run/courier ] || mkdir -p /var/run/courier chown courier:courier /var/run/courier - if [ ! -f /var/run/daemons/authdaemond ]; then + if ck_daemon authdaemond; then echo "ERROR: authdaemond is not running" stat_fail exit 1 diff --git a/community/courier-mta/imapd.rc.d b/community/courier-mta/imapd.rc.d index 7a8bff410..8bce59f6c 100644 --- a/community/courier-mta/imapd.rc.d +++ b/community/courier-mta/imapd.rc.d @@ -9,7 +9,7 @@ case "$1" in [ -d /var/run/courier ] || mkdir -p /var/run/courier chown courier:courier /var/run/courier - if [ ! -f /var/run/daemons/authdaemond ]; then + if ck_daemon authdaemond; then echo "ERROR: authdaemond is not running" stat_fail exit 1 diff --git a/community/courier-mta/pop3d-ssl.rc.d b/community/courier-mta/pop3d-ssl.rc.d index 730c6edbf..6e7ae4e12 100644 --- a/community/courier-mta/pop3d-ssl.rc.d +++ b/community/courier-mta/pop3d-ssl.rc.d @@ -9,7 +9,7 @@ case "$1" in [ -d /var/run/courier ] || mkdir -p /var/run/courier chown courier:courier /var/run/courier - if [ ! -f /var/run/daemons/authdaemond ]; then + if ck_daemon authdaemond; then echo "ERROR: authdaemond is not running" stat_fail exit 1 diff --git a/community/courier-mta/pop3d.rc.d b/community/courier-mta/pop3d.rc.d index 6ec1d82b6..25f8379ba 100644 --- a/community/courier-mta/pop3d.rc.d +++ b/community/courier-mta/pop3d.rc.d @@ -9,7 +9,7 @@ case "$1" in [ -d /var/run/courier ] || mkdir -p /var/run/courier chown courier:courier /var/run/courier - if [ ! -f /var/run/daemons/authdaemond ]; then + if ck_daemon authdaemond; then echo "ERROR: authdaemond is not running" stat_fail exit 1 diff --git a/community/courier-mta/webmaild.rc.d b/community/courier-mta/webmaild.rc.d index 2337e3ce8..835cc2bf0 100644 --- a/community/courier-mta/webmaild.rc.d +++ b/community/courier-mta/webmaild.rc.d @@ -9,7 +9,7 @@ case "$1" in [ -d /var/run/courier ] || mkdir -p /var/run/courier chown courier:courier /var/run/courier - if [ ! -f /var/run/daemons/authdaemond ]; then + if ck_daemon authdaemond; then echo "ERROR: authdaemond is not running" stat_fail exit 1 diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index ff4c7d7f0..eea40b5b0 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52709 2011-07-27 22:06:23Z spupykin $ +# $Id: PKGBUILD 54817 2011-08-26 16:20:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=0.9.1 +pkgver=0.9.2 _pkgver=0.9 pkgrel=1 pkgdesc="Utility to organize and develop raw images" @@ -18,7 +18,7 @@ optdepends=( 'librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) -md5sums=('7f2167ad002386b377eae8b347c26ed7') +md5sums=('08377e80ad77c7b11f742f26fddb80f1') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD index c05548fba..4d7b7ffb8 100644 --- a/community/mldonkey/PKGBUILD +++ b/community/mldonkey/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 49135 2011-06-11 15:20:48Z cbrannon $ +# $Id: PKGBUILD 54810 2011-08-26 12:19:01Z cbrannon $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=mldonkey -pkgver=3.0.7 -pkgrel=3 +pkgver=3.1.0 +pkgrel=1 pkgdesc="A multi-network P2P client" arch=('i686' 'x86_64') url="http://mldonkey.sourceforge.net/" @@ -17,7 +17,6 @@ optdepends=('librsvg: GUI support' backup=('etc/conf.d/mldonkey') install=mldonkey.install source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2 - mldonkey-gcc46.patch mldonkeyd mldonkey.conf mldonkey.desktop) @@ -25,8 +24,6 @@ source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.t build() { cd "$srcdir/$pkgname-$pkgver" - # Patch comes from upstream; will go away in later versions. - patch -p1 < "$srcdir/mldonkey-gcc46.patch" ./configure --prefix=/usr --enable-gui=newgui2 make } @@ -43,8 +40,7 @@ package() { install -Dm755 "$srcdir/mldonkeyd" "$pkgdir/etc/rc.d/mldonkey" install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey" } -md5sums=('162b78fc4e20335a8fe31d91e1656db2' - 'c2bd99420ba5d48629b6823aae6bf127' +md5sums=('072726d158ba1e936c554be341e7ceff' '75e4b6c7fb282f7de15a8d5478f3bd70' '1f86d92db51c62cded0e6f3833057dee' '1de3266caa49f82bee73ba891eea12cf') diff --git a/community/obconf/PKGBUILD b/community/obconf/PKGBUILD index dfc1442a0..b1c34b3d1 100644 --- a/community/obconf/PKGBUILD +++ b/community/obconf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54341 2011-08-17 07:30:50Z andrea $ +# $Id: PKGBUILD 54809 2011-08-26 11:01:00Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Kieslich <tobias@archlinux.org> @@ -6,18 +6,22 @@ pkgname=obconf pkgver=2.0.3.git20100309 -pkgrel=1 +pkgrel=2 pkgdesc="A GTK2 based configuration tool for the Openbox windowmanager" arch=('i686' 'x86_64') url="http://openbox.org/wiki/ObConf:About" license=('GPL') depends=('openbox' 'gtk2' 'libglade' 'desktop-file-utils' 'libsm') install=${pkgname}.install -source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('d45a1eab18aa25c18280821118368b97') +source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'config-file.patch') +md5sums=('d45a1eab18aa25c18280821118368b97' + '51f5f110f8bc4a89dfb460c3dd4a3be8') build() { cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/config-file.patch + ./bootstrap ./configure --prefix=/usr make diff --git a/community/obconf/config-file.patch b/community/obconf/config-file.patch new file mode 100644 index 000000000..ce7973f3d --- /dev/null +++ b/community/obconf/config-file.patch @@ -0,0 +1,28 @@ +From: Dana Jansens <danakj@orodu.net> +Date: Fri, 5 Aug 2011 16:05:10 +0000 (-0400) +Subject: Load the rc.xml config file given on --config-file the same as Openbox (use the whole ... +X-Git-Url: http://git.openbox.org/?p=dana%2Fobconf.git;a=commitdiff_plain;h=cc7a18807663313ef111d86a75844ded0416a889 + +Load the rc.xml config file given on --config-file the same as Openbox (use the whole path given). +--- + +diff --git a/src/main.c b/src/main.c +index 9035e8d..a576253 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -233,11 +233,10 @@ int main(int argc, char **argv) + } + + xmlIndentTreeOutput = 1; +- if (!obt_xml_load_config_file(parse_i, +- "openbox", +- (obc_config_file ? +- obc_config_file : "rc.xml"), +- "openbox_config")) ++ if (!((obc_config_file && ++ obt_xml_load_file(parse_i, obc_config_file, "openbox_config")) || ++ obt_xml_load_config_file(parse_i, "openbox", "rc.xml", ++ "openbox_config"))) + { + obconf_error(_("Failed to load an rc.xml. You have probably failed to install Openbox properly."), TRUE); + exit_with_error = TRUE; diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index d445e72cf..e6b73c70e 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54346 2011-08-17 07:32:06Z stativ $ +# $Id: PKGBUILD 54803 2011-08-26 10:44:32Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com> # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com> # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz> # Contributor: Archie <mymaud@gmail.com> pkgname=rawtherapee -pkgver=4.0.1 +pkgver=4.0.2 pkgrel=1 pkgdesc="RAW photo editor" arch=('i686' 'x86_64') diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index 4a1f6e1cf..26b7d7617 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 54652 2011-08-22 13:48:57Z ttopper $ +# $Id: PKGBUILD 54833 2011-08-26 19:35:19Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=roxterm pkgver=2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Tabbed, VTE-based terminal emulator" arch=('i686' 'x86_64') url="http://roxterm.sourceforge.net/" license=('GPL3') -depends=('libglade' 'dbus-glib' 'vte' 'hicolor-icon-theme' 'dbus' 'dbus-core' 'glib2') +depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'dbus' 'dbus-core' 'glib2') makedepends=('docbook-xsl' 'xmlto' 'po4a') install=roxterm.install source=(http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.gz) diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index 299b12a65..d1cb2bd19 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 54266 2011-08-16 00:37:12Z giovanni $ +# $Id: PKGBUILD 54816 2011-08-26 15:37:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=sigil -_pkgname=Sigil -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="A WYSIWYG ebook editor" arch=('i686' 'x86_64') @@ -13,14 +12,12 @@ license=('GPL3') depends=('qt') makedepends=('cmake') install=sigil.install -source=(http://${pkgname}.googlecode.com/files/${_pkgname}-${pkgver}-Code.zip +source=(http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip ${pkgname}.desktop) -md5sums=('b36b8178446647f7dd320a6b335a40ba' +md5sums=('b0ae292aea366fe6eb3f3392232ba9a6' 'fef6aa492af487ccccd6b133635cee5a') build() { - cd ${_pkgname}-${pkgver}-Code - mkdir build cd build cmake -G "Unix Makefiles" \ @@ -28,14 +25,13 @@ build() { -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON .. || return 1 + -DCMAKE_SKIP_RPATH=ON .. - make || return 1 + make } package() { - cd ${_pkgname}-${pkgver}-Code/build - + cd build make install DESTDIR="${pkgdir}" install -d -m 0755 "${pkgdir}"/usr/share/applications diff --git a/community/speed-dreams/PKGBUILD b/community/speed-dreams/PKGBUILD index e5c547b4e..3686c44c2 100644 --- a/community/speed-dreams/PKGBUILD +++ b/community/speed-dreams/PKGBUILD @@ -1,43 +1,59 @@ -# $Id: PKGBUILD 39442 2011-02-10 06:52:04Z svenstaro $ +# $Id: PKGBUILD 54835 2011-08-26 20:12:54Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Adrián Chaves Fernández, aka Gallaecio <adriyetichaves@gmail.com> # Contributor: Shahar Weiss <sweiss4@gmx.net> (build() code from his TORCS' PKGBUILD) pkgname=speed-dreams -pkgver=1.4.0 -pkgver2=1.4.0-r2307 # For managing files and directories -pkgrel=3 +pkgver=2.0.0a3 +_pkgver=2.0.0-a3-r3412 +pkgrel=2 pkgdesc="A racing simulator with rich graphics and physics" arch=('i686' 'x86_64') url="http://speed-dreams.sourceforge.net/" license=('GPL2') -depends=('freealut' 'freeglut' 'libpng' 'libxi' 'libxmu' 'libxrandr' 'plib>=1.8.3' 'libjpeg' 'zlib' 'enet' 'speed-dreams-data') -source=("http://sourceforge.net/projects/${pkgname}/files/1.4.0/${pkgname}-${pkgver2}-src.tar.bz2/download" - "${pkgname}.desktop" - "${pkgname}.sh") -md5sums=('92c324c2c47a598dea9278d9a66c5b78' - 'f89654510f1b558054eb17e778f1af7f' - 'dcfd31797bacb6b3e9dc27ddb59d29c3') +depends=('sdl' 'freealut' 'freeglut' 'libpng' 'libxi' 'libxmu' 'libxrandr' 'plib>=1.8.3' 'libjpeg' 'zlib' 'enet' 'speed-dreams-data') +makedepends=('cmake' 'p7zip') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_pkgver}-src.tar.7z" + "${pkgname}.desktop") +md5sums=('659837e8866c59c85279c31fcaba4144' + '6b45e9c40984ebb79a1dfaddbfabde92') build() { - cd "$srcdir/${pkgname}-${pkgver}-src" - - unset LDFLAGS MAKEFLAGS # How can a build system be this broken? + 7z x ${pkgname}-${_pkgver}-src.tar.7z + tar xf ${pkgname}-${_pkgver}-src.tar + + cd "${pkgname}-${_pkgver}-src" + + cmake . \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSD_BINDIR=/usr/bin \ + -DSD_DATADIR=/usr/share/speed-dreams-2 \ + -DSD_LIBDIR=/usr/lib/speed-dreams-2 - ./configure --prefix="/opt/${pkgname}" --x-includes=/usr/include --x-libraries=/usr/lib make } package() { - cd "$srcdir/${pkgname}-${pkgver}-src" + cd "$srcdir/${pkgname}-${_pkgver}-src" - make DESTDIR="${pkgdir}/" install datainstall + make DESTDIR="${pkgdir}/" install + + rm -r "${pkgdir}/usr/share" + + install -Dm644 "data/data/icons/icon.png" "${pkgdir}/usr/share/pixmaps/speed-dreams.png" + install -Dm644 "data/data/icons/icon.svg" "${pkgdir}/usr/share/pixmaps/speed-dreams.svg" + install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/speed-dreams.desktop" + + mkdir -p "${pkgdir}/usr/share/doc/${pkgname}" + cp -r doc "${pkgdir}/usr/share/doc/${pkgname}/" - install -D -m644 "icon.png" "${pkgdir}/usr/share/pixmaps/speed-dreams.png" && \ - install -D -m644 "../${pkgname}.desktop" "${pkgdir}/usr/share/applications/speed-dreams.desktop" && \ - install -D -m755 "../${pkgname}.sh" "${pkgdir}/bin/${pkgname}" + mkdir -p "${pkgdir}/usr/share/man/man6/${pkgname}" + rm doc/man/speed-dreams.es.6 + cp doc/man/* "${pkgdir}/usr/share/man/man6/${pkgname}" - find "${pkgdir}/" -type d -exec chmod 755 {} \; - rm -r $pkgdir/opt/${pkgname}/share + # Symlink for backwards compatibility + cd "${pkgdir}/usr/bin" + ln -s speed-dreams-2 speed-dreams } # vim:set ts=2 sw=2 et: diff --git a/community/speed-dreams/speed-dreams.desktop b/community/speed-dreams/speed-dreams.desktop index fa39ed1e5..f04b71791 100644 --- a/community/speed-dreams/speed-dreams.desktop +++ b/community/speed-dreams/speed-dreams.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Name=Speed Dreams Comment=The Open Racing Car Simulator Fork -Exec=/opt/speed-dreams/bin/speed-dreams -Icon=speed-dreams.png +Exec=speed-dreams-2 +Icon=speed-dreams.svg Terminal=false Type=Application Encoding=UTF-8 diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD index 98f8bc5cc..0a988e352 100644 --- a/community/ushare/PKGBUILD +++ b/community/ushare/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 51319 2011-07-07 10:51:58Z spupykin $ +# $Id: PKGBUILD 54798 2011-08-26 08:53:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: kastor <kastor@fobos.org.ar> pkgname=ushare pkgver=1.1a -pkgrel=14 +pkgrel=15 pkgdesc="A free UPnP A/V Media Server for Linux" url="http://ushare.geexbox.org" license=('GPL2') diff --git a/community/ushare/ushare.install b/community/ushare/ushare.install index ee677c849..c58209616 100644 --- a/community/ushare/ushare.install +++ b/community/ushare/ushare.install @@ -1,9 +1,9 @@ post_install() { if [ -z "`grep '^ushare:' /etc/group`" ]; then - groupadd ushare + groupadd -r ushare fi if [ -z "`grep '^ushare:' /etc/passwd`" ]; then - useradd -d /var/empty -g ushare -s /sbin/nologin ushare + useradd -r -d /var/empty -g ushare -s /sbin/nologin ushare fi } diff --git a/core/cloog/PKGBUILD b/core/cloog/PKGBUILD index 3542e0f0d..b61a7a95c 100644 --- a/core/cloog/PKGBUILD +++ b/core/cloog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135904 2011-08-20 07:13:54Z allan $ +# $Id: PKGBUILD 136343 2011-08-26 22:10:53Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=cloog -pkgver=0.16.2 -pkgrel=2 +pkgver=0.16.3 +pkgrel=1 pkgdesc="Library that generates loops for scanning polyhedra" arch=('i686' 'x86_64') url="http://www.bastoul.net/cloog/" @@ -12,7 +12,7 @@ depends=('isl' 'gmp') conflicts=('cloog-ppl<0.15.10-2') options=('!libtool') source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz) -md5sums=('83877caaa879c7160063138bb18348e7') +md5sums=('a0f8a241cd1c4f103f8d2c91642b3498') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index a5ac9be2b..a01df3b5b 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135922 2011-08-20 07:14:22Z allan $ +# $Id: PKGBUILD 136345 2011-08-26 22:10:56Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,9 +6,9 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') pkgver=4.6.1 -pkgrel=3 -#_snapshot=4.6-20110603 -_libstdcppmanver=20110201 # Note: check source directory name when updating this +pkgrel=4 +_snapshot=4.6-20110819 +_libstdcppmanver=20110814 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -16,13 +16,13 @@ url="http://gcc.gnu.org" makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada') checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-hash-style-both.patch) -md5sums=('c57a9170c677bf795bdc04ed796ca491' - '1e9fd2eaf0ee47ea64e82c48998f1999' +md5sums=('b14d22730f9085eab7fd927039e68d28' + 'ce920d2550ff7e042b9f091d27764d8f' '4030ee1c08dd1e843c0225b772360e76' '4df25b623799b148a0703eaeec8fdf3f') @@ -63,17 +63,9 @@ build() { --with-ppl --enable-cloog-backend=isl \ --enable-lto --enable-gold --enable-ld=default \ --enable-plugin --with-plugin-ld=ld.gold \ - --disable-multilib --disable-libstdcxx-pch \ + --disable-multilib --disable-libssp --disable-libstdcxx-pch \ --enable-checking=release make - - # rebuild libssp without -fstack-protector and -D_FORTIFY_SOURCE=2 - # adjusting Makefile.in prior to build still results in these leaking through (yay libtool...) - cd $CHOST/libssp - sed -i -e "s#-fstack-protector#-fno-stack-protector#" \ - -e "s#-D_FORTIFY_SOURCE=2#-U_FORTIFY_SOURCE#" Makefile - make clean - make } check() { @@ -97,7 +89,7 @@ package_gcc-libs() cd gcc-build make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do + for lib in libmudflap libgomp libstdc++-v3/src; do make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES done make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD index c6912f4fc..fc65267df 100644 --- a/core/isl/PKGBUILD +++ b/core/isl/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 135908 2011-08-20 07:13:59Z allan $ +# $Id: PKGBUILD 136341 2011-08-26 22:10:51Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=isl -pkgver=0.06 -pkgrel=2 +pkgver=0.07 +pkgrel=1 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" arch=('i686' 'x86_64') url="http://www.kotnet.org/~skimo/isl/" license=('LGPL2.1') options=('!libtool') source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) -md5sums=('504f054eaffdd8d07c497ebe3ebc7e04') +md5sums=('0d1a38db9f1c7d526758092b985827ea') build() { cd "$srcdir/$pkgname-$pkgver" @@ -29,5 +29,5 @@ package() { # this seems a better place for this file... install -dm755 $pkgdir/usr/share/gdb/auto-load/ - mv $pkgdir/usr/{lib,share/gdb/auto-load}/libisl.so.6.0.0-gdb.py + mv $pkgdir/usr/{lib,share/gdb/auto-load}/libisl.so.7.0.0-gdb.py } diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 812aeeaa0..b298f17e3 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 128481 2011-06-24 03:51:45Z bisson $ +# $Id: PKGBUILD 136347 2011-08-26 22:11:46Z allan $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.30 -pkgrel=4 +pkgrel=5 pkgdesc='A multicast/unicast DNS-SD framework' arch=('i686' 'x86_64') url='http://www.avahi.org/' diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index f1663ceb2..889033fb9 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,40 +1,43 @@ -# $Id: PKGBUILD 111081 2011-02-23 22:48:06Z paul $ -# Maintainer: Paul Mattal <paul@archlinux.org> +# $Id: PKGBUILD 136349 2011-08-27 02:25:00Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=dnsmasq -pkgver=2.57 +pkgver=2.58 pkgrel=1 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" arch=('i686' 'x86_64') license=('GPL') -depends=('glibc' 'bash') +depends=('glibc' 'bash' 'dbus-core') makedepends=('libcap>=2.16') backup=('etc/dnsmasq.conf') install= source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" 'rc.dnsmasq') -md5sums=('d10faeb409717eae94718d7716ca63a4' 'e956eee1ec24212a3254d2b168187495') +md5sums=('14c5c81debb324adc261db971730f4c6' + 'e956eee1ec24212a3254d2b168187495') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" - # Build - make || return 1 + # link against dbus + echo '#define HAVE_DBUS' >> src/config.h - # Install - install -d $pkgdir/etc/rc.d || return 1 - make PREFIX=/usr DESTDIR=$pkgdir install || return 1 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" - install -D -m755 \ - $srcdir/rc.dnsmasq $pkgdir/etc/rc.d/dnsmasq || return 1 - install -D -m644 \ - dnsmasq.conf.example $pkgdir/etc/dnsmasq.conf || return 1 + make PREFIX=/usr DESTDIR="$pkgdir" install - # Make the Required Directories for DHCP Server Default Directories - install -d $pkgdir/var/db || return 1 - install -d $pkgdir/var/lib/misc || return 1 + install -dm755 "$pkgdir"/var/{db,lib/misc} + install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.d/dnsmasq + install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf + install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf + install -Dm644 "contrib/systemd/dnsmasq.service" "$pkgdir"/lib/systemd/system/dnsmasq.service } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/kdeedu-marble/gpsd3.patch b/extra/kdeedu-marble/gpsd3.patch new file mode 100644 index 000000000..e11859b0b --- /dev/null +++ b/extra/kdeedu-marble/gpsd3.patch @@ -0,0 +1,42 @@ +diff -up marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp +--- marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig 2011-05-20 15:34:41.000000000 -0500 ++++ marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp 2011-08-24 13:38:37.050200241 -0500 +@@ -20,6 +20,9 @@ using namespace Marble; + + GpsdConnection::GpsdConnection( QObject* parent ) + : QObject( parent ), ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) ++ m_gpsd("localhost", DEFAULT_GPSD_PORT), ++#endif + m_timer( 0 ) + { + m_oldLocale = setlocale( LC_NUMERIC, NULL ); +@@ -35,7 +38,11 @@ GpsdConnection::~GpsdConnection() + void GpsdConnection::initialize() + { + m_timer.stop(); ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) ++ gps_data_t* data; ++#else + gps_data_t* data = m_gpsd.open(); ++#endif + if ( data ) { + m_status = PositionProviderStatusAcquiring; + emit statusChanged( m_status ); +@@ -82,8 +89,16 @@ void GpsdConnection::initialize() + void GpsdConnection::update() + { + #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET ) ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) ++ if ( m_gpsd.waiting(0) ) { ++#else + if ( m_gpsd.waiting() ) { ++#endif ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) ++ gps_data_t* data = m_gpsd.read(); ++#else + gps_data_t* data = m_gpsd.poll(); ++#endif + if ( data && data->set & PACKET_SET ) { + emit gpsdInfo( *data ); + } diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD index 533c343aa..e8e5ccdb1 100644 --- a/extra/kexec-tools/PKGBUILD +++ b/extra/kexec-tools/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 110362 2011-02-19 03:39:03Z allan $ +# $Id: PKGBUILD 136323 2011-08-26 10:46:24Z tpowa $ # Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kexec-tools pkgver=2.0.2 -pkgrel=3 +pkgrel=4 pkgdesc="Load another kernel from the currently executing Linux kernel" arch=('i686' 'x86_64') url="http://kernel.org/pub/linux/utils/kernel/kexec/" source=("http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-${pkgver}.tar.bz2" - 'kexec' 'kexec.conf.d') + 'kexec-tools-2.0.0-purgatory-makefile.patch' + 'kexec' + 'kexec.conf.d') depends=('gawk') makedepends=('zlib' 'xz') backup=('etc/conf.d/kexec') license=('GPL2') md5sums=('35d05fed1c97008ac34c5bfb929295eb' - '15599234f174ddc4d2611f32effec6ab' - 'b9ddfb9fbcc7e4e7e7294fe94fa60aeb') + 'b96f47c29757fcadfbc50ea6ea22f839' + 'be059a103e5989519d22fca99f860a64' + '9ca7e31d2c5c66c436a9a2baf20ad9b2') build() { cd $srcdir/$pkgname-$pkgver export LDFLAGS+=" -static" + patch -Np1 -i ../kexec-tools-2.0.0-purgatory-makefile.patch ./configure --prefix=/usr make } diff --git a/extra/kexec-tools/kexec b/extra/kexec-tools/kexec index bef5b5ef3..c2e9a78a8 100755 --- a/extra/kexec-tools/kexec +++ b/extra/kexec-tools/kexec @@ -7,19 +7,19 @@ case "$1" in start) - stat_busy "Enabled loading kernel for Kexec into running kernel on reboot" + stat_busy "Enabling kexec on reboot" add_daemon kexec stat_done ;; stop|load) if [ "$RUNLEVEL" = "6" -o "$1" = "load" ]; then - stat_busy "Loading kernel for Kexec into running kernel" + stat_busy "Loading kexec kernel" [ -f "$KPATH" ] || stat_fail [ -f "$INITRD" ] && _INITRD="--initrd=$INITRD" /sbin/kexec -l $KPATH --append="root=$ROOTPART $KPARAM" $_INITRD > /dev/null 2>&1 else - stat_busy "Skipping loading kernel for Kexec into running kernel" + stat_busy "Disabling kexec on reboot" fi if [ $? -eq 0 ] ; then rm_daemon kexec @@ -30,7 +30,7 @@ case "$1" in ;; unload) - stat_busy "Unloading Kexec kernel from running kernel" + stat_busy "Unloading kexec kernel" /sbin/kexec -u if [ $? -eq 0 ] ; then stat_done diff --git a/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch b/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch new file mode 100644 index 000000000..0c029c8f4 --- /dev/null +++ b/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch @@ -0,0 +1,20 @@ +diff -up kexec-tools-2.0.0/purgatory/Makefile.orig kexec-tools-2.0.0/purgatory/Makefile +--- kexec-tools-2.0.0/purgatory/Makefile.orig 2011-03-10 11:39:22.100799291 -0500 ++++ kexec-tools-2.0.0/purgatory/Makefile 2011-03-10 11:39:36.422736886 -0500 +@@ -55,14 +55,14 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATO + -I$(srcdir)/util_lib/include \ + -I$(shell $(CC) -print-file-name=include) + $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ +- --no-undefined -nostartfiles -nostdlib -nodefaultlibs \ ++ -nostartfiles -nostdlib -nodefaultlibs \ + -e purgatory_start -r + + $(PURGATORY): $(PURGATORY_OBJS) + $(MKDIR) -p $(@D) + $(CC) $(LDFLAGS) -o $@ $^ + +-# $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB) ++# $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB) + + echo:: + @echo "PURGATORY_SRCS $(PURGATORY_SRCS)" diff --git a/extra/kexec-tools/kexec.conf.d b/extra/kexec-tools/kexec.conf.d index 17b10d228..991a7a27d 100644 --- a/extra/kexec-tools/kexec.conf.d +++ b/extra/kexec-tools/kexec.conf.d @@ -3,7 +3,7 @@ # # Path to kernel, default to stock arch kernel -KPATH="/boot/vmlinuz26" +KPATH="/boot/vmlinuz-linux" # Root partition # The default attempts to autodetect @@ -13,4 +13,4 @@ ROOTPART="$(awk '/^[ \t]*[^#]/ { if ($2 == "/") { print $1; }}' /etc/fstab)" KPARAM="ro" # Path to initrd image, default to stock arch kernel -INITRD="/boot/kernel26.img" +INITRD="/boot/initramfs-linux.img" diff --git a/extra/pinentry/PKGBUILD b/extra/pinentry/PKGBUILD index 71baf5bdc..6aecd3c33 100644 --- a/extra/pinentry/PKGBUILD +++ b/extra/pinentry/PKGBUILD @@ -1,17 +1,15 @@ -# $Id: PKGBUILD 131244 2011-07-12 07:40:08Z tpowa $ +# $Id: PKGBUILD 136330 2011-08-26 13:04:19Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pinentry pkgver=0.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnupg.org/aegypten2" depends=('ncurses' 'libcap>=2.16') -makedepends=('gtk' 'qt3' 'gtk2' 'qt') -optdepends=('gtk: for gtk backend' - 'gtk2: for gtk2 backend' - 'qt3: for qt3 backend' +makedepends=('gtk2' 'qt') +optdepends=('gtk2: for gtk2 backend' 'qt: for qt4 backend') source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz gtk2-pinentry-segfault.patch) @@ -19,22 +17,21 @@ install=pinentry.install build() { cd $startdir/src/$pkgname-$pkgver - [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh for file in qt4/*.moc; do /usr/bin/moc ${file/.moc/.h} > ${file} done ./configure --prefix=/usr \ --enable-pinentry-curses \ - --enable-pinentry-gtk \ + --disable-pinentry-gtk \ + --disable-pinentry-qt \ --enable-pinentry-gtk2 \ - --enable-pinentry-qt \ --enable-pinentry-qt4 \ --enable-fallback-curses make make DESTDIR=${pkgdir} install - rm ${pkgdir}/usr/share/info/dir - rm ${pkgdir}/usr/bin/pinentry - ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry + #rm ${pkgdir}/usr/share/info/dir + #rm ${pkgdir}/usr/bin/pinentry + #ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry } md5sums=('81f99904daee5331eb6738408bb024b6' 'bd9888fafc56464b2c4deaad5b8edb07') diff --git a/extra/progsreiserfs/PKGBUILD b/extra/progsreiserfs/PKGBUILD index 38ad5c1fc..7d4cb1baa 100644 --- a/extra/progsreiserfs/PKGBUILD +++ b/extra/progsreiserfs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 107514 2011-01-26 12:57:49Z tpowa $ +# $Id: PKGBUILD 136335 2011-08-26 15:07:16Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=progsreiserfs pkgver=0.3.0.5 -pkgrel=6 +pkgrel=7 pkgdesc="library for accessing and manipulating reiserfs partitions" arch=(i686 x86_64) url="http://www.namesys.com" @@ -12,11 +12,13 @@ depends=('e2fsprogs') options=('!libtool') source=(#ftp://ftp.namesys.com/pub/libreiserfs/${pkgname}-${pkgver}.tar.gz ftp://ftp.archlinux.org/other/progsreiserfs/${pkgname}-${pkgver}.tar.gz + fix-underquoted-definition.patch ) md5sums=('d822579bbd4a29a1be5e4490869d9bee') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -Np0 -i ../fix-underquoted-definition.patch ./configure --prefix=/usr --mandir=/usr/share/man make } @@ -28,3 +30,5 @@ package() { rm -r ${pkgdir}/usr/sbin rm -r ${pkgdir}/usr/share/man/ } +md5sums=('d822579bbd4a29a1be5e4490869d9bee' + '4c47c1f136d01f60cb73f84116edbcc2') diff --git a/extra/progsreiserfs/fix-underquoted-definition.patch b/extra/progsreiserfs/fix-underquoted-definition.patch new file mode 100644 index 000000000..7d8eb7c0c --- /dev/null +++ b/extra/progsreiserfs/fix-underquoted-definition.patch @@ -0,0 +1,11 @@ +--- progsreiserfs.m4~ 2011-08-26 17:02:36.263433559 +0200 ++++ progsreiserfs.m4 2011-08-26 17:02:36.263433559 +0200 +@@ -10,7 +10,7 @@ + dnl Adds the required libraries to $REISERFS_LIBS and does an + dnl AC_SUBST(REISERFS_LIBS) + +-AC_DEFUN(AC_CHECK_LIBREISERFS, ++AC_DEFUN([AC_CHECK_LIBREISERFS], + [ + + dnl save LIBS diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 15c90887a..26af8f5e3 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135597 2011-08-16 14:39:28Z tpowa $ +# $Id: PKGBUILD 136328 2011-08-26 12:41:22Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba @@ -8,11 +8,12 @@ pkgver=3.6.0 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=3.6.0 -pkgrel=1 +pkgrel=4 arch=(i686 x86_64) url="http://www.samba.org" license=('GPL3') -makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb') +makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' +'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb' 'python2') options=(!makeflags) source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz samba samba.logrotate @@ -24,27 +25,36 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz build() { cd ${srcdir}/${pkgbase}-${_realver}/source3 - ./configure --prefix=/usr \ + sed -i "s/env python/env python2/g" ../buildtools/bin/waf + ./autogen-waf.sh + # everything needs to be specified :/ + ../buildtools/bin/waf configure --prefix=/usr \ + --with-privatedir=/etc/samba/private \ --libdir=/usr/lib/ \ + --with-modulesdir=/usr/lib/samba \ + --with-swatdir=/usr/share/samba/swat \ --localstatedir=/var \ --with-configdir=/etc/samba \ --with-lockdir=/var/cache/samba \ + --with-cachedir=/var/cache/samba \ + --with-statedir=/var/cache/samba \ --with-piddir=/var/run/samba \ - --with-fhs \ + --with-logfilebase=/var/log/samba \ + --sysconfdir=/etc \ --with-pam \ --with-pam_smbpass \ --with-pammodulesdir=/lib/security \ --with-ads \ --with-acl-support \ - --with-cifsmount \ - --with-libsmbclient \ --with-syslog \ - --enable-external-libtalloc \ - --disable-dnssd \ --disable-avahi \ - --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \ - --enable-external-libtdb - make + --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \ + --disable-rpath \ + --disable-rpath-private-install \ + --disable-rpath-install + #fix the shitty build system! + sed -i -e 's#/etc/smb.conf#/etc/samba/smb.conf#g' bin/default/source3/include/config.h + ../buildtools/bin/waf build ${MAKEFLAGS} } package_smbclient () { @@ -53,9 +63,23 @@ depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprog cd ${srcdir}/${pkgbase}-${_realver}/source3 mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/ - for i in libnetapi* libwbclient* libsmbclient*;do - cp -a bin/${i}*.so* ${pkgdir}/usr/lib/ + for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so libtdb-wrap.so libaddns.so libcliauth.so libwinbind-client.so; do + install -m644 -D bin/shared/private/$i ${pkgdir}/usr/lib/$i done + for i in libsmbconf libnetapi libwbclient libsmbclient; do + install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0 + ln -sf /usr/lib/$i.so.0 ${pkgdir}/usr/lib/$i.so + done + mkdir ${pkgdir}/usr/lib/libsmb + ln -sf /usr/lib/libsmb/libsmbclient.so.0 ${pkgdir}/usr/lib/libsmb/libsmbclient.so.0 + ln -sf /usr/lib/libsmb/libsmbclient.so.0 ${pkgdir}/usr/lib/libsmb/libsmbclient.so + for i in libndr-krb5pac libndr-standard libndr; do + install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0.0.1 + ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so.0 + ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so + done + install -m644 -D bin/shared/private/libtevent.so.0 ${pkgdir}/usr/lib/libtevent.so.0.9.11 + ln -sf /usr/lib/libtevent.so.0.9.11 ${pkgdir}/usr/lib/libtevent.so.0 install -m755 script/smbtar ${pkgdir}/usr/bin/ mkdir -p ${pkgdir}/usr/lib/cups/backend ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb @@ -77,37 +101,37 @@ backup=(etc/logrotate.d/samba etc/samba/smb.conf etc/xinetd.d/swat etc/conf.d/samba) -depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc') +depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc') +optdepends=('python2: for python bindings') cd ${srcdir}/samba-${_realver}/source3 mkdir -p ${pkgdir}/etc/samba/private chmod 700 ${pkgdir}/etc/samba/private - make DESTDIR=${pkgdir} install + ../buildtools/bin/waf install --destdir=${pkgdir} chmod 644 ${pkgdir}/usr/include/*.h rm -rf ${pkgdir}/usr/var - (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh) - install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba - install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba + install -D -m755 ${startdir}/samba ${pkgdir}/etc/rc.d/samba + install -D -m644 ${startdir}/samba.conf.d ${pkgdir}/etc/conf.d/samba mkdir -p ${pkgdir}/etc/samba cat ../examples/smb.conf.default | \ sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default - install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba - install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat - install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba + install -D -m644 ${startdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba + install -D -m644 ${startdir}/swat.xinetd ${pkgdir}/etc/xinetd.d/swat + install -D -m644 ${startdir}/samba.pam ${pkgdir}/etc/pam.d/samba # spool directory install -d -m1777 ${pkgdir}/var/spool/samba sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default # fix logrotate sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default - # nsswitch libraries - install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so - ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2 - install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so # remove conflict files of smbclient for man in libsmbclient smbspool \ mount.cifs net cifs.upcall; do rm -f ${pkgdir}/usr/share/man/man8/${man}.8 done - for i in libnetapi* libwbclient* libsmbclient*;do + for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so libtdb-wrap.so libaddns.so libcliauth.so libtevent.so.0.9.11 libtevent.so.0 libwinbind-client.so; do + rm -f ${pkgdir}/usr/lib/samba/$i + done + mv ${pkgdir}/usr/lib/samba/*.so ${pkgdir}/usr/lib + for i in libndr-krb5pac.* libsmbconf.* libndr-standard.* libndr.* libnetapi.* libwbclient.* libsmbclient.*; do rm -f ${pkgdir}/usr/lib/$i done for bin in net \ @@ -115,6 +139,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr smbcquotas smbget smbspool smbtar smbtree; do rm -f ${pkgdir}/usr/bin/$bin done + rm -r ${pkgdir}/usr/lib/libsmb rm -f ${pkgdir}/usr/sbin/cifs.upcall rm -f ${pkgdir}/usr/include/netapi.h for man in rpcclient smbcacls smbclient smbcquotas \ @@ -129,10 +154,10 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('e297e0ea7923c7de8d7c1d8fd0ec0a05' - 'a3da19515a234c703876cf850c44e996' - '5697da77590ec092cc8a883bae06093c' - 'a4bbfa39fee95bba2e7ad6b535fae7e6' - '96f82c38f3f540b53f3e5144900acf17' - 'f2f2e348acd1ccb566e95fa8a561b828' - 'c6a38a8c8fa24979e6217aed533358ea') +md5sums=(e297e0ea7923c7de8d7c1d8fd0ec0a05 + a3da19515a234c703876cf850c44e996 + 5697da77590ec092cc8a883bae06093c + a4bbfa39fee95bba2e7ad6b535fae7e6 + 96f82c38f3f540b53f3e5144900acf17 + f2f2e348acd1ccb566e95fa8a561b828 + c6a38a8c8fa24979e6217aed533358ea) diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD index 2175233cf..68017ee1a 100644 --- a/extra/udisks/PKGBUILD +++ b/extra/udisks/PKGBUILD @@ -1,24 +1,21 @@ -# $Id: PKGBUILD 133589 2011-07-29 19:10:42Z giovanni $ +# $Id: PKGBUILD 136339 2011-08-26 17:03:08Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=udisks -pkgver=1.0.3 -pkgrel=6 +pkgver=1.0.4 +pkgrel=1 pkgdesc="Disk Management Service" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/udisks" license=('GPL') -depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'lvm2' 'eject') -makedepends=('intltool' 'docbook-xsl' 'gtk-doc') +depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject') +makedepends=('intltool' 'docbook-xsl') options=(!libtool) -source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz - 01-mkfs-tempdir.patch) -sha256sums=('d95bceb52a70c727291b934c4c05774899a0074927c8138a219b81a784de8a4b' - '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c') +source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) +sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/01-mkfs-tempdir.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/udisks --disable-static #fix location for bash_completion helper @@ -30,6 +27,4 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}/var/run" } diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD index 5071a49b7..7f2b02f87 100644 --- a/multilib/gcc-multilib/PKGBUILD +++ b/multilib/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54542 2011-08-20 07:14:14Z allan $ +# $Id: PKGBUILD 54869 2011-08-26 22:10:40Z allan $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -8,9 +8,9 @@ pkgbase='gcc-multilib' pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') pkgver=4.6.1 -pkgrel=3 -#_snapshot=4.6-20110603 -_libstdcppmanver=20110201 # Note: check source directory name when updating this +pkgrel=4 +_snapshot=4.6-20110819 +_libstdcppmanver=20110814 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -19,13 +19,13 @@ makedepends=('binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multili 'lib32-glibc>=2.14') checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-hash-style-both.patch) -md5sums=('c57a9170c677bf795bdc04ed796ca491' - '1e9fd2eaf0ee47ea64e82c48998f1999' +md5sums=('b14d22730f9085eab7fd927039e68d28' + 'ce920d2550ff7e042b9f091d27764d8f' '22cec272f9cc2801d3cd348feaca888b' '4df25b623799b148a0703eaeec8fdf3f') @@ -64,24 +64,9 @@ build() { --with-ppl --enable-cloog-backend=isl \ --enable-lto --enable-gold --enable-ld=default \ --enable-plugin --with-plugin-ld=ld.gold \ - --enable-multilib --disable-libstdcxx-pch \ + --enable-multilib --disable-libssp --disable-libstdcxx-pch \ --enable-checking=release make - - # rebuild libssp without -fstack-protector and -D_FORTIFY_SOURCE=2 - # adjusting Makefile.in prior to build still results in these leaking through (yay libtool...) - cd $CHOST/libssp - sed -i -e "s#-fstack-protector#-fno-stack-protector#" \ - -e "s#-D_FORTIFY_SOURCE=2#-U_FORTIFY_SOURCE#" Makefile - make clean - make - - # rebuild 32-bit libssp - cd ../32/libssp - sed -i -e "s#-fstack-protector#-fno-stack-protector#" \ - -e "s#-D_FORTIFY_SOURCE=2#-U_FORTIFY_SOURCE#" Makefile - make clean - make } check() { @@ -106,7 +91,7 @@ package_gcc-libs-multilib() cd gcc-build make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do + for lib in libmudflap libgomp libstdc++-v3/src; do make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES done make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install @@ -137,7 +122,7 @@ package_lib32-gcc-libs() cd gcc-build make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do + for lib in libmudflap libgomp libstdc++-v3/src; do make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES done diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index 0c98b6962..023e8b0a9 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 53566 2011-08-05 19:08:11Z bluewind $ +# $Id: PKGBUILD 54822 2011-08-26 18:44:09Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine -pkgver=1.3.26 +pkgver=1.3.27 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('92ea09eb11aec92672671853ce9b792b') +md5sums=('d717ecec6959d8cab194c61c29c3dcdf') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" diff --git a/multilib/wine_gecko/PKGBUILD b/multilib/wine_gecko/PKGBUILD index 30b412492..dba21f215 100644 --- a/multilib/wine_gecko/PKGBUILD +++ b/multilib/wine_gecko/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 42670 2011-03-19 08:38:12Z heftig $ +# $Id: PKGBUILD 54881 2011-08-27 02:39:49Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Nicky726 (Nicky726 <at> gmail <dot> com) # Contributor: Allan McRae (allan <at> archlinux <dot> org) # Contributor: Alexander 'bas' Brovikov (bas <at> it-core <dot> org) pkgname=wine_gecko -pkgver=1.2.0 +pkgver=1.3 pkgrel=1 pkgdesc="Wine's built-in replacement for Microsoft's Internet Explorer" arch=(i686 x86_64) @@ -13,8 +13,8 @@ url="http://wiki.winehq.org/Gecko" license=(MPL) depends=('wine>=1.3.16') source=(http://downloads.sourceforge.net/project/wine/Wine%20Gecko/$pkgver/$pkgname-$pkgver-x86{,_64}.msi) -md5sums=('f2ed548494c86c511892b1c02491c8c4' - '26489d8d1dfa34b5783b3e567edcaa9f') +md5sums=('9e21684bb68d016b837744d53abb2fde' + '49a1155adca77cda4321e4fd40062373') if [[ $CARCH == i686 ]]; then # Strip x86_64 msi diff --git a/testing/lzo2/PKGBUILD b/testing/lzo2/PKGBUILD new file mode 100644 index 000000000..2bec2cfa8 --- /dev/null +++ b/testing/lzo2/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 136326 2011-08-26 12:38:07Z tpowa $ +# Contributor: Low Kian Seong <fastmail_low@speedymail.org> +# Maintainer: dorphell <dorphell@archlinux.org> +pkgname=lzo2 +pkgver=2.06 +pkgrel=1 +pkgdesc="Portable lossless data compression library" +arch=('i686' 'x86_64') +url="http://www.oberhumer.com/opensource/lzo" +license=('GPL') +depends=('glibc') +source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz) +options=(!libtool) +md5sums=('95380bd4081f85ef08c5209f4107e9f8') + +build() { + cd "${srcdir}/lzo-${pkgver}" + + ./configure --prefix=/usr --enable-shared + make + + # build minilzo + gcc $CFLAGS -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c + gcc -g -shared -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o +} + +package() { + cd "${srcdir}/lzo-${pkgver}" + make DESTDIR=${pkgdir} install + + # install minilzo + install -m 755 libminilzo.so.0 ${pkgdir}/usr/lib + install -p -m 644 minilzo/minilzo.h ${pkgdir}/usr/include/lzo + cd ${pkgdir}/usr/lib + ln -s libminilzo.so.0 libminilzo.so +} diff --git a/testing/nfs-utils/PKGBUILD b/testing/nfs-utils/PKGBUILD new file mode 100644 index 000000000..4d09d8be0 --- /dev/null +++ b/testing/nfs-utils/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 136332 2011-08-26 14:46:35Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> +# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> +# Contributor: abelstr <abel@pinklf.eu> +# Contributor: Marco Lima <cipparello gmail com> + +pkgname=nfs-utils +pkgver=1.2.4 +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' '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 + nfs-common.conf + nfs-server + nfs-server.conf + exports + idmapd.conf + start-statd.patch + nfs-utils-1.1.4-mtab-sym.patch + nfs-utils-1.1.4-no-exec.patch + kernel-3.0-segfault.patch) +install=nfs-utils.install +md5sums=('938dc0574f3eb9891a8ed4746f806277' + 'dd0d65fc6e8f422fa12520813098264b' + 'f73f197a16b02c3e248488ec35c4cf43' + 'e619f18354ff958ed624d05d08853d8f' + '2bf71def3263325643a09458635520f0' + 'ff585faf410a62c4333a027c50b56bae' + 'eb4f4027fab6fc1201f1ca04f5954c76' + 'e24f81a8c8657672e262c61235d34b4a' + '7674106eaaa4c149bccd4f05fe3604e9' + '4f4827dfc93008dfadd0a530ad0872b2' + 'ab92e67f3d0ee2935faab9cdabef8003') + +build() { + cd $srcdir/${pkgname}-${pkgver} + patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch + #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch + patch -Np1 -i ../kernel-3.0-segfault.patch + # arch specific patch + patch -Np0 -i $srcdir/start-statd.patch + + ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \ + --without-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc + + make +} + +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 + # Configuration + install -D -m 644 ../exports "$pkgdir/"etc/exports + install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf + install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf + install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf + # directories + mkdir "$pkgdir/"etc/exports.d + mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs + mkdir "$pkgdir/"var/lib/nfs/v4recovery +} diff --git a/testing/nfs-utils/exports b/testing/nfs-utils/exports new file mode 100644 index 000000000..8f4aac598 --- /dev/null +++ b/testing/nfs-utils/exports @@ -0,0 +1,15 @@ +# /etc/exports +# +# List of directories exported to NFS clients. See exports(5). +# Use exportfs -arv to reread. +# +# Example for NFSv2 and NFSv3: +# /srv/home hostname1(rw,sync) hostname2(ro,sync) +# +# Example for NFSv4: +# /srv/nfs4 hostname1(rw,sync,fsid=0) +# /srv/nfs4/home hostname1(rw,sync,nohide) +# Using Kerberos and integrity checking: +# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt) +# /srv/nfs4/home gss/krb5i(rw,sync,nohide) +# diff --git a/testing/nfs-utils/idmapd.conf b/testing/nfs-utils/idmapd.conf new file mode 100644 index 000000000..b1b23afe9 --- /dev/null +++ b/testing/nfs-utils/idmapd.conf @@ -0,0 +1,14 @@ +[General] + +Verbosity = 0 +Pipefs-Directory = /var/lib/nfs/rpc_pipefs +Domain = localdomain + +[Mapping] + +Nobody-User = nobody +Nobody-Group = nobody + +[Translation] + +Method = nsswitch diff --git a/testing/nfs-utils/kernel-3.0-segfault.patch b/testing/nfs-utils/kernel-3.0-segfault.patch new file mode 100644 index 000000000..3dba94a05 --- /dev/null +++ b/testing/nfs-utils/kernel-3.0-segfault.patch @@ -0,0 +1,53 @@ +mount.nfs segfaults if kernel version number does not contain +at least 3 components delimited with a dot. + +Avoid this by matching up to three unsigned integers inialised +to zero, separated by dots. + +A version that does not start with an integer is probably a future +version where the versioning evolved to another scheme. +Return UINT_MAX which is guaranteed to be higher than existing +versions. This would also make it possible to easily identify +versions that do not start with an integer. + +Signed-off-by: Luk Claes <luk@...> +--- + utils/mount/version.h | 16 +++++++++------- + 1 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/utils/mount/version.h b/utils/mount/version.h +index af61a6f..531cf68 100644 +--- a/utils/mount/version.h ++++ b/utils/mount/version.h +@@ -23,8 +23,8 @@ + #ifndef _NFS_UTILS_MOUNT_VERSION_H + #define _NFS_UTILS_MOUNT_VERSION_H + +-#include <stdlib.h> +-#include <string.h> ++#include <stdio.h> ++#include <limits.h> + + #include <sys/utsname.h> + +@@ -37,14 +37,16 @@ static inline unsigned int MAKE_VERSION(unsigned int p, unsigned int q, + static inline unsigned int linux_version_code(void) + { + struct utsname my_utsname; +- unsigned int p, q, r; ++ unsigned int p, q = 0, r = 0; + ++ /* UINT_MAX as backward compatibility code should not be run */ + if (uname(&my_utsname)) +- return 0; ++ return UINT_MAX; + +- p = (unsigned int)atoi(strtok(my_utsname.release, ".")); +- q = (unsigned int)atoi(strtok(NULL, ".")); +- r = (unsigned int)atoi(strtok(NULL, ".")); ++ /* UINT_MAX as future versions might not start with an integer */ ++ if (sscanf(my_utsname.release, "%u.%u.%u", &p, &q, &r) < 1) ++ return UINT_MAX; ++ + return MAKE_VERSION(p, q, r); + } diff --git a/testing/nfs-utils/nfs-common b/testing/nfs-utils/nfs-common new file mode 100644 index 000000000..7b16b4b3c --- /dev/null +++ b/testing/nfs-utils/nfs-common @@ -0,0 +1,315 @@ +#!/bin/bash + +daemon_name=nfs-common + +NEED_STATD= +STATD_OPTS= +NEED_IDMAPD= +IDMAPD_OPTS= +NEED_GSSD= +GSSD_OPTS= +PIPEFS_MOUNTPOINT= +PIPEFS_MOUNTOPTS= + +# rpc.statd daemon & binary location +STATD_DAEMON_NAME=rpc.statd +STATD="/usr/sbin/rpc.statd" + +# rpc.idmapd daemon & binary location +IDMAPD_DAEMON_NAME=rpc.idmapd +IDMAPD="/usr/sbin/rpc.idmapd" + +# rpc.gssd daemon & binary location +GSSD_DAEMON_NAME=rpc.gssd +GSSD="/usr/sbin/rpc.gssd" + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/$daemon_name.conf + +# Default mountpoint and options for rpc_pipefs filesystem +[ -z "$PIPEFS_MOUNTPOINT" ] && PIPEFS_MOUNTPOINT="/var/lib/nfs/rpc_pipefs" +[ -z "$PIPEFS_MOUNTOPTS" ] && PIPEFS_MOUNTOPTS="defaults" + +# Parse the fstab file, and determine whether we need idmapd and gssd. (The +# /etc/conf.d/nfs-common settings, if any, will override our autodetection.) +AUTO_NEED_IDMAPD=no +AUTO_NEED_GSSD=no + +if [ -f /etc/fstab ]; then + exec 9<&0 </etc/fstab + + while read DEV MTPT FSTYPE OPTS REST; do + if [ "$FSTYPE" = "nfs4" ]; then + AUTO_NEED_IDMAPD=yes + fi + case "$OPTS" in + sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*) + AUTO_NEED_GSSD=yes + ;; + esac + done + + exec 0<&9 9<&- +fi + +# We also need idmapd if we run an NFSv4 server. It's fairly difficult +# to autodetect whether there are NFSv4 exports or not, and idmapd is not a +# particularily heavy daemon, so we auto-enable it if we find an /etc/exports +# file. This does not mean that there are NFSv4 or other mounts active (or +# even that nfs-kernel-server is installed), but it matches what the "start" +# condition in nfs-kernel-server's init script does, which has a value in +# itself. +if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then + AUTO_NEED_IDMAPD=yes +fi + +case "$NEED_STATD" in + yes|no) + ;; + *) + NEED_STATD=yes + ;; +esac + +case "$NEED_IDMAPD" in + yes|no) + ;; + *) + NEED_IDMAPD=$AUTO_NEED_IDMAPD + ;; +esac + +case "$NEED_GSSD" in + yes|no) + ;; + *) + NEED_GSSD=$AUTO_NEED_GSSD + ;; +esac + +do_modprobe() { + if [ -x /sbin/modprobe -a -f /proc/modules ]; then + modprobe -q "$1" || true + fi +} + +do_mount() { + if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then + return 1 + fi + + if grep -vw "$1" /proc/mounts &> /dev/null ; then + if ! mountpoint -q "$2" ; then + mount -t "$1" "$1" "$2" -o "$3" + return + fi + fi + return 0 +} + +do_umount() { + if mountpoint -q "$1" ; then + umount "$1" + fi + return 0 +} + +get_pid() { + pidof -o %PPID "$1" +} + +case "$1" in + start) + ck_daemon rpcbind && { echo -n "Start rpcbind first." >&2; stat_die; } + rc=0 + if [ "$NEED_STATD" = yes ]; then + stat_busy "Starting $STATD_DAEMON_NAME daemon" + PID=$(get_pid $STATD) + if [ -z "$PID" ]; then + [ -f /var/run/$STATD_DAEMON_NAME.pid ] && rm -f /var/run/$STATD_DAEMON_NAME.pid + # RUN + $STATD $STATD_OPTS + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + echo $(get_pid $STATD) > /var/run/$STATD_DAEMON_NAME.pid + stat_done + fi + else + stat_fail + exit 1 + fi + # Run sm-notify + /usr/sbin/sm-notify $SMNOTIFY_OPTS + fi + + if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then + stat_busy "Mounting pipefs filesystem" + do_modprobe sunrpc + do_modprobe nfs + do_modprobe nfsd + do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS" + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + stat_done + fi + + if [ "$NEED_IDMAPD" = yes ]; then + stat_busy "Starting $IDMAPD_DAEMON_NAME daemon" + PID=$(get_pid $IDMAPD) + if [ -z "$PID" ]; then + [ -f /var/run/$IDMAPD_DAEMON_NAME.pid ] && rm -f /var/run/$IDMAPD_DAEMON_NAME.pid + # RUN + $IDMAPD $IDMAPD_OPTS + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + echo $(get_pid $IDMAPD) > /var/run/$IDMAPD_DAEMON_NAME.pid + stat_done + fi + else + stat_fail + exit 1 + fi + fi + + if [ "$NEED_GSSD" = yes ]; then + do_modprobe rpcsec_gss_krb5 + stat_busy "Starting $GSSD_DAEMON_NAME daemon" + PID=$(get_pid $GSSD) + if [ -z "$PID" ]; then + [ -f /var/run/$GSSD_DAEMON_NAME.pid ] && rm -f /var/run/$GSSD_DAEMON_NAME.pid + # RUN + $GSSD $GSSD_OPTS + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + echo $(get_pid $GSSD) > /var/run/$GSSD_DAEMON_NAME.pid + stat_done + fi + else + stat_fail + exit 1 + fi + fi + fi + + add_daemon $daemon_name + ;; + + stop) + rc=0 + if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then + + if [ "$NEED_GSSD" = yes ]; then + stat_busy "Stopping $GSSD_DAEMON_NAME daemon" + PID=$(get_pid $GSSD) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + rm -f /var/run/$GSSD_DAEMON_NAME.pid &> /dev/null + stat_done + fi + fi + + if [ "$NEED_IDMAPD" = yes ]; then + stat_busy "Stopping $IDMAPD_DAEMON_NAME daemon" + PID=$(get_pid $IDMAPD) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + rm -f /var/run/$IDMAPD_DAEMON_NAME.pid &> /dev/null + stat_done + fi + fi + do_umount "$PIPEFS_MOUNTPOINT" 2>/dev/null || true + fi + + if [ "$NEED_STATD" = yes ]; then + stat_busy "Stopping $STATD_DAEMON_NAME daemon" + PID=$(get_pid $STATD) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + rm -f /var/run/$STATD_DAEMON_NAME.pid &> /dev/null + stat_done + fi + fi + + rm_daemon $daemon_name + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + + if [ "$NEED_STATD" = yes ]; then + stat_busy "Daemon $STATD_DAEMON_NAME running" + PID=$(get_pid $STATD) + if [ -z "$PID" ]; then + stat_fail + else + stat_done + fi + fi + + if [ "$NEED_GSSD" = yes ]; then + stat_busy "Daemon $GSSD_DAEMON_NAME running" + PID=$(get_pid $GSSD) + if [ -z "$PID" ]; then + stat_fail + else + stat_done + fi + fi + + if [ "$NEED_IDMAPD" = yes ]; then + stat_busy "Daemon $IDMAPD_DAEMON_NAME running" + PID=$(get_pid $IDMAPD) + if [ -z "$PID" ]; then + stat_fail + else + stat_done + fi + fi + echo + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|status|restart}" +esac +exit 0 + diff --git a/testing/nfs-utils/nfs-common.conf b/testing/nfs-utils/nfs-common.conf new file mode 100644 index 000000000..12466b3e5 --- /dev/null +++ b/testing/nfs-utils/nfs-common.conf @@ -0,0 +1,40 @@ +# Parameters to be passed to nfs-common (nfs clients & server) init script. +# + +# If you do not set values for the NEED_ options, they will be attempted +# autodetected; this should be sufficient for most people. Valid alternatives +# for the NEED_ options are "yes" and "no". + +# Do you want to start the statd daemon? It is not needed for NFSv4. +NEED_STATD="" + +# Options to pass to rpc.statd. +# See rpc.statd(8) for more details. +# N.B. statd normally runs on both client and server, and run-time +# options should be specified accordingly. +# STATD_OPTS="-p 32765 -o 32766" +STATD_OPTS="" + +# Options to pass to sm-notify +# e.g. SMNOTIFY_OPTS="-p 32764" +SMNOTIFY_OPTS="" + +# Do you want to start the idmapd daemon? It is only needed for NFSv4. +NEED_IDMAPD="" + +# Options to pass to rpc.idmapd. +# See rpc.idmapd(8) for more details. +IDMAPD_OPTS="" + +# Do you want to start the gssd daemon? It is required for Kerberos mounts. +NEED_GSSD="" + +# Options to pass to rpc.gssd. +# See rpc.gssd(8) for more details. +GSSD_OPTS="" + +# Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs". +PIPEFS_MOUNTPOINT="" + +# Options used to mount rpc_pipefs filesystem; the default is "defaults". +PIPEFS_MOUNTOPTS="" diff --git a/testing/nfs-utils/nfs-server b/testing/nfs-utils/nfs-server new file mode 100644 index 000000000..6aa609d8c --- /dev/null +++ b/testing/nfs-utils/nfs-server @@ -0,0 +1,299 @@ +#!/bin/bash + +daemon_name=nfs-server + +NFSD_COUNT= +NFSD_OPTS= +NEED_SVCGSSD= +SVCGSSD_OPTS= +MOUNTD_OPTS= +PROCNFSD_MOUNTPOINT= +PROCNFSD_MOUNTOPTS= + +# rpc.nfsd daemon & binary location +NFSD_PROCESS_NAME=nfsd +NFSD_DAEMON_NAME=rpc.nfsd +NFSD="/usr/sbin/rpc.nfsd" + +# rpc.svcgssd daemon & binary location +SVCGSSD_DAEMON_NAME=rpc.svcgssd +SVCGSSD="/usr/sbin/rpc.svcgssd" + +# rpc.idmapd daemon & binary location +IDMAPD_DAEMON_NAME=rpc.idmapd +IDMAPD="/usr/sbin/rpc.idmapd" + +# rpc.mountd daemon & binary location +MOUNTD_DAEMON_NAME=rpc.mountd +MOUNTD="/usr/sbin/rpc.mountd" + +# exortfs binary location +EXPORTFS="/usr/sbin/exportfs" + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/$daemon_name.conf + +# Default number of nfsd servers +[ -z "$NFSD_COUNT" ] && NFSD_COUNT=8 + +# Default mountpoint and options for nfsd filesystem +[ -z "$PROCNFSD_MOUNTPOINT" ] && PROCNFSD_MOUNTPOINT="/proc/fs/nfsd" +[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid" + +case "$NEED_SVCGSSD" in + yes|no) + ;; + *) + NEED_SVCGSSD=no + ;; +esac + +do_modprobe() { + if [ -x /sbin/modprobe -a -f /proc/modules ]; then + modprobe -q "$1" || true + fi +} + +do_mount() { + if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then + return 1 + fi + + if grep -vw "$1" /proc/mounts &> /dev/null ; then + if ! mountpoint -q "$2" ; then + mount -t "$1" "$1" "$2" -o "$3" + return + fi + fi + return 0 +} + +do_umount() { + if mountpoint -q "$1" ; then + umount "$1" + fi + return 0 +} + +get_pid() { + pidof -o %PPID "$1" +} + +case "$1" in + start) + ck_daemon nfs-common && { echo -n "Start nfs-common first." >&2; stat_die; } + rc=0 + stat_busy "Mounting nfsd filesystem" + do_modprobe nfsd + do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS" + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + stat_done + fi + + stat_busy "Exporting all directories" + $EXPORTFS -r + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + stat_done + fi + + stat_busy "Starting $NFSD_DAEMON_NAME daemon" + PID=$(get_pid $NFSD_PROCESS_NAME) + if [ -z "$PID" ]; then + [ -f /var/run/$NFSD_DAEMON_NAME.pid ] && rm -f /var/run/$NFSD_DAEMON_NAME.pid + # RUN + $NFSD $NFSD_OPTS $NFSD_COUNT + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + echo $(get_pid $NFSD_PROCESS_NAME) > /var/run/$NFSD_DAEMON_NAME.pid + stat_done + fi + else + stat_fail + exit 1 + fi + + if [ "$NEED_SVCGSSD" = yes ]; then + do_modprobe rpcsec_gss_krb5 + stat_busy "Starting $SVCGSSD_DAEMON_NAME daemon" + PID=$(get_pid $SVCGSSD) + if [ -z "$PID" ]; then + [ -f /var/run/$SVCGSSD_DAEMON_NAME.pid ] && rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid + # RUN + $SVCGSSD $SVCGSSD_OPTS + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + echo $(get_pid $SVCGSSD) > /var/run/$SVCGSSD_DAEMON_NAME.pid + stat_done + fi + else + stat_fail + exit 1 + fi + fi + + PID=$(get_pid $IDMAPD) + [ ! -z "$PID" ] && kill -SIGHUP $IDMAPD_DAEMON_NAME &> /dev/null + + stat_busy "Starting $MOUNTD_DAEMON_NAME daemon" + PID=$(get_pid $MOUNTD) + if [ -z "$PID" ]; then + [ -f /var/run/$MOUNTD_DAEMON_NAME.pid ] && rm -f /var/run/$MOUNTD_DAEMON_NAME.pid + # RUN + $MOUNTD $MOUNTD_OPTS + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + echo $(get_pid $MOUNTD) > /var/run/$MOUNTD_DAEMON_NAME.pid + stat_done + fi + else + stat_fail + exit 1 + fi + + add_daemon $daemon_name + ;; + + stop) + rc=0 + stat_busy "Stopping $MOUNTD_DAEMON_NAME daemon" + PID=$(get_pid $MOUNTD) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + rm -f /var/run/$MOUNTD_DAEMON_NAME.pid &> /dev/null + stat_done + fi + + if [ "$NEED_SVCGSSD" = yes ]; then + stat_busy "Stopping $SVCGSSD_DAEMON_NAME daemon" + PID=$(get_pid $SVCGSSD) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid &> /dev/null + stat_done + fi + fi + + stat_busy "Stopping $NFSD_DAEMON_NAME daemon" + PID=$(get_pid $NFSD_PROCESS_NAME) + # KILL (SIGINT) + [ ! -z "$PID" ] && kill -2 $PID &> /dev/null + # + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + sleep 1 + PID=$(get_pid $NFSD_PROCESS_NAME) + # KILL (KILL) - just to be sure + [ ! -z "$PID" ] && kill -9 $PID &> /dev/null + # + rm -f /var/run/$NFSD_DAEMON_NAME.pid &> /dev/null + stat_done + fi + + stat_busy "Unexporting all directories" + $EXPORTFS -au + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + stat_done + fi + + # flush everything out of the kernels export table + if mountpoint -q "$PROCNFSD_MOUNTPOINT" ; then + $EXPORTFS -f + fi + do_umount "$PROCNFSD_MOUNTPOINT" 2>/dev/null || true + rm_daemon $daemon_name + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + + stat_busy "Daemon $NFSD_DAEMON_NAME running" + PID=$(get_pid $NFSD_PROCESS_NAME) + if [ -z "$PID" ]; then + stat_fail + else + stat_done + fi + + stat_busy "Daemon $MOUNTD_DAEMON_NAME running" + PID=$(get_pid $MOUNTD) + if [ -z "$PID" ]; then + stat_fail + else + stat_done + fi + + if [ "$NEED_SVCGSSD" = yes ]; then + stat_busy "Daemon $SVCGSSD_DAEMON_NAME running" + PID=$(get_pid $SVCGSSD) + if [ -z "$PID" ]; then + stat_fail + else + stat_done + fi + fi + echo + ;; + + reload) + rc=0 + stat_busy "Re-exporting all directories" + $EXPORTFS -r + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + exit $rc + else + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|status|reload|restart}" +esac +exit 0 diff --git a/testing/nfs-utils/nfs-server.conf b/testing/nfs-utils/nfs-server.conf new file mode 100644 index 000000000..4054d6b88 --- /dev/null +++ b/testing/nfs-utils/nfs-server.conf @@ -0,0 +1,29 @@ +# Parameters to be passed to nfs-server init script. +# + +# Options to pass to rpc.nfsd. +# See rpc.nfsd(8) for more details. +NFSD_OPTS="" + +# Number of servers to start up; the default is 8 servers. +NFSD_COUNT="" + +# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd". +PROCNFSD_MOUNTPOINT="" + +# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid". +PROCNFSD_MOUNTOPTS="" + +# Options for rpc.mountd. +# If you have a port-based firewall, you might want to set up +# a fixed port here using the --port option. +# See rpc.mountd(8) for more details. +MOUNTD_OPTS="--no-nfs-version 2" + +# Do you want to start the svcgssd daemon? It is only required for Kerberos +# exports. Valid alternatives are "yes" and "no"; the default is "no". +NEED_SVCGSSD="" + +# Options to pass to rpc.svcgssd. +# See rpc.svcgssd(8) for more details. +SVCGSSD_OPTS="" diff --git a/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch b/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch new file mode 100644 index 000000000..4a5a138e7 --- /dev/null +++ b/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch @@ -0,0 +1,138 @@ +diff -NaurwB nfs-utils-1.1.2.orig/aclocal/kerberos5.m4 nfs-utils-1.1.2/aclocal/kerberos5.m4 +--- nfs-utils-1.1.2.orig/aclocal/kerberos5.m4 2008-03-14 16:46:29.000000000 +0100 ++++ nfs-utils-1.1.2/aclocal/kerberos5.m4 2008-06-12 17:13:51.000000000 +0200 +@@ -1,112 +1,48 @@ +-dnl Checks for Kerberos +-dnl NOTE: while we intend to do generic gss-api, currently we +-dnl have a requirement to get an initial Kerberos machine +-dnl credential. Thus, the requirement for Kerberos. +-dnl The Kerberos gssapi library will be dynamically loaded? + AC_DEFUN([AC_KERBEROS_V5],[ ++ K5CONFIG="krb5-config" + AC_MSG_CHECKING(for Kerberos v5) +- AC_ARG_WITH(krb5, +- [AC_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])], ++ AC_ARG_WITH(krb5-config, ++ [AC_HELP_STRING([--with-krb5-config=PATH], [Full Path to krb5-config.])], + [ case "$withval" in + yes|no) +- krb5_with="" ++ K5CONFIG="krb5-config" + ;; + *) +- krb5_with="$withval" ++ K5CONFIG="$withval" + ;; + esac ] + ) + +- for dir in $krb5_with /usr /usr/kerberos /usr/local /usr/local/krb5 \ +- /usr/krb5 /usr/heimdal /usr/local/heimdal /usr/athena ; do +- dnl This ugly hack brought on by the split installation of +- dnl MIT Kerberos on Fedora Core 1 +- K5CONFIG="" +- if test -f $dir/bin/krb5-config; then +- K5CONFIG=$dir/bin/krb5-config +- elif test -f "/usr/kerberos/bin/krb5-config"; then +- K5CONFIG="/usr/kerberos/bin/krb5-config" +- elif test -f "/usr/lib/mit/bin/krb5-config"; then +- K5CONFIG="/usr/lib/mit/bin/krb5-config" +- fi + if test "$K5CONFIG" != ""; then + KRBCFLAGS=`$K5CONFIG --cflags` + KRBLIBS=`$K5CONFIG --libs gssapi` +- K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'` +- AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) +- if test -f $dir/include/gssapi/gssapi_krb5.h -a \ +- \( -f $dir/lib/libgssapi_krb5.a -o \ +- -f $dir/lib64/libgssapi_krb5.a -o \ +- -f $dir/lib64/libgssapi_krb5.so -o \ +- -f $dir/lib/libgssapi_krb5.so \) ; then ++ if $K5CONFIG --version | grep -q -e heimdal; then ++ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f2 -d ' ' | tr -d '.'` ++ AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries]) ++ gssapi_lib=gssapi ++ KRBIMPL="heimdal" ++ elif $K5CONFIG --version | grep -q -e mit; then ++ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f4 -d ' ' | tr -d '.'` + AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries]) +- KRBDIR="$dir" +- dnl If we are using MIT K5 1.3.1 and before, we *MUST* use the +- dnl private function (gss_krb5_ccache_name) to get correct +- dnl behavior of changing the ccache used by gssapi. +- dnl Starting in 1.3.2, we *DO NOT* want to use +- dnl gss_krb5_ccache_name, instead we want to set KRB5CCNAME +- dnl to get gssapi to use a different ccache + if test $K5VERS -le 131; then + AC_DEFINE(USE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the private function, gss_krb5_cache_name, must be used to tell the Kerberos library which credentials cache to use. Otherwise, this is done by setting the KRB5CCNAME environment variable]) + fi + gssapi_lib=gssapi_krb5 +- break +- dnl The following ugly hack brought on by the split installation +- dnl of Heimdal Kerberos on SuSe +- elif test \( -f $dir/include/heim_err.h -o\ +- -f $dir/include/heimdal/heim_err.h \) -a \ +- -f $dir/lib/libroken.a; then +- AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries]) +- KRBDIR="$dir" +- gssapi_lib=gssapi +- break +- fi +- fi +- done +- dnl We didn't find a usable Kerberos environment +- if test "x$KRBDIR" = "x"; then +- if test "x$krb5_with" = "x"; then +- AC_MSG_ERROR(Kerberos v5 with GSS support not found: consider --disable-gss or --with-krb5=) ++ KRBIMPL="mit-krb5" + else +- AC_MSG_ERROR(Kerberos v5 with GSS support not found at $krb5_with) +- fi ++ AC_MSG_ERROR(Unknown Kerberos 5 Implementation. Is neither heimdal or mit-krb5.) ++ KRBIMPL="unknown" + fi +- AC_MSG_RESULT($KRBDIR) +- +- dnl Check if -rpath=$(KRBDIR)/lib is needed +- echo "The current KRBDIR is $KRBDIR" +- if test "$KRBDIR/lib" = "/lib" -o "$KRBDIR/lib" = "/usr/lib" \ +- -o "$KRBDIR/lib" = "//lib" -o "$KRBDIR/lib" = "/usr//lib" ; then +- KRBLDFLAGS=""; +- elif /sbin/ldconfig -p | grep > /dev/null "=> $KRBDIR/lib/"; then +- KRBLDFLAGS=""; +- else +- KRBLDFLAGS="-Wl,-rpath=$KRBDIR/lib" ++ AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) + fi ++ AC_MSG_RESULT($KRBIMPL) + +- dnl Now check for functions within gssapi library +- AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, +- AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS) +- AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, +- AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS) +- AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, +- AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS) +- +- dnl Check for newer error message facility +- AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, +- AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS) ++ AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS) ++ AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS) ++ AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS) ++ AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS) ++ AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS) + +- dnl Check for function to specify addressless tickets +- AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, +- AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS) +- +- dnl If they specified a directory and it didn't work, give them a warning +- if test "x$krb5_with" != "x" -a "$krb5_with" != "$KRBDIR"; then +- AC_MSG_WARN(Using $KRBDIR instead of requested value of $krb5_with for Kerberos!) +- fi +- +- AC_SUBST([KRBDIR]) + AC_SUBST([KRBLIBS]) + AC_SUBST([KRBCFLAGS]) + AC_SUBST([KRBLDFLAGS]) diff --git a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch new file mode 100644 index 000000000..c9e60afc7 --- /dev/null +++ b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch @@ -0,0 +1,39 @@ +ripped from Debian + +--- nfs-utils-1.1.4/utils/mount/fstab.c ++++ nfs-utils-1.1.4/utils/mount/fstab.c +@@ -57,7 +57,7 @@ mtab_does_not_exist(void) { + return var_mtab_does_not_exist; + } + +-static int ++int + mtab_is_a_symlink(void) { + get_mtab_info(); + return var_mtab_is_a_symlink; +--- nfs-utils-1.1.4/utils/mount/fstab.h ++++ nfs-utils-1.1.4/utils/mount/fstab.h +@@ -7,6 +7,7 @@ + #define _PATH_FSTAB "/etc/fstab" + #endif + ++int mtab_is_a_symlink(void); + int mtab_is_writable(void); + int mtab_does_not_exist(void); + void reset_mtab_info(void); +--- nfs-utils-1.1.4/utils/mount/mount.c ++++ nfs-utils-1.1.4/utils/mount/mount.c +@@ -230,6 +230,13 @@ create_mtab (void) { + int flags; + mntFILE *mfp; + ++ /* Avoid writing if the mtab is a symlink to /proc/mounts, since ++ that would create a file /proc/mounts in case the proc filesystem ++ is not mounted, and the fchmod below would also fail. */ ++ if (mtab_is_a_symlink()) { ++ return EX_SUCCESS; ++ } ++ + lock_mtab(); + + mfp = nfs_setmntent (MOUNTED, "a+"); diff --git a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch new file mode 100644 index 000000000..ea50a21d8 --- /dev/null +++ b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch @@ -0,0 +1,15 @@ +ripped from Debian + +--- nfs-utils-1.1.2/utils/mount/mount.c ++++ nfs-utils-1.1.2/utils/mount/mount.c +@@ -381,10 +381,6 @@ + mount_error(NULL, mount_point, ENOTDIR); + return 1; + } +- if (access(mount_point, X_OK) < 0) { +- mount_error(NULL, mount_point, errno); +- return 1; +- } + + return 0; + } diff --git a/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch b/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch new file mode 100644 index 000000000..7f6c7a751 --- /dev/null +++ b/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch @@ -0,0 +1,69 @@ +diff -Naur nfs-utils-1.1.6.orig/utils/gssd/krb5_util.c nfs-utils-1.1.6/utils/gssd/krb5_util.c +--- utils/gssd/krb5_util.c 2009-04-20 19:32:50.000000000 +0200 ++++ utils/gssd/krb5_util.c 2009-04-20 20:57:31.000000000 +0200 +@@ -940,9 +940,37 @@ + { + krb5_error_code ret; + krb5_creds creds; +- krb5_cc_cursor cur; + int found = 0; + ++#ifdef HAVE_HEIMDAL ++ krb5_creds pattern; ++ krb5_realm *client_realm; ++ ++ krb5_cc_clear_mcred(&pattern); ++ ++ client_realm = krb5_princ_realm (context, principal); ++ ++ ret = krb5_make_principal (context, &pattern.server, ++ *client_realm, KRB5_TGS_NAME, *client_realm, ++ NULL); ++ if (ret) ++ krb5_err (context, 1, ret, "krb5_make_principal"); ++ pattern.client = principal; ++ ++ ret = krb5_cc_retrieve_cred (context, ccache, 0, &pattern, &creds); ++ krb5_free_principal (context, pattern.server); ++ if (ret) { ++ if (ret == KRB5_CC_END) ++ return 1; ++ krb5_err (context, 1, ret, "krb5_cc_retrieve_cred"); ++ } ++ ++ found = creds.times.endtime > time(NULL); ++ ++ krb5_free_cred_contents (context, &creds); ++#else ++ krb5_cc_cursor cur; ++ + ret = krb5_cc_start_seq_get(context, ccache, &cur); + if (ret) + return 0; +@@ -962,6 +990,7 @@ + krb5_free_cred_contents(context, &creds); + } + krb5_cc_end_seq_get(context, ccache, &cur); ++#endif + + return found; + } +@@ -1008,6 +1037,9 @@ + } + krb5_free_principal(context, principal); + err_princ: ++#ifdef HAVE_HEIMDAL ++#define KRB5_TC_OPENCLOSE 0x00000001 ++#endif + krb5_cc_set_flags(context, ccache, KRB5_TC_OPENCLOSE); + krb5_cc_close(context, ccache); + err_cache: +@@ -1262,7 +1294,7 @@ + if (context != NULL) { + origmsg = krb5_get_error_message(context, code); + msg = strdup(origmsg); +- krb5_free_error_message(context, origmsg); ++ krb5_free_error_string(context, origmsg); + } + #endif + if (msg != NULL) diff --git a/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch b/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch new file mode 100644 index 000000000..917136a8c --- /dev/null +++ b/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch @@ -0,0 +1,57 @@ +Index: nfs-utils-1.1.6/utils/gssd/context_lucid.c +=================================================================== +--- nfs-utils-1.1.6.orig/utils/gssd/context_lucid.c ++++ nfs-utils-1.1.6/utils/gssd/context_lucid.c +@@ -51,8 +51,10 @@ + #include "context.h" + + #ifndef OM_uint64 ++#ifndef GSSAPI_GSSAPI_H_ + typedef uint64_t OM_uint64; + #endif ++#endif + + static int + write_lucid_keyblock(char **p, char *end, gss_krb5_lucid_key_t *key) +@@ -177,10 +179,10 @@ + int retcode = 0; + + printerr(2, "DEBUG: serialize_krb5_ctx: lucid version!\n"); +- maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx, ++ maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx, + 1, &return_ctx); + if (maj_stat != GSS_S_COMPLETE) { +- pgsserr("gss_export_lucid_sec_context", ++ pgsserr("gss_krb5_export_lucid_sec_context", + maj_stat, min_stat, &krb5oid); + goto out_err; + } +@@ -204,9 +206,9 @@ + else + retcode = prepare_krb5_rfc_cfx_buffer(lctx, buf, endtime); + +- maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx); ++ maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, ctx); + if (maj_stat != GSS_S_COMPLETE) { +- pgsserr("gss_export_lucid_sec_context", ++ pgsserr("gss_krb5_export_lucid_sec_context", + maj_stat, min_stat, &krb5oid); + printerr(0, "WARN: failed to free lucid sec context\n"); + } +Index: nfs-utils-1.1.6/utils/gssd/krb5_util.c +=================================================================== +--- nfs-utils-1.1.6.orig/utils/gssd/krb5_util.c ++++ nfs-utils-1.1.6/utils/gssd/krb5_util.c +@@ -332,10 +332,10 @@ + return -1; + } + +- maj_stat = gss_set_allowable_enctypes(&min_stat, credh, &krb5oid, ++ maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh, + num_enctypes, &enctypes); + if (maj_stat != GSS_S_COMPLETE) { +- pgsserr("gss_set_allowable_enctypes", ++ pgsserr("gss_krb5_set_allowable_enctypes", + maj_stat, min_stat, &krb5oid); + gss_release_cred(&min_stat, &credh); + return -1; diff --git a/testing/nfs-utils/nfs-utils.install b/testing/nfs-utils/nfs-utils.install new file mode 100644 index 000000000..7dcdf9575 --- /dev/null +++ b/testing/nfs-utils/nfs-utils.install @@ -0,0 +1,32 @@ +## arg 1: the new package version +post_install() { +cat << 'EOM' + ==> PLEASE NOTE: + ==> Extended configuration options for NFS (clients & server) are available in + ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf + ==> + ==> Please refer to http://wiki.archlinux.org/index.php/Nfs + ==> for further information on NFS; for NFSv4, refer to + ==> http://wiki.archlinux.org/index.php/NFSv4 +EOM +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then +cat << 'EOM' + ==> IMPORTANT NFS UTILS CHANGES: + ==> This is a rather important upgrade, you are going to have to change config files. + ==> /etc/rc.conf daemons changes: + ==> Change portmap to rpcbind + ==> Change nfslock to nfs-common + ==> Change nfsd to nfs-server + ==> + ==> Extended configuration options for NFS (clients & server) are available in: + ==> /etc/conf.d/nfs-common + ==> /etc/conf.d/nfs-server + ==> Please change them to your needs. +EOM + fi +} diff --git a/testing/nfs-utils/start-statd.patch b/testing/nfs-utils/start-statd.patch new file mode 100644 index 000000000..38c60a784 --- /dev/null +++ b/testing/nfs-utils/start-statd.patch @@ -0,0 +1,22 @@ +--- utils/statd/start-statd 2007-05-11 04:40:57.000000000 +0100 ++++ utils/statd/start-statd.new 2007-09-21 17:11:34.000000000 +0100 +@@ -1,9 +1,16 @@ +-#!/bin/sh -p ++#!/bin/sh ++ ++# Original script provided by the NFS project ++# Modified for Arch Linux by Tom Killian ++ + # nfsmount calls this script when mounting a filesystem with locking + # enabled, but when statd does not seem to be running (based on + # /var/run/rpc.statd.pid). + # It should run run statd with whatever flags are apropriate for this + # site. +-PATH=/sbin:/usr/sbin +-exec rpc.statd --no-notify ++ ++# source application-specific settings ++[ -f /etc/conf.d/nfs-common.conf ] && . /etc/conf.d/nfs-common.conf ++ ++exec /usr/sbin/rpc.statd $STATD_OPTS + diff --git a/testing/nfsidmap/PKGBUILD b/testing/nfsidmap/PKGBUILD new file mode 100644 index 000000000..235332551 --- /dev/null +++ b/testing/nfsidmap/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 136337 2011-08-26 15:15:41Z tpowa $ +# Maintainer: +# Contributor: Judd <jvinet@zeroflux.org> + +pkgname=nfsidmap +pkgver=0.24 +pkgrel=3 +pkgdesc="Library to help mapping IDs, mainly for NFSv4" +arch=('i686' 'x86_64') +url="http://www.citi.umich.edu/projects/nfsv4/linux/" +depends=('glibc' 'libldap>=2.4.18') +license=('custom:nfsidmap') +options=(!libtool) +source=(http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-$pkgver.tar.gz) +md5sums=('d71a1ee9881d5b5814ff3ec41256937d') + +build() { + cd $srcdir/lib$pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd $srcdir/lib$pkgname-$pkgver + make DESTDIR=$pkgdir install + + # install license + install -Dm644 COPYING $pkgdir/usr/share/licenses/nfsidmap/LICENSE +} |