diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-28 22:36:26 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-28 22:36:26 +0200 |
| commit | 92116b44c20c9b8e3ee49b794084d08d22e87cd3 (patch) | |
| tree | ebfcd9f003924e328dd0ccdb16197c7e38c61dcf | |
| parent | c89124d6a88f4cfffaba4492922c86091f2c8516 (diff) | |
| parent | 00f77ef3b2b7856520daba393370f67b773c2184 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/gnustep-base/PKGBUILD
community-testing/gtranslator/PKGBUILD
community-testing/parrot/PKGBUILD
community/chmsee/PKGBUILD
core/lvm2/PKGBUILD
extra/php/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-openssl/PKGBUILD
staging/php/PKGBUILD
staging/php/php-fpm.conf.in.patch
staging/php/php.ini.patch
testing/cairo/PKGBUILD
testing/eog-plugins/PKGBUILD
testing/eog/PKGBUILD
testing/gedit/PKGBUILD
testing/gjs/PKGBUILD
testing/glib2/PKGBUILD
testing/gnome-documents/PKGBUILD
testing/gnome-shell/PKGBUILD
testing/gobject-introspection/PKGBUILD
testing/libpeas/PKGBUILD
testing/mutter/PKGBUILD
testing/openssl/PKGBUILD
testing/pygobject/PKGBUILD
testing/python/PKGBUILD
testing/rhythmbox/PKGBUILD
testing/ruby/PKGBUILD
testing/ruby/ruby.install
testing/sushi/PKGBUILD
testing/totem/PKGBUILD
50 files changed, 423 insertions, 306 deletions
diff --git a/community-testing/gdlmm/PKGBUILD b/community-testing/gdlmm/PKGBUILD deleted file mode 100644 index fac4cc149..000000000 --- a/community-testing/gdlmm/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 69716 2012-04-22 23:41:47Z heftig $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -pkgname=gdlmm -pkgver=3.3.2 -pkgrel=2 -pkgdesc="C++ bindings for the gdl library" -arch=('x86_64' 'i686') -url="http://git.gnome.org/browse/gdlmm/" -depends=('gdl' 'gtkmm3') -options=(!libtool !emptydirs) -license=('LGPL') -source=("http://ftp.gnome.org/pub/GNOME/sources/gdlmm/3.3/$pkgname-$pkgver.tar.xz") -sha256sums=('cf3253be052737332b2b6e9dbd6f62d79cbc3f3398497158c0099dbc45741a46') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/gedit-plugins/PKGBUILD b/community-testing/gedit-plugins/PKGBUILD deleted file mode 100644 index 1403bb7c1..000000000 --- a/community-testing/gedit-plugins/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 69712 2012-04-22 23:14:40Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Hugo Doria <hugo@archlinux.org> -# Contributor: Sergej Chodarev <sergejx@centrum.sk> -# Contributor: zhuqin <zhuqin83@gmail.com> - -pkgname=gedit-plugins -pkgver=3.4.0 -pkgrel=1 -pkgdesc="Plugins for gedit" -arch=('x86_64' 'i686') -license=('GPL') -url="http://live.gnome.org/GeditPlugins" -depends=('gedit' 'dbus-python') -optdepends=('gucharmap: for charmap plugin' - 'vte3: for embedded terminal') -makedepends=('intltool' 'gnome-doc-utils' 'vte3') -options=('!libtool' '!emptydirs') -install=gedit-plugins.install -source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz") -sha256sums=('a66138b43e1a77f39258f04936be35163b4c6bfd49643791ca445cb3c3d60e0a') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all \ - --disable-schemas-compile - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR=$pkgdir install -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/gedit-plugins/gedit-plugins.install b/community-testing/gedit-plugins/gedit-plugins.install deleted file mode 100644 index d5bcc00ae..000000000 --- a/community-testing/gedit-plugins/gedit-plugins.install +++ /dev/null @@ -1,23 +0,0 @@ -pkgname=gedit-plugins - -post_install() { - usr/bin/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 $1 -} - - -post_remove() { - post_install $1 -} - - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/gtk-engine-unico/PKGBUILD b/community-testing/gtk-engine-unico/PKGBUILD deleted file mode 100644 index dfcf116e0..000000000 --- a/community-testing/gtk-engine-unico/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 69673 2012-04-22 10:47:36Z bpiotrowski $ -# Maintainer: Bartlomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Hilinus <itahilinus[at]hotmail[dot]it> - -pkgname=gtk-engine-unico -pkgver=1.0.2 -pkgrel=1 -pkgdesc="Unico GTK3 theme engine" -arch=('i686' 'x86_64') -url="https://launchpad.net/unico" -license=('GPL') -depends=("gtk3") -options=(!libtool) -source=("http://launchpad.net/unico/1.0/$pkgver/+download/${pkgname#gtk-engine-}-$pkgver.tar.gz") -md5sums=('19fb3ecc36d4d13b4a76e26a4ebd6412') - - -build() { - cd ${srcdir}/${pkgname#gtk-engine-}-$pkgver - - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd ${srcdir}/${pkgname#gtk-engine-}-$pkgver - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/nemiver/PKGBUILD b/community-testing/nemiver/PKGBUILD deleted file mode 100644 index 16ed100c9..000000000 --- a/community-testing/nemiver/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 69718 2012-04-22 23:49:26Z heftig $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: jordz <jordz@archlinux.us> - -pkgname=nemiver -pkgver=0.9.2 -pkgrel=2 -pkgdesc="C/C++ debugger for GNOME" -arch=('x86_64' 'i686') -license=('GPL') -url="http://www.gnome.org/projects/nemiver/" -depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'dconf' 'gsettings-desktop-schemas') -makedepends=('boost' 'intltool' 'gnome-doc-utils') -install=nemiver.install -source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz") -options=('!libtool' '!emptydirs') -sha256sums=('770392965a45d728b798da3c6111c4e7cb55d51f109a78aedead99083f8e2520') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --with-boost \ - --disable-scrollkeeper \ - --enable-symsvis=yes \ - --enable-memoryview=yes \ - --disable-schemas-compile \ - --enable-gsettings=yes - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/nemiver/nemiver.install b/community-testing/nemiver/nemiver.install deleted file mode 100644 index f6a1886e7..000000000 --- a/community-testing/nemiver/nemiver.install +++ /dev/null @@ -1,15 +0,0 @@ -post_upgrade() { - usr/bin/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_install() { - post_upgrade -} - -post_remove() { - post_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index d0b952a07..f9cc7a4ff 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69020 2012-04-08 08:25:21Z lcarlier $ +# $Id: PKGBUILD 69903 2012-04-26 07:47:47Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee pkgver=1.99.09 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" @@ -22,7 +22,7 @@ build() { cd ${srcdir}/jungleji-chmsee-*/src cp Makefile.arch Makefile - #sed -i -e 's/10.*/11.*/g' ../application.ini + sed -i -e 's/11.*/12.*/g' ../application.ini make } diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD index 739432875..6d1c905b5 100644 --- a/community/gwibber/PKGBUILD +++ b/community/gwibber/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 69796 2012-04-23 09:42:07Z ibiru $ +# $Id: PKGBUILD 69926 2012-04-26 21:16:13Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=gwibber -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="Microblogging client for GNOME, which supports Twitter, Identi.ca, StatusNet, Facebook, Flickr, Digg, FriendFeed and Qaiku" arch=('i686' 'x86_64') @@ -12,15 +12,12 @@ depends=('libgee' 'libnotify' 'dee>=1.0.0' 'json-glib' 'gtkspell3' 'python2-gobj makedepends=('intltool' 'vala>=0.15.0') options=('!libtool') install=$pkgname.install -source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz - lp_959068.patch) -md5sums=('cec2c692d870f7aa7fb6a7cb556617ad' - 'c15dd5289f36270f980036ead71b6c20') +source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('47d27eaa1fe1c94a959acff7128a644a') build() { cd "$srcdir/$pkgname-$pkgver" find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - patch -Np1 -i "$srcdir/lp_959068.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile --disable-unity diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index 927d9ba4c..f9cde65bd 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64335 2012-02-11 23:22:02Z allan $ +# $Id: PKGBUILD 69901 2012-04-26 05:53:01Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3-wm _pkgsourcename=i3 -pkgver=4.1.2 -pkgrel=4 +pkgver=4.2 +pkgrel=1 pkgdesc="An improved dynamic tiling window manager" arch=('i686' 'x86_64' 'mips64el') url="http://i3wm.org/" @@ -20,7 +20,7 @@ optdepends=('rxvt-unicode: The terminal emulator used in the default config.' 'perl: To migrate your configuration to v4 format.') options=('docs' '!strip') source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2") -md5sums=('0e81c381f9bf3ebf155aaa394e71834f') +md5sums=('11b7e5ecdd837341978c72341cb890c6') build() { cd "$srcdir/$_pkgsourcename-$pkgver" diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index 41df57604..718f8b6de 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155399 2012-04-03 11:09:56Z allan $ +# $Id: PKGBUILD 157323 2012-04-27 00:50:16Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils pkgver=2.22 -pkgrel=5 +pkgrel=6 _date=20120323 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,10 @@ depends=('glibc>=2.15' 'zlib') checkdepends=('dejagnu') options=('!libtool' '!distcc' '!ccache') install=binutils.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -md5sums=('de2ac4298732827f8af706fc24020330') +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2 + binutils-2.22-ld-13621.patch) +md5sums=('de2ac4298732827f8af706fc24020330' + '86d9445914c9d51bfe575ecbac265be0') mksource() { mkdir ${pkgname}-${_date} @@ -30,6 +32,10 @@ mksource() { } build() { + cd ${srcdir}/binutils + # http://sourceware.org/bugzilla/show_bug.cgi?id=13621 + patch -p1 -i $srcdir/binutils-2.22-ld-13621.patch + cd ${srcdir} mkdir binutils-build && cd binutils-build diff --git a/core/binutils/binutils-2.22-ld-13621.patch b/core/binutils/binutils-2.22-ld-13621.patch new file mode 100644 index 000000000..ffb2ab825 --- /dev/null +++ b/core/binutils/binutils-2.22-ld-13621.patch @@ -0,0 +1,27 @@ +diff --git a/bfd/linker.c b/bfd/linker.c +index c51c5df..0404474 100644 +--- a/bfd/linker.c ++++ b/bfd/linker.c +@@ -3208,6 +3208,12 @@ fix_syms (struct bfd_link_hash_entry *h, void *data) + op = op1; + } + ++ /* Refuse to choose a section for which we are out of bounds. */ ++ /* ??? This may make most of the above moot. */ ++ if (h->u.def.value < op->vma ++ || h->u.def.value > op->vma + op->size) ++ op = bfd_abs_section_ptr; ++ + h->u.def.value -= op->vma; + h->u.def.section = op; + } +index 95b7ef4..a9c05f9 100644 +--- a/ld/testsuite/ld-elf/warn2.d ++++ b/ld/testsuite/ld-elf/warn2.d +@@ -13,5 +13,5 @@ + # construct and that the symbol still appears as expected. + + #... +- +[0-9]+: +[0-9a-f]+ +20 +OBJECT +GLOBAL +DEFAULT +[1-9] Foo ++ +[0-9]+: +[0-9a-f]+ +20 +OBJECT +GLOBAL +DEFAULT +ABS Foo + #pass diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index 83f108937..b4a12b532 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146230 2012-01-06 14:32:39Z thomas $ +# $Id: PKGBUILD 157320 2012-04-26 22:51:21Z eric $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup pkgver=1.4.1 -pkgrel=1 +pkgrel=3 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -18,10 +18,10 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 sha256sums=('82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb' '71c6506d4b6d0b22b9b6c2a68e604959e4c072af04680ed6acc0126c97bdbc88' '811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757' - 'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573') + 'ddbbdcb8eff93a3a7622ec633e90d5c0d68e3afbeaf942dc2309adab345047d4') build() { cd "${srcdir}"/$pkgname-${pkgver} - ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib + ./configure --prefix=/usr --disable-static --sbindir=/sbin make } @@ -29,9 +29,6 @@ package() { cd "${srcdir}"/$pkgname-${pkgver} make DESTDIR="${pkgdir}" install # install hook - install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/lib/initcpio/hooks/encrypt - install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/lib/initcpio/install/encrypt - # Fix pkgconfig location - install -d -m755 "${pkgdir}"/usr/lib - mv "${pkgdir}"/lib/pkgconfig "${pkgdir}"/usr/lib/ + install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt + install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt } diff --git a/core/cryptsetup/encrypt_install b/core/cryptsetup/encrypt_install index 13174ec06..9ed50e863 100644 --- a/core/cryptsetup/encrypt_install +++ b/core/cryptsetup/encrypt_install @@ -12,10 +12,10 @@ build() [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup" [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup" add_binary "/sbin/dmsetup" - add_file "/lib/udev/rules.d/10-dm.rules" - add_file "/lib/udev/rules.d/13-dm-disk.rules" - add_file "/lib/udev/rules.d/95-dm-notify.rules" - add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" + add_file "/usr/lib/udev/rules.d/10-dm.rules" + add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" + add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" + add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" } help () diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD index d3fd6f97d..574159c6b 100644 --- a/core/fakeroot/PKGBUILD +++ b/core/fakeroot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144854 2011-12-08 12:17:14Z allan $ +# $Id: PKGBUILD 157325 2012-04-27 00:50:20Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=fakeroot -pkgver=1.18.2 +pkgver=1.18.3 pkgrel=1 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ install=fakeroot.install depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh') options=('!libtool') source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2) -md5sums=('79f32331358ad58499704ea5e19fd0ae') +md5sums=('99c6ba2eb0005086144ee9f1f6fd63f4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD index 2a2fda2cf..6d4d76ad7 100644 --- a/core/grep/PKGBUILD +++ b/core/grep/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153418 2012-03-13 08:24:31Z allan $ +# $Id: PKGBUILD 157327 2012-04-27 00:50:23Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=grep -pkgver=2.11 -pkgrel=2 +pkgver=2.12 +pkgrel=1 pkgdesc="A string search utility" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -13,15 +13,12 @@ groups=('base') depends=('glibc' 'pcre' 'sh') makedepends=('texinfo') install=${pkgname}.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} - grep-2.11-exclude-dir-crash.patch) -md5sums=('ad9c6dbdeab93e50d2bc380f10ed3643' - 'e4fea5e355973c951f93f48bc86f92fa' - 'e882644cf8c1a4e37da7ba8c0867e70b') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +md5sums=('8d2f0346d08b13c18afb81f0e8aa1e2f' + '7a25f2ece647b8637f4ae1de474712e7') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i $srcdir/grep-2.11-exclude-dir-crash.patch ./configure --prefix=/usr --without-included-regex make } diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index 48435da86..f892eeabc 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 153950 2012-03-21 02:16:27Z eric $ +# $Id: PKGBUILD 157318 2012-04-26 22:51:18Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.95 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -16,18 +16,16 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} 11-dm-initramfs.rules) sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85' '45f5e31045065e7bdf5d6f2e21c857b4978024b4' - '7f108b2f2056eb050fc898bf5190ecf9145aed8a' + '08007f13cf1a9caf6e4aca76dd2ed6a4ab037601' '7d63aa838703c9f986531a78164b556f765f5cce' 'f6a554eea9557c3c236df2943bb6e7e723945c41') build() { cd "${srcdir}/LVM2.${pkgver}" - sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh unset LDFLAGS - ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ - --includedir=/usr/include --with-usrlibdir=/usr/lib \ + ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var \ --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ - --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules + --enable-udev_sync --enable-udev_rules make } @@ -39,7 +37,7 @@ package_device-mapper() { cd "${srcdir}/LVM2.${pkgver}" make DESTDIR="${pkgdir}" install_device-mapper # extra udev rule for device-mapper in initramfs - install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules" + install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules" } package_lvm2() { @@ -56,6 +54,6 @@ package_lvm2() { # /etc directories install -d "${pkgdir}"/etc/lvm/{archive,backup} # mkinitcpio hook - install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" - install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" + install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2" + install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2" } diff --git a/core/lvm2/lvm2_install b/core/lvm2/lvm2_install index 94175b523..98a995b14 100644 --- a/core/lvm2/lvm2_install +++ b/core/lvm2/lvm2_install @@ -9,11 +9,11 @@ build() add_binary "/sbin/lvm" add_binary "/sbin/dmsetup" - add_file "/lib/udev/rules.d/10-dm.rules" - add_file "/lib/udev/rules.d/13-dm-disk.rules" - add_file "/lib/udev/rules.d/95-dm-notify.rules" - add_file "/lib/udev/rules.d/11-dm-lvm.rules" - add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" + add_file "/usr/lib/udev/rules.d/10-dm.rules" + add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" + add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" + add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules" + add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" } help () diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index 7ee8f4942..cfd4a0bb5 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152724 2012-03-09 12:06:10Z tpowa $ +# $Id: PKGBUILD 157236 2012-04-26 13:06:19Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> @@ -7,12 +7,12 @@ pkgname=nfs-utils pkgver=1.2.5 -pkgrel=2 +pkgrel=4 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64' 'mips64el') url='http://nfs.sourceforge.net' license=('GPL') -backup=(etc/{exports,idmapd.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) +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 @@ -23,8 +23,18 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn exports idmapd.conf start-statd.patch + nfs nfs-utils-1.1.4-mtab-sym.patch - nfs-utils-1.1.4-no-exec.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' @@ -34,8 +44,18 @@ md5sums=('8395ac770720b83c5c469f88306d7765' 'ff585faf410a62c4333a027c50b56bae' 'eb4f4027fab6fc1201f1ca04f5954c76' 'e9144277a89a620d9bc80413158a7d27' + 'f5e7bba09a46c5c5d7007cac6eff9df5' '7674106eaaa4c149bccd4f05fe3604e9' - '4f4827dfc93008dfadd0a530ad0872b2') + '4f4827dfc93008dfadd0a530ad0872b2' + '38855936dc55a5afe37d84edc0f11066' + '8d888de677a217c5e5f7244a2e3a2d3a' + 'e05705d9ccccaeaeb1ecaee20adc05bc' + 'd7df7bc311fd95c5b80017dd1741570d' + '2e72ee082cba5d3ec6f51d2a105664da' + '5d33d2e754fd37280365b287603bac90' + '1cd65909fa0983047f3f06a3ab352401' + '02a34835aa077146a90eb7d191e612d0' + '8ac484023d786766d287ccbe878ae4ba') build() { cd $srcdir/${pkgname}-${pkgver} @@ -44,9 +64,10 @@ build() { # arch specific patch patch -Np0 -i $srcdir/start-statd.patch - ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \ + ./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-ipv6 --sysconfdir=/etc --enable-libmount-mount \ + --enable-mountconfig make } @@ -66,6 +87,13 @@ package() { 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 diff --git a/core/nfs-utils/nfs b/core/nfs-utils/nfs new file mode 100644 index 000000000..2d33cf3d4 --- /dev/null +++ b/core/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/core/nfs-utils/nfs-utils.conf b/core/nfs-utils/nfs-utils.conf new file mode 100644 index 000000000..33c97b838 --- /dev/null +++ b/core/nfs-utils/nfs-utils.conf @@ -0,0 +1 @@ +nfs diff --git a/core/nfs-utils/nfsd.service b/core/nfs-utils/nfsd.service new file mode 100644 index 000000000..e5481c3d1 --- /dev/null +++ b/core/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/core/nfs-utils/proc-fs-nfsd.mount b/core/nfs-utils/proc-fs-nfsd.mount new file mode 100644 index 000000000..f8664a8be --- /dev/null +++ b/core/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/core/nfs-utils/rpc-gssd.service b/core/nfs-utils/rpc-gssd.service new file mode 100644 index 000000000..446864d18 --- /dev/null +++ b/core/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/core/nfs-utils/rpc-idmapd.service b/core/nfs-utils/rpc-idmapd.service new file mode 100644 index 000000000..72cd26a93 --- /dev/null +++ b/core/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/core/nfs-utils/rpc-mountd.service b/core/nfs-utils/rpc-mountd.service new file mode 100644 index 000000000..917e1b444 --- /dev/null +++ b/core/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/core/nfs-utils/rpc-statd.service b/core/nfs-utils/rpc-statd.service new file mode 100644 index 000000000..983b4044f --- /dev/null +++ b/core/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/core/nfs-utils/rpc-svcgssd.service b/core/nfs-utils/rpc-svcgssd.service new file mode 100644 index 000000000..8152e8338 --- /dev/null +++ b/core/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/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount b/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount new file mode 100644 index 000000000..4bd440f24 --- /dev/null +++ b/core/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/core/rpcbind/PKGBUILD b/core/rpcbind/PKGBUILD index c38f302fd..c24a915bd 100644 --- a/core/rpcbind/PKGBUILD +++ b/core/rpcbind/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146812 2012-01-18 17:16:35Z tpowa $ +# $Id: PKGBUILD 157234 2012-04-26 13:06:13Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=rpcbind pkgver=0.2.0 -pkgrel=6 +pkgrel=8 pkgdesc="portmap replacement which supports RPC over various protocols" arch=(i686 x86_64 'mips64el') depends=('bash' 'glibc' 'libtirpc') @@ -12,9 +12,11 @@ license=('custom') replaces=('portmap') source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2 rpcbind-sunrpc.patch + rpcbind.service rpcbind) md5sums=('1a77ddb1aaea8099ab19c351eeb26316' 'c02ac36a98baac70b8a26190524b7b73' + 'd2615f4c0d58f154aab6e294997ac9be' '78a963654f57cbb209e228884767836e') build() { @@ -37,6 +39,8 @@ package() { install -m644 man/rpcinfo.8 $pkgdir/usr/share/man/man8/ # install daemon install -D -m755 $srcdir/rpcbind $pkgdir/etc/rc.d/rpcbind + # install systemd service file + install -D -m644 $srcdir/rpcbind.service $pkgdir/usr/lib/systemd/system/rpcbind.service # install license install -D -m644 COPYING $pkgdir/usr/share/licenses/rpcbind/COPYING } diff --git a/core/rpcbind/rpcbind.service b/core/rpcbind/rpcbind.service new file mode 100644 index 000000000..418ba1e05 --- /dev/null +++ b/core/rpcbind/rpcbind.service @@ -0,0 +1,11 @@ +[Unit] +Description=RPC Bind +Requires=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/rpcbind +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index a437fa806..f0ad1d7bc 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 156552 2012-04-20 19:21:46Z andrea $ +# $Id: PKGBUILD 157224 2012-04-26 06:42:14Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -22,8 +22,8 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.4.0 -pkgrel=3 +pkgver=2.4.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -33,18 +33,10 @@ makedepends=('cmake' 'automoc4' 'boost ' 'eigen2' 'libwpd' 'libwpg' 'pstoedit' 'glew' 'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2') groups=('calligra') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" - 'do-not-build-hancomword.patch' - 'fix-docx-support.patch') -md5sums=('a45b9141c6bb750569e8f6554197dd50' - 'cc1a5fba43426003909751035d093362' - 'b694e3af26a31c36488d869f9331090c') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") +md5sums=('a4da7e1181e1539850a4fcae466d7d75') build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -p1 -i "${srcdir}"/do-not-build-hancomword.patch - patch -p1 -i "${srcdir}"/fix-docx-support.patch - cd "${srcdir}" mkdir build cd build diff --git a/extra/capi4hylafax/PKGBUILD b/extra/capi4hylafax/PKGBUILD index 0a6eca6d7..24a1e1c99 100644 --- a/extra/capi4hylafax/PKGBUILD +++ b/extra/capi4hylafax/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 154271 2012-03-25 09:27:30Z tpowa $ +# $Id: PKGBUILD 157241 2012-04-26 13:40:50Z tpowa $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=capi4hylafax pkgver=010300 -pkgrel=6 +pkgrel=7 pkgdesc="capi plugin for hylafax to enable isdn faxing" arch=(i686 x86_64 'mips64el') url="ftp://ftp.avm.de/tools" license=('GPL') depends=('glibc' 'isdn4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog') source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz - config.faxCAPI capi4hylafax.rc) -md5sums=('d37dc652ac80d1525ef8693be55ee67f' - '653b60695d21c128f020a86274ca9192' - '1fe40c58289fa3ba625ce6fe2fdb3d07') + config.faxCAPI + capi4hylafax.rc + c2faxrecv.service + capi4hylafax.conf) + install=capi4hylafax.install backup=(var/spool/hylafax/etc/config.faxCAPI) @@ -42,8 +43,8 @@ package() { chown 10 "$pkgdir"/var/spool/hylafax chgrp 14 "$pkgdir"/var/spool/hylafax # adding udev rule - mkdir -p "$pkgdir"/lib/udev/rules.d -cat << EOF >> "$pkgdir"/lib/udev/rules.d/53-capi4hylafax.rules + mkdir -p "$pkgdir"/usr/lib/udev/rules.d +cat << EOF >> "$pkgdir"/usr/lib/udev/rules.d/53-capi4hylafax.rules # CAPI devices SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp" SUBSYSTEM=="tty" KERNEL=="capi[0-9]*", NAME="capi/%n", GROUP="uucp" @@ -52,4 +53,12 @@ EOF # fix c2faxadd sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' "$pkgdir"/usr/bin/c2faxaddmodem echo "main_config_dialog" >> "$pkgdir"/usr/bin/c2faxaddmodem +# add systemd files + install -D -m644 $srcdir/c2faxrecv.service $pkgdir/usr/lib/systemd/system/c2faxrecv.service + install -D -m644 $srcdir/capi4hylafax.conf $pkgdir/usr/lib/modules-load.d/capi4hylafax.conf } +md5sums=('d37dc652ac80d1525ef8693be55ee67f' + '653b60695d21c128f020a86274ca9192' + '1fe40c58289fa3ba625ce6fe2fdb3d07' + 'a12164b2694490bfedb0cc861692e240' + '7c41d4fa5c5ef7b1372813341fd0d02b') diff --git a/extra/capi4hylafax/c2faxrecv.service b/extra/capi4hylafax/c2faxrecv.service new file mode 100644 index 000000000..5e73e29e7 --- /dev/null +++ b/extra/capi4hylafax/c2faxrecv.service @@ -0,0 +1,11 @@ +[Unit] +Description=CAPI to fax receive +Requires=faxq.service +After=faxq.service + +[Service] +ExecStart=/usr/bin/c2faxrecv +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/capi4hylafax/capi4hylafax.conf b/extra/capi4hylafax/capi4hylafax.conf new file mode 100644 index 000000000..9c145eb55 --- /dev/null +++ b/extra/capi4hylafax/capi4hylafax.conf @@ -0,0 +1 @@ +capi
\ No newline at end of file diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD index ee95019de..8ca86f3c1 100644 --- a/extra/hylafax/PKGBUILD +++ b/extra/hylafax/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 148782 2012-02-05 11:50:17Z ibiru $ +# $Id: PKGBUILD 157237 2012-04-26 13:06:28Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hylafax pkgver=6.0.5 -pkgrel=3 +pkgrel=4 pkgdesc="Fax Server" arch=('i686' 'x86_64' 'mips64el') install='hylafax.install' @@ -18,13 +18,17 @@ source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz hylafax.cron.daily config.local configure-6.0.5.patch - hylafax-libtiff4.patch) + hylafax-libtiff4.patch + faxq.service + hfaxd.service) md5sums=('eb9ac942354ad708e20e4583cec6615f' '6602288a405324d8c8e3c5eac2bf19fd' '52beffe7dc296b4f9ce9fd0387f7804e' - '0d2ce24d918226a852539aebf57d3f4a' + '60f2a7e62c256ead4e9238cb31b35b90' '51d9f639bb76e5e39cdc8e2ac07e208d' - '3d239c186f24720e945508d349b069b1') + '3d239c186f24720e945508d349b069b1' + '9c8916a753106795fc3f40268889f645' + 'a0b5a008b7fbf1943d167e0d5eb32341') build() { cd "$srcdir/${pkgname}-${pkgver}" @@ -48,6 +52,9 @@ package () { "$pkgdir"/var/spool/hylafax/bin/notify.awk # fix permission on /var/lock chmod 1777 "$pkgdir"/var/lock + # add systemd files + install -D -m644 $srcdir/hfaxd.service $pkgdir/usr/lib/systemd/system/hfaxd.service + install -D -m644 $srcdir/faxq.service $pkgdir/usr/lib/systemd/system/faxq.service install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT } diff --git a/extra/hylafax/config.local b/extra/hylafax/config.local index 0d8e2bcd8..4ea0f3500 100644 --- a/extra/hylafax/config.local +++ b/extra/hylafax/config.local @@ -250,24 +250,24 @@ SYSUID="root" # user ID for system installs # based on whether or not they are capable of processing scripts # included in the distribution (e.g AWK and SCRIPT_SH, SED). # -#AWK="/bin/awk" # pathname of suitable awk program +AWK="/usr/bin/awk" # pathname of suitable awk program #CAT="/bin/cat" # pathname of suitable cat program #CHGRP="/etc/chgrp" # pathname of suitable chgrp program #CHMOD="/etc/chmod" # pathname of suitable chmod program #CHOWN="/etc/chown" # pathname of suitable chown program -#CMP="/bin/cmp" # pathname of suitable cmp program -#COL="/bin/col" # pathname of suitable col program +CMP="/usr/bin/cmp" # pathname of suitable cmp program +COL="/usr/bin/col" # pathname of suitable col program #CP="/bin/cp" # pathname of suitable cp program #ECHO="/bin/echo" # pathname of suitable echo program -#GREP="/bin/grep" # pathname of suitable grep program +GREP="/usr/bin/grep" # pathname of suitable grep program #LN="/bin/ln" # pathname of suitable ln program #LN_S="-s" # option to ${LN} to create symlink #MAN="/usr/bin/man" # pathname of suitable man program #MKDIR="/bin/mkdir" # pathname of suitable mkdir program -#MKFIFO="/bin/mkfifo" # pathname of suitable mkfifo program +MKFIFO="/usr/bin/mkfifo" # pathname of suitable mkfifo program #MV="/bin/mv" # pathname of suitable mv program #MV_F="-f" # option to ${MV} to force operation #RMCMD="/bin/rm" # pathname of suitable rm program #SED="/bin/sed" # pathname of suitable sed program #SCRIPT_SH="/bin/sh" # pathname of suitable shell -#SORT="/bin/sort" # pathname of suitable sort program +SORT="/usr/bin/sort" # pathname of suitable sort program diff --git a/extra/hylafax/faxq.service b/extra/hylafax/faxq.service new file mode 100644 index 000000000..1fef20a6d --- /dev/null +++ b/extra/hylafax/faxq.service @@ -0,0 +1,9 @@ +[Unit] +Description=Hyla FAX queue manager + +[Service] +ExecStart=/usr/sbin/faxq +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/hylafax/hfaxd.service b/extra/hylafax/hfaxd.service new file mode 100644 index 000000000..d5d96c34d --- /dev/null +++ b/extra/hylafax/hfaxd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Hyla FAX client-server + +[Service] +ExecStart=/usr/lib/fax/hfaxd -i hylafax +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 66ecfa5f9..29fee72cf 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156579 2012-04-21 07:48:29Z giovanni $ +# $Id: PKGBUILD 157227 2012-04-26 08:49:24Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.04.21 +pkgver=2012.04.26 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('2e06ec6343be2c8355ce9fd3289f7c87') +md5sums=('4c7202e0611951998325b0e41ae63041') build() { cd ${srcdir}/live diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index bade1768f..3e1eb0d52 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157026 2012-04-23 09:27:54Z ibiru $ +# $Id: PKGBUILD 157229 2012-04-26 10:12:29Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,22 +21,22 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.3.10 +pkgver=5.3.11 _suhosinver=5.3.9-0.9.10 -pkgrel=5 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') url='http://www.php.net' makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' - 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' + 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' - 'logrotate.d.php-fpm' 'pcre_info.patch') -md5sums=('816259e5ca7d0a7e943e56a3bb32b17f' + 'logrotate.d.php-fpm' 'suhosin.patch') +md5sums=('94709f6e7c920cbe26e19fa991d9975d' 'c099b3d7eac95018ababd41ded7f3066' 'c15d18f846be1d69144a5d0056ee6506' 'ffc338e8ce2a990f6f2a486355bbab65' @@ -44,7 +44,7 @@ md5sums=('816259e5ca7d0a7e943e56a3bb32b17f' 'b01be5f816988fcee7e78225836e5e27' '740ec5fe2ecfd9d7febd4081c90ec65b' '07c4e412909ac65a44ec90e7a2c4bade' - '8d3806bbb19e390f9b32ccf21611d937') + '07ca7da608553b4cb92797e655eb94f1') build() { phpconfig="--srcdir=../${pkgbase}-${pkgver} \ @@ -135,12 +135,13 @@ build() { PEAR_INSTALLDIR=/usr/share/pear export PEAR_INSTALLDIR - cd ${srcdir}/${pkgbase}-${pkgver} + # fix the suhosin patch + patch -i ${srcdir}/suhosin.patch - patch -p1 -i ${srcdir}/pcre_info.patch + cd ${srcdir}/${pkgbase}-${pkgver} # apply suhosin patch - patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch + patch -F3 -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch # adjust paths patch -p0 -i ${srcdir}/php.ini.patch @@ -349,8 +350,8 @@ package_php-snmp() { } package_php-sqlite() { - depends=('php' 'sqlite3') - pkgdesc='sqlite3 module for PHP' + depends=('php' 'sqlite') + pkgdesc='sqlite module for PHP' install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so } diff --git a/extra/php/suhosin.patch b/extra/php/suhosin.patch new file mode 100644 index 000000000..e5db52d40 --- /dev/null +++ b/extra/php/suhosin.patch @@ -0,0 +1,13 @@ +--- suhosin-patch-5.3.9-0.9.10.patch 2012-04-01 11:55:46.699676255 +0200
++++ suhosin-patch-5.3.9-0.9.10.patch 2012-04-01 11:56:19.322146479 +0200
+@@ -4515,8 +4515,8 @@
+ +#define SUHOSIN_PATCH 1
+ +EOF
+
+- echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
+- echo "configure:19377: checking for declared timezone" >&5
++ echo "$as_me:$LINENO: checking for declared timezone" >&5
++ echo $ECHO_N "checking for declared timezone... $ECHO_C" >&6
+ @@ -115830,7 +115833,7 @@
+ php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
+ strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index ac97b50e3..bb764ac67 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 148898 2012-02-05 11:54:47Z ibiru $ +# $Id: PKGBUILD 157263 2012-04-26 20:32:45Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm -pkgver=1.0 -pkgrel=3 +pkgver=1.0.1 +pkgrel=1 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64 'mips64el') license=('GPL2' 'LGPL2.1') url="http://www.linux-kvm.org" -depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'libpulse') +depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'libpulse') makedepends=('git' 'iasl' 'texi2html' 'perl' 'python2') backup=('etc/qemu/target-x86_64.conf') install=qemu-kvm.install @@ -35,7 +35,8 @@ build() cd "${srcdir}/" git clone git://git.seabios.org/seabios.git cd seabios - find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + #find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + sed -i -e 's/python/python2/g' Makefile make clean make } @@ -69,5 +70,5 @@ package() esac done } -md5sums=('00a825db46a70ba8ef9fc95da9cc7c1e' +md5sums=('f23711fb9f3c70f802829b109ba9aa27' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index f91daf3fa..b064a7ab3 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 156039 2012-04-11 21:03:20Z tpowa $ +# $Id: PKGBUILD 157239 2012-04-26 13:06:31Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba @@ -8,7 +8,7 @@ pkgver=3.6.4 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=3.6.4 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64 mips64el) url="http://www.samba.org" license=('GPL3') @@ -17,7 +17,11 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz samba samba.logrotate swat.xinetd samba.pam - samba.conf.d) + samba.conf.d + smbd.service + nmbd.service + winbindd.service + smbd.conf) ### UNINSTALL dmapi package before building!!! build() { @@ -144,10 +148,19 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr 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') + 'f2f2e348acd1ccb566e95fa8a561b828' + '389cc4fa3b459360feaa1b3d93274693' + 'ea6a1251be979cb30c6098a28b270d2d' + '455f106ce7a4f983975b3a686eaa85e5' + '6956c4f9989bec8f313de7d9343b6ba1') diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service new file mode 100644 index 000000000..6e22ef2fb --- /dev/null +++ b/extra/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/extra/samba/smbd.conf b/extra/samba/smbd.conf new file mode 100644 index 000000000..b745bb85b --- /dev/null +++ b/extra/samba/smbd.conf @@ -0,0 +1 @@ +D /var/run/samba 0755 root root - diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service new file mode 100644 index 000000000..beb9bfad7 --- /dev/null +++ b/extra/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/extra/samba/winbindd.service b/extra/samba/winbindd.service new file mode 100644 index 000000000..509c89628 --- /dev/null +++ b/extra/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 diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD index 660efcecc..c1d81d333 100644 --- a/extra/swig/PKGBUILD +++ b/extra/swig/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 149972 2012-02-11 23:31:30Z allan $ +# $Id: PKGBUILD 157248 2012-04-26 14:30:56Z pierre $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=swig -pkgver=2.0.4 -pkgrel=3 +pkgver=2.0.5 +pkgrel=1 pkgdesc="Generate scripting interfaces to C/C++ code" arch=('i686' 'x86_64' 'mips64el') url="http://www.swig.org/" license=('custom') depends=('zlib' 'pcre') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('ace563563a8f6f367ba82236e5bea240adea0d94') +sha1sums=('dfe3c89da775a0f98a8d884df1c658073c8a9087') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 82bf28b8b..ab75659b0 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -11,7 +11,7 @@ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox-libre pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source') -pkgver=4.1.12 +pkgver=4.1.14 pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' @@ -194,7 +194,7 @@ package_virtualbox-parabola-additions(){ # install sample config install -D -m644 "$srcdir/vbox-service.conf" "$pkgdir/etc/conf.d/vbox-service" } -md5sums=('4e385d2333e1a4832e5618b982fddee5' +md5sums=('f8baa04e6d589bc6b1fb4e7079fbe414' '5f85710e0b8606de967716ded7b2d351' '755ab0dd9bcacf2c00d2275b1ca69547' 'a1ff1d1b4423556887e48a32978226a6' diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD index 60a903615..f711418ca 100644 --- a/libre/virtualbox-modules/PKGBUILD +++ b/libre/virtualbox-modules/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=virtualbox-modules pkgname=('virtualbox-modules' 'virtualbox-parabola-modules') -pkgver=4.1.12 -pkgrel=2 +pkgver=4.1.14 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -17,7 +17,7 @@ provides=("virtualbox-modules=$pkgver") [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules) -md5sums=('4e385d2333e1a4832e5618b982fddee5' +md5sums=('f8baa04e6d589bc6b1fb4e7079fbe414' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe') |