diff options
206 files changed, 1624 insertions, 845 deletions
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD index 677e10b47..a4d931af5 100644 --- a/community/acpid/PKGBUILD +++ b/community/acpid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70904 2012-05-18 22:37:04Z seblu $ +# $Id: PKGBUILD 71877 2012-06-02 17:57:44Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: xduugu # Contributor: Manolis Tzanidakis @@ -6,7 +6,7 @@ pkgname=acpid pkgver=2.0.16 -pkgrel=2 +pkgrel=3 pkgdesc='A daemon for delivering ACPI power management events with netlink support' arch=('i686' 'x86_64') url='http://tedfelix.com/linux/acpid-netlink.html' @@ -26,7 +26,7 @@ md5sums=('d59fc02c9c34f0d5c137495302e2c074' '077475c75fbdd9de75f9a397130ccd91' '929c6d2e91295c22ed9ec6212d7eabef' 'ee6cb99e50e580c50331a73045412ae9' - '953e26477c5d4f5f013d6861c04b4af6' + '7f545754db5be7296d2dd97c049062ee' '2d37b98d6e74bab815604b8b48c6cfd4' '74ee3c33714ff5cb44f30c9a0dceeef0') diff --git a/community/acpid/acpid.service b/community/acpid/acpid.service index 31fcc0575..4c0e073b0 100644 --- a/community/acpid/acpid.service +++ b/community/acpid/acpid.service @@ -5,3 +5,7 @@ Requires=acpid.socket [Service] EnvironmentFile=/etc/conf.d/acpid ExecStart=/usr/sbin/acpid -f $ACPID_ARGS + +[Install] +WantedBy=multi-user.target +Also=acpid.socket diff --git a/community/amsn/PKGBUILD b/community/amsn/PKGBUILD index 0faa75753..0d3367dca 100644 --- a/community/amsn/PKGBUILD +++ b/community/amsn/PKGBUILD @@ -1,32 +1,34 @@ -# $Id: PKGBUILD 63498 2012-02-05 11:51:24Z ibiru $ +# $Id: PKGBUILD 71853 2012-06-02 11:00:55Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <j@codemac.net> pkgname=amsn -pkgver=0.98.4 -pkgrel=2 +pkgver=0.98.9 +pkgrel=1 pkgdesc="MSN client written in Tcl/Tk" arch=('i686' 'x86_64') url="http://amsn.sourceforge.net/" license=('GPL2') depends=('tk' 'tls') -makedepends=('libjpeg' 'libpng' 'farsight2' 'libv4l') -optdepends=('farsight2: for video conferencing') +makedepends=('libjpeg' 'libpng' 'farstream' 'libv4l') +optdepends=('farstream: for video conferencing') changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2 amsn-0.98.4-libpng15.patch amsn-0.98.4-v4l2.patch) -md5sums=('96fd20e8709ced4443432d125a5e0a5a' - '182eef321e78632499c24b3009c085ad' - '02d4ec8faed521387d6e44481f43c91a') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver-src.tar.bz2 + $pkgname-$pkgver-v4l2.patch + $pkgname-$pkgver-no-rebuild-on-install.patch) +sha256sums=('1fd2620489cc3627a841773a79cf28a7c9c438979c76d37f231a773a79e7f23e' + '5371339024548fad3b3c5330e3bc410360a383a75d1771fb656885acddfc44cf' + 'dd560bebcfa672ba0be56b70dbcaa069b0faba7206d9cb8ea5d61fbd50ad81a1') build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # patch for libpng15 - patch -Np0 -i $srcdir/amsn-0.98.4-libpng15.patch + cd ${srcdir}/$pkgname-$pkgver # patch for linux kernel header changes - patch -Np0 -i $srcdir/amsn-0.98.4-v4l2.patch + patch -Np0 -i ${srcdir}/$pkgname-$pkgver-v4l2.patch + # build patch + patch -Np0 -i ${srcdir}/$pkgname-$pkgver-no-rebuild-on-install.patch + # python2 fix for file in lang/missing.py plugins/music/infosongbird; do sed -i 's_/usr/bin/env python_/usr/bin/env python2_' ${file} @@ -37,7 +39,7 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install } diff --git a/community/amsn/amsn-0.98.9-no-rebuild-on-install.patch b/community/amsn/amsn-0.98.9-no-rebuild-on-install.patch new file mode 100644 index 000000000..d3b6e4c55 --- /dev/null +++ b/community/amsn/amsn-0.98.9-no-rebuild-on-install.patch @@ -0,0 +1,14 @@ +--- Makefile.in 2012-05-18 21:28:05.000000000 +0200 ++++ Makefile.in 2012-06-02 12:26:35.585073960 +0200 +@@ -261,3 +261,5 @@ + +-install_libs:: rebuild_libs do_install_libs ++install_libs:: clean_libs ++ $(MAKE) rebuild_libs ++ $(MAKE) do_install_libs + +@@ -278,3 +280,3 @@ + rebuild_libs: LIBDIR=$(libdir)/$(PACKAGE) +-rebuild_libs: clean_libs $(LIBS_WITH_RPATH) ++rebuild_libs: $(LIBS_WITH_RPATH) + diff --git a/community/amsn/amsn-0.98.9-v4l2.patch b/community/amsn/amsn-0.98.9-v4l2.patch new file mode 100644 index 000000000..b636e61fd --- /dev/null +++ b/community/amsn/amsn-0.98.9-v4l2.patch @@ -0,0 +1,44 @@ +--- configure.ac 2012-05-23 21:21:14.000000000 +0200 ++++ configure.ac 2012-06-02 12:29:24.836921683 +0200 +@@ -378,6 +378,10 @@ + AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux) + fi + ++if test "$FOUND_OS" = "linux"; then ++ AC_CHECK_HEADERS(linux/videodev2.h) ++fi ++ + #--------------------------------------------------------------------------------------------- + + dnl --------------------------------------------------------------------- +--- utils/linux/capture/capture.h 2011-04-12 02:20:59.000000000 +0200 ++++ utils/linux/capture/capture.h 2012-06-02 12:29:24.836921683 +0200 +@@ -34,7 +34,11 @@ + #ifdef HAVE_SYS_VIDEODEV2_H + # include <sys/videodev2.h> + #else +-# include <linux/videodev.h> ++ #ifdef HAVE_LINUX_VIDEODEV2_H ++ #include <linux/videodev2.h> ++ #else ++ #include <linux/videodev.h> ++ #endif + #endif + */ + +--- utils/linux/capture/libng/plugins/Rules.mk 2012-05-18 17:31:32.000000000 +0200 ++++ utils/linux/capture/libng/plugins/Rules.mk 2012-06-02 12:51:59.523065502 +0200 +@@ -2,6 +2,13 @@ + TARGETS-plugins := $(capture_dir)/libng/plugins/conv-mjpeg.so + TARGETS-plugins += $(patsubst %,$(capture_dir)/libng/plugins/%.so,${LIBNG_PLUGINS}) + ++plugin_link_so = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(capture_dir)/capture.so $(SHARED) -o $@ ++ifeq ($(verbose),no) ++ echo_plugin_link_so = echo " LDP " $@ ++else ++ echo_plugin_link_so = echo $(plugin_link_so) ++endif ++ + # global targets + all:: $(TARGETS-plugins) +
\ No newline at end of file diff --git a/community/amsn/amsn.changelog b/community/amsn/amsn.changelog index 8dab097ad..41d497576 100644 --- a/community/amsn/amsn.changelog +++ b/community/amsn/amsn.changelog @@ -1,3 +1,6 @@ +2012-06-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * amsn 0.98.9-1 + 2010-12-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * Update to major release 0.98.4 diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD index b67f9c548..ee6427335 100644 --- a/community/awesome/PKGBUILD +++ b/community/awesome/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70615 2012-05-12 21:06:01Z ibiru $ +# $Id: PKGBUILD 71885 2012-06-02 21:17:08Z heftig $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: xduugu # Contributor: Ronald van Haren <ronald.archlinux.org> @@ -6,7 +6,7 @@ pkgname=awesome pkgver=3.4.11 -pkgrel=4 +pkgrel=5 pkgdesc='Highly configurable framework window manager' arch=('i686' 'x86_64') url='http://awesome.naquadah.org/' diff --git a/community/bam/PKGBUILD b/community/bam/PKGBUILD new file mode 100644 index 000000000..fb6384301 --- /dev/null +++ b/community/bam/PKGBUILD @@ -0,0 +1,22 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributors: Bmauet <careil.baptiste@gmail.com> +pkgname=bam +pkgver=0.4.0 +pkgrel=1 +pkgdesc="A fast and flexible build system using Lua" +arch=('i686' 'x86_64') +url=http://github.com/matricks/bam +license=('ZLIB') +source=("https://github.com/downloads/matricks/bam/${pkgname}-${pkgver}.tar.gz") +md5sums=('2f8e8336b8884110e8a355b12c9fa58a') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + sh make_unix.sh +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + install -D -m755 bam ${pkgdir}/usr/bin/bam + install -D -m755 license.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 30ef6e616..88b750eca 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69301 2012-04-12 20:37:46Z bisson $ +# $Id: PKGBUILD 71735 2012-06-02 10:28:04Z bluewind $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd pkgver=5.1.0 -pkgrel=1 +pkgrel=2 pkgdesc='Daemon which collects system performance statistics periodically' arch=('i686' 'x86_64') url='http://collectd.org/' diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD index 6cac247a5..530ab61b6 100644 --- a/community/courier-mta/PKGBUILD +++ b/community/courier-mta/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70426 2012-05-06 03:20:26Z svenstaro $ +# $Id: PKGBUILD 71737 2012-06-02 10:28:34Z bluewind $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> @@ -8,7 +8,7 @@ pkgname=courier-mta pkgver=0.68.0 -pkgrel=1 +pkgrel=2 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" arch=(i686 x86_64) license=('GPL2') diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD index 6ff0846bf..2711324dc 100644 --- a/community/ekg2/PKGBUILD +++ b/community/ekg2/PKGBUILD @@ -1,31 +1,32 @@ -# $Id: PKGBUILD 64838 2012-02-18 16:54:04Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# $Id: PKGBUILD 71739 2012-06-02 10:28:38Z bluewind $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Mateusz Herych <heniekk@gmail.com> pkgname=ekg2 pkgver=0.3.1 -pkgrel=2 +pkgrel=4 pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client" arch=('i686' 'x86_64') url="http://ekg2.org/" license=('GPL') depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib') -optdepends=( 'xosd: for xosd support' - 'sqlite3: sqlite support' - 'gtk2: gtk support') -provides=('ekg2-unicode') +optdepends=('xosd: xosd support' + 'sqlite: sqlite support' + 'gtk2: gtk support') source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('68fc05b432c34622df6561eaabef5a40') build() { cd "$srcdir/$pkgname-$pkgver" + sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h - ./configure --prefix=/usr \ + + ./configure --prefix=/usr \ --sysconfdir=/etc \ - --with-libgadu \ - --with-xosd \ - --enable-unicode \ - --enable-shared \ + --with-libgadu \ + --with-xosd \ + --enable-unicode \ + --enable-shared \ --without-gpg make } @@ -33,6 +34,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install + rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod mv "$pkgdir"/usr/libexec/ioctld "$pkgdir"/usr/lib/ekg2/ioctld rm -rf "$pkgdir"/usr/libexec diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 003e31405..ba9e81078 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70173 2012-05-01 11:40:01Z andrea $ +# $Id: PKGBUILD 71741 2012-06-02 10:28:48Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.1.12 -pkgrel=5 +pkgrel=6 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index ccdee9865..a98298013 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69901 2012-04-26 05:53:01Z ttopper $ +# $Id: PKGBUILD 71887 2012-06-02 21:17:12Z heftig $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3-wm _pkgsourcename=i3 pkgver=4.2 -pkgrel=1 +pkgrel=2 pkgdesc="An improved dynamic tiling window manager" arch=('i686' 'x86_64') url="http://i3wm.org/" diff --git a/community/i3lock/PKGBUILD b/community/i3lock/PKGBUILD index cfba2dcbf..6729f3f5d 100644 --- a/community/i3lock/PKGBUILD +++ b/community/i3lock/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 70687 2012-05-14 17:17:38Z ttopper $ +# $Id: PKGBUILD 71875 2012-06-02 17:53:59Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3lock -pkgver=2.4 -pkgrel=3 +pkgver=2.4.1 +pkgrel=1 pkgdesc="An improved screenlocker based upon XCB and PAM" arch=('i686' 'x86_64') url="http://i3wm.org/i3lock/" @@ -13,7 +13,7 @@ depends=('xcb-util-image' 'xcb-util-keysyms' 'pam' 'libev' 'cairo') options=('docs') backup=("etc/pam.d/i3lock") source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2") -md5sums=('728e2654d886ef97449708f0135e9fa5') +md5sums=('fbc954133a6335be89e394d9ec85fcfd') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD index 55377a3c0..5b7a43d0c 100644 --- a/community/inn/PKGBUILD +++ b/community/inn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 44059 2011-04-01 20:32:01Z spupykin $ +# $Id: PKGBUILD 71743 2012-06-02 10:29:04Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Edward Tjörnhammar <xhemi@cube2.se> # Contributor: Edward Tjörnhammar <xhemi@cube2.se> pkgname=inn pkgver=2.5.2 -pkgrel=9 +pkgrel=10 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." url="http://www.isc.org/software/inn/" arch=('i686' 'x86_64') diff --git a/community/iptstate/PKGBUILD b/community/iptstate/PKGBUILD index f0fbb6abe..9f1321bbe 100644 --- a/community/iptstate/PKGBUILD +++ b/community/iptstate/PKGBUILD @@ -1,17 +1,17 @@ -# $Id$ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# $Id: PKGBUILD 71896 2012-06-03 00:25:44Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=iptstate -pkgver=2.2.3 +pkgver=2.2.5 pkgrel=1 pkgdesc='top-like interface to netfilter connection-tracking table' arch=('i686' 'x86_64') url='http://www.phildev.net/iptstate/' license=('custom') -depends=('ncurses' 'libnetfilter_conntrack') +depends=('gcc-libs' 'ncurses' 'libnetfilter_conntrack') source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2") -md5sums=('5238a0c4c4f764a919aba678051698ec') +md5sums=('5abe47e473bee256adaf8a48b1141a90') build() { cd $pkgname-$pkgver diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index 1566792fb..bec61f747 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61081 2011-12-21 20:51:13Z andrea $ +# $Id: PKGBUILD 71745 2012-06-02 10:29:12Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=kvirc pkgver=4.0.4 -pkgrel=4 +pkgrel=5 pkgdesc="Qt-based IRC client" url="http://www.kvirc.net" depends=('python2' 'qt' 'libxss' 'qtwebkit') @@ -12,11 +12,17 @@ makedepends=('cmake') license=('GPL') options=("!libtool") install=kvirc.install -source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2) -md5sums=('26fd24979ae4a29bac9309b3b0c98788') +source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2 + kvirc-4.0.4-gcc-4.7.0.patch) +md5sums=('26fd24979ae4a29bac9309b3b0c98788' + '863e33f5b38f0b5124144e9a8b640e42') build() { cd $srcdir + + # Fix build with GCC 4.7 + patch -d "$pkgname-$pkgver" -Np4 -i "$srcdir/kvirc-4.0.4-gcc-4.7.0.patch" + mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/community/kvirc/kvirc-4.0.4-gcc-4.7.0.patch b/community/kvirc/kvirc-4.0.4-gcc-4.7.0.patch new file mode 100644 index 000000000..f122a29af --- /dev/null +++ b/community/kvirc/kvirc-4.0.4-gcc-4.7.0.patch @@ -0,0 +1,62 @@ +Index: /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp
+===================================================================
+--- /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp (revision 4667)
++++ /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp (revision 6024)
+@@ -190,6 +190,6 @@
+ QString artist;
+ QString title;
+- foreach (QVariant v, reply.arguments()) {
+- QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++ foreach (QVariant w, reply.arguments()) {
++ QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ QVariant v = qdbus_cast<QVariantMap>(arg);
+ if (v.userType() == QVariant::Map) {
+Index: /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp
+===================================================================
+--- /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp (revision 6024)
++++ /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp (revision 6025)
+@@ -139,6 +139,6 @@
+ return __return_if_fail; \
+ MPRIS_CALL_METHOD("GetMetadata", __return_if_fail) \
+- foreach (QVariant v, reply.arguments()) { \
+- QDBusArgument arg = qvariant_cast<QDBusArgument>(v); \
++ foreach (QVariant w, reply.arguments()) { \
++ QDBusArgument arg = qvariant_cast<QDBusArgument>(w); \
+ QVariant v = qdbus_cast<QVariantMap>(arg); \
+ if (v.userType() == QVariant::Map) { \
+@@ -214,6 +214,6 @@
+ MPRIS_CALL_METHOD("GetMetadata", "")
+
+- foreach (QVariant v, reply.arguments()) {
+- QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++ foreach (QVariant w, reply.arguments()) {
++ QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ QVariant v = qdbus_cast<QVariantMap>(arg);
+ if (v.userType() == QVariant::Map) {
+@@ -292,6 +292,6 @@
+ MPRIS_CALL_METHOD("GetMetadata", -1)
+
+- foreach (QVariant v, reply.arguments()) {
+- QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++ foreach (QVariant w, reply.arguments()) {
++ QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ QVariant v = qdbus_cast<QVariantMap>(arg);
+ if (v.userType() == QVariant::Map) {
+@@ -353,6 +353,6 @@
+ MPRIS_CALL_METHOD("GetMetadata", "")
+
+- foreach (QVariant v, reply.arguments()) {
+- QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++ foreach (QVariant w, reply.arguments()) {
++ QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ QVariant v = qdbus_cast<QVariantMap>(arg);
+ if (v.userType() == QVariant::Map) {
+@@ -404,6 +404,6 @@
+ MPRIS_CALL_METHOD("GetMetadata", -1)
+
+- foreach (QVariant v, reply.arguments()) {
+- QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++ foreach (QVariant w, reply.arguments()) {
++ QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ QVariant v = qdbus_cast<QVariantMap>(arg);
+ if (v.userType() == QVariant::Map) {
diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index a0e3427da..b44f8cf38 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71019 2012-05-21 21:06:32Z seblu $ +# $Id: PKGBUILD 71747 2012-06-02 10:29:22Z bluewind $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=linux-tools pkgname=('perf' 'cpupower') pkgver=3.4 -pkgrel=1 +pkgrel=2 license=('GPL2') arch=('i686' 'x86_64') url='http://www.kernel.org' diff --git a/community/lxappearance-obconf/PKGBUILD b/community/lxappearance-obconf/PKGBUILD new file mode 100644 index 000000000..92b47b7fb --- /dev/null +++ b/community/lxappearance-obconf/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 71868 2012-06-02 14:56:09Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> + +pkgname=lxappearance-obconf +pkgver=0.2.0 +pkgrel=1 +pkgdesc='A plugin for LXAppearance to configure Openbox' +arch=('i686' 'x86_64') +license=('GPL2') +url="http://lxde.org/" +groups=('lxde') +depends=('lxappearance' 'openbox') +makedepends=('intltool') +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz) +md5sums=('8bf23c90febe6a655e0f86c80e44725d') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + diff --git a/community/lxmusic/PKGBUILD b/community/lxmusic/PKGBUILD new file mode 100644 index 000000000..197adf4ec --- /dev/null +++ b/community/lxmusic/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 71871 2012-06-02 14:59:08Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Marcus Schulderinsky <mmaacceess at gmail dot com> + +pkgname=lxmusic +pkgver=0.4.5 +pkgrel=1 +pkgdesc='Lightweight XMMS2 client' +arch=('i686' 'x86_64') +url="http://lxde.org/" +license=('GPL') +groups=('lxde') +depends=('gtk2' 'xmms2') +makedepends=('pkgconfig' 'intltool') +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz + libnotify-0.7.patch) +md5sums=('9c3e5eb636f05e8c190d359cd0c8b679' + '770c63254a7369613daeb6d1260d123f') + +build() { + cd $srcdir/$pkgname-$pkgver + patch -Np1 -i $srcdir/libnotify-0.7.patch + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} diff --git a/community/lxmusic/libnotify-0.7.patch b/community/lxmusic/libnotify-0.7.patch new file mode 100644 index 000000000..01f513de4 --- /dev/null +++ b/community/lxmusic/libnotify-0.7.patch @@ -0,0 +1,27 @@ +Upstream: +https://sourceforge.net/tracker/?func=detail&aid=3529198&group_id=180858&atid=894869 +Index: lxmusic-0.4.5/src/lxmusic-notify.c +=================================================================== +--- lxmusic-0.4.5.orig/src/lxmusic-notify.c ++++ lxmusic-0.4.5/src/lxmusic-notify.c +@@ -84,9 +84,20 @@ LXMusicNotification lxmusic_do_notify_pr + else + g_string_append( message, title ); + struct _LXMusicNotification *lxn = g_new ( struct _LXMusicNotification, 1); ++#ifdef NOTIFY_CHECK_VERSION ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ lxn->notify = notify_notification_new (summary, message->str, NULL); ++#else + lxn->notify = notify_notification_new (summary, message->str, NULL, NULL); ++#endif ++#else ++ lxn->notify = notify_notification_new (summary, message->str, NULL, NULL); ++#endif + notify_notification_set_urgency (lxn->notify, NOTIFY_URGENCY_NORMAL); ++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) ++ notify_notification_attach_to_status_icon(notify, priv->statusIcon); + notify_notification_attach_to_status_icon( lxn->notify, status_icon ); ++#endif + notify_notification_set_timeout (lxn->notify, NOTIFY_EXPIRES_DEFAULT); + g_string_free( message, TRUE ); + return lxn; diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD index 7d9c38e2d..111059043 100644 --- a/community/multipath-tools/PKGBUILD +++ b/community/multipath-tools/PKGBUILD @@ -1,34 +1,41 @@ -# $Id: PKGBUILD 68933 2012-04-06 00:04:44Z dreisner $ -# Maintainer: +# $Id: PKGBUILD 71861 2012-06-02 13:06:55Z dreisner $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas S Hatch <thatch45 ar gmail dot com> # Contributor: Michael P <ptchinster@archlinux.us> # Contributor: Matt Heagney <matt@heagney.com> pkgname=multipath-tools pkgver=0.4.9 -pkgrel=6 -pkgdesc="Multipath Tools For Linux" +pkgrel=8 +pkgdesc='Multipath tools for Linux' arch=('i686' 'x86_64') url="http://christophe.varoqui.free.fr/" license=('GPL') depends=('libaio' 'device-mapper') 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" 'fix-build.patch') +options=(!emptydirs) +source=(http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2 + 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' - '2576fc535d7fa767837b1c7827013e52') + '885c0ba9c90b73cc93aa3f78005f81d6' + 'c5aab36777b0304a3525533cdd31bddc' + '00eae05e02f1b85062e998574ab1b833' + '61b4038c4c145ca52e836145ea6bdd6c' + 'd99beb6d8a9b84f90125c7cacf8a6006') build() { - patch -p1 -i fix-build.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 - sed -i 's|etc/udev|usr/lib/udev|g' multipath/Makefile kpartx/Makefile - sed -i 's|/sbin/|/usr/bin/|g' kpartx/kpartx.rules - # Needs to be fixed upstream. Refer to # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814 export LDFLAGS=${LDFLAGS/-Wl,--as-needed} @@ -37,7 +44,7 @@ build() { } package() { - make LIB="usr/lib" DESTDIR="$pkgdir" bindir="/usr/bin" libudevdir="/usr/lib/udev" install + make LIB='usr/lib' DESTDIR="$pkgdir" bindir='/usr/bin' libudevdir='/usr/lib/udev' install install -D -m 644 multipath.conf "$pkgdir"/etc/multipath.conf install -D -m 644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated install -D -m 755 multipathd.rc "$pkgdir"/etc/rc.d/multipathd diff --git a/community/multipath-tools/blacklist-cciss-devices.patch b/community/multipath-tools/blacklist-cciss-devices.patch new file mode 100644 index 000000000..497121c36 --- /dev/null +++ b/community/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/multipath-tools/buffer-overflows.patch b/community/multipath-tools/buffer-overflows.patch new file mode 100644 index 000000000..38719aceb --- /dev/null +++ b/community/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/multipath-tools/explicitly-include-posix_types.h.patch b/community/multipath-tools/explicitly-include-posix_types.h.patch new file mode 100644 index 000000000..6cbbc3ba1 --- /dev/null +++ b/community/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/multipath-tools/fix-build.patch b/community/multipath-tools/fix-build.patch index c6196f73b..ff8f6824c 100644 --- a/community/multipath-tools/fix-build.patch +++ b/community/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/multipath-tools/log_enquery_overflow.patch b/community/multipath-tools/log_enquery_overflow.patch new file mode 100644 index 000000000..67367c9f4 --- /dev/null +++ b/community/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/pcsc-perl/PKGBUILD b/community/pcsc-perl/PKGBUILD index 91fdcc270..0d6aec8c6 100644 --- a/community/pcsc-perl/PKGBUILD +++ b/community/pcsc-perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 50836 2011-07-01 18:53:03Z bluewind $ +# $Id: PKGBUILD 71749 2012-06-02 10:29:26Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com> # Contributor: marc0s <marc0s@fsfe.org> pkgname=pcsc-perl pkgver=1.4.12 -pkgrel=2 +pkgrel=3 pkgdesc="A Perl Module for PC/SC SmartCard access" arch=('i686' 'x86_64') url="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/" diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index 33e2b34fe..cadb09300 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 70768 2012-05-16 14:40:05Z mtorromeo $ +# $Id: PKGBUILD 71873 2012-06-02 15:23:50Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.23_rel25.3 +pkgver=5.5.24_rel26.0 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server" arch=('i686' 'x86_64') @@ -99,6 +99,6 @@ package() { install -dm700 "${pkgdir}"/var/lib/mysql } -md5sums=('b098914c14256187686db0ccbc46a6d4' +md5sums=('76f835e98ad3c71fcaa33794ee187630' '243864805611764a7e5883c1dba7afd8' '1c949c0dbea5206af0db14942d9927b6') diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD index 654211678..7fcd9d4d9 100644 --- a/community/perl-berkeleydb/PKGBUILD +++ b/community/perl-berkeleydb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61955 2012-01-11 15:22:14Z stephane $ +# $Id: PKGBUILD 71751 2012-06-02 10:29:30Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-berkeleydb pkgver=0.50 -pkgrel=2 +pkgrel=4 pkgdesc="Interface to Berkeley DB version 2, 3 or 4" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/BerkeleyDB/" diff --git a/community/perl-class-methodmaker/PKGBUILD b/community/perl-class-methodmaker/PKGBUILD index f19e850f7..d80482f8e 100644 --- a/community/perl-class-methodmaker/PKGBUILD +++ b/community/perl-class-methodmaker/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65745 2012-02-22 12:13:32Z spupykin $ +# $Id: PKGBUILD 71753 2012-06-02 10:29:34Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-class-methodmaker pkgver=2.18 -pkgrel=5 +pkgrel=6 pkgdesc="Create generic class methods" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Class-MethodMaker" diff --git a/community/perl-clone/PKGBUILD b/community/perl-clone/PKGBUILD index a9c26d9c6..21a131b25 100644 --- a/community/perl-clone/PKGBUILD +++ b/community/perl-clone/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-clone pkgver=0.31 -pkgrel=4 +pkgrel=5 pkgdesc='Recursive copy of nested objects.' arch=('i686' 'x86_64') url='http://search.cpan.org/~RDF/Clone' diff --git a/community/perl-crypt-blowfish/PKGBUILD b/community/perl-crypt-blowfish/PKGBUILD index c1228fbc3..780a82008 100644 --- a/community/perl-crypt-blowfish/PKGBUILD +++ b/community/perl-crypt-blowfish/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65753 2012-02-22 12:15:58Z spupykin $ +# $Id: PKGBUILD 71757 2012-06-02 10:29:42Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-crypt-blowfish pkgver=2.12 -pkgrel=4 +pkgrel=5 pkgdesc="Perl/CPAN Module Crypt::Blowfish : XSbased implementation of Blowfish" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Crypt-Blowfish" diff --git a/community/perl-crypt-des/PKGBUILD b/community/perl-crypt-des/PKGBUILD index cdc5c95db..e40092acd 100644 --- a/community/perl-crypt-des/PKGBUILD +++ b/community/perl-crypt-des/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66020 2012-02-22 14:38:55Z spupykin $ +# $Id: PKGBUILD 71759 2012-06-02 10:29:46Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> #Contributor: Pete Morris <pete dot morris at gmail dot com> pkgname=perl-crypt-des pkgver=2.05 -pkgrel=4 +pkgrel=5 pkgdesc="Perl DES encryption module" arch=('i686' 'x86_64') url="http://search.cpan.org/~dparis/Crypt-DES" diff --git a/community/perl-curses/PKGBUILD b/community/perl-curses/PKGBUILD index 716129930..3f11fa792 100644 --- a/community/perl-curses/PKGBUILD +++ b/community/perl-curses/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66022 2012-02-22 14:40:14Z spupykin $ +# $Id: PKGBUILD 71761 2012-06-02 10:29:50Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-curses pkgver=1.28 -pkgrel=4 +pkgrel=5 pkgdesc="Character screen handling and windowing" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Curses" diff --git a/community/perl-data-structure-util/PKGBUILD b/community/perl-data-structure-util/PKGBUILD index 7fd35568c..636e1a877 100644 --- a/community/perl-data-structure-util/PKGBUILD +++ b/community/perl-data-structure-util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65768 2012-02-22 12:24:05Z spupykin $ +# $Id: PKGBUILD 71763 2012-06-02 10:29:54Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-data-structure-util pkgver=0.15 -pkgrel=5 +pkgrel=6 pkgdesc="Perl/CPAN Module Data::Structure::Util" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Data-Structure-Util" diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD index 95623b3a5..839ff1c63 100644 --- a/community/perl-datetime/PKGBUILD +++ b/community/perl-datetime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62774 2012-01-26 14:45:14Z spupykin $ +# $Id: PKGBUILD 71765 2012-06-02 10:29:58Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime pkgver=0.72 -pkgrel=1 +pkgrel=2 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DateTime" diff --git a/community/perl-dbd-odbc/PKGBUILD b/community/perl-dbd-odbc/PKGBUILD index 6bca355a2..4bd5cf4d4 100644 --- a/community/perl-dbd-odbc/PKGBUILD +++ b/community/perl-dbd-odbc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69177 2012-04-10 00:11:00Z spupykin $ +# $Id: PKGBUILD 71767 2012-06-02 10:30:02Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-dbd-odbc pkgver=1.37 -pkgrel=1 +pkgrel=2 pkgdesc="ODBC Driver for DBI" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DBD-ODBC/" diff --git a/community/perl-dbd-pg/PKGBUILD b/community/perl-dbd-pg/PKGBUILD index aa23749a1..7f2ad5e91 100644 --- a/community/perl-dbd-pg/PKGBUILD +++ b/community/perl-dbd-pg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67587 2012-03-13 12:46:53Z spupykin $ +# $Id: PKGBUILD 71769 2012-06-02 10:30:06Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-dbd-pg pkgver=2.19.2 -pkgrel=1 +pkgrel=2 pkgdesc="Postgres Driver for DBI" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DBD-Pg" diff --git a/community/perl-dbd-sqlite2/PKGBUILD b/community/perl-dbd-sqlite2/PKGBUILD index bdf165963..172143d89 100644 --- a/community/perl-dbd-sqlite2/PKGBUILD +++ b/community/perl-dbd-sqlite2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65789 2012-02-22 12:35:40Z spupykin $ +# $Id: PKGBUILD 71771 2012-06-02 10:30:10Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-dbd-sqlite2 pkgver=0.33 -pkgrel=8 +pkgrel=9 pkgdesc="Perl/CPAN Module DBD::SQLite2" arch=("i686" "x86_64") url="http://search.cpan.org/dist/DBD-SQLite2" diff --git a/community/perl-dbd-sybase/PKGBUILD b/community/perl-dbd-sybase/PKGBUILD index ecc703202..338bf74ea 100644 --- a/community/perl-dbd-sybase/PKGBUILD +++ b/community/perl-dbd-sybase/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56416 2011-10-07 09:53:00Z spupykin $ +# $Id: PKGBUILD 71773 2012-06-02 10:30:14Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-dbd-sybase pkgver=1.14 -pkgrel=1 +pkgrel=2 pkgdesc="Sybase Driver for DBI" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DBD-Sybase/" diff --git a/community/perl-device-serialport/PKGBUILD b/community/perl-device-serialport/PKGBUILD index 668b79445..7f0ba54d6 100644 --- a/community/perl-device-serialport/PKGBUILD +++ b/community/perl-device-serialport/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 50831 2011-07-01 18:51:53Z bluewind $ +# $Id: PKGBUILD 71775 2012-06-02 10:30:18Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Ross melin <rdmelin@gmail.com> pkgname=perl-device-serialport pkgver=1.04 -pkgrel=3 +pkgrel=4 pkgdesc="POSIX clone of Win32::SerialPort" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Device-SerialPort" diff --git a/community/perl-file-rsyncp/PKGBUILD b/community/perl-file-rsyncp/PKGBUILD index 7ed76655e..29af9c1a1 100644 --- a/community/perl-file-rsyncp/PKGBUILD +++ b/community/perl-file-rsyncp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62351 2012-01-19 15:52:14Z seblu $ +# $Id: PKGBUILD 71777 2012-06-02 10:30:22Z bluewind $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=perl-file-rsyncp pkgver=0.70 -pkgrel=1 +pkgrel=2 pkgdesc='Perl interface to rsync file list encoding and decoding' arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') diff --git a/community/perl-fuse/PKGBUILD b/community/perl-fuse/PKGBUILD index 21a1d84bd..ae5b9ccfc 100644 --- a/community/perl-fuse/PKGBUILD +++ b/community/perl-fuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56424 2011-10-07 09:55:09Z spupykin $ +# $Id: PKGBUILD 71779 2012-06-02 10:30:26Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-fuse pkgver=0.14 -pkgrel=1 +pkgrel=2 pkgdesc="write filesystems in Perl using FUSE" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Fuse" diff --git a/community/perl-gd/PKGBUILD b/community/perl-gd/PKGBUILD index 05004b664..b3cf18028 100644 --- a/community/perl-gd/PKGBUILD +++ b/community/perl-gd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65825 2012-02-22 12:50:52Z spupykin $ +# $Id: PKGBUILD 71781 2012-06-02 10:30:30Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+aur@gmail.com> pkgname=perl-gd pkgver=2.46 -pkgrel=2 +pkgrel=3 pkgdesc="Interface to Gd Graphics Library" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/GD" diff --git a/community/perl-gnome2-wnck/PKGBUILD b/community/perl-gnome2-wnck/PKGBUILD index 0f4c28d26..32e0812be 100644 --- a/community/perl-gnome2-wnck/PKGBUILD +++ b/community/perl-gnome2-wnck/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 63698 2012-02-05 12:07:47Z ibiru $ +# $Id: PKGBUILD 71783 2012-06-02 10:30:34Z bluewind $ # Maintainer Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=perl-gnome2-wnck pkgver=0.16 -pkgrel=5 +pkgrel=6 pkgdesc="Perl interface to the Window Navigator Construction Kit" arch=('i686' 'x86_64') -license=("GPL" "Artistic") +license=("GPL" "PerlArtistic") url="http://search.cpan.org/dist/Gnome2-Wnck" depends=('perl' 'perl-extutils-depends' 'perl-extutils-pkgconfig' 'gnome-perl' 'libwnck') options=('!emptydirs') diff --git a/community/perl-gssapi/PKGBUILD b/community/perl-gssapi/PKGBUILD index 171793635..51bed482b 100644 --- a/community/perl-gssapi/PKGBUILD +++ b/community/perl-gssapi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65837 2012-02-22 12:55:08Z spupykin $ +# $Id: PKGBUILD 71785 2012-06-02 10:30:38Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-gssapi pkgver=0.28 -pkgrel=5 +pkgrel=6 pkgdesc="Perl/CPAN Module GSSAPI" arch=("i686" "x86_64") url="http://search.cpan.org/dist/GSSAPI" diff --git a/community/perl-gstreamer-interfaces/PKGBUILD b/community/perl-gstreamer-interfaces/PKGBUILD index 80e33ee26..50bb736b6 100644 --- a/community/perl-gstreamer-interfaces/PKGBUILD +++ b/community/perl-gstreamer-interfaces/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66039 2012-02-22 14:59:49Z spupykin $ +# $Id: PKGBUILD 71789 2012-06-02 10:30:46Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Corrado Primier <bardo@aur.archlinux.org> pkgname=perl-gstreamer-interfaces pkgver=0.06 -pkgrel=4 +pkgrel=5 pkgdesc="GStreamer::Interfaces" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/GStreamer-Interfaces" diff --git a/community/perl-gstreamer/PKGBUILD b/community/perl-gstreamer/PKGBUILD index 1a841eb7a..d62ae8283 100644 --- a/community/perl-gstreamer/PKGBUILD +++ b/community/perl-gstreamer/PKGBUILD @@ -1,32 +1,28 @@ -# $Id: PKGBUILD 66034 2012-02-22 14:54:14Z spupykin $ +# $Id: PKGBUILD 71787 2012-06-02 10:30:42Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=perl-gstreamer -pkgver=0.16 -pkgrel=2 +pkgver=0.17 +pkgrel=1 pkgdesc="Interface to the GStreamer library" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/GStreamer" license=('GPL' 'PerlArtistic') depends=('glib-perl>=1.180' 'gstreamer0.10' 'perl-extutils-pkgconfig>=1.07' 'perl-extutils-depends>=0.205') options=('!emptydirs') -source=("http://www.cpan.org/authors/id/T/TS/TSCH/GStreamer-${pkgver}.tar.gz") -md5sums=('e2d51158f3c671c0e4c11a82c9171b2b') +source=(http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/GStreamer-$pkgver.tar.gz) +md5sums=('8fe097daf0e2534452a3f69af05ec9fd') build() { cd GStreamer-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make } package() { cd GStreamer-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-gtk2-sexy/PKGBUILD b/community/perl-gtk2-sexy/PKGBUILD index 44f110e1f..46f089951 100644 --- a/community/perl-gtk2-sexy/PKGBUILD +++ b/community/perl-gtk2-sexy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 63700 2012-02-05 12:07:55Z ibiru $ +# $Id: PKGBUILD 71791 2012-06-02 10:30:50Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Charles Mauch <cmauch@gmail.com> # Creator: Florian Ragwitz <http://search.cpan.org/~/> pkgname=perl-gtk2-sexy pkgver=0.05 -pkgrel=6 +pkgrel=7 pkgdesc="Perl/CPAN Module Gtk2::Sexy" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Gtk2-Sexy" diff --git a/community/perl-gtk2-trayicon/PKGBUILD b/community/perl-gtk2-trayicon/PKGBUILD index 531aa6fe0..aa6c724f3 100644 --- a/community/perl-gtk2-trayicon/PKGBUILD +++ b/community/perl-gtk2-trayicon/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63702 2012-02-05 12:08:02Z ibiru $ +# $Id: PKGBUILD 71793 2012-06-02 10:30:54Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-gtk2-trayicon pkgver=0.06 -pkgrel=8 +pkgrel=9 pkgdesc="Perl interface to the EggTrayIcon library" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Gtk2-TrayIcon/" diff --git a/community/perl-gtk2-webkit/PKGBUILD b/community/perl-gtk2-webkit/PKGBUILD index 190a668f2..5df9e74c1 100644 --- a/community/perl-gtk2-webkit/PKGBUILD +++ b/community/perl-gtk2-webkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63704 2012-02-05 12:08:14Z ibiru $ +# $Id: PKGBUILD 71795 2012-06-02 10:30:58Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=perl-gtk2-webkit pkgver=0.09 -pkgrel=2 +pkgrel=3 pkgdesc="Gtk2::WebKit" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Gtk2-WebKit" diff --git a/community/perl-html-strip/PKGBUILD b/community/perl-html-strip/PKGBUILD index 795d25551..830bfff44 100644 --- a/community/perl-html-strip/PKGBUILD +++ b/community/perl-html-strip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66047 2012-02-22 15:16:05Z spupykin $ +# $Id: PKGBUILD 71797 2012-06-02 10:31:02Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-html-strip pkgver=1.06 -pkgrel=7 +pkgrel=8 pkgdesc="Perl/CPAN Module HTML::Strip" arch=('i686' 'x86_64') url="http://search.cpan.org/~kilinrax/HTML-Strip/" diff --git a/community/perl-inline-java/PKGBUILD b/community/perl-inline-java/PKGBUILD index 40e5faaef..8704e58e9 100644 --- a/community/perl-inline-java/PKGBUILD +++ b/community/perl-inline-java/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65861 2012-02-22 13:08:58Z spupykin $ +# $Id: PKGBUILD 71799 2012-06-02 10:31:06Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> pkgname=perl-inline-java pkgver=0.53 -pkgrel=3 +pkgrel=4 pkgdesc="The Inline::Java module allows you to put Java source code directly inline in a Perl script or module." arch=('i686' 'x86_64') depends=('perl' 'perl-inline' 'java-runtime') diff --git a/community/perl-io-dirent/PKGBUILD b/community/perl-io-dirent/PKGBUILD index f176527e9..4dbd3d576 100644 --- a/community/perl-io-dirent/PKGBUILD +++ b/community/perl-io-dirent/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62356 2012-01-19 16:17:05Z seblu $ +# $Id: PKGBUILD 71801 2012-06-02 10:31:10Z bluewind $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=perl-io-dirent pkgver=0.05 -pkgrel=1 +pkgrel=2 pkgdesc='Perl IO::Dirent module - Access to dirent structs returned by readdir' arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') diff --git a/community/perl-io-tty/PKGBUILD b/community/perl-io-tty/PKGBUILD index 6560133ec..540af17de 100644 --- a/community/perl-io-tty/PKGBUILD +++ b/community/perl-io-tty/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56440 2011-10-07 09:59:16Z spupykin $ +# $Id: PKGBUILD 71803 2012-06-02 10:31:14Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Charles Mauch <cmauch@gmail.com> pkgname=perl-io-tty pkgver=1.10 -pkgrel=1 +pkgrel=2 pkgdesc="Provide an interface to TTYs and PTYs" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/IO-Tty/" diff --git a/community/perl-json-xs/PKGBUILD b/community/perl-json-xs/PKGBUILD index b1c70feb1..ff9351475 100644 --- a/community/perl-json-xs/PKGBUILD +++ b/community/perl-json-xs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56442 2011-10-07 09:59:59Z spupykin $ +# $Id: PKGBUILD 71805 2012-06-02 10:31:18Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> pkgname=perl-json-xs pkgver=2.32 -pkgrel=1 +pkgrel=2 pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast" url="http://search.cpan.org/dist/JSON-XS/" license=("GPL") diff --git a/community/perl-libapreq2/PKGBUILD b/community/perl-libapreq2/PKGBUILD index c26e5ef00..5acb325e6 100644 --- a/community/perl-libapreq2/PKGBUILD +++ b/community/perl-libapreq2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65875 2012-02-22 13:14:51Z spupykin $ +# $Id: PKGBUILD 71807 2012-06-02 10:31:22Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-libapreq2 pkgver=2.13 -pkgrel=2 +pkgrel=3 pkgdesc="A safe, standards-compliant, high-performance library used for parsing HTTP cookies, query-strings and POST data." arch=('i686' 'x86_64') url="http://search.cpan.org/dist/libapreq2" diff --git a/community/perl-linux-pid/PKGBUILD b/community/perl-linux-pid/PKGBUILD index f50e9a06a..9efec9e4a 100644 --- a/community/perl-linux-pid/PKGBUILD +++ b/community/perl-linux-pid/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 50357 2011-06-28 18:54:54Z angvp $ +# $Id: PKGBUILD 71809 2012-06-02 10:31:26Z bluewind $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Generator : CPANPLUS::Dist::Arch 1.12 pkgname='perl-linux-pid' pkgver='0.04' -pkgrel='1' +pkgrel='2' pkgdesc="Interface to Linux getpp?id functions" arch=('i686' 'x86_64') license=('PerlArtistic' 'GPL') diff --git a/community/perl-mail-box-parser-c/PKGBUILD b/community/perl-mail-box-parser-c/PKGBUILD index fd73a5aa2..da609e0f6 100644 --- a/community/perl-mail-box-parser-c/PKGBUILD +++ b/community/perl-mail-box-parser-c/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65883 2012-02-22 13:18:05Z spupykin $ +# $Id: PKGBUILD 71811 2012-06-02 10:31:30Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-mail-box-parser-c pkgver=3.006 -pkgrel=7 +pkgrel=8 pkgdesc="Perl/CPAN Module Mail::Box::Parser::C : extends MailBox with the speed of C" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Mail-Box-Parser-C" diff --git a/community/perl-mail-transport-dbx/PKGBUILD b/community/perl-mail-transport-dbx/PKGBUILD index f3c34f9b1..fb303ea49 100644 --- a/community/perl-mail-transport-dbx/PKGBUILD +++ b/community/perl-mail-transport-dbx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65888 2012-02-22 13:20:21Z spupykin $ +# $Id: PKGBUILD 71813 2012-06-02 10:31:34Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-mail-transport-dbx pkgver=0.07 -pkgrel=7 +pkgrel=8 pkgdesc="Perl/CPAN Module Mail::Transport::Dbx : Parse Outlook Express mailboxes" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Mail-Transport-Dbx" diff --git a/community/perl-net-dbus/PKGBUILD b/community/perl-net-dbus/PKGBUILD index c16439477..d8e5e7ae5 100644 --- a/community/perl-net-dbus/PKGBUILD +++ b/community/perl-net-dbus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56450 2011-10-07 10:02:33Z spupykin $ +# $Id: PKGBUILD 71815 2012-06-02 10:31:38Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-net-dbus pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Binding for DBus messaging protocol" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Net-DBus" diff --git a/community/perl-net-libidn/PKGBUILD b/community/perl-net-libidn/PKGBUILD index 052d39d73..75bf0f379 100644 --- a/community/perl-net-libidn/PKGBUILD +++ b/community/perl-net-libidn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 65896 2012-02-22 13:28:05Z spupykin $ +# $Id: PKGBUILD 71817 2012-06-02 10:31:42Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-net-libidn pkgver=0.12 -pkgrel=5 +pkgrel=6 pkgdesc="Perl/CPAN Module Net::LibIDN" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Net-LibIDN/" diff --git a/community/perl-package-stash-xs/PKGBUILD b/community/perl-package-stash-xs/PKGBUILD index 40dd20936..ee83389a2 100644 --- a/community/perl-package-stash-xs/PKGBUILD +++ b/community/perl-package-stash-xs/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer: Justin Davis <jrcd83@gmail.com> -# $Id: PKGBUILD 57660 2011-11-01 00:16:28Z juster $ +# $Id: PKGBUILD 71819 2012-06-02 10:31:46Z bluewind $ pkgname=perl-package-stash-xs pkgver=0.25 -pkgrel=1 +pkgrel=2 pkgdesc="faster and more correct implementation of the Package::Stash API" arch=(i686 x86_64) license=(PerlArtistic GPL) diff --git a/community/perl-params-classify/PKGBUILD b/community/perl-params-classify/PKGBUILD index 3ad5af1e9..d0dae4a7d 100644 --- a/community/perl-params-classify/PKGBUILD +++ b/community/perl-params-classify/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 58968 2011-11-20 18:12:25Z spupykin $ +# $Id: PKGBUILD 71821 2012-06-02 10:31:50Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-params-classify pkgver=0.013 -pkgrel=1 +pkgrel=2 pkgdesc="argument type classification" arch=(i686 x86_64) license=('PerlArtistic') diff --git a/community/perl-params-util/PKGBUILD b/community/perl-params-util/PKGBUILD index da772e5f4..231c569ee 100644 --- a/community/perl-params-util/PKGBUILD +++ b/community/perl-params-util/PKGBUILD @@ -1,43 +1,48 @@ -# Maintainer: Justin Davis (juster) <jrcd83@gmail.com> -# $Id: PKGBUILD 71654 2012-05-31 15:48:33Z juster $ +# Maintainer: Justin Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 71823 2012-06-02 10:31:54Z bluewind $ pkgname=perl-params-util -pkgver=1.07 -pkgrel=1 -pkgdesc='Simple, compact and correct param-checking functions' +pkgver=1.04 +pkgrel=2 +pkgdesc="Simple, compact and correct param-checking functions" arch=(i686 x86_64) license=(PerlArtistic GPL) options=(!emptydirs) -depends=('perl>=5.5.30') +depends=('perl>=5.5.30' 'perl-scalar-list-utils') +makedepends=('perl-extutils-cbuilder>=0.27' 'perl-extutils-makemaker>=6.52' + 'perl-pathtools') +checkdepends=('perl-test-simple') url=https://metacpan.org/release/Params-Util -source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-$pkgver.tar.gz") -md5sums=(02db120c0eef87aae1830cc62bdec37b) -sha512sums=(ff471b01b33414fc5e1c68d97c21171a95d3418c33e3c45f9910cc768898690e35051506a83ad9403a200336654c14b8efc9d471c4b3fe3321047a7603d6fd56) -_dir="$srcdir/Params-Util-$pkgver" +source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-${pkgver}.tar.gz") +md5sums=(84bfb0a16cff67f2077ece0e24408b0f) +sha512sums=(086b6e37ce24a423439e346c4fc7069cbb5bde6af5c259fa765616bf637597105ee379df5edca82fdeb3bb0e44d83c7704ea1fe09170acea389ffb54d77f3d3d) +_distdir="${srcdir}/Params-Util-${pkgver}" -build() -( - cd "$_dir" - export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps - unset PERL5LIB PERL_MM_OPT - /usr/bin/perl Makefile.PL - make -) +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null -check() -( - cd "$_dir" - export PERL_MM_USE_DEFAULT=1 - unset PERL5LIB - make test -) + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} -package() -( - cd "$_dir" - make install INSTALLDIRS=vendor DESTDIR="$pkgdir" - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -) +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} # Local Variables: # mode: shell-script diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD index e24601f60..b14f42de7 100644 --- a/community/perl-params-validate/PKGBUILD +++ b/community/perl-params-validate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69212 2012-04-10 03:46:07Z spupykin $ +# $Id: PKGBUILD 71825 2012-06-02 10:31:58Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-params-validate pkgver=1.06 -pkgrel=2 +pkgrel=3 pkgdesc="Validate sub params against a spec" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Params-Validate" diff --git a/community/perl-string-crc32/PKGBUILD b/community/perl-string-crc32/PKGBUILD index 848c1e468..8b4470b72 100644 --- a/community/perl-string-crc32/PKGBUILD +++ b/community/perl-string-crc32/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65923 2012-02-22 13:42:55Z spupykin $ +# $Id: PKGBUILD 71827 2012-06-02 10:32:02Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-string-crc32 pkgver=1.4 -pkgrel=7 +pkgrel=8 pkgdesc="Perl/CPAN Module String::CRC32 : ZMODEMlike CRC32 generation" arch=("i686" "x86_64") url="http://search.cpan.org/dist/String-CRC32" diff --git a/community/perl-text-charwidth/PKGBUILD b/community/perl-text-charwidth/PKGBUILD index ead6632fd..46ad4d725 100644 --- a/community/perl-text-charwidth/PKGBUILD +++ b/community/perl-text-charwidth/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65951 2012-02-22 13:55:21Z spupykin $ +# $Id: PKGBUILD 71829 2012-06-02 10:32:06Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-text-charwidth pkgver=0.04 -pkgrel=7 +pkgrel=8 pkgdesc="Perl/CPAN Module Text::CharWidth" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Text-CharWidth" diff --git a/community/perl-text-kakasi/PKGBUILD b/community/perl-text-kakasi/PKGBUILD index d0ba95f76..81f4b2066 100644 --- a/community/perl-text-kakasi/PKGBUILD +++ b/community/perl-text-kakasi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 65954 2012-02-22 13:55:56Z spupykin $ +# $Id: PKGBUILD 71831 2012-06-02 10:32:12Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Allan McRae <mcrae_allan@hotmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-text-kakasi pkgver=2.04 -pkgrel=8 +pkgrel=9 pkgdesc="Perl frontend to kakasi" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Text-Kakasi" diff --git a/community/perl-tie-hash-indexed/PKGBUILD b/community/perl-tie-hash-indexed/PKGBUILD index 5a2db91a9..a2326057c 100644 --- a/community/perl-tie-hash-indexed/PKGBUILD +++ b/community/perl-tie-hash-indexed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65962 2012-02-22 14:01:53Z spupykin $ +# $Id: PKGBUILD 71833 2012-06-02 10:32:16Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-tie-hash-indexed pkgver=0.05 -pkgrel=7 +pkgrel=8 pkgdesc="Ordered hashes for Perl" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Tie-Hash-Indexed" diff --git a/community/perl-tk-tablematrix/PKGBUILD b/community/perl-tk-tablematrix/PKGBUILD index 58ece78cc..21f70e804 100644 --- a/community/perl-tk-tablematrix/PKGBUILD +++ b/community/perl-tk-tablematrix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65972 2012-02-22 14:05:41Z spupykin $ +# $Id: PKGBUILD 71835 2012-06-02 10:32:20Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-tk-tablematrix pkgver=1.23 -pkgrel=8 +pkgrel=9 pkgdesc="Display data in TableSpreadsheet format" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Tk-TableMatrix" diff --git a/community/perl-www-curl/PKGBUILD b/community/perl-www-curl/PKGBUILD index 8f04a80cf..c0b79e460 100644 --- a/community/perl-www-curl/PKGBUILD +++ b/community/perl-www-curl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65982 2012-02-22 14:11:32Z spupykin $ +# $Id: PKGBUILD 71837 2012-06-02 10:32:24Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-www-curl pkgver=4.15 -pkgrel=2 +pkgrel=3 pkgdesc="Perl/CPAN Module WWW::Curl" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/WWW-Curl/" diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD index 066d4637b..72245d28c 100644 --- a/community/perl-xml-libxml/PKGBUILD +++ b/community/perl-xml-libxml/PKGBUILD @@ -1,7 +1,9 @@ -# Maintainer: François Charette <francois.archlinux.org> +# $Id: PKGBUILD 71839 2012-06-02 10:32:30Z bluewind $ +# Maintainer: Justin "juster" Davis <jrcd83@gmail.com> +# Contributor: François Charette <francois.archlinux.org> pkgname=perl-xml-libxml -pkgver=1.88 +pkgver=1.98 pkgrel=1 pkgdesc="Interface to the libxml library" arch=('i686' 'x86_64') @@ -13,7 +15,7 @@ replaces=('perl-libxml' 'perl-xml-libxml-common') conflicts=('perl-libxml' 'perl-xml-libxml-common') install=perl-xml-libxml.install source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz) -md5sums=('31c0e64e0ccd7d51489aae03a29b372a') +md5sums=('78c2e293d02e92ca99b07e9a768380ca') build() { cd $srcdir/XML-LibXML-$pkgver diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD index 4c0b21e74..31e0b3a49 100644 --- a/community/perl-xml-libxslt/PKGBUILD +++ b/community/perl-xml-libxslt/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 56997 2011-10-18 03:35:07Z ebelanger $ -# Maintainer: François Charette <firmicus ατ gmx δοτ net> +# $Id: PKGBUILD 71841 2012-06-02 10:32:34Z bluewind $ +# Maintainer: Justin "juster" Davis <jrcd83@gmail.com> +# Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-xml-libxslt -pkgver=1.73 +pkgver=1.77 pkgrel=1 pkgdesc="Interface to the gnome libxslt library" arch=('i686' 'x86_64') @@ -11,7 +12,7 @@ license=('GPL') depends=('perl-xml-libxml' 'libxslt') options=('!emptydirs') source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-$pkgver.tar.gz) -md5sums=('99b372c85cae773a073d4387e305c29c') +md5sums=('a9cf4adb3637a0a42eb69a2998fa488e') build() { cd "$srcdir/XML-LibXSLT-$pkgver" diff --git a/community/perl-xmms/PKGBUILD b/community/perl-xmms/PKGBUILD index 9b1ca0f35..3291dc2bc 100644 --- a/community/perl-xmms/PKGBUILD +++ b/community/perl-xmms/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66002 2012-02-22 14:17:37Z spupykin $ +# $Id: PKGBUILD 71843 2012-06-02 10:32:38Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Georg Grabler <ggrabler@gmail.com> pkgname=perl-xmms pkgver=0.12 -pkgrel=7 +pkgrel=8 pkgdesc="Bundle::Xmms - Bundle for xmms remote control shell" arch=('i686' 'x86_64') url="http://search.cpan.org/~dougm/Xmms-Perl/" diff --git a/community/pork/PKGBUILD b/community/pork/PKGBUILD index 0fcb0307b..0dbe383f4 100644 --- a/community/pork/PKGBUILD +++ b/community/pork/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 68186 2012-03-18 21:35:54Z jlichtblau $ +# $Id: PKGBUILD 71845 2012-06-02 10:32:42Z bluewind $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=pork pkgver=0.99.8.1 -pkgrel=5 +pkgrel=6 pkgdesc="Console-based AOL Instant Messenger & IRC client" arch=('i686' 'x86_64') url="http://dev.ojnk.net/" license=('GPL') depends=('ncurses' 'perl') source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz) -sha256sums=('0c720db7e4e843aeee0fa53ade7cdffd') +sha256sums=('f0d4cad21017fd75b3c200342c54dd56d9ff7bc38d1e9b3c8ba686ba53d585ed') build() { cd $pkgname-$pkgver @@ -25,4 +25,3 @@ package() { make DESTDIR=${pkgdir} install } -sha256sums=('f0d4cad21017fd75b3c200342c54dd56d9ff7bc38d1e9b3c8ba686ba53d585ed') diff --git a/community/python-bsddb/PKGBUILD b/community/python-bsddb/PKGBUILD index c4ab0e502..570273e69 100644 --- a/community/python-bsddb/PKGBUILD +++ b/community/python-bsddb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64243 2012-02-11 01:07:58Z tdziedzic $ +# $Id: PKGBUILD 71894 2012-06-02 22:27:02Z allan $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> @@ -7,7 +7,7 @@ pkgbase=python-bsddb pkgname=('python2-bsddb' 'python-bsddb') pkgver=5.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Python interface for BerkeleyDB" license=('MIT') arch=('i686' 'x86_64') diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD index c34f660cc..867bc44b1 100644 --- a/community/r8168-lts/PKGBUILD +++ b/community/r8168-lts/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70870 2012-05-18 08:29:14Z mtorromeo $ +# $Id: PKGBUILD 71856 2012-06-02 12:20:04Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=r8168-lts _pkgname=r8168 -pkgver=8.030.00 -pkgrel=2 +pkgver=8.031.00 +pkgrel=1 pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts" url="http://www.realtek.com.tw" license=("GPL") @@ -28,5 +28,5 @@ package() { find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; } -md5sums=('3205d895dbdc7564ba60b71acb308417') -sha256sums=('1b2267703c83f1709cad115cc39b11e8c4b64e7944452c684ef2bd86c626d6c4') +md5sums=('ec1654f02e2dad930bbeb0210ddab7e5') +sha256sums=('5c617b3c08aca18d1eb24d33f77df40020eb64fb32c8e4008265e08b7ffe5779') diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD index 77c2758f4..62ab3add2 100644 --- a/community/rxvt-unicode/PKGBUILD +++ b/community/rxvt-unicode/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 68942 2012-04-06 10:19:39Z seblu $ +# $Id: PKGBUILD 71847 2012-06-02 10:32:52Z bluewind $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> -# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=rxvt-unicode pkgver=9.15 -pkgrel=2 +pkgrel=3 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)' arch=('i686' 'x86_64') url='http://software.schmorp.de/pkg/rxvt-unicode.html' license=('GPL') -depends=('gcc-libs' 'libxft' 'gdk-pixbuf2' 'perl') +depends=('libxft' 'gdk-pixbuf2' 'perl' 'startup-notification') optdepends=('gtk2-perl: to use the urxvt-tabbed') source=( "http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2" @@ -26,38 +26,50 @@ md5sums=('15595aa326167ac5eb68c28d95432faf' build() { cd $pkgname-$pkgver - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --with-terminfo=/usr/share/terminfo \ --enable-256-color \ + --enable-combining \ + --enable-fading \ --enable-font-styles \ - --enable-xim \ + --enable-iso14755 \ --enable-keepscrolling \ + --enable-lastlog \ + --enable-mousewheel \ + --enable-next-scroll \ + --enable-perl \ + --enable-pixbuf \ + --enable-pointer-blank \ + --enable-rxvt-scroll \ --enable-selectionscrolling \ + --enable-slipwheeling \ --enable-smart-resize \ - --enable-pixbuf \ + --enable-startup-notification \ --enable-transparency \ + --enable-unicode3 \ --enable-utmp \ --enable-wtmp \ - --enable-lastlog \ + --enable-xft \ + --enable-xim \ + --enable-xterm-scroll \ --disable-frills make } package() { - cd $pkgname-$pkgver + pushd $pkgname-$pkgver # workaround terminfo installation export TERMINFO="$pkgdir/usr/share/terminfo" install -d "$TERMINFO" - make DESTDIR="$pkgdir" install - # install the tabbing wrapper ( requires gtk2-perl! ) sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed install -Dm 755 doc/rxvt-tabbed "$pkgdir/usr/bin/urxvt-tabbed" - + popd # install freedesktop menu for _f in urxvt urxvtc urxvt-tabbed; do - install -Dm644 ../$_f.desktop "$pkgdir/usr/share/applications/$_f.desktop" + install -Dm644 $_f.desktop "$pkgdir/usr/share/applications/$_f.desktop" done } diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD index d1e4ae01e..ca7635fde 100644 --- a/community/spacefm/PKGBUILD +++ b/community/spacefm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71694 2012-06-01 13:05:32Z dreisner $ +# $Id: PKGBUILD 71883 2012-06-02 19:08:13Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com> pkgname=spacefm -pkgver=0.7.6 -pkgrel=3 +pkgver=0.7.7 +pkgrel=1 pkgdesc="A multi-panel tabbed file manager" arch=('i686' 'x86_64') url="http://ignorantguru.github.com/spacefm/" @@ -21,7 +21,7 @@ optdepends=('lsof: device processes' 'udisks: mount as non-root user' 'udisks2: mount as non-root user') source=(https://raw.github.com/IgnorantGuru/spacefm/master/packages/${pkgver}/spacefm-${pkgver}.tar.xz) -md5sums=('572b256ab46073d8bb065999bd531423') +md5sums=('f6153cc30606375cbf91075fa1f7a4a3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/sylpheed/PKGBUILD b/community/sylpheed/PKGBUILD new file mode 100644 index 000000000..e9bb68bf9 --- /dev/null +++ b/community/sylpheed/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 71851 2012-06-02 10:42:33Z speps $ +# Maintainer: speps <speps at aur dot archlinux dot org> +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: dorphell <dorphell@archlinux.org> + +pkgname=sylpheed +pkgver=3.1.4 +pkgrel=1 +pkgdesc="Lightweight and user-friendly e-mail client" +arch=('i686' 'x86_64') +url="http://sylpheed.sraoss.jp/en/" +license=('GPL') +depends=('gpgme' 'gtkspell' 'desktop-file-utils') +makedepends=('compface' 'openssl') +options=('!libtool') +install="$pkgname.install" +source=("http://sylpheed.sraoss.jp/$pkgname/v3.1/$pkgname-$pkgver.tar.bz2") +md5sums=('4e0e41f05607e5c2542a7dfd166aee77') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # glib2 fix + sed -i 's/glibconfig/glib/' libsylph/defs.h + + ./configure --prefix=/usr \ + --enable-ldap + make + + # Build Attachment-Tool Plug-in + cd plugin/attachment_tool && make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + + # Install Attachment-Tool Plug-in + cd plugin/attachment_tool + make DESTDIR="$pkgdir/" install-plugin +} diff --git a/community/sylpheed/sylpheed.install b/community/sylpheed/sylpheed.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/community/sylpheed/sylpheed.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/tilda/PKGBUILD b/community/tilda/PKGBUILD index 6878c3375..19ba559f2 100644 --- a/community/tilda/PKGBUILD +++ b/community/tilda/PKGBUILD @@ -1,33 +1,42 @@ -# $Id: PKGBUILD 67790 2012-03-14 12:36:28Z giovanni $ +# $Id: PKGBUILD 71879 2012-06-02 18:37:37Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=tilda pkgver=0.9.6 -pkgrel=5 +pkgrel=6 pkgdesc="Linux terminal based on classic terminals from first person shooter games" arch=('i686' 'x86_64') url="http://tilda.sourceforge.net" license=('GPL') depends=('vte' 'confuse' 'libglade') makedepends=('gawk') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz \ - fix.patch) +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz + tilda-fix.patch tilda-glib2.patch tilda-conf-sigsegv.patch) sha256sums=('b3bd0f63eb83a5001ef26056ca116e5f8005d454f8f82a94f334868862068411' - '5f3aa2a58f52475e476b1871ea3f407c0cf4414670e861794888737b605c3caf') + 'ceac38bb33a0e8141f7b6cbc55807c999729319f2fdfaa3c375aa1a541d29729' + 'c71cdd8cdc1fdd76c919605c6b7a1b89e4929d20630db17145e6c2b584c8aaf9' + 'e28c731c0ca94210d5e4f4b7dd0eee9952405593f1d06e4ab2d87ee299e3e533') build() { - cd ${srcdir}/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver - patch -Np1 -i "${srcdir}/fix.patch" +# gdk && desktop file fix FS#25762 + patch -p0 -i ${srcdir}/$pkgname-fix.patch + +# glib2 fix + patch -p0 -i ${srcdir}/$pkgname-glib2.patch + +# fix segfaults on malformed config files FS#29754 + patch -p0 -i ${srcdir}/$pkgname-conf-sigsegv.patch ./configure --prefix=/usr make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver make DESTDIR=${pkgdir} install } diff --git a/community/tilda/tilda-conf-sigsegv.patch b/community/tilda/tilda-conf-sigsegv.patch new file mode 100644 index 000000000..a48aad0a3 --- /dev/null +++ b/community/tilda/tilda-conf-sigsegv.patch @@ -0,0 +1,11 @@ +--- src/key_grabber.c 2008-04-08 00:12:31.000000000 +0200 ++++ src/key_grabber.c 2012-05-17 19:43:25.227699421 +0200 +@@ -257,7 +257,7 @@ + gboolean tilda_keygrabber_bind (const gchar *keystr, tilda_window *tw) + { + /* Empty strings are no good */ +- if (strcmp ("", keystr) == 0) ++ if (!keystr || strcmp ("", keystr) == 0) + return FALSE; + + return tomboy_keybinder_bind (keystr, onKeybindingPull, tw); diff --git a/community/tilda/tilda-fix.patch b/community/tilda/tilda-fix.patch new file mode 100644 index 000000000..a6d273c26 --- /dev/null +++ b/community/tilda/tilda-fix.patch @@ -0,0 +1,24 @@ +--- src/key_grabber.c 2008-04-08 01:12:31.000000000 +0300 ++++ src/key_grabber.c 2009-10-16 17:39:16.399679408 +0300 +@@ -190,7 +190,7 @@ + * Overriding the user time here seems to work a lot better than calling + * gtk_window_present_with_time() here, or at the end of the function. I have + * no idea why, they should do the same thing. */ +- gdk_x11_window_set_user_time (GTK_WIDGET(tw->window)->window, ++ gdk_x11_window_set_user_time (GTK_WIDGET(tw->window), + tomboy_keybinder_get_current_event_time()); + gtk_window_move (GTK_WINDOW(tw->window), config_getint ("x_pos"), config_getint ("y_pos")); + gtk_widget_show (GTK_WIDGET(tw->window)); + +--- tilda.desktop.in 2007-03-16 04:53:34.000000000 +0100 ++++ tilda.desktop.in 2011-08-28 19:08:53.000000000 +0200 +@@ -2 +1,0 @@ +-Encoding=UTF-8 +@@ -4,2 +3,2 @@ +-Exec=@BINDIR@/tilda +-Icon=@PIXMAPSDIR@/tilda.png ++Exec=tilda ++Icon=tilda +@@ -8 +7 @@ +-Categories=GNOME;GTK;Application;Utility;TerminalEmulator; ++Categories=GNOME;GTK;Utility;TerminalEmulator;System; diff --git a/community/tilda/tilda-glib2.patch b/community/tilda/tilda-glib2.patch new file mode 100644 index 000000000..2d048e565 --- /dev/null +++ b/community/tilda/tilda-glib2.patch @@ -0,0 +1,11 @@ +--- src/tomboykeybinder.h 2007-07-15 04:31:19.000000000 +0200 ++++ src/tomboykeybinder.h 2012-05-17 19:42:06.613150329 +0200 +@@ -2,7 +2,7 @@ + #ifndef __TOMBOY_KEY_BINDER_H__ + #define __TOMBOY_KEY_BINDER_H__ + +-#include <glib/gtypes.h> ++//#include <glib/gtypes.h> + + G_BEGIN_DECLS + diff --git a/community/tilda/tilda.changelog b/community/tilda/tilda.changelog index af3650071..4248e9a32 100644 --- a/community/tilda/tilda.changelog +++ b/community/tilda/tilda.changelog @@ -1,3 +1,7 @@ +2012-06-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + + * FS#29754 fixed + 2011-08-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * FS#25762 fixed diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index 9f42f7932..fd9981586 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,31 +1,43 @@ -# $Id: PKGBUILD 68939 2012-04-06 10:11:29Z seblu $ +# $Id: PKGBUILD 71849 2012-06-02 10:32:56Z bluewind $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mickael9 <mickael9 at gmail dot com> pkgname=znc pkgver=0.206 -pkgrel=1 +pkgrel=2 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' license=('GPL2') arch=('i686' 'x86_64') -depends=('c-ares' 'gcc-libs' 'openssl') -makedepends=('swig' 'tcl' 'python' 'perl' 'cyrus-sasl') +depends=('c-ares' 'libsasl') +#makedepends=('swig' 'tcl' 'python' 'perl') +makedepends=('tcl' 'python' 'perl') optdepends=('tcl: modtcl module' 'python: modpython module' 'perl: modperl module' 'cyrus-sasl: saslauth module') -source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz") -md5sums=('b7d3f21da81abaeb553066b0e10beb53') +source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz" + "http://people.znc.in/~darthgandalf/znc/modperl/modperl-znc-0.204.tar.bz2" + "http://people.znc.in/~darthgandalf/znc/modpython/modpython-znc-0.204.tar.bz2") +md5sums=('b7d3f21da81abaeb553066b0e10beb53' + 'a9c72d556d9a4ef100520433f17d71ae' + '19bf033c5cb9243171c215043c594f07') build() { + # swig 2.0.6 is bugged, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672035 + # use an alternate ways of building znc explain here: + # - http://wiki.znc.in/Modperl + # - http://wiki.znc.in/Modpython + mv -v modperl/* $pkgname-$pkgver/modules/modperl + mv -v modpython/* $pkgname-$pkgver/modules/modpython cd $pkgname-$pkgver ./configure --prefix=/usr \ --enable-sasl \ - --enable-tcl \ --enable-python \ --enable-perl \ + --enable-tcl \ + --disable-swig \ --enable-extra make } diff --git a/core/db/PKGBUILD b/core/db/PKGBUILD index c86b2f44a..937e1f924 100644 --- a/core/db/PKGBUILD +++ b/core/db/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146445 2012-01-11 15:20:54Z stephane $ +# $Id: PKGBUILD 160636 2012-06-02 22:25:49Z allan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=db -pkgver=5.3.15 +pkgver=5.3.21 pkgrel=1 pkgdesc="The Berkeley DB embedded database system" arch=('i686' 'x86_64') @@ -14,17 +14,17 @@ depends=('gcc-libs' 'sh') options=('!libtool') install=db.install source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) -sha1sums=('7683b632a01ff3543c379a120809a942ec457738') +sha1sums=('32e43c4898c8996750c958a90c174bd116fcba83') build() { - cd "${srcdir}/$pkgname-${pkgver}/build_unix" + cd "${srcdir}"/$pkgname-${pkgver}/build_unix ../dist/configure --prefix=/usr --enable-compat185 \ --enable-shared --enable-static --enable-cxx --enable-dbm make LIBSO_LIBS=-lpthread } package() { - cd "${srcdir}/$pkgname-${pkgver}/build_unix" + cd "${srcdir}"/$pkgname-${pkgver}/build_unix make DESTDIR="${pkgdir}" install rm -r "${pkgdir}"/usr/docs install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \ diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 191b43974..f084b2ea5 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158014 2012-05-01 02:11:44Z eric $ +# $Id: PKGBUILD 160638 2012-06-02 22:26:01Z allan $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') pkgver=2.4.31 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.openldap.org/" license=('custom') diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index 94d9c623f..58b94e7fb 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 159280 2012-05-20 20:41:32Z bluewind $ +# $Id: PKGBUILD 160587 2012-06-02 10:54:59Z bluewind $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: kevin <kevin.archlinux.org> # Contributor: judd <jvinet.zeroflux.org> # Contributor: francois <francois.archlinux.org> pkgname=perl -pkgver=5.14.2 -pkgrel=7 +pkgver=5.16.0 +pkgrel=2 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') @@ -16,17 +16,13 @@ changelog=ChangeLog source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perlbin.sh perlbin.csh -provides.pl -digest_eval_hole.diff -0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch) +provides.pl) install=perl.install options=('makeflags' '!purge') -md5sums=('04a4c5d3c1f9f19d77daff8e8cd19a26' +md5sums=('15a2f95fb27231e10998240f13acf961' '5ed2542fdb9a60682f215bd33701e61a' '1f0cbbee783e8a6d32f01be5118e0d5e' - '31fc0b5bb4935414394c5cfbec2cb8e5' - '490852b3d77c3b3866d0d75f5fbf5c5d' - 'c25d86206d649046538c3daab7874564') + '999c3eea6464860704abbb055a0f0896') # workaround to let the integrity check find the correct provides array if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then @@ -44,8 +40,6 @@ build() { arch_opts="" fi - patch -Np1 -i $srcdir/digest_eval_hole.diff - ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \ -Dprivlib=/usr/share/perl5/core_perl \ @@ -60,7 +54,6 @@ build() { -Dinc_version_list=none \ -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \ -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" - patch -Np1 -i $srcdir/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch make } @@ -120,7 +113,4 @@ package() { done find $pkgdir/usr/lib -name *.pod -delete find $pkgdir -name .packlist -delete - # Add /usr/lib/perl5/core_perl/CORE/ to standard library path (FS#24660) - install -dv ${pkgdir}/etc/ld.so.conf.d - echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf } diff --git a/core/perl/provides.pl b/core/perl/provides.pl index 3bf369577..d2cdc762e 100644 --- a/core/perl/provides.pl +++ b/core/perl/provides.pl @@ -1,9 +1,16 @@ # provides.pl ## # Script for printing out a provides list of every CPAN distribution -# that is bundled with perl. +# that is bundled with perl. You can run it before building perl +# or you can run it after building perl. Required modules are in core +# for perl 5.13 and above. It might be nice if this didn't require +# HTTP::Tiny and maybe just used wget or curl. # -# Justin Davis <jrcd83@gmail.com> +# This script uses HTTP::Tiny to query Tatsuhiko Miyagawa's webapp at +# cpanmetadb.plackperl.org to cross-reference module files to their +# providing CPAN distribution. Thank you Miyagawa! +# +# - Justin "juster" Davis <jrcd83@gmail.com> use warnings 'FATAL' => 'all'; use strict; @@ -13,21 +20,26 @@ package Common; sub evalver { my ($path, $mod) = @_; - $mod ||= ""; open my $fh, '<', $path or die "open $path: $!"; - while (<$fh>) { - next unless /\s*(?:\$${mod}::|\$)VERSION\s*=\s*(.+)/; - my $ver = eval $1; + my $m = ($mod + ? qr/(?:\$${mod}::VERSION|\$VERSION)/ + : qr/\$VERSION/); + + while (my $ln = <$fh>) { + next unless $ln =~ /\s*$m\s*=\s*.+/; + chomp $ln; + my $ver = do { no strict; eval $ln }; return $ver unless $@; - warn qq{$path:$. bad version string "$ver"\n}; + die qq{$path:$. bad version string in "$ln"\n}; } close $fh; return undef; } + #----------------------------------------------------------------------------- package Dists; @@ -143,7 +155,7 @@ use File::stat; sub cpan_provider { my ($module) = @_; - my $url = "http://cpanmetadb.appspot.com/v1.0/package/$module"; + my $url = "http://cpanmetadb.plackperl.org/v1.0/package/$module"; my $http = HTTP::Tiny->new; my $resp = $http->get($url); return undef unless $resp->{'success'}; @@ -169,6 +181,7 @@ sub find my @modfiles; my $finder = sub { return unless /[.]pm\z/; + return if m{\Q$libdir\E[^/]+/t/}; # ignore testing modules push @modfiles, $_; }; findfile({ 'no_chdir' => 1, 'wanted' => $finder }, $libdir); @@ -194,7 +207,7 @@ sub find $mod =~ s{\A$libdir}{}; $mod =~ s{/}{::}g; - my $ver = Common::evalver($path) || q{}; + my $ver = Common::evalver($path, $mod) || q{}; push @mods, [ $mod, $ver ]; } diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 867a40695..84dc54e39 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 159168 2012-05-17 06:43:10Z giovanni $ +# $Id: PKGBUILD 160642 2012-06-02 23:03:27Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10788 +pkgver=10790 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('a8b68be7382f64ffe32314935461cd78') +md5sums=('a76b0536f0b13fa278bd65287c443ad0') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD index e970bb1c6..17cae72ed 100644 --- a/extra/cairo-perl/PKGBUILD +++ b/extra/cairo-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158976 2012-05-13 21:18:20Z jgc $ +# $Id: PKGBUILD 160461 2012-06-02 10:25:40Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cairo-perl pkgver=1.082 -pkgrel=1 +pkgrel=2 pkgdesc="Perl wrappers for cairo" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD index 37e44a542..203d1ff67 100644 --- a/extra/claws-mail-extra-plugins/PKGBUILD +++ b/extra/claws-mail-extra-plugins/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 146705 2012-01-16 19:49:15Z dreisner $ +# $Id: PKGBUILD 160463 2012-06-02 10:25:44Z bluewind $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Mildred <mildred593 at online dot fr> pkgname=claws-mail-extra-plugins pkgver=3.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="Extra plugins for claws-mail" url="http://www.claws-mail.org/plugins.php?branch=EXT" license=('GPL3') arch=('i686' 'x86_64') depends=('claws-mail>=3.8.0') -makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7' +makedepends=('make' 'bc' 'perl>=5.16.0' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7' 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1' 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata') optdepends=('libgtkhtml: for gtkhtml2_viewer plugin' diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index 8729d1374..27625f16c 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 156724 2012-04-23 09:04:05Z ibiru $ +# $Id: PKGBUILD 160595 2012-06-02 19:09:24Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=clutter-gst -pkgver=1.5.4 +pkgver=1.5.6 pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('clutter' 'gstreamer0.10-base' 'libxdamage') makedepends=('gobject-introspection') options=('!libtool') source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a137313ad134cd3737c018cc8f725ed1a4d1cf7d276012d75467b55f1f9859d7') +sha256sums=('f12b59d5a548abe38c63750ae2e6cb909afd90cfdcc06d2c4288097f962b08bc') build() { cd "$pkgname-$pkgver" diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 61d4f636b..bb1ccaa68 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158081 2012-05-02 16:38:42Z ibiru $ +# $Id: PKGBUILD 160599 2012-06-02 20:26:43Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter -pkgver=1.10.4 +pkgver=1.10.6 pkgrel=1 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ license=('LGPL') depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi') makedepends=('gobject-introspection' 'mesa') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2f2f03c3f385db402898d2607e72d5ad9be2d14402a900c446273e5ae8be250a') +sha256sums=('1599432d5ea79b0260cdea72803784d3b94ee14de2722ad29eefbe75975630f2') build() { cd "$pkgname-$pkgver" diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 50bb1b6b2..531b66b53 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157728 2012-04-29 04:45:00Z allan $ +# $Id: PKGBUILD 160605 2012-06-02 20:59:03Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord -pkgver=0.1.19 -pkgrel=2 +pkgver=0.1.21 +pkgrel=1 pkgdesc="Color daemon" arch=('i686' 'x86_64') url="http://www.freedesktop.org/software/colord" @@ -13,7 +13,7 @@ depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite' 'ude makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') source=($url/releases/$pkgname-$pkgver.tar.xz) options=('!libtool') -sha1sums=('d133c6320fcdd069be86f4a7afa723f48f99acb3') +sha1sums=('dbf981beec70e81c45cf46b150f426fc1eb56c24') build() { cd "$pkgname-$pkgver" diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD index 4a657bb99..2b8825e04 100644 --- a/extra/eog-plugins/PKGBUILD +++ b/extra/eog-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 157387 2012-04-28 09:26:19Z allan $ +# $Id: PKGBUILD 160597 2012-06-02 20:11:49Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=eog-plugins -pkgver=3.4.0 -pkgrel=2 +pkgver=3.4.1 +pkgrel=1 pkgdesc="Plugins for Eye of Gnome" arch=('i686' 'x86_64') url="http://www.gnome.org/" @@ -14,7 +14,7 @@ install=eog-plugins.install options=('!libtool') groups=(gnome-extra) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('21a63f8f6e3a5b30f2f05133edc46becd4c83343c0f462a345204326071bc139') +sha256sums=('e1f7c4a0a9cc825d1ac8a64cc3d8db4da3054d294e4cd60b28eba13643d71055') build() { cd $pkgname-$pkgver diff --git a/extra/frozen-bubble/PKGBUILD b/extra/frozen-bubble/PKGBUILD index fb21cbd21..c003f806c 100644 --- a/extra/frozen-bubble/PKGBUILD +++ b/extra/frozen-bubble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127529 2011-06-15 21:23:24Z remy $ +# $Id: PKGBUILD 160465 2012-06-02 10:25:48Z bluewind $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Brandon Niemczyk <maccorin@cfl.rr.com> @@ -6,7 +6,7 @@ pkgname=frozen-bubble _pkgver=2.2.1-beta1 pkgver=${_pkgver/-/} -pkgrel=3 +pkgrel=4 pkgdesc="A game in which you throw colorful bubbles and build groups to destroy the bubbles" arch=(i686 x86_64) url="http://www.frozen-bubble.org" diff --git a/extra/fsarchiver/PKGBUILD b/extra/fsarchiver/PKGBUILD index b2b810b46..37c9af86b 100644 --- a/extra/fsarchiver/PKGBUILD +++ b/extra/fsarchiver/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 153566 2012-03-16 02:52:32Z eric $ +# $Id: PKGBUILD 160593 2012-06-02 18:42:56Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=fsarchiver -pkgver=0.6.13 +pkgver=0.6.15 pkgrel=1 pkgdesc="A safe and flexible file-system backup and deployment tool" arch=('i686' 'x86_64') url="http://www.fsarchiver.org/" -license=('GPL') +license=('GPL2') depends=('bzip2' 'e2fsprogs' 'lzo2' 'xz' 'libgcrypt') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('49e974cbb18332bb67e6089d942eac66') +sha1sums=('f55a9022ab692c394b366161c52db0700956e0b2') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr make } diff --git a/extra/gconf-perl/PKGBUILD b/extra/gconf-perl/PKGBUILD index 6a6c96175..35f4f4d06 100644 --- a/extra/gconf-perl/PKGBUILD +++ b/extra/gconf-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143700 2011-11-28 13:20:17Z jgc $ +# $Id: PKGBUILD 160467 2012-06-02 10:25:52Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gconf-perl pkgver=1.044 -pkgrel=6 +pkgrel=7 pkgdesc="Gnome2-GConf perl bindings for gconf" arch=('i686' 'x86_64') license=('LGPL') diff --git a/extra/glade-perl/PKGBUILD b/extra/glade-perl/PKGBUILD index 0e2b13098..cac93c7ca 100644 --- a/extra/glade-perl/PKGBUILD +++ b/extra/glade-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148742 2012-02-05 11:48:53Z ibiru $ +# $Id: PKGBUILD 160469 2012-06-02 10:25:54Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glade-perl _realname=Gtk2-GladeXML pkgver=1.007 -pkgrel=5 +pkgrel=6 pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD index c94632d8a..0f92ef23f 100644 --- a/extra/glib-perl/PKGBUILD +++ b/extra/glib-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159216 2012-05-18 10:00:28Z jgc $ +# $Id: PKGBUILD 160471 2012-06-02 10:25:59Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=glib-perl -pkgver=1.242 +pkgver=1.260 pkgrel=1 pkgdesc="Perl wrappers for glib 2.x, including GObject" arch=(i686 x86_64) @@ -13,7 +13,7 @@ options=('!emptydirs') depends=('glib2>=2.24.1' 'perl>=5.14') makedepends=('perl-extutils-depends>=0.302' 'perl-extutils-pkgconfig>=1.12') source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz) -md5sums=('59c176888e8ef8139c4e1b8c2d45f1d0') +md5sums=('faa052bdf6e9b87ea30b630c2806e71e') build() { cd "${srcdir}/Glib-${pkgver}" diff --git a/extra/gnome-perl/PKGBUILD b/extra/gnome-perl/PKGBUILD index 9936311d7..d790dc760 100644 --- a/extra/gnome-perl/PKGBUILD +++ b/extra/gnome-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148752 2012-02-05 11:49:12Z ibiru $ +# $Id: PKGBUILD 160473 2012-06-02 10:26:01Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-perl _realname=Gnome2 pkgver=1.042 -pkgrel=7 +pkgrel=8 pkgdesc="Perl bindings for libgnome" arch=('i686' 'x86_64') license=('LGPL') diff --git a/extra/gnome-vfs-perl/PKGBUILD b/extra/gnome-vfs-perl/PKGBUILD index 3960f5285..6c766e895 100644 --- a/extra/gnome-vfs-perl/PKGBUILD +++ b/extra/gnome-vfs-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 125162 2011-05-25 19:05:23Z foutrelis $ +# $Id: PKGBUILD 160475 2012-06-02 10:26:04Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-vfs-perl _realname=Gnome2-VFS pkgver=1.081 -pkgrel=4 +pkgrel=5 pkgdesc="Gnome2-VFS perl bindings for gnome-vfs" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/gnomecanvas-perl/PKGBUILD b/extra/gnomecanvas-perl/PKGBUILD index 81dc19907..c869a2752 100644 --- a/extra/gnomecanvas-perl/PKGBUILD +++ b/extra/gnomecanvas-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148746 2012-02-05 11:49:02Z ibiru $ +# $Id: PKGBUILD 160477 2012-06-02 10:26:08Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnomecanvas-perl _realname=Gnome2-Canvas pkgver=1.002 -pkgrel=9 +pkgrel=10 pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas" arch=('i686' 'x86_64') license=('LGPL') diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index 51531a917..7b72f42ab 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139544 2011-10-03 12:22:49Z jgc $ +# $Id: PKGBUILD 160479 2012-06-02 10:26:10Z bluewind $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric pkgver=1.10.17 -pkgrel=1 +pkgrel=2 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64') url="http://www.gnome.org/projects/gnumeric/" @@ -21,6 +21,9 @@ sha256sums=('8f105a10dc0dd47e14df2879591d2f28482fd03809fa95977dd4d1470a02f963') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # Remove invalid mime type. (FS#26338) + sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-schemas-install --enable-ssindex make diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD index dd4aeffea..31ab66def 100644 --- a/extra/graphicsmagick/PKGBUILD +++ b/extra/graphicsmagick/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157625 2012-04-29 02:08:46Z bisson $ +# $Id: PKGBUILD 160481 2012-06-02 10:26:14Z bluewind $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgname=graphicsmagick pkgver=1.3.15 -pkgrel=1 +pkgrel=2 pkgdesc='Image processing system' url='http://www.graphicsmagick.org/' arch=('i686' 'x86_64') @@ -21,6 +21,11 @@ sha1sums=('d5df4000d5531fad3ede9e008f9c8dc2d085d546') build() { cd "${srcdir}/GraphicsMagick-${pkgver}" + # fix typemap bug + # https://rt.cpan.org/Public/Bug/Display.html?id=70150 + # http://trac.imagemagick.org/browser/ImageMagick/branches/ImageMagick-6.7.7/PerlMagick/typemap + echo 'Graphics::Magick T_PTROBJ' > typemap + ./configure \ --prefix=/usr \ --with-perl \ diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index f0640f068..066b71862 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 158786 2012-05-09 18:48:24Z pierre $ +# $Id: PKGBUILD 160483 2012-06-02 10:26:16Z bluewind $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.28.0 -pkgrel=9 +pkgrel=10 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') diff --git a/extra/gtk2-perl/PKGBUILD b/extra/gtk2-perl/PKGBUILD index 84a7b8efe..9a87154b0 100644 --- a/extra/gtk2-perl/PKGBUILD +++ b/extra/gtk2-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143696 2011-11-28 13:05:23Z jgc $ +# $Id: PKGBUILD 160485 2012-06-02 10:26:22Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=gtk2-perl -pkgver=1.241 +pkgver=1.244 pkgrel=1 pkgdesc="Perl bindings for GTK+ 2.x" arch=(i686 x86_64) @@ -14,7 +14,7 @@ depends=('gtk2' 'pango-perl') checkdepends=('ttf-dejavu' 'xorg-server-xvfb') options=('!emptydirs') source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-${pkgver}.tar.gz) -md5sums=('82ee2af46ef9ab7b560601e3ae6f8f7a') +md5sums=('191fda807f44a7c82d699838bf544bca') build() { cd "${srcdir}/Gtk2-${pkgver}" diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index b7ad89181..870220505 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158012 2012-05-01 01:56:10Z eric $ +# $Id: PKGBUILD 160487 2012-06-02 10:26:25Z bluewind $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.6.8 +pkgver=6.7.7.5 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('eaf5a7f2316f8be3db9c2a37d2bb1056e9a0e03c' +sha1sums=('44b307c97c9bc27f60963306c82e2de5e37dcfb5' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/iptraf-ng/PKGBUILD b/extra/iptraf-ng/PKGBUILD index 3d0dfddf0..86075450f 100644 --- a/extra/iptraf-ng/PKGBUILD +++ b/extra/iptraf-ng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153597 2012-03-16 13:00:51Z ibiru $ +# $Id: PKGBUILD 160611 2012-06-02 21:10:00Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: sh0 <mee@sh0.org> pkgname=iptraf-ng -pkgver=1.1.1 -pkgrel=2 +pkgver=1.1.3.1 +pkgrel=1 pkgdesc="A console-based network monitoring utility (a fork of original iptraf)" url="https://fedorahosted.org/iptraf-ng/" arch=('i686' 'x86_64') @@ -13,18 +13,16 @@ license=('GPL2') replaces=('iptraf') options=('!libtool') source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('a48c30c186aafc1e8921b611236b732b') +md5sums=('1a2c02944b0b012d6a3de96207610fa2') build() { - cd "$srcdir/$pkgname-$pkgver" - sed s/ncurses5-config/ncursesw5-config/ -i configure.ac - autoreconf -fi + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var - make CFLAGS="$CFLAGS" + --localstatedir=/var --sbindir=/usr/sbin + make CFLAGS="$CFLAGS -std=gnu99" } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR=$pkgdir install } diff --git a/extra/irssi/PKGBUILD b/extra/irssi/PKGBUILD index bba878633..676ab070d 100644 --- a/extra/irssi/PKGBUILD +++ b/extra/irssi/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 125226 2011-05-25 19:11:10Z foutrelis $ +# $Id: PKGBUILD 160489 2012-06-02 10:26:29Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dan McGee <dan@archlinux.org> pkgname=irssi pkgver=0.8.15 -pkgrel=5 +pkgrel=6 pkgdesc="Modular text mode IRC client with Perl scripting" arch=('i686' 'x86_64') url="http://irssi.org/" license=('GPL') -depends=('glib2' 'openssl' 'perl') +depends=('glib2' 'openssl') optdepends=('perl-libwww: for the scriptassist script') -backup=(etc/irssi.conf) -source=(http://irssi.org/files/${pkgname}-${pkgver}.tar.bz2) +backup=('etc/irssi.conf') +source=("http://irssi.org/files/${pkgname}-${pkgver}.tar.bz2") options=('!libtool') md5sums=('1dcb3f511b88df94b0c996f36668c7da') @@ -24,6 +24,11 @@ build() { --with-proxy \ --sysconfdir=/etc \ --with-perl-lib=vendor - make + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index b6577ff1d..8d4259c1a 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152428 2012-03-06 20:36:57Z andyrtr $ +# $Id: PKGBUILD 160627 2012-06-02 21:15:26Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Guillaume ALAUX <guillaume@archlinux.org> @@ -7,34 +7,37 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7 pkgbase=java7-openjdk _java_ver=7 -_openjdk_build=b147 +_updatever=u4 +_openjdk_build=b21 _openjdk_date=27_jun_2011 -_icedtea_ver=2.1 +_icedtea_ver=2.2 _date=20110922 # check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=5617f6c5cc94 -_HOTSPOT_CHANGESET=0e651e004747 -_JAXP_CHANGESET=1cf75c0e2c96 -_JAXWS_CHANGESET=7edfbfe974f2 -_JDK_CHANGESET=50f6f276a06c -_LANGTOOLS_CHANGESET=b534c4c6cd9b -_OPENJDK_CHANGESET=22cc03983e20 +_CORBA_CHANGESET=3231f3e9c517 +_HOTSPOT_CHANGESET=bfe5efd70bce +_JAXP_CHANGESET=0036fe6fe7dc +_JAXWS_CHANGESET=abfb890c262a +_JDK_CHANGESET=839d0155f7cc +_LANGTOOLS_CHANGESET=f855bdb37537 +_OPENJDK_CHANGESET=49a6fc8f712f _bootstrap=0 # 0/1 for quick build or full bootstrap -pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver} -pkgrel=3 +pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') options=('!emptydirs') makedepends=('jdk7-openjdk' 'libxp' 'libxslt' 'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2' - 'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # 'inetutils' 'grep') # fastjar`? + 'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # 'inetutils' 'grep') # fastjar`? [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj') -_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1 +#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip + +_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2 source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz{,.sig} ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz @@ -51,26 +54,24 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('8492920dccae8b76bcb41f91f8d98b2dc619380531a679f1f9ea4e166ad02ec6' - '8d127e8397a0af3ffd8d1d96102a053d065d5507946f5c7118c0427668ac4227' - 'ada790b4754f521ebfad0dd909ea29b92b2b3c1b84b2e99d32673343727d95d7' - '963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3' - '8ce48c704f38285207ee6dc56c45b2d214083b4d4d36be02901401b594ce701e' - '823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa' - '5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d' - 'c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c' - 'd68455e5cdb14280cd61155a4e9d531e90b073607f4367e93ead0fcf34476ae1' +sha256sums=('98bc5a0d789a686cb7a1209a8945c314e801a931b2b6004a33dfe692e93626d5' + '9a5e9342111263f76aae4b86ac38e912b60cd81fb49943c3868c8f63e2e21130' + '26b9a5b546dfa66ae070ed7863a6580e054d7c5691472273540009cf3f172b54' + '9e26ea18aff308f636199e9cd822a1af078570221e8b76bbce1dea90d8ac6274' + '245b30d3ac0fe45aa4c2a3d451029107b16fd0b74830d432b45448676aa86ee2' + 'e800972666fadd0235d9a4d30df7778ec502a4761dc33467e9c80fffc6289c8a' + '19dbbf2e370ee89703305c561b3fdd174e949b041484ab515138b72d16fbd7e7' + 'd46ab00352ee74b9d18e5daf38a10f6a31288e38583675c2b2eb58a16e154d19' + '86d2f78025d5781222bcab985b93c97af7a114bdf7ac03b2a7abf7e0fce8a514' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' - '6384026ee4854a4ebcd5203845f0a56126aaf34517e99cfbc16c3ea353c55fe5' - '9b3aa677773356d8b67300f99ad21118426e83f092392096726fcf123173008c' - '14cf334b7e79e0086b446ba1b172b7cc4ad09668f52c9b12077020a3ded3c3e7' + '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' + 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' + 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410' '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' 'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a' '84d3b91cc57c67b2cf2ddb7fe5abcf1e88b5a151565aaecf4b595c7ce8f3fee9') -#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip - noextract=("${_OPENJDK_CHANGESET}.tar.gz" "${_CORBA_CHANGESET}.tar.gz" "${_JAXP_CHANGESET}.tar.gz" @@ -126,10 +127,9 @@ build() { --with-rhino \ --with-abs-install-dir=${_jvmdir} #--help + #--enable-systemtap Enable inclusion of SystemTap trace support - needs systemtab from AUR -# --enable-systemtap Enable inclusion of SystemTap trace support - needs systemtab from AUR + --with-abs-install-dir=/usr/lib/jvm/java-7-openjdk The absolute path where the j2sdk-image dir will be installed - - make + make } check() { @@ -140,7 +140,7 @@ check() { package_jre7-openjdk-headless() { pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Minimal Java runtime - needed for executing non GUI Java programs" depends=('libjpeg-turbo' 'lcms2' 'nss' - 'ca-certificates-java' 'rhino') + 'ca-certificates-java' 'java-rhino') optdepends=('libcups: needed for Java Mauve support - libmawt.so' 'fontconfig: needed for Java Mauve support - libmawt.so') provides=('java-runtime-headless=7') @@ -291,7 +291,7 @@ package_jre7-openjdk() { # Install desktop files. install -m755 -d ${pkgdir}/usr/share/applications - install -m644 ${srcdir}/icedtea-${_icedtea_ver}/{jconsole,policytool}.desktop ${pkgdir}/usr/share/applications + install -m644 ${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop ${pkgdir}/usr/share/applications } package_jdk7-openjdk() { @@ -332,6 +332,10 @@ package_jdk7-openjdk() { done popd + # Install desktop files. + install -m755 -d ${pkgdir}/usr/share/applications + install -m644 ${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop ${pkgdir}/usr/share/applications + # Handling 'java-rmi.cgi' separately install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi diff --git a/extra/java7-openjdk/fix_corba_cmds_path.diff b/extra/java7-openjdk/fix_corba_cmds_path.diff index 842657880..7a3db9567 100644 --- a/extra/java7-openjdk/fix_corba_cmds_path.diff +++ b/extra/java7-openjdk/fix_corba_cmds_path.diff @@ -1,6 +1,6 @@ --- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300 +++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300 -@@ -86,10 +86,10 @@ +@@ -76,7 +76,7 @@ CHMOD = $(UTILS_COMMAND_PATH)chmod CMP = $(UTILS_USR_BIN_PATH)cmp COMM = $(UTILS_USR_BIN_PATH)comm @@ -8,21 +8,17 @@ +COMPRESS = $(UTILS_COMMAND_PATH)compress CP = $(UTILS_COMMAND_PATH)cp CPIO = $(UTILS_COMMAND_PATH)cpio --CUT = $(UTILS_USR_BIN_PATH)cut -+CUT = $(UTILS_COMMAND_PATH)cut - DATE = $(UTILS_COMMAND_PATH)date - DF = $(UTILS_COMMAND_PATH)df - DIFF = $(UTILS_USR_BIN_PATH)diff -@@ -136,7 +136,7 @@ + CUT = $(UTILS_USR_BIN_PATH)cut +@@ -125,7 +125,7 @@ + TAIL = $(UTILS_USR_BIN_PATH)tail TAR = $(UTILS_COMMAND_PATH)tar TEST = $(UTILS_USR_BIN_PATH)test - TOUCH = $(UTILS_COMMAND_PATH)touch --TR = $(UTILS_USR_BIN_PATH)tr -+TR = $(UTILS_COMMAND_PATH)tr +-TOUCH = $(UTILS_COMMAND_PATH)touch ++TOUCH = $(UTILS_USR_BIN_PATH)touch + TR = $(UTILS_USR_BIN_PATH)tr TRUE = $(UTILS_COMMAND_PATH)true UNAME = $(UTILS_COMMAND_PATH)uname - UNIQ = $(UTILS_USR_BIN_PATH)uniq -@@ -186,7 +186,7 @@ +@@ -176,7 +176,7 @@ # others have it in /usr/bin. SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ $(wildcard $(UTILS_USR_BIN_PATH)sort)) diff --git a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff index ee434246a..6cac91dd6 100644 --- a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff +++ b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff @@ -1,6 +1,6 @@ --- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2011-08-06 15:46:01.000000000 +0200 +++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-08-06 15:59:26.000000000 +0200 -@@ -91,10 +91,10 @@ +@@ -91,7 +91,7 @@ CHMOD = $(UTILS_COMMAND_PATH)chmod CMP = $(UTILS_USR_BIN_PATH)cmp COMM = $(UTILS_USR_BIN_PATH)comm @@ -8,34 +8,8 @@ +COMPRESS = $(UTILS_COMMAND_PATH)compress CP = $(UTILS_COMMAND_PATH)cp CPIO = $(UTILS_COMMAND_PATH)cpio --CUT = $(UTILS_USR_BIN_PATH)cut -+CUT = $(UTILS_COMMAND_PATH)cut - DATE = $(UTILS_COMMAND_PATH)date - DF = $(UTILS_COMMAND_PATH)df - DIFF = $(UTILS_USR_BIN_PATH)diff -@@ -141,7 +141,7 @@ - TAR = $(UTILS_COMMAND_PATH)tar - TEST = $(UTILS_USR_BIN_PATH)test - TOUCH = $(UTILS_COMMAND_PATH)touch --TR = $(UTILS_USR_BIN_PATH)tr -+TR = $(UTILS_COMMAND_PATH)tr - TRUE = $(UTILS_COMMAND_PATH)true - UNAME = $(UTILS_COMMAND_PATH)uname - UNIQ = $(UTILS_USR_BIN_PATH)uniq ---- openjdk/jdk/make/common/shared/Defs-utils.gmk 2012-02-15 14:16:25.000000000 +0100 -+++ openjdk/jdk/make/common/shared//Defs-utils.gmk.new 2012-02-15 15:06:26.400107173 +0100 -@@ -107,7 +107,7 @@ - FIND = $(UTILS_USR_BIN_PATH)find - FMT = $(UTILS_COMMAND_PATH)fmt - GDB = $(UTILS_USR_BIN_PATH)gdb --GREP = $(UTILS_COMMAND_PATH)grep -+GREP = $(UTILS_USR_BIN_PATH)grep - GUNZIP = $(UTILS_COMMAND_PATH)gunzip - # GZIP is used for solaris. Linux and windows use tar czf - GZIP = $(UTILS_COMMAND_PATH)gzip ---- openjdk/jdk/make/common/shared/Defs-utils.gmk 2012-02-15 15:11:27.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Defs-utils.gmk.new 2012-02-15 15:14:09.504446263 +0100 -@@ -101,7 +101,7 @@ + CUT = $(UTILS_USR_BIN_PATH)cut +@@ -101,13 +101,13 @@ DIRNAME = $(UTILS_USR_BIN_PATH)dirname DUMP = $(UTILS_CCS_BIN_PATH)dump ECHO = $(UTILS_COMMAND_PATH)echo @@ -44,3 +18,19 @@ EXPR = $(UTILS_USR_BIN_PATH)expr FILE = $(UTILS_USR_BIN_PATH)file FIND = $(UTILS_USR_BIN_PATH)find + FMT = $(UTILS_COMMAND_PATH)fmt + GDB = $(UTILS_USR_BIN_PATH)gdb +-GREP = $(UTILS_COMMAND_PATH)grep ++GREP = $(UTILS_USR_BIN_PATH)grep + GUNZIP = $(UTILS_COMMAND_PATH)gunzip + # GZIP is used for solaris. Linux and windows use tar czf + GZIP = $(UTILS_COMMAND_PATH)gzip +@@ -140,7 +140,7 @@ + TAIL = $(UTILS_USR_BIN_PATH)tail + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test +-TOUCH = $(UTILS_COMMAND_PATH)touch ++TOUCH = $(UTILS_USR_BIN_PATH)touch + TR = $(UTILS_USR_BIN_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname diff --git a/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff b/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff index ba1a588e1..22d54fc42 100644 --- a/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff +++ b/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff @@ -1,25 +1,25 @@ --- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2011-08-07 18:45:05.000000000 +0200 +++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-08-07 18:45:54.000000000 +0200 -@@ -102,7 +102,8 @@ - METACITY_WM = 11, +@@ -103,7 +103,8 @@ COMPIZ_WM = 12, LG3D_WM = 13, -- MUTTER_WM = 14; -+ MUTTER_WM = 14, -+ OTHER_NONREPARENTING_WM = 15; + CWM_WM = 14, +- MUTTER_WM = 15; ++ MUTTER_WM = 15, ++ OTHER_NONREPARENTING_WM = 16; public String toString() { switch (WMID) { case NO_WM: -@@ -576,7 +577,7 @@ +@@ -583,7 +584,7 @@ // TODO: according to wikipedia, compiz is now reparenting. This should // probably be updated. static boolean isNonReparentingWM() { -- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM); -+ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); +- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM); ++ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); } /* -@@ -762,9 +763,17 @@ +@@ -771,9 +772,17 @@ * supports WIN or _NET wm spec. */ else if (l_net_protocol.active()) { @@ -28,18 +28,18 @@ + awt_wmgr = XWM.OTHER_NONREPARENTING_WM; + } else { + awt_wmgr = XWM.OTHER_WM; -+ } ++ } } else if (win.active()) { - awt_wmgr = XWM.OTHER_WM; + if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { + awt_wmgr = XWM.OTHER_NONREPARENTING_WM; + } else { + awt_wmgr = XWM.OTHER_WM; -+ } ++ } } /* * Check for legacy WMs. -@@ -775,6 +784,8 @@ +@@ -784,6 +793,8 @@ awt_wmgr = XWM.MOTIF_WM; } else if (isOpenLook()) { awt_wmgr = XWM.OPENLOOK_WM; @@ -48,7 +48,7 @@ } else { awt_wmgr = XWM.OTHER_WM; } -@@ -1289,6 +1300,7 @@ +@@ -1298,6 +1309,7 @@ res = new Insets(28, 6, 6, 6); break; case NO_WM: diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index fb96c81b4..107ce1c95 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158417 2012-05-03 22:32:11Z andrea $ +# $Id: PKGBUILD 160491 2012-06-02 10:26:33Z bluewind $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde pkgver=4.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for the KDE libraries" url="http://kde.org/" arch=('i686' 'x86_64') diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index d65f19fe8..6750e259b 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158367 2012-05-03 22:30:39Z andrea $ +# $Id: PKGBUILD 160493 2012-06-02 10:26:36Z bluewind $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt pkgver=4.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for the Qt libraries" url="http://kde.org/" arch=('i686' 'x86_64') diff --git a/extra/libproxy/PKGBUILD b/extra/libproxy/PKGBUILD index 5b1367bd5..ca6d9e2d0 100644 --- a/extra/libproxy/PKGBUILD +++ b/extra/libproxy/PKGBUILD @@ -3,7 +3,7 @@ pkgname=libproxy pkgver=0.4.7 -pkgrel=1 +pkgrel=2 pkgdesc="A library that provides automatic proxy configuration management" arch=(i686 x86_64) license=('LGPL') @@ -14,12 +14,19 @@ optdepends=('kdelibs: KDE configuration module' 'python2: Python bindings') makedepends=('cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl') url="http://libproxy.googlecode.com" -source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz + libproxy-0.4.7-unistd.patch) options=('!libtool') -md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5') +md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5' + 'e90c03f296e553ace347b46f4fea3625') build() { cd "${srcdir}" + + # Fix build with GCC 4.7 (patch from Fedora) + patch -d "${pkgname}-${pkgver}" -Np1 -i \ + "${srcdir}/libproxy-0.4.7-unistd.patch" + mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/libproxy/libproxy-0.4.7-unistd.patch b/extra/libproxy/libproxy-0.4.7-unistd.patch new file mode 100644 index 000000000..803f81970 --- /dev/null +++ b/extra/libproxy/libproxy-0.4.7-unistd.patch @@ -0,0 +1,40 @@ +--- libproxy-0.4.7/libproxy/url.cpp.orig 2012-02-28 21:05:15.572948027 +0000 ++++ libproxy-0.4.7/libproxy/url.cpp 2012-02-28 21:05:45.635937474 +0000 +@@ -27,6 +27,7 @@ + #define close _close + #endif + #include <fcntl.h> // For ::open() ++#include <unistd.h> // For ::read() and ::close() + #include <cstring> // For memcpy() + #include <sstream> // For int/string conversion (using stringstream) + #include <cstdio> // For sscanf() +--- libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp.orig 2012-02-28 21:06:01.552943358 +0000 ++++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp 2012-02-28 21:11:21.429953982 +0000 +@@ -18,6 +18,7 @@ + ******************************************************************************/ + + #include <sys/stat.h> ++#include <unistd.h> + #include <cstdlib> + #include <map> + #include <fstream> +--- libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp.orig 2012-02-28 21:06:11.637943033 +0000 ++++ libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp 2012-02-28 21:11:46.560961409 +0000 +@@ -17,6 +17,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + ******************************************************************************/ + ++#include <unistd.h> // for ::gethostname() + #include <cstring> // ? + + #include "../extension_pacrunner.hpp" +--- libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp.orig 2012-02-28 21:06:29.615943614 +0000 ++++ libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp 2012-02-28 21:12:35.530965553 +0000 +@@ -17,6 +17,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + ******************************************************************************/ + ++#include <unistd.h> // for ::gethostname() + #include "../extension_pacrunner.hpp" + using namespace libproxy; + diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD index 2105c8623..dfee94203 100644 --- a/extra/libx11/PKGBUILD +++ b/extra/libx11/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 160023 2012-05-28 10:00:52Z andyrtr $ +# $Id: PKGBUILD 160633 2012-06-02 21:43:25Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.4.99.902 +pkgver=1.5.0 pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64) @@ -14,9 +14,9 @@ license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 xorg.sh xorg.csh) -sha1sums=('afe75b7c2c54e354f726fd36251bcfec1e1f833a' - '4b756387426afb2a5bb7a155631ec42348abf5c1' - '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8') +sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86' + '1a1b5db0320579958fba24774bae7984a1b1b8c647ac6fbd4d8937178c48ed46' + '96c85ccbdcb056540f2e2b6cf48dea067f80260c16957ee401c49cf94cea5894') build() { cd "${srcdir}/libX11-${pkgver}" diff --git a/extra/libx11/xorg.csh b/extra/libx11/xorg.csh index 26c49a222..39d5a9715 100644 --- a/extra/libx11/xorg.csh +++ b/extra/libx11/xorg.csh @@ -3,9 +3,9 @@ setenv XDG_CONFIG_HOME ${HOME}/.config setenv XDG_CACHE_HOME ${HOME}/.cache if (! ($?XDG_DATA_DIRS) ) then - setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/ + setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/ else - setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/:${XDG_DATA_DIRS} + setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/:${XDG_DATA_DIRS} endif if (! ($?XDG_CONFIG_DIRS) ) then diff --git a/extra/libx11/xorg.sh b/extra/libx11/xorg.sh index e1de6866c..4fc02e322 100644 --- a/extra/libx11/xorg.sh +++ b/extra/libx11/xorg.sh @@ -3,9 +3,9 @@ export XDG_CONFIG_HOME=$HOME/.config export XDG_CACHE_HOME=$HOME/.cache if [ -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=/usr/share/:/usr/local/share/ + export XDG_DATA_DIRS=/usr/local/share/:/usr/share/ else - export XDG_DATA_DIRS=/usr/share/:/usr/local/share/:$XDG_DATA_DIRS + export XDG_DATA_DIRS=/usr/local/share/:/usr/share/:$XDG_DATA_DIRS fi if [ -z $XDG_CONFIG_DIRS ]; then diff --git a/extra/libxaw/PKGBUILD b/extra/libxaw/PKGBUILD index 788b3871a..687aaea06 100644 --- a/extra/libxaw/PKGBUILD +++ b/extra/libxaw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154128 2012-03-23 17:09:26Z andyrtr $ +# $Id: PKGBUILD 160631 2012-06-02 21:31:52Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxaw -pkgver=1.0.10 +pkgver=1.0.11 pkgrel=1 pkgdesc="X11 Athena Widget library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('libxmu' 'libxpm') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXaw-${pkgver}.tar.bz2) -sha1sums=('8caa4c692e28f9681678a22168978b7668df57be') +sha256sums=('87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492') build() { cd "${srcdir}/libXaw-${pkgver}" diff --git a/extra/libxft/PKGBUILD b/extra/libxft/PKGBUILD index e15cb95bc..b38f5ee8a 100644 --- a/extra/libxft/PKGBUILD +++ b/extra/libxft/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153277 2012-03-12 20:25:11Z andyrtr $ +# $Id: PKGBUILD 160629 2012-06-02 21:27:53Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxft -pkgver=2.3.0 -pkgrel=2 +pkgver=2.3.1 +pkgrel=1 pkgdesc="FreeType-based font drawing library for X" arch=('i686' 'x86_64') license=('custom') @@ -11,15 +11,11 @@ url="http://xorg.freedesktop.org/" depends=('fontconfig' 'libxrender') makedepends=('pkgconfig') options=('!libtool') -source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2" - git_fixes.diff) -sha1sums=('687f38a810b9ae58e1169c295d9d438370235e23' - 'a87a56f62905bfcd85469caf349d07f37f84a989') +source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2") +sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd') build() { cd "${srcdir}/libXft-${pkgver}" - # fix broken bold fonts in urxvt terinals - https://bugs.freedesktop.org/show_bug.cgi?id=47178 + https://bugs.freedesktop.org/show_bug.cgi?id=47196 - patch -Np1 -i ${srcdir}/git_fixes.diff ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index df6b62d96..8e3616b81 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,35 +1,38 @@ -# $Id: PKGBUILD 149958 2012-02-11 23:31:05Z allan $ +# $Id: PKGBUILD 160457 2012-06-02 08:38:52Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd -pkgver=1.4.30 -pkgrel=3 -pkgdesc='a secure, fast, compliant and very flexible web-server' +pkgver=1.4.31 +pkgrel=1 +pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') url="http://www.lighttpd.net/" depends=('pcre' 'bzip2' 'libldap' 'util-linux') -makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig') +makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig') optdepends=('libxml2: mod_webdav' 'lua: mod_cml/mod_magnet' 'libmysqlclient: mod_mysql_vhost' - 'sqlite3: mod_webdav') + 'sqlite: mod_webdav') backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd') options=('!libtool' 'emptydirs') +install='lighttpd.install' source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz" "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc" - 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf') -sha256sums=('c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b' - '941ab747aeb97ca111fb670d21eefecdf745debc5e139bc5bd6881ee66b2742a' - 'ceff3a88e876f6104c094379d507b89bc504777d0f98a0930406a70624fcf024' - '550aa1abaced6bc9e8d65c2b069bfc96bf4d06734b17eeb140c5d00705de1230' - 'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa') + 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service') +sha256sums=('8a0a4f1ab782c2a3554e031c7d8ad600aac9b4c0466710a6cc9aab10659fe3f2' + '0ba44866f6ebdf6fefc8efba89240eacff075b5d1b80e0d7a9e0479491ff01a7' + '186f4bb2364f82d4076a2ba7d3e088ffb356550493d92dd9d5eb57cac2839c17' + '6df18675691384c48b9137c8f18ca238055001f1077baf05cb8322247b475a77' + 'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa' + 'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871' + '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 \ @@ -58,6 +61,8 @@ 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}/usr/lib/tmpfiles.d/lighttpd.conf + install -D -m644 ${srcdir}/lighttpd.service ${pkgdir}/usr/lib/systemd/system/lighttpd.service pushd doc/config >/dev/null find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \; diff --git a/extra/lighttpd/lighttpd.install b/extra/lighttpd/lighttpd.install new file mode 100644 index 000000000..6b471f633 --- /dev/null +++ b/extra/lighttpd/lighttpd.install @@ -0,0 +1,9 @@ +post_install() { + if [[ ! -d run/lighttpd ]]; then + usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/lighttpd.conf + fi +} + +post_upgrade() { + post_install +} diff --git a/extra/lighttpd/lighttpd.logrotate.d b/extra/lighttpd/lighttpd.logrotate.d index 5be47b863..76f98785c 100644 --- a/extra/lighttpd/lighttpd.logrotate.d +++ b/extra/lighttpd/lighttpd.logrotate.d @@ -4,6 +4,6 @@ notifempty sharedscripts postrotate - /etc/rc.d/lighttpd reload >/dev/null || true + /usr/bin/killall -HUP lighttpd-angel &>/dev/null || true endscript } diff --git a/extra/lighttpd/lighttpd.rc.d b/extra/lighttpd/lighttpd.rc.d index 88f0a1474..c2c41b818 100644 --- a/extra/lighttpd/lighttpd.rc.d +++ b/extra/lighttpd/lighttpd.rc.d @@ -4,7 +4,7 @@ . /etc/rc.d/functions -pid_file='/var/run/lighttpd/lighttpd-angel.pid' +pid_file='/run/lighttpd/lighttpd-angel.pid' get_pid() { if [ -r "${pid_file}" ]; then @@ -32,11 +32,6 @@ test_config() { stat_die fi - local piddir=$(dirname "${pid_file}") - if [ ! -d "${piddir}" ]; then - install -d -m755 -o http -g http "${piddir}" - fi - stat_done } diff --git a/extra/lighttpd/lighttpd.service b/extra/lighttpd/lighttpd.service new file mode 100644 index 000000000..b80db7695 --- /dev/null +++ b/extra/lighttpd/lighttpd.service @@ -0,0 +1,12 @@ +[Unit] +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 + +[Install] +WantedBy=multi-user.target diff --git a/extra/lighttpd/lighttpd.tmpfiles b/extra/lighttpd/lighttpd.tmpfiles new file mode 100644 index 000000000..e39cd425d --- /dev/null +++ b/extra/lighttpd/lighttpd.tmpfiles @@ -0,0 +1,2 @@ +d /run/lighttpd 755 http http - +d /var/cache/lighttpd 755 http http 10d diff --git a/extra/mod_perl/PKGBUILD b/extra/mod_perl/PKGBUILD index 0d257544b..f333c0aeb 100644 --- a/extra/mod_perl/PKGBUILD +++ b/extra/mod_perl/PKGBUILD @@ -1,29 +1,36 @@ -# $Id: PKGBUILD 131985 2011-07-18 18:21:39Z foutrelis $ -# Maintainer: Firmicus <francois.archlinux.org> +# $Id: PKGBUILD 160497 2012-06-02 10:26:43Z bluewind $ +# Maintainer: +# Contributor: Firmicus <francois.archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=mod_perl -pkgver=2.0.5 -pkgrel=8 +pkgver=2.0.6 +pkgrel=1 pkgdesc="Apache module that embeds the Perl interpreter within the server" -url="http://search.cpan.org/dist/${pkgname}/" -depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid') -license=('APACHE') arch=('i686' 'x86_64') -options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/${pkgname}-${pkgver}.tar.gz - nolfs.patch) -md5sums=('03d01d135a122bd8cebd0cd5b185d674' - '088e082afef57f92f234a01269e24ce5') +url="http://perl.apache.org/" +license=('APACHE') +depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid') +options=('!emptydirs') +source=(http://perl.apache.org/dist/$pkgname-$pkgver.tar.gz + mod_perl-2.0.6-nolfs.patch + mod_perl-2.0.6-perl-5.16-fixes.patch) +sha256sums=('8cf768d2c55291e10542ef8d9a4f4ebe835365e43b4584771e654079405827dc' + '5d1b6a051d847108b23b5dc06ea5885c37dd81d3a9156b69d179d95b5cf92f08' + 'c6cde22806b1b2d919545b21c49536c8c377c8d1f921e8948e1289bb2ab413d9') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" # Patch from openSUSE to fix segfaults on i686 (FS#25008): # avoid a conflict between apache's LARGEFILE64_SOURCE and perl's # FILE_OFFSET_BITS=64 because the conflict isn't real and causes the perl # structures to be invalid if only the apache flags are used - patch -Np1 -i "$srcdir/nolfs.patch" + patch -Np1 -i "$srcdir/mod_perl-2.0.6-nolfs.patch" + + # Fix build with Perl 5.16 + # http://search.cpan.org/dist/perl-5.16.0/pod/perldelta.pod#$%3C,_$%3E,_$%28_and_$%29_are_no_longer_cached + patch -Np1 -i "$srcdir/mod_perl-2.0.6-perl-5.16-fixes.patch" # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs @@ -31,6 +38,8 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make install DESTDIR=${pkgdir} + cd "$srcdir/$pkgname-$pkgver" + make install DESTDIR="$pkgdir" } + +# vim:set ts=2 sw=2 et: diff --git a/extra/mod_perl/mod_perl-2.0.6-nolfs.patch b/extra/mod_perl/mod_perl-2.0.6-nolfs.patch new file mode 100644 index 000000000..13e5cccee --- /dev/null +++ b/extra/mod_perl/mod_perl-2.0.6-nolfs.patch @@ -0,0 +1,13 @@ +diff -upr mod_perl-2.0.6.orig/lib/Apache2/Build.pm mod_perl-2.0.6/lib/Apache2/Build.pm +--- mod_perl-2.0.6.orig/lib/Apache2/Build.pm 2012-05-26 22:31:00.000000000 +0300 ++++ mod_perl-2.0.6/lib/Apache2/Build.pm 2012-05-26 22:31:32.000000000 +0300 +@@ -2207,7 +2207,8 @@ sub has_large_files_conflict { + # with it is that we didn't have such a case yet, but may need to + # deal with it later + +- return $perl_lfs64 ^ $apr_lfs64; ++ return 0; ++ # $perl_lfs64 ^ $apr_lfs64; + } + + # if perl is built with uselargefiles, but apr not, the build won't diff --git a/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch b/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch new file mode 100644 index 000000000..4e26fd87d --- /dev/null +++ b/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch @@ -0,0 +1,17 @@ +diff -upr mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c mod_perl-2.0.6/src/modules/perl/modperl_perl.c +--- mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c 2012-05-26 21:49:27.000000000 +0300 ++++ mod_perl-2.0.6/src/modules/perl/modperl_perl.c 2012-05-26 21:55:39.000000000 +0300 +@@ -102,13 +102,4 @@ static void modperl_perl_init_ids(pTHX_ + sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), ids->pid); + +-#ifndef WIN32 +- PL_uid = ids->uid; +- PL_euid = ids->euid; +- PL_gid = ids->gid; +- PL_egid = ids->egid; +-#endif +-#ifdef MP_MAINTAIN_PPID +- PL_ppid = ids->ppid; +-#endif + } + diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index 256f31f19..d70068fd4 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150902 2012-02-23 13:55:13Z allan $ +# $Id: PKGBUILD 160499 2012-06-02 10:26:47Z bluewind $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> pkgname=net-snmp pkgver=5.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('i686' 'x86_64') url="http://www.net-snmp.org/" diff --git a/extra/pango-perl/PKGBUILD b/extra/pango-perl/PKGBUILD index e0c903a57..a14a34f43 100644 --- a/extra/pango-perl/PKGBUILD +++ b/extra/pango-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143689 2011-11-28 12:08:52Z jgc $ +# $Id: PKGBUILD 160501 2012-06-02 10:26:50Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango-perl pkgver=1.223 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for Pango" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/perl-async-interrupt/PKGBUILD b/extra/perl-async-interrupt/PKGBUILD index 02bbe8fd5..904bdad48 100644 --- a/extra/perl-async-interrupt/PKGBUILD +++ b/extra/perl-async-interrupt/PKGBUILD @@ -1,10 +1,10 @@ # Packager: Justin Davis (juster) <jrcd83@gmail.com> -# $Id: PKGBUILD 159110 2012-05-15 18:35:31Z juster $ +# $Id: PKGBUILD 160503 2012-06-02 10:26:54Z bluewind $ pkgname=perl-async-interrupt _ver=1.1 pkgver=1.10 -pkgrel=1 +pkgrel=2 pkgdesc='allow C/XS libraries to interrupt perl asynchronously' arch=(i686 x86_64) license=(PerlArtistic GPL) diff --git a/extra/perl-bit-vector/PKGBUILD b/extra/perl-bit-vector/PKGBUILD index 57324f2c1..b27aa1b39 100644 --- a/extra/perl-bit-vector/PKGBUILD +++ b/extra/perl-bit-vector/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 154306 2012-03-26 01:44:26Z eric $ +# $Id: PKGBUILD 160505 2012-06-02 10:26:56Z bluewind $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: K. Piche <kpiche@rogers.com> pkgname=perl-bit-vector _cpanname=Bit-Vector pkgver=7.2 -pkgrel=1 +pkgrel=2 pkgdesc='Efficient bit vector, set of integers and "big int" math library' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_cpanname}/" -depends=('perl-carp-clan' 'perl>=5.10.0') +depends=('perl-carp-clan' 'perl') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz) md5sums=('bc6ae34738b8f889290bf50099ff8aed') @@ -30,8 +30,4 @@ check() { package() { cd "${srcdir}/${_cpanname}-$pkgver" make DESTDIR="${pkgdir}" install - - # remove perllocal.pod and .packlist - find "${pkgdir}" -name perllocal.pod -delete - find "${pkgdir}" -name .packlist -delete } diff --git a/extra/perl-compress-bzip2/PKGBUILD b/extra/perl-compress-bzip2/PKGBUILD index dc709e2b4..7f5e2bc99 100644 --- a/extra/perl-compress-bzip2/PKGBUILD +++ b/extra/perl-compress-bzip2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149423 2012-02-07 16:50:05Z heftig $ +# $Id: PKGBUILD 160507 2012-06-02 10:27:00Z bluewind $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=perl-compress-bzip2 _realname=Compress-Bzip2 pkgver=2.09 -pkgrel=4 +pkgrel=5 pkgdesc="Interface to Bzip2 compression library" arch=(i686 x86_64) license=(GPL2) diff --git a/extra/perl-crypt-openssl-bignum/PKGBUILD b/extra/perl-crypt-openssl-bignum/PKGBUILD index a97048a6a..e5f881bcc 100644 --- a/extra/perl-crypt-openssl-bignum/PKGBUILD +++ b/extra/perl-crypt-openssl-bignum/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-crypt-openssl-bignum pkgver=0.04 -pkgrel=6 +pkgrel=7 pkgdesc="OpenSSL's multiprecision integer arithmetic " arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum" diff --git a/extra/perl-crypt-openssl-random/PKGBUILD b/extra/perl-crypt-openssl-random/PKGBUILD index b193f95c2..24ebde127 100644 --- a/extra/perl-crypt-openssl-random/PKGBUILD +++ b/extra/perl-crypt-openssl-random/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-crypt-openssl-random pkgver=0.04 -pkgrel=6 +pkgrel=7 pkgdesc="Interface to OpenSSL PRNG methods" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Crypt-OpenSSL-Random" diff --git a/extra/perl-crypt-openssl-rsa/PKGBUILD b/extra/perl-crypt-openssl-rsa/PKGBUILD index 38a159e49..3a44bf936 100644 --- a/extra/perl-crypt-openssl-rsa/PKGBUILD +++ b/extra/perl-crypt-openssl-rsa/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-crypt-openssl-rsa pkgver=0.28 -pkgrel=2 +pkgrel=3 pkgdesc="Interface to OpenSSL RSA methods" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Crypt-OpenSSL-RSA" diff --git a/extra/perl-crypt-ssleay/PKGBUILD b/extra/perl-crypt-ssleay/PKGBUILD index 37f315f89..ccaab5ed3 100644 --- a/extra/perl-crypt-ssleay/PKGBUILD +++ b/extra/perl-crypt-ssleay/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 125246 2011-05-25 19:15:29Z foutrelis $ +# $Id: PKGBUILD 160515 2012-06-02 10:27:13Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-crypt-ssleay pkgver=0.58 -pkgrel=3 +pkgrel=4 pkgdesc="OpenSSL glue that provides LWP https support" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Crypt-SSLeay" diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD index 5127dcbf7..33f9e418a 100644 --- a/extra/perl-dbd-mysql/PKGBUILD +++ b/extra/perl-dbd-mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 146787 2012-01-18 02:09:02Z allan $ +# $Id: PKGBUILD 160517 2012-06-02 10:27:16Z bluewind $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=perl-dbd-mysql _realname=DBD-mysql pkgver=4.020 -pkgrel=2 +pkgrel=3 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') @@ -17,7 +17,7 @@ source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgv md5sums=('a2bf8808bbd45298e84dde06afbd58e9') build() { - cd ${srcdir}/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor --testsocket=/tmp/socket.mysql @@ -25,7 +25,7 @@ build() { } check() { - cd ${srcdir}/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" mkdir -p /tmp/mysql_test mysql_install_db \ --basedir=/usr \ @@ -40,10 +40,6 @@ check() { } package() { - cd ${srcdir}/${_realname}-${pkgver} - make install DESTDIR=${pkgdir} - - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" } diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD index dc0a5aaf7..3c156157d 100644 --- a/extra/perl-dbd-sqlite/PKGBUILD +++ b/extra/perl-dbd-sqlite/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 153674 2012-03-17 19:39:43Z eric $ +# $Id: PKGBUILD 160519 2012-06-02 10:27:20Z bluewind $ # Contributor: Tom Killian <tomk@runbox.com> # Contributor: francois at archlinux dot org pkgname=perl-dbd-sqlite _cpanname=DBD-SQLite pkgver=1.35 -pkgrel=1 +pkgrel=2 pkgdesc="Self-contained RDBMS in a DBI driver" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/${_cpanname}" license=('GPL' 'PerlArtistic') -depends=('perl-dbi>=1.61' 'sqlite3') +depends=('perl-dbi>=1.61' 'sqlite') options=('!emptydirs') source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz) md5sums=('d9752e4a26fa54e74aa893dafd02ceda') diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD index f52d506b3..73b4dff05 100644 --- a/extra/perl-dbi/PKGBUILD +++ b/extra/perl-dbi/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 153672 2012-03-17 19:13:48Z eric $ +# $Id: PKGBUILD 160521 2012-06-02 10:27:22Z bluewind $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Matt Thompson <mattt@defunct.ca> pkgname=perl-dbi _realname=DBI pkgver=1.618 -pkgrel=1 +pkgrel=2 pkgdesc="Database independent interface for Perl" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl>=5.12.1') +depends=('perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) md5sums=('5ad29b56f7457f22bd1ca1c871b30719') diff --git a/extra/perl-digest-nilsimsa/PKGBUILD b/extra/perl-digest-nilsimsa/PKGBUILD index 40e9ae353..d4878b1e8 100644 --- a/extra/perl-digest-nilsimsa/PKGBUILD +++ b/extra/perl-digest-nilsimsa/PKGBUILD @@ -1,35 +1,35 @@ -# $Id: PKGBUILD 125252 2011-05-25 19:16:38Z foutrelis $ +# $Id: PKGBUILD 160523 2012-06-02 10:27:26Z bluewind $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-digest-nilsimsa _realname=Digest-Nilsimsa pkgver=0.06 -pkgrel=7 -pkgdesc="Perl version of Nilsimsa code." +pkgrel=8 +pkgdesc="Perl version of Nilsimsa code" arch=('i686' 'x86_64') license=('LGPL') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl>=5.10.0') -options=(!emptydirs) -source=(http://www.cpan.org/authors/id/V/VI/VIPUL/${_realname}-${pkgver}.tar.gz) +depends=('perl') replaces=('digest-nilsimsa') provides=('digest-nilsimsa') +options=(!emptydirs) +source=(http://www.cpan.org/authors/id/V/VI/VIPUL/${_realname}-${pkgver}.tar.gz) md5sums=('08e940bd7f5d1167ef3fd1aa7ce234d7') build() { - cd ${srcdir}/${_realname}-${pkgver} - # install module in vendor directories. + cd "${srcdir}/${_realname}-${pkgver}" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" make test } package() { - cd ${srcdir}/${_realname}-${pkgver} - make install DESTDIR=${pkgdir} - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/perl-digest-sha1/PKGBUILD b/extra/perl-digest-sha1/PKGBUILD index eaae5e528..e35269169 100644 --- a/extra/perl-digest-sha1/PKGBUILD +++ b/extra/perl-digest-sha1/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 125255 2011-05-25 19:17:02Z foutrelis $ +# $Id: PKGBUILD 160525 2012-06-02 10:27:28Z bluewind $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-digest-sha1 _realname=Digest-SHA1 pkgver=2.13 -pkgrel=2 +pkgrel=3 pkgdesc="Perl interface to the SHA-1 Algorithm" arch=(i686 x86_64) license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl>=5.10.0') +depends=('perl') options=(!emptydirs) source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) replaces=('digest-sha1') @@ -18,21 +18,20 @@ provides=('digest-sha1') md5sums=('bd22388f268434f2b24f64e28bf1aa35') build() { - cd ${srcdir}/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" make test } package() { - cd ${srcdir}/${_realname}-${pkgver} - - make install DESTDIR=${pkgdir} - - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/perl-ev/PKGBUILD b/extra/perl-ev/PKGBUILD index 9065260a9..604dac065 100644 --- a/extra/perl-ev/PKGBUILD +++ b/extra/perl-ev/PKGBUILD @@ -1,9 +1,9 @@ # Packager: Justin Davis (juster) <jrcd83@gmail.com> -# $Id: PKGBUILD 159113 2012-05-15 18:43:42Z juster $ +# $Id: PKGBUILD 160527 2012-06-02 10:27:33Z bluewind $ pkgname=perl-ev pkgver=4.11 -pkgrel=1 +pkgrel=2 pkgdesc='perl interface to libev, a high performance full-featured event loop' arch=(i686 x86_64) license=(PerlArtistic GPL) diff --git a/extra/perl-event/PKGBUILD b/extra/perl-event/PKGBUILD index 47d2ee055..861a64527 100644 --- a/extra/perl-event/PKGBUILD +++ b/extra/perl-event/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140115 2011-10-07 08:31:40Z eric $ +# $Id: PKGBUILD 160529 2012-06-02 10:27:35Z bluewind $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: François Charette <francois.archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-event _srcname=Event pkgver=1.20 -pkgrel=1 +pkgrel=2 pkgdesc="Framework for GUI events" arch=('i686' 'x86_64') license=('PerlArtistic' 'GPL') @@ -31,10 +31,5 @@ check() { package() { cd "${srcdir}/${_srcname}-${pkgver}" - make install DESTDIR="${pkgdir}" - - # remove perllocal.pod and .packlist - find "${pkgdir}" -name perllocal.pod -delete - find "${pkgdir}" -name .packlist -delete } diff --git a/extra/perl-fcgi/PKGBUILD b/extra/perl-fcgi/PKGBUILD index 53fc43f5e..a03c4baf9 100644 --- a/extra/perl-fcgi/PKGBUILD +++ b/extra/perl-fcgi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143929 2011-11-30 21:23:50Z giovanni $ +# $Id: PKGBUILD 160531 2012-06-02 10:27:39Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-fcgi pkgver=0.74 -pkgrel=2 +pkgrel=3 pkgdesc="Fast CGI" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/FCGI" diff --git a/extra/perl-guard/PKGBUILD b/extra/perl-guard/PKGBUILD index e72b6e71e..d1d804f0a 100644 --- a/extra/perl-guard/PKGBUILD +++ b/extra/perl-guard/PKGBUILD @@ -1,9 +1,9 @@ # Packager: Justin Davis <jrcd83@gmail.com> -# $Id: PKGBUILD 146269 2012-01-07 18:44:39Z juster $ +# $Id: PKGBUILD 160533 2012-06-02 10:27:42Z bluewind $ pkgname=perl-guard pkgver=1.022 -pkgrel=1 +pkgrel=2 pkgdesc="safe cleanup blocks" arch=(i686 x86_64) license=(custom:unknown) diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD index 82ed98477..b30443f40 100644 --- a/extra/perl-html-parser/PKGBUILD +++ b/extra/perl-html-parser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153676 2012-03-17 19:52:14Z eric $ +# $Id: PKGBUILD 160535 2012-06-02 10:27:46Z bluewind $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis # Contributor: Firmicus <francois.archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-html-parser _realname=HTML-Parser pkgver=3.69 -pkgrel=1 +pkgrel=2 pkgdesc="Perl HTML parser class" arch=('i686' 'x86_64') license=('PerlArtistic') diff --git a/extra/perl-libintl-perl/PKGBUILD b/extra/perl-libintl-perl/PKGBUILD index af266d871..6554a2524 100644 --- a/extra/perl-libintl-perl/PKGBUILD +++ b/extra/perl-libintl-perl/PKGBUILD @@ -1,33 +1,33 @@ -# $Id: PKGBUILD 125264 2011-05-25 19:18:10Z foutrelis $ +# $Id: PKGBUILD 160537 2012-06-02 10:27:49Z bluewind $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=perl-libintl-perl _realname=libintl-perl pkgver=1.20 -pkgrel=3 +pkgrel=4 pkgdesc="Perl Module: Localization support" arch=('i686' 'x86_64') license=('LGPL') url="http://search.cpan.org/dist/${_realname}/" -depends=('gettext' 'perl>=5.10.0') +depends=('gettext' 'perl') options=(!emptydirs) source=(http://www.cpan.org/authors/id/G/GU/GUIDO/${_realname}-$pkgver.tar.gz) md5sums=('cb36f58a7d2e15974f25b35381548b1b') build() { - cd ${srcdir}/${_realname}-$pkgver + cd "${srcdir}/${_realname}-$pkgver" # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-$pkgver" make test } package() { - cd ${srcdir}/${_realname}-$pkgver - make install DESTDIR=${pkgdir} - - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete + cd "${srcdir}/${_realname}-$pkgver" + make install DESTDIR="${pkgdir}" } diff --git a/extra/perl-list-moreutils/PKGBUILD b/extra/perl-list-moreutils/PKGBUILD index 276a6f804..80d83dfc4 100644 --- a/extra/perl-list-moreutils/PKGBUILD +++ b/extra/perl-list-moreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 155999 2012-04-11 04:34:58Z allan $ +# $Id: PKGBUILD 160539 2012-06-02 10:27:53Z bluewind $ # Maintainer : Justin "juster" Davis <jrcd83@gmail.com> # Generator : pbjam 0.01 pkgname=perl-list-moreutils pkgver=0.33 -pkgrel=2 +pkgrel=3 pkgdesc="Provide the stuff missing in List::Util" arch=(i686 x86_64) license=(PerlArtistic GPL) diff --git a/extra/perl-locale-gettext/PKGBUILD b/extra/perl-locale-gettext/PKGBUILD index 2926a9ec7..e2bb2e3b5 100644 --- a/extra/perl-locale-gettext/PKGBUILD +++ b/extra/perl-locale-gettext/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143936 2011-11-30 21:34:33Z giovanni $ +# $Id: PKGBUILD 160541 2012-06-02 10:27:56Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Mark Rosenstand <mark@borkware.net> # Contributor: Paul Mattal <paul@archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-locale-gettext _realname=gettext pkgver=1.05 -pkgrel=8 +pkgrel=9 pkgdesc="Permits access from Perl to the gettext() family of functions" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD index e1024c6c1..fcde3f988 100644 --- a/extra/perl-net-dns/PKGBUILD +++ b/extra/perl-net-dns/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 153680 2012-03-17 20:08:26Z eric $ +# $Id: PKGBUILD 160543 2012-06-02 10:28:00Z bluewind $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-dns _realname=Net-DNS pkgver=0.68 -pkgrel=1 +pkgrel=2 pkgdesc="Perl Module: Interface to the DNS resolver." arch=('i686' 'x86_64') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-digest-hmac' 'perl-net-ip' 'perl>=5.10.0') +depends=('perl-digest-hmac' 'perl-net-ip' 'perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/O/OL/OLAF/${_realname}-$pkgver.tar.gz) md5sums=('05c0f6955747758bb5c9578d9bc6c3a5') @@ -30,9 +30,5 @@ check() { package() { cd "$srcdir/${_realname}-${pkgver}" make install DESTDIR="${pkgdir}" - - # remove perllocal.pod and .packlist - find "${pkgdir}" -name perllocal.pod -delete - find "${pkgdir}" -name .packlist -delete } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index 155f25459..847626556 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 158028 2012-05-01 10:32:13Z giovanni $ +# $Id: PKGBUILD 160545 2012-06-02 10:28:03Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay pkgver=1.48 -pkgrel=1 +pkgrel=2 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64') license=('custom:BSD') diff --git a/extra/perl-netaddr-ip/PKGBUILD b/extra/perl-netaddr-ip/PKGBUILD index 859379449..8343437a4 100644 --- a/extra/perl-netaddr-ip/PKGBUILD +++ b/extra/perl-netaddr-ip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143974 2011-12-01 07:52:54Z andrea $ +# $Id: PKGBUILD 160547 2012-06-02 10:28:06Z bluewind $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Francois Charette <francois.archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-netaddr-ip _realname=NetAddr-IP pkgver=4.058 -pkgrel=1 +pkgrel=2 pkgdesc="Perl module to manage IP addresses and subnets" arch=(i686 x86_64) license=('PerlArtistic' 'GPL') @@ -17,22 +17,18 @@ source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/${_realname}-${pkgver} md5sums=('8829958dd84a8b36e3cd10347564739d') build() { - cd ${srcdir}/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd ${srcdir}/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" make test } package() { - cd ${srcdir}/${_realname}-${pkgver} - make DESTDIR=${pkgdir} install - - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete + cd "${srcdir}/${_realname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/perl-sdl/PKGBUILD b/extra/perl-sdl/PKGBUILD index 29483fdc1..99ebfaf6e 100644 --- a/extra/perl-sdl/PKGBUILD +++ b/extra/perl-sdl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127524 2011-06-15 21:01:17Z remy $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 160549 2012-06-02 10:28:09Z bluewind $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=perl-sdl -pkgver=2.531 -pkgrel=3 +pkgver=2.536 +pkgrel=1 pkgdesc="Simple DirectMedia Layer for Perl" arch=(i686 x86_64) license=(LGPL) @@ -17,8 +17,10 @@ options=('!emptydirs') replaces=(sdl_perl) conflicts=(sdl_perl) provides=("sdl_perl=$pkgver") -source=(http://search.cpan.org/CPAN/authors/id/G/GA/GARU/SDL-$pkgver.tar.gz) -md5sums=('ed39c87ae685d3a933705a2ea82a9e18') +# http://search.cpan.org/dist/SDL/ +_author=FROGGS +source=(http://search.cpan.org/CPAN/authors/id/${_author:0:1}/${_author:0:2}/$_author/SDL-$pkgver.tar.gz) +md5sums=('5c682e8a96cd655e959497b034b978ce') build() { cd "$srcdir/SDL-$pkgver" diff --git a/extra/perl-socket6/PKGBUILD b/extra/perl-socket6/PKGBUILD index be7ac34f0..88c8acc07 100644 --- a/extra/perl-socket6/PKGBUILD +++ b/extra/perl-socket6/PKGBUILD @@ -3,7 +3,7 @@ pkgname='perl-socket6' pkgver='0.23' -pkgrel='1' +pkgrel='2' pkgdesc="getaddrinfo/getnameinfo support module" arch=('i686' 'x86_64') license=('PerlArtistic' 'GPL') diff --git a/extra/perl-template-toolkit/PKGBUILD b/extra/perl-template-toolkit/PKGBUILD index d955edfdd..fdce31abc 100644 --- a/extra/perl-template-toolkit/PKGBUILD +++ b/extra/perl-template-toolkit/PKGBUILD @@ -5,7 +5,7 @@ pkgname=perl-template-toolkit _realname=Template-Toolkit pkgver=2.22 -pkgrel=4 +pkgrel=5 pkgdesc="Perl template processing system" arch=(i686 x86_64) license=('PerlArtistic') diff --git a/extra/perl-term-readkey/PKGBUILD b/extra/perl-term-readkey/PKGBUILD index 2a78e3c89..8c73caf7a 100644 --- a/extra/perl-term-readkey/PKGBUILD +++ b/extra/perl-term-readkey/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157151 2012-04-25 02:51:00Z eric $ +# $Id: PKGBUILD 160555 2012-06-02 10:28:20Z bluewind $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Francois Charette <francois.archlinux.org> @@ -6,11 +6,11 @@ pkgname=perl-term-readkey _realname=TermReadKey pkgver=2.30.02 -pkgrel=1 +pkgrel=2 pkgdesc="Provides simple control over terminal driver modes" arch=('i686' 'x86_64') license=('custom') -depends=('perl>=5.10.0' 'glibc') +depends=('perl' 'glibc') url="http://search.cpan.org/~stsi/${_realname}/" options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/S/ST/STSI/${_realname}-$pkgver.tar.gz) @@ -30,10 +30,7 @@ check() { package() { cd "${srcdir}/TermReadKey-$pkgver" make DESTDIR="${pkgdir}" install + chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Term/ReadKey/ReadKey.so" install -d "${pkgdir}/usr/share/licenses/$pkgname/" head -7 README > "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" - - # remove perllocal.pod and .packlist - find "${pkgdir}" -name perllocal.pod -delete - find "${pkgdir}" -name .packlist -delete } diff --git a/extra/perl-text-iconv/PKGBUILD b/extra/perl-text-iconv/PKGBUILD index acd6932e2..cde5d71c0 100644 --- a/extra/perl-text-iconv/PKGBUILD +++ b/extra/perl-text-iconv/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 125288 2011-05-25 19:22:57Z foutrelis $ +# $Id: PKGBUILD 160557 2012-06-02 10:28:23Z bluewind $ # Maintainer: # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-text-iconv _realname=Text-Iconv pkgver=1.7 -pkgrel=6 +pkgrel=7 pkgdesc="Interface to iconv codeset conversion" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/${_realname}/" license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') +depends=('perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/M/MP/MPIOTR/${_realname}-${pkgver}.tar.gz) md5sums=('81b26e069eaebb084e91ea3c009b67ae') build() { - cd ${srcdir}/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" make test } package() { - cd ${srcdir}/${_realname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${_realname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/perl-time-hires/PKGBUILD b/extra/perl-time-hires/PKGBUILD index d719fd468..8253ff249 100644 --- a/extra/perl-time-hires/PKGBUILD +++ b/extra/perl-time-hires/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149153 2012-02-06 00:45:55Z giovanni $ +# $Id: PKGBUILD 160559 2012-06-02 10:28:27Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: mezcal <fila at pruda dot com> pkgname=perl-time-hires pkgver=1.9725 -pkgrel=1 +pkgrel=2 pkgdesc="Perl module: high resolution time, sleep, and alarm" arch=('i686' 'x86_64') license=('PerlArtistic') diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD index b49b5d983..06cb132c4 100644 --- a/extra/perl-tk/PKGBUILD +++ b/extra/perl-tk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 148874 2012-02-05 11:53:42Z ibiru $ +# $Id: PKGBUILD 160561 2012-06-02 10:28:31Z bluewind $ # Maintainer: François Charette <francois ατ archlinux δοτ org> # Contributor: Jason Chu <jchu@xentac.net> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-tk _cpanname=Tk pkgver=804.030 -pkgrel=2 +pkgrel=3 pkgdesc="A graphical user interface toolkit for Perl" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/${_cpanname}" diff --git a/extra/perl-unicode-string/PKGBUILD b/extra/perl-unicode-string/PKGBUILD index c8bcd6c7a..2c15f8c52 100644 --- a/extra/perl-unicode-string/PKGBUILD +++ b/extra/perl-unicode-string/PKGBUILD @@ -1,33 +1,33 @@ -# $Id: PKGBUILD 125294 2011-05-25 19:24:14Z foutrelis $ +# $Id: PKGBUILD 160563 2012-06-02 10:28:34Z bluewind $ # Maintainer: James Rayner <iphitus@gmail.com> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=perl-unicode-string _realname=Unicode-String pkgver=2.09 -pkgrel=6 +pkgrel=7 pkgdesc="String of Unicode characters for perl (UCS2/UTF16)" arch=('i686' 'x86_64') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl>=5.10.0') +depends=('perl') options=(!emptydirs) source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) md5sums=('553e68e603723bf7c631f8701ab0d678') build() { - cd ${srcdir}/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" # in stall module in vendor directories. PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" make test } package() { - cd ${srcdir}/${_realname}-${pkgver} - make install DESTDIR=${pkgdir} - - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" } diff --git a/extra/perl-xml-parser/PKGBUILD b/extra/perl-xml-parser/PKGBUILD index 25273db30..3e2a9db86 100644 --- a/extra/perl-xml-parser/PKGBUILD +++ b/extra/perl-xml-parser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151310 2012-02-25 13:24:17Z pierre $ +# $Id: PKGBUILD 160565 2012-06-02 10:28:38Z bluewind $ # Maintainer: # Contributor: firmicus <francois@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -7,7 +7,7 @@ pkgname=perl-xml-parser _realname=XML-Parser pkgver=2.41 -pkgrel=2 +pkgrel=3 pkgdesc="Expat-based XML parser module for perl" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD index e1f29bada..1b3f73adf 100644 --- a/extra/perl-yaml-syck/PKGBUILD +++ b/extra/perl-yaml-syck/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 153683 2012-03-17 20:26:21Z eric $ +# $Id: PKGBUILD 160567 2012-06-02 10:28:42Z bluewind $ # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Maintainer: kevin <kevin@archlinux.org> pkgname=perl-yaml-syck _realname=YAML-Syck pkgver=1.20 -pkgrel=1 +pkgrel=2 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64') license=('custom') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl>=5.10.0') +depends=('perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz) md5sums=('8f6d04ee5817b8479e1234264a8d458d') @@ -32,10 +32,6 @@ package() { cd "${srcdir}/${_realname}-$pkgver" make install DESTDIR="${pkgdir}" - # remove perllocal.pod and .packlist - find "${pkgdir}" -name perllocal.pod -delete - find "${pkgdir}" -name .packlist -delete - # license. install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 35039e75b..2796f3f38 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158788 2012-05-09 18:48:29Z pierre $ +# $Id: PKGBUILD 160455 2012-06-02 08:38:48Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -22,7 +22,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.4.3 -pkgrel=1 +pkgrel=4 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' @@ -32,13 +32,15 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' - 'logrotate.d.php-fpm') + 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') md5sums=('51f9488bf8682399b802c48656315cac' '0b0bc7a917fc592bdf11dcd3c5c255e9' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' - 'b01be5f816988fcee7e78225836e5e27' - '59b3a25f9eb3afc02f1adf9ee699808c' - '07c4e412909ac65a44ec90e7a2c4bade') + 'aabda9f3f2f8b9d8fdc9558c31c718db' + '825e580dd5708d959b50944afa1b12b6' + 'f56b5bb7e93c802ae8519182fbea3387' + '86c73d481f3099e740e602869bacf637' + 'c60343df74f8e1afb13b084d5c0e47ed') build() { phpconfig="--srcdir=../${pkgbase}-${pkgver} \ @@ -233,6 +235,7 @@ package_php-fpm() { pkgdesc='FastCGI Process Manager for PHP' depends=('php') backup=('etc/php/php-fpm.conf') + install='php-fpm.install' install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 @@ -240,6 +243,8 @@ 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}/usr/lib/tmpfiles.d/php-fpm.conf + install -D -m644 ${srcdir}/php-fpm.service ${pkgdir}/usr/lib/systemd/system/php-fpm.service } package_php-embed() { diff --git a/extra/php/logrotate.d.php-fpm b/extra/php/logrotate.d.php-fpm index 7a1ba2597..ac2d92a36 100644 --- a/extra/php/logrotate.d.php-fpm +++ b/extra/php/logrotate.d.php-fpm @@ -1,6 +1,8 @@ /var/log/php-fpm.log { missingok + notifempty + delaycompress postrotate - /etc/rc.d/php-fpm logrotate >/dev/null || true + kill -USR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true endscript } diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch index 4e0f4a888..0b17182fd 100644 --- a/extra/php/php-fpm.conf.in.patch +++ b/extra/php/php-fpm.conf.in.patch @@ -14,7 +14,7 @@ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: none -;pid = run/php-fpm.pid -+pid = run/php-fpm/php-fpm.pid ++pid = /run/php-fpm/php-fpm.pid ; Error log file ; If it's set to "syslog", log is sent to syslogd instead of being written @@ -24,7 +24,7 @@ ; Note: This value is mandatory. -listen = 127.0.0.1:9000 +;listen = 127.0.0.1:9000 -+listen = /var/run/php-fpm/php-fpm.sock ++listen = /run/php-fpm/php-fpm.sock ; Set listen(2) backlog. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) diff --git a/extra/php/php-fpm.install b/extra/php/php-fpm.install new file mode 100644 index 000000000..41fc37c22 --- /dev/null +++ b/extra/php/php-fpm.install @@ -0,0 +1,9 @@ +post_install() { + if [[ ! -d run/php-fpm ]]; then + usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/php-fpm.conf + fi +} + +post_upgrade() { + post_install +} diff --git a/extra/php/php-fpm.service b/extra/php/php-fpm.service new file mode 100644 index 000000000..e29f7c236 --- /dev/null +++ b/extra/php/php-fpm.service @@ -0,0 +1,13 @@ +[Unit] +Description=FastCGI Process Manager for PHP +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/php-fpm/php-fpm.pid +PrivateTmp=true +ExecStart=/usr/sbin/php-fpm +ExecReload=/bin/kill -USR2 $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/php/php-fpm.tmpfiles b/extra/php/php-fpm.tmpfiles new file mode 100644 index 000000000..801e74f1e --- /dev/null +++ b/extra/php/php-fpm.tmpfiles @@ -0,0 +1 @@ +d /run/php-fpm 755 root root diff --git a/extra/php/rc.d.php-fpm b/extra/php/rc.d.php-fpm index 54bcf4d5b..3b3ec20de 100644 --- a/extra/php/rc.d.php-fpm +++ b/extra/php/rc.d.php-fpm @@ -49,8 +49,6 @@ test_config() { stat_die fi - [ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm - stat_done } @@ -66,7 +64,7 @@ case "$1" in exit 1 fi - wait_for_pid created /var/run/php-fpm/php-fpm.pid + wait_for_pid created /run/php-fpm/php-fpm.pid if [ -n "$try" ] ; then stat_fail @@ -81,14 +79,14 @@ case "$1" in test_config stat_busy 'Gracefully shutting down php-fpm' - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + if [ ! -r /run/php-fpm/php-fpm.pid ] ; then stat_fail exit 1 fi - kill -QUIT `cat /var/run/php-fpm/php-fpm.pid` + kill -QUIT `cat /run/php-fpm/php-fpm.pid` - wait_for_pid removed /var/run/php-fpm.pid + wait_for_pid removed /run/php-fpm.pid if [ -n "$try" ] ; then stat_fail @@ -102,14 +100,14 @@ case "$1" in force-quit) stat_busy 'Terminating php-fpm' - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + if [ ! -r /run/php-fpm/php-fpm.pid ] ; then stat_fail exit 1 fi - kill -TERM `cat /var/run/php-fpm/php-fpm.pid` + kill -TERM `cat /run/php-fpm/php-fpm.pid` - wait_for_pid removed /var/run/php-fpm/php-fpm.pid + wait_for_pid removed /run/php-fpm/php-fpm.pid if [ -n "$try" ] ; then stat_fail @@ -129,24 +127,12 @@ case "$1" in test_config stat_busy 'Reload service php-fpm' - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -USR2 `cat /var/run/php-fpm/php-fpm.pid` - stat_done - ;; - - logrotate) - stat_busy 'Reopen php-fpm log' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + if [ ! -r /run/php-fpm/php-fpm.pid ] ; then stat_fail exit 1 fi - kill -USR1 `cat /var/run/php-fpm/php-fpm.pid` + kill -USR2 `cat /run/php-fpm/php-fpm.pid` stat_done ;; diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 7f8df9a63..0c77c8f60 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158683 2012-05-07 06:27:02Z foutrelis $ +# $Id: PKGBUILD 160569 2012-06-02 10:28:46Z bluewind $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') diff --git a/extra/pmount/PKGBUILD b/extra/pmount/PKGBUILD index e3977e585..371593ae3 100644 --- a/extra/pmount/PKGBUILD +++ b/extra/pmount/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149539 2012-02-08 13:33:32Z tpowa $ +# $Id: PKGBUILD 160589 2012-06-02 11:45:11Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pmount pkgver=0.9.23 -pkgrel=3 +pkgrel=4 pkgdesc="mount removable devices as normal user" arch=(i686 x86_64) license=('GPL2') @@ -16,7 +16,8 @@ md5sums=('db19f5bf3151b1b41705ec7bafa439d3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-hal + ./configure --prefix=/usr --disable-hal \ + --with-cryptsetup-prog=/usr/sbin/cryptsetup make } diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index b9e57d230..f17225c53 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 151563 2012-02-27 18:02:25Z dan $ +# $Id: PKGBUILD 160571 2012-06-02 10:28:50Z bluewind $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') pkgver=9.1.3 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.postgresql.org/" license=('custom:PostgreSQL') -makedepends=('libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0') +makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0') source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate) @@ -19,6 +19,7 @@ build() { ./configure --prefix=/usr \ --mandir=/usr/share/man \ --datadir=/usr/share/postgresql \ + --with-krb5 \ --with-libxml \ --with-openssl \ --with-perl \ @@ -34,7 +35,7 @@ build() { package_postgresql-libs() { pkgdesc="Libraries for use with PostgreSQL" - depends=('openssl>=1.0.0' 'readline>=6.0') + depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0') provides=('postgresql-client') conflicts=('postgresql-client') @@ -89,7 +90,7 @@ package_postgresql-docs() { package_postgresql() { pkgdesc="A sophisticated object-relational DBMS" backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql') - depends=("postgresql-libs>=${pkgver}" 'libxml2' 'readline>=6.0' 'openssl>=1.0.0') + depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0') optdepends=('python2: for PL/Python support' 'perl: for PL/Perl support' 'tcl: for PL/Tcl support' @@ -133,16 +134,6 @@ package_postgresql() { "${pkgdir}/etc/logrotate.d/postgresql" } -md5sums=('7dbff52221954c46595313eb7f92c3e0' - '1ddd1df8010549f237e7983bb326025e' - 'a54d09a20ab1672adf08f037df188d53' - '96f82c38f3f540b53f3e5144900acf17' - 'd28e443f9f65a5712c52018b84e27137') -sha256sums=('8d54ff514f5b2754e6e36b008c43d7bbf7daf541da608767cc5bdedb1de5db30' - '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45' - '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81' - '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' - '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e') md5sums=('641e1915f7ebfdc9f138e4c55b6aec0e' '1ddd1df8010549f237e7983bb326025e' 'a54d09a20ab1672adf08f037df188d53' diff --git a/extra/razor/PKGBUILD b/extra/razor/PKGBUILD index 0bce1dd2d..1907c778f 100644 --- a/extra/razor/PKGBUILD +++ b/extra/razor/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 150552 2012-02-18 12:47:09Z pierre $ +# $Id: PKGBUILD 160573 2012-06-02 10:28:53Z bluewind $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=razor pkgver=2.84 -pkgrel=6 +pkgrel=7 pkgdesc="A distributed, collaborative, spam detection and filtering network" arch=('i686' 'x86_64') url="http://razor.sourceforge.net" license=('PerlArtistic') -depends=('perl-net-dns' 'perl-digest-sha1' 'perl-uri' 'perl-digest-nilsimsa' 'perl>=5.14.0') +depends=('perl-net-dns' 'perl-digest-sha1' 'perl-uri' 'perl-digest-nilsimsa' 'perl') +options=('!emptydirs') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2") md5sums=('8b9a11a6ce020383c32c45d1530d77c2') -options=('!emptydirs') build() { cd "${srcdir}"/${pkgname}-agents-${pkgver} @@ -31,12 +31,8 @@ check() { } package() { - cd ${srcdir}/${pkgname}-agents-${pkgver} - make DESTDIR=${pkgdir} install - - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete + cd "${srcdir}"/${pkgname}-agents-${pkgver} + make DESTDIR="${pkgdir}" install # cd ${pkgdir}/usr/bin # for i in razor-check razor-report razor-revoke razor-admin; do diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index 7b6a0f13f..ae45fdf62 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153438 2012-03-13 23:17:57Z eric $ +# $Id: PKGBUILD 160575 2012-06-02 10:28:55Z bluewind $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=rrdtool pkgver=1.4.7 -pkgrel=1 +pkgrel=2 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64') url="http://www.rrdtool.org" diff --git a/extra/startup-notification/PKGBUILD b/extra/startup-notification/PKGBUILD index 647b181c9..be5991abc 100644 --- a/extra/startup-notification/PKGBUILD +++ b/extra/startup-notification/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 144441 2011-12-05 19:49:41Z andyrtr $ +# $Id: PKGBUILD 160613 2012-06-02 21:14:51Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=startup-notification pkgver=0.12 -pkgrel=2 +pkgrel=3 pkgdesc="Monitor and display application startup" arch=(i686 x86_64) license=('LGPL') -depends=('libx11' 'xcb-util>=0.3.8') +depends=('libx11' 'xcb-util>=0.3.9') options=('!libtool') url="http://www.freedesktop.org" source=(http://www.freedesktop.org/software/startup-notification/releases/${pkgname}-${pkgver}.tar.gz) diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 0fb7dea1c..8ff469795 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 159359 2012-05-22 14:33:28Z stephane $ +# $Id: PKGBUILD 160577 2012-06-02 10:29:00Z bluewind $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion pkgver=1.7.5 -pkgrel=1 +pkgrel=2 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') license=('APACHE') diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index f60db7804..cbc430fb4 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158968 2012-05-13 20:52:23Z tdziedzic $ +# $Id: PKGBUILD 160579 2012-06-02 10:29:06Z bluewind $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -10,7 +10,7 @@ _patchlevel=515 __hgrev=8201108e9cf0 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('custom:vim') url="http://www.vim.org" diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index 9bbc30e5b..1019be313 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 157002 2012-04-23 09:10:59Z ibiru $ +# $Id: PKGBUILD 160601 2012-06-02 20:33:51Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.32.1 +pkgver=0.32.2 pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64') @@ -11,14 +11,11 @@ license=('LGPL') options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/GNOME/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz -make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199) -sha256sums=('543e489943d439dc82a4ba54871984ea843c3ef0a1fffa24aa65dabc57e7e4da' - '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3') +source=(http://ftp.gnome.org/pub/GNOME/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz) +sha256sums=('d69ec071f7a380d8b8b981b35a9a0b891f37c4b6b17d08407f66ac98d619486a') build() { cd "vte-$pkgver" - patch -Np1 -R -i "$srcdir/make_alt_work.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vte \ --localstatedir=/var --disable-static \ diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index ce7cad83b..eabbcde40 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151466 2012-02-26 12:39:20Z giovanni $ +# $Id: PKGBUILD 160581 2012-06-02 10:29:09Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat pkgver=0.3.7 -pkgrel=1 +pkgrel=2 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64') url="http://www.weechat.org/" diff --git a/extra/xcb-util-image/PKGBUILD b/extra/xcb-util-image/PKGBUILD index 18fd700ba..81dc8f8d3 100644 --- a/extra/xcb-util-image/PKGBUILD +++ b/extra/xcb-util-image/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 144429 2011-12-05 19:49:24Z andyrtr $ +# $Id: PKGBUILD 160617 2012-06-02 21:14:58Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=xcb-util-image -pkgver=0.3.8 +pkgver=0.3.9 pkgrel=1 pkgdesc="Utility libraries for XC Binding - Port of Xlib's XImage and XShmImage functions" arch=('i686' 'x86_64') url="http://xcb.freedesktop.org" license=('custom') -depends=('libxcb>=1.7' 'xcb-util>=0.3.8') +depends=('libxcb>=1.7' 'xcb-util>=0.3.9') makedepends=('xorg-util-macros') options=('!libtool') source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" 'LICENSE') -md5sums=('245a96041f373b05764148e52d2e0211' - '2672c2e72dedb40f773e989dd622f298') +sha256sums=('d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df' + 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xcb-util-keysyms/PKGBUILD b/extra/xcb-util-keysyms/PKGBUILD index 618d0687c..27f1cc9a6 100644 --- a/extra/xcb-util-keysyms/PKGBUILD +++ b/extra/xcb-util-keysyms/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 144431 2011-12-05 19:49:26Z andyrtr $ +# $Id: PKGBUILD 160619 2012-06-02 21:15:01Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=xcb-util-keysyms -pkgver=0.3.8 +pkgver=0.3.9 pkgrel=1 -pkgdesc="Utility libraries for XC Binding" +pkgdesc="Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes" arch=('i686' 'x86_64') url="http://xcb.freedesktop.org" license=('custom') @@ -14,8 +14,8 @@ makedepends=('xorg-util-macros') options=('!libtool') source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" 'LICENSE') -md5sums=('c75bb20e709093580a67eaf263251b50' - '2672c2e72dedb40f773e989dd622f298') +sha256sums=('7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e' + 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xcb-util-wm/PKGBUILD b/extra/xcb-util-wm/PKGBUILD index 5b17b5bd8..5b1ce09da 100644 --- a/extra/xcb-util-wm/PKGBUILD +++ b/extra/xcb-util-wm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 144435 2011-12-05 19:49:32Z andyrtr $ +# $Id: PKGBUILD 160621 2012-06-02 21:15:05Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=xcb-util-wm -pkgver=0.3.8 +pkgver=0.3.9 pkgrel=1 -pkgdesc="Utility libraries for XC Binding - " +pkgdesc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM" arch=('i686' 'x86_64') url="http://xcb.freedesktop.org" license=('custom') @@ -14,8 +14,8 @@ makedepends=('xorg-util-macros') options=('!libtool') source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" 'LICENSE') -md5sums=('dda47289bc846a6a3e07824e9ec3aef8' - '2672c2e72dedb40f773e989dd622f298') +sha256sums=('038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030' + 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xcb-util/PKGBUILD b/extra/xcb-util/PKGBUILD index 588e29f70..42f3273fb 100644 --- a/extra/xcb-util/PKGBUILD +++ b/extra/xcb-util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144427 2011-12-05 19:49:22Z andyrtr $ +# $Id: PKGBUILD 160615 2012-06-02 21:14:55Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=xcb-util -pkgver=0.3.8 +pkgver=0.3.9 pkgrel=1 pkgdesc="Utility libraries for XC Binding" arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ makedepends=('gperf' 'xorg-util-macros') options=('!libtool') source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" 'LICENSE') -md5sums=('8ce019c4bbf20dce246b98f177cfccff' - '2672c2e72dedb40f773e989dd622f298') +sha256sums=('c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4' + 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 90404585d..eaa97b02d 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 160379 2012-06-01 12:59:00Z dreisner $ +# $Id: PKGBUILD 160623 2012-06-02 21:15:09Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel pkgver=2.19.0 -pkgrel=2 +pkgrel=3 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') -depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.8' 'libxfixes' 'udev>=183') +depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'udev>=183') makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') conflicts=('xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') diff --git a/extra/xfconf/PKGBUILD b/extra/xfconf/PKGBUILD index 7860c4901..c8258bf35 100644 --- a/extra/xfconf/PKGBUILD +++ b/extra/xfconf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157905 2012-04-30 04:21:42Z foutrelis $ +# $Id: PKGBUILD 160585 2012-06-02 10:29:16Z bluewind $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfconf pkgver=4.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="A simple client-server configuration storage and query system" arch=('i686' 'x86_64') url="http://www.xfce.org/" diff --git a/extra/xournal/PKGBUILD b/extra/xournal/PKGBUILD index 79f6f7c93..aede2f778 100644 --- a/extra/xournal/PKGBUILD +++ b/extra/xournal/PKGBUILD @@ -1,31 +1,23 @@ -# $Id: PKGBUILD 140585 2011-10-17 08:15:15Z jgc $ +# $Id: PKGBUILD 160591 2012-06-02 17:08:42Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=xournal -pkgver=0.4.5 -pkgrel=5 +pkgver=0.4.6 +pkgrel=1 pkgdesc='Notetaking and sketching application' -arch=('i686' 'x86_64') url='http://xournal.sourceforge.net/' license=('GPL') +arch=('i686' 'x86_64') depends=('libgnomecanvas' 'poppler-glib' 'shared-mime-info' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('ghostscript: import PS/PDF files as bitmap backgrounds') -source=("http://downloads.sourceforge.net/xournal/xournal-${pkgver}.tar.gz" - 'pdf-export-64.patch' - 'poppler-api.patch') -sha1sums=('390cb275774469ed1b04b7268dd625bd456c895e' - 'f23f53b9f69ba8a5773c53d7bca99abf9d8504f8' - '5aedd5610b42df96e964bb889d4bf0831c2080bc') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('4ebe79e3df7155d2a09c341537a639ac2332d4c8') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../pdf-export-64.patch # from xournal CVS, see FS#21693 - patch -p1 -i ../poppler-api.patch - - ./configure --prefix=/usr + ./configure --prefix=/usr LIBS='-lm -lz' make } diff --git a/kde-unstable/kdepim/PKGBUILD b/kde-unstable/kdepim/PKGBUILD index bb01a34be..da93aa268 100644 --- a/kde-unstable/kdepim/PKGBUILD +++ b/kde-unstable/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160158 2012-05-29 23:05:07Z andrea $ +# $Id: PKGBUILD 160453 2012-06-02 06:43:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,17 +20,22 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-libkdepim') pkgver=4.8.80 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('c563279f8ae207ee3a4aa01534f38bfadee92cff') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" + 'fix-build.patch') +sha1sums=('af86571d86dbb3c9e7af0ef86c6d90fbaf9304bd' + '526d0460658f649159eed8e58fa384fd3f72fbbe') build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/fix-build.patch + cd "${srcdir}" mkdir build cd build @@ -143,7 +148,7 @@ package_kdepim-kmail() { 'kdepim-mimelib' 'kdepim-plugins') replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' 'kdepim-mimelib' 'kdepim-plugins') - for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \ + for i in kmail doc/kmail kmailcvt ksendemail libksieve \ mailfilteragent ontologies kontact/plugins/kmail; do cd "${srcdir}"/build/${i} make DESTDIR="${pkgdir}" install @@ -154,7 +159,7 @@ package_kdepim-knode() { pkgdesc='News Reader' depends=('kdepim-libkdepim') url="http://kde.org/applications/internet/knode/" - install='kdepim.install' + install='kdepim-knode.install' cd "${srcdir}"/build/knode make DESTDIR="${pkgdir}" install cd "${srcdir}"/build/doc/knode @@ -237,7 +242,7 @@ package_kdepim-libkdepim() { kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ messagecomposer messagecore messagelist messageviewer icons \ strigi-analyzer templateparser plugins/messageviewer \ - plugins/ktexteditor; do + plugins/ktexteditor mailcommon; do cd "${srcdir}"/build/${i} make DESTDIR="${pkgdir}" install done diff --git a/kde-unstable/kdepim/fix-build.patch b/kde-unstable/kdepim/fix-build.patch new file mode 100644 index 000000000..b42046677 --- /dev/null +++ b/kde-unstable/kdepim/fix-build.patch @@ -0,0 +1,32 @@ +From: Allen Winter <winter@kde.org> +Date: Thu, 31 May 2012 16:58:07 +0000 +Subject: Revert last: Remove X11 requirement +X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=26f9d62b9a9b4bfa736b342903d16dc0d8739d98 +--- +Revert last: Remove X11 requirement + +CCMAIL: djarvie@kde.org +David, without explicit linking to X11 libs, I get an unresolved +symbol for XSetWMHints +--- + + +--- a/kalarm/CMakeLists.txt ++++ b/kalarm/CMakeLists.txt +@@ -202,6 +202,7 @@ if(KALARM_USE_AKONADI) + kdepim + ${KDE4_KCMUTILS_LIBS} + ${KDE4_PHONON_LIBS} ++ ${X11_X11_LIB} + ) + else(KALARM_USE_AKONADI) + target_link_libraries(kalarm_bin +@@ -220,6 +221,7 @@ else(KALARM_USE_AKONADI) + kdepim + ${KDE4_KCMUTILS_LIBS} + ${KDE4_PHONON_LIBS} ++ ${X11_X11_LIB} + ) + endif(KALARM_USE_AKONADI) + + diff --git a/kde-unstable/kdepim/kdepim-knode.install b/kde-unstable/kdepim/kdepim-knode.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/kde-unstable/kdepim/kdepim-knode.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index b031d3c90..9799d2b5e 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159699 2012-05-26 07:40:36Z andrea $ +# $Id: PKGBUILD 160657 2012-06-03 10:02:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.8.3 -pkgrel=2.1 +pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -15,7 +15,7 @@ depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee' 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit' - 'media-player-info' 'herqq') + 'media-player-info') makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell') provides=("kdelibs=$pkgver") replaces=('kdelibs-experimental' 'kdelibs') @@ -53,7 +53,8 @@ build() { -DSYSCONF_INSTALL_DIR=/etc \ -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \ -DKDE_DEFAULT_HOME='.kde4' \ - -DWITH_FAM=OFF + -DWITH_FAM=OFF \ + -DWITH_HUpnp=OFF make } diff --git a/multilib/lib32-libx11/PKGBUILD b/multilib/lib32-libx11/PKGBUILD index fe73ec11e..22dfd8467 100644 --- a/multilib/lib32-libx11/PKGBUILD +++ b/multilib/lib32-libx11/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71602 2012-05-30 17:06:38Z lcarlier $ +# $Id: PKGBUILD 71890 2012-06-02 22:15:54Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> _pkgbasename=libx11 pkgname=lib32-$_pkgbasename -pkgver=1.4.99.902 +pkgver=1.5.0 pkgrel=1 pkgdesc="X11 client-side library (32-bit)" arch=(x86_64) @@ -13,7 +13,7 @@ makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto' 'gcc-multilib' options=('!libtool') license=('custom:XFREE86') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2) -sha1sums=('afe75b7c2c54e354f726fd36251bcfec1e1f833a') +sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86') build() { export CC="gcc -m32" @@ -23,6 +23,11 @@ build() { ./configure --prefix=/usr --disable-static --disable-xf86bigfont \ --libdir=/usr/lib32 --disable-specs make +} + +check() { + cd "${srcdir}/libX11-${pkgver}" + make check } diff --git a/multilib/lib32-libxft/PKGBUILD b/multilib/lib32-libxft/PKGBUILD index d05c4ce39..8437fd608 100644 --- a/multilib/lib32-libxft/PKGBUILD +++ b/multilib/lib32-libxft/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 67394 2012-03-11 10:50:08Z bluewind $ +# $Id: PKGBUILD 71892 2012-06-02 22:18:20Z lcarlier $ # Maintainer: Ionut Biru <ibiru@archlinux.org> _pkgbasename=libxft pkgname=lib32-$_pkgbasename -pkgver=2.3.0 +pkgver=2.3.1 pkgrel=1 pkgdesc="FreeType-based font drawing library for X (32-bit)" arch=('x86_64') @@ -12,7 +12,7 @@ depends=('lib32-fontconfig' 'lib32-libxrender') makedepends=('gcc-multilib') options=('!libtool') source=(${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2) -sha1sums=('687f38a810b9ae58e1169c295d9d438370235e23') +sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd') build() { export CC="gcc -m32" diff --git a/multilib/lib32-xcb-util/PKGBUILD b/multilib/lib32-xcb-util/PKGBUILD index fe1051772..3b46d134d 100644 --- a/multilib/lib32-xcb-util/PKGBUILD +++ b/multilib/lib32-xcb-util/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60278 2011-12-08 20:24:48Z bluewind $ +# $Id: PKGBUILD 71888 2012-06-02 21:25:02Z lcarlier $ # Maintainer : Ionut Biru <ibiru@archlinux.org> _pkgbasename=xcb-util pkgname=lib32-xcb-util -pkgver=0.3.8 +pkgver=0.3.9 pkgrel=1 pkgdesc="Utility libraries for XC Binding (32-bit)" arch=('x86_64') @@ -13,7 +13,7 @@ depends=('lib32-glibc' 'lib32-libxcb' $_pkgbasename) makedepends=('gperf' 'gcc-multilib') options=('!libtool') source=(http://xcb.freedesktop.org/dist/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('8ce019c4bbf20dce246b98f177cfccff') +sha256sums=('c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4') build() { export CC="gcc -m32" diff --git a/testing/run-parts/PKGBUILD b/testing/run-parts/PKGBUILD new file mode 100644 index 000000000..c29ffb194 --- /dev/null +++ b/testing/run-parts/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 160459 2012-06-02 09:35:46Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=run-parts +pkgver=4.3.1 +pkgrel=1 +pkgdesc='run scripts or programs in a directory' +arch=('i686' 'x86_64') +url='http://packages.qa.debian.org/d/debianutils.html' +license=('GPL') +depends=('glibc') +source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz") +sha256sums=('03cbb242b8b86f444477e0bbe8e391c18aec8f8d08a2a02e8893efd1d5d6e4bc') + +build() { + cd $srcdir/debianutils-$pkgver + ./configure --prefix=/usr + make run-parts +} + +package() { + cd $srcdir/debianutils-$pkgver + install -D -m755 run-parts $pkgdir/usr/bin/run-parts + install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8 + for l in po4a/*/run-parts.8; do + install -D -m644 ${l} $pkgdir/usr/share/man/${l:5:2}/man8/run-parts.8 + done +} diff --git a/~brendan/guile/PKGBUILD b/~brendan/guile/PKGBUILD index c6297290a..af8827563 100644 --- a/~brendan/guile/PKGBUILD +++ b/~brendan/guile/PKGBUILD @@ -1,27 +1,32 @@ -# Maintainer: Brendan Tildesley <brendan.tildesley@gmail.com> +# Maintainer: Patrick McCarty <pnorcks at gmail dot com> +# Contributor: Emmanuel 'guinness' Boudreault +# Parabola Maintainer: Brendan Tildesley (brendyn) +# +# This is `guile-devel' from AUR, with very little changes. pkgname=guile -pkgver=2.0.3 +pkgver=2.0.5 pkgrel=1 -pkgdesc="GNU Ubiquitous Intelligent Language for Extensions - portable Scheme implementation written in C." +pkgdesc="GNU Ubiquitous Intelligent Language for Extensions - a portable, embeddable Scheme implementation written in C" url="http://www.gnu.org/software/guile/" -license=('GPL3' 'LGPL3') -arch=(i686 x86_64 mips64el) -depends=('gmp>=4.1' 'libtool' 'gettext' 'libunistring' 'gc' 'libffi') -builddepends=('pkgconfig') +arch=('i686' 'x86_64') +license=('GPL') +depends=('gmp>=4.3.1' 'libtool' 'ncurses>=5.7' 'texinfo' + 'libunistring' 'gc' 'libffi') +conflicts=('guile' 'guile-git') +provides=("guile=$pkgver") install=guile.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('4fde55bbd612adda267420d86d8b395d49031809') -# I think .xz is only provided for latest release, so change to .gz if it vanishes +options=('!libtool') +source=(ftp://ftp.gnu.org/pub/gnu/guile/guile-${pkgver}.tar.gz) +sha256sums=('2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --disable-static \ - --disable-error-on-warning + cd "${srcdir}/guile-${pkgver}" + + ./configure --prefix=/usr make LDFLAGS+="-lpthread" } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/guile-${pkgver}" make DESTDIR="${pkgdir}" install -}
\ No newline at end of file +} |