diff options
| author | root <root@rshg054.dnsready.net> | 2012-05-30 00:02:28 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-05-30 00:02:28 +0000 |
| commit | f676c2f568b9c75daa3e2b688978b877f950953d (patch) | |
| tree | 59afe7e51ecb44399c2e64658841e1b5f86571fa | |
| parent | edec45419def1b81bd663a2859684ef55ba56269 (diff) | |
Wed May 30 00:02:27 UTC 2012
32 files changed, 549 insertions, 152 deletions
diff --git a/community-testing/libvirt/PKGBUILD b/community-testing/libvirt/PKGBUILD index 5000e9a3d..fd8b61ae9 100644 --- a/community-testing/libvirt/PKGBUILD +++ b/community-testing/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71494 2012-05-27 13:14:57Z dreisner $ +# $Id: PKGBUILD 71546 2012-05-28 16:42:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=0.9.12 -pkgrel=4 +pkgrel=8 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -34,6 +34,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.rc.d libvirtd-guests.conf.d + libvirt.tmpfiles.d openbsd-netcat-default.patch libvirt-libnl3.patch) md5sums=('5e842bc55733ceba60c64767580ff3e4' @@ -41,6 +42,7 @@ md5sums=('5e842bc55733ceba60c64767580ff3e4' '3ed0e24f5b5e25bf553f5427d64915e6' '8297b1be794a24cc77f66af9380ace59' 'bc2971dacdbac967fc3474e50affc345' + '8d98e62915785686b0b6c8c070628392' 'b0be50eb9dfe4d133decf23b60880f7d' 'ba27fbcd989de8d84cfff98326f10c54') @@ -64,8 +66,8 @@ build() { export LDFLAGS=-lX11 export RADVD=/usr/sbin/radvd [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ - --with-storage-lvm --without-xen --with-udev --without-hal --disable-static - find -name Makefile -exec sed -i 's#-L /usr#-L/usr#' {} \; + --with-storage-lvm --without-xen --with-udev --without-hal --disable-static \ + --with-init-script=systemd make -j1 } @@ -80,5 +82,18 @@ package() { install -D -m755 "$srcdir"/libvirtd-guests.rc.d "$pkgdir"/etc/rc.d/libvirtd-guests install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests - rm -rf $pkgdir/var/run + + install -dm0755 $pkgdir/usr/lib/sysctl.d + mv $pkgdir/etc/sysctl.d/libvirtd $pkgdir/usr/lib/sysctl.d/libvirtd + + # systemd stuff + install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf + mv $pkgdir/lib/* $pkgdir/usr/lib/ + + rm -rf \ + $pkgdir/var/run \ + $pkgdir/etc/rc.d/init.d \ + $pkgdir/etc/sysconfig \ + $pkgdir/lib \ + $pkgdir/etc/sysctl.d } diff --git a/community-testing/libvirt/libvirt.tmpfiles.d b/community-testing/libvirt/libvirt.tmpfiles.d new file mode 100644 index 000000000..0cec93271 --- /dev/null +++ b/community-testing/libvirt/libvirt.tmpfiles.d @@ -0,0 +1,4 @@ +d /var/run/libvirt/qemu 0755 root root - +d /var/run/libvirt/lxc 0755 root root - +d /var/run/libvirt/uml 0755 root root - +d /var/run/libvirt/network 0755 root root - diff --git a/community-testing/multipath-tools/PKGBUILD b/community-testing/multipath-tools/PKGBUILD index 28d08b8f4..b4f134390 100644 --- a/community-testing/multipath-tools/PKGBUILD +++ b/community-testing/multipath-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 71284 2012-05-26 08:37:33Z bpiotrowski $ +# $Id: PKGBUILD 71548 2012-05-28 17:59:37Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas S Hatch <thatch45 ar gmail dot com> # Contributor: Michael P <ptchinster@archlinux.us> @@ -6,7 +6,7 @@ pkgname=multipath-tools pkgver=0.4.9 -pkgrel=7 +pkgrel=8 pkgdesc='Multipath tools for Linux' arch=('i686' 'x86_64') url="http://christophe.varoqui.free.fr/" @@ -16,15 +16,25 @@ backup=('etc/multipath.conf' 'etc/multipath.conf.annotated') install=multipath-tools.install options=(!emptydirs) source=(http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2 - multipath.conf multipath.conf.annotated multipathd.rc all-in-one.patch) + multipath.conf multipath.conf.annotated multipathd.rc + fix-build.patch buffer-overflows.patch log_enquery_overflow.patch + blacklist-cciss-devices.patch explicitly-include-posix_types.h.patch) md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765' '9324ff0ba8330dcb21b2fcf64988026f' 'be11462922eeeb9fcd2ba5f3f137b7d9' '7c04ef96441363b0d43a2ebb13a87659' - '885c0ba9c90b73cc93aa3f78005f81d6') + '885c0ba9c90b73cc93aa3f78005f81d6' + 'c5aab36777b0304a3525533cdd31bddc' + '00eae05e02f1b85062e998574ab1b833' + '61b4038c4c145ca52e836145ea6bdd6c' + 'd99beb6d8a9b84f90125c7cacf8a6006') build() { - patch -Np1 -i all-in-one.patch + patch -Np1 -i fix-build.patch + patch -Np1 -i buffer-overflows.patch + patch -Np1 -i log_enquery_overflow.patch + patch -Np1 -i blacklist-cciss-devices.patch + patch -Np1 -i explicitly-include-posix_types.h.patch # Needs to be fixed upstream. Refer to # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814 diff --git a/community-testing/multipath-tools/blacklist-cciss-devices.patch b/community-testing/multipath-tools/blacklist-cciss-devices.patch new file mode 100644 index 000000000..497121c36 --- /dev/null +++ b/community-testing/multipath-tools/blacklist-cciss-devices.patch @@ -0,0 +1,29 @@ +From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> +Date: Fri, 3 Oct 2008 12:39:48 +0200 +Subject: [PATCH] blacklist cciss devices + +cciss support isn't complete in 0.4.8 and the half functioning causes +problems in d-i among other things. +Closes: #500991 +--- + libmultipath/blacklist.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c +index f369517..2e5efc8 100644 +--- a/libmultipath/blacklist.c ++++ b/libmultipath/blacklist.c +@@ -121,6 +121,12 @@ setup_default_blist (struct config * conf) + if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) + return 1; + ++ str = STRDUP("^cciss!c[0-9]d[0-9]*"); ++ if (!str) ++ return 1; ++ if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) ++ return 1; ++ + vector_foreach_slot (conf->hwtable, hwe, i) { + if (hwe->bl_product) { + if (alloc_ble_device(conf->blist_device)) +-- diff --git a/community-testing/multipath-tools/buffer-overflows.patch b/community-testing/multipath-tools/buffer-overflows.patch new file mode 100644 index 000000000..38719aceb --- /dev/null +++ b/community-testing/multipath-tools/buffer-overflows.patch @@ -0,0 +1,22 @@ +--- multipath-tools-0.4.9.orig/libmultipath/prioritizers/datacore.c 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/libmultipath/prioritizers/datacore.c 2010-11-28 12:22:12.037228583 -0800 +@@ -94,7 +94,7 @@ + if ((io_hdr.info & SG_INFO_OK_MASK) != SG_INFO_OK) + return 0; + +- snprintf(vendor, 9, "%.8s\n", inqBuffp + 8); ++ snprintf(vendor, 8, "%.8s\n", inqBuffp + 8); + snprintf(product, 17, "%.16s", inqBuffp + 16); + snprintf(luname, 21, "%.19s", inqBuffp + 36); + snprintf(wwpn, 17, "%.16s", inqBuffp + 96); +--- multipath-tools-0.4.9.orig/libmultipath/prioritizers/hds.c 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/libmultipath/prioritizers/hds.c 2010-11-28 12:22:44.199483997 -0800 +@@ -123,7 +123,7 @@ + return -1; + } + +- snprintf (vendor, 9, "%.8s", inqBuffp + 8); ++ snprintf (vendor, 8, "%.8s", inqBuffp + 8); + snprintf (product, 17, "%.16s", inqBuffp + 16); + snprintf (serial, 5, "%.4s", inqBuffp + 40); + snprintf (ldev, 5, "%.4s", inqBuffp + 44); diff --git a/community-testing/multipath-tools/explicitly-include-posix_types.h.patch b/community-testing/multipath-tools/explicitly-include-posix_types.h.patch new file mode 100644 index 000000000..6cbbc3ba1 --- /dev/null +++ b/community-testing/multipath-tools/explicitly-include-posix_types.h.patch @@ -0,0 +1,35 @@ +From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> +Date: Sat, 5 Dec 2009 18:11:00 +0100 +Subject: [PATCH] explicitly include posix_types.h + +to get the correct type for __kernel_old_dev_t + +Closes: #558990 +--- + kpartx/lopart.c | 13 +------------ + 1 files changed, 1 insertions(+), 12 deletions(-) + +Index: mpath/kpartx/lopart.c +=================================================================== +--- mpath.orig/kpartx/lopart.c 2012-02-09 18:02:23.808800332 +0530 ++++ mpath/kpartx/lopart.c 2012-02-09 18:15:24.400671080 +0530 +@@ -26,18 +26,7 @@ + #include <sys/stat.h> + #include <sys/mman.h> + #include <sysmacros.h> +- +-#if defined(__hppa__) || defined(__powerpc64__) || defined (__alpha__) \ +- || defined (__x86_64__) +-typedef unsigned long __kernel_old_dev_t; +-#elif defined(__powerpc__) || defined(__ia64__) || (defined(__sparc__) && defined (__arch64__)) +-typedef unsigned int __kernel_old_dev_t; +-#else +-typedef unsigned short __kernel_old_dev_t; +-#endif +- +-#define dev_t __kernel_old_dev_t +- ++#include <asm/posix_types.h> + #include <linux/loop.h> + + #include "lopart.h" diff --git a/community-testing/multipath-tools/fix-build.patch b/community-testing/multipath-tools/fix-build.patch index c6196f73b..ff8f6824c 100644 --- a/community-testing/multipath-tools/fix-build.patch +++ b/community-testing/multipath-tools/fix-build.patch @@ -1,6 +1,24 @@ ---- multipath-tools-0.4.9.orig/kpartx/Makefile 2010-05-22 05:01:58.000000000 -0700 -+++ multipath-tools-0.4.9/kpartx/Makefile 2010-11-28 12:14:25.763531104 -0800 -@@ -6,7 +6,7 @@ +diff -rupN upstream/Makefile.inc devel/Makefile.inc +--- upstream/Makefile.inc 2010-05-22 14:01:58.000000000 +0200 ++++ devel/Makefile.inc 2012-05-26 10:14:46.969786387 +0200 +@@ -32,11 +32,10 @@ rcdir = $(prefix)/etc/init.d + syslibdir = $(prefix)/$(LIB) + libdir = $(prefix)/$(LIB)/multipath + +-GZIP = /bin/gzip -9 -c + INSTALL_PROGRAM = install + +-OPTFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes +-CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" ++OPTFLAGS = -Wall -Wunused -Wstrict-prototypes ++CFLAGS += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" + SHARED_FLAGS = -shared + + %.o: %.c +diff -rupN upstream/kpartx/Makefile devel/kpartx/Makefile +--- upstream/kpartx/Makefile 2010-05-22 14:01:58.000000000 +0200 ++++ devel/kpartx/Makefile 2012-05-26 10:23:38.909780754 +0200 +@@ -6,7 +6,7 @@ include ../Makefile.inc CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 @@ -9,7 +27,7 @@ OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ gpt.o mac.o crc32.o lopart.o xstrncpy.o devmapper.o EXEC = kpartx -@@ -14,8 +14,7 @@ +@@ -14,22 +14,22 @@ EXEC = kpartx all: $(EXEC) $(EXEC): $(OBJS) @@ -19,12 +37,13 @@ install: $(EXEC) $(EXEC).8 $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) -@@ -23,13 +22,14 @@ + $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) - $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d +- $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d - $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/ -+ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules ++ $(INSTALL_PROGRAM) -d $(DESTDIR)/usr/lib/udev/rules.d ++ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/usr/lib/udev/rules.d/66-kpartx.rules $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) @@ -33,30 +52,30 @@ rm -f $(DESTDIR)$(bindir)/$(EXEC) - rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz + rm -f $(DESTDIR)$(mandir)/$(EXEC).8 -+ rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules ++ rm -f $(DESTDIR)/usr/lib/udev/rules.d/66-kpartx.rules clean: - rm -f core *.o $(EXEC) *.gz + rm -f core *.o $(EXEC) ---- multipath-tools-0.4.9.orig/Makefile.inc 2010-05-22 05:01:58.000000000 -0700 -+++ multipath-tools-0.4.9/Makefile.inc 2010-11-28 12:14:25.763531104 -0800 -@@ -32,11 +32,10 @@ - syslibdir = $(prefix)/$(LIB) - libdir = $(prefix)/$(LIB)/multipath - --GZIP = /bin/gzip -9 -c - INSTALL_PROGRAM = install - --OPTFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes --CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" -+OPTFLAGS = -Wall -Wunused -Wstrict-prototypes -+CFLAGS += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" - SHARED_FLAGS = -shared - - %.o: %.c ---- multipath-tools-0.4.9.orig/multipath/Makefile 2010-05-22 05:01:58.000000000 -0700 -+++ multipath-tools-0.4.9/multipath/Makefile 2010-11-28 12:14:46.718697048 -0800 -@@ -7,32 +7,30 @@ +diff -rupN upstream/kpartx/kpartx.rules devel/kpartx/kpartx.rules +--- upstream/kpartx/kpartx.rules 2010-05-22 14:01:58.000000000 +0200 ++++ devel/kpartx/kpartx.rules 2012-05-26 10:30:32.769776372 +0200 +@@ -27,9 +27,9 @@ ENV{DM_PART}=="?*", \ + + # Create dm tables for partitions + ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="mpath-*", \ +- RUN+="/sbin/kpartx -a -p -part /dev/$name" ++ RUN+="/usr/sbin/kpartx -a -p -part /dev/$name" + ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="dmraid-*", \ +- RUN+="/sbin/kpartx -a -p -part /dev/$name" ++ RUN+="/usr/sbin/kpartx -a -p -part /dev/$name" + + LABEL="kpartx_end" + +diff -rupN upstream/multipath/Makefile devel/multipath/Makefile +--- upstream/multipath/Makefile 2010-05-22 14:01:58.000000000 +0200 ++++ devel/multipath/Makefile 2012-05-26 10:22:38.819781391 +0200 +@@ -7,32 +7,30 @@ include ../Makefile.inc OBJS = main.o CFLAGS += -I$(multipathdir) @@ -76,9 +95,10 @@ install: $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ - $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d +- $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d - $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/ -+ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/65-multipath.rules ++ $(INSTALL_PROGRAM) -d $(DESTDIR)/usr/lib/udev/rules.d ++ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/usr/lib/udev/rules.d/65-multipath.rules $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) @@ -91,7 +111,7 @@ - rm $(DESTDIR)$(bindir)/$(EXEC) - rm $(DESTDIR)$(mandir)/$(EXEC).8.gz - rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz -+ rm -f $(DESTDIR)/etc/udev/rules.d/65-multipath.rules ++ rm -f $(DESTDIR)/usr/lib/udev/rules.d/65-multipath.rules + rm -f $(DESTDIR)$(bindir)/$(EXEC) + rm -f $(DESTDIR)$(mandir)/$(EXEC).8 + rm -f $(DESTDIR)$(man5dir)/$(EXEC).conf.5 @@ -99,9 +119,58 @@ clean: - rm -f core *.o $(EXEC) *.gz + rm -f core *.o $(EXEC) ---- multipath-tools-0.4.9.orig/multipathd/Makefile 2010-05-22 05:01:58.000000000 -0700 -+++ multipath-tools-0.4.9/multipathd/Makefile 2010-11-28 12:15:46.624171566 -0800 -@@ -6,8 +6,8 @@ +diff -rupN upstream/multipath/multipath.rules devel/multipath/multipath.rules +--- upstream/multipath/multipath.rules 2010-05-22 14:01:58.000000000 +0200 ++++ devel/multipath/multipath.rules 2012-05-26 10:17:34.849784609 +0200 +@@ -1,7 +1,24 @@ +-# +-# udev rules for multipathing. +-# The persistent symlinks are created with the kpartx rules +-# ++# multipath wants the devmaps presented as meaninglful device names ++# so name them after their devmap name ++SUBSYSTEM!="block", GOTO="end_mpath" + +-# socket for uevents +-SUBSYSTEM=="block", RUN+="socket:/org/kernel/dm/multipath_event" ++ENV{MPATH_SBIN_PATH}="/sbin" ++TEST!="$env{MPATH_SBIN_PATH}/multipath", ENV{MPATH_SBIN_PATH}="/usr/sbin" ++ ++ACTION=="add", ENV{DEVTYPE}!="partition", \ ++ ENV{DM_MULTIPATH_DEVICE_PATH}!="1", \ ++ PROGRAM=="$env{MPATH_SBIN_PATH}/multipath -c $tempnode", \ ++ ENV{DM_MULTIPATH_DEVICE_PATH}="1" ++ ++ENV{DM_MULTIPATH_DEVICE_PATH}=="1", ENV{DEVTYPE}!="partition", \ ++ RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}" ++ ++RUN+="socket:/org/kernel/dm/multipath_event" ++KERNEL!="dm-*", GOTO="end_mpath" ++ACTION!="change", GOTO="end_mpath" ++ENV{DM_UUID}=="mpath-?*|part[0-9]*-mpath-?*", OPTIONS+="link_priority=10" ++ENV{DM_UUID}!="mpath-?*", GOTO="end_mpath" ++ENV{DM_SUSPENDED}=="1", GOTO="end_mpath" ++ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath" ++RUN+="$env{MPATH_SBIN_PATH}/kpartx -a -p p $tempnode" ++LABEL="end_mpath" +diff -rupN upstream/multipath-tools.spec.in devel/multipath-tools.spec.in +--- upstream/multipath-tools.spec.in 2010-05-22 14:01:58.000000000 +0200 ++++ devel/multipath-tools.spec.in 2012-05-26 10:24:16.989780353 +0200 +@@ -47,8 +47,8 @@ rm -rf $RPM_BUILD_ROOT + %{prefix}/usr/share/man/man8/multipathd.8.gz + %{prefix}/usr/share/man/man5/multipath.conf.5.gz + %{prefix}/sbin/multipathd +-%{prefix}/etc/udev/rules.d/multipath.rules +-%{prefix}/etc/udev/rules.d/kpartx.rules ++%{prefix}/usr/lib/udev/rules.d/multipath.rules ++%{prefix}/usr/lib/udev/rules.d/kpartx.rules + %{prefix}/lib/udev/kpartx_id + %{prefix}/lib/multipath/*.so + +diff -rupN upstream/multipathd/Makefile devel/multipathd/Makefile +--- upstream/multipathd/Makefile 2010-05-22 14:01:58.000000000 +0200 ++++ devel/multipathd/Makefile 2012-05-26 10:14:46.969786387 +0200 +@@ -6,8 +6,8 @@ include ../Makefile.inc # basic flags setting # CFLAGS += -I$(multipathdir) @@ -112,7 +181,7 @@ # # debuging stuff -@@ -28,21 +28,20 @@ +@@ -28,21 +28,20 @@ OBJS = main.o pidfile.o uxlsnr.o uxclnt. all : $(EXEC) $(EXEC): $(OBJS) diff --git a/community-testing/multipath-tools/log_enquery_overflow.patch b/community-testing/multipath-tools/log_enquery_overflow.patch new file mode 100644 index 000000000..67367c9f4 --- /dev/null +++ b/community-testing/multipath-tools/log_enquery_overflow.patch @@ -0,0 +1,69 @@ +From e1d69df0cdd1627676501df3a533b25ffadaeff0 Mon Sep 17 00:00:00 2001 +From: Arkadiusz Miskiewicz <arekm@maven.pl> +Date: Sat, 27 Nov 2010 19:21:21 +0100 +Subject: [PATCH] multipath-tools overflow + +On Saturday 27 of November 2010, you wrote: + +[...] + +> the whole logarea is memset to 0 by logarea_init(), and each dequeued +> message is also memset to 0 by log_dequeue(), so it seems normal that +> msg->str value is 0x0, but it's really its address that matters. + +Ok, got it. Pointers, memory areas in my debugging session - are looking +good then. + +> +> It's not clear to me : are you actually hitting a bug or is it your +> debug session that puzzles you ? + +I'm hitting a bug. multipathd dies for me at that strcpy(). Now I think +the bug is strcpy usage instead of memcpy because I'm building with +-O2 -D_FORTIFY_SOURCE=2 which turns on special glibc overflow +detection. + +That detection seem to be smart enough to know that &str area is not +a string memory and aborts the program. + +Found similar problem discussed here +http://sourceware.org/ml/binutils/2005-11/msg00308.html + +glibc aborts the program: +[pid 13432] writev(2, [{"*** ", 4}, {"buffer overflow detected", 24}, +{" ***: ", 6}, {"/home/users/arekm/rpm/BUILD/multipath-tools-0.4.9 +/multipathd/multipathd", 71}, {" terminated\n", 12}], 5) = 117 + +same for valgrind: +**13436** *** strcpy_chk: buffer overflow detected ***: program terminated +==13436== at 0x4024997: VALGRIND_PRINTF_BACKTRACE (valgrind.h:4477) +==13436== by 0x40265F8: __strcpy_chk (mc_replace_strmem.c:781) +==13436== by 0x40EDC06: log_enqueue (string3.h:107) +==13436== by 0x40ED68A: log_safe (log_pthread.c:24) +==13436== by 0x40E296A: dlog (debug.c:36) +==13436== by 0x804ECEC: pidfile_create (pidfile.c:37) +==13436== by 0x804E731: main (main.c:1424) + +The bug is not visible if I run multipathd in debug mode (-d). + +This patch fixes the problem for me by avoiding false positive on strcpy_chk. +--- + libmultipath/log.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libmultipath/log.c b/libmultipath/log.c +index e56e46b..57b7696 100644 +--- a/libmultipath/log.c ++++ b/libmultipath/log.c +@@ -142,7 +142,7 @@ int log_enqueue (int prio, const char * fmt, va_list ap) + la->empty = 0; + msg = (struct logmsg *)la->tail; + msg->prio = prio; +- strcpy((void *)&msg->str, buff); ++ memcpy((void *)&msg->str, buff, strlen(buff) + 1); + lastmsg->next = la->tail; + msg->next = la->head; + +-- +1.7.6.5 + diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 79ac592da..6d1557c43 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -1,10 +1,12 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# $Id: PKGBUILD 71517 2012-05-28 04:56:49Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.15.0 +pkgver=1.15.1 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64') @@ -13,7 +15,7 @@ license=('GPL') depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates') checkdepends=('cppunit') source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2") -md5sums=('a381b8a0fe2d71f726187237ac6de82d') +md5sums=('a749a1f7cfe03a7518630d2310267c42') build() { cd aria2-${pkgver} diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 51502fc16..a9abeab51 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70825 2012-05-17 09:48:45Z spupykin $ +# $Id: PKGBUILD 71544 2012-05-28 16:19:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=0.9.12 -pkgrel=3 +pkgrel=7 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -34,6 +34,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.rc.d libvirtd-guests.conf.d + libvirt.tmpfiles.d openbsd-netcat-default.patch libvirt-libnl3.patch) md5sums=('5e842bc55733ceba60c64767580ff3e4' @@ -41,6 +42,7 @@ md5sums=('5e842bc55733ceba60c64767580ff3e4' '3ed0e24f5b5e25bf553f5427d64915e6' '8297b1be794a24cc77f66af9380ace59' 'bc2971dacdbac967fc3474e50affc345' + '8d98e62915785686b0b6c8c070628392' 'b0be50eb9dfe4d133decf23b60880f7d' 'ba27fbcd989de8d84cfff98326f10c54') @@ -64,8 +66,8 @@ build() { export LDFLAGS=-lX11 export RADVD=/usr/sbin/radvd [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ - --with-storage-lvm --without-xen --with-udev --without-hal --disable-static - find -name Makefile -exec sed -i 's#-L /usr#-L/usr#' {} \; + --with-storage-lvm --without-xen --with-udev --without-hal --disable-static \ + --with-init-script=systemd make -j1 } @@ -80,5 +82,18 @@ package() { install -D -m755 "$srcdir"/libvirtd-guests.rc.d "$pkgdir"/etc/rc.d/libvirtd-guests install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests - rm -rf $pkgdir/var/run + + install -dm0755 $pkgdir/usr/lib/sysctl.d + mv $pkgdir/etc/sysctl.d/libvirtd $pkgdir/usr/lib/sysctl.d/libvirtd + + # systemd stuff +# install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt +# mv $pkgdir/lib/* $pkgdir/usr/lib/ + + rm -rf \ + $pkgdir/var/run \ + $pkgdir/etc/rc.d/init.d \ + $pkgdir/etc/sysconfig \ + $pkgdir/lib \ + $pkgdir/etc/sysctl.d } diff --git a/community/libvirt/libvirt.tmpfiles.d b/community/libvirt/libvirt.tmpfiles.d new file mode 100644 index 000000000..0cec93271 --- /dev/null +++ b/community/libvirt/libvirt.tmpfiles.d @@ -0,0 +1,4 @@ +d /var/run/libvirt/qemu 0755 root root - +d /var/run/libvirt/lxc 0755 root root - +d /var/run/libvirt/uml 0755 root root - +d /var/run/libvirt/network 0755 root root - diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD index 9c97d5e4b..150ad5868 100755 --- a/community/mathomatic/PKGBUILD +++ b/community/mathomatic/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70548 2012-05-11 05:36:19Z ttopper $ +# $Id: PKGBUILD 71531 2012-05-28 12:15:53Z ttopper $ # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=mathomatic -pkgver=15.8.4 +pkgver=15.8.5 pkgrel=1 pkgdesc="General purpose Computer Algebra System written in C" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial' 'm4: for complex operations using the matho script' 'gnuplot: for plotting') source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2) -md5sums=('9b58f8221e76a80f847f31a67bf01401') +md5sums=('cb2abc1a35142158f8ec99d7e8368e11') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index 607ea0b3e..eb2752b20 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70098 2012-04-29 09:24:57Z spupykin $ +# $Id: PKGBUILD 71527 2012-05-28 07:39:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=33.0.0 +pkgver=33.1.0 pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ depends=('qt' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('61f7df51378ab94324ef6df17f793f1d' +md5sums=('15593d59f6079f0114e390ec731a8527' '377ace3363124f4c086de0babb820761') build() { diff --git a/community/uzbl/PKGBUILD b/community/uzbl/PKGBUILD index 9ee2129c6..725ff0e0d 100644 --- a/community/uzbl/PKGBUILD +++ b/community/uzbl/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 60076 2011-12-04 21:15:00Z lcarlier $ +# $Id: PKGBUILD 71552 2012-05-28 19:39:02Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Dieter Plaetinck <dieter@plaetinck.be> pkgbase=uzbl pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed') -pkgver=2011.11.28 +pkgver=2012.05.14 pkgrel=1 arch=('i686' 'x86_64') url="http://www.uzbl.org" license=('GPL3') makedepends=('pkgconfig' 'libwebkit>=1.3.13') source=(uzbl-$pkgver.tar.gz::https://github.com/Dieterbe/uzbl/tarball/$pkgver) -md5sums=('6e55474050b5df43d8bdd403248b1da6') +md5sums=('4c58653bddbcf1429f7275bbb7c664a9') build() { cd "$srcdir"/Dieterbe-uzbl-* diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index 61230854c..187653a5b 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70952 2012-05-20 14:22:35Z svenstaro $ +# $Id: PKGBUILD 71521 2012-05-28 07:37:34Z svenstaro $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> pkgname=wt pkgver=3.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64') url="http://www.webtoolkit.eu/" @@ -33,7 +33,7 @@ build() { cmake -DCONNECTOR_HTTP=ON -DCMAKE_INSTALL_PREFIX=/usr \ -DWEBUSER=http -DWEBGROUP=http -DRUNDIR=/var/run/wt -DDEPLOYROOT=/var/www/wt \ -DUSE_SYSTEM_SQLITE3=ON -DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \ - -DWT_CMAKE_FINDER_INSTALL_DIR="share/cmake-2.8/Modules" .. + -DWT_CMAKE_FINDER_INSTALL_DIR="share/cmake-2.8/Modules" -DINSTALL_EXAMPLES=ON .. make } diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index d270ca783..3c905ace6 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159240 2012-05-18 16:47:23Z tpowa $ +# $Id: PKGBUILD 160025 2012-05-28 10:25:39Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm -pkgver=3.2.4 -pkgrel=1 +pkgver=3.2.5 +pkgrel=2 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') @@ -21,12 +21,12 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 mdadm.service disable-werror.patch) replaces=('raidtools') -md5sums=('c25007b981e0f5362eacdad385ff0e15' +md5sums=('83ba4a6249ae24677e915e44c9cfcc58' '8333d405f550317c2bacd5510bf1cb60' '00cbed931db4f15b6ce49e3e7d433966' - '9b01e96b6c3c218fb61628c9281fe688' + '609d10888727710cb20db7ac3e096116' 'fbb5542d9bdf87441a11dd7e7a0a17f8' - '2318b99701dba9b01a6891c62be7bc1c' + 'd1d8e9eb81ce9347de74f3c84a9db09e' 'aafb5f9ac8437a284cbf948b9b13b179' '4ad87b74a4bc9a34621280abe0e0c3e4') diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install index b53258676..cf6159e40 100644 --- a/core/mdadm/mdadm_install +++ b/core/mdadm/mdadm_install @@ -1,45 +1,45 @@ -# vim: set ft=sh: - -build() -{ - MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " - BINARIES="" - FILES="" - SCRIPT="mdadm" +#!/bin/bash + +build() { + add_checked_modules -f 'dm-' 'drivers/md/*' + # check if a custom mdadm.conf exists if grep -q ^ARRAY /etc/mdadm.conf; then echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." add_file "/etc/mdadm.conf" fi add_binary "/sbin/mdassemble" + + add_runscript } -help () -{ -cat<<HELPEOF - This hook loads the necessary modules for any raid root device, - and assembles the raid device when run. - - If arrays are defined in /etc/mdadm.conf, the file will be used instead - of command line assembling. - - Command Line Setup: - - for raid arrays with persistent superblocks: - md=<md device no.>,dev0,dev1,...,devn - md=<md device no.>,uuid - - for partitionable raid arrays with persistent superblocks: - md=d<md device no.>,dev0,dev1,...,devn - md=d<md device no.>,uuid - - Parameters: - - <md device no.> = the number of the md device: - 0 means md0, 1 means md1, ... - - <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1 - or 0900878d:f95f6057:c39a36e9:55efa60a - Examples: - - md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1 - This will setup 2 md partitionable arrays. - - md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1 - This will setup 2 md arrays with persistent superblocks. +help() { + cat <<HELPEOF +This hook loads the necessary modules for any raid root device, +and assembles the raid device when run. + +If arrays are defined in /etc/mdadm.conf, the file will be used instead +of command line assembling. + +Command Line Setup: +- for raid arrays with persistent superblocks: + md=<md device no.>,dev0,dev1,...,devn + md=<md device no.>,uuid +- for partitionable raid arrays with persistent superblocks: + md=d<md device no.>,dev0,dev1,...,devn + md=d<md device no.>,uuid + +Parameters: +- <md device no.> = the number of the md device: + 0 means md0, 1 means md1, ... +- <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1 + or 0900878d:f95f6057:c39a36e9:55efa60a +Examples: +- md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1 + This will setup 2 md partitionable arrays. +- md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1 + This will setup 2 md arrays with persistent superblocks. HELPEOF } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install index be653fc74..f6f5de4ad 100644 --- a/core/mdadm/mdadm_udev_install +++ b/core/mdadm/mdadm_udev_install @@ -1,7 +1,7 @@ #!/bin/bash build() { - MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-")" + add_checked_modules -f 'dm-' 'drivers/md/*' # check if a custom mdadm.conf exists if grep -qw ^ARRAY "$BASEDIR/etc/mdadm.conf"; then @@ -15,7 +15,9 @@ build() { help() { cat <<HELPEOF - This hook loads raid arrays with udev. +This hook loads the necessary modules for a RAID array and uses incremental +assembly via udev at runtime to create the devices. This hook with NOT work +without the udev hook included on the image. HELPEOF } diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index f2ccd5064..a6ac7ff9d 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157236 2012-04-26 13:06:19Z tpowa $ +# $Id: PKGBUILD 160027 2012-05-28 10:26:22Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> @@ -6,8 +6,8 @@ # Contributor: Marco Lima <cipparello gmail com> pkgname=nfs-utils -pkgver=1.2.5 -pkgrel=4 +pkgver=1.2.6 +pkgrel=1 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' @@ -34,9 +34,10 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn nfsd.service var-lib-nfs-rpc_pipefs.mount proc-fs-nfsd.mount + blkmapd.service nfs-utils.conf) install=nfs-utils.install -md5sums=('8395ac770720b83c5c469f88306d7765' +md5sums=('8be543ca270c2234ff18f8c8d35e0d37' 'dd0d65fc6e8f422fa12520813098264b' 'f73f197a16b02c3e248488ec35c4cf43' 'e619f18354ff958ed624d05d08853d8f' @@ -48,13 +49,14 @@ md5sums=('8395ac770720b83c5c469f88306d7765' '7674106eaaa4c149bccd4f05fe3604e9' '4f4827dfc93008dfadd0a530ad0872b2' '38855936dc55a5afe37d84edc0f11066' - '8d888de677a217c5e5f7244a2e3a2d3a' + '965311784d49a7d126d512cadbe91deb' 'e05705d9ccccaeaeb1ecaee20adc05bc' 'd7df7bc311fd95c5b80017dd1741570d' '2e72ee082cba5d3ec6f51d2a105664da' '5d33d2e754fd37280365b287603bac90' '1cd65909fa0983047f3f06a3ab352401' '02a34835aa077146a90eb7d191e612d0' + '8ffc2ebe932d29efe17d6f3f23d5b975' '8ac484023d786766d287ccbe878ae4ba') build() { @@ -74,6 +76,8 @@ build() { package() { cd $srcdir/${pkgname}-${pkgver} + # fix make install + mkdir -p $pkgdir/sbin make DESTDIR=$pkgdir install # support python2 (FS#25120) @@ -91,7 +95,7 @@ package() { 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) + install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}" done install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf # directories diff --git a/core/nfs-utils/blkmapd.service b/core/nfs-utils/blkmapd.service new file mode 100644 index 000000000..16cb68bbb --- /dev/null +++ b/core/nfs-utils/blkmapd.service @@ -0,0 +1,11 @@ +[Unit] +Description=pNFS block layout mapping daemon +After=var-lib-nfs-rpc_pipefs.mount nfsd.service +Requires=var-lib-nfs-rpc_pipefs.mount + +[Service] +Type=forking +ExecStart=/usr/sbin/blkmapd + +[Install] +WantedBy=multi-user.target diff --git a/core/nfs-utils/rpc-mountd.service b/core/nfs-utils/rpc-mountd.service index 917e1b444..edd8c851d 100644 --- a/core/nfs-utils/rpc-mountd.service +++ b/core/nfs-utils/rpc-mountd.service @@ -1,5 +1,5 @@ [Unit] -Description=NFSv2/3 Mount Daemon +Description=NFS Mount Daemon After=rpcbind.service nfsd.service Requires=rpcbind.service nfsd.service diff --git a/extra/cups-filters/PKGBUILD b/extra/cups-filters/PKGBUILD index aa3ac50f0..b702d997e 100644 --- a/extra/cups-filters/PKGBUILD +++ b/extra/cups-filters/PKGBUILD @@ -1,38 +1,29 @@ -# $Id: PKGBUILD 159704 2012-05-26 07:54:13Z andyrtr $ +# $Id: PKGBUILD 160054 2012-05-28 15:36:43Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters -pkgver=1.0.17 +pkgver=1.0.18 pkgrel=2 pkgdesc="OpenPrinting CUPS Filters" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') -groups=() -depends=('ghostscript' 'lcms2' 'poppler') # bc ? https://bugs.archlinux.org/task/29808 -makedepends=() -optdepends=() -provides=() -conflicts=() -replaces=() -backup=() -#options=(!makeflags) -install= +depends=('lcms2' 'poppler') +makedepends=('ghostscript') +optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' + 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' + 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly' + 'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly') +backup=(etc/fonts/conf.d/99pdftoopvp.conf) source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz) -md5sums=('5132b018cc503e9338fbd029acf56e55') +md5sums=(63972b426b7224915cdbb42b2a937374'') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc make } -#check() { -# cd "$srcdir/$pkgname-$pkgver" -# make -k check -#} - package() { cd "$srcdir/$pkgname-$pkgver" #make DESTDIR="$pkgdir/" install diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD index 67228de92..2105c8623 100644 --- a/extra/libx11/PKGBUILD +++ b/extra/libx11/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153607 2012-03-16 17:04:23Z andyrtr $ +# $Id: PKGBUILD 160023 2012-05-28 10:00:52Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.4.99.901 +pkgver=1.4.99.902 pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64) @@ -14,7 +14,7 @@ license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 xorg.sh xorg.csh) -sha1sums=('af10b064c1c64ee9e7daae0a7f1f9719eb7e965a' +sha1sums=('afe75b7c2c54e354f726fd36251bcfec1e1f833a' '4b756387426afb2a5bb7a155631ec42348abf5c1' '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8') diff --git a/extra/mahjong/PKGBUILD b/extra/mahjong/PKGBUILD index 1b719f79d..8727e3a12 100644 --- a/extra/mahjong/PKGBUILD +++ b/extra/mahjong/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136995 2011-09-04 21:27:03Z eric $ +# $Id: PKGBUILD 160020 2012-05-28 05:16:18Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Jason Chu <jchu@xentac.net> pkgname=mahjong -pkgver=1.11 +pkgver=1.12.1 pkgrel=1 pkgdesc="The classical game of Mah Jong (not the solitare version) with network support" arch=('i686' 'x86_64') @@ -11,12 +11,12 @@ url="http://www.stevens-bradfield.com/MahJong/" license=('GPL' 'custom') depends=('gtk2') source=(http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz) -md5sums=('c0cd19620eb3fcef3e0a83eaed6c3780') +md5sums=('a74acae39d6a49bad9c34b84088f72f3') build() { cd "$srcdir/mj-$pkgver-src" sed -i 's/& Calling/Calling/' gui-dial.c - make + make LDLIBS="-lm" } package() { diff --git a/testing/libpipeline/PKGBUILD b/testing/libpipeline/PKGBUILD new file mode 100644 index 000000000..b8d6ea75e --- /dev/null +++ b/testing/libpipeline/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 160037 2012-05-28 11:30:14Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgname=libpipeline +pkgver=1.2.1 +pkgrel=1 +pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way" +arch=('i686' 'x86_64') +url="http://libpipeline.nongnu.org/" +license=('GPL') +depends=('glibc') +options=('!libtool') +source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz) +md5sums=('20896c919eca4acb3d2f13012fb7ba02') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/testing/lighttpd/PKGBUILD b/testing/lighttpd/PKGBUILD index 90702eaa0..1d0748828 100644 --- a/testing/lighttpd/PKGBUILD +++ b/testing/lighttpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160014 2012-05-28 01:48:30Z pierre $ +# $Id: PKGBUILD 160045 2012-05-28 14:12:38Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd pkgver=1.4.30 -pkgrel=4 +pkgrel=6 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') @@ -24,14 +24,14 @@ sha256sums=('c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b' 'dacfa1d748e5ac38c2d51d8310acad76d85ba5c1fe02a93534cf032400429257' '6df18675691384c48b9137c8f18ca238055001f1077baf05cb8322247b475a77' 'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa' - 'ce214a5fdf81085c35cce0faa2e2b5712a70ba15896ef5fa90e6d674d5bdcd89' - 'd6c302d190b53c85f69b48ce7ca15cab5f6a097af5f3af495bd3dc3ef52a5776') + '758275bd8d17115394caabc46e1bbbad01934b20ea957c7984d0b6ba78c4fd40' + '708cefe97541edba73f572ed3836bd056462b1467e45e1912c9d960139929696') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr \ - --libexecdir=/usr/lib/lighttpd/modules \ + --libdir=/usr/lib/lighttpd/ \ --sysconfdir=/etc/lighttpd \ --with-mysql \ --with-ldap \ @@ -60,7 +60,7 @@ package() { install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/ - install -D -m644 ${srcdir}/lighttpd.tmpfiles ${pkgdir}/etc/tmpfiles.d/lighttpd.tmpfiles + install -D -m644 ${srcdir}/lighttpd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/lighttpd.conf install -D -m644 ${srcdir}/lighttpd.service ${pkgdir}/usr/lib/systemd/system/lighttpd.service pushd doc/config >/dev/null diff --git a/testing/lighttpd/lighttpd.service b/testing/lighttpd/lighttpd.service index af427063e..b80db7695 100644 --- a/testing/lighttpd/lighttpd.service +++ b/testing/lighttpd/lighttpd.service @@ -3,6 +3,7 @@ Description=A secure, fast, compliant and very flexible web-server After=syslog.target network.target [Service] +PrivateTmp=true ExecStart=/usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf ExecReload=/bin/kill -HUP $MAINPID KillSignal=SIGINT diff --git a/testing/lighttpd/lighttpd.tmpfiles b/testing/lighttpd/lighttpd.tmpfiles index cb72b68c8..eb1a7699e 100644 --- a/testing/lighttpd/lighttpd.tmpfiles +++ b/testing/lighttpd/lighttpd.tmpfiles @@ -1 +1,2 @@ -d /var/run/lighttpd 755 http http +d /var/run/lighttpd 755 http http - +d /var/cache/lighttpd 755 http http 10d diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD index ca2263548..d5e0a7e03 100644 --- a/testing/php/PKGBUILD +++ b/testing/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160010 2012-05-28 00:42:52Z pierre $ +# $Id: PKGBUILD 160031 2012-05-28 10:36:59Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -22,7 +22,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.4.3 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' @@ -39,7 +39,7 @@ md5sums=('51f9488bf8682399b802c48656315cac' '61837f1e9b50d7fdf4c8d1f81fa153f7' '59b3a25f9eb3afc02f1adf9ee699808c' 'a2af49da239122eb45744f4446752050' - '9a330bbfb162848572a3d9dc0e051956' + '84d0a4caf8d735279cf4500d1772e2a5' 'e808f39a075dd53cd8da70d984d0e166') build() { @@ -242,7 +242,7 @@ package_php-fpm() { install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm install -d -m755 ${pkgdir}/etc/php/fpm.d - install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/etc/tmpfiles.d/php-fpm.tmpfiles + install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/php-fpm.conf install -D -m644 ${srcdir}/php-fpm.service ${pkgdir}/usr/lib/systemd/system/php-fpm.service } diff --git a/testing/php/php-fpm.service b/testing/php/php-fpm.service index 2fd30113c..3ef95a83a 100644 --- a/testing/php/php-fpm.service +++ b/testing/php/php-fpm.service @@ -5,6 +5,7 @@ After=syslog.target network.target [Service] Type=forking PIDFile=/var/run/php-fpm/php-fpm.pid +PrivateTmp=true ExecStart=/usr/sbin/php-fpm ExecReload=/bin/kill -USR2 $MAINPID diff --git a/testing/pixman/PKGBUILD b/testing/pixman/PKGBUILD new file mode 100644 index 000000000..6f90efbc8 --- /dev/null +++ b/testing/pixman/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 160035 2012-05-28 11:24:39Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + +pkgname=pixman +pkgver=0.26.0 +pkgrel=1 +pkgdesc="The pixel-manipulation library for X and cairo" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org" +license=('custom') +depends=('glibc') +options=('!libtool') +source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2 + test_failures_on_x86-32.diff) +sha1sums=('d772cf794ec5da0966eba3cb360919a0a5e0d23f' + '24a688271d5cf2c4137a147deaa2975122c01aa8') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/test_failures_on_x86-32.diff + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/testing/pixman/test_failures_on_x86-32.diff b/testing/pixman/test_failures_on_x86-32.diff new file mode 100644 index 000000000..6e333c03a --- /dev/null +++ b/testing/pixman/test_failures_on_x86-32.diff @@ -0,0 +1,46 @@ +From da6193b1fcc1dfab27f4c36917864f2f2c41cf3e Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Sun, 27 May 2012 17:01:57 +0000 +Subject: mmx: add missing _mm_empty calls + +Fixes spurious test failures on x86-32. +--- +diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c +index bb125bf..6e292c6 100644 +--- a/pixman/pixman-mmx.c ++++ b/pixman/pixman-mmx.c +@@ -2232,6 +2232,8 @@ mmx_composite_src_x888_0565 (pixman_implementation_t *imp, + w--; + } + } ++ ++ _mm_empty (); + } + + static void +@@ -3542,6 +3544,7 @@ mmx_fetch_x8r8g8b8 (pixman_iter_t *iter, const uint32_t *mask) + w--; + } + ++ _mm_empty (); + return iter->buffer; + } + +@@ -3585,6 +3588,7 @@ mmx_fetch_r5g6b5 (pixman_iter_t *iter, const uint32_t *mask) + w--; + } + ++ _mm_empty (); + return iter->buffer; + } + +@@ -3630,6 +3634,7 @@ mmx_fetch_a8 (pixman_iter_t *iter, const uint32_t *mask) + w--; + } + ++ _mm_empty (); + return iter->buffer; + } + +-- +cgit v0.9.0.2-2-gbebe |