diff options
44 files changed, 1450 insertions, 178 deletions
diff --git a/community-testing/catalyst-utils/PKGBUILD b/community-testing/catalyst-utils/PKGBUILD new file mode 100644 index 000000000..2a05774b3 --- /dev/null +++ b/community-testing/catalyst-utils/PKGBUILD @@ -0,0 +1,128 @@ +# $Id: PKGBUILD 76582 2012-09-23 23:07:57Z lcarlier $ +# Maintainer: idontknow +# Contributor: to fill with a lot of people + +pkgbase=catalyst-utils +pkgname=('catalyst-utils' 'opencl-catalyst') +pkgver=12.8 +pkgrel=0.2 +pkgdesc="AMD Catalyst drivers utilities and libraries with OpenCL implementation." +arch=('i686' 'x86_64') +url="http://www.amd.com" +license=('custom') +source=("http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip" + atieventsd + atieventsd.service) +md5sums=('41c5478322b13be6909eeb46412a3aa0' + 'f729bf913613f49b0b9759c246058a87' + '14beb8cc8f59c06d5ef998e222779dae') + +if [ "${CARCH}" = "i686" ]; then + _ARCHDIR="x86" + _ARCHLIB="" + _ARCHXPIC="" +else + _ARCHDIR="x86_64" + _ARCHLIB="64" + _ARCHXPIC="_64a" +fi + +build() { + cd ${srcdir} + + sh ./amd-driver-installer*.run --extract fglrx-install +} + +package_catalyst-utils() { + pkgdesc="AMD Catalyst drivers utilities and libraries." + provides=('libgl') + conflicts=('libgl' 'nvidia-utils') + depends=('xorg-server>=1.7.0' 'xorg-server<1.13.0' 'gcc-libs' 'libxinerama' \ + 'libxcursor' 'libxxf86vm' 'libxrandr' 'libsm' 'fontconfig' 'libxi' 'netkit-bsd-finger') + optdepends=('qt: amdcccle') + + install -dm755 "${pkgdir}"/usr/{bin,sbin} + install -dm755 "${pkgdir}"/usr/lib/{dri,xorg/modules/{dri,drivers,extensions/fglrx,linux},systemd/system} + install -dm755 "${pkgdir}"/usr/include/GL + install -dm755 "${pkgdir}"/etc/{ati,acpi/events,security/console.apps,rc.d} + install -dm755 "${pkgdir}"/usr/share/{applications,ati/amdcccle,man/man8,pixmaps} + + # binaries + cd ${srcdir}/fglrx-install + install -m755 common/usr/sbin/* "${pkgdir}/usr/sbin/" + install -m755 common/usr/X11R6/bin/* "${pkgdir}/usr/bin/" + install -m755 arch/${_ARCHDIR}/usr/sbin/* "${pkgdir}/usr/sbin/" + install -m755 arch/${_ARCHDIR}/usr/X11R6/bin/* "${pkgdir}/usr/bin/" + + # headers + install -m644 common/usr/include/GL/* "${pkgdir}/usr/include/GL/" + + # xorg/dri/gl/... drivers + cd ${srcdir}/fglrx-install/xpic${_ARCHXPIC}/usr/X11R6/lib${_ARCHLIB}/modules + install -m755 *.so "${pkgdir}/usr/lib/xorg/modules/" + install -m755 drivers/*.so "${pkgdir}/usr/lib/xorg/modules/drivers/" + install -m755 linux/*.so "${pkgdir}/usr/lib/xorg/modules/linux/" + install -m755 extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/" + ln -s fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" + cd ${srcdir}/fglrx-install/arch/${_ARCHDIR}/usr/X11R6/lib${_ARCHLIB} + install -m755 modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/" + ln -s /usr/lib/xorg/modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/dri/" + install -m755 fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/" + install -m755 *.so* "${pkgdir}/usr/lib/" + install -m644 libAMDXvBA.cap "${pkgdir}/usr/lib/" + cd ${srcdir}/fglrx-install/arch/${_ARCHDIR}/usr/lib${_ARCHLIB} + install -m755 *.so* "${pkgdir}/usr/lib/" + # needed symlinks + ln -s libatiuki.so.1.0 "${pkgdir}/usr/lib/libatiuki.so.1" + ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1" + ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so" + ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/libAMDXvBA.so.1" + ln -s libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/libfglrx_dm.so.1" + + # various files + cd ${srcdir}/fglrx-install/common + install -m644 usr/share/man/man8/* "${pkgdir}/usr/share/man/man8/" + install -m644 usr/share/applications/* "${pkgdir}/usr/share/applications/" + install -m644 usr/share/icons/* "${pkgdir}/usr/share/pixmaps/" + install -m644 usr/share/ati/amdcccle/* "${pkgdir}/usr/share/ati/amdcccle/" + install -m644 etc/ati/* "${pkgdir}/etc/ati/" + chmod 755 "${pkgdir}/etc/ati/authatieventsd.sh" + install -m644 etc/security/console.apps/amdcccle-su "${pkgdir}/etc/security/console.apps/" + install -m644 usr/share/applications/*.desktop "${pkgdir}/usr/share/applications/" + # use ACPI example files + install -m755 usr/share/doc/fglrx/examples/etc/acpi/*.sh "${pkgdir}/etc/acpi/" + install -m644 usr/share/doc/fglrx/examples/etc/acpi/events/* "${pkgdir}/etc/acpi/events/" + # systemd and rc.d scripts + install -m755 "${srcdir}/atieventsd" "${pkgdir}/etc/rc.d/" + install -m644 "${srcdir}/atieventsd.service" "${pkgdir}/usr/lib/systemd/system/" + + # provided in opencl-catalyst package + rm "${pkgdir}"/usr/lib/lib{amdocl*,OpenCL}.so* + + # licenses + install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" + install -Dm644 "${srcdir}/fglrx-install/common/usr/share/doc/amdcccle/ccc_copyrights.txt" \ + "${pkgdir}/usr/share/licenses/${pkgname}/amdcccle_copyrights.txt" +} + +package_opencl-catalyst() { + pkgdesc="OpenCL implemention from AMD" + provides=('libcl') + conflicts=('libcl') + depends=('gcc-libs') + optdepends=('opencl-headers: headers necessary for OpenCL development') + + install -dm755 "${pkgdir}"/usr/{bin,lib} + install -dm755 "${pkgdir}/etc/OpenCL/vendors" + + cd ${srcdir}/fglrx-install/arch/${_ARCHDIR} + + install -m755 usr/bin/clinfo "${pkgdir}/usr/bin/" + install -m644 etc/OpenCL/vendors/amdocl*.icd "${pkgdir}/etc/OpenCL/vendors/" + install -m755 usr/lib${_ARCHLIB}/libamdocl*.so "${pkgdir}/usr/lib/" + install -m755 usr/lib${_ARCHLIB}/libOpenCL.so.1 "${pkgdir}/usr/lib/" + ln -s libOpenCL.so.1 "${pkgdir}/usr/lib/libOpenCL.so" + + # license + install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" +} diff --git a/community-testing/catalyst-utils/atieventsd b/community-testing/catalyst-utils/atieventsd new file mode 100644 index 000000000..16bd9a4fa --- /dev/null +++ b/community-testing/catalyst-utils/atieventsd @@ -0,0 +1,41 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +ATID_PID=`pidof -o %PPID /usr/sbin/atieventsd` + +case "$1" in + start) + rc=0 + stat_busy "Starting ATI Events Daemon" + [ -z "$ATID_PID" ] && /usr/sbin/atieventsd + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + else + add_daemon atieventsd + stat_done + fi + ;; + stop) + rc=0 + stat_busy "Stopping ATI Events Daemon" + kill $ATID_PID &>/dev/null + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + else + rm_daemon atieventsd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/catalyst-utils/atieventsd.service b/community-testing/catalyst-utils/atieventsd.service new file mode 100644 index 000000000..14dd7e210 --- /dev/null +++ b/community-testing/catalyst-utils/atieventsd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Catalyst event Daemon + +[Service] +ExecStart=/usr/sbin/atieventsd --nodaemon + +[Install] +WantedBy=multi-user.target + diff --git a/community-testing/catalyst/3.5-do_mmap.patch b/community-testing/catalyst/3.5-do_mmap.patch new file mode 100644 index 000000000..04248eb7b --- /dev/null +++ b/community-testing/catalyst/3.5-do_mmap.patch @@ -0,0 +1,50 @@ +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200 ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200 +@@ -2106,6 +2106,12 @@ + } + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) ++# define NO_DO_MMAP ++# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f) ++# define do_munmap(a,b,c) vm_munmap(b, c) ++#endif ++ + unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval( + KCL_IO_FILE_Handle file, + unsigned long addr, +@@ -2117,10 +2123,13 @@ + + flags = MAP_SHARED; + prot = PROT_READ|PROT_WRITE; +- ++#ifdef NO_DO_MMAP ++ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff); ++#else + down_write(¤t->mm->mmap_sem); + vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff); + up_write(¤t->mm->mmap_sem); ++#endif + if (IS_ERR(vaddr)) + return 0; + else +@@ -2131,7 +2140,9 @@ + { + int retcode = 0; + ++#ifndef NO_DO_MMAP + down_write(¤t->mm->mmap_sem); ++#endif + #ifdef FGL_LINUX_RHEL_MUNMAP_API + retcode = do_munmap(current->mm, + addr, +@@ -2142,7 +2153,9 @@ + addr, + len); + #endif ++#ifndef NO_DO_MMAP + up_write(¤t->mm->mmap_sem); ++#endif + return retcode; + } + diff --git a/community-testing/catalyst/PKGBUILD b/community-testing/catalyst/PKGBUILD new file mode 100644 index 000000000..80652f726 --- /dev/null +++ b/community-testing/catalyst/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 76561 2012-09-23 08:26:49Z lcarlier $ +# Maintainer: idontknow +# Contributor: to fill with a lot of people + +pkgname=catalyst +pkgver=12.8 +pkgrel=0.1 +_extramodules=extramodules-3.5-ARCH +pkgdesc="AMD proprietary gpu drivers" +arch=('i686' 'x86_64') +url="http://www.amd.com" +license=('custom') +depends=('linux>=3.5' 'linux<3.6') +makedepends=('linux-headers>=3.5' 'linux-headers<3.6') +#conflicts=('nvidia' 'xf86-video-ati' 'ati-dri') +source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip + 3.5-do_mmap.patch) +md5sums=('41c5478322b13be6909eeb46412a3aa0' + 'a450e2e3db61994b09e9d99d95bee837') +install=catalyst.install + +build() { + cd ${srcdir} + + if [ "${CARCH}" = "x86_64" ]; then + BUILDARCH=x86_64 + _archdir=x86_64 + else + BUILDARCH=i386 + _archdir=x86 + fi + + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + sh ./amd-driver-installer*.run --extract fglrx-install + + cd fglrx-install + patch -Np1 -i ../3.5-do_mmap.patch + + cd common/lib/modules/fglrx/build_mod + ln -s "${srcdir}/fglrx-install/arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a + ln -s 2.6.x/Makefile + + CFLAGS_MODULE="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=0 -DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space -D__SMP__ -DMODVERSIONS" + + make -C /usr/lib/modules/${_kernver}/build SUBDIRS="`pwd`" ARCH=${BUILDARCH} \ + MODFLAGS="$CFLAGS_MODULE" CFLAGS_MODULE="$CFLAGS_MODULE" \ + KVER=${_kernver} PAGE_ATTR_FIX=0 modules +} + +package() { + depends=(${depends[@]} "catalyst-utils=${pkgver}") + + cd ${srcdir}/fglrx-install/common/lib/modules/fglrx/build_mod + + install -Dm644 fglrx.ko "${pkgdir}/usr/lib/modules/${_extramodules}/fglrx.ko" + install -dm755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/catalyst.install" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/fglrx.ko" + + # license + install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" +} diff --git a/community-testing/catalyst/catalyst.install b/community-testing/catalyst/catalyst.install new file mode 100644 index 000000000..22b72ea84 --- /dev/null +++ b/community-testing/catalyst/catalyst.install @@ -0,0 +1,16 @@ +post_install() { + EXTRAMODULES='extramodules-3.5-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use the catalyst module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.5-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.5-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + diff --git a/community/ext4magic/PKGBUILD b/community/ext4magic/PKGBUILD index d229cb03f..3734d6aa7 100644 --- a/community/ext4magic/PKGBUILD +++ b/community/ext4magic/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 67335 2012-03-09 01:54:07Z seblu $ +# $Id: PKGBUILD 76580 2012-09-23 20:37:13Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=ext4magic -pkgver=0.3.0 +pkgver=0.3.1 pkgrel=1 pkgdesc='Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems' arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url='http://developer.berlios.de/projects/ext4magic/' license=('GPL2') depends=('bzip2' 'file' 'util-linux' 'e2fsprogs') source=("http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('54ed503730b7e279c5cddc99a8821de3') +md5sums=('59c194b71e33aa6bd098b91f802e67d5') build() { cd $pkgname-$pkgver diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index a1b45f2e5..679ce651e 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75316 2012-08-19 08:00:44Z heftig $ +# $Id: PKGBUILD 76563 2012-09-23 10:10:49Z jelle $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu -pkgver=0.7.13 -pkgrel=4 +pkgver=0.7.14 +pkgrel=1 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64') url="http://pdf2djvu.googlecode.com" @@ -31,3 +31,4 @@ check() { sed -i 's/nosetests/nosetests2/' tests/Makefile make test } +md5sums=('bfeb443f81d0df7544fd393ad7ee6cd7') diff --git a/community/php-memcache/PKGBUILD b/community/php-memcache/PKGBUILD index 88f4cd109..f9c3e0fa7 100644 --- a/community/php-memcache/PKGBUILD +++ b/community/php-memcache/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 70503 2012-05-09 18:48:11Z pschmitz $ +# $Id: PKGBUILD 76558 2012-09-23 05:22:53Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=php-memcache -pkgver=3.0.6 -pkgrel=3 +pkgver=3.0.7 +pkgrel=1 pkgdesc="Memcache module for PHP" arch=('i686' 'x86_64') url="http://pecl.php.net/package/memcache" @@ -12,7 +12,7 @@ depends=('php') backup=('etc/php/conf.d/memcache.ini') install=php-memcache.install source=(http://pecl.php.net/get/memcache-$pkgver.tgz) -sha256sums=('cf6871f0944ee38022c5f84910f306d83b0f51564bbc08624a215e06d8486618') +sha256sums=('f34e2ef42dd8f1f7e6a2cfbb9417a9e58e3bfd7f5db7227ca5afab686cefdd1f') build() { cd "$srcdir/memcache-$pkgver" diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index f83225f9f..58454c747 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,43 +1,25 @@ -# $Id: PKGBUILD 163714 2012-07-18 02:16:52Z dreisner $ +# $Id: PKGBUILD 166962 2012-09-23 12:22:15Z tomegun $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=coreutils -pkgver=8.17 -pkgrel=3 +pkgver=8.19 +pkgrel=1 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') license=('GPL3') url="http://www.gnu.org/software/coreutils" groups=('base') depends=('glibc' 'pam' 'acl' 'gmp' 'libcap') -replaces=('mktemp') -backup=('etc/pam.d/su') install=${pkgname}.install -options=('!emptydirs') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} - coreutils-pam.patch - 0001-ls-color-each-symlink-to-relative-name-in-properly.patch - su.pam) -md5sums=('bbda656ce8ca2c6903948f9faa204ba3' - 'ebecd29b095aa21b0b2f833f1ec20d70' - 'aad79a2aa6d566c375d7bdd1b0767278' - 'd7c691898a695a6284a927e6a9426fe4' - 'fa85e5cce5d723275b14365ba71a8aad') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +md5sums=('1a01231a2f3ed37c0efc073ccdda9375' + '7f564749d834397aa67f0f05bacb62d5') build() { cd ${srcdir}/${pkgname}-${pkgver} - # added su wheel group pam patch (from fedora git) - patch -Np1 -i ${srcdir}/coreutils-pam.patch - - # fix coloring for symlinks in / - # upstream commit 6124a3842dfa8484b52e067a8ab8105c3875a4f7 - patch -Np1 -i $srcdir/0001-ls-color-each-symlink-to-relative-name-in-properly.patch - - autoreconf -v - ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \ - --enable-install-program=su \ + ./configure --prefix=/usr --libexecdir=/usr/lib \ --enable-no-install-program=groups,hostname,kill,uptime \ --enable-pam make @@ -53,14 +35,13 @@ package() { make DESTDIR=${pkgdir} install cd ${pkgdir}/usr/bin - install -dm755 ${pkgdir}/{bin,usr/sbin} + install -dm755 ${pkgdir}/bin # binaries required by FHS _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false' - 'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'su' 'sync' + 'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'sync' 'true' 'uname') - mv ${_fhs[@]} ${pkgdir}/bin - - mv chroot ${pkgdir}/usr/sbin - install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su + for i in ${_fhs[@]}; do + ln -s ../usr/bin/$i ${pkgdir}/bin/$i + done } diff --git a/core/coreutils/coreutils.install b/core/coreutils/coreutils.install index 8caae6686..22cfcb2a1 100644 --- a/core/coreutils/coreutils.install +++ b/core/coreutils/coreutils.install @@ -1,11 +1,9 @@ infodir=usr/share/info -filelist=(coreutils.info) +file=coreutils.info post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done + [[ -x usr/bin/install-info ]] || return 0 + install-info $infodir/$file.gz $infodir/dir 2> /dev/null } post_upgrade() { @@ -13,9 +11,7 @@ post_upgrade() { } pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done + [[ -x usr/bin/install-info ]] || return 0 + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null } diff --git a/core/mlocate/PKGBUILD b/core/mlocate/PKGBUILD index 1e863a55a..c8d979f9a 100644 --- a/core/mlocate/PKGBUILD +++ b/core/mlocate/PKGBUILD @@ -1,51 +1,49 @@ -# $Id: PKGBUILD 162719 2012-06-29 02:14:10Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 166971 2012-09-23 22:22:21Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: lydgate pkgname=mlocate -pkgver=0.25 -pkgrel=2 -pkgdesc="Faster merging drop-in for slocate" +pkgver=0.26 +pkgrel=1 +pkgdesc='Merging locate/updatedb implementation' +url='https://fedorahosted.org/mlocate/' arch=('i686' 'x86_64') -url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate" license=('GPL') -depends=('glibc' 'coreutils' 'sh') backup=('etc/updatedb.conf' 'etc/cron.daily/updatedb') -source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz - updatedb.conf - updatedb.cron.daily) -md5sums=('c6d043b170613b0e327a815b497f680a' - 'b56d81de17fe29b01b4b28861acb8fd4' - 'cde5da81bebad2de556ef2e43d895e13') +source=("https://fedorahosted.org/releases/m/l/mlocate/mlocate-${pkgver}.tar.xz" + 'updatedb.conf' + 'updatedb.cron') +sha1sums=('c6e6d81b25359c51c545f4b8ba0f3b469227fcbc' + '0150379149bf9d714bc81332d775fc273e7e3535' + '8301e6277d27db539af6cf4bc243e8e247bffc2e') build() { - cd $srcdir/$pkgname-$pkgver - - sed -i '/^groupname /s/mlocate/locate/' Makefile.in - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib - make + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i '/^groupname /s/mlocate/locate/' Makefile.in + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib + make } check() { - cd $srcdir/$pkgname-$pkgver - make check + cd "${srcdir}/${pkgname}-${pkgver}" + make check } package() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=$pkgdir install + make DESTDIR="${pkgdir}" install - ln -s locate $pkgdir/usr/bin/slocate - chgrp 21 $pkgdir/usr/bin/locate - chmod 2755 $pkgdir/usr/bin/locate + chgrp 21 "${pkgdir}/usr/bin/locate" + chmod 2755 "${pkgdir}/usr/bin/locate" + ln -s locate "${pkgdir}/usr/bin/slocate" - install -dm755 $pkgdir/var/lib - install -dm750 -g21 $pkgdir/var/lib/locate - - # Set up a default updatedb.conf and a daily cronjob - install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf - install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb + install -dm755 "${pkgdir}/var/lib" + install -dm750 -g21 "${pkgdir}/var/lib/locate" + + install -Dm644 ../updatedb.conf "${pkgdir}/etc/updatedb.conf" + install -Dm744 ../updatedb.cron "${pkgdir}/etc/cron.daily/updatedb" } diff --git a/core/mlocate/updatedb.cron b/core/mlocate/updatedb.cron new file mode 100755 index 000000000..431cb533e --- /dev/null +++ b/core/mlocate/updatedb.cron @@ -0,0 +1,6 @@ +#!/bin/sh + +NICE='nice -n 19' +IONICE='ionice -c 2 -n 7' + +exec ${IONICE} ${NICE} updatedb -f proc diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD index 60eea9e59..96a719025 100644 --- a/core/procps-ng/PKGBUILD +++ b/core/procps-ng/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 163561 2012-07-15 23:10:42Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> +# $Id: PKGBUILD 166961 2012-09-23 12:22:10Z tomegun $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Eric Bélanger <eric@archlinux.org> pkgname=procps-ng pkgver=3.3.3 -pkgrel=3 -pkgdesc="Utilities for monitoring your system and processes on your system" +pkgrel=6 +pkgdesc='Utilities for monitoring your system and its processes' arch=('i686' 'x86_64') url="http://gitorious.org/procps" license=('GPL' 'LGPL') @@ -18,7 +19,7 @@ options=('!libtool') source=(procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver} sysctl.conf) sha1sums=('e78a098f1a3c06722155800cc5cfa0c865af03c0' - 'efb6cdc17ee39be8433ae9c8e9bb02d1f47eeefc') + '97ff07bab9aa5daa8d54a1346f73ba74f8e12a53') build() { cd "${srcdir}/procps-procps" @@ -31,5 +32,9 @@ build() { package() { cd "${srcdir}/procps-procps" make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/sysctl.conf" "${pkgdir}/etc/sysctl.conf" + install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf" + + # provided by util-linux + rm "${pkgdir}/bin/kill" + rm "${pkgdir}/usr/share/man/man1/kill.1" } diff --git a/core/procps-ng/sysctl.conf b/core/procps-ng/sysctl.conf index baddd90a6..4695cdd92 100644 --- a/core/procps-ng/sysctl.conf +++ b/core/procps-ng/sysctl.conf @@ -1,46 +1,41 @@ -# /etc/sysctl.conf - Configuration file for setting system variables -# See sysctl.conf (5) for information. +# Configuration file for runtime kernel parameters. +# See sysctl.conf(5) for more information. -# you can have the CD-ROM close when you use it, and open -# when you are done. -#dev.cdrom.autoeject = 1 +# Have the CD-ROM close when you use it, and open when you are done. #dev.cdrom.autoclose = 1 +#dev.cdrom.autoeject = 1 -# protection from the SYN flood attack +# Protection from the SYN flood attack. net.ipv4.tcp_syncookies = 1 -# see the evil packets in your log files +# See evil packets in your logs. #net.ipv4.conf.all.log_martians = 1 -# if not functioning as a router, there is no need to accept redirects or source routes +# Never accept redirects or source routes (these are only useful for routers). #net.ipv4.conf.all.accept_redirects = 0 #net.ipv4.conf.all.accept_source_route = 0 #net.ipv6.conf.all.accept_redirects = 0 #net.ipv6.conf.all.accept_source_route = 0 -# Disable packet forwarding +# Disable packet forwarding. net.ipv4.ip_forward = 0 net.ipv6.conf.all.forwarding = 0 -# Enable IPv6 Privacy Extensions -net.ipv6.conf.default.use_tempaddr = 2 -net.ipv6.conf.all.use_tempaddr = 2 - -# sets the port range used for outgoing connections -#net.ipv4.ip_local_port_range = 32768 61000 +# Tweak the port range used for outgoing connections. +#net.ipv4.ip_local_port_range = 32768 61000 -# Swapping too much or not enough? Disks spinning up when you'd -# rather they didn't? Tweak these. +# Tweak those values to alter disk syncing and swap behavior. #vm.vfs_cache_pressure = 100 #vm.laptop_mode = 0 #vm.swappiness = 60 +# Tweak how the flow of kernel messages is throttled. #kernel.printk_ratelimit_burst = 10 #kernel.printk_ratelimit = 5 -#kernel.panic_on_oops = 0 -# Reboot 600 seconds after a panic +# Reboot 600 seconds after kernel panic or oops. +#kernel.panic_on_oops = 1 #kernel.panic = 600 -# Disable SysRq key (note: console security issues) +# Disable SysRq key to avoid console security issues. kernel.sysrq = 0 diff --git a/core/sysvinit/PKGBUILD b/core/sysvinit/PKGBUILD index 5c81ef41d..8a9de3577 100644 --- a/core/sysvinit/PKGBUILD +++ b/core/sysvinit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165862 2012-09-01 20:01:12Z tomegun $ +# $Id: PKGBUILD 166964 2012-09-23 12:22:41Z tomegun $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgbase=sysvinit pkgname=('sysvinit-tools' 'sysvinit') pkgver=2.88 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/sysvinit" license=('GPL') @@ -37,11 +37,10 @@ package_sysvinit-tools() { cd "${pkgdir}" rm bin/mountpoint rm usr/share/man/man1/mountpoint.1 -# once u-l-2.22 is out -# rm usr/bin/{mesg,utmpdump,wall} -# rm usr/share/man/man1/{mesg,utmpdump,wall}.1 -# rm sbin/sulogin -# rm usr/share/man/man8/sulogin.8 + rm usr/bin/{mesg,utmpdump,wall} + rm usr/share/man/man1/{mesg,utmpdump,wall}.1 + rm sbin/sulogin + rm usr/share/man/man8/sulogin.8 ### split out sysvinit rm -rf ${srcdir}/_sysvinit diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 1a2d85d4a..ae7784fe6 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,36 +1,59 @@ -# $Id: PKGBUILD 163535 2012-07-15 00:25:36Z tomegun $ +# $Id: PKGBUILD 166963 2012-09-23 12:22:32Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.21.2 -pkgrel=5 +pkgver=2.22 +pkgrel=6 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') groups=('base') -depends=('pam') -conflicts=('util-linux-ng') -provides=("util-linux-ng=${pkgver}") +depends=('pam' 'shadow') +makedepends=('bc') # for check() only, change this to checkdepends for pacman 4.1 +conflicts=('util-linux-ng' 'eject') +provides=("util-linux-ng=${pkgver}" 'eject') license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.22/${pkgname}-${pkgver}.tar.xz + su.1 + uuidd.tmpfiles pam-login - pam-common) -backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login) + pam-common + pam-su + hwclock-systz.patch) +backup=(etc/pam.d/chfn + etc/pam.d/chsh + etc/pam.d/login + etc/pam.d/su + etc/pam.d/su-l) install=util-linux.install build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../hwclock-systz.patch + + # unbreak --localstatedir + # TODO(dreisner): find out what sami had in mind with these heuristics + sed -i '71,75d' configure.ac + ./autogen.sh + ./configure --prefix=/usr \ --libdir=/usr/lib \ + --localstatedir=/run \ --enable-fs-paths-extra=/usr/bin:/usr/sbin \ - --enable-write \ --enable-raw \ - --disable-wall \ - --enable-new-mount \ - --enable-login-utils + --enable-vipw \ + --enable-newgrp \ + --enable-chfn-chsh \ + --enable-write \ + --enable-mesg \ + --enable-socket-activation + +# --enable-reset \ # part of ncurses +# --enable-last \ # not part of any package +# --enable-line \ # not compat make } @@ -46,20 +69,29 @@ package() { cd "${pkgdir}" - # broken tool, going away in next major release, so just remove it now - rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1} - - # delete stray empty dir, fixed upstream - rm -r usr/share/man/ru - # setuid chfn and chsh - chmod 4755 "$pkgdir"/usr/bin/ch{sh,fn} + chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}} # install PAM files for login-utils install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn" install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh" install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login" + install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su" + install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su-l" + + # broken buildsys doesn't include su(1), which means it + # isn't even in the dist tarball + # TODO(dreisner): patched upstream + install -m644 "$srcdir/su.1" "$pkgdir/usr/share/man/man1/su.1" + + # include tmpfiles fragment for uuidd + # TODO(dreisner): offer this upstream? + install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf" } -md5sums=('54ba880f1d66782c2287ee2c898520e9' +md5sums=('ba2d8cc12a937231c80a04f7f7149303' + '7f524538dcf57284a86f03a98e624f04' + 'a39554bfd65cccfd8254bb46922f4a67' '4368b3f98abd8a32662e094c54e7f9b1' - 'a31374fef2cba0ca34dfc7078e2969e4') + 'a31374fef2cba0ca34dfc7078e2969e4' + 'fa85e5cce5d723275b14365ba71a8aad' + '19eaa197a0cfb046661dede2e991120b') diff --git a/core/util-linux/hwclock-systz.patch b/core/util-linux/hwclock-systz.patch new file mode 100644 index 000000000..79ed1a5f3 --- /dev/null +++ b/core/util-linux/hwclock-systz.patch @@ -0,0 +1,96 @@ +From 46a8834c2eb9b0c37d92e30d1a262e41306cf36f Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Wed, 19 Sep 2012 18:10:34 +0200 +Subject: [PATCH 1/2] hwclock: don't warp the systemtime if it is in UTC + +A sideeffect of 839be2ba6b44fa9dc927f081d547ebadec9de19c is that we now +warp the systemtime according to the timezone, on the first call of +--systz. This is not always the correct thing to do, and causes a +regression for us in Arch Linux. + +This is the correct thing to do if the RTC, and hence the systemtime is +set in localtime. However, if the systemtime is already in UTC we don't +want to touch it when we set the kernel timezone (which we still need to +do as e.g. FAT stores timestamps in localtime). + +An almost identical issue was also fixed in systemd commit +72edcff5db936e54cfc322d9392ec46e2428fd9b. + +Fixes: +Signed-off-by: Tom Gundersen <teg@jklm.no> +--- + sys-utils/hwclock.8 | 11 +++++++---- + sys-utils/hwclock.c | 17 +++++++++++++++-- + 2 files changed, 22 insertions(+), 6 deletions(-) + +diff --git a/sys-utils/hwclock.8 b/sys-utils/hwclock.8 +index 07d9fc0..5c599ad 100644 +--- a/sys-utils/hwclock.8 ++++ b/sys-utils/hwclock.8 +@@ -58,10 +58,12 @@ This is a good option to use in one of the system startup scripts. + Set the Hardware Clock to the current System Time. + .TP + .B \-\-systz +-Reset the System Time based on the current timezone. ++Set the kernel's timezone and reset the System Time based on the current timezone. + +-Also set the kernel's timezone value to the local timezone +-as indicated by the TZ environment variable and/or ++The system time is only reset on the first call after boot. ++ ++The local timezone is taken to be what is ++indicated by the TZ environment variable and/or + .IR /usr/share/zoneinfo , + as + .BR tzset (3) +@@ -74,7 +76,8 @@ This is an alternate option to + .B \-\-hctosys + that does not read the hardware clock, and may be used in system startup + scripts for recent 2.6 kernels where you know the System Time contains +-the Hardware Clock time. ++the Hardware Clock time. If the Hardware Clock is already in UTC, it is ++not reset. + .TP + .B \-\-adjust + Add or subtract time from the Hardware Clock to account for systematic +diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c +index 5a4c87e..351ce1f 100644 +--- a/sys-utils/hwclock.c ++++ b/sys-utils/hwclock.c +@@ -772,7 +772,6 @@ static int set_system_clock_timezone(const bool universal, const bool testing) + struct timeval tv; + struct tm *broken; + int minuteswest; +- int rc; + + gettimeofday(&tv, NULL); + if (debug) { +@@ -818,10 +817,24 @@ static int set_system_clock_timezone(const bool universal, const bool testing) + ("Not setting system clock because running in test mode.\n")); + retcode = 0; + } else { ++ const struct timezone tz_utc = { 0, 0 }; + const struct timezone tz = { minuteswest, 0 }; + const struct timeval *tv_null = NULL; ++ int rc = 0; ++ ++ /* The first call to settimeofday after boot will assume the systemtime ++ * is in localtime, and adjust it according to the given timezone to ++ * compensate. If the systemtime is in fact in UTC, then this is wrong ++ * so we first do a dummy call to make sure the time is not shifted. ++ */ ++ if (universal) ++ rc = settimeofday(tv_null, &tz_utc); ++ ++ /* Now we set the real timezone. Due to the above dummy call, this will ++ * only warp the systemtime if the RTC is not in UTC. */ ++ if (!rc) ++ rc = settimeofday(tv_null, &tz); + +- rc = settimeofday(tv_null, &tz); + if (rc) { + if (errno == EPERM) { + warnx(_ +-- +1.7.12.1 + diff --git a/core/util-linux/pam-su b/core/util-linux/pam-su new file mode 100644 index 000000000..cf15f40f1 --- /dev/null +++ b/core/util-linux/pam-su @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +# Uncomment the following line to implicitly trust users in the "wheel" group. +#auth sufficient pam_wheel.so trust use_uid +# Uncomment the following line to require a user to be in the "wheel" group. +#auth required pam_wheel.so use_uid +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/core/util-linux/su.1 b/core/util-linux/su.1 new file mode 100644 index 000000000..59e17314d --- /dev/null +++ b/core/util-linux/su.1 @@ -0,0 +1,230 @@ +.TH SU "1" "June 2012" "util-linux" "User Commands" +.SH NAME +su \- run a command with substitute user and group ID +.SH SYNOPSIS +.B su +[options...] [\-] [user [args...]] +.SH DESCRIPTION +.B su +allows to run commands with substitute user and group ID. +.PP +When called without arguments +.B su +defaults to running an interactive shell as +.IR root . +.PP +For backward compatibility +.B su +defaults to not change the current directory and to only set the +environment variables +.B HOME +and +.B SHELL +(plus +.B USER +and +.B LOGNAME +if the target +.I user +is not root). It is recommended to always use the +.B \-\-login +option (instead it's shortcut +.BR \- ) +to avoid side effects caused by mixing environments. +.PP +This version of +.B su +uses PAM for authentication, account and session management. Some +configuration options found in other +.B su +implementations such as e.g. support of a wheel group have to be +configured via PAM. +.SH OPTIONS +.TP +\fB\-c\fR \fIcommand\fR, \fB\-\-command\fR=\fIcommand\fR +Pass +.I command +to the shell with the +.B \-c +option. +.TP +\fB\-\-session\-command\fR=\fIcommand\fR +Same as +.B \-c +but do not create a new session (discouraged). +.TP +\fB\-f\fR, \fB\-\-fast\fR +Pass +.B \-f +to the shell which may or may not be useful depending on the +shell. +.TP +\fB\-g\fR, \fB\-\-group\fR=\fIgroup\fR\fR +specify the primary group, this option is allowed for root user only +.TP +\fB\-G\fR, \fB\-\-supp-group\fR=\fIgroup\fR\fR +specify a supplemental group, this option is allowed for root user only +.TP +\fB\-\fR, \fB\-l\fR, \fB\-\-login\fR +Starts the shell as login shell with an environment similar to a real +login: +.RS 10 +.TP +o +clears all environment variables except for +.B TERM +.TP +o +initializes the environment variables +.BR HOME , +.BR SHELL , +.BR USER , +.BR LOGNAME , +.B PATH +.TP +o +changes to the target user's home directory +.TP +o +sets argv[0] of the shell to +.RB ' \- ' +in order to make the shell a login shell +.RE +.TP +\fB\-m\fR, \fB\-p\fR, \fB\-\-preserve-environment\fR +Preserves the whole environment, ie does not set +.BR HOME , +.BR SHELL , +.B USER +nor +.BR LOGNAME . +.TP +\fB\-s\fR \fISHELL\fR, \fB\-\-shell\fR=\fISHELL\fR +Runs the specified shell instead of the default. The shell to run is +selected according to the following rules in order: +.RS 10 +.TP +o +the shell specified with +.B \-\-shell +.TP +o +The shell specified in the environment variable +.B SHELL +if the +.B \-\-preserve-environment +option is used. +.TP +o +the shell listed in the passwd entry of the target user +.TP +o +/bin/sh +.RE +.IP +If the target user has a restricted shell (i.e. not listed in +/etc/shells) the +.B \-\-shell +option and the +.B SHELL +environment variables are ignored unless the calling user is root. +.TP +\fB\-\-help\fR +Display help text and exit. +.TP +\fB\-\-version\fR +Display version information and exit. +.SH CONFIG FILES +.B su +reads the +.I /etc/default/su +and +.I /etc/login.defs +configuration files. The following configuration items are relevant +for +.BR su (1): +.PP +.B FAIL_DELAY +(number) +.RS 4 +Delay in seconds in case of authentication failure. Number must be +a non-negative integer. +.RE +.PP +.B ENV_PATH +(string) +.RS 4 +Defines the PATH environment variable for a regular user. The +default value is +.IR /usr/local/bin:\:/bin:\:/usr/bin . +.RE +.PP +.B ENV_ROOTPATH +(string) +.br +.B ENV_SUPATH +(string) +.RS 4 +Defines the PATH environment variable for root. The default value is +.IR /usr/local/sbin:\:/usr/local/bin:\:/sbin:\:/bin:\:/usr/sbin:\:/usr/bin . +.RE +.PP +.B ALWAYS_SET_PATH +(boolean) +.RS 4 +If set to +.I yes +and \-\-login and \-\-preserve\-environment were not specified +.B su +initializes +.BR PATH . +.RE +.SH EXIT STATUS +.B su +normally returns the exit status of the command it executed. If the +command was killed by a signal, +.B su +returns the number of the signal plus 128. +.PP +Exit status generated by +.B su +itself: +.RS 10 +.TP +1 +Generic error before executing the requested command +.TP +126 +The requested command could not be executed +.TP +127 +The requested command could was not found +.RE +.SH FILES +.PD 0 +.TP 17 +/etc/pam.d/su +default PAM configuration file +.TP +/etc/pam.d/su-l +PAM configuration file if \-\-login is specified +.TP +/etc/default/su +command specific logindef config file +.TP +/etc/login.defs +global logindef config file +.PD 1 +.SH "SEE ALSO" +.BR pam (8), +.BR shells (5), +.BR login.defs (5) +.SH AUTHOR +Derived from coreutils' su which was based on an implementation from +David MacKenzie. +.SH AVAILABILITY +The su command is part of the util-linux package and is +available from +.UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/ +Linux Kernel Archive +.UE . diff --git a/core/util-linux/util-linux.install b/core/util-linux/util-linux.install index 90ce5bd73..35f80e2a2 100644 --- a/core/util-linux/util-linux.install +++ b/core/util-linux/util-linux.install @@ -1,3 +1,20 @@ +post_install() { + # create user for uuidd + if ! getent group uuidd >/dev/null; then + groupadd -r uuidd + fi + + if ! getent passwd uuidd >/dev/null; then + useradd -r -s /sbin/nologin -d / -g uuidd uuidd + fi + + # we don't want use systemd-tmpfiles here because + # the package dependency would create a circular dep. + if [ ! -d run/uuidd ]; then + install -o uuidd -g uuidd -dm755 run/uuidd + fi +} + post_upgrade() { if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then if [ -f /var/lib/hwclock/adjtime ]; then @@ -7,4 +24,16 @@ post_upgrade() { rmdir /var/lib/hwclock fi fi + + post_install +} + +post_remove() { + if getent passwd uuidd >/dev/null; then + userdel uuidd + fi + + if getent group uuidd >/dev/null; then + userdel uuidd + fi } diff --git a/core/util-linux/uuidd.tmpfiles b/core/util-linux/uuidd.tmpfiles new file mode 100644 index 000000000..b059cfe65 --- /dev/null +++ b/core/util-linux/uuidd.tmpfiles @@ -0,0 +1 @@ +d /run/uuidd 0755 uuidd uuidd diff --git a/elementary/gtk-engine-equinox/PKGBUILD b/elementary/gtk-engine-equinox/PKGBUILD index d2c08627b..11d0a717a 100644 --- a/elementary/gtk-engine-equinox/PKGBUILD +++ b/elementary/gtk-engine-equinox/PKGBUILD @@ -1,33 +1,34 @@ -# created 16:18:42 - 21/03/10 -# Maintainer: Frikilinux <frikilinux at frikilinux.com.ar> +# Maintainer : SpepS <dreamspepser at yahoo dot it> +# Contributor: Frikilinux <frikilinux at frikilinux.com.ar> pkgname=gtk-engine-equinox pkgver=1.50 -pkgrel=2 +pkgrel=3 pkgdesc="A heavily modified version of the beautiful Aurora engine" url="http://gnome-look.org/content/show.php/Equinox+GTK+Engine?content=121881" -license=('GPL2') +license=('GPL') arch=('i686' 'x86_64') depends=('gtk2') -makedepends=('pkgconfig') -conflicts=() +makedepends=('libtool') options=('!libtool') -source=("http://gnome-look.org/CONTENT/content-files/121881-equinox-${pkgver}.tar.gz") +source=("http://gnome-look.org/CONTENT/content-files/121881-equinox-$pkgver.tar.gz") sha256sums=('0cf8b8cc841e0da7d4a08ab5a70d3bb330fd76bdcb03165a47aaddcd47e02227') build() { - # extract engine files - #tar xzf equinox-gtk-engine.tar.gz - cd "${srcdir}"/equinox-$pkgver + cd "$srcdir/equinox-$pkgver" - # Toolbar Fix - sed -i "s|\(EQUINOX_IS_TOOLBAR.*parent\)|widget \&\& \1|" src/equinox_style.c - - ./configure --prefix=/usr --enable-animation - make + # toolbar fix + sed -i "s/=\( EQUINOX_IS_TOOLBAR\)/= widget \&\&\1/" \ + src/equinox_style.c + # glib2 fix + sed -i "/gtimer/d" src/animation.c + + ./configure --prefix=/usr \ + --enable-animation + make } package() { - cd "${srcdir}"/equinox-$pkgver - make DESTDIR="${pkgdir}" install + cd "$srcdir/equinox-$pkgver" + make DESTDIR="$pkgdir/" install } diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 29898c04c..d660f6d86 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 165171 2012-08-12 04:07:04Z bisson $ +# $Id: PKGBUILD 166973 2012-09-23 22:56:56Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=3.3.1 +pkgver=3.3.2 pkgrel=1 pkgdesc='Lightweight, advanced audio player focused on audio quality' url='http://audacious-media-player.org/' -license=('GPL3') +license=('custom:BSD') arch=('i686' 'x86_64') depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'desktop-file-utils') optdepends=('unzip: zipped skins support') source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('6ccd6856df853d939ea41402be4bfc76a5423a8f') +sha1sums=('bab3bcb267b8b333570c85cae9590470fe509eb9') provides=('audacious-player') replaces=('audacious-player') @@ -29,4 +29,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libffado/PKGBUILD b/extra/libffado/PKGBUILD index a3ebc3d37..d0fbd0b4f 100644 --- a/extra/libffado/PKGBUILD +++ b/extra/libffado/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166872 2012-09-20 10:13:42Z schiv $ +# $Id: PKGBUILD 166955 2012-09-23 09:44:31Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: galiyosha@gmail.com # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> pkgname=libffado pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Driver for FireWire audio devices" arch=('i686' 'x86_64') url="http://www.ffado.org/" @@ -26,6 +26,7 @@ _scons-conf() { PREFIX=/usr \ MANDIR=/usr/share/man \ UDEVDIR=/usr/lib/udev/rules.d \ + ENABLE_SETBUFFERSIZE_API_VER=false \ COMPILE_FLAGS="$CFLAGS" $@ } diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index 4fedbdd6a..97169c70c 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165552 2012-08-23 17:48:12Z tomegun $ +# $Id: PKGBUILD 166960 2012-09-23 11:44:00Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: damir <damir@archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=libmtp -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=1 pkgdesc="Library implementation of the Media Transfer Protocol" arch=("i686" "x86_64") @@ -24,4 +24,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('27d9bcbc925c1ef84869eb27fdda54e8') +md5sums=('f80e45c0e6e5798c434bb1c26a7b602d') diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 4dae23cae..a29c185e7 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166901 2012-09-21 13:44:23Z andrea $ +# $Id: PKGBUILD 166954 2012-09-23 09:22:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.3 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -19,14 +19,16 @@ source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' 'improve-cups-support.patch' - 'fix-crash-in-assistant.patch') + 'fix-crash-in-assistant.patch' + 'undo-fix-jit-crash-on-x86_64.patch') md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' 'c439c7731c25387352d8453ca7574971' - '57590084078b6379f0501f7728b02ae2') + '57590084078b6379f0501f7728b02ae2' + '094e5a4e30e52423c77daa4a9c782df5') build() { cd "${srcdir}"/${_pkgfqn} @@ -34,8 +36,11 @@ build() { # (FS#28381) (KDEBUG#180051) patch -p1 -i "${srcdir}"/improve-cups-support.patch - # (FS#) + # (FS#29469) patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch + + # (FS#31654) + patch -Rp1 -i "${srcdir}"/undo-fix-jit-crash-on-x86_64.patch export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} diff --git a/extra/qt/undo-fix-jit-crash-on-x86_64.patch b/extra/qt/undo-fix-jit-crash-on-x86_64.patch new file mode 100644 index 000000000..ac86a846b --- /dev/null +++ b/extra/qt/undo-fix-jit-crash-on-x86_64.patch @@ -0,0 +1,280 @@ +Description: Fix JIT crash on x86-64 (avoid 32-bit branch offset overflow) + . + Cherry-picked from webkit commit + a5b3261a8c4386b4e14ce40a34c7fc933a5f7001 +Origin: commit ada98493bbfbd9af0d0b593017e29d39bcd3495e +Author: Kent Hansen <kent.hansen@nokia.com> +Forwarded: not-needed +Applied-Upstream: yes +Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> +Reviewed-by: Kent Hansen <kent.hansen@nokia.com> +--- + .../javascriptcore/JavaScriptCore/ChangeLog | 27 +++++++++++++++++ + .../JavaScriptCore/JavaScriptCore.pri | 1 + + .../JavaScriptCore/jit/ExecutableAllocator.cpp | 21 +++++++++++++ + .../jit/ExecutableAllocatorFixedVMPool.cpp | 31 +++++++++++++------- + .../jit/ExecutableAllocatorPosix.cpp | 29 ++---------------- + .../jit/ExecutableAllocatorSymbian.cpp | 2 +- + .../JavaScriptCore/jit/ExecutableAllocatorWin.cpp | 2 +- + .../javascriptcore/JavaScriptCore/wtf/Platform.h | 10 +++++++ + 8 files changed, 84 insertions(+), 39 deletions(-) + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog +index 9cbf0c1..5ab23e6 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog +@@ -1,3 +1,30 @@ ++2010-07-08 Gavin Barraclough <barraclough@apple.com> ++ ++ Reviewed by Sam Weinig. ++ ++ https://bugs.webkit.org/show_bug.cgi?id=41641 ++ ++ Update compile flags to allow use of ExecutableAllocatorFixedVMPool on platforms ++ other than x86-64 (this may be useful on 32-bit platforms, too). ++ ++ Simplify ifdefs by dividing into thwo broad allocation strategies ++ (ENABLE_EXECUTABLE_ALLOCATOR_FIXED & ENABLE_EXECUTABLE_ALLOCATOR_DEMAND). ++ ++ Rename constant used in the code to have names descriptive of their purpose, ++ rather than their specific value on a given platform. ++ ++ * jit/ExecutableAllocator.cpp: ++ (JSC::ExecutableAllocator::reprotectRegion): ++ (JSC::ExecutableAllocator::cacheFlush): ++ * jit/ExecutableAllocatorFixedVMPool.cpp: ++ (JSC::FixedVMPoolAllocator::FixedVMPoolAllocator): ++ (JSC::FixedVMPoolAllocator::free): ++ (JSC::ExecutablePool::systemAlloc): ++ * jit/ExecutableAllocatorPosix.cpp: ++ * jit/ExecutableAllocatorSymbian.cpp: ++ * jit/ExecutableAllocatorWin.cpp: ++ * wtf/Platform.h: ++ + 2010-08-24 Oliver Hunt <oliver@apple.com> + + Reviewed by Geoff Garen. +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +index b061321..847f69c 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +@@ -100,6 +100,7 @@ SOURCES += \ + interpreter/CallFrame.cpp \ + interpreter/Interpreter.cpp \ + interpreter/RegisterFile.cpp \ ++ jit/ExecutableAllocatorFixedVMPool.cpp \ + jit/ExecutableAllocatorPosix.cpp \ + jit/ExecutableAllocatorSymbian.cpp \ + jit/ExecutableAllocatorWin.cpp \ +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp +index f6b27ec..f0ebbab 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp +@@ -33,6 +33,27 @@ namespace JSC { + + size_t ExecutableAllocator::pageSize = 0; + ++#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) ++void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting) ++{ ++ if (!pageSize) ++ intializePageSize(); ++ ++ // Calculate the start of the page containing this region, ++ // and account for this extra memory within size. ++ intptr_t startPtr = reinterpret_cast<intptr_t>(start); ++ intptr_t pageStartPtr = startPtr & ~(pageSize - 1); ++ void* pageStart = reinterpret_cast<void*>(pageStartPtr); ++ size += (startPtr - pageStartPtr); ++ ++ // Round size up ++ size += (pageSize - 1); ++ size &= ~(pageSize - 1); ++ ++ mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX); ++} ++#endif ++ + } + + #endif // HAVE(ASSEMBLER) +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp +index dd1db4e..16d0fb1 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp +@@ -27,25 +27,33 @@ + + #include "ExecutableAllocator.h" + +-#include <errno.h> ++#if ENABLE(EXECUTABLE_ALLOCATOR_FIXED) + +-#if ENABLE(ASSEMBLER) && OS(DARWIN) && CPU(X86_64) ++#include <errno.h> + + #include "TCSpinLock.h" +-#include <mach/mach_init.h> +-#include <mach/vm_map.h> + #include <sys/mman.h> + #include <unistd.h> + #include <wtf/AVLTree.h> + #include <wtf/VMTags.h> + ++#if CPU(X86_64) ++ // These limits suitable on 64-bit platforms (particularly x86-64, where we require all jumps to have a 2Gb max range). ++ #define VM_POOL_SIZE (2u * 1024u * 1024u * 1024u) // 2Gb ++ #define COALESCE_LIMIT (16u * 1024u * 1024u) // 16Mb ++#else ++ // These limits are hopefully sensible on embedded platforms. ++ #define VM_POOL_SIZE (32u * 1024u * 1024u) // 32Mb ++ #define COALESCE_LIMIT (4u * 1024u * 1024u) // 4Mb ++#endif ++ ++// ASLR currently only works on darwin (due to arc4random) & 64-bit (due to address space size). ++#define VM_POOL_ASLR (OS(DARWIN) && CPU(X86_64)) ++ + using namespace WTF; + + namespace JSC { + +-#define TWO_GB (2u * 1024u * 1024u * 1024u) +-#define SIXTEEN_MB (16u * 1024u * 1024u) +- + // FreeListEntry describes a free chunk of memory, stored in the freeList. + struct FreeListEntry { + FreeListEntry(void* pointer, size_t size) +@@ -291,9 +299,12 @@ public: + // for now instead of 2^26 bits of ASLR lets stick with 25 bits of randomization plus + // 2^24, which should put up somewhere in the middle of usespace (in the address range + // 0x200000000000 .. 0x5fffffffffff). +- intptr_t randomLocation = arc4random() & ((1 << 25) - 1); ++ intptr_t randomLocation = 0; ++#if VM_POOL_ASLR ++ randomLocation = arc4random() & ((1 << 25) - 1); + randomLocation += (1 << 24); + randomLocation <<= 21; ++#endif + m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0); + if (!m_base) + CRASH(); +@@ -387,7 +398,7 @@ public: + // 16MB of allocations have been freed, sweep m_freeList + // coalescing any neighboring fragments. + m_countFreedSinceLastCoalesce += size; +- if (m_countFreedSinceLastCoalesce >= SIXTEEN_MB) { ++ if (m_countFreedSinceLastCoalesce >= COALESCE_LIMIT) { + m_countFreedSinceLastCoalesce = 0; + coalesceFreeSpace(); + } +@@ -429,7 +440,7 @@ ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t size) + SpinLockHolder lock_holder(&spinlock); + + if (!allocator) +- allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, TWO_GB); ++ allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, VM_POOL_SIZE); + ExecutablePool::Allocation alloc = {reinterpret_cast<char*>(allocator->alloc(size)), size}; + return alloc; + } +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp +index 2eb0c87..b04049c 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp +@@ -27,7 +27,7 @@ + + #include "ExecutableAllocator.h" + +-#if ENABLE(ASSEMBLER) && OS(UNIX) && !OS(SYMBIAN) ++#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && !OS(WINDOWS) && !OS(SYMBIAN) + + #include <sys/mman.h> + #include <unistd.h> +@@ -35,8 +35,6 @@ + + namespace JSC { + +-#if !(OS(DARWIN) && !PLATFORM(QT) && CPU(X86_64)) +- + void ExecutableAllocator::intializePageSize() + { + ExecutableAllocator::pageSize = getpagesize(); +@@ -57,29 +55,6 @@ void ExecutablePool::systemRelease(const ExecutablePool::Allocation& alloc) + ASSERT_UNUSED(result, !result); + } + +-#endif // !(OS(DARWIN) && !PLATFORM(QT) && CPU(X86_64)) +- +-#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) +-void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting) +-{ +- if (!pageSize) +- intializePageSize(); +- +- // Calculate the start of the page containing this region, +- // and account for this extra memory within size. +- intptr_t startPtr = reinterpret_cast<intptr_t>(start); +- intptr_t pageStartPtr = startPtr & ~(pageSize - 1); +- void* pageStart = reinterpret_cast<void*>(pageStartPtr); +- size += (startPtr - pageStartPtr); +- +- // Round size up +- size += (pageSize - 1); +- size &= ~(pageSize - 1); +- +- mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX); +-} +-#endif +- + } + +-#endif // HAVE(ASSEMBLER) ++#endif +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp +index e82975c..9028f50 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp +@@ -22,7 +22,7 @@ + + #include "ExecutableAllocator.h" + +-#if ENABLE(ASSEMBLER) && OS(SYMBIAN) ++#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(SYMBIAN) + + #include <e32hal.h> + #include <e32std.h> +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp +index e38323c..72a1d5f 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp +@@ -27,7 +27,7 @@ + + #include "ExecutableAllocator.h" + +-#if ENABLE(ASSEMBLER) && OS(WINDOWS) ++#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(WINDOWS) + + #include "windows.h" + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +index 700977e..d930ed7 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +@@ -1016,6 +1016,16 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ + #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0 + #endif + ++/* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in. ++ On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */ ++#if ENABLE(ASSEMBLER) ++#if CPU(X86_64) ++#define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1 ++#else ++#define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1 ++#endif ++#endif ++ + #if !defined(ENABLE_PAN_SCROLLING) && OS(WINDOWS) + #define ENABLE_PAN_SCROLLING 1 + #endif +-- +1.7.10.4 + diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index dc5bca7f2..f0af5797e 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165472 2012-08-20 13:29:51Z tomegun $ +# $Id: PKGBUILD 166956 2012-09-23 09:55:03Z tomegun $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') pkgver=2.61 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.transmissionbt.com/" license=('MIT') diff --git a/extra/transmission/transmission-cli.install b/extra/transmission/transmission-cli.install index 68df89498..8ab275e61 100644 --- a/extra/transmission/transmission-cli.install +++ b/extra/transmission/transmission-cli.install @@ -3,14 +3,15 @@ post_install() { If you want to run the Transmission daemon at boot, add transmissiond to the DAEMONS array in /etc/rc.conf. - _EOF + +post_upgrade +passwd -l transmission &>/dev/null } post_upgrade() { # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files getent group transmission >/dev/null || groupadd -g 169 transmission getent passwd transmission >/dev/null || useradd -c 'Transmission BitTorrent Client' -u 169 -g transmission -b '/var/lib' -m -s /bin/false transmission - passwd -l transmission &>/dev/null systemd-tmpfiles --create transmission.conf } diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index e753c4317..c58a2a649 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164051 2012-07-25 06:08:06Z giovanni $ +# $Id: PKGBUILD 166946 2012-09-23 04:27:14Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=whois -pkgver=5.0.18 +pkgver=5.0.19 pkgrel=1 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('libidn') makedepends=('perl') source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz") -md5sums=('15d777273d44a5b9a0814c1ea0d22b1a') +md5sums=('16b0a0e5e3757287462bbeb01b66b191') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/social/libnatpmp/PKGBUILD b/social/libnatpmp/PKGBUILD new file mode 100644 index 000000000..e81d3445f --- /dev/null +++ b/social/libnatpmp/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Pierre Bourdon <delroth@gmail.com> + +pkgname=libnatpmp +pkgver=20120821 +pkgrel=1 +pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol" +arch=('i686' 'x86_64') +url="http://miniupnp.free.fr/libnatpmp.html" +license=('BSD') +depends=('glibc') +makedepends=() +source=(libnatpmp-$pkgver.tar.gz::http://miniupnp.free.fr/files/download.php?file=libnatpmp-$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make INSTALLPREFIX="$pkgdir/usr" \ + INSTALLDIRINC="$pkgdir/usr/include/libnatpmp" install + + # Needed by some packages + install -m 644 getgateway.h declspec.h "$pkgdir/usr/include/libnatpmp" + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} +md5sums=('d2b9c2dedba3a00deb0e7589982ceced') diff --git a/social/miniupnpc/PKGBUILD b/social/miniupnpc/PKGBUILD index 4d139afdc..a28b9842f 100644 --- a/social/miniupnpc/PKGBUILD +++ b/social/miniupnpc/PKGBUILD @@ -1,14 +1,14 @@ # Contributor: Florian Loitsch <archlinux@florian.loitsch.com> pkgname=miniupnpc -pkgver=1.6 -pkgrel=2 +pkgver=1.7.20120830 +pkgrel=1 pkgdesc='A small UPnP client library/tool to access Internet Gateway Devices' -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://miniupnp.free.fr" license=('BSD') depends=('sh') source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz") -md5sums=('88055f2d4a061cfd4cfe25a9eae22f67') +md5sums=('c74b24b906e11860005fc425b4979fe6') build() { cd $srcdir/$pkgname-$pkgver diff --git a/social/miniupnpd/PKGBUILD b/social/miniupnpd/PKGBUILD new file mode 100644 index 000000000..b0d67c09e --- /dev/null +++ b/social/miniupnpd/PKGBUILD @@ -0,0 +1,41 @@ +pkgname=miniupnpd +pkgver=1.7.20120824 +pkgrel=2 +pkgdesc="Lightweight UPnP IGD daemon" +arch=('i686' 'x86_64' 'mips64el') +url="http://miniupnp.free.fr" +license=('BSD') +backup=(etc/miniupnpd/miniupnpd.conf) +depends=('libnfnetlink') + +eval $(wget "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/iptables" -O - | awk -F= ' + $1 == "pkgver" { pkgver=$2 } + $1 == "source" { sub(/\${pkgname}/, "iptables"); sub(/\${pkgver}/, pkgver); print $0 "); " } + $1 == "sha1sums" { print $0 ");" } + END { print "_iptables=iptables-" pkgver }') + +source+=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz" miniupnpd.init miniupnpd.systemd) +sha1sums+=('7abca8ecbcd8596392175eb312941083ed5faf21' + 'c84031d7af122c5bede8609bcfa80bc31f2a5e61' + 'bc0ae02a88eceef4f172b07f6f67d5fd54cc6ae0') + +build() { + cd "$srcdir/$_iptables" + ./configure --enable-static + make + + cd "$srcdir/$pkgname-$pkgver" + make -f Makefile.linux config.h + IPTABLESPATH="$srcdir/$_iptables" make -f Makefile.linux +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + mkdir -p "$pkgdir/usr/share/man/man8" + make PREFIX="$pkgdir/" -f Makefile.linux install + rm -r "${pkgdir}/etc/init.d" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm755 "${srcdir}/miniupnpd.init" "${pkgdir}/etc/rc.d/miniupnpd" + install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service" +} + diff --git a/social/miniupnpd/miniupnpd.init b/social/miniupnpd/miniupnpd.init new file mode 100644 index 000000000..e09ac3ade --- /dev/null +++ b/social/miniupnpd/miniupnpd.init @@ -0,0 +1,51 @@ +#!/bin/sh + +MINIUPNPD=/usr/sbin/miniupnpd +ARGS='-f /etc/miniupnpd/miniupnpd.conf' +PIDFILE='/var/run/miniupnpd.pid' +IPTABLES_CREATE=/etc/miniupnpd/iptables_init.sh +IPTABLES_REMOVE=/etc/miniupnpd/iptables_removeall.sh + +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting MiniUPNPd" + + if ! pidof -o %PPID $MINIUPNPD &> /dev/null; then + rm -f "$PIDFILE" + fi + + $IPTABLES_CREATE > /dev/null 2>&1 + + PID="$(cat "$PIDFILE" 2> /dev/null)" + + if [ -z "$PID" ] && $MINIUPNPD $ARGS; then + add_daemon miniupnpd + stat_done + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping MiniUPNPd" + PID="$(cat "$PIDFILE" 2> /dev/null)" + if [ -n "$PID" ] && kill "$PID" &> /dev/null; then + rm -f "$PIDFILE" + rm_daemon miniupnpd + stat_done + else + stat_fail + fi + ;; + restart) + "$0" stop + sleep 1 + "$0" start + ;; + *) + echo "Usage: /etc/rc.d/miniupnpd {start|stop|restart}" + exit 2 + ;; +esac +exit 0 diff --git a/social/miniupnpd/miniupnpd.systemd b/social/miniupnpd/miniupnpd.systemd new file mode 100644 index 000000000..0449e8a69 --- /dev/null +++ b/social/miniupnpd/miniupnpd.systemd @@ -0,0 +1,8 @@ +[Unit] +Description=Lightweight UPnP IGD daemon + +[Service] +ExecStart=/usr/sbin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d + +[Install] +WantedBy=network.target diff --git a/social/nitroshare/PKGBUILD b/social/nitroshare/PKGBUILD new file mode 100644 index 000000000..7896a356e --- /dev/null +++ b/social/nitroshare/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Sid Karunaratne <sid at karunaratne dot net> +# Contributor: Nathan Osman <https://launchpad.net/~george-edison55> + +pkgname=nitroshare +pkgver=0.2 +pkgrel=2 +pkgdesc="Makes sending a file to another machine on the local network as easy as dragging-and-dropping" +arch=('i686' 'x86_64') +url="https://launchpad.net/nitroshare" +license=('GPL3') +depends=('qt' 'qjson' 'qxmlrpc') +makedepends=() +options=() +source=(https://launchpad.net/${pkgname}/${pkgver}/${pkgver}/+download/${pkgname}_${pkgver}.tar.gz nitroshare.install) +md5sums=('00f670fadf385ee2a920b67a4120295d' + '0e8cd7761d04a45d22d28ac7b98fa234') + +build () { + cd "${srcdir}/${pkgname}" + sed -i "s_target.path = /opt/extras.ubuntu.com/nitroshare_target.path = ${pkgdir}/usr/bin_g" nitroshare.pro + sed -i "s_Exec=/opt/extras.ubuntu.com/nitroshare/nitroshare_Exec=/usr/bin/${pkgname}_g" resource/other/extras-${pkgname}.desktop + qmake + make +} + +package (){ + cd "${srcdir}/${pkgname}" + make install + mkdir -p ${pkgdir}/usr/share/applications + install -Dm644 resource/other/extras-${pkgname}.desktop ${pkgdir}/usr/share/applications/ + install -Dm644 resource/images/logo.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/social/nitroshare/nitroshare.install b/social/nitroshare/nitroshare.install new file mode 100644 index 000000000..d6519a6e8 --- /dev/null +++ b/social/nitroshare/nitroshare.install @@ -0,0 +1,4 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor + update-desktop-database -q +} diff --git a/social/qxmlrpc/01_build_targets.patch b/social/qxmlrpc/01_build_targets.patch new file mode 100644 index 000000000..bee6d5167 --- /dev/null +++ b/social/qxmlrpc/01_build_targets.patch @@ -0,0 +1,9 @@ +Index: qxmlrpc-0.0.svn6/qxmlrpc.pro +=================================================================== +--- qxmlrpc-0.0.svn6.orig/qxmlrpc.pro 2010-06-04 14:39:33.000000000 +0400 ++++ qxmlrpc-0.0.svn6/qxmlrpc.pro 2010-06-04 14:39:44.000000000 +0400 +@@ -1,3 +1,3 @@ + TEMPLATE = subdirs +-SUBDIRS = xmlrpc test/unit examples/client examples/server ++SUBDIRS = xmlrpc + CONFIG += ordered diff --git a/social/qxmlrpc/02_staticlib_removed.patch b/social/qxmlrpc/02_staticlib_removed.patch new file mode 100644 index 000000000..58f1d68d1 --- /dev/null +++ b/social/qxmlrpc/02_staticlib_removed.patch @@ -0,0 +1,12 @@ +Index: qxmlrpc-0.0.svn6/xmlrpc/xmlrpc.pro +=================================================================== +--- qxmlrpc-0.0.svn6.orig/xmlrpc/xmlrpc.pro 2010-06-04 18:18:24.000000000 +0400 ++++ qxmlrpc-0.0.svn6/xmlrpc/xmlrpc.pro 2010-06-04 18:23:23.000000000 +0400 +@@ -4,7 +4,6 @@ + win32:TARGET = ../qxmlrpc + + CONFIG += warn_on +-CONFIG += staticlib + CONFIG += debug_and_release + CONFIG += precompile_header + diff --git a/social/qxmlrpc/03_client.h_include_fix.patch b/social/qxmlrpc/03_client.h_include_fix.patch new file mode 100644 index 000000000..6f174cb95 --- /dev/null +++ b/social/qxmlrpc/03_client.h_include_fix.patch @@ -0,0 +1,13 @@ +Index: qxmlrpc-0.0.svn6/xmlrpc/client.h +=================================================================== +--- qxmlrpc-0.0.svn6.orig/xmlrpc/client.h 2010-06-04 18:18:24.000000000 +0400 ++++ qxmlrpc-0.0.svn6/xmlrpc/client.h 2010-06-04 18:20:21.000000000 +0400 +@@ -7,7 +7,7 @@ + #include <qobject.h> + #include <QHttp> + +-#include "xmlrpc/variant.h" ++#include "variant.h" + class QAuthenticator; + + namespace xmlrpc { diff --git a/social/qxmlrpc/04_do_not_link_gui.patch b/social/qxmlrpc/04_do_not_link_gui.patch new file mode 100644 index 000000000..c086d4990 --- /dev/null +++ b/social/qxmlrpc/04_do_not_link_gui.patch @@ -0,0 +1,24 @@ +Index: qxmlrpc-0.0.svn6/xmlrpc/stable.h +=================================================================== +--- qxmlrpc-0.0.svn6.orig/xmlrpc/stable.h 2010-06-04 18:23:58.000000000 +0400 ++++ qxmlrpc-0.0.svn6/xmlrpc/stable.h 2010-06-04 18:24:20.000000000 +0400 +@@ -2,7 +2,6 @@ + #ifndef STABLE_H + #define STABLE_H + #if defined(__cplusplus) and not defined(__OBJC__) +- #include <QtGui> + #include <QtXml> + #include <QtCore> + #include <QtNetwork> +Index: qxmlrpc-0.0.svn6/xmlrpc/xmlrpc.pro +=================================================================== +--- qxmlrpc-0.0.svn6.orig/xmlrpc/xmlrpc.pro 2010-06-04 18:23:54.000000000 +0400 ++++ qxmlrpc-0.0.svn6/xmlrpc/xmlrpc.pro 2010-06-04 18:24:12.000000000 +0400 +@@ -10,6 +10,7 @@ + DEPENDPATH += . + INCLUDEPATH += . .. + ++QT -= gui + QT += xml + QT += network + diff --git a/social/qxmlrpc/PKGBUILD b/social/qxmlrpc/PKGBUILD new file mode 100644 index 000000000..2e23c0a47 --- /dev/null +++ b/social/qxmlrpc/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Sid Karunaratne <sid at karunaratne dot net> +pkgname=qxmlrpc +pkgver=6 +pkgrel=1 +pkgdesc="a full Qt4 based implementation of XML-RPC protocol" +arch=('i686' 'x86_64') +url="https://code.google.com/p/qxmlrpc" +license=('LGPL') +depends=('qt') +makedepends=('subversion') +source=("https://repo.parabolagnulinux.org/other/$pkgname-$pkgver-$pkgrel-any.src.tar.xz"{,.sig} + "01_build_targets.patch" + "02_staticlib_removed.patch" + "03_client.h_include_fix.patch" + "04_do_not_link_gui.patch") +md5sums=("87a89cc118e816265989a87a2b3c9321" + "7f10b0f33b6d0a67136838740b4b7c72" + "7d997d9fc0f8ec08e7b0c640480eb941" + "ee1a3d2a284c93f41d3c76c163ee734d" + "c5cacf7e13b93abb3e8e223118c5abbb" + "8ff188be390bcd1966b354d7159fd0e6") + +build () { + cd "${srcdir}/${pkgname}" + msg "Starting build..." + + patch -p1 < ../01_build_targets.patch + patch -p1 < ../02_staticlib_removed.patch + patch -p1 < ../03_client.h_include_fix.patch + patch -p1 < ../04_do_not_link_gui.patch + + qmake + make +} + +package() { + install -Dm 755 "$srcdir/$pkgname/libqxmlrpc.so" "$pkgdir/usr/lib/libqxmlrpc.so" + install -Dm 755 "$srcdir/$pkgname/xmlrpc/client.h" "$pkgdir/usr/include/qxmlrpc/client.h" + install -Dm 755 "$srcdir/$pkgname/xmlrpc/request.h" "$pkgdir/usr/include/qxmlrpc/request.h" + install -Dm 755 "$srcdir/$pkgname/xmlrpc/response.h" "$pkgdir/usr/include/qxmlrpc/response.h" + install -Dm 755 "$srcdir/$pkgname/xmlrpc/server.h" "$pkgdir/usr/include/qxmlrpc/server.h" + install -Dm 755 "$srcdir/$pkgname/xmlrpc/serverintrospection.h" "$pkgdir/usr/include/qxmlrpc/serverintrospection.h" + install -Dm 755 "$srcdir/$pkgname/xmlrpc/variant.h" "$pkgdir/usr/include/qxmlrpc/variant.h" +} diff --git a/social/qxmlrpc/SRCBUILD b/social/qxmlrpc/SRCBUILD new file mode 100644 index 000000000..b5fe17ebf --- /dev/null +++ b/social/qxmlrpc/SRCBUILD @@ -0,0 +1,30 @@ +pkgname=qxmlrpc +pkgver=6 +pkgrel=1 +pkgdesc="a full Qt4 based implementation of XML-RPC protocol" +arch=('any') +url="https://code.google.com/p/qxmlrpc" +license=('LGPL') +makedepends=('subversion') +_svntrunk="http://qxmlrpc.googlecode.com/svn/trunk/" +_svnmod="qxmlrpc" + +build() { + msg "Connecting to SVN server...." + + if [[ -d "$_svnmod/.svn" ]]; then + (cd "$_svnmod" && svn up -r "$pkgver") + else + svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod" + fi + + msg "SVN checkout done or server timeout" +} + +package() { + export PKGEXT=.src.tar.xz + export PKGDEST=${SRCDEST} + + mv ${srcdir}/${_svnmod} ${pkgdir}/ + +} |