From 5233daa5825f00ccf0722ef9733ea6b3bbd44bc8 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 27 Apr 2012 00:01:30 +0000 Subject: Fri Apr 27 00:01:30 UTC 2012 --- community-staging/gtranslator/PKGBUILD | 34 +++ .../gtranslator/gtranslator.changelog | 43 +++ community-staging/gtranslator/gtranslator.install | 13 + community-staging/smalltalk/PKGBUILD | 60 ++++ community-staging/smalltalk/smalltalk.install | 22 ++ community/gpicview/PKGBUILD | 17 +- community/gpicview/gpicview.install | 11 + community/kpartsplugin/PKGBUILD | 8 +- community/mupdf/PKGBUILD | 39 +-- community/mupdf/mupdf.install | 1 - community/vdrift/PKGBUILD | 12 +- community/widelands/PKGBUILD | 24 +- extra/cmake/PKGBUILD | 13 +- extra/cmake/fix-pkg-config.patch | 31 ++ extra/cups-filters/PKGBUILD | 6 +- extra/gnome-pilot/PKGBUILD | 8 +- extra/gnome-settings-daemon/PKGBUILD | 24 +- extra/lv2/PKGBUILD | 36 +++ extra/virtuoso/PKGBUILD | 8 +- extra/webmin/PKGBUILD | 13 +- extra/webmin/webmin.rc | 6 +- extra/webmin/webmin.service | 11 + extra/xfce4-mount-plugin/PKGBUILD | 6 +- libre-testing/icedove-libre/PKGBUILD | 14 +- .../icedove-libre/searchplugins-libre.patch | 30 +- libre/unarchiver/PKGBUILD | 27 +- staging/eog-plugins/PKGBUILD | 31 ++ staging/eog-plugins/eog-plugins.install | 11 + staging/eog/PKGBUILD | 33 +++ staging/eog/eog.install | 13 + staging/gedit/PKGBUILD | 32 +++ staging/gedit/gedit.install | 18 ++ staging/gjs/PKGBUILD | 26 ++ staging/gnome-documents/PKGBUILD | 35 +++ staging/gnome-documents/gnome-documents.install | 13 + staging/libpeas/PKGBUILD | 32 +++ staging/libpeas/libpeas.install | 11 + staging/mutter/PKGBUILD | 33 +++ staging/mutter/mutter.install | 19 ++ staging/pygobject/PKGBUILD | 58 ++++ staging/pygobject2/PKGBUILD | 83 ++++++ staging/pygobject2/python3-fix-build.patch | 34 +++ staging/pygobject2/python3-fix-maketrans.patch | 36 +++ staging/seed/PKGBUILD | 27 ++ staging/sushi/PKGBUILD | 29 ++ testing/inetutils/PKGBUILD | 69 +++++ testing/inetutils/dnsdomainname | 3 + testing/inetutils/ftpd.conf | 4 + testing/inetutils/ftpd.rc | 37 +++ testing/inetutils/inetutils.install | 20 ++ testing/inetutils/rlogin.xinetd | 10 + testing/inetutils/rsh.xinetd | 10 + testing/inetutils/talk.xinetd | 10 + testing/inetutils/telnet.xinetd | 10 + testing/nfs-utils/PKGBUILD | 101 +++++++ testing/nfs-utils/exports | 15 + testing/nfs-utils/idmapd.conf | 14 + testing/nfs-utils/nfs | 40 +++ testing/nfs-utils/nfs-common | 315 +++++++++++++++++++++ testing/nfs-utils/nfs-common.conf | 40 +++ testing/nfs-utils/nfs-server | 299 +++++++++++++++++++ testing/nfs-utils/nfs-server.conf | 29 ++ testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch | 39 +++ testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch | 15 + testing/nfs-utils/nfs-utils.conf | 1 + testing/nfs-utils/nfs-utils.install | 32 +++ testing/nfs-utils/nfsd.service | 16 ++ testing/nfs-utils/proc-fs-nfsd.mount | 8 + testing/nfs-utils/rpc-gssd.service | 12 + testing/nfs-utils/rpc-idmapd.service | 12 + testing/nfs-utils/rpc-mountd.service | 12 + testing/nfs-utils/rpc-statd.service | 12 + testing/nfs-utils/rpc-svcgssd.service | 12 + testing/nfs-utils/start-statd.patch | 22 ++ testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount | 7 + testing/samba/PKGBUILD | 166 +++++++++++ testing/samba/nmbd.service | 8 + testing/samba/samba | 57 ++++ testing/samba/samba.conf.d | 7 + testing/samba/samba.logrotate | 9 + testing/samba/samba.pam | 3 + testing/samba/smbd.conf | 1 + testing/samba/smbd.service | 9 + testing/samba/swat.xinetd | 10 + testing/samba/winbindd.service | 9 + 85 files changed, 2478 insertions(+), 118 deletions(-) create mode 100644 community-staging/gtranslator/PKGBUILD create mode 100644 community-staging/gtranslator/gtranslator.changelog create mode 100644 community-staging/gtranslator/gtranslator.install create mode 100644 community-staging/smalltalk/PKGBUILD create mode 100644 community-staging/smalltalk/smalltalk.install create mode 100644 community/gpicview/gpicview.install create mode 100644 extra/cmake/fix-pkg-config.patch create mode 100644 extra/lv2/PKGBUILD create mode 100644 extra/webmin/webmin.service create mode 100644 staging/eog-plugins/PKGBUILD create mode 100644 staging/eog-plugins/eog-plugins.install create mode 100644 staging/eog/PKGBUILD create mode 100644 staging/eog/eog.install create mode 100644 staging/gedit/PKGBUILD create mode 100644 staging/gedit/gedit.install create mode 100644 staging/gjs/PKGBUILD create mode 100644 staging/gnome-documents/PKGBUILD create mode 100644 staging/gnome-documents/gnome-documents.install create mode 100644 staging/libpeas/PKGBUILD create mode 100644 staging/libpeas/libpeas.install create mode 100644 staging/mutter/PKGBUILD create mode 100644 staging/mutter/mutter.install create mode 100644 staging/pygobject/PKGBUILD create mode 100644 staging/pygobject2/PKGBUILD create mode 100644 staging/pygobject2/python3-fix-build.patch create mode 100644 staging/pygobject2/python3-fix-maketrans.patch create mode 100644 staging/seed/PKGBUILD create mode 100644 staging/sushi/PKGBUILD create mode 100644 testing/inetutils/PKGBUILD create mode 100644 testing/inetutils/dnsdomainname create mode 100644 testing/inetutils/ftpd.conf create mode 100644 testing/inetutils/ftpd.rc create mode 100644 testing/inetutils/inetutils.install create mode 100644 testing/inetutils/rlogin.xinetd create mode 100644 testing/inetutils/rsh.xinetd create mode 100644 testing/inetutils/talk.xinetd create mode 100644 testing/inetutils/telnet.xinetd create mode 100644 testing/nfs-utils/PKGBUILD create mode 100644 testing/nfs-utils/exports create mode 100644 testing/nfs-utils/idmapd.conf create mode 100644 testing/nfs-utils/nfs create mode 100644 testing/nfs-utils/nfs-common create mode 100644 testing/nfs-utils/nfs-common.conf create mode 100644 testing/nfs-utils/nfs-server create mode 100644 testing/nfs-utils/nfs-server.conf create mode 100644 testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch create mode 100644 testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch create mode 100644 testing/nfs-utils/nfs-utils.conf create mode 100644 testing/nfs-utils/nfs-utils.install create mode 100644 testing/nfs-utils/nfsd.service create mode 100644 testing/nfs-utils/proc-fs-nfsd.mount create mode 100644 testing/nfs-utils/rpc-gssd.service create mode 100644 testing/nfs-utils/rpc-idmapd.service create mode 100644 testing/nfs-utils/rpc-mountd.service create mode 100644 testing/nfs-utils/rpc-statd.service create mode 100644 testing/nfs-utils/rpc-svcgssd.service create mode 100644 testing/nfs-utils/start-statd.patch create mode 100644 testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount create mode 100644 testing/samba/PKGBUILD create mode 100644 testing/samba/nmbd.service create mode 100755 testing/samba/samba create mode 100644 testing/samba/samba.conf.d create mode 100644 testing/samba/samba.logrotate create mode 100644 testing/samba/samba.pam create mode 100644 testing/samba/smbd.conf create mode 100644 testing/samba/smbd.service create mode 100644 testing/samba/swat.xinetd create mode 100644 testing/samba/winbindd.service diff --git a/community-staging/gtranslator/PKGBUILD b/community-staging/gtranslator/PKGBUILD new file mode 100644 index 000000000..ea4084ab0 --- /dev/null +++ b/community-staging/gtranslator/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 69873 2012-04-25 04:51:03Z tdziedzic $ +# Maintainer: Jaroslav Lichtblau +# Contributor: Hugo Doria +# Contributor: Christer Solskogen (solskogen@carebears.mine.nu) + +pkgname=gtranslator +pkgver=2.91.3 +pkgrel=3 +pkgdesc="An enhanced gettext po file editor for the GNOME" +arch=('i686' 'x86_64') +url="http://projects.gnome.org/gtranslator/" +license=('GPL') +depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell3' 'iso-codes' 'libgda' 'libpeas' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf') +makedepends=('intltool' 'gnome-doc-utils' 'gucharmap' 'json-glib') +optdepends=('gucharmap: for charmap plugin' + 'json-glib: for open-tran plugin') +options=('!libtool') +install=$pkgname.install +changelog=$pkgname.changelog +source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz) +sha256sums=('0e398cf7909d1fbaf9db66e20913553b38d1af7cad097f5bc8cc229d9ffbc594') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/gtranslator/gtranslator.changelog b/community-staging/gtranslator/gtranslator.changelog new file mode 100644 index 000000000..c9b484e39 --- /dev/null +++ b/community-staging/gtranslator/gtranslator.changelog @@ -0,0 +1,43 @@ +2012-04-23 Jan Alexander Steffens (heftig) + * gtranslator 2.91.3-2 + rebuild for gdl 3.4.2 + +2012-04-21 Balló György + * gtranslator 2.91.3-1 + +2012-04-09 Balló György + * gtranslator 2.91.2-1 + replace gtkspell dependency with gtkspell3 + remove unused libunique dependency + remove broken dictionary plugin + +2012-03-18 Jaroslav Lichtblau + * gtranslator 2.90.8-1 + +2011-10-28 Jaroslav Lichtblau (Dragonlord) + * gtranslator 2.90.7-1 + +2011-08-20 Jaroslav Lichtblau (Dragonlord) + * gtranslator 2.90.5-1 + +2011-05-12 Jaroslav Lichtblau (Dragonlord) + * gtranslator 2.90.3-1 + +2011-01-09 Jaroslav Lichtblau (Dragonlord) + * gtranslator-1.9.13-1 + +2010-08-30 Jaroslav Lichtblau (Dragonlord) + * gtranslator-1.9.11-1 + +2010-02-23 Jaroslav Lichtblau (Dragonlord) + * gtranslator-1.9.7-1 + +2007-06-19 Eric Belanger (Snowman) + * gtranslator-1.1.7-3 + added x86_64 to arch field + added license + removed gnome.sh sourcing : no longer necessary + +2007-05-29 Alessio 'mOLOk' Bolognino + * gtranslator-1.1.7-3 + move from /opt/gnome to /usr diff --git a/community-staging/gtranslator/gtranslator.install b/community-staging/gtranslator/gtranslator.install new file mode 100644 index 000000000..390bbf2b0 --- /dev/null +++ b/community-staging/gtranslator/gtranslator.install @@ -0,0 +1,13 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/smalltalk/PKGBUILD b/community-staging/smalltalk/PKGBUILD new file mode 100644 index 000000000..1f320c7d7 --- /dev/null +++ b/community-staging/smalltalk/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 69870 2012-04-25 04:30:21Z tdziedzic $ +# Maintainer: Alexander Rødseth +# Contributor: Kaiting Chen +# Contributor: mrshpot +# Contributor: Michael Fellinger + +pkgname=smalltalk +pkgver=3.2.4 +pkgrel=7 +pkgdesc='Implementation of Smalltalk-80' +url='http://smalltalk.gnu.org/' +license=('GPL' 'LGPL') +arch=('x86_64' 'i686') +options=('!libtool' '!emptydirs') +depends=('gmp' 'libffi' 'libsigsegv' 'readline' 'libltdl') +makedepends=('gdbm' 'gtk2' 'sqlite' 'tk' 'zip') +install=smalltalk.install +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") +sha256sums=('901cc7090a1fa44bc60900a970d207de4aa3bdfdce72bea55114e243bc1eb1b3') +optdepends=('tk: for gst-blox' + 'sqlite: database in a file' + 'sed: for examples' + 'gtk2: GUI toolkit') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/smalltalk \ + --with-imagedir=/var/lib/smalltalk \ + --enable-gtk=yes \ + --with-system-libffi \ + --with-system-libsigsegv \ + --with-readline \ + --with-tcl \ + --with-tk \ + --with-x \ + --without-emacs + + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + +# make check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # fix manpage symlink + rm -f "$pkgdir/usr/share/man/man1/gst-reload.1" + ln -s gst-load.1 "$pkgdir/usr/share/man/man1/gst-reload.1" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/smalltalk/smalltalk.install b/community-staging/smalltalk/smalltalk.install new file mode 100644 index 000000000..3f7150d67 --- /dev/null +++ b/community-staging/smalltalk/smalltalk.install @@ -0,0 +1,22 @@ +infodir=usr/share/info +filelist=(gst-base.info{,-1,-2,-3,-4,-5}.gz gst-libs.info{,-1,-2,-3}.gz gst.info{,-1,-2}.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/community/gpicview/PKGBUILD b/community/gpicview/PKGBUILD index f09f60b3e..ef08560b4 100644 --- a/community/gpicview/PKGBUILD +++ b/community/gpicview/PKGBUILD @@ -1,19 +1,22 @@ -# $Id: PKGBUILD 52590 2011-07-26 09:08:13Z angvp $ -# Maintainer: Angel Velasquez +# $Id: PKGBUILD 69882 2012-04-25 13:40:48Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Angel Velasquez # Contributor: Geoffroy Carrier + pkgname=gpicview -pkgver=0.2.2 +pkgver=0.2.3 pkgrel=1 -pkgdesc="Picture viewer of the LXDE Desktop" +pkgdesc="lightweight image viewer" arch=('i686' 'x86_64') license=('GPL2') url="http://lxde.org/" groups=('lxde') -depends=('gtk2') +depends=('gtk2' 'desktop-file-utils') +install=$pkgname.install makedepends=('pkgconfig' 'intltool') optdepends=('librsvg: For SVG support') -source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) -md5sums=('943da9f4a23541accd5acdd4fb69966f') +source=(http://ftp.de.debian.org/debian/pool/main/g/$pkgname/${pkgname}_${pkgver}.orig.tar.xz) +md5sums=('0f1275b5b0ca66e48963a7ccda8a5019') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gpicview/gpicview.install b/community/gpicview/gpicview.install new file mode 100644 index 000000000..bc3abcd40 --- /dev/null +++ b/community/gpicview/gpicview.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/kpartsplugin/PKGBUILD b/community/kpartsplugin/PKGBUILD index c0494e486..13f9135c8 100644 --- a/community/kpartsplugin/PKGBUILD +++ b/community/kpartsplugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60774 2011-12-17 17:24:00Z tredaelli $ +# $Id: PKGBUILD 69899 2012-04-25 21:22:15Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: birdflesh # Contributor: Frikilinux pkgname=kpartsplugin -pkgver=20110823 -pkgrel=2 +pkgver=20120422 +pkgrel=1 pkgdesc="This plugin uses KDE's KParts to embed file viewers into non-KDE browsers" arch=('i686' 'x86_64') url="http://www.unix-ag.uni-kl.de/~fischer/kpartsplugin/" @@ -12,7 +12,7 @@ license=('GPL3' 'BSD') depends=('kdelibs') makedepends=('automoc4' 'cmake') source=("${url}${pkgname}-${pkgver}.tar.bz2" "LICENSE") -md5sums=('d134198ff2f05ba414719920030ea71b' +md5sums=('6f1126a5f9a84374b14d99086a935026' 'c4cc811349e40e9f34e77e27b902ad96') build(){ diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index 1817f38ac..1395fceae 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 67364 2012-03-10 11:47:55Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 69884 2012-04-25 14:08:08Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski # Contributor: Brad Fanella # Contributor: Stefan Husmann # Contributor: Pierre-Paul Paquin # Contributor: xduugu (.desktop and install files) pkgname=mupdf -pkgver=0.9 -pkgrel=2 +pkgver=1.0 +pkgrel=1 pkgdesc="lightweight PDF viewer and toolkit written in portable C" arch=('i686' 'x86_64') url="http://mupdf.com" @@ -15,38 +15,25 @@ license=('GPL3') depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext' 'desktop-file-utils') install=mupdf.install source=("http://mupdf.com/download/$pkgname-$pkgver-source.tar.gz") -md5sums=('76640ee16a797a27fe49cc0eaa87ce3a') +md5sums=('d986ab98e2b035b7abd61afc474562b3') build() { CFLAGS+=" -fPIC" CXXFLAGS+=" -fPIC" - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir"/$pkgname-$pkgver-source make build=release prefix="$pkgdir/usr" } package() { - # Install - cd "$srcdir/$pkgname-$pkgver" - make build=release prefix="${pkgdir}/usr" install + cd "$srcdir"/$pkgname-$pkgver-source + make build=release prefix="$pkgdir/usr" install - # Rename executables - msg "Renaming executables" - cd "${pkgdir}/usr/bin" - for i in pdf*; do - mv "$i" "$i-mupdf"; - done + sed -i 's/mupdf.xpm/mupdf/' debian/mupdf.desktop + sed -i 's/application\/x-pdf/application\/x-pdf/' debian/mupdf.desktop - # Fix mupdf.desktop - cd "$srcdir/$pkgname-$pkgver" - sed -i "s/mupdf.xpm/mupdf/" debian/mupdf.desktop - sed -i "s/application\/x-pdf/application\/x-pdf/" debian/mupdf.desktop + install -Dm644 debian/mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop + install -Dm644 debian/mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm - # Install other stuff - cd "$srcdir/$pkgname-$pkgver/debian" - install -Dm644 mupdf.desktop "$pkgdir/usr/share/applications/mupdf.desktop" - install -Dm644 mupdf.xpm "$pkgdir/usr/share/pixmaps/mupdf.xpm" - - # Fix permissions - chmod 644 $pkgdir/usr/lib/{libmuxps.a,libfitz.a,libmupdf.a} + chmod 644 "$pkgdir"/usr/lib/libfitz.a } diff --git a/community/mupdf/mupdf.install b/community/mupdf/mupdf.install index 7f12704ae..b4632d36d 100644 --- a/community/mupdf/mupdf.install +++ b/community/mupdf/mupdf.install @@ -1,5 +1,4 @@ post_install() { - [ -x /usr/bin/update-desktop-database ] || return 0 update-desktop-database -q } diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD index b9a6a2343..a85ea7973 100644 --- a/community/vdrift/PKGBUILD +++ b/community/vdrift/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 64535 2012-02-15 23:50:18Z svenstaro $ +# $Id: PKGBUILD 69896 2012-04-25 19:15:46Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Anton Bazhenov # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift pkgver=2011.10.22 -pkgrel=4 -pkgdesc="An open source driving simulation made with drift racing in mind" +pkgrel=6 +pkgdesc="Open source driving simulation made with drift racing in mind" arch=('i686' 'x86_64') url="http://vdrift.net/" license=('GPL') @@ -17,7 +17,9 @@ md5sums=('6f8806ab1be303e9e1e47522c9eee890') install=vdrift.install build() { - cd "$srcdir"/$pkgname-${pkgver//./-} + cd "$srcdir" + + cd $pkgname-${pkgver//./-} # select arch if [ `uname -m` = "x86_64" ]; then @@ -56,6 +58,8 @@ package() { "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png install -Dm644 data/textures/icons/vdrift-64x64.png \ "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png + install -Dm644 data/textures/icons/vdrift-64x64.png \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" rm -r $pkgdir/usr/share/vdrift } diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index 80885f298..036da3f52 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 68367 2012-03-23 06:59:41Z svenstaro $ +# $Id: PKGBUILD 69897 2012-04-25 19:17:33Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Arkham # Contributor: Christoph Zeiler pkgname=widelands -pkgver=16 -_realver=build16 -pkgrel=6 +pkgver=17 +_realver=build17 +pkgrel=1 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64') url="http://widelands.org/" license=('GPL') -makedepends=('cmake' 'boost' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2') -source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2 - widelands-0.16-libpng15.patch - 6233_6232.diff +depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2' 'widelands-data') +makedepends=('cmake' 'boost' 'ggz-client-libs') +source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2" $pkgname.desktop $pkgname.png $pkgname.sh) -md5sums=('3d8c28e145b73c64d8ed1625319d25a2' - 'e492620b071cbd1db04280173653a67c' - '9f91bff91a6867cc3ecdea407007d781' +md5sums=('bdc9bc0aa631af1aa7fb450507611a58' '15820bf099fd6f16251fe70a75c534bb' '3dfda7e9ca76ca00dd98d745d0ceb328' '7cae50aba5ed0cd2cfeea79124637b46') @@ -28,8 +25,7 @@ md5sums=('3d8c28e145b73c64d8ed1625319d25a2' build() { cd $srcdir/$pkgname-$_realver-src - patch -Np0 < $srcdir/widelands-0.16-libpng15.patch - patch -Np0 < $srcdir/6233_6232.diff + sed -i "1 i #include " src/main.cc mkdir -p build/compile && cd build/compile @@ -42,8 +38,6 @@ build() { } package() { - depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2' 'widelands-data>=16') - cd $srcdir/$pkgname-$_realver-src/build/compile make DESTDIR="$pkgdir" install diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 6088c88ad..5600a7a8b 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156521 2012-04-20 06:48:44Z andrea $ +# $Id: PKGBUILD 157165 2012-04-25 06:58:42Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=cmake pkgver=2.8.8 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') url="http://www.cmake.org/" @@ -13,12 +13,17 @@ depends=('curl' 'libarchive' 'shared-mime-info') makedepends=('qt') optdepends=('qt: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") -md5sums=('ba74b22c788a0c8547976b880cd02b17') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" + 'fix-pkg-config.patch') +md5sums=('ba74b22c788a0c8547976b880cd02b17' + '32c6a4360a2ba12dc77b6a840fa7672b') build() { cd "${srcdir}"/${pkgname}-${pkgver} + # FS#29545 + patch -p1 -i "${srcdir}"/fix-pkg-config.patch + ./bootstrap --prefix=/usr \ --mandir=/share/man \ --docdir=/share/doc/cmake \ diff --git a/extra/cmake/fix-pkg-config.patch b/extra/cmake/fix-pkg-config.patch new file mode 100644 index 000000000..c9390aec2 --- /dev/null +++ b/extra/cmake/fix-pkg-config.patch @@ -0,0 +1,31 @@ +X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindPkgConfig.cmake;h=39d3a76abd852df4a32eab5f8d5672fa24a7e4cf;hp=5d93ab151de792b4565cbef1927f372be633f4a6;hb=3ea850a5023060b84dcc0e6f0098c32c28b15807;hpb=ad3d2b450f1c2454cd1a3f416ef97631e2937eef + +diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake +index 5d93ab1..39d3a76 100644 +--- a/Modules/FindPkgConfig.cmake ++++ b/Modules/FindPkgConfig.cmake +@@ -13,11 +13,10 @@ + # When the 'QUIET' argument is set, no status messages will be printed. + # + # It sets the following variables: +-# PKG_CONFIG_FOUND ... true if pkg-config works on the system ++# PKG_CONFIG_FOUND ... if pkg-config executable was found + # PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program + # PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found + # (since CMake 2.8.8) +-# PKG_CONFIG_FOUND ... if pkg-config executable was found + # + # For the following variables two sets of values exist; first one is the + # common one and has the given PREFIX. The second set contains flags +@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig + REQUIRED_VARS PKG_CONFIG_EXECUTABLE + VERSION_VAR PKG_CONFIG_VERSION_STRING) + ++# This is needed because the module name is "PkgConfig" but the name of ++# this variable has always been PKG_CONFIG_FOUND so this isn't automatically ++# handled by FPHSA. ++set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}") ++ + # Unsets the given variables + macro(_pkgconfig_unset var) + set(${var} "" CACHE INTERNAL "") diff --git a/extra/cups-filters/PKGBUILD b/extra/cups-filters/PKGBUILD index b1eef9fce..8483f5f02 100644 --- a/extra/cups-filters/PKGBUILD +++ b/extra/cups-filters/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155821 2012-04-07 06:09:20Z andyrtr $ +# $Id: PKGBUILD 157192 2012-04-25 13:19:30Z andyrtr $ # Maintainer: Andreas Radke pkgname=cups-filters -pkgver=1.0.12 +pkgver=1.0.17 pkgrel=1 pkgdesc="OpenPrinting CUPS Filters" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ backup=() #options=(!makeflags) install= source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz) -md5sums=('aace03cc690dde7809d6cb5394accfa4') +md5sums=('5132b018cc503e9338fbd029acf56e55') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-pilot/PKGBUILD b/extra/gnome-pilot/PKGBUILD index 9a780339e..f558b2713 100644 --- a/extra/gnome-pilot/PKGBUILD +++ b/extra/gnome-pilot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139311 2011-10-01 18:58:09Z ibiru $ +# $Id: PKGBUILD 157208 2012-04-26 02:01:26Z eric $ # Jan de Groot pkgname=gnome-pilot pkgver=2.91.93 -pkgrel=1 +pkgrel=2 pkgdesc="Pilot Support for Gnome" arch=(i686 x86_64) license=('GPL') @@ -30,6 +30,6 @@ package() { make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 60da0cb70..4cf1daec8 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156847 2012-04-23 09:07:29Z ibiru $ +# $Id: PKGBUILD 157198 2012-04-25 14:06:29Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=gnome-settings-daemon pkgver=3.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -15,14 +15,30 @@ install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - systemd-fallback.patch) + systemd-fallback.patch + evironment.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=9d7ea1d0b8b90b55f916751858a210a2e02a06b6 + arguments.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=00681573ad6ebeb127ec72ac61d30d69be6459f8 + mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=053f48b3b1b9a3b2ab0714d470da4354735d0c4b + glist-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=214a832820f6448f07d438f6686267eaf8301dd1 + mouse-mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=09c215b42312ca5bb63b215c2f95231613b3103d) sha256sums=('d5d4a270ec5692cdc56a58cfb57bc7f8fa93374566912a65e78c1c3db7faf4ed' - '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008') + '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008' + '1ba33f6eadac4c54f3f08f4bce075d2bef8124f857f5af22eaee010c8d38bc3b' + '884a959b334f864f75dcb4eec8c137785f587c7c2ae57906f8b4e60e04c29246' + '3a3f8b2964406b9b3c85c05f25e677e8c9eaa221779b95826ffbc0474740decc' + 'af3bda801befdbd3d318723ae6de3aaf7df1e16bccd84e13f15b57f2dceaefcd' + '43b7397e622a2c19091b3665822e9461067fb6a497b9507418a3bbb100a69e1b') build() { cd $pkgname-$pkgver patch -Np1 -i ../systemd-fallback.patch + patch -Np1 -i ../evironment.patch + patch -Np1 -i ../arguments.patch + patch -Np1 -i ../mem-leak.patch + patch -Np1 -i ../glist-leak.patch + patch -Np1 -i ../mouse-mem-leak.patch + gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \ --enable-systemd diff --git a/extra/lv2/PKGBUILD b/extra/lv2/PKGBUILD new file mode 100644 index 000000000..a45496af2 --- /dev/null +++ b/extra/lv2/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 157185 2012-04-25 12:13:02Z schiv $ +# Maintainer: Ray Rashif + +pkgname=lv2 +pkgver=1.0.0 +pkgrel=2 +pkgdesc="Successor to the LADSPA audio plug-in standard" +url="http://lv2plug.in/" +license=('LGPL' 'custom') +arch=('i686' 'x86_64') +makedepends=('python2' 'libsndfile' 'gtk2') +optdepends=('libsndfile: lv2-eg-sampler' + 'gtk2: lv2-eg-sampler') +provides=('lv2core') +conflicts=('lv2core') +replaces=('lv2core') +source=("http://lv2plug.in/spec/$pkgname-$pkgver.tar.bz2") +md5sums=('af98a50d8dfa8318a69800ea48b421f6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf configure --prefix=/usr + python2 waf build $MAKEFLAGS +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf install --destdir="$pkgdir" + + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index fb34b6640..112dbfaac 100644 --- a/extra/virtuoso/PKGBUILD +++ b/extra/virtuoso/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148047 2012-01-30 18:21:09Z andrea $ +# $Id: PKGBUILD 157183 2012-04-25 11:45:58Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Massimiliano Torromeo pkgname=virtuoso -pkgver=6.1.4 -pkgrel=2 +pkgver=6.1.5 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality' url='http://virtuoso.openlinksw.com/wiki/main/Main/' @@ -13,7 +13,7 @@ depends=('libldap') makedepends=('bison' 'flex') options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz") -md5sums=('7110a0b4b171b84850d346f4fe648172') +md5sums=('61b53395e14a11dd7e7715b50261b9eb') build() { cd ${srcdir}/${pkgname}-opensource-${pkgver} diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD index b4e26c64e..e094acd03 100644 --- a/extra/webmin/PKGBUILD +++ b/extra/webmin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152241 2012-03-05 19:12:45Z tpowa $ +# $Id: PKGBUILD 157190 2012-04-25 13:14:12Z tpowa $ # Maintainer: Tobias Powalowski pkgname=webmin pkgver=1.580 -pkgrel=1 +pkgrel=2 pkgdesc="a web-based interface for system administration" arch=(i686 x86_64) license=('custom:webmin') @@ -86,7 +86,8 @@ install=webmin.install source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2 - webmin.rc) + webmin.rc + webmin.service) options=(!strip) build() { @@ -203,6 +204,9 @@ build() { #install rc file install -D -m 755 $startdir/src/webmin.rc $startdir/pkg/etc/rc.d/webmin + # install systemd files + install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service + # delete temp dir rm -r $startdir/pkg/tmp # change sticky bit @@ -213,4 +217,5 @@ build() { md5sums=('2aa5378bc3ed6471c460d18e87a06fa3' '43a77243acd519c4efe9577090b59912' 'bfebb75bb94029b48c46b7f1ba1aa811' - '0673e51af0e81418b4a6c1e205f7e5cd') + 'c77dfcd621b417a7826d25f56a1e60ae' + 'fc29ecb6a5cd8c278abe054e60381095') diff --git a/extra/webmin/webmin.rc b/extra/webmin/webmin.rc index ee83fbea2..6aac8941d 100644 --- a/extra/webmin/webmin.rc +++ b/extra/webmin/webmin.rc @@ -14,6 +14,7 @@ case "$1" in RETVAL=$? if [ "$RETVAL" = "0" ]; then touch $lockfile >/dev/null 2>&1 + add_daemon webmin stat_done else stat_fail @@ -26,6 +27,7 @@ fi RETVAL=$? if [ "$RETVAL" = "0" ]; then rm -f $lockfile + rm_daemon webmin stat_done else stat_fail @@ -33,8 +35,8 @@ fi ;; 'restart') - $stop && $start - RETVAL=$? + $0 stop + $0 start ;; *) echo "Usage: $0 { start | stop | restart }" diff --git a/extra/webmin/webmin.service b/extra/webmin/webmin.service new file mode 100644 index 000000000..a8a384a8c --- /dev/null +++ b/extra/webmin/webmin.service @@ -0,0 +1,11 @@ +[Unit] +Description=Webmin + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/etc/webmin/start +ExecStop=/etc/webmin/stop + +[Install] +WantedBy=multi-user.target diff --git a/extra/xfce4-mount-plugin/PKGBUILD b/extra/xfce4-mount-plugin/PKGBUILD index f179c66e8..f0d684d2c 100644 --- a/extra/xfce4-mount-plugin/PKGBUILD +++ b/extra/xfce4-mount-plugin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156689 2012-04-22 23:46:49Z eric $ +# $Id: PKGBUILD 157202 2012-04-25 17:31:31Z eric $ # Maintainer: AndyRTR # Contributor: Tobias Kieslich pkgname=xfce4-mount-plugin -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Plugin for the Xfce4 panel to mount and unmount volumes" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('intltool') options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('0b9dee13886639aea8b4ca3158b9cdf7') +sha1sums=('dbbf8e29c50ec1cd9ba0fa65f7255ca0788a372e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre-testing/icedove-libre/PKGBUILD b/libre-testing/icedove-libre/PKGBUILD index 4d5ee4bb9..9beba51a8 100644 --- a/libre-testing/icedove-libre/PKGBUILD +++ b/libre-testing/icedove-libre/PKGBUILD @@ -29,6 +29,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" vendor.js makefile.patch gcc47.patch + rules.patch searchplugins-libre.patch) md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc' 'cb3dba2916bdf2deb72248b0984c4302' @@ -38,7 +39,8 @@ md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc' '4eecc4fc5aafaf0da651a09eadc90bee' '5a6282bb005d596aa4ab1884ac6b0517' '66376a8e934013078f0e646e49614937' - '836528f4b4907a3ffb3f3a3c46e2c442') + '2e6a57dc04b4a7255f5f1f3642af23ac' + '8f6d5be227bb68e1558dd6674cbba446') build() { export QUILT_PATCHES=debian/patches @@ -56,9 +58,10 @@ build() { cp "$srcdir/mozconfig" .mozconfig patch -Np1 -i "$srcdir/gcc47.patch" patch -Np1 -i "$srcdir/makefile.patch" + patch -Np1 -i "$srcdir/rules.patch" # Removing non-free search plugins replacing them with duckduckgo and identi.ca - patch -Np1 -i "$srcdir/searchplugins-libre.patch" + patch -Np0 -i "$srcdir/searchplugins-libre.patch" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" } @@ -71,13 +74,14 @@ package() { install -m644 "$srcdir/channel-prefs.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref" # Recommend free addons for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - install -Dm644 "$debian/app-icons/$_pkgname${i/x*/}.png" "/usr/share/icons/hicolor/$i/apps/$_pkgname.png" + install -Dm644 debian/app-icons/$_pkgname${i/x*/}.png \ + "$pkgdir/usr/share/icons/hicolor/$i/apps/$_pkgname.png" + install -Dm644 debian/app-icons/icedovebig.svg \ + "$pkgdir/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg" done - install -Dm644 "$debian/app-icons/$_pkgname_icon.svg" "/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg" rm -rf "$pkgdir"/usr/lib/$_pkgname/{dictionaries,hyphenation} ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation" - ln -sf $_pkgname /usr/lib/$_pkgname/$_pkgname usr/bin/$_pkgname rm -r "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} # We don't want the development stuff } diff --git a/libre-testing/icedove-libre/searchplugins-libre.patch b/libre-testing/icedove-libre/searchplugins-libre.patch index 9de805e96..19c1ea5ab 100644 --- a/libre-testing/icedove-libre/searchplugins-libre.patch +++ b/libre-testing/icedove-libre/searchplugins-libre.patch @@ -1,5 +1,5 @@ ---- mozilla-build.orig/mail/locales/en-US/searchplugins/list.txt 2012-03-27 15:56:00.000000000 -0300 -+++ mozilla-build/mail/locales/en-US/searchplugins/list.txt 2012-04-13 05:43:25.227475353 -0300 +--- mail.orig/locales/en-US/searchplugins/list.txt 2012-03-27 15:56:00.000000000 -0300 ++++ mail/locales/en-US/searchplugins/list.txt 2012-04-13 05:43:25.227475353 -0300 @@ -1,8 +1,5 @@ -amazondotcom -aol-web-search @@ -12,7 +12,7 @@ +identica-people-search wikipedia -yahoo ---- mozilla-build.orig/mail/locales/en-US/searchplugins/amazondotcom.xml 2012-03-27 15:56:00.000000000 -0300 +--- mail/locales/en-US/searchplugins/amazondotcom.xml 2012-03-27 15:56:00.000000000 -0300 +++ /dev/null 2012-04-12 23:52:53.981159155 -0300 @@ -1,11 +0,0 @@ - @@ -26,7 +26,7 @@ - -http://www.amazon.com/ - ---- mozilla-build.orig/mail/locales/en-US/searchplugins/aol-web-search.xml 2012-03-27 15:56:00.000000000 -0300 +--- mail/locales/en-US/searchplugins/aol-web-search.xml 2012-03-27 15:56:00.000000000 -0300 +++ /dev/null 2012-04-12 23:52:53.981159155 -0300 @@ -1,10 +0,0 @@ - @@ -39,9 +39,9 @@ - - - ---- mozilla-build.orig/mail/locales/en-US/searchplugins/bing.xml 2012-03-27 15:56:00.000000000 -0300 -+++ /dev/null 2012-04-12 23:52:53.981159155 -0300 -@@ -1,21 +0,0 @@ +--- mail/locales/en-US/searchplugins/bing.xml 2012-03-06 13:44:50.000000000 -0200 ++++ /dev/null 2012-04-25 14:16:16.847855589 -0300 +@@ -1,17 +0,0 @@ - - Bing - Bing. Search by Microsoft. @@ -53,17 +53,13 @@ - - - -- -- - - - -- -- - - http://www.bing.com/search - ---- mozilla-build.orig/mail/locales/en-US/searchplugins/google.xml 2012-03-27 15:56:00.000000000 -0300 +--- mail/locales/en-US/searchplugins/google.xml 2012-03-27 15:56:00.000000000 -0300 +++ /dev/null 2012-04-12 23:52:53.981159155 -0300 @@ -1,14 +0,0 @@ - @@ -80,7 +76,7 @@ - -http://www.google.com - ---- comm-release.orig/mail/locales/en-US/searchplugins/twitter.xml 2012-03-27 15:56:00.000000000 -0300 +--- mail/locales/en-US/searchplugins/twitter.xml 2012-03-27 15:56:00.000000000 -0300 +++ /dev/null 2012-04-12 23:52:53.981159155 -0300 @@ -1,10 +0,0 @@ - @@ -93,7 +89,7 @@ -http://search.twitter.com/ - - ---- mozilla-build.orig/mail/locales/en-US/searchplugins/yahoo.xml 2012-03-27 15:56:00.000000000 -0300 +--- mail/locales/en-US/searchplugins/yahoo.xml 2012-03-27 15:56:00.000000000 -0300 +++ /dev/null 2012-04-12 23:52:53.981159155 -0300 @@ -1,13 +0,0 @@ - @@ -110,7 +106,7 @@ -http://search.yahoo.com/ - --- /dev/null 2012-04-12 23:52:53.981159155 -0300 -+++ mozilla-build/mail/locales/en-US/searchplugins/duckduckgo-ssl.xml 2012-04-09 14:43:56.000000000 -0300 ++++ mail/locales/en-US/searchplugins/duckduckgo-ssl.xml 2012-04-09 14:43:56.000000000 -0300 @@ -0,0 +1,11 @@ + +DuckDuckGo RU SSL @@ -124,7 +120,7 @@ + + --- /dev/null 2012-04-12 23:52:53.981159155 -0300 -+++ mozilla-build/mail/locales/en-US/searchplugins/identica-notice-search.xml 2012-04-13 05:15:55.000000000 -0300 ++++ mail/locales/en-US/searchplugins/identica-notice-search.xml 2012-04-13 05:15:55.000000000 -0300 @@ -0,0 +1,7 @@ + +Identi.ca Notice Search @@ -134,7 +130,7 @@ + + --- /dev/null 2012-04-12 23:52:53.981159155 -0300 -+++ mozilla-build/mail/locales/en-US/searchplugins/identica-people-search.xml 2012-04-13 05:15:53.000000000 -0300 ++++ mail/locales/en-US/searchplugins/identica-people-search.xml 2012-04-13 05:15:53.000000000 -0300 @@ -0,0 +1,7 @@ + +Identi.ca People Search diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD index 9c0cf3978..3e2e316a9 100644 --- a/libre/unarchiver/PKGBUILD +++ b/libre/unarchiver/PKGBUILD @@ -2,36 +2,41 @@ # Contributor: N30N pkgname=unarchiver -pkgver=3.0 -pkgrel=1.1 +pkgver=3.1 +pkgrel=1 pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686') -url="http://wakaba.c3.cx/s/apps/unarchiver.html" +url="http://unarchiver.c3.cx/" license=('LGPL2.1') depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib') makedepends=('gcc-objc') source=("http://theunarchiver.googlecode.com/files/TheUnarchiver${pkgver}_src.zip" "native_obj_exceptions.patch" "libz.patch") +sha1sums=('a8a28e3372a8811689c39871f5de86c64c8c466c' + 'b8024026607dc2de758479b73d8b01ca6f692b59' + '003d114a0ba9a919af602881ef5e04cdba2e4c50') build() { - cd $srcdir/ + cd "$srcdir/The Unarchiver" + + patch -p1 < ../native_obj_exceptions.patch + patch -p1 < ../libz.patch - patch -Np1 -i native_obj_exceptions.patch - patch -Np1 -i libz.patch - cd XADMaster . /usr/share/GNUstep/Makefiles/GNUstep.sh make -f Makefile.linux } package() { - cd "$srcdir/XADMaster" + cd "$srcdir/The Unarchiver/XADMaster" install -d "$pkgdir/usr/bin/" install -m755 unar lsar "$pkgdir/usr/bin/" + + cd "$srcdir/The Unarchiver/Extra" + install -d "$pkgdir/usr/share/man/man1" + gzip -c lsar.1 > "$pkgdir/usr/share/man/man1"/lsar.1.gz + gzip -c unar.1 > "$pkgdir/usr/share/man/man1"/unar.1.gz } # vim:set ts=2 sw=2 et: -md5sums=('c7c42cd3640bf477b79b21436344f098' - '4fa4ecc6e4ba14d3b6952d064e728511' - '665d01bf93191cc6f57dc80d8c1d3d5a') diff --git a/staging/eog-plugins/PKGBUILD b/staging/eog-plugins/PKGBUILD new file mode 100644 index 000000000..af836a0bd --- /dev/null +++ b/staging/eog-plugins/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 157181 2012-04-25 10:59:48Z allan $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=eog-plugins +pkgver=3.4.0 +pkgrel=2 +pkgdesc="Plugins for Eye of Gnome" +arch=('i686' 'x86_64') +url="http://www.gnome.org/" +license=('GPL2') +depends=('eog' 'libchamplain' 'libgdata') +makedepends=('intltool') +install=eog-plugins.install +options=('!libtool') +groups=(gnome-extra) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('21a63f8f6e3a5b30f2f05133edc46becd4c83343c0f462a345204326071bc139') + +build() { + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/eog-plugins/eog-plugins.install b/staging/eog-plugins/eog-plugins.install new file mode 100644 index 000000000..24072f316 --- /dev/null +++ b/staging/eog-plugins/eog-plugins.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/eog/PKGBUILD b/staging/eog/PKGBUILD new file mode 100644 index 000000000..125cef627 --- /dev/null +++ b/staging/eog/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 157179 2012-04-25 10:47:54Z allan $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=eog +pkgver=3.4.1 +pkgrel=2 +pkgdesc="Eye of Gnome: An image viewing and cataloging program" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf') +makedepends=('gtk-doc' 'intltool') +install=eog.install +groups=('gnome-extra') +options=('!emptydirs' '!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('cf29997ee065341fa323abc849732bfa18ab564cc0d931d61eaa473953d3e216') + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-scrollkeeper + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # remove it from Xfce menu that ships its own thingy + echo "NotShowIn=XFCE" >> $pkgdir/usr/share/applications/eog.desktop +} diff --git a/staging/eog/eog.install b/staging/eog/eog.install new file mode 100644 index 000000000..1571179ca --- /dev/null +++ b/staging/eog/eog.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/gedit/PKGBUILD b/staging/gedit/PKGBUILD new file mode 100644 index 000000000..33e67cf65 --- /dev/null +++ b/staging/gedit/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 157212 2012-04-26 03:41:42Z allan $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gedit +pkgver=3.4.1 +pkgrel=2 +pkgdesc="A text editor for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf') +makedepends=('yelp-tools' 'intltool') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +install=gedit.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9b1f0164d6c6bc08e391efde7e6a2aa9290a65bda543fe3a7adc6ef73b722a64') + +build() { + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib --disable-updater --disable-schemas-compile \ + --enable-python + make +} + +package(){ + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/staging/gedit/gedit.install b/staging/gedit/gedit.install new file mode 100644 index 000000000..606920688 --- /dev/null +++ b/staging/gedit/gedit.install @@ -0,0 +1,18 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q +} + +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/gedit.schemas ]; then + gconfpkg --uninstall gedit + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/staging/gjs/PKGBUILD b/staging/gjs/PKGBUILD new file mode 100644 index 000000000..6b0e959f0 --- /dev/null +++ b/staging/gjs/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 157206 2012-04-26 00:19:23Z allan $ +# Maintainer: Ionut Biru + +pkgname=gjs +pkgver=1.32.0 +pkgrel=2 +pkgdesc="Javascript Bindings for GNOME" +arch=('i686' 'x86_64') +url="http://live.gnome.org/Gjs" +license=('GPL') +depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js') +options=('!libtool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('b9f1dc156c15806824c936bb08ddc5048f52f6921654146c47025a62457108c0') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i 's|python|python2|' scripts/make-tests + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/staging/gnome-documents/PKGBUILD b/staging/gnome-documents/PKGBUILD new file mode 100644 index 000000000..493c1323b --- /dev/null +++ b/staging/gnome-documents/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 157210 2012-04-26 03:26:37Z allan $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=gnome-documents +pkgver=0.4.1 +pkgrel=2 +pkgdesc="Documents Manager for GNOME" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL') +groups=('gnome-extra') +depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' 'tracker') +makedepends=('intltool') +optdepends=('unoconv: Support for Libreoffice document types') +options=('!libtool') +install=gnome-documents.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('2b2c6b15ed9e6a46602977f1e8dc15e6655c171df8ede6a3f8a749ed6682da46') + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-documents + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/gnome-documents/gnome-documents.install b/staging/gnome-documents/gnome-documents.install new file mode 100644 index 000000000..1571179ca --- /dev/null +++ b/staging/gnome-documents/gnome-documents.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/libpeas/PKGBUILD b/staging/libpeas/PKGBUILD new file mode 100644 index 000000000..5e1ab21e5 --- /dev/null +++ b/staging/libpeas/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 157159 2012-04-25 04:34:31Z tdziedzic $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=libpeas +pkgver=1.4.0 +pkgrel=2 +pkgdesc="A GObject-based plugins engine" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection') +makedepends=('gtk-doc' 'intltool' 'vala' 'python2-gobject' 'gjs' 'seed' 'glade') +optdepends=('gjs: gobject-based plugin engine - gjs runtime loader' + 'seed: gobject-based plugin engine - seed runtime loader') +options=('!libtool') +install=libpeas.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) +sha256sums=('d508df249d5aefad0e5a720095e0103355ab13856dae6a10e6e5b8235d5eecf6') + +build() { + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc --localstatedir=/var --enable-vala + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/libpeas/libpeas.install b/staging/libpeas/libpeas.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/staging/libpeas/libpeas.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/mutter/PKGBUILD b/staging/mutter/PKGBUILD new file mode 100644 index 000000000..36fd4580e --- /dev/null +++ b/staging/mutter/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 157214 2012-04-26 03:48:13Z allan $ +# Maintainer: Jan "heftig" Steffens +# Maintainer: Ionut Biru +# Contributor: Michael Kanis + +pkgname=mutter +pkgver=3.4.1 +pkgrel=2 +pkgdesc="A window manager for GNOME" +arch=(i686 x86_64) +license=('GPL') +depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity') +makedepends=('intltool' 'gnome-doc-utils') +url="http://www.gnome.org" +groups=('gnome') +options=('!libtool' '!emptydirs') +install=mutter.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('dbf08b014179980ab3d0cce645c5391c83b0ce070c73504feea8eec0ad000449') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/mutter \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/staging/mutter/mutter.install b/staging/mutter/mutter.install new file mode 100644 index 000000000..c47f1cef2 --- /dev/null +++ b/staging/mutter/mutter.install @@ -0,0 +1,19 @@ +pkgname=mutter + +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then + /usr/sbin/gconfpkg --uninstall $pkgname + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/pygobject/PKGBUILD b/staging/pygobject/PKGBUILD new file mode 100644 index 000000000..32ecf3c73 --- /dev/null +++ b/staging/pygobject/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 157173 2012-04-25 10:19:14Z allan $ +# Maintainer: Ionut Biru + +pkgbase=pygobject +pkgname=(python-gobject python2-gobject pygobject-devel) +pkgver=3.2.0 +pkgrel=2 +arch=('i686' 'x86_64') +url="https://live.gnome.org/PyGObject" +license=('LGPL') +makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +options=('!libtool') +sha256sums=('1a2140c4c4ce0c1a5d7abe74eeb7a7040f426cb17943c3ae7e57695b355151c3') + +build() { + cp -a "$pkgbase-$pkgver" python2-build + mkdir devel + + ( + cd python2-build + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr + make + ) + + ( + cd "$pkgbase-$pkgver" + ./configure --prefix=/usr + make + ) +} + +package_python-gobject() { + pkgdesc="Python 3 bindings for GObject" + depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver") + + cd "$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + rm -r "$pkgdir"/usr/{include,lib/pkgconfig} +} + +package_python2-gobject() { + pkgdesc="Python 2 bindings for GObject" + depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver") + + cd "python2-build" + make DESTDIR="$pkgdir" install + mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel" +} + +package_pygobject-devel() { + pkgdesc="Development files for the pygobject bindings" + cd "devel" + mkdir -p "$pkgdir"/usr/{include,lib} + mv include "$pkgdir/usr/" + mv pkgconfig "$pkgdir/usr/lib/" +} diff --git a/staging/pygobject2/PKGBUILD b/staging/pygobject2/PKGBUILD new file mode 100644 index 000000000..90890135d --- /dev/null +++ b/staging/pygobject2/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 157175 2012-04-25 10:25:02Z allan $ +# Maintainer: Jan de Groot + +pkgbase=pygobject2 +pkgname=(python-gobject2 python2-gobject2 pygobject2-devel) +pkgver=2.28.6 +pkgrel=5 +arch=('i686' 'x86_64') +url="http://www.pygtk.org/" +license=('LGPL') +makedepends=('python' 'python2') +source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz + python3-fix-build.patch + python3-fix-maketrans.patch) +options=('!libtool') +sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8' + 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca' + '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a') + +build() { + cd "${srcdir}" + cp -a "pygobject-${pkgver}" python2-build + mkdir devel + + ( + cd python2-build + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr --disable-introspection + make + ) + + ( + cd "pygobject-${pkgver}" + #patches available in 2.28 branch but unreleased. + patch -Np1 -i "${srcdir}/python3-fix-build.patch" + patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" + + ./configure --prefix=/usr --disable-introspection + make + ) +} + +package_python-gobject2() { + pkgdesc="Python 3 bindings for GObject2" + depends=('glib2' 'pygobject2-devel' 'python') + replaces=('py3gobject') + provides=("py3gobject=$pkgver") + + cd "${srcdir}/pygobject-${pkgver}" + make DESTDIR="${pkgdir}" install + + # Delete devel stuff + rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} +} + +package_python2-gobject2() { + pkgdesc="Python 2 bindings for GObject2" + depends=('glib2' 'pygobject2-devel' 'python2') + replaces=('pygobject') + provides=("pygobject=$pkgver") + + cd "${srcdir}/python2-build" + make DESTDIR="${pkgdir}" install + + find "$pkgdir"/usr/share/pygobject -name '*.py' | \ + xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" + + # Split devel stuff + mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \ + "$srcdir/devel/" +} + +package_pygobject2-devel() { + pkgdesc="Development files for the pygobject bindings" + + cd "${srcdir}/devel" + mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject} + + mv include "$pkgdir/usr/" + mv pkgconfig "$pkgdir/usr/lib/" + mv gtk-doc "$pkgdir/usr/share/" + mv xsl "$pkgdir/usr/share/pygobject/" +} diff --git a/staging/pygobject2/python3-fix-build.patch b/staging/pygobject2/python3-fix-build.patch new file mode 100644 index 000000000..4cb8cfe57 --- /dev/null +++ b/staging/pygobject2/python3-fix-build.patch @@ -0,0 +1,34 @@ +From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro +Date: Thu, 21 Apr 2011 14:52:20 +0000 +Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore + +--- +diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c +index 81b9865..edf52d7 100644 +--- a/gi/pygi-foreign-cairo.c ++++ b/gi/pygi-foreign-cairo.c +@@ -30,7 +30,7 @@ + #include + #endif + +-Pycairo_CAPI_t *Pycairo_CAPI; ++static Pycairo_CAPI_t *Pycairo_CAPI; + + #include "pygi-foreign.h" + +@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info, + static PyMethodDef _gi_cairo_functions[] = {0,}; + PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo") + { ++#if PY_VERSION_HEX < 0x03000000 + Pycairo_IMPORT; ++#else ++ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI"); ++#endif ++ + if (Pycairo_CAPI == NULL) + return PYGLIB_MODULE_ERROR_RETURN; + +-- +cgit v0.9 diff --git a/staging/pygobject2/python3-fix-maketrans.patch b/staging/pygobject2/python3-fix-maketrans.patch new file mode 100644 index 000000000..f5bc0e77c --- /dev/null +++ b/staging/pygobject2/python3-fix-maketrans.patch @@ -0,0 +1,36 @@ +From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Wed, 13 Jul 2011 06:42:22 +0000 +Subject: [python3] Fix maketrans import + +Python3 moved the maketrans() function from the string module to a str method. +This unbreaks gi/module.py for Python 3 again. +--- +diff --git a/gi/module.py b/gi/module.py +index 70df76c..d56bdaf 100644 +--- a/gi/module.py ++++ b/gi/module.py +@@ -24,7 +24,11 @@ from __future__ import absolute_import + + import os + import gobject +-import string ++try: ++ maketrans = ''.maketrans ++except AttributeError: ++ # fallback for Python 2 ++ from string import maketrans + + import gi + from .overrides import registry +@@ -124,7 +128,7 @@ class IntrospectionModule(object): + # Don't use upper() here to avoid locale specific + # identifier conversion (e. g. in Turkish 'i'.upper() == 'i') + # see https://bugzilla.gnome.org/show_bug.cgi?id=649165 +- ascii_upper_trans = string.maketrans( ++ ascii_upper_trans = maketrans( + 'abcdefgjhijklmnopqrstuvwxyz', + 'ABCDEFGJHIJKLMNOPQRSTUVWXYZ') + for value_info in info.get_values(): +-- +cgit v0.9 diff --git a/staging/seed/PKGBUILD b/staging/seed/PKGBUILD new file mode 100644 index 000000000..0c1700896 --- /dev/null +++ b/staging/seed/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 157177 2012-04-25 10:32:19Z allan $ +#Maintainer : Ionut Biru +#Contributor: Jan de Groot + +pkgname=seed +pkgver=3.2.0 +pkgrel=2 +pkgdesc="Library and interpreter for JavaScript with GObject type system bindings." +arch=('i686' 'x86_64') +url="http://live.gnome.org/Seed/" +license=('LGPL') +options=('!libtool') +depends=('libwebkit3' 'gobject-introspection' 'gnome-js-common') +makedepends=('intltool') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) +sha256sums=('3d1eca40834b72a5730ddaf8a5f46b8df20ddb2b3b39687d1a84ef966d3d37c0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/sushi/PKGBUILD b/staging/sushi/PKGBUILD new file mode 100644 index 000000000..53d89b06b --- /dev/null +++ b/staging/sushi/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 157216 2012-04-26 03:55:30Z allan $ +# Maintainer: Ionut Biru + +pkgname=sushi +pkgver=0.4.1 +pkgrel=2 +pkgdesc="A quick previewer for Nautilus" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL2') +groups=(gnome-extra) +depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz3' 'libwebkit3' 'gtksourceview3' 'evince') +makedepends=('intltool' 'gobject-introspection') +options=(!libtool) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('7889e4309443dd7dfd5c9546af23565d15813c3f8f2af6c6776702ca8911a7bd') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --libexecdir=/usr/lib/sushi + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/inetutils/PKGBUILD b/testing/inetutils/PKGBUILD new file mode 100644 index 000000000..4a53f7f27 --- /dev/null +++ b/testing/inetutils/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 157204 2012-04-25 19:44:02Z eric $ +# Maintainer: Eric Bélanger + +pkgname=inetutils +pkgver=1.9.1 +pkgrel=2 +pkgdesc="A collection of common network programs" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/inetutils/" +license=('GPL3') +groups=('base') +depends=('readline' 'ncurses' 'pam') +backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \ + 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh') +options=('!emptydirs') +install=inetutils.install +source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \ + ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \ + dnsdomainname) +sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90' + 'ff0aad9946a38915580b094dadf67e790e8a2f87' + '84dc802b5e57b5e04c847572225a3b9612017155' + '68a590083b45997dfdb80e666b2de762f494ba74' + 'bfad98a4a62f1fff8779f076c6019ed07f9111af' + '27d99b910eec0fc26bd79ccc2c1de26608330298' + '81f10b3b688e3952f793b35bcef63b5bf257a92b' + '81f4a8da823cf0bb14284fc71ee6108849691eda' + 'eb952b0b9c3e3d429d8e21b110249e495f0e0e63') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \ + --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \ + --without-wrap --with-pam \ + --enable-ftp --enable-ftpd \ + --enable-telnet --enable-telnetd \ + --enable-talk --enable-talkd \ + --enable-rlogin --enable-rlogind \ + --enable-rsh --enable-rshd \ + --enable-rcp --enable-hostname \ + --disable-rexec --disable-rexecd \ + --disable-tftp --disable-tftpd \ + --disable-ping --disable-ping6 \ + --disable-logger --disable-syslogd \ + --disable-inetd --disable-whois \ + --disable-uucpd --disable-ifconfig --disable-traceroute + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/bin" + ln -s /usr/bin/hostname "${pkgdir}/bin/hostname" + install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname" + echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1" + install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd" + install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd" + install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet" + install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk" + install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin" + install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh" +} diff --git a/testing/inetutils/dnsdomainname b/testing/inetutils/dnsdomainname new file mode 100644 index 000000000..a1b8a8c31 --- /dev/null +++ b/testing/inetutils/dnsdomainname @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/bin/hostname -d "$@" diff --git a/testing/inetutils/ftpd.conf b/testing/inetutils/ftpd.conf new file mode 100644 index 000000000..f660f0035 --- /dev/null +++ b/testing/inetutils/ftpd.conf @@ -0,0 +1,4 @@ +# +# Parameters to be passed to ftpd +# +FTPD_ARGS="" diff --git a/testing/inetutils/ftpd.rc b/testing/inetutils/ftpd.rc new file mode 100644 index 000000000..3d0d34421 --- /dev/null +++ b/testing/inetutils/ftpd.rc @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/ftpd + +PID=$(pidof -o %PPID /usr/sbin/ftpd) +case "$1" in + start) + stat_busy "Starting ftpd" + [ -z "$PID" ] && /usr/sbin/ftpd -D $FTPD_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon ftpd + stat_done + fi + ;; + stop) + stat_busy "Stopping ftpd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon ftpd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/inetutils/inetutils.install b/testing/inetutils/inetutils.install new file mode 100644 index 000000000..b338fa498 --- /dev/null +++ b/testing/inetutils/inetutils.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(inetutils.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/testing/inetutils/rlogin.xinetd b/testing/inetutils/rlogin.xinetd new file mode 100644 index 000000000..5c72f86df --- /dev/null +++ b/testing/inetutils/rlogin.xinetd @@ -0,0 +1,10 @@ +service login +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/sbin/rlogind + log_on_failure += USERID + disable = yes +} diff --git a/testing/inetutils/rsh.xinetd b/testing/inetutils/rsh.xinetd new file mode 100644 index 000000000..a13738c31 --- /dev/null +++ b/testing/inetutils/rsh.xinetd @@ -0,0 +1,10 @@ +service shell +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/sbin/rshd + log_on_failure += USERID + disable = yes +} diff --git a/testing/inetutils/talk.xinetd b/testing/inetutils/talk.xinetd new file mode 100644 index 000000000..6abef359c --- /dev/null +++ b/testing/inetutils/talk.xinetd @@ -0,0 +1,10 @@ +service ntalk +{ + flags = REUSE + socket_type = dgram + wait = yes + user = root + server = /usr/sbin/talkd + log_on_failure += USERID + disable = yes +} diff --git a/testing/inetutils/telnet.xinetd b/testing/inetutils/telnet.xinetd new file mode 100644 index 000000000..bd3a5e4b1 --- /dev/null +++ b/testing/inetutils/telnet.xinetd @@ -0,0 +1,10 @@ +service telnet +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/sbin/telnetd + log_on_failure += USERID + disable = yes +} diff --git a/testing/nfs-utils/PKGBUILD b/testing/nfs-utils/PKGBUILD new file mode 100644 index 000000000..09e3b8aa1 --- /dev/null +++ b/testing/nfs-utils/PKGBUILD @@ -0,0 +1,101 @@ +# $Id: PKGBUILD 157200 2012-04-25 16:11:10Z tpowa $ +# Maintainer: Tobias Powalowski +# Contributor: John Proctor +# Contributor: dibblethewrecker +# Contributor: abelstr +# Contributor: Marco Lima + +pkgname=nfs-utils +pkgver=1.2.5 +pkgrel=4 +pkgdesc="Support programs for Network File Systems" +arch=('i686' 'x86_64') +url='http://nfs.sourceforge.net' +license=('GPL') +backup=(etc/{exports,idmapd.conf,nfsmount.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' 'device-mapper') +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 + nfs-utils-1.1.4-mtab-sym.patch + nfs-utils-1.1.4-no-exec.patch + rpc-gssd.service + rpc-mountd.service + rpc-svcgssd.service + rpc-idmapd.service + rpc-statd.service + nfsd.service + var-lib-nfs-rpc_pipefs.mount + proc-fs-nfsd.mount + nfs-utils.conf) +install=nfs-utils.install +md5sums=('8395ac770720b83c5c469f88306d7765' + 'dd0d65fc6e8f422fa12520813098264b' + 'f73f197a16b02c3e248488ec35c4cf43' + 'e619f18354ff958ed624d05d08853d8f' + '9cef69bc686cc5dcac23fbb51450747d' + 'ff585faf410a62c4333a027c50b56bae' + 'eb4f4027fab6fc1201f1ca04f5954c76' + 'e9144277a89a620d9bc80413158a7d27' + 'f5e7bba09a46c5c5d7007cac6eff9df5' + '7674106eaaa4c149bccd4f05fe3604e9' + '4f4827dfc93008dfadd0a530ad0872b2' + '38855936dc55a5afe37d84edc0f11066' + '8d888de677a217c5e5f7244a2e3a2d3a' + 'e05705d9ccccaeaeb1ecaee20adc05bc' + 'd7df7bc311fd95c5b80017dd1741570d' + '2e72ee082cba5d3ec6f51d2a105664da' + '5d33d2e754fd37280365b287603bac90' + '1cd65909fa0983047f3f06a3ab352401' + '02a34835aa077146a90eb7d191e612d0' + '8ac484023d786766d287ccbe878ae4ba') + +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 + # arch specific patch + patch -Np0 -i $srcdir/start-statd.patch + + ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \ + --without-tcp-wrappers --with-statedir=/var/lib/nfs \ + --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \ + --enable-mountconfig + + 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 + install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs + install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf + # systemd files + for i in ${srcdir}/*.{service,mount}; do + install -D -m 644 $i "$pkgdir/"usr/lib/systemd/system/$(basename $i) + done + install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.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/nfs b/testing/nfs-utils/nfs new file mode 100644 index 000000000..2d33cf3d4 --- /dev/null +++ b/testing/nfs-utils/nfs @@ -0,0 +1,40 @@ +# +# Optinal options passed to rquotad +RPCRQUOTADOPTS="" +# +# Optional arguments passed to in-kernel lockd +#LOCKDARG= +# TCP port rpc.lockd should listen on. +#LOCKD_TCPPORT=32803 +# UDP port rpc.lockd should listen on. +#LOCKD_UDPPORT=32769 +# +# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8) +RPCNFSDARGS="" +# Number of nfs server processes to be started. +# The default is 8. +RPCNFSDCOUNT=8 +# Set V4 grace period in seconds +#NFSD_V4_GRACE=90 +# +# Optional arguments passed to rpc.mountd. See rpc.mountd(8) +RPCMOUNTDOPTS="" +# +# Optional arguments passed to rpc.statd. See rpc.statd(8) +STATDARG="" +# +# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8) +RPCIDMAPDARGS="" +# +# Optional arguments passed to rpc.gssd. See rpc.gssd(8) +RPCGSSDARGS="" +# +# Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8) +RPCSVCGSSDARGS="" +# +# To enable RDMA support on the server by setting this to +# the port the server should listen on +#RDMA_PORT=20049 +# +# Optional arguments passed to blkmapd. See blkmapd(8) +BLKMAPDARGS="" 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 /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..581e26350 --- /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="" + +# 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.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.conf b/testing/nfs-utils/nfs-utils.conf new file mode 100644 index 000000000..33c97b838 --- /dev/null +++ b/testing/nfs-utils/nfs-utils.conf @@ -0,0 +1 @@ +nfs 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/nfsd.service b/testing/nfs-utils/nfsd.service new file mode 100644 index 000000000..e5481c3d1 --- /dev/null +++ b/testing/nfs-utils/nfsd.service @@ -0,0 +1,16 @@ +[Unit] +Description=NFS server +After=rpcbind.service +Requires=rpcbind.service + +[Service] +Type=oneshot +EnvironmentFile=/etc/conf.d/nfs-server.conf +ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT +ExecStartPost=/usr/sbin/exportfs -a +ExecStop=/usr/sbin/rpc.nfsd 0 +ExecStopPost=/usr/sbin/exportfs -a -u +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/testing/nfs-utils/proc-fs-nfsd.mount b/testing/nfs-utils/proc-fs-nfsd.mount new file mode 100644 index 000000000..f8664a8be --- /dev/null +++ b/testing/nfs-utils/proc-fs-nfsd.mount @@ -0,0 +1,8 @@ +[Unit] +Description=RPC Pipe File System +DefaultDependencies=no + +[Mount] +What=sunrpc +Where=/proc/fs/nfsd +Type=rpc_pipefs diff --git a/testing/nfs-utils/rpc-gssd.service b/testing/nfs-utils/rpc-gssd.service new file mode 100644 index 000000000..446864d18 --- /dev/null +++ b/testing/nfs-utils/rpc-gssd.service @@ -0,0 +1,12 @@ +[Unit] +Description=RPC GSS-API client-side daemon +After=rpcbind.service var-lib-nfs-rpc_pipefs.mount +Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-common.conf +ExecStart=/usr/sbin/rpc.gssd $GSSD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/testing/nfs-utils/rpc-idmapd.service b/testing/nfs-utils/rpc-idmapd.service new file mode 100644 index 000000000..72cd26a93 --- /dev/null +++ b/testing/nfs-utils/rpc-idmapd.service @@ -0,0 +1,12 @@ +[Unit] +Description=NFSv4 ID-name mapping daemon +After=var-lib-nfs-rpc_pipefs.mount nfsd.service +Requires=var-lib-nfs-rpc_pipefs.mount + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-common.conf +ExecStart=/usr/sbin/rpc.idmapd $IDMAPD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/testing/nfs-utils/rpc-mountd.service b/testing/nfs-utils/rpc-mountd.service new file mode 100644 index 000000000..917e1b444 --- /dev/null +++ b/testing/nfs-utils/rpc-mountd.service @@ -0,0 +1,12 @@ +[Unit] +Description=NFSv2/3 Mount Daemon +After=rpcbind.service nfsd.service +Requires=rpcbind.service nfsd.service + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-server.conf +ExecStart=/usr/sbin/rpc.mountd $MOUNTD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/testing/nfs-utils/rpc-statd.service b/testing/nfs-utils/rpc-statd.service new file mode 100644 index 000000000..983b4044f --- /dev/null +++ b/testing/nfs-utils/rpc-statd.service @@ -0,0 +1,12 @@ +[Unit] +Description=NFSv2/3 Network Status Monitor Daemon +After=rpcbind.service +Requires=rpcbind.service + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-common.conf +ExecStart=/usr/sbin/rpc.statd $STATD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/testing/nfs-utils/rpc-svcgssd.service b/testing/nfs-utils/rpc-svcgssd.service new file mode 100644 index 000000000..8152e8338 --- /dev/null +++ b/testing/nfs-utils/rpc-svcgssd.service @@ -0,0 +1,12 @@ +[Unit] +Description=RPC GSS-API server-side daemon +After=rpcbind.service +Requires=rpcbind.service + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/nfs-server.conf +ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/testing/nfs-utils/start-statd.patch b/testing/nfs-utils/start-statd.patch new file mode 100644 index 000000000..5d73b6e35 --- /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/bash -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 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/nfs-utils/var-lib-nfs-rpc_pipefs.mount b/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount new file mode 100644 index 000000000..4bd440f24 --- /dev/null +++ b/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount @@ -0,0 +1,7 @@ +[Unit] +Description=RPC pipe filesystem + +[Mount] +What=rpc_pipefs +Where=/var/lib/nfs/rpc_pipefs +Type=rpc_pipefs diff --git a/testing/samba/PKGBUILD b/testing/samba/PKGBUILD new file mode 100644 index 000000000..749414a95 --- /dev/null +++ b/testing/samba/PKGBUILD @@ -0,0 +1,166 @@ +# $Id: PKGBUILD 157197 2012-04-25 14:01:40Z tpowa $ +# Maintainer: Tobias Powalowski +# Contributor: judd +pkgbase=samba +pkgname=('libwbclient' 'smbclient' 'samba') +pkgver=3.6.4 +# We use the 'A' to fake out pacman's version comparators. Samba chooses +# to append 'a','b',etc to their subsequent releases, which pamcan +# misconstrues as alpha, beta, etc. Bad samba! +_realver=3.6.4 +pkgrel=2 +arch=(i686 x86_64) +url="http://www.samba.org" +license=('GPL3') +makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb') +source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz + samba samba.logrotate + swat.xinetd + samba.pam + samba.conf.d + smbd.service + nmbd.service + winbindd.service + smbd.conf) +### UNINSTALL dmapi package before building!!! + +build() { + cd ${srcdir}/${pkgbase}-${_realver}/source3 + ./configure --prefix=/usr \ + --libdir=/usr/lib/ \ + --localstatedir=/var \ + --with-configdir=/etc/samba \ + --with-lockdir=/var/cache/samba \ + --with-piddir=/var/run/samba \ + --with-fhs \ + --with-pam \ + --with-pam_smbpass \ + --with-pammodulesdir=/lib/security \ + --with-dnsupdate \ + --with-automount \ + --with-quotas \ + --with-ads \ + --with-acl-support \ + --with-libsmbclient \ + --with-syslog \ + --enable-external-libtalloc \ + --disable-dnssd \ + --disable-avahi \ + --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \ + --enable-external-libtdb + make +} + +package_libwbclient () { +pkgdesc="Samba winbind client library" +depends=('glibc') + cd ${srcdir}/${pkgbase}-${_realver}/source3 + mkdir -p ${pkgdir}/usr/lib + for i in libwbclient*; do + cp -a bin/${i}*.so* ${pkgdir}/usr/lib/ + done +} + +package_smbclient () { +pkgdesc="Tools to access a server's filespace and printers via SMB" +depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc' 'libwbclient') + 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* libsmbclient*;do + cp -a bin/${i}*.so* ${pkgdir}/usr/lib/ + done + 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 + mkdir -p ${pkgdir}/usr/include + install -m644 include/libsmbclient.h ${pkgdir}/usr/include/ + install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/ + mkdir -p ${pkgdir}/usr/share/man/man{1,7} + for man in rpcclient smbcacls smbclient smbcquotas smbget \ + smbtree smbtar nmblookup; do + install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/ + done + install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/ +} + +package_samba () { +pkgdesc="Tools to access a server's filespace and printers via SMB" +backup=(etc/logrotate.d/samba + etc/pam.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' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc') + cd ${srcdir}/samba-${_realver}/source3 + mkdir -p ${pkgdir}/etc/samba/private + chmod 700 ${pkgdir}/etc/samba/private + make DESTDIR=${pkgdir} install + chmod 644 ${pkgdir}/usr/include/*.h + rm -rf ${pkgdir}/usr/var + rm -rf ${pkgdir}/var/run/samba + (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 + 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 + # 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 + ln -s libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so.2 + # winbind krb5 locator + mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5 + install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5 + install -m 755 bin/winbind_krb5_locator.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/winbind_krb5_locator.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* winbind_krb5*;do + rm -f ${pkgdir}/usr/lib/$i + done + for bin in net \ + nmblookup rpcclient smbcacls smbclient \ + smbcquotas smbget smbspool smbtar smbtree; do + rm -f ${pkgdir}/usr/bin/$bin + done + rm -f ${pkgdir}/usr/sbin/cifs.upcall + rm -f ${pkgdir}/usr/include/netapi.h + for man in rpcclient smbcacls smbclient smbcquotas \ + smbtree smbtar nmblookup smbget; do + rm -f ${pkgdir}/usr/share/man/man1/${man}.1 + done + for man in tdbbackup tdbdump tdbtool; do + rm -f ${pkgdir}/usr/share/man/man8/${man}.8 + done + rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7 + rm -f ${pkgdir}/usr/include/libsmbclient.h + # copy ldap example + install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema + # install systemd files + for i in smbd nmbd winbindd; do + install -D -m644 ${srcdir}/$i.service ${pkgdir}/usr/lib/systemd/system/$i.service + done + install -D -m644 ${srcdir}/smbd.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf +} +md5sums=('d8e070e2a3b12f202f347e4427469bc2' + 'dfc6f9018c556b9783c7140de183727f' + '5697da77590ec092cc8a883bae06093c' + 'a4bbfa39fee95bba2e7ad6b535fae7e6' + '96f82c38f3f540b53f3e5144900acf17' + 'f2f2e348acd1ccb566e95fa8a561b828' + '389cc4fa3b459360feaa1b3d93274693' + 'ea6a1251be979cb30c6098a28b270d2d' + '455f106ce7a4f983975b3a686eaa85e5' + '6956c4f9989bec8f313de7d9343b6ba1') diff --git a/testing/samba/nmbd.service b/testing/samba/nmbd.service new file mode 100644 index 000000000..6e22ef2fb --- /dev/null +++ b/testing/samba/nmbd.service @@ -0,0 +1,8 @@ +[Unit] +Description=Samba NetBIOS name server + +[Service] +ExecStart=/usr/sbin/nmbd -F + +[Install] +WantedBy=multi-user.target diff --git a/testing/samba/samba b/testing/samba/samba new file mode 100755 index 000000000..2a04bfec4 --- /dev/null +++ b/testing/samba/samba @@ -0,0 +1,57 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba + +[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd) + +case "$1" in + start) + rc=0 + stat_busy "Starting Samba Server" + if [ ! -x /var/run/samba ] ; then + install -m755 -d /var/run/samba + fi + if [ ! -x /var/log/samba ] ; then + install -m755 -d /var/log/samba + fi + for d in ${SAMBA_DAEMONS[@]}; do + PID=`pidof -o %PPID /usr/sbin/$d` + [ -z "$PID" ] && /usr/sbin/$d -D + rc=$(($rc+$?)) + done + if [ $rc -gt 0 ]; then + stat_fail + else + add_daemon samba + stat_done + fi + ;; + stop) + rc=0 + stat_busy "Stopping Samba Server" + for d in ${SAMBA_DAEMONS[@]}; do + PID=`pidof -o %PPID /usr/sbin/$d` + [ -z "$PID" ] || kill $PID &> /dev/null + rc=$(($rc+$?)) + done + if [ $rc -gt 0 ]; then + stat_fail + else + rm /var/run/samba/smbd.pid &>/dev/null + rm /var/run/samba/nmbd.pid &>/dev/null + rm /var/run/samba/winbindd.pid &>/dev/null + rm_daemon samba + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/samba/samba.conf.d b/testing/samba/samba.conf.d new file mode 100644 index 000000000..8721f956a --- /dev/null +++ b/testing/samba/samba.conf.d @@ -0,0 +1,7 @@ +# +# Configuration for the samba init script +# + +# space separated list of daemons to launch +SAMBA_DAEMONS=(smbd nmbd) +#SAMBA_DAEMONS=(smbd nmbd winbindd) diff --git a/testing/samba/samba.logrotate b/testing/samba/samba.logrotate new file mode 100644 index 000000000..581f4c33b --- /dev/null +++ b/testing/samba/samba.logrotate @@ -0,0 +1,9 @@ +/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log { + notifempty + missingok + sharedscripts + copytruncate + postrotate + /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/testing/samba/samba.pam b/testing/samba/samba.pam new file mode 100644 index 000000000..53724d1f8 --- /dev/null +++ b/testing/samba/samba.pam @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/testing/samba/smbd.conf b/testing/samba/smbd.conf new file mode 100644 index 000000000..b745bb85b --- /dev/null +++ b/testing/samba/smbd.conf @@ -0,0 +1 @@ +D /var/run/samba 0755 root root - diff --git a/testing/samba/smbd.service b/testing/samba/smbd.service new file mode 100644 index 000000000..beb9bfad7 --- /dev/null +++ b/testing/samba/smbd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Samba SMB/CIFS server + +[Service] +ExecStart=/usr/sbin/smbd -F +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/testing/samba/swat.xinetd b/testing/samba/swat.xinetd new file mode 100644 index 000000000..2e62a82b2 --- /dev/null +++ b/testing/samba/swat.xinetd @@ -0,0 +1,10 @@ +service swat +{ + socket_type = stream + wait = no + user = root + server = /usr/sbin/swat + log_on_success += HOST DURATION + log_on_failure += HOST + disable = yes +} diff --git a/testing/samba/winbindd.service b/testing/samba/winbindd.service new file mode 100644 index 000000000..509c89628 --- /dev/null +++ b/testing/samba/winbindd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Samba Winbind daemon + +[Service] +ExecStart=/usr/sbin/winbindd -F +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3-54-g00ecf