diff options
136 files changed, 2204 insertions, 679 deletions
diff --git a/community-testing/pigeonhole/PKGBUILD b/community-testing/pigeonhole/PKGBUILD index 687c90522..afc922926 100644 --- a/community-testing/pigeonhole/PKGBUILD +++ b/community-testing/pigeonhole/PKGBUILD @@ -4,12 +4,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.1.0 +_dcpkgver=2.1.1 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" arch=('i686' 'x86_64') url="http://pigeonhole.dovecot.org/" diff --git a/community/anyfs-tools/PKGBUILD b/community/anyfs-tools/PKGBUILD index 47d550208..f0ff30bf5 100644 --- a/community/anyfs-tools/PKGBUILD +++ b/community/anyfs-tools/PKGBUILD @@ -1,23 +1,32 @@ -# $Id: PKGBUILD 20118 2010-07-02 14:36:14Z spupykin $ +# $Id: PKGBUILD 66269 2012-02-23 06:54:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=anyfs-tools pkgver=0.85.1c -pkgrel=1 +pkgrel=3 pkgdesc="unix-way toolset for recovering and converting filesystems" arch=('i686' 'x86_64') url="http://anyfs-tools.sourceforge.net/" license=('GPL') depends=(bzip2 e2fsprogs libmpeg2 xfsprogs fuse) -source=(http://downloads.sourceforge.net/sourceforge/anyfs-tools/${pkgname}-${pkgver}.tar.bz2) -md5sums=('d3da0004cd0f037ec3e926acd3f520c2') +#makedepends=('linux-headers') +install=anyfs-tools.install +source=(http://downloads.sourceforge.net/sourceforge/anyfs-tools/${pkgname}-${pkgver}.tar.bz2 + disable-build-ext2fs.patch) +md5sums=('d3da0004cd0f037ec3e926acd3f520c2' + '5ea91297b605d51b03243adda1efed27') build() { cd $srcdir/$pkgname-${pkgver} + + unset LDFLAGS + unset CFLAGS + patch -p1 <$srcdir/disable-build-ext2fs.patch + #Dirty Arch64 fix which doesn't affect i686 CFLAGS="-DNO_INLINE_FUNCS -D_INLINE_=static" ./configure --prefix=/usr --build=i686-linux-gnu - make || return 1 + make -j1 sed -i 's|ldconfig||' src/anysurrect/Makefile make INSTALLPATH=$pkgdir/usr install } diff --git a/community/anyfs-tools/anyfs-tools.install b/community/anyfs-tools/anyfs-tools.install new file mode 100644 index 000000000..a9e3e45b5 --- /dev/null +++ b/community/anyfs-tools/anyfs-tools.install @@ -0,0 +1,7 @@ +post_install() { + echo ">> build_e2fs tool temporary disabled" +} + +post_upgrade() { + post_install +} diff --git a/community/anyfs-tools/disable-build-ext2fs.patch b/community/anyfs-tools/disable-build-ext2fs.patch new file mode 100644 index 000000000..7f35f446d --- /dev/null +++ b/community/anyfs-tools/disable-build-ext2fs.patch @@ -0,0 +1,20 @@ +diff -wbBur anyfs-tools-0.85.1c/src/Makefile.in anyfs-tools-0.85.1c.my/src/Makefile.in +--- anyfs-tools-0.85.1c/src/Makefile.in 2006-11-20 03:40:54.000000000 +0300 ++++ anyfs-tools-0.85.1c.my/src/Makefile.in 2012-02-23 10:43:33.000000000 +0400 +@@ -17,7 +17,7 @@ + REBLOCKLDFLAGS= -lany + BDITLDFLAGS= -lany + +-all: reblock build_it anysurrect_util build_e2fs_util $(XFS_UTILS) $(ANYFUSE_MODULE) ++all: reblock build_it anysurrect_util $(XFS_UTILS) $(ANYFUSE_MODULE) + + reblock: $(OBJREBLOCK) + $(CC) $(CCFLAGS) -o $@ $(OBJREBLOCK) $(LDFLAGS) $(REBLOCKLDFLAGS) +@@ -39,7 +39,6 @@ + $(INSTALL) -d $(INSTALLPATH)/sbin + $(INSTALL) reblock build_it $(INSTALLPATH)/sbin + $(MAKE) $(AM_MAKEFLAGS) -C anysurrect install +- $(MAKE) $(AM_MAKEFLAGS) -C build_e2fs install + $(MAKE) $(AM_MAKEFLAGS) -C build_xfs install + $(MAKE) $(AM_MAKEFLAGS) -C anyfuse install + diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index 7af95150b..60a20a49d 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56916 2011-10-16 17:30:46Z spupykin $ +# $Id: PKGBUILD 66360 2012-02-24 00:42:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Pranaitis <jens@jenux.homelinux.org> pkgname=busybox -pkgver=1.19.2 -pkgrel=3 +pkgver=1.19.4 +pkgrel=1 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64") url="http://www.busybox.net" @@ -13,7 +13,7 @@ makedepends=("make" "gcc" "sed" "ncurses") source=($url/downloads/$pkgname-$pkgver.tar.bz2 config) install=busybox.install -md5sums=('50267054345f1a0b77fe65f6e0e5ba29' +md5sums=('9c0cae5a0379228e7b55e5b29528df8e' 'edd5c66c974ccc1b0030fd00beaa1b02') build() { diff --git a/community/busybox/busybox.install b/community/busybox/busybox.install index 233b70799..72a1e98b3 100644 --- a/community/busybox/busybox.install +++ b/community/busybox/busybox.install @@ -4,10 +4,10 @@ post_install() { } pre_upgrade() { - stat -c %a /bin/busybox >tmp/busybox.upgrade.script + stat -c %a bin/busybox >tmp/busybox.upgrade.script } post_upgrade() { - [ -f tmp/busybox.upgrade.script ] && chmod `cat tmp/busybox.upgrade.script` /bin/busybox + [ -f tmp/busybox.upgrade.script ] && chmod `cat tmp/busybox.upgrade.script` bin/busybox rm -f tmp/busybox.upgrade.script } diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index 1ea5f1978..594fa3f30 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62726 2012-01-25 08:16:40Z lfleischer $ +# $Id: PKGBUILD 66292 2012-02-23 13:43:57Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef pkgver=0.5.1 -pkgrel=4 +pkgrel=5 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64') url='http://deadbeef.sourceforge.net' diff --git a/community/ecryptfs-utils/PKGBUILD b/community/ecryptfs-utils/PKGBUILD index efdbf8817..1e1ed1b53 100644 --- a/community/ecryptfs-utils/PKGBUILD +++ b/community/ecryptfs-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61018 2011-12-20 16:47:52Z tredaelli $ +# $Id: PKGBUILD 66344 2012-02-23 20:45:16Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Richard Murri <admin@richardmurri.com> # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=ecryptfs-utils -pkgver=95 +pkgver=96 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux" @@ -14,7 +14,7 @@ makedepends=('swig' 'intltool' 'gettext') depends=('keyutils' 'nss' 'python2') source=("http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz") options=(!libtool) -md5sums=('b015c89d9c684bd1c10b57c7c8d40577') +md5sums=('4f92c9f6e8f62ac00ca7e2c4e480f1d7') build() { cd "$srcdir/${pkgname}-${pkgver}" diff --git a/community/gmerlin-avdecoder/PKGBUILD b/community/gmerlin-avdecoder/PKGBUILD index c915337bf..8974c2774 100644 --- a/community/gmerlin-avdecoder/PKGBUILD +++ b/community/gmerlin-avdecoder/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 63594 2012-02-05 11:58:46Z ibiru $ +# $Id: PKGBUILD 66296 2012-02-23 13:44:15Z allan $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin-avdecoder pkgver=1.1.0 -pkgrel=4 +pkgrel=5 pkgdesc="Media decoding library" arch=('i686' 'x86_64') url="http://gmerlin.sourceforge.net/avdec_frame.html" diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index ef8b7aa08..433af970c 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 63592 2012-02-05 11:58:41Z ibiru $ +# $Id: PKGBUILD 66294 2012-02-23 13:44:07Z allan $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin pkgver=1.0.0 -pkgrel=5 +pkgrel=6 pkgdesc="Multimedia architecture for Linux" arch=('i686' 'x86_64') url="http://openmovieeditor.sourceforge.net/HomePage" diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD index 507b7c3f7..7e354a274 100644 --- a/community/hostapd/PKGBUILD +++ b/community/hostapd/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 48888 2011-06-07 11:05:59Z spupykin $ +# $Id: PKGBUILD 66310 2012-02-23 14:02:47Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> _madwifiver=0.9.4.4133 pkgname=hostapd pkgver=0.7.3 -pkgrel=5 +pkgrel=7 pkgdesc="daemon for wireless software access points" arch=('i686' 'x86_64') url="http://hostap.epitest.fi/hostapd/" license=('custom') depends=('openssl' 'libnl') -makedepends=('svn') +makedepends=() provides=('hostapd') conflicts=('hostapd') backup=('etc/hostapd/hostapd.conf' @@ -27,51 +27,46 @@ backup=('etc/hostapd/hostapd.conf' install=hostapd.install source=(http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz ftp://ftp.archlinux.org/other/madwifi/madwifi-${_madwifiver}.tar.bz2 - config.bz2 + hostap_allow-linking-with-libnl-3.2.patch + config hostapd hostapd.conf.d) md5sums=('91a7c8d0f090b7104152d3455a84c112' 'ca3c3504d000e7b3d7063af46271c932' - '5d087e2e047ffceb3218e6b2b68fb3bf' + 'e904e62b12c5d64132dd9441e8b45dce' + 'bfe5701bc93d5d091e6f1a93f1a32dd6' 'd570327c385f34a4af24d3a0d61cea19' 'f169534b0f59b341f6df1a21e0344511') build() { - cd $srcdir/$pkgname-$pkgver/hostapd + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch" - cp ../../config ./.config + cd hostapd + cp "$srcdir/config" ./.config - sed -i "s|/usr|$srcdir/madwifi|" .config - sed -i "s|/usr/local/bin|$pkgdir/usr/bin|" Makefile - - mkdir -p $pkgdir/usr/bin $pkgdir/etc/hostapd \ - $pkgdir/usr/man/man1 $pkgdir/usr/man/man8 \ - $pkgdir/usr/share/licenses/$pkgname $pkgdir/etc/rc.d + sed -i "s|@@madwifi@@|$srcdir/madwifi|" .config + sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf make } package() { - cd $srcdir/$pkgname-$pkgver/hostapd - make DESTDIR=$pkg install + cd "$srcdir/$pkgname-$pkgver/hostapd" + + install -D hostapd "$pkgdir/usr/bin/hostapd" + install hostapd_cli "$pkgdir/usr/bin/hostapd_cli" + + install -Dm644 hlr_auc_gw.milenage_db "$pkgdir/etc/hostapd/hlr_auc_gw.milenage_db" + install -m644 -t "$pkgdir/etc/hostapd" \ + hostapd.{accept,conf,deny,eap_user,radius_clients,sim_db,vlan,wpa_psk} \ + wired.conf + + install -Dm644 hostapd.8 "$pkgdir/usr/share/man/man8/hostapd.8" + install -Dm644 hostapd_cli.1 "$pkgdir/usr/share/man/man1/hostapd_cli.1" - cp hlr_auc_gw.milenage_db $pkgdir/etc/hostapd - cp hostapd.accept $pkgdir/etc/hostapd - cp hostapd.conf $pkgdir/etc/hostapd - cp hostapd.deny $pkgdir/etc/hostapd - cp hostapd.eap_user $pkgdir/etc/hostapd - cp hostapd.radius_clients $pkgdir/etc/hostapd - cp hostapd.sim_db $pkgdir/etc/hostapd - cp hostapd.vlan $pkgdir/etc/hostapd - cp hostapd.wpa_psk $pkgdir/etc/hostapd - cp wired.conf $pkgdir/etc/hostapd - cp hostapd.8 $pkgdir/usr/man/man8 - cp hostapd_cli.1 $pkgdir/usr/man/man1 - cp ../COPYING $pkgdir/usr/share/licenses/hostapd - cp ../../hostapd $pkgdir/etc/rc.d - mkdir -p $pkgdir/etc/conf.d - cp ../../hostapd.conf.d $pkgdir/etc/conf.d/hostapd + install -D "$srcdir/hostapd" "$pkgdir/etc/rc.d/hostapd" + install -Dm644 "$srcdir/hostapd.conf.d" "$pkgdir/etc/conf.d/hostapd" - mv $pkgdir/usr/man $pkgdir/usr/share/ - sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' $pkgdir/etc/hostapd/hostapd.conf + install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/community/hostapd/config b/community/hostapd/config new file mode 100644 index 000000000..d77e77461 --- /dev/null +++ b/community/hostapd/config @@ -0,0 +1,96 @@ +# Example hostapd build time configuration +# +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cass, these lines should use += in order not +# to override previous values of the variables. + +# Driver interface for Host AP driver +CONFIG_DRIVER_HOSTAP=y + +# Driver interface for wired authenticator +CONFIG_DRIVER_WIRED=y + +# Driver interface for madwifi driver +CONFIG_DRIVER_MADWIFI=y +CFLAGS += -I@@madwifi@@ # change to reflect local setup; directory for madwifi src + +# Driver interface for Prism54 driver +CONFIG_DRIVER_PRISM54=y + +# IEEE 802.11F/IAPP +CONFIG_IAPP=y + +# WPA2/IEEE 802.11i RSN pre-authentication +CONFIG_RSN_PREAUTH=y + +# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) +CONFIG_PEERKEY=y + +# IEEE 802.11w (management frame protection) +# This version is an experimental implementation based on IEEE 802.11w/D1.0 +# draft and is subject to change since the standard has not yet been finalized. +# Driver support is also needed for IEEE 802.11w. +CONFIG_IEEE80211W=y + +# Integrated EAP server +CONFIG_EAP=y + +# EAP-MD5 for the integrated EAP server +CONFIG_EAP_MD5=y + +# EAP-TLS for the integrated EAP server +CONFIG_EAP_TLS=y + +# EAP-MSCHAPv2 for the integrated EAP server +CONFIG_EAP_MSCHAPV2=y + +# EAP-PEAP for the integrated EAP server +CONFIG_EAP_PEAP=y + +# EAP-GTC for the integrated EAP server +CONFIG_EAP_GTC=y + +# EAP-TTLS for the integrated EAP server +CONFIG_EAP_TTLS=y + +# EAP-SIM for the integrated EAP server +CONFIG_EAP_SIM=y + +# EAP-AKA for the integrated EAP server +CONFIG_EAP_AKA=y + +# EAP-PAX for the integrated EAP server +CONFIG_EAP_PAX=y + +# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK) +CONFIG_EAP_PSK=y + +# EAP-SAKE for the integrated EAP server +CONFIG_EAP_SAKE=y + +# EAP-GPSK for the integrated EAP server +CONFIG_EAP_GPSK=y +# Include support for optional SHA256 cipher suite in EAP-GPSK +CONFIG_EAP_GPSK_SHA256=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) +CONFIG_PKCS12=y + +# RADIUS authentication server. This provides access to the integrated EAP +# server from external hosts using RADIUS. +CONFIG_RADIUS_SERVER=y + +# Build IPv6 support for RADIUS operations +CONFIG_IPV6=y + +CONFIG_DRIVER_NL80211=y + +CONFIG_IEEE80211N=y + +CONFIG_LIBNL32=y diff --git a/community/hostapd/hostap_allow-linking-with-libnl-3.2.patch b/community/hostapd/hostap_allow-linking-with-libnl-3.2.patch new file mode 100644 index 000000000..8e7cd9a97 --- /dev/null +++ b/community/hostapd/hostap_allow-linking-with-libnl-3.2.patch @@ -0,0 +1,42 @@ +Subject: [RFC] hostap: Allow linking with libnl-3. +Date: Tue, 15 Nov 2011 14:30:04 -0000 +From: Ben Greear <greearb@candelatech.com> + +I needed this patch to compile against the latest +libnl code. I added this to my config file: + +CONFIG_LIBNL32=y + +Signed-hostap: Ben Greear <greearb@candelatech.com> +rediffed against 0.7.3 by Stefan Lippers-Hollmann <s.l-h@gmx.de> + +--- +:100644 100644 5caeec5... 0cc81f9... M src/drivers/drivers.mak + src/drivers/drivers.mak | 21 ++++++++++++++------- + 2 files changed, 29 insertions(+), 14 deletions(-) + +--- a/src/drivers/drivers.mak ++++ b/src/drivers/drivers.mak +@@ -31,11 +31,18 @@ NEED_SME=y + NEED_AP_MLME=y + NEED_NETLINK=y + NEED_LINUX_IOCTL=y +-DRV_LIBS += -lnl ++ifdef CONFIG_LIBNL32 ++ DRV_LIBS += -lnl-3 ++ DRV_LIBS += -lnl-genl-3 ++ DRV_CFLAGS += -DCONFIG_LIBNL20 ++ DRV_CFLAGS += -I/usr/include/libnl3/ ++else ++ DRV_LIBS += -lnl + +-ifdef CONFIG_LIBNL20 +-DRV_LIBS += -lnl-genl +-DRV_CFLAGS += -DCONFIG_LIBNL20 ++ ifdef CONFIG_LIBNL20 ++ DRV_LIBS += -lnl-genl ++ DRV_CFLAGS += -DCONFIG_LIBNL20 ++ endif + endif + endif + diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD index 28e2ea582..710e7ce51 100644 --- a/community/hwinfo/PKGBUILD +++ b/community/hwinfo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56757 2011-10-11 21:02:19Z arodseth $ +# $Id: PKGBUILD 66324 2012-02-23 14:26:30Z arodseth $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Gergely Imreh <imrehgATgmailDOTcom> @@ -6,40 +6,42 @@ # Contributor: madeye # Contributor: Ranguvar # Contributor: ninja_pt + pkgname=hwinfo -pkgver=19.0 -pkgrel=2 +pkgver=19.1 +_subver=1.2 +pkgrel=1 pkgdesc='Hardware detection tool from openSUSE' arch=('x86_64' 'i686') url='http://www.opensuse.org/' license=('GPL2') depends=('perl' 'libx86emu') makedepends=('sysfsutils' 'rpmextract' 'flex') -source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/${pkgname}-${pkgver}-1.1.src.rpm" +source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$pkgver-$_subver.src.rpm" 'custom_ioctl.patch') -md5sums=('751238feaa13449324593ee5e145cd56' - '1500ecfa26f6aaf4d7967eea74e86e5d') +sha256sums=('77b67512f7a7a027200233b6c89be2b777f96b2a6d742b695cb062f9cf4ec258' + '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d') build() { - cd "${srcdir}" + cd "$srcdir" msg2 "Extracting source rpm..." - rpmextract.sh "${pkgname}-${pkgver}-1.1.src.rpm" - tar jxf ${pkgname}-${pkgver}.tar.bz2 - cd "${pkgname}-${pkgver}" + rpmextract.sh "$pkgname-$pkgver-$_subver.src.rpm" + tar jxf $pkgname-$pkgver.tar.bz2 + cd "$pkgname-$pkgver" msg2 "Patching..." patch -p0 < ../custom_ioctl.patch msg2 "Compiling..." - make -j1 CFLAGS+="-fPIC -I${srcdir}/${pkgname}-${pkgver}/src/hd" LIBDIR=/usr/lib + make -j1 CFLAGS+="-fPIC -I$srcdir/$pkgname-$pkgver/src/hd" LIBDIR=/usr/lib } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" msg2 "Packaging files..." - make LIBDIR=/usr/lib DESTDIR=${pkgdir} install + make LIBDIR=/usr/lib DESTDIR="$pkgdir" install msg2 "Cleaning up..." - rmdir "${pkgdir}/sbin" + rmdir "$pkgdir/sbin" } # vim:set ts=2 sw=2 et: diff --git a/community/ipvsadm/01-fix-not-showing-all-server.patch b/community/ipvsadm/01-fix-not-showing-all-server.patch new file mode 100644 index 000000000..dea23bf76 --- /dev/null +++ b/community/ipvsadm/01-fix-not-showing-all-server.patch @@ -0,0 +1,24 @@ +diff -urN ipvsadm-1.26.vanilla/libipvs/ip_vs.h ipvsadm-1.26/libipvs/ip_vs.h +--- ipvsadm-1.26.vanilla/libipvs/ip_vs.h 2011-02-06 18:38:57.000000000 -0800 ++++ ipvsadm-1.26/libipvs/ip_vs.h 2011-08-23 15:03:59.000000000 -0700 +@@ -413,7 +413,7 @@ + __IPVS_CMD_ATTR_MAX, + }; + +-#define IPVS_CMD_ATTR_MAX (__IPVS_SVC_ATTR_MAX - 1) ++#define IPVS_CMD_ATTR_MAX (__IPVS_CMD_ATTR_MAX - 1) + + /* + * Attributes used to describe a service +diff -urN ipvsadm-1.26.vanilla/libipvs/ip_vs_nl_policy.c +ipvsadm-1.26/libipvs/ip_vs_nl_policy.c +--- ipvsadm-1.26.vanilla/libipvs/ip_vs_nl_policy.c 2008-09-18 +08:57:37.000000000 -0700 ++++ ipvsadm-1.26/libipvs/ip_vs_nl_policy.c 2011-08-23 14:45:34.000000000 -0700 +@@ -26,6 +26,8 @@ + [IPVS_SVC_ATTR_TIMEOUT] = { .type = NLA_U32 }, + [IPVS_SVC_ATTR_NETMASK] = { .type = NLA_U32 }, + [IPVS_SVC_ATTR_STATS] = { .type = NLA_NESTED }, ++ [IPVS_SVC_ATTR_PE_NAME] = { .type = NLA_STRING, ++ .maxlen = IP_VS_PENAME_MAXLEN}, + }; diff --git a/community/ipvsadm/PKGBUILD b/community/ipvsadm/PKGBUILD index b197164c0..94a0e668c 100644 --- a/community/ipvsadm/PKGBUILD +++ b/community/ipvsadm/PKGBUILD @@ -1,28 +1,31 @@ -# $Id$ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# $Id: PKGBUILD 66312 2012-02-23 14:03:04Z allan $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=ipvsadm pkgver=1.26 -pkgrel=1 +pkgrel=3 pkgdesc='The IP Virtual Server administration utility' arch=('i686' 'x86_64') url='http://www.linuxvirtualserver.org/software/ipvs.html' license=('GPL2') -depends=('libnl' 'popt') +depends=('libnl1' 'popt') backup=('etc/conf.d/ipvsadm') #options=('!makeflags') source=("http://www.linuxvirtualserver.org/software/kernel-2.6/$pkgname-$pkgver.tar.gz" 'ipvsadm.rc' 'ipvsadm.conf' - 'ipvsadm.rules') + 'ipvsadm.rules' + '01-fix-not-showing-all-server.patch') md5sums=('eac3ba3f62cd4dea2da353aeddd353a8' '0e106fce0675e014bea0f9355b947bd6' 'cd358130967a9cc0d31fc61282df43e7' - 'cd6649c647e495d4d6f981542ce5a93b') + 'cd6649c647e495d4d6f981542ce5a93b' + 'e9fb77d2fbe2d3f41d60257316338543') build() { cd ${pkgname}-${pkgver} + patch -p1 -i ../01-fix-not-showing-all-server.patch make INCLUDE="-I/usr/src/linux-`uname -r`/include -I.. -I." || return 1 } diff --git a/community/irrlicht/PKGBUILD b/community/irrlicht/PKGBUILD index c4b0ceccd..ca166de12 100644 --- a/community/irrlicht/PKGBUILD +++ b/community/irrlicht/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63632 2012-02-05 12:02:14Z ibiru $ +# $Id: PKGBUILD 66356 2012-02-23 23:04:08Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Hilton Medeiros <medeiros.hilton AT gmail DOT com> # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com> @@ -6,8 +6,8 @@ # Contributor: Lukas Kropatschek <lukas.krop AT gmail DOT com> pkgname=irrlicht -pkgver=1.7.2 -pkgrel=4 +pkgver=1.7.3 +pkgrel=1 pkgdesc="An open source high performance realtime 3D graphics engine." arch=('i686' 'x86_64') url="http://irrlicht.sourceforge.net/" @@ -16,9 +16,9 @@ depends=('libgl' 'libjpeg' 'bzip2' 'libpng') makedepends=('mesa' 'unzip') source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip" "irrlicht-1.7.2-libpng15.patch") -md5sums=('eb627d4c432bf73f12bc6d9ddc700b07' - 'a7f8d4aa1bc2880bbeaf3449e09f69a5') noextract=($pkgname-$pkgver.zip) +md5sums=('cfbdc8c68fbca544c7c8dfb3623ae086' + 'a7f8d4aa1bc2880bbeaf3449e09f69a5') build() { unzip $pkgname-$pkgver.zip @@ -34,24 +34,9 @@ build() { include/IrrCompileConfig.h cd source/Irrlicht - sed -i -e '/^CXXFLAGS/s:-g.*::' \ - -e '/^CXXFLAGS/s:-Wall::' \ - -e '/^CFLAGS/s/:= -O3 -fexpensive-optimizations/+=/' \ - -e '/^CXXINCS/s:-Izlib -Ijpeglib -Ilibpng::' \ - -e '/^ZLIBOBJ/d' \ - -e '/^JPEGLIBOBJ/d' \ - -e '/^BZIP2OBJ/d' \ - -e '/^LIBPNGOBJ/d' \ - -e '/.o=.d/d' \ - -e '/^staticlib sharedlib: LDFLAGS/s:+=.*:+= -lGL -lXxf86vm -lpng -ljpeg -lbz2 -lz:' \ - -e "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" \ - -e 's/0-SVN/1/' \ - -e 's/.$(VERSION_MINOR) -o/ -o/' \ + sed -i "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" \ Makefile - sed -i "s/png_set_gray_1_2_4_to_8/png_set_expand_gray_1_2_4_to_8/" \ - CImageLoaderPNG.cpp - make sharedlib make diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD index 79361ec90..ad7fa29f4 100644 --- a/community/keepalived/PKGBUILD +++ b/community/keepalived/PKGBUILD @@ -1,16 +1,16 @@ # $Id$ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=keepalived pkgver=1.2.2 -pkgrel=1 -pkgdesc='implements an independent VRRPv2 stack and a userspace daemon for LVS cluster nodes healthchecks and LVS directors failover' +pkgrel=3 +pkgdesc='Failover and monitoring daemon for LVS clusters' arch=('i686' 'x86_64') url='http://www.keepalived.org/' license=('GPL2') backup=('etc/keepalived/keepalived.conf' 'etc/conf.d/keepalived') -depends=('openssl' 'popt' 'libnl') +depends=('openssl' 'popt' 'libnl1') source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" 'keepalived.rc' 'keepalived.conf' @@ -28,10 +28,6 @@ build() { } package() { - # add initscripts - install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname" - install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname" - cd $pkgname-$pkgver make DESTDIR="$pkgdir" install # clean pacakge init scripts @@ -39,6 +35,11 @@ package() { # move examples to /usr/share install -d -m 755 "$pkgdir/usr/share/$pkgname" mv "$pkgdir/etc/keepalived/samples" "$pkgdir/usr/share/$pkgname/samples" + + # add initscripts + install -D -m 755 ../$pkgname.rc "${pkgdir}/etc/rc.d/$pkgname" + install -D -m 644 ../$pkgname.conf "${pkgdir}/etc/conf.d/$pkgname" + } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD index 59b346dac..de09a5f07 100644 --- a/community/knemo/PKGBUILD +++ b/community/knemo/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 61797 2012-01-07 22:46:40Z lcarlier $ +# $Id: PKGBUILD 66316 2012-02-23 14:03:25Z allan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com> pkgname=knemo pkgver=0.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="The KDE Network Monitor" arch=('i686' 'x86_64') url="http://www.kde-apps.org/content/show.php?content=12956" license=('GPL') -depends=('kdebase-workspace' 'wireless_tools' 'iw') +depends=('kdebase-workspace' 'wireless_tools' 'iw' 'libnl1' + 'gtk-update-icon-cache') makedepends=('cmake' 'automoc4') install=${pkgname}.install options=('libtool') diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 5038f5816..2abdad16a 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61826 2012-01-08 18:22:27Z spupykin $ +# $Id: PKGBUILD 66318 2012-02-23 14:03:47Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=0.9.9 +pkgver=0.9.10 pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('LGPL') depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2' 'netcf') + 'iproute2' 'netcf' 'libnl1') makedepends=('pkgconfig' 'lvm2') optdepends=('bridge-utils: for briged networking (default)' 'dnsmasq: for NAT/DHCP for guests' @@ -37,7 +37,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" openbsd-netcat-default.patch unixperms.patch yajl-2.x.patch) -md5sums=('37c4bf8cdd4c76150bc0c1d249945d27' +md5sums=('a424bb793521e637349da47e93dd5fff' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' '737ec24aa56871fbabfa892789457db4' @@ -68,7 +68,7 @@ build() { export LDFLAGS=-lX11 [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ - --with-storage-lvm --without-xen --with-udev --without-hal + --with-storage-lvm --without-xen --with-udev --without-hal --disable-static find -name Makefile -exec sed -i 's#-L /usr#-L/usr#' {} \; make -j1 } diff --git a/community/mairix/PKGBUILD b/community/mairix/PKGBUILD index 4078c4e22..b041bd02e 100644 --- a/community/mairix/PKGBUILD +++ b/community/mairix/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 18519 2010-06-07 11:11:39Z spupykin $ +# $Id: PKGBUILD 66226 2012-02-23 05:02:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> # Contributor: Giorgio Lando <patroclo7@gmail.com> @@ -6,7 +6,7 @@ pkgname=mairix pkgver=0.22 -pkgrel=1 +pkgrel=2 pkgdesc="A program for indexing and searching emails" arch=('i686' 'x86_64') url="http://www.rpcurnow.force9.co.uk/mairix/" @@ -20,10 +20,10 @@ md5sums=('6c6aaca19c2b2de3bf567b856705ce1a') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir install || return 1 + make + make DESTDIR=$pkgdir install mkdir -p $pkgdir/usr/share/ - mv $pkgdir/usr/man $pkgdir/usr/share/ && \ + mv $pkgdir/usr/man $pkgdir/usr/share/ install -D -m 644 dotmairixrc.eg $pkgdir/etc/mairixrc.sample } diff --git a/community/matchbox-desktop/PKGBUILD b/community/matchbox-desktop/PKGBUILD index 637edc3e2..3af5a9717 100644 --- a/community/matchbox-desktop/PKGBUILD +++ b/community/matchbox-desktop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58996 2011-11-20 19:49:57Z spupykin $ +# $Id: PKGBUILD 66229 2012-02-23 05:03:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com> pkgname=matchbox-desktop pkgver=2.0 -pkgrel=2 +pkgrel=3 pkgdesc="A PDA style application launcher or 'item browser'." arch=('i686' 'x86_64') license=('GPL') @@ -16,7 +16,7 @@ md5sums=('b0a4a47130272e2adab4e9feb43a6c9c') build() { cd $srcdir/$pkgname-$pkgver - ./configure --sysconfdir=/etc --prefix=/usr --enable-startup-notification + LDFLAGS=-lX11 ./configure --sysconfdir=/etc --prefix=/usr --enable-startup-notification make make DESTDIR=$pkgdir install } diff --git a/community/matchbox-keyboard/PKGBUILD b/community/matchbox-keyboard/PKGBUILD index 51d822e22..a2a6e34cf 100644 --- a/community/matchbox-keyboard/PKGBUILD +++ b/community/matchbox-keyboard/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58999 2011-11-20 19:51:14Z spupykin $ +# $Id: PKGBUILD 66225 2012-02-23 05:01:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=matchbox-keyboard pkgver=0.1 -pkgrel=3 +pkgrel=4 pkgdesc="An on screen virtual keyboard" arch=('i686' 'x86_64') depends=('cairo' 'libfakekey' 'libxft') diff --git a/community/matchbox-panel/PKGBUILD b/community/matchbox-panel/PKGBUILD index 043e03d17..81d0eb80d 100644 --- a/community/matchbox-panel/PKGBUILD +++ b/community/matchbox-panel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59002 2011-11-20 19:52:18Z spupykin $ +# $Id: PKGBUILD 66225 2012-02-23 05:01:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com> pkgname=matchbox-panel pkgver=0.9.3 -pkgrel=4 +pkgrel=5 pkgdesc="A flexible always present 'window bar' for holding application launchers and small 'applet' style applications" arch=('i686' 'x86_64') license=('GPL') diff --git a/community/matchbox-window-manager/PKGBUILD b/community/matchbox-window-manager/PKGBUILD index 8a093e686..888dc2d37 100644 --- a/community/matchbox-window-manager/PKGBUILD +++ b/community/matchbox-window-manager/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59005 2011-11-20 19:53:19Z spupykin $ +# $Id: PKGBUILD 66232 2012-02-23 05:07:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com> pkgname=matchbox-window-manager pkgver=1.2 -pkgrel=2 +pkgrel=3 pkgdesc="A pretty much unique X window manager with a classic PDA management policy" arch=('i686' 'x86_64') license=('GPL') diff --git a/community/mcabber/PKGBUILD b/community/mcabber/PKGBUILD index 603298562..f4a81248c 100644 --- a/community/mcabber/PKGBUILD +++ b/community/mcabber/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58853 2011-11-19 00:17:45Z andrea $ +# $Id: PKGBUILD 66233 2012-02-23 05:07:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: 3ED <kas1987@o2.pl> pkgname=mcabber pkgver=0.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="a small Jabber console client, includes features: SSL, PGP, MUC, UTF8" arch=('i686' 'x86_64') url="http://www.lilotux.net/~mikael/mcabber/" diff --git a/community/mednafen/ChangeLog b/community/mednafen/ChangeLog index a3097076c..54b01d58f 100644 --- a/community/mednafen/ChangeLog +++ b/community/mednafen/ChangeLog @@ -1,3 +1,6 @@ +2012-02-23 Allan McRae <allan@archlinux.org> + * Rebuild for libcdio soname bumps + 2011-05-17 Angel Velasquez <angvp@archlinux.org> * Updated to 0.8.D.3 * Removed fix_build patch diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD index 88e469afc..802249f21 100755 --- a/community/mednafen/PKGBUILD +++ b/community/mednafen/PKGBUILD @@ -1,21 +1,25 @@ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: kagan <juanynie@mi.madritel.es> + pkgname=mednafen pkgver=0.8.D.3 -pkgrel=1 +pkgrel=2 pkgdesc="A command-line multi-system gaming emulator" url="http://mednafen.sourceforge.net/" -license=(GPL) +license=('GPL') arch=('i686' 'x86_64') -depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib') +depends=('libcdio' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib') makedepends=('pkgconfig' 'mesa') changelog=ChangeLog -source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2) -md5sums=('57d22805071becd81858b0c088a275e5') +source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2 + mednafen-0.8.13.3-zlib-1.2.6.patch) +md5sums=('57d22805071becd81858b0c088a275e5' + '450bb5aa7552db5b8f6d6713bdb725ce') build() { cd $srcdir/$pkgname + patch -Np1 -i $srcdir/mednafen-0.8.13.3-zlib-1.2.6.patch ./configure --prefix=/usr make } diff --git a/community/mednafen/mednafen-0.8.13.3-zlib-1.2.6.patch b/community/mednafen/mednafen-0.8.13.3-zlib-1.2.6.patch new file mode 100644 index 000000000..9437f76ce --- /dev/null +++ b/community/mednafen/mednafen-0.8.13.3-zlib-1.2.6.patch @@ -0,0 +1,29 @@ +--- mednafen.orig/src/file.cpp ++++ mednafen/src/file.cpp +@@ -229,7 +229,7 @@ + goto doret; + } + +- while((howmany = gzread(tz, tmp->data + cur_size, cur_alloced - cur_size)) > 0) ++ while((howmany = gzread((gzFile)tz, tmp->data + cur_size, cur_alloced - cur_size)) > 0) + { + cur_size += howmany; + cur_alloced <<= 1; +@@ -282,7 +282,7 @@ + } + else if(type == MDFN_FILETYPE_GZIP) + { +- gzclose(tz); ++ gzclose((gzFile)tz); + } + else if(type == MDFN_FILETYPE_ZIP) + { +@@ -444,7 +444,7 @@ + + if(!(fceufp = MakeMemWrap(t, 1))) + { +- gzclose(t); ++ gzclose((gzFile)t); + return(0); + } + diff --git a/community/metamail/PKGBUILD b/community/metamail/PKGBUILD index 9f45530ed..71922cd14 100644 --- a/community/metamail/PKGBUILD +++ b/community/metamail/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 21419 2010-07-16 12:02:09Z spupykin $ +# $Id: PKGBUILD 66234 2012-02-23 05:08:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sekenre <sekenre at ukfsn dot org> # Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com> pkgname=metamail pkgver=2.7 -pkgrel=5 +pkgrel=6 pkgdesc="Used to display and process MIME messages" arch=('i686' 'x86_64') url="http://packages.debian.org/stable/mail/metamail" @@ -23,13 +23,13 @@ md5sums=('c6967e9bc5d3c919764b02df24efca01' build() { cd $srcdir/metamail-$pkgver.orig - zcat $srcdir/metamail_$pkgver-54.diff.gz | patch -p1 + patch -p1 <$srcdir/metamail_$pkgver-54.diff sed -i 's|getline|xgetline|' metamail/uue.c src/metamail/uue.c sh ./bootstrap - sh ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 + sh ./configure --prefix=/usr + make + make DESTDIR=$pkgdir install install -D -m0644 $srcdir/license $pkgdir/usr/share/licenses/$pkgname/license } diff --git a/community/mftrace/PKGBUILD b/community/mftrace/PKGBUILD index 6d03e7608..8bc526c61 100644 --- a/community/mftrace/PKGBUILD +++ b/community/mftrace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 43118 2011-03-24 07:48:42Z spupykin $ +# $Id: PKGBUILD 66235 2012-02-23 05:09:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=mftrace pkgver=1.2.17 -pkgrel=1 +pkgrel=2 pkgdesc="Traces TeX bitmap fonts into PFA, PFB, or TTF" arch=('i686' 'x86_64') url="http://lilypond.org/mftrace/" diff --git a/community/mimetex/PKGBUILD b/community/mimetex/PKGBUILD index e6ceb75de..234f2e4c4 100644 --- a/community/mimetex/PKGBUILD +++ b/community/mimetex/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 59132 2011-11-21 12:05:32Z spupykin $ +# $Id: PKGBUILD 66237 2012-02-23 05:11:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=mimetex pkgver=1.70 -pkgrel=2 +pkgrel=3 pkgdesc="tex to gif converter" arch=(i686 x86_64) url="http://www.forkosh.com/mimetex.html" diff --git a/community/minbif/PKGBUILD b/community/minbif/PKGBUILD index a762e584e..c4e29c400 100644 --- a/community/minbif/PKGBUILD +++ b/community/minbif/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54473 2011-08-18 15:08:10Z bluewind $ +# $Id: PKGBUILD 66328 2012-02-23 15:30:58Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: AkiraYB <brunoyb!yahoo,com,br> pkgname=minbif -pkgver=1.0.4 -pkgrel=4 +pkgver=1.0.5 +pkgrel=1 pkgdesc='An IRC gateway to IM networks that uses libpurple.' arch=('i686' 'x86_64') url='http://minbif.im/' @@ -15,9 +15,9 @@ optdepends=('xinetd: to run minbif through xinetd') backup=('etc/minbif/minbif.conf' 'etc/minbif/minbif.motd') install='minbif.install' -source=("http://minbif.im/attachments/download/90/${pkgname}-${pkgver}.tar.gz" +source=("http://minbif.im/attachments/download/148/${pkgname}-${pkgver}.tar.gz" 'minbif') -md5sums=('25069fb6015dfb9ddc24ef2e09e74da3' +md5sums=('00c5c1abbe2b8a9d900961832c7909a8' '307a6fab42bcaeed11a55b5fb4589778') build() { diff --git a/community/mingw32-pthreads/PKGBUILD b/community/mingw32-pthreads/PKGBUILD index 842a8352a..48a1ca469 100644 --- a/community/mingw32-pthreads/PKGBUILD +++ b/community/mingw32-pthreads/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 50731 2011-06-30 10:05:09Z spupykin $ +# $Id: PKGBUILD 66225 2012-02-23 05:01:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Marcel Schneider marcelATcoopmastersDOTde pkgname=mingw32-pthreads pkgver=2.8.0 _pkgver=2-8-0 -pkgrel=2 +pkgrel=3 arch=(i686 x86_64) pkgdesc="The POSIX 1003.1-2001 standard for writing multithreaded applications." license=(LGPL) diff --git a/community/mktorrent/PKGBUILD b/community/mktorrent/PKGBUILD index 6eff9a3c4..495ea2b59 100644 --- a/community/mktorrent/PKGBUILD +++ b/community/mktorrent/PKGBUILD @@ -1,8 +1,9 @@ +# $Id: PKGBUILD 66239 2012-02-23 05:13:18Z spupykin $ # Contributor: Emil Renner Berthing <esmil@users.sourceforge.net> pkgname=mktorrent pkgver=1.0 -pkgrel=2 +pkgrel=3 pkgdesc='Simple command line utility to create BitTorrent metainfo files' arch=('i686' 'x86_64') url='http://mktorrent.sourceforge.net/' diff --git a/community/mp3gain/PKGBUILD b/community/mp3gain/PKGBUILD index 88ba47c5a..d3ec615a4 100644 --- a/community/mp3gain/PKGBUILD +++ b/community/mp3gain/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 27735 2010-09-27 10:44:54Z spupykin $ +# $Id: PKGBUILD 66240 2012-02-23 05:13:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alessio 'mOLOk' Bolognino <themolok@gmail.com> # Contributor: keith <keith@hubbard.net> pkgname=mp3gain pkgver=1.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="Lossless mp3 normalizer with statistical analysis " arch=('i686' 'x86_64') url="http://mp3gain.sourceforge.net" diff --git a/community/mp3info/PKGBUILD b/community/mp3info/PKGBUILD index 1acf47a00..e661e929c 100644 --- a/community/mp3info/PKGBUILD +++ b/community/mp3info/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 17596 2010-05-24 15:32:08Z spupykin $ +# $Id: PKGBUILD 66241 2012-02-23 05:14:32Z spupykin $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=mp3info pkgver=0.8.5a -pkgrel=3 +pkgrel=4 pkgdesc="An MP3 technical info viewer and ID3 1.x tag editor" arch=('i686' 'x86_64') url="http://ibiblio.org/mp3info/" @@ -17,9 +17,9 @@ build() { cd ${srcdir}/$pkgname-$pkgver sed -i "s:-O2:${CFLAGS}:" Makefile - sed -i "s:/usr/bin/install:/bin/install:" Makefile + sed -i "s:/usr/bin/install:/bin/install:" Makefile - make || return 1 + make install -d ${pkgdir}/usr/bin ${pkgdir}/usr/share/man/man1 make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man/man1 install diff --git a/community/mtasc/PKGBUILD b/community/mtasc/PKGBUILD index 30e3284f8..31875d2d4 100644 --- a/community/mtasc/PKGBUILD +++ b/community/mtasc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51324 2011-07-07 13:42:20Z spupykin $ +# $Id: PKGBUILD 66242 2012-02-23 05:15:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Niel Drummond <niel.drummond@grumpytoad.org> pkgname=mtasc pkgver=20091229 -pkgrel=3 +pkgrel=4 pkgdesc="An open source flash (swf) compiler" arch=(i686 x86_64) url="http://mtasc.org/" diff --git a/community/mysql++/PKGBUILD b/community/mysql++/PKGBUILD index 2b7a4ac14..9e461cb03 100644 --- a/community/mysql++/PKGBUILD +++ b/community/mysql++/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51970 2011-07-18 20:04:38Z spupykin $ +# $Id: PKGBUILD 66225 2012-02-23 05:01:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Markus Härer <markus.haerer@gmx.net> pkgname=mysql++ pkgver=3.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="A C++ wraper for MySQLs C API" arch=("i686" "x86_64") url="http://tangentsoft.net/mysql++/" diff --git a/community/nbtscan/PKGBUILD b/community/nbtscan/PKGBUILD index f7c2fd2be..03c637932 100755 --- a/community/nbtscan/PKGBUILD +++ b/community/nbtscan/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59205 2011-11-21 15:02:49Z spupykin $ +# $Id: PKGBUILD 66246 2012-02-23 05:18:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergio Rubio <rubiojr@biondofu.net> pkgname=nbtscan pkgver=1.5.1 -pkgrel=4 +pkgrel=5 pkgdesc="NBTscan is a program for scanning IP networks for NetBIOS name information." arch=('i686' 'x86_64') license=('GPL') diff --git a/community/neatx/PKGBUILD b/community/neatx/PKGBUILD index 003d1bebf..b3e0f345b 100644 --- a/community/neatx/PKGBUILD +++ b/community/neatx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 27121 2010-09-17 15:17:17Z schuay $ +# $Id: PKGBUILD 66247 2012-02-23 05:19:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Nicolas Doualot <packages@slubman.info> pkgname=neatx pkgver=0.3.1 -pkgrel=10 +pkgrel=11 pkgdesc="A free NX server by google" arch=('i686' 'x86_64') url="http://code.google.com/p/neatx/" diff --git a/community/nemesis/PKGBUILD b/community/nemesis/PKGBUILD index c299d0158..b80d7d3fe 100644 --- a/community/nemesis/PKGBUILD +++ b/community/nemesis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44947 2011-04-13 08:59:35Z spupykin $ +# $Id: PKGBUILD 66248 2012-02-23 05:20:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=nemesis pkgver=1.4 -pkgrel=4 +pkgrel=5 pkgdesc="command-line network packet crafting and injection utility" arch=(i686 x86_64) url="http://nemesis.sourceforge.net/" diff --git a/community/net6/PKGBUILD b/community/net6/PKGBUILD index f0ebc38e4..e748926d9 100644 --- a/community/net6/PKGBUILD +++ b/community/net6/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 59157 2011-11-21 12:41:35Z spupykin $ +# $Id: PKGBUILD 66249 2012-02-23 05:21:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: William Rea <sillywilly@gmail.com> @@ -6,7 +6,7 @@ pkgname=net6 pkgver=1.3.12 -pkgrel=2 +pkgrel=3 pkgdesc="A library that provides a TCP protocol abstraction for C++" arch=('i686' 'x86_64') url="http://gobby.0x539.de/" diff --git a/community/netbrake/PKGBUILD b/community/netbrake/PKGBUILD index 3b2e4d053..3eb1bf9cd 100644 --- a/community/netbrake/PKGBUILD +++ b/community/netbrake/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 17605 2010-05-24 15:33:54Z spupykin $ +# $Id: PKGBUILD 66250 2012-02-23 05:21:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=netbrake pkgver=0.2 -pkgrel=3 +pkgrel=4 pkgdesc="Netbrake is an utility to limit the bandwidth used by a process" arch=(i686 x86_64) url="http://www.hping.org/netbrake/" @@ -29,7 +29,7 @@ build() { cp netbrake.h.in netbrake.h sed -i -e 's|#define LIBPATH "@LIBPATH@"|#define LIBPATH "/usr/lib"|g' netbrake.h - make || return 1 + make mkdir -p $pkgdir/usr/bin mkdir -p $pkgdir/usr/lib diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD index cfc7411aa..0383ca4da 100644 --- a/community/netcf/PKGBUILD +++ b/community/netcf/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 60351 2011-12-11 20:20:01Z spupykin $ +# $Id: PKGBUILD 66320 2012-02-23 14:03:54Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com> pkgname=netcf pkgver=0.1.7 -pkgrel=2 +pkgrel=3 pkgdesc="A library for configuring network interfaces" arch=('i686' 'x86_64') license=('LGPL') url="https://fedorahosted.org/netcf/" -depends=('augeas>=0.7.4' 'netcfg' 'libxslt' 'libxml2' 'libnl') +depends=('augeas>=0.7.4' 'netcfg' 'libxslt' 'libxml2' 'libnl1') makedepends=('gcc') options=(!libtool) source=("https://fedorahosted.org/released/netcf/$pkgname-$pkgver.tar.gz" @@ -20,7 +20,7 @@ md5sums=('8e313b623c907eb035cf3948b71fecc2' build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i ${srcdir}/netcf-0.1.7.patch - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/community/netstat-nat/PKGBUILD b/community/netstat-nat/PKGBUILD index c6785d714..a6b7b85ae 100644 --- a/community/netstat-nat/PKGBUILD +++ b/community/netstat-nat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 39342 2011-02-09 09:58:47Z spupykin $ +# $Id: PKGBUILD 66252 2012-02-23 05:24:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=netstat-nat pkgver=1.4.10 -pkgrel=1 +pkgrel=2 pkgdesc="Small program written in C displaying NAT connections, managed by netfilter." url="http://tweegy.nl/projects/netstat-nat/" license=("GPL") diff --git a/community/netwatch/PKGBUILD b/community/netwatch/PKGBUILD index 13953b968..4bbe25890 100644 --- a/community/netwatch/PKGBUILD +++ b/community/netwatch/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 59160 2011-11-21 12:43:25Z spupykin $ +# $Id: PKGBUILD 66253 2012-02-23 05:25:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=netwatch pkgver=1.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="monitor network connections" arch=(i686 x86_64) url="http://www.slctech.org/~mackay/NETWATCH/netwatch.html" diff --git a/community/newsbeuter/PKGBUILD b/community/newsbeuter/PKGBUILD index 52509e5b3..3a06787e7 100644 --- a/community/newsbeuter/PKGBUILD +++ b/community/newsbeuter/PKGBUILD @@ -1,31 +1,32 @@ -# $Id: PKGBUILD 39113 2011-02-06 22:21:51Z jlichtblau $ +# $Id: PKGBUILD 66351 2012-02-23 20:58:14Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Sven Pfleiderer <pfleidi@roothausen.de> pkgname=newsbeuter -pkgver=2.4 +pkgver=2.5 pkgrel=1 pkgdesc="A RSS feed reader for the text console with special Podcast support" arch=('i686' 'x86_64') url="http://www.newsbeuter.org/" license=('custom: MIT') -depends=('curl' 'libxml2' 'sqlite3' 'stfl') +depends=('curl' 'json-c' 'libxml2' 'sqlite3' 'stfl') makedepends=('swig' 'gettext') optdepends=('ruby') options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog -source=(http://www.newsbeuter.org/downloads/$pkgname-$pkgver.tar.gz \ - $pkgname-archlinux.patch) -sha256sums=('62dc8a3daf2f4c1ab6ec6997df0881146b6aa3fe3b29ef70cb644c258a7d0a9a' - '5d76916159fd2b02eefb67e016f109edd0977df5274672685b7f8e0ec9668754') +source=(http://www.newsbeuter.org/downloads/$pkgname-$pkgver.tar.gz) +sha256sums=('abc54b7bee3e062cd166787edf35aadbeb0ae1f5fcc8d955b77143aaca096825') build() { cd ${srcdir}/$pkgname-$pkgver - patch -Np0 -i ${srcdir}/$pkgname-archlinux.patch - make prefix=/usr +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make prefix=/usr DESTDIR=$pkgdir install #license diff --git a/community/newsbeuter/newsbeuter.changelog b/community/newsbeuter/newsbeuter.changelog index 98be69352..f2a048aa1 100644 --- a/community/newsbeuter/newsbeuter.changelog +++ b/community/newsbeuter/newsbeuter.changelog @@ -1,3 +1,6 @@ +2012-02-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * newsbeuter 2.5-1 + 2011-01-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * newsbeuter 2.4-1 diff --git a/community/obexfs/PKGBUILD b/community/obexfs/PKGBUILD index 3e1d404a1..c3472e487 100644 --- a/community/obexfs/PKGBUILD +++ b/community/obexfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 20975 2010-07-13 09:53:35Z spupykin $ +# $Id: PKGBUILD 66254 2012-02-23 05:25:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Packager: cs-cam - me.at.camdaniel.com pkgname=obexfs pkgver=0.12 -pkgrel=2 +pkgrel=3 pkgdesc="FUSE based filesystem using ObexFTP (currently beta)." arch=('i686' 'x86_64') url="http://openobex.triq.net/obexfs" @@ -20,6 +20,6 @@ build() { export OBEXFTP_LIBS="-lobexftp -lmulticobex -lbfb -lopenobex -lbluetooth" ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir install || return 1 + make + make DESTDIR=$pkgdir install } diff --git a/community/openbsd-netcat/PKGBUILD b/community/openbsd-netcat/PKGBUILD index 6c2899eb8..95e4e13bf 100644 --- a/community/openbsd-netcat/PKGBUILD +++ b/community/openbsd-netcat/PKGBUILD @@ -1,10 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 66256 2012-02-23 05:29:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname="openbsd-netcat" pkgver=1.89 -pkgrel=4 +pkgrel=5 +_patch=4 pkgdesc="TCP/IP swiss army knife. OpenBSD variant." arch=('i686' 'x86_64') url="http://packages.debian.org/sid/netcat-openbsd" @@ -12,13 +13,13 @@ license=('BSD') depends=('glib2') makedepends=('gcc' 'make') source=("http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}.orig.tar.gz" - "http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}-${pkgrel}.diff.gz") + "http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}-${_patch}.diff.gz") md5sums=('7238ce15aae43069e96ba7faf03f153e' '00c65aa22243b76998174c733cbb64cc') build() { cd $srcdir/netcat-openbsd-${pkgver}.orig - patch -p1 < ../netcat-openbsd_${pkgver}-${pkgrel}.diff + patch -p1 < ../netcat-openbsd_${pkgver}-${_patch}.diff for i in `cat debian/patches/series` do echo "** patch $i" 1>&2 @@ -29,4 +30,6 @@ build() { install -d $pkgdir/usr/share/man/man1/ install nc $pkgdir/usr/bin/nc.openbsd install nc.1 $pkgdir/usr/share/man/man1/nc.openbsd.1 + mkdir -p $pkgdir/usr/share/licenses/$pkgname/ + head -n28 netcat.c | tail -n+2 >$pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/openthreads/PKGBUILD b/community/openthreads/PKGBUILD index e65ef6aab..ff94915c2 100644 --- a/community/openthreads/PKGBUILD +++ b/community/openthreads/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 24579 2010-08-26 13:35:34Z lcarlier $ +# $Id: PKGBUILD 66257 2012-02-23 05:29:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=openthreads pkgver=2.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="A minimal & complete Object-Oriented thread interface for C++ programmers" arch=('i686' 'x86_64') url="http://openthreads.sourceforge.net" diff --git a/community/orange/PKGBUILD b/community/orange/PKGBUILD index e6c6f982b..f013122aa 100644 --- a/community/orange/PKGBUILD +++ b/community/orange/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 53301 2011-08-02 17:49:29Z spupykin $ +# $Id: PKGBUILD 66258 2012-02-23 05:30:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zhukov Pavel <gelios@gmail.com> pkgname=orange pkgver=0.4 -pkgrel=3 +pkgrel=4 pkgdesc="a helper tool for synce" arch=('i686' 'x86_64') url="http://synce.sourceforge.net/" diff --git a/community/osec/PKGBUILD b/community/osec/PKGBUILD index 0f0a7a96d..a7c83c131 100644 --- a/community/osec/PKGBUILD +++ b/community/osec/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 35425 2010-12-20 11:43:21Z spupykin $ +# $Id: PKGBUILD 66262 2012-02-23 05:34:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=osec pkgver=1.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="lightweight integrity checking system" arch=(i686 x86_64) url="http://o-security.sourceforge.net/" diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD index d47dd7c94..04fb34f64 100644 --- a/community/osiris/PKGBUILD +++ b/community/osiris/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59237 2011-11-21 15:30:37Z spupykin $ +# $Id: PKGBUILD 66263 2012-02-23 05:35:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: jlvsimoes pkgname=osiris pkgver=4.2.3 -pkgrel=3 +pkgrel=4 pkgdesc="A file integrity management system" arch=('i686' 'x86_64') url="http://osiris.shmoo.com/" diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index ee8d7bdf3..3c340eaaa 100755 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 64036 2012-02-08 19:28:46Z ttopper $ +# $Id: PKGBUILD 66304 2012-02-23 13:45:07Z allan $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> pkgname=pragha pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64') url="http://pragha.wikispaces.com/" diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD index 343aa89dd..122eb7e51 100644 --- a/community/projectm/PKGBUILD +++ b/community/projectm/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 65637 2012-02-21 16:08:20Z giovanni $ +# $Id: PKGBUILD 66284 2012-02-23 10:51:41Z giovanni $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=projectm pkgver=2.0.1 -pkgrel=4 +pkgrel=5 pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.' arch=('i686' 'x86_64') url='http://projectm.sourceforge.net/' license=('LGPL') depends=('gcc-libs' 'ftgl' 'glew' 'gtkglext') -makedepends=('pkgconfig' 'cmake') +makedepends=('pkg-config' 'cmake') source=("http://downloads.sourceforge.net/${pkgname}/projectM-${pkgver}-Source.tar.gz" - 'libprojectM-2.0.1-pkg-config.patch') + 'libprojectM-2.0.1-pkg-config.patch' + 'libprojectM-2.0.1-fix-linking.patch') md5sums=('f8bf795878cdbbef54784cf2390b4c89' - '4f258f4e7c2ab612931936bfd7f1f0fb') + '4f258f4e7c2ab612931936bfd7f1f0fb' + '5c178cadf1e00ee4baf32cd9ccbc818c') build() { cd "${srcdir}/projectM-${pkgver}-Source" patch -Np1 -i "${srcdir}/libprojectM-2.0.1-pkg-config.patch" + patch -Np1 -i "${srcdir}/libprojectM-2.0.1-fix-linking.patch" cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release make diff --git a/community/projectm/libprojectM-2.0.1-fix-linking.patch b/community/projectm/libprojectM-2.0.1-fix-linking.patch new file mode 100644 index 000000000..23d8a7b9a --- /dev/null +++ b/community/projectm/libprojectM-2.0.1-fix-linking.patch @@ -0,0 +1,23 @@ +--- a/CMakeLists.txt 2009-12-06 02:42:51.000000000 +0100 ++++ b/CMakeLists.txt 2012-02-23 04:30:51.000000000 +0100 +@@ -177,10 +177,10 @@ + LINK_DIRECTORIES(${FTGL_LINK_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR}) + + if(BUILD_PROJECTM_STATIC) +- TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) ++ TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES}) + else(BUILD_PROJECTM_STATIC) + +-TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) ++TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES} ) + + endif(BUILD_PROJECTM_STATIC) + +--- a/Renderer/CMakeLists.txt 2009-12-06 02:42:51.000000000 +0100 ++++ b/Renderer/CMakeLists.txt 2012-02-23 04:31:58.000000000 +0100 +@@ -13,4 +13,4 @@ + INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR}) + ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES}) + SET_TARGET_PROPERTIES(Renderer PROPERTIES VERSION 2.00 SOVERSION 2) +-TARGET_LINK_LIBRARIES(Renderer m) ++TARGET_LINK_LIBRARIES(Renderer m ${OPENGL_LIBRARIES} ${FREETYPE2_LIBRARIES}) diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 6e5964a32..75ed9f5a0 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 58421 2011-11-12 17:18:45Z ibiru $ +#$Id: PKGBUILD 66306 2012-02-23 13:45:20Z allan $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.5.2 -pkgrel=3 +pkgver=0.5.3 +pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64') url="http://qmmp.ylsoftware.com/" @@ -22,7 +22,7 @@ optdepends=('flac: native FLAC support' 'ffmpeg' 'libsamplerate' 'wavpack') install=$pkgname.install source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec') +sha256sums=('6f0842d1dce9a259584b79a9f1368547e23292cd291cbccd105dd10d8bea5d6d') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qt-recordmydesktop/PKGBUILD b/community/qt-recordmydesktop/PKGBUILD index 06eeecf79..9fcf83dc3 100644 --- a/community/qt-recordmydesktop/PKGBUILD +++ b/community/qt-recordmydesktop/PKGBUILD @@ -5,7 +5,7 @@ pkgname=qt-recordmydesktop pkgver=0.3.8 -pkgrel=4 +pkgrel=5 pkgdesc="Qt4 frontend for recordMyDesktop" arch=('i686' 'x86_64') url="http://recordmydesktop.sourceforge.net" diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD index 594599ac9..8c01c6e1a 100644 --- a/community/remmina/PKGBUILD +++ b/community/remmina/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 64462 2012-02-14 00:49:08Z spupykin $ +# $Id: PKGBUILD 66273 2012-02-23 07:08:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=remmina pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Remmina is a remote desktop client written in GTK+. " arch=(i686 x86_64) -url="http://sourceforge.net/projects/remmina/" +url="http://remmina.sourceforge.net/" license=('GPL') depends=('gtk2' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp' 'libgnome-keyring') makedepends=('intltool' 'pkgconfig' 'cmake' @@ -16,11 +16,17 @@ replaces=('remmina-plugins') provides=("grdc" "grdc=$pkgver" 'remmina-plugins') conflicts=("grdc") install=remmina.install -source=(https://github.com/downloads/FreeRDP/Remmina/Remmina-$pkgver.tar.gz) -md5sums=('701c540acaab961bc3adf130a2ddb8b1') +source=(https://github.com/downloads/FreeRDP/Remmina/Remmina-$pkgver.tar.gz + 'https://github.com/FreeRDP/Remmina/commit/569d9bb702d06c061dfbbf3c590d57ea83a04369.diff' + 'https://github.com/FreeRDP/Remmina/commit/f7d1038ba358a295fb46c681db5c47e4ead97306.diff') +md5sums=('701c540acaab961bc3adf130a2ddb8b1' + 'a979c898d5e53446cec9d01912ad9243' + 'b2a9c0e80ac7b0c8a26935bbe289aa3b') build() { cd ${srcdir}/FreeRDP-Remmina-*/ + patch -p1 -i "${srcdir}/569d9bb702d06c061dfbbf3c590d57ea83a04369.diff" + patch -p1 -i "${srcdir}/f7d1038ba358a295fb46c681db5c47e4ead97306.diff" export LDFLAGS="-lX11 -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lpthread" cmake -DWITH_APPINDICATOR=OFF -DCMAKE_INSTALL_PREFIX=/usr . make diff --git a/community/simh/PKGBUILD b/community/simh/PKGBUILD index d3590dcd4..54f8c2204 100644 --- a/community/simh/PKGBUILD +++ b/community/simh/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 59085 2011-11-21 09:31:01Z spupykin $ +# $Id: PKGBUILD 66322 2012-02-23 14:04:05Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: waterbear <st92.at.freeshell.org> pkgname=simh pkgver=3.8.1 _pkgver=38-1 -pkgrel=2 +pkgrel=3 pkgdesc="simulator for assorted historical computers, from Altair to VAX" arch=('i686' 'x86_64') url="http://simh.trailing-edge.com" license=("BSD") -depends=("libpcap" "glibc") +depends=("libpcap") makedepends=("unzip") install=simh.install source=("http://simh.trailing-edge.com/sources/simhv${_pkgver}.zip" @@ -19,18 +19,21 @@ md5sums=('e15f65a82e21ea49e14b438326d93d5c' 'd56eefa5d020ee2b77d21280fef80e3d') build() { - cd $srcdir/ + cd "$srcdir" + mkdir -p BIN + find VAX -type f -exec sed -i 's/SIM_INLINE//' {} + + make USE_NETWORK=1 NETWORK_OPT='-DUSE_NETWORK -isystem /usr/include -lpcap' +} + +package() { + cd "$srcdir/BIN" + for i in *; do + install -D $i "$pkgdir/usr/bin/simh-$i" + done - mkdir BIN || true - find ./VAX -type f -exec sed -i 's#SIM_INLINE##' {} \; - make USE_NETWORK=1 NETWORK_OPT='-DUSE_NETWORK -isystem /usr/include -lpcap -lnl' || exit 1 + cd "$srcdir/VAX" + mkdir -p "$pkgdir/usr/lib/simh" + cp *.bin "$pkgdir/usr/lib/simh" - mkdir -p $pkgdir/usr/bin - cd BIN - for i in *; do cp $i $pkgdir/usr/bin/simh-$i; done - mkdir -p $pkgdir/usr/lib/simh - cd ../VAX - cp *.bin $pkgdir/usr/lib/simh - mkdir -p $pkgdir/usr/share/licenses/$pkgname - cp $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname + install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD index 533de4e94..d63b9450e 100644 --- a/community/subtle/PKGBUILD +++ b/community/subtle/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65317 2012-02-20 23:41:01Z angvp $ +# $Id: PKGBUILD 66362 2012-02-24 01:53:44Z tdziedzic $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: unexist <unexist@dorfelite.net> # Past Contributors: Abakus <java5@arcor.de>, TDY <tdy@gmx.com>, Xilon <xilonmu@gmail.com> pkgname=subtle pkgver=0.10.3008 -pkgrel=3 +pkgrel=4 pkgdesc="A grid-based manual tiling window manager with a strong focus on easy but customizable look and feel" arch=("i686" "x86_64") url="http://subtle.subforge.org" @@ -20,5 +20,9 @@ md5sums=('10961e02f45a7ce9fc7ca5b11360f001') build() { cd "$srcdir/$pkgname-$pkgver-nu" + + # use vendor_ruby instead of site_ruby + sed -e 's/RbConfig::CONFIG\["sitelibdir"\]/RbConfig::CONFIG\["vendorlibdir"\]/' -i Rakefile + rake destdir=$pkgdir install } diff --git a/community/tcsh/PKGBUILD b/community/tcsh/PKGBUILD index fd9484acb..2c7edb257 100644 --- a/community/tcsh/PKGBUILD +++ b/community/tcsh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63350 2012-01-30 22:26:07Z lfleischer $ +# $Id: PKGBUILD 66330 2012-02-23 15:37:07Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=tcsh -pkgver=6.18.00 +pkgver=6.18.01 pkgrel=1 pkgdesc='Enhanced version of the Berkeley C shell.' arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ install='tcsh.install' source=("ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'csh.cshrc' 'csh.login') -md5sums=('ee9b3aa36fb38d32eab6a37a34e4c341' +md5sums=('6eed09dbd4223ab5b6955378450d228a' '7ca0fe6d1a1b9a0093f632499d4fb112' '4869b9da87c79854e2cc97241f125853') diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD index e0ba7a89b..a1488fcd8 100644 --- a/community/zynaddsubfx/PKGBUILD +++ b/community/zynaddsubfx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65279 2012-02-20 12:46:47Z spupykin $ +# $Id: PKGBUILD 66272 2012-02-23 07:06:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: SpepS <dreamspepser at yahoo dot it> # Contributor: Ionut Biru <ibiru@archlinux.org> @@ -6,13 +6,13 @@ pkgname=zynaddsubfx pkgver=2.4.1 -pkgrel=6 +pkgrel=7 pkgdesc="An opensource software synthesizer capable of making a countless number of instruments." arch=('i686' 'x86_64') url="http://zynaddsubfx.sourceforge.net" license=('GPL') -depends=('fltk' 'libgl' 'fftw' 'lash') -makedepends=('mxml' 'cmake' 'pkgconfig' 'mesa') +depends=('fltk' 'libgl' 'fftw' 'lash' 'mxml') +makedepends=('cmake' 'pkgconfig' 'mesa') options=('!emptydirs') source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/ZynAddSubFX-$pkgver.tar.bz2" "$pkgname.desktop" diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD index f5264bb73..ce6144e17 100644 --- a/core/crda/PKGBUILD +++ b/core/crda/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141968 2011-11-03 18:52:56Z thomas $ +# $Id: PKGBUILD 150888 2012-02-23 13:53:54Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=crda pkgver=1.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Central Regulatory Domain Agent for wireless networks" arch=(i686 x86_64) url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" @@ -12,13 +12,15 @@ depends=('wireless-regdb' 'libnl' 'libgcrypt' 'udev' 'iw') makedepends=('python-m2crypto') install=crda.install source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 - crda.rc) + crda.rc libnl32.patch) md5sums=('5226f65aebacf94baaf820f8b4e06df4' - '014eef3f8655e9a130064ec6891317fc') + '014eef3f8655e9a130064ec6891317fc' + 'c1f7aff29f15a0364ae6f7905a1d4ae6') build() { msg "Compiling crda ..." cd "${srcdir}"/${pkgname}-${pkgver} + patch -Np1 -i "$srcdir/libnl32.patch" sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py make crda regdbdump } diff --git a/core/crda/libnl32.patch b/core/crda/libnl32.patch new file mode 100644 index 000000000..682b6c5de --- /dev/null +++ b/core/crda/libnl32.patch @@ -0,0 +1,12 @@ +diff -u -r crda-1.1.2/Makefile crda-1.1.2-libnl32/Makefile +--- crda-1.1.2/Makefile 2011-08-10 01:36:19.000000000 +0200 ++++ crda-1.1.2-libnl32/Makefile 2012-02-09 18:53:33.376430180 +0100 +@@ -51,7 +51,7 @@ + + ifeq ($(NL3FOUND),Y) + CFLAGS += -DCONFIG_LIBNL30 +-NLLIBS += -lnl-genl ++NLLIBS += $(shell pkg-config --libs libnl-genl-3.0) + NLLIBNAME = libnl-3.0 + else + ifeq ($(NL2FOUND),Y) diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD index cd622ddb6..e237e1b01 100644 --- a/core/iw/PKGBUILD +++ b/core/iw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149926 2012-02-11 23:08:41Z thomas $ +# $Id: PKGBUILD 150890 2012-02-23 13:53:57Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=iw pkgver=3.3 -pkgrel=1 +pkgrel=2 pkgdesc="nl80211 based CLI configuration utility for wireless devices" arch=("i686" "x86_64") url="http://wireless.kernel.org/en/users/Documentation/iw" diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD index 18803a30f..7893a115f 100644 --- a/core/libnl/PKGBUILD +++ b/core/libnl/PKGBUILD @@ -1,28 +1,31 @@ -# $Id: PKGBUILD 137795 2011-09-11 08:35:21Z pierre $ +# $Id: PKGBUILD 150892 2012-02-23 13:54:02Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libnl -pkgver=1.1 -pkgrel=3 +pkgver=3.2.7 +pkgrel=1 pkgdesc="Library for applications dealing with netlink sockets" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://www.infradead.org/~tgr/libnl/" -license=('GPL') -depends=('glibc') -source=("http://www.infradead.org/~tgr/libnl/files/${pkgname}-${pkgver}.tar.gz" - 'fix-compilation.patch') -md5sums=('ae970ccd9144e132b68664f98e7ceeb1' - 'e1f5e82c8aa1b3ad025c7b588178de1e') +license=(GPL) +depends=(glibc) +backup=(etc/libnl/classid etc/libnl/pktloc) +options=(!libtool) +source=("$url/files/$pkgname-$pkgver.tar.gz") +md5sums=('6a233a9dffa0ee3a7f6110c95c5410ab') build() { - cd ${srcdir}/libnl-${pkgver} - patch -Np1 -i ${srcdir}/fix-compilation.patch - ./configure --prefix=/usr + cd "$srcdir/$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --disable-static make } package() { - cd ${srcdir}/libnl-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD index 0cddb1358..a528954b0 100644 --- a/core/libpcap/PKGBUILD +++ b/core/libpcap/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 146220 2012-01-06 09:21:20Z thomas $ +# $Id: PKGBUILD 150894 2012-02-23 13:54:08Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=libpcap pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A system-independent interface for user-level packet capture" arch=('i686' 'x86_64') url="http://www.tcpdump.org/" license=('BSD') depends=('glibc' 'libnl' 'sh') makedepends=('flex') -source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz - http://www.tcpdump.org/release/libpcap-1.2.1.tar.gz.sig) +source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig} + libnl32.patch) sha256sums=('a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd' - 'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4') + 'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4' + '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-ipv6 + patch -Np1 -i "${srcdir}/libnl32.patch" + autoreconf -f -i + ./configure --prefix=/usr --enable-ipv6 --with-libnl make } diff --git a/core/libpcap/libnl32.patch b/core/libpcap/libnl32.patch new file mode 100644 index 000000000..633fd003e --- /dev/null +++ b/core/libpcap/libnl32.patch @@ -0,0 +1,19 @@ +diff -u -r libpcap-1.2.1/configure.in libpcap-1.2.1-libnl32/configure.in +--- libpcap-1.2.1/configure.in 2012-01-02 01:47:37.000000000 +0100 ++++ libpcap-1.2.1-libnl32/configure.in 2012-02-09 19:29:29.405603749 +0100 +@@ -433,12 +433,13 @@ + # + # Try libnl 2.x first. + # +- AC_CHECK_LIB(nl, nl_socket_alloc, ++ AC_CHECK_LIB(nl-3, nl_socket_alloc, + [ + # + # Yes, we have libnl 2.x. + # +- LIBS="-lnl-genl -lnl $LIBS" ++ LIBS="$(pkg-config --libs libnl-genl-3.0 libnl-3.0) $LIBS" ++ V_INCLS="$V_INCLS $(pkg-config --cflags libnl-genl-3.0 libnl-3.0)" + AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]) + AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x]) + ], diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD index ca050cef0..830a0f4cf 100644 --- a/core/man-db/PKGBUILD +++ b/core/man-db/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143802 2011-11-29 13:32:56Z stephane $ +# $Id: PKGBUILD 150921 2012-02-23 15:44:07Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> pkgname=man-db -pkgver=2.6.0.2 -pkgrel=3 +pkgver=2.6.1 +pkgrel=1 pkgdesc="A utility for reading man pages" arch=('i686' 'x86_64') url="http://www.nongnu.org/man-db/" @@ -19,19 +19,14 @@ provides=('man') replaces=('man') install=${pkgname}.install source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.gz - 1361_1360.diff - #http://launchpad.net/man-db/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz convert-mans man-db.cron.daily) options=('!libtool') -md5sums=('2b41c96efec032d2b74ccbf2e401f93e' - '08b76b1f924c5493a280b79fc0aebde4' +md5sums=('79658e8695c7b9b3be1ee340d78a4692' '2b7662a7d5b33fe91f9f3e034361a2f6' 'd30c39ae47560304471b5461719e0f03') build() { cd ${srcdir}/${pkgname}-${pkgver} - # https://bugs.archlinux.org/task/18722 - patch -Np0 -i $srcdir/1361_1360.diff ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --with-db=gdbm --disable-setuid --enable-mandirs=GNU \ --with-sections="1 n l 8 3 0 2 5 4 9 6 7" diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD index 493dbf5f3..b8f264e29 100644 --- a/core/wpa_supplicant/PKGBUILD +++ b/core/wpa_supplicant/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142217 2011-11-06 10:21:29Z thomas $ +# $Id: PKGBUILD 150896 2012-02-23 13:54:14Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant pkgver=0.7.3 -pkgrel=4 +pkgrel=5 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64') @@ -13,13 +13,17 @@ license=('GPL') groups=('base') backup=('etc/wpa_supplicant.conf') source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz - config dbus.patch) + config dbus.patch hostap_allow-linking-with-libnl-3.2.patch) sha256sums=('d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443' - '6a0837f18e5ff179ccd6954f7952dfc2e6aa69f353194ee4cb29c1ed2ef68c5d' - '13effa9ed6a1bb940ffc056a3eabcf64c8cc057069eca5cc1822b98ed769812a') + 'd00f306e53c22cc0d7352a0d4ed701fd77b9ff20e3a2422d81ac1fddcc11dff4' + '13effa9ed6a1bb940ffc056a3eabcf64c8cc057069eca5cc1822b98ed769812a' + 'ac805bf6e5aaec733dfc2c333417e519239cd58663a6e1cb34a54fd0f2bcc3c5') build() { - cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch" + + cd ${pkgname} # Required by NetworkManager 0.8.995 patch -Np2 -i "$srcdir/dbus.patch" cp "${srcdir}/config" ./.config diff --git a/core/wpa_supplicant/config b/core/wpa_supplicant/config index 192e338f2..eef35d045 100644 --- a/core/wpa_supplicant/config +++ b/core/wpa_supplicant/config @@ -402,3 +402,5 @@ CONFIG_DEBUG_FILE=y #LIBS += -lbfd -liberty -lz #LIBS_p += -lbfd -liberty -lz #LIBS_c += -lbfd -liberty -lz + +CONFIG_LIBNL32=y diff --git a/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch b/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch new file mode 100644 index 000000000..8e7cd9a97 --- /dev/null +++ b/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch @@ -0,0 +1,42 @@ +Subject: [RFC] hostap: Allow linking with libnl-3. +Date: Tue, 15 Nov 2011 14:30:04 -0000 +From: Ben Greear <greearb@candelatech.com> + +I needed this patch to compile against the latest +libnl code. I added this to my config file: + +CONFIG_LIBNL32=y + +Signed-hostap: Ben Greear <greearb@candelatech.com> +rediffed against 0.7.3 by Stefan Lippers-Hollmann <s.l-h@gmx.de> + +--- +:100644 100644 5caeec5... 0cc81f9... M src/drivers/drivers.mak + src/drivers/drivers.mak | 21 ++++++++++++++------- + 2 files changed, 29 insertions(+), 14 deletions(-) + +--- a/src/drivers/drivers.mak ++++ b/src/drivers/drivers.mak +@@ -31,11 +31,18 @@ NEED_SME=y + NEED_AP_MLME=y + NEED_NETLINK=y + NEED_LINUX_IOCTL=y +-DRV_LIBS += -lnl ++ifdef CONFIG_LIBNL32 ++ DRV_LIBS += -lnl-3 ++ DRV_LIBS += -lnl-genl-3 ++ DRV_CFLAGS += -DCONFIG_LIBNL20 ++ DRV_CFLAGS += -I/usr/include/libnl3/ ++else ++ DRV_LIBS += -lnl + +-ifdef CONFIG_LIBNL20 +-DRV_LIBS += -lnl-genl +-DRV_CFLAGS += -DCONFIG_LIBNL20 ++ ifdef CONFIG_LIBNL20 ++ DRV_LIBS += -lnl-genl ++ DRV_CFLAGS += -DCONFIG_LIBNL20 ++ endif + endif + endif + diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 1de5cc7e1..28132c5ca 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,24 +1,23 @@ -# $Id: PKGBUILD 147730 2012-01-27 15:54:11Z heftig $ +# $Id: PKGBUILD 150898 2012-02-23 13:54:59Z allan $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=bluez pkgver=4.98 -pkgrel=2 +pkgrel=3 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64') license=('GPL2') depends=('dbus-core') -makedepends=('gstreamer0.10-base' 'libusb-compat' 'libnl' 'libsndfile') +makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile') optdepends=("gstreamer0.10-base: bluetooth GStreamer support" "alsa-lib: Audio bluetooth devices support" "dbus-python: to run bluez-simple-agent" "pygobject: to run bluez-simple-agent" "libusb-compat: USB adapters support" - "cups: CUPS backend" - "libnl: netlink plugin") + "cups: CUPS backend") conflicts=('bluez-libs' 'bluez-utils') provides=('bluez-libs' 'bluez-utils') replaces=('bluez-libs' 'bluez-utils') diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 873778ad0..97d3c91ad 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146778 2012-01-17 13:36:48Z ibiru $ +# $Id: PKGBUILD 150827 2012-02-23 11:03:34Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord -pkgver=0.1.16 +pkgver=0.1.17 pkgrel=1 pkgdesc="Color daemon" arch=('i686' 'x86_64') @@ -11,15 +11,19 @@ url="http://www.freedesktop.org/software/colord" license=('GPL2') depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev') makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') -source=($url/releases/$pkgname-$pkgver.tar.xz) +source=($url/releases/$pkgname-$pkgver.tar.xz + fix-compilation.patch) options=('!libtool') -sha1sums=('bd2fbad0043d2c1f55ab7ff8cb5e261b684e699c') +sha1sums=('7716c58a7ab85029637c7e88bdb77e48b6cd5ce9' + 'b77dd47f623a05055e8988dd568695fcbf457500') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix-compilation.patch" ./configure --prefix=/usr \ --sysconfdir=/etc --libexecdir=/usr/lib/colord \ - --localstatedir=/var --disable-static + --localstatedir=/var --disable-static \ + --with-systemdsystemunitdir=/lib/systemd/system make } diff --git a/extra/colord/fix-compilation.patch b/extra/colord/fix-compilation.patch new file mode 100644 index 000000000..b956cb9f6 --- /dev/null +++ b/extra/colord/fix-compilation.patch @@ -0,0 +1,38 @@ +From 638a98fef16fa15946522d4112660b4b20c0d630 Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard@hughsie.com> +Date: Thu, 23 Feb 2012 10:43:37 +0000 +Subject: [PATCH] trivial: Fix compile with older versions of GLib + +g_mapped_file_new_from_fd() was introduced in 2.31.0 not 2.30.0 as the +docs suggested. + +Resoves https://bugs.freedesktop.org/show_bug.cgi?id=46481 +--- + src/cd-profile.c | 10 ++++++++++ + 1 files changed, 10 insertions(+), 0 deletions(-) + +diff --git a/src/cd-profile.c b/src/cd-profile.c +index a292616..323588b 100644 +--- a/src/cd-profile.c ++++ b/src/cd-profile.c +@@ -1066,7 +1066,17 @@ cd_profile_set_fd (CdProfile *profile, + } + + /* create a mapped file */ ++#if GLIB_CHECK_VERSION(2,31,0) + priv->mapped_file = g_mapped_file_new_from_fd (fd, FALSE, error); ++ if (priv->mapped_file == NULL) { ++ g_set_error (error, ++ CD_MAIN_ERROR, ++ CD_MAIN_ERROR_FAILED, ++ "failed to create mapped file from fd %i", ++ fd); ++ goto out; ++ } ++#endif + + /* parse the ICC file */ + lcms_profile = cmsOpenProfileFromStream (stream, "r"); +-- +1.7.6 + diff --git a/extra/ecasound/PKGBUILD b/extra/ecasound/PKGBUILD index 079175e12..04a9e1793 100644 --- a/extra/ecasound/PKGBUILD +++ b/extra/ecasound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149067 2012-02-05 16:13:46Z schiv $ +# $Id: PKGBUILD 150935 2012-02-24 01:43:21Z tdziedzic $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ecasound pkgver=2.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="A software package designed for multitrack audio processing" arch=('i686' 'x86_64') url="http://www.eca.cx/ecasound/" @@ -29,6 +29,9 @@ md5sums=('d9ded0074a8eeb59dd507c248220d010') build() { cd "$srcdir/$pkgname-$pkgver" + # use vendor_ruby for ruby files + sed -e 's/CONFIG\["sitedir"\]/CONFIG\["vendordir"\]/' -i configure + PYTHONPATH=/usr/bin/python2 ./configure \ --prefix=/usr \ --with-python-includes=/usr/include/python2.7 \ diff --git a/extra/exempi/PKGBUILD b/extra/exempi/PKGBUILD index 0f385c8be..d399218d4 100644 --- a/extra/exempi/PKGBUILD +++ b/extra/exempi/PKGBUILD @@ -1,24 +1,28 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: André Klitzing <aklitzing@online.de> pkgname=exempi -pkgver=2.1.1 +pkgver=2.2.0 pkgrel=1 pkgdesc="A library to parse XMP metadata" arch=(i686 x86_64) url="http://libopenraw.freedesktop.org/wiki/Exempi" license=('custom:BSD') -depends=('gcc-libs>=4.4.2' 'expat>=2.0.1' 'zlib') -makedepends=('boost>=1.36.0') +depends=('gcc-libs' 'expat' 'zlib') +makedepends=('boost') options=(!libtool) -source=(http://libopenraw.freedesktop.org/download/${pkgname}-${pkgver}.tar.gz) -md5sums=('62ecb5a01387b9f940a5429b3df67e65') +source=(http://libopenraw.freedesktop.org/download/$pkgname-$pkgver.tar.bz2) +md5sums=('f46d96975613593ee17aaf48cd350228') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/${pkgname}-${pkgver}/COPYING" \ - "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -d "$pkgdir/usr/share/licenses/$pkgname" + install -m644 "$srcdir/$pkgname-$pkgver/COPYING" \ + "$pkgdir/usr/share/licenses/$pkgname" } diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index 701f308a0..7f6a2ca12 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 59982 2009-11-29 20:19:34Z jgc $ +# $Id: PKGBUILD 150857 2012-02-23 13:01:06Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fontconfig pkgver=2.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64) url="http://www.fontconfig.org/release/" license=('custom') -depends=('expat>=2.0.1' 'freetype2>=2.3.11') +depends=('expat' 'freetype2') options=('!libtool') install=fontconfig.install -source=(http://www.fontconfig.org/release/${pkgname}-${pkgver}.tar.gz +source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz 29-replace-bitmap-fonts.conf 30-urw-aliases.patch) md5sums=('77e15a92006ddc2adbb06f840d591c0e' @@ -18,18 +18,22 @@ md5sums=('77e15a92006ddc2adbb06f840d591c0e' '51bc6cb633b50f3c28793361738aac5b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/30-urw-aliases.patch" || return 1 + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/30-urw-aliases.patch" # enable Position Independent Code for prelinking - export CFLAGS="${CFLAGS} -fPIC" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m644 "${srcdir}/29-replace-bitmap-fonts.conf" \ - "${pkgdir}/etc/fonts/conf.avail" || return 1 - rm -f ${pkgdir}/etc/fonts/conf.d/*.conf + export CFLAGS="$CFLAGS -fPIC" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -m644 "$srcdir/29-replace-bitmap-fonts.conf" \ + "$pkgdir/etc/fonts/conf.avail" + rm -f "$pkgdir"/etc/fonts/conf.d/*.conf #Install license - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" + install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname" } diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 9725ac6ba..876ca8be2 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149828 2012-02-11 09:25:31Z bisson $ +# $Id: PKGBUILD 150925 2012-02-23 21:04:37Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=2.7.3 +pkgver=2.7.4 pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' @@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4-lib64.patch') -sha1sums=('d27a236f7d3a3cf54a688ecaeb576325dca4f89f' +sha1sums=('d580c772b670ccb34f510dce5535628dd22dd6cb' '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70') install=install diff --git a/extra/gconf-editor/PKGBUILD b/extra/gconf-editor/PKGBUILD index d6fb91c69..94ade7b75 100644 --- a/extra/gconf-editor/PKGBUILD +++ b/extra/gconf-editor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 117817 2011-04-04 18:08:43Z ibiru $ +# $Id: PKGBUILD 150859 2012-02-23 13:04:28Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gconf-editor pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Graphical gconf registry editor" arch=(i686 x86_64) license=('GPL') @@ -17,17 +17,17 @@ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$p sha256sums=('184e17416c2dd927ccb3a9b435d86fbe4b654316b91a6db724a3fd447a9fae60') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-scrollkeeper make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gconf-editor ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gconf-editor "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-keyring-sharp/PKGBUILD b/extra/gnome-keyring-sharp/PKGBUILD index e8d024129..734c0e2fe 100644 --- a/extra/gnome-keyring-sharp/PKGBUILD +++ b/extra/gnome-keyring-sharp/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 104610 2011-01-04 16:15:34Z ibiru $ +# $Id: PKGBUILD 150836 2012-02-23 12:21:20Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-keyring-sharp pkgver=1.0.2 -pkgrel=2 +pkgrel=3 pkgdesc="A fully managed implementation of libgnome-keyring" arch=('i686' 'x86_64') url="http://www.mono-project.com/Libraries" license=('custom') depends=('ndesk-dbus>=0.4' 'libgnome-keyring') makedepends=('gtk-sharp-2') -replaces=('gnome-keyring-sharp-svn') source=(http://www.go-mono.com/archive/${pkgname}/${pkgname}-${pkgver}.tar.gz) -options=('!makeflags') +options=('!makeflags' '!libtool') md5sums=('f9a48319f3fe6123017b000d714d68b1') build() { @@ -21,6 +20,11 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install rm -rf "${MONO_SHARED_DIR}" ln -sf gnome-keyring-sharp-1.0.pc "${pkgdir}/usr/lib/pkgconfig/gnome-keyring-sharp.pc" diff --git a/extra/gnome-python-extras/PKGBUILD b/extra/gnome-python-extras/PKGBUILD index 18d6b3de3..6c6fc9594 100644 --- a/extra/gnome-python-extras/PKGBUILD +++ b/extra/gnome-python-extras/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139493 2011-10-02 11:50:40Z ibiru $ +# $Id: PKGBUILD 150866 2012-02-23 13:12:25Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gnome-python-extras pkgname=('gnome-python-extras' 'python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') pkgver=2.25.3 -pkgrel=11 +pkgrel=12 arch=('i686' 'x86_64') url="http://www.daa.com.au/~james/pygtk/" license=('GPL' 'LGPL') diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index 78a5325cb..3a7d4fcd1 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146667 2012-01-16 05:26:24Z eric $ +# $Id: PKGBUILD 150910 2012-02-23 13:59:07Z juergen $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Mark Schneider <queueRAM@gmail.com> pkgname=gnucash -pkgver=2.4.9 +pkgver=2.4.10 pkgrel=1 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('evince: for print preview' options=('!libtool' '!makeflags' '!emptydirs') install=gnucash.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('a0ed6532e53164b7dc9a319d6503c6563310b878') +sha1sums=('b1906f8143406fdf8cb5217233143cc08e708b99') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 2b98f4cb6..7889cc845 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149278 2012-02-06 17:33:35Z ibiru $ +# $Id: PKGBUILD 150876 2012-02-23 13:48:00Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.18 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') diff --git a/extra/guile/PKGBUILD b/extra/guile/PKGBUILD index eafece87a..50f10eb03 100644 --- a/extra/guile/PKGBUILD +++ b/extra/guile/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 109127 2011-02-06 11:24:26Z andyrtr $ +# $Id: PKGBUILD 150868 2012-02-23 13:23:16Z ibiru $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=guile pkgver=1.8.8 -pkgrel=1 +pkgrel=2 pkgdesc="a portable, embeddable Scheme implementation written in C" url="http://www.gnu.org/software/guile/" arch=(i686 x86_64) license=('GPL') -depends=('gmp' 'libtool' 'ncurses>=5.7' 'texinfo') +depends=('gmp' 'libltdl' 'ncurses>=5.7' 'texinfo') install=guile.install source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) options=('!libtool') diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index ab8552cec..b347eae87 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146709 2012-01-16 19:49:21Z dreisner $ +# $Id: PKGBUILD 150878 2012-02-23 13:48:04Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') pkgver=1.10.1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL') makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf') diff --git a/extra/hddtemp/PKGBUILD b/extra/hddtemp/PKGBUILD index f43fb8f50..e98e28e64 100644 --- a/extra/hddtemp/PKGBUILD +++ b/extra/hddtemp/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 98707 2010-11-12 20:24:41Z ibiru $ -# Maintainer: Andrea Scarpino <bash@archlinux.it> +# $Id: PKGBUILD 150841 2012-02-23 12:31:37Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> @@ -7,7 +8,7 @@ pkgname=hddtemp pkgver=0.3.beta15.46 _origver=0.3-beta15 _patchver=46 -pkgrel=1 +pkgrel=2 pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information" arch=('i686' 'x86_64') url="http://www.guzu.net/linux/hddtemp.php" @@ -32,6 +33,10 @@ build() { ./configure --prefix=/usr --mandir=/usr/share/man --with-db-path=/usr/share/$pkgname/hddtemp.db make +} + +package() { + cd "$srcdir/$pkgname-${_origver}" make DESTDIR=$pkgdir install install -D -m644 "$srcdir/$pkgname-${_origver}/debian/hddtemp.db" \ diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD index a99e03f43..37142d4af 100644 --- a/extra/kismet/PKGBUILD +++ b/extra/kismet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 149954 2012-02-11 23:30:59Z allan $ +# $Id: PKGBUILD 150900 2012-02-23 13:55:06Z allan $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Juergen Hoetzel <jason@archlinux.org> @@ -6,12 +6,12 @@ pkgname=kismet pkgver=2011_03_R2 _realver="${pkgver//_/-}" -pkgrel=3 +pkgrel=4 pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system" arch=('i686' 'x86_64') url="http://www.kismetwireless.net/" license=('GPL') -depends=('libcap' 'libnl' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat') +depends=('libcap' 'libnl1' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat') makedepends=() # already in core: ('grep' 'gcc-libs') optdepends=('gpsd: log coordinates of detected networks' 'wireshark-cli: provide OUI files used to determine device manufacturer' diff --git a/extra/kismet/kismet.changelog b/extra/kismet/kismet.changelog index e66dcfda0..3078d0625 100644 --- a/extra/kismet/kismet.changelog +++ b/extra/kismet/kismet.changelog @@ -1,3 +1,6 @@ +2012-02-10 Eric Bélanger <eric@archlinux.org> + * Change libnl depends to libnl1 + 2010-05-07 Angel Velasquez <angvp@archlinux.org> * ChangeLog added diff --git a/extra/leafpad/PKGBUILD b/extra/leafpad/PKGBUILD index 179133ff4..a54bcc40f 100644 --- a/extra/leafpad/PKGBUILD +++ b/extra/leafpad/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 110473 2011-02-19 16:41:59Z ibiru $ +# $Id: PKGBUILD 150844 2012-02-23 12:34:26Z ibiru $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Link Dupont <link@subpop.net> pkgname=leafpad pkgver=0.8.18.1 -pkgrel=2 +pkgrel=3 pkgdesc="A notepad clone for GTK+ 2.0" arch=('i686' 'x86_64') url="http://tarot.freeshell.org/leafpad/" diff --git a/extra/libcdio/PKGBUILD b/extra/libcdio/PKGBUILD index 4c309a65e..a532e0d77 100644 --- a/extra/libcdio/PKGBUILD +++ b/extra/libcdio/PKGBUILD @@ -1,25 +1,34 @@ -# $Id: PKGBUILD 59886 2009-11-29 15:21:53Z jgc $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 150880 2012-02-23 13:48:06Z allan $ +# Maintainer: # Contributor: damir <damir@archlinux.org> pkgname=libcdio -pkgver=0.82 +pkgver=0.83 pkgrel=1 pkgdesc="GNU Compact Disc Input and Control Library" -arch=("i686" "x86_64") +arch=('i686' 'x86_64') license=('GPL3') url="http://www.gnu.org/software/libcdio/" -depends=('gcc-libs>=4.4.2' 'libcddb' 'ncurses') +depends=('libcddb' 'ncurses') options=('!libtool') install=libcdio.install -source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz) -md5sums=('1c29b18e01ab2b966162bc727bf3c360') +source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig} + libcdio-0.83-linking.patch) +md5sums=('b9e0f1bccb142e697cd834fe56b6e6fb' + 'a7864a4b572a1e2a28cc0a05aa4a67d3' + '5a7f50209c03d5919d5b932f07871af7') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs || return 1 - make || return 1 - make -j1 DESTDIR="${pkgdir}" install || return 1 - #install -m644 libcdio_paranoia.pc libcdio_cdda.pc \ - # "${pkgdir}/usr/lib/pkgconfig/" || return 1 + patch -Np1 -i $srcdir/libcdio-0.83-linking.patch + ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 DESTDIR="${pkgdir}" install + + sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \ + $pkgdir/usr/include/cdio/cdio_config.h } diff --git a/extra/libcdio/libcdio-0.83-linking.patch b/extra/libcdio/libcdio-0.83-linking.patch new file mode 100644 index 000000000..84a0746b5 --- /dev/null +++ b/extra/libcdio/libcdio-0.83-linking.patch @@ -0,0 +1,22 @@ +diff -Naur libcdio-0.83-orig/example/C++/OO/Makefile.in libcdio-0.83/example/C++/OO/Makefile.in +--- libcdio-0.83-orig/example/C++/OO/Makefile.in 2011-10-27 18:02:31.000000000 +1000 ++++ libcdio-0.83/example/C++/OO/Makefile.in 2012-02-18 11:10:07.369277231 +1000 +@@ -315,15 +315,15 @@ + + isofile2_SOURCES = isofile2.cpp + isofile2_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ +- $(LIBCDIOPP_LIBS) $(LTLIBICONV) ++ $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) + + isolist_SOURCES = isolist.cpp + isolist_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ +- $(LIBCDIOPP_LIBS) $(LTLIBICONV) ++ $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) + + iso4_SOURCES = iso4.cpp + iso4_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \ +- $(LIBCDIOPP_LIBS) $(LTLIBICONV) ++ $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) + + mmc1_SOURCES = mmc1.cpp + mmc1_DEPENDENCIES = $(LIBCDIO_DEPS) diff --git a/extra/libmusicbrainz3/PKGBUILD b/extra/libmusicbrainz3/PKGBUILD index a89a5939a..62e039b28 100644 --- a/extra/libmusicbrainz3/PKGBUILD +++ b/extra/libmusicbrainz3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92430 2010-09-29 21:08:46Z ibiru $ +# $Id: PKGBUILD 150845 2012-02-23 12:35:42Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Max Fehrm max.fehrm@gmail.com pkgname=libmusicbrainz3 pkgver=3.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="Library That Provides Access to the MusicBrainz Server " url="http://musicbrainz.org/" arch=('i686' 'x86_64') diff --git a/extra/libnl1/PKGBUILD b/extra/libnl1/PKGBUILD new file mode 100644 index 000000000..6d35c216d --- /dev/null +++ b/extra/libnl1/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 150908 2012-02-23 13:56:22Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=libnl1 +pkgver=1.1 +pkgrel=1 +pkgdesc="Library for applications dealing with netlink sockets (Legacy version)" +arch=('i686' 'x86_64') +url="http://www.infradead.org/~tgr/libnl/" +license=('GPL') +depends=('glibc') +source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz" + 'fix-compilation.patch') +md5sums=('ae970ccd9144e132b68664f98e7ceeb1' + 'e1f5e82c8aa1b3ad025c7b588178de1e') + +build() { + cd ${srcdir}/libnl-${pkgver} + patch -Np1 -i ${srcdir}/fix-compilation.patch + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/libnl-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/extra/libnl1/fix-compilation.patch b/extra/libnl1/fix-compilation.patch new file mode 100644 index 000000000..891562a39 --- /dev/null +++ b/extra/libnl1/fix-compilation.patch @@ -0,0 +1,10 @@ +--- libnl-1.1.orig/include/netlink-local.h 2008-01-14 16:48:45.000000000 +0100 ++++ libnl-1.1/include/netlink-local.h 2009-06-26 11:15:33.186011844 +0200 +@@ -26,6 +26,7 @@ + #include <sys/socket.h> + #include <inttypes.h> + #include <assert.h> ++#include <limits.h> + + #include <arpa/inet.h> + #include <netdb.h> diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD index 3eaf2461f..049eaf05a 100644 --- a/extra/licq/PKGBUILD +++ b/extra/licq/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137082 2011-09-06 03:22:00Z eric $ +# $Id: PKGBUILD 150853 2012-02-23 12:53:44Z juergen $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=licq -pkgver=1.5.1 +pkgver=1.6.0 pkgrel=1 pkgdesc="Advanced graphical ICQ clone and more for Unix" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('libxss' 'qt' 'openssl') makedepends=('cmake' 'boost') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2) -md5sums=('7dbf9f4f190fdae4c34ab6edefb34997') +md5sums=('383153697e281a0b1b4ff008936731b8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 85d561ddc..285faf4b8 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 150146 2012-02-13 14:36:40Z ronald $ +# $Id: PKGBUILD 150832 2012-02-23 12:01:17Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.26.0 -pkgrel=1 +pkgrel=2 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64') license=('GPL') url="http://maxima.sourceforge.net" -depends=('sbcl=1.0.54' 'texinfo' 'sh') +depends=('sbcl=1.0.55' 'texinfo' 'sh') makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') # needs rebuild when bash changes version diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index 910d86329..256f31f19 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139480 2011-10-02 02:49:38Z eric $ +# $Id: PKGBUILD 150902 2012-02-23 13:55:13Z allan $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> pkgname=net-snmp pkgver=5.7.1 -pkgrel=1 +pkgrel=2 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/" @@ -18,14 +18,20 @@ provides=('ucd-snmp') backup=('etc/conf.d/snmpd') options=('!libtool' '!makeflags' '!emptydirs') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} - snmpd.confd snmpd.rc) + snmpd.confd snmpd.rc libnl32.patch) sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a' '2bdc2839ce09d7daa608cd54687fa8beb47ed907' 'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b' - '90600c0141eed10d6e3ca3ccc97ad8dda15c2112') + '90600c0141eed10d6e3ca3ccc97ad8dda15c2112' + '74a9848b95f63378eb1753fc309d2b74de5afb0f') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694 + patch -Np1 -i "$srcdir/libnl32.patch" + autoreconf -f -i + sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -38,7 +44,8 @@ build() { --with-sys-location="Unknown" \ --with-logfile="/var/log/snmpd.log" \ --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ - --with-persistent-directory="/var/net-snmp" + --with-persistent-directory="/var/net-snmp" \ + --disable-static make NETSNMP_DONT_CHECK_VERSION=1 } diff --git a/extra/net-snmp/libnl32.patch b/extra/net-snmp/libnl32.patch new file mode 100644 index 000000000..d93d7ef67 --- /dev/null +++ b/extra/net-snmp/libnl32.patch @@ -0,0 +1,80 @@ +diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c +--- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c 2011-09-28 06:53:47.000000000 +0200 ++++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c 2012-02-09 20:02:49.136022132 +0100 +@@ -566,8 +566,9 @@ + static int + tcpTable_load_netlink(void) + { ++ int err; + /* TODO: perhaps use permanent nl handle? */ +- struct nl_handle *nl = nl_handle_alloc(); ++ struct nl_sock *nl = nl_socket_alloc(); + + if (nl == NULL) { + DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n")); +@@ -575,10 +576,10 @@ + return -1; + } + +- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) { ++ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err))); ++ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err)); ++ nl_socket_free(nl); + return -1; + } + +@@ -590,10 +591,10 @@ + struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST); + nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); + +- if (nl_send_auto_complete(nl, nm) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ if ((err = nl_send_auto_complete(nl, nm)) < 0) { ++ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err))); ++ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err)); ++ nl_socket_free(nl); + return -1; + } + nlmsg_free(nm); +@@ -604,9 +605,9 @@ + + while (running) { + if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len))); ++ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len)); ++ nl_socket_free(nl); + return -1; + } + +@@ -655,7 +656,7 @@ + free(buf); + } + +- nl_handle_destroy(nl); ++ nl_socket_free(nl); + + if (tcp_head) { + DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n")); +diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2 net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 +--- net-snmp-5.7.1/configure.d/config_os_libs2 2011-09-28 06:53:47.000000000 +0200 ++++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 2012-02-09 20:10:44.282165275 +0100 +@@ -224,8 +224,9 @@ + if test "x$with_nl" != "xno"; then + case $target_os in + linux*) # Check for libnl (linux) ++ CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)" + NETSNMP_SEARCH_LIBS( +- nl_connect, nl, ++ nl_connect, nl-3, + [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS) + ;; + esac diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index 4dd030d1d..1b511a2cd 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142491 2011-11-10 19:42:04Z ibiru $ +# $Id: PKGBUILD 150904 2012-02-23 13:55:20Z allan $ # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> @@ -7,7 +7,7 @@ pkgname=networkmanager pkgver=0.9.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/ntrack/PKGBUILD b/extra/ntrack/PKGBUILD index 7be10f581..160ac938d 100644 --- a/extra/ntrack/PKGBUILD +++ b/extra/ntrack/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150729 2012-02-21 11:02:40Z andrea $ +# $Id: PKGBUILD 150906 2012-02-23 13:55:25Z allan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=ntrack @@ -21,7 +21,7 @@ build() { cd "${srcdir}/${pkgname}-0${pkgver}" patch -p1 -i "${srcdir}"/libnl3.patch - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var make diff --git a/extra/oxine/PKGBUILD b/extra/oxine/PKGBUILD index 4736fcceb..0efebfe8c 100644 --- a/extra/oxine/PKGBUILD +++ b/extra/oxine/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 146426 2012-01-10 23:37:48Z eric $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> +# $Id: PKGBUILD 150882 2012-02-23 13:48:09Z allan $ +# Maintainer: # Contributor: Rouslan Solomakhin <rouslan@localnet.com> # Contributor: dorphell <dorphell@archlinux.org> pkgname=oxine pkgver=0.7.1 -pkgrel=5 +pkgrel=6 pkgdesc="A lightweight, purely osd based xine frontend for set-top boxes and home entertainment systems" arch=('i686' 'x86_64') url="http://oxine.sourceforge.net/" diff --git a/extra/python-telepathy/PKGBUILD b/extra/python-telepathy/PKGBUILD index 13fde3c16..0df359a07 100644 --- a/extra/python-telepathy/PKGBUILD +++ b/extra/python-telepathy/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102076 2010-12-04 12:37:04Z ibiru $ +# $Id: PKGBUILD 150847 2012-02-23 12:38:51Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> pkgname=python-telepathy pkgver=0.15.19 -pkgrel=1 +pkgrel=2 pkgdesc="Python libraries for use in Telepathy clients and connection managers" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org" @@ -17,5 +17,9 @@ build() { cd "${srcdir}/telepathy-python-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/telepathy-python-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index 7d3c2f1e2..b2d49d466 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148912 2012-02-05 11:55:38Z ibiru $ +# $Id: PKGBUILD 150933 2012-02-24 01:09:55Z tdziedzic $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=rrdtool pkgver=1.4.5 -pkgrel=5 +pkgrel=6 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64') url="http://www.rrdtool.org" @@ -20,7 +20,12 @@ sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl |' bindings/perl-shared/Makefile.PL + + # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby + sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in + PYTHON=python2 ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ --enable-ruby --enable-ruby-site-install --enable-python \ diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 11a474e99..895c3843e 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146485 2012-01-11 15:22:42Z stephane $ +# $Id: PKGBUILD 150870 2012-02-23 13:25:51Z stephane $ # Maintainer: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.7.2 -pkgrel=2 +pkgver=1.7.3 +pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') license=('APACHE') @@ -19,8 +19,8 @@ provides=('svn') options=('!makeflags' '!libtool') source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} svnserve svn svnserve.conf subversion.rpath.fix.patch) -sha1sums=('8c0824aeb7f42da1ff4f7cd296877af7f59812bb' - '66293923ddc1b12a43b0e86f6b6a3c23b70df6ae' +sha1sums=('624d4070361c0e8d7cf4f5c667629e72459b122d' + 'cac344ec6e717bab3d97e2f3f1206289d83b8e05' '64ba3e6ebafc08ac62f59d788f7a825fdce69573' '73b36c046c09cec2093354911c89e3ba8056af6c' 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' diff --git a/extra/systemd/PKGBUILD b/extra/systemd/PKGBUILD index 27934ec81..60a526323 100644 --- a/extra/systemd/PKGBUILD +++ b/extra/systemd/PKGBUILD @@ -1,33 +1,16 @@ -# $Id: PKGBUILD 150293 2012-02-16 14:21:25Z dreisner $ +# $Id: PKGBUILD 150927 2012-02-23 21:53:17Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> -pkgname=systemd +pkgbase=systemd +pkgname=('systemd' 'libsystemd') pkgver=43 -pkgrel=2 -pkgdesc="Session and Startup manager" +pkgrel=3 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2') -depends=('acl' 'dbus-core' 'kbd' 'kmod' 'libcap' 'util-linux' 'udev' 'xz') -makedepends=('gperf' 'cryptsetup' 'docbook-xsl' 'intltool' 'libxslt' 'linux-api-headers') -optdepends=('cryptsetup: required for encrypted block devices' - 'dbus-python: systemd-analyze' - 'initscripts: legacy support for hostname and vconsole setup' - 'initscripts-systemd: native boot and initialization scripts' - 'python2-cairo: systemd-analyze' - 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries') +makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool' + 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz') options=('!libtool') -backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf - etc/dbus-1/system.d/org.freedesktop.hostname1.conf - etc/dbus-1/system.d/org.freedesktop.login1.conf - etc/dbus-1/system.d/org.freedesktop.locale1.conf - etc/dbus-1/system.d/org.freedesktop.timedate1.conf - etc/systemd/system.conf - etc/systemd/user.conf - etc/systemd/systemd-logind.conf - etc/systemd/systemd-journald.conf) -install="$pkgname.install" source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" "os-release") md5sums=('446cc6db7625617af67e2d8e5f503a49' @@ -36,53 +19,84 @@ md5sums=('446cc6db7625617af67e2d8e5f503a49' build() { cd "$pkgname-$pkgver" - # Don't unset locale in getty - # https://bugzilla.redhat.com/show_bug.cgi?id=663900 - sed -i -e '/^Environ.*LANG/s/^/#/' \ - -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4 - ./configure --sysconfdir=/etc \ --libexecdir=/usr/lib \ --libdir=/usr/lib \ + --with-pamlibdir=/lib/security \ --localstatedir=/var \ --with-rootprefix= \ - --with-rootlibdir=/lib \ --with-distro=arch make - - # fix .so links in manpages - sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8 - sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1 } -package() { +package_systemd() { + pkgdesc="systemd and service manager" + depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz') + optdepends=('cryptsetup: required for encrypted block devices' + 'dbus-python: systemd-analyze' + 'initscripts: legacy support for hostname and vconsole setup' + 'initscripts-systemd: native boot and initialization scripts' + 'python2-cairo: systemd-analyze' + 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' + 'systemd-sysvcompat: symlink package to provide sysvinit binaries') + backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf + etc/dbus-1/system.d/org.freedesktop.hostname1.conf + etc/dbus-1/system.d/org.freedesktop.login1.conf + etc/dbus-1/system.d/org.freedesktop.locale1.conf + etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/systemd/system.conf + etc/systemd/user.conf + etc/systemd/systemd-logind.conf + etc/systemd/systemd-journald.conf) + install="$pkgname.install" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" - printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" + + printf "d /run/console 755 root root\n" >"$pkgdir/usr/lib/tmpfiles.d/console.conf" + chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf" # symlink to /bin/systemd for compat and sanity - ln -s ../lib/systemd/systemd "$pkgdir"/bin/systemd + ln -s ../lib/systemd/systemd "$pkgdir/bin/systemd" - # fix systemd-analyze for python2 + # use python2 for systemd-analyze sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" - # rename man pages to avoid conflicts with sysvinit and initscripts - cd "$pkgdir/usr/share/man" - - # not building this with systemd + # didn't build this... rm -f "man1/systemadm.1" + # fix .so links in manpage stubs + find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \ + -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} + + + # rename man pages to avoid conflicts with sysvinit and initscripts manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 man5/{hostname,{vconsole,locale}.conf}.5) - + cd "$pkgdir/usr/share/man" for manpage in "${manpages[@]}"; do IFS='/' read section page <<< "$manpage" mv "$manpage" "$section/systemd.$page" done + + ### split off libsystemd (libs, includes, pkgconfig, man3) + install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig,share/man} + + cd "$srcdir"/libsystemd + mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib + mv "$pkgdir/usr/include/systemd" usr/include + mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig + mv "$pkgdir/usr/share/man/man3" usr/share/man +} + +package_libsystemd() { + pkgdesc="systemd client libraries" + depends=('libcap' 'xz') + + mv "$srcdir/libsystemd"/* "$pkgdir" } # vim: ft=sh syn=sh et diff --git a/extra/telepathy-butterfly/PKGBUILD b/extra/telepathy-butterfly/PKGBUILD index 915673e49..1400376d8 100644 --- a/extra/telepathy-butterfly/PKGBUILD +++ b/extra/telepathy-butterfly/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102171 2010-12-06 12:36:03Z ibiru $ +# $Id: PKGBUILD 150850 2012-02-23 12:45:25Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> pkgname=telepathy-butterfly pkgver=0.5.15 -pkgrel=1 +pkgrel=2 pkgdesc="A MSN connection manager for Telepathy" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org" diff --git a/extra/vcdimager/PKGBUILD b/extra/vcdimager/PKGBUILD index f3d94d176..bc97912b3 100644 --- a/extra/vcdimager/PKGBUILD +++ b/extra/vcdimager/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135066 2011-08-10 01:37:52Z eric $ +# $Id: PKGBUILD 150884 2012-02-23 13:48:13Z allan $ # Maintainer: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=vcdimager pkgver=0.7.24 -pkgrel=1 +pkgrel=2 pkgdesc="A full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's" arch=('i686' 'x86_64') url="http://www.vcdimager.org/" @@ -12,11 +12,14 @@ license=('GPL') depends=('libcdio>=0.82' 'libxml2>=2.7.3' 'popt') options=('!libtool') install=vcdimager.install -source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz) -md5sums=('3af22978fd79c79d5fda6513b6811145') +source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz + vcdimager-0.7.24-libcdio-0.83.patch) +md5sums=('3af22978fd79c79d5fda6513b6811145' + 'f4e7376fd9d975951d2b93a5e9123fdc') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i $srcdir/vcdimager-0.7.24-libcdio-0.83.patch ./configure --prefix=/usr make } diff --git a/extra/vcdimager/vcdimager-0.7.24-libcdio-0.83.patch b/extra/vcdimager/vcdimager-0.7.24-libcdio-0.83.patch new file mode 100644 index 000000000..467c06073 --- /dev/null +++ b/extra/vcdimager/vcdimager-0.7.24-libcdio-0.83.patch @@ -0,0 +1,337 @@ +diff -u vcdimager-0.7.23/include/libvcd/info.h vcdimager-0.7.23/include/libvcd/info.h +--- vcdimager-0.7.23/include/libvcd/info.h ++++ vcdimager-0.7.23/include/libvcd/info.h +@@ -32,6 +32,9 @@ + #include <libvcd/version.h> + #include <libvcd/types.h> + #include <libvcd/files.h> ++ ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + #include <cdio/cdio.h> + #include <cdio/ds.h> + +--- vcdimager-0.7.23.orig/frontends/cli/vcd-info.c ++++ vcdimager-0.7.23/frontends/cli/vcd-info.c +@@ -38,6 +38,8 @@ + #define POPT_ARGFLAG_OPTIONAL 0 + #endif + ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + #include <cdio/cdio.h> + #include <cdio/bytesex.h> + #include <cdio/iso9660.h> +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/frontends/cli/cdxa2mpeg.c ++++ vcdimager-0.7.23/frontends/cli/cdxa2mpeg.c +@@ -33,6 +33,8 @@ + #include <stdlib.h> + #include <errno.h> + #include <unistd.h> ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + #include <cdio/sector.h> + #include <cdio/bytesex.h> + +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_build.c ++++ vcdimager-0.7.23/frontends/xml/vcd_xml_build.c +@@ -27,8 +27,14 @@ + #include <string.h> + #include <errno.h> + ++#ifdef HAVE_TIME_H ++#include <time.h> ++#endif ++ + #include <popt.h> + ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + #include <libxml/parserInternals.h> + #include <libxml/parser.h> + #include <libxml/valid.h> +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_common.c ++++ vcdimager-0.7.23/frontends/xml/vcd_xml_common.c +@@ -25,6 +25,9 @@ + #include <stdio.h> + #include <stdlib.h> + ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ ++ + /* Private includes */ + #include "vcd_assert.h" + #include "vcd.h" +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/lib/info_private.c ++++ vcdimager-0.7.23/lib/info_private.c +@@ -46,6 +46,8 @@ + #include <unistd.h> + #endif + ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + #include <cdio/cdio.h> + #include <cdio/bytesex.h> + #include <cdio/util.h> +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/lib/image_nrg.c ++++ vcdimager-0.7.23/lib/image_nrg.c +@@ -30,6 +30,8 @@ + #include <stdlib.h> + #include <string.h> + ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + #include <cdio/cdio.h> + #include <cdio/bytesex.h> + #include <cdio/iso9660.h> +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/lib/image_cdrdao.c ++++ vcdimager-0.7.23/lib/image_cdrdao.c +@@ -26,6 +26,8 @@ + #include <stdlib.h> + #include <string.h> + ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + /* Public headers */ + #include <cdio/iso9660.h> + #include <cdio/util.h> +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/lib/inf.c ++++ vcdimager-0.7.23/lib/inf.c +@@ -49,6 +49,8 @@ + #include <unistd.h> + #endif + ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + #include <cdio/cdio.h> + #include <cdio/bytesex.h> + #include <cdio/util.h> +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/lib/vcd_read.h ++++ vcdimager-0.7.23/lib/vcd_read.h +@@ -22,6 +22,8 @@ + # include "config.h" + #endif + ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + #include <cdio/cdio.h> + #include <cdio/iso9660.h> + +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/lib/image.c ++++ vcdimager-0.7.23/lib/image.c +@@ -23,6 +23,8 @@ + # include "config.h" + #endif + ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + #include <cdio/cdio.h> + + /* Public headers */ +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/lib/files.c ++++ vcdimager-0.7.23/lib/files.c +@@ -27,6 +27,8 @@ + #include <stddef.h> + #include <math.h> + ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + #include <cdio/cdio.h> + #include <cdio/bytesex.h> + #include <cdio/util.h> +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/lib/image_bincue.c ++++ vcdimager-0.7.23/lib/image_bincue.c +@@ -26,6 +26,8 @@ + #include <stdlib.h> + #include <string.h> + ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + #include <cdio/cdio.h> + #include <cdio/bytesex.h> + #include <cdio/iso9660.h> +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/lib/pbc.c ++++ vcdimager-0.7.23/lib/pbc.c +@@ -26,6 +26,8 @@ + #include <stddef.h> + #include <math.h> + ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + #include <cdio/cdio.h> + #include <cdio/bytesex.h> + #include <cdio/util.h> +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/lib/info_private.h ++++ vcdimager-0.7.23/lib/info_private.h +@@ -25,6 +25,8 @@ + + #ifndef _VCD_INFO_PRIVATE_H + #define _VCD_INFO_PRIVATE_H ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + + #ifdef HAVE_CONFIG_H + # include "config.h" +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/lib/vcd.c ++++ vcdimager-0.7.23/lib/vcd.c +@@ -28,6 +28,9 @@ + #include <ctype.h> + #include <math.h> + ++#define _VCD_INFO_PRIVATE_H ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + #include <cdio/cdio.h> + #include <cdio/util.h> + #include <cdio/iso9660.h> +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/include/libvcd/types.h ++++ vcdimager-0.7.23/include/libvcd/types.h +@@ -21,6 +21,8 @@ + #ifndef __VCD_TYPES_H__ + #define __VCD_TYPES_H__ + ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + #include <cdio/types.h> + + #ifdef __cplusplus +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/test/check_vcd20.sh ++++ vcdimager-0.7.23/test/check_vcd20.sh +@@ -27,7 +27,7 @@ + fi + else + if do_cksum <<EOF +-1170593626 1764000 videocd.bin ++1594106842 1764000 videocd.bin + 3699460731 172 videocd.cue + EOF + then +@@ -60,7 +60,7 @@ + fi + + if do_cksum <<EOF +-1209563022 4840416 videocd.bin ++3694706815 4840416 videocd.bin + 2350689551 447 videocd.cue + EOF + then +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/test/check_svcd1.sh ++++ vcdimager-0.7.23/test/check_svcd1.sh +@@ -26,7 +26,7 @@ + fi + else + if do_cksum <<EOF +-3747978987 1587600 videocd.bin ++1923402845 1587600 videocd.bin + 3699460731 172 videocd.cue + EOF + then +@@ -59,7 +59,7 @@ + fi + + if do_cksum <<EOF +-4104676060 4059552 videocd.bin ++832619107 4059552 videocd.bin + 669873986 424 videocd.cue + EOF + then +@@ -112,7 +112,7 @@ + fi + + if do_cksum <<EOF +-3695643404 2018016 videocd.bin ++4248765257 2018016 videocd.bin + 483250638 172 videocd.cue + EOF + then +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/test/check_vcd11.sh ++++ vcdimager-0.7.23/test/check_vcd11.sh +@@ -26,8 +26,6 @@ + fi + else + if do_cksum <<EOF +-3746200718 1764000 videocd.bin +-3699460731 172 videocd.cue + EOF + then + : +@@ -58,7 +56,7 @@ + fi + + if do_cksum <<EOF +-1013953491 3880800 videocd.bin ++4286535819 3880800 videocd.bin + 2088931809 424 videocd.cue + EOF + then +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/test/check_sizeof.c ++++ vcdimager-0.7.23/test/check_sizeof.c +@@ -28,6 +28,8 @@ + #include <stdio.h> + #include <math.h> + ++/* We don't want to pull in cdio's config */ ++#define __CDIO_CONFIG_H__ + #include <cdio/iso9660.h> + #include <libvcd/types.h> + #include <libvcd/files.h> +only in patch2: +unchanged: +--- vcdimager-0.7.23.orig/test/check_nrg.sh ++++ vcdimager-0.7.23/test/check_nrg.sh +@@ -27,7 +27,7 @@ + fi + + if do_cksum <<EOF +-1284184221 2630472 videocd.nrg ++2176989007 2630472 videocd.nrg + EOF + then + : +@@ -72,7 +72,7 @@ + fi + + if do_cksum <<EOF +-2897989104 1653964 videocd.nrg ++2290177553 1653964 videocd.nrg + EOF + then + : diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 577d754c6..b62117816 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 150788 2012-02-22 11:22:08Z ibiru $ +# $Id: PKGBUILD 150929 2012-02-23 23:36:49Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=2.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" -license=('GPL') +license=('LGPL2.1' 'GPL2') depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio' - 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' - 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' - 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' - 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' 'xcb-util-keysyms' - 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') + 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' 'aalib' + 'libxinerama' 'libtar' 'libtiger' 'lua' 'v4l-utils' 'smbclient' + 'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' + 'libupnp' 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' + 'xcb-util-keysyms' 'ttf-freefont') makedepends=('avahi' 'pkg-config' 'live-media' 'libnotify' 'libbluray' - 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' + 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'libgcrypt' 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' - 'lirc-utils' 'gnutls' 'libcaca' 'oss') + 'lirc-utils' 'gnutls' 'libcaca' 'librsvg' 'portaudio' 'oss' + 'ncurses' 'libgme' 'schroedinger' 'udev' 'projectm' 'twolame' + 'libdvdcss' 'gnome-vfs' 'libgoom2' 'vcdimager') optdepends=('avahi: for service discovery using bonjour protocol' 'libnotify: for notification plugin' 'ncurses: for ncurses interface support' @@ -31,8 +33,19 @@ optdepends=('avahi: for service discovery using bonjour protocol' 'libpulse: PulseAudio support' 'vdpau-video: vdpau back-end for nvidia' 'libva-driver-intel: back-end for intel cards' - 'libbluray: for Blu-Ray disks' - 'oss: for OSS audio') + 'libbluray: for Blu-Ray support' + 'oss: for OSS audio support' + 'portaudio: for portaudio support' + 'twolame: for TwoLAME mpeg2 encoder plugin' + 'projectm: for ProjectM visualisation plugin' + 'udev: for service discovery using udev' + 'libcaca: for colored ASCII art video output' + 'libgme: for libgme plugin' + 'librsvg: for SVG plugin' + 'libgcrypt: support for some plugins' + 'gnome-vfs: for GNOME Virtual File System support' + 'libgoom2: for libgoom plugin' + 'vcdimager: navigate VCD with libvcdinfo') conflicts=('vlc-plugin') replaces=('vlc-plugin') backup=('usr/share/vlc/lua/http/.hosts' @@ -40,7 +53,7 @@ backup=('usr/share/vlc/lua/http/.hosts' options=('!libtool') install=vlc.install source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz" - access_smb_link_to_smbclient.patch) + 'access_smb_link_to_smbclient.patch') md5sums=('8806bff2ea9c76791123d444a92f708c' '5f510fdea99cdb7941423eb40045968a') @@ -55,23 +68,23 @@ build() { ./configure --prefix=/usr \ --disable-rpath \ --enable-faad \ - --enable-dbus-control \ --enable-nls \ --enable-lirc \ --enable-pvr \ --enable-ncurses \ - --enable-upnp \ - --enable-oss \ - --enable-bluray \ - --enable-live555 \ - --enable-realrtsp + --enable-real \ + --enable-realrtsp \ + --enable-xosd \ + --enable-aa \ + --enable-vcdx \ + --enable-media-library make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}/" install + make DESTDIR="${pkgdir}" install for res in 16 32 48 128; do install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD index e4853d4c5..a3d15bb41 100644 --- a/extra/xfdesktop/PKGBUILD +++ b/extra/xfdesktop/PKGBUILD @@ -1,41 +1,50 @@ -# $Id: PKGBUILD 138129 2011-09-17 02:28:33Z allan $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 150819 2012-02-23 06:32:41Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfdesktop pkgver=4.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="A desktop manager for Xfce" arch=('i686' 'x86_64') -license=('GPL2') url="http://www.xfce.org/" +license=('GPL2') groups=('xfce4') -depends=('libxfce4ui' 'thunar>=1.2.0' 'garcon' 'hicolor-icon-theme' 'libwnck>=2.30.0') -makedepends=('intltool' 'xfce4-panel>=4.8.0') +depends=('libxfce4ui' 'thunar>=1.2.0' 'garcon' 'hicolor-icon-theme' 'libwnck') +makedepends=('intltool' 'xfce4-panel') optdepends=('xfce4-panel: panel menu plugin') conflicts=('xfce4-menueditor') replaces=('xfce4-menueditor') options=('!libtool') install=xfdesktop.install -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('617c667c469698e8c974e38412cb484c') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2 + implement-paste-on-desktop.patch) +sha256sums=('e58460f52ae96c389402f6db62c46db61cd51cdb550a42bd97c0ab2a5b62f424' + 'f26a75fe27c198cd40fad139310e984f4eaac0dfa2cae0d7f32498a8f58322b2') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" + + # Fix FS#27866: Paste menu entry in context menu is deactivated + # Upstream report/patch: https://bugzilla.xfce.org/show_bug.cgi?id=3804 + patch -Np1 -i "$srcdir/implement-paste-on-desktop.patch" + ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --enable-gio-unix \ - --enable-thunarx \ - --enable-exo \ - --enable-notifications \ - --disable-debug + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --enable-gio-unix \ + --enable-thunarx \ + --enable-exo \ + --enable-notifications \ + --disable-debug make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfdesktop/implement-paste-on-desktop.patch b/extra/xfdesktop/implement-paste-on-desktop.patch new file mode 100644 index 000000000..a84e6cb05 --- /dev/null +++ b/extra/xfdesktop/implement-paste-on-desktop.patch @@ -0,0 +1,236 @@ +From dd57435413a10b288153d1ae0062d37e58bcffd1 Mon Sep 17 00:00:00 2001 +From: Eric Koegel <eric.koegel@gmail.com> +Date: Sat, 17 Dec 2011 10:37:04 +0300 +Subject: [PATCH] Adds the code required to perform a paste on the on the + desktop. Fixes bug 3804. + +--- + src/xfdesktop-clipboard-manager.c | 114 ++++++++++++++++++++++++++++++------- + src/xfdesktop-file-icon-manager.c | 27 ++++++++- + 2 files changed, 120 insertions(+), 21 deletions(-) + +diff --git a/src/xfdesktop-clipboard-manager.c b/src/xfdesktop-clipboard-manager.c +index 76b4bef..ed90aa0 100644 +--- a/src/xfdesktop-clipboard-manager.c ++++ b/src/xfdesktop-clipboard-manager.c +@@ -307,7 +307,6 @@ xfdesktop_clipboard_manager_owner_changed (GtkClipboard *clipboard, + } + + +-#if 0 + static void + xfdesktop_clipboard_manager_contents_received (GtkClipboard *clipboard, + GtkSelectionData *selection_data, +@@ -318,6 +317,8 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard *clipboard, + GtkWindow *parent = GTK_WINDOW(gtk_widget_get_toplevel(request->widget)); + gboolean path_copy = TRUE; + GList *path_list = NULL; ++ GList *dest_file_list = NULL; ++ GList *l = NULL; + gchar *data; + + /* check whether the retrieval worked */ +@@ -340,19 +341,43 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard *clipboard, + } + + /* determine the path list stored with the selection */ +- path_list = thunar_vfs_path_list_from_string (data, NULL); ++ path_list = xfdesktop_file_utils_file_list_from_string (data); + } + + /* perform the action if possible */ + if (G_LIKELY (path_list != NULL)) + { ++ for (l = path_list; l; l = l->next) { ++ gchar *dest_basename = g_file_get_basename(l->data); ++ ++ if(dest_basename && *dest_basename != '\0') { ++ /* If we copy a file, we need to use the new absolute filename ++ * as the destination. If we move, we need to use the destination ++ * directory. */ ++ if(path_copy) { ++ GFile *dest_file = g_file_get_child(request->target_file, dest_basename); ++ dest_file_list = g_list_prepend(dest_file_list, dest_file); ++ } else { ++ dest_file_list = g_list_prepend(dest_file_list, request->target_file); ++ } ++ } ++ g_free(dest_basename); ++ } ++ ++ dest_file_list = g_list_reverse(dest_file_list); ++ + if (G_LIKELY (path_copy)) +- xfdesktop_file_utils_copy_into(parent, path_list, request->target_path); +- //thunar_application_copy_into (application, request->widget, path_list, request->target_path, request->new_files_closure); +- else +- xfdesktop_file_utils_move_into(parent, path_list, request->target_path); +- //thunar_application_move_into (application, request->widget, path_list, request->target_path, request->new_files_closure); +- thunar_vfs_path_list_free (path_list); ++ { ++ xfdesktop_file_utils_transfer_files(GDK_ACTION_COPY, ++ path_list, ++ dest_file_list, ++ gtk_widget_get_screen(GTK_WIDGET(parent))); ++ } else { ++ xfdesktop_file_utils_transfer_files(GDK_ACTION_MOVE, ++ path_list, ++ dest_file_list, ++ gtk_widget_get_screen(GTK_WIDGET(parent))); ++ } + + /* clear the clipboard if it contained "cutted data" + * (gtk_clipboard_clear takes care of not clearing +@@ -365,18 +390,11 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard *clipboard, + * if either the Xserver or our GTK+ version + * doesn't support the XFixes extension. + */ +-#if GTK_CHECK_VERSION(2,6,0) + if (!gdk_display_supports_selection_notification (gtk_clipboard_get_display (manager->clipboard))) +-#endif + { + xfdesktop_clipboard_manager_owner_changed (manager->clipboard, NULL, manager); + } + } +- else +- { +- /* tell the user that we cannot paste */ +-// thunar_dialogs_show_error (request->widget, NULL, _("There is nothing on the clipboard to paste")); +- } + + /* free the request */ + if (G_LIKELY (request->widget != NULL)) +@@ -384,10 +402,11 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard *clipboard, + if (G_LIKELY (request->new_files_closure != NULL)) + g_closure_unref (request->new_files_closure); + g_object_unref (G_OBJECT (request->manager)); +- thunar_vfs_path_unref (request->target_path); +- g_free (request); ++ ++ g_list_free(dest_file_list); ++ g_list_free(path_list); + } +-#endif ++ + + + static void +@@ -654,6 +673,61 @@ xfdesktop_clipboard_manager_cut_files (XfdesktopClipboardManager *manager, + gboolean + xfdesktop_clipboard_manager_get_can_paste (XfdesktopClipboardManager *manager) + { +- /* FIXME: implement */ +- return FALSE; ++ g_return_val_if_fail (XFDESKTOP_IS_CLIPBOARD_MANAGER (manager), FALSE); ++ return manager->can_paste; ++} ++ ++ ++/** ++ * thunar_clipboard_manager_paste_files: ++ * @manager : a #XfdesktopClipboardManager. ++ * @target_file : the #GFile of the folder to which the contents on the clipboard ++ * should be pasted. ++ * @widget : a #GtkWidget, on which to perform the paste or %NULL if no widget is ++ * known. ++ * @new_files_closure : a #GClosure to connect to the job's "new-files" signal, ++ * which will be emitted when the job finishes with the ++ * list of #GFile<!---->s created by the job, or ++ * %NULL if you're not interested in the signal. ++ * ++ * Pastes the contents from the clipboard associated with @manager to the directory ++ * referenced by @target_file. ++ * Code copied and adapted from thunar-clipboard-manager.c ++ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org> ++ * Copyright (c) 2009-2011 Jannis Pohlmann <jannis@xfce.org> ++ **/ ++void ++xfdesktop_clipboard_manager_paste_files (XfdesktopClipboardManager *manager, ++ GFile *target_file, ++ GtkWidget *widget, ++ GClosure *new_files_closure) ++{ ++ XfdesktopClipboardPasteRequest *request; ++ ++ g_return_if_fail (XFDESKTOP_IS_CLIPBOARD_MANAGER (manager)); ++ g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget)); ++ ++ /* prepare the paste request */ ++ request = g_slice_new0 (XfdesktopClipboardPasteRequest); ++ request->manager = g_object_ref (G_OBJECT (manager)); ++ request->target_file = g_object_ref (target_file); ++ request->widget = widget; ++ ++ /* take a reference on the closure (if any) */ ++ if (G_LIKELY (new_files_closure != NULL)) ++ { ++ request->new_files_closure = new_files_closure; ++ g_closure_ref (new_files_closure); ++ g_closure_sink (new_files_closure); ++ } ++ ++ /* get notified when the widget is destroyed prior to ++ * completing the clipboard contents retrieval ++ */ ++ if (G_LIKELY (request->widget != NULL)) ++ g_object_add_weak_pointer (G_OBJECT (request->widget), (gpointer) &request->widget); ++ ++ /* schedule the request */ ++ gtk_clipboard_request_contents (manager->clipboard, manager->x_special_gnome_copied_files, ++ xfdesktop_clipboard_manager_contents_received, request); + } +diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c +index d3ca2eb..b7fada2 100644 +--- a/src/xfdesktop-file-icon-manager.c ++++ b/src/xfdesktop-file-icon-manager.c +@@ -858,6 +858,15 @@ xfdesktop_file_icon_menu_delete(GtkWidget *widget, + } + + static void ++xfdesktop_file_icon_menu_paste(GtkWidget *widget, ++ gpointer user_data) ++{ ++ XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data); ++ if(widget && fmanager) ++ xfdesktop_clipboard_manager_paste_files(clipboard_manager, fmanager->priv->folder, widget, NULL); ++} ++ ++static void + xfdesktop_file_icon_menu_properties(GtkWidget *widget, + gpointer user_data) + { +@@ -1616,7 +1625,11 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop, + mi = gtk_image_menu_item_new_from_stock(GTK_STOCK_PASTE, NULL); + gtk_widget_show(mi); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); +- /* FIXME: implement */ ++ if(xfdesktop_clipboard_manager_get_can_paste(clipboard_manager)) { ++ g_signal_connect(G_OBJECT(mi), "activate", ++ G_CALLBACK(xfdesktop_file_icon_menu_paste), ++ fmanager); ++ } else + gtk_widget_set_sensitive(mi, FALSE); + } else { + mi = gtk_image_menu_item_new_from_stock(GTK_STOCK_COPY, NULL); +@@ -2098,6 +2111,18 @@ xfdesktop_file_icon_manager_key_press(GtkWidget *widget, + } + return TRUE; + ++ case GDK_v: ++ case GDK_V: ++ if(!(evt->state & GDK_CONTROL_MASK) ++ || (evt->state & (GDK_SHIFT_MASK|GDK_MOD1_MASK|GDK_MOD4_MASK))) ++ { ++ return FALSE; ++ } ++ if(xfdesktop_clipboard_manager_get_can_paste(clipboard_manager)) { ++ xfdesktop_clipboard_manager_paste_files(clipboard_manager, fmanager->priv->folder, widget, NULL); ++ } ++ return TRUE; ++ + case GDK_r: + case GDK_R: + if(!(evt->state & GDK_CONTROL_MASK) +-- +1.7.5.4 + diff --git a/extra/xfdesktop/xfdesktop.install b/extra/xfdesktop/xfdesktop.install index 21b79d2d4..e4f8fd06c 100644 --- a/extra/xfdesktop/xfdesktop.install +++ b/extra/xfdesktop/xfdesktop.install @@ -3,9 +3,11 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index fb6f5ea5f..2c8141170 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148646 2012-02-05 03:52:36Z eric $ +# $Id: PKGBUILD 150886 2012-02-23 13:48:15Z allan $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" diff --git a/extra/xorg-xev/PKGBUILD b/extra/xorg-xev/PKGBUILD index 23ad46247..c0380e60d 100644 --- a/extra/xorg-xev/PKGBUILD +++ b/extra/xorg-xev/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 149060 2012-02-05 15:59:34Z bisson $ +# $Id: PKGBUILD 150821 2012-02-23 07:20:15Z andyrtr $ # Contributor: Jan de Groot <jgc@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=xorg-xev -pkgver=1.1.0 -pkgrel=3 +pkgver=1.2.0 +pkgrel=1 pkgdesc='Print contents of X events' url='http://xorg.freedesktop.org/' arch=('i686' 'x86_64') license=('custom') -depends=('libx11') -makedepends=('xorg-util-macros') +depends=('libx11' 'libxrandr') +makedepends=('xorg-util-macros' 'xproto') source=("http://xorg.freedesktop.org/archive/individual/app/xev-${pkgver}.tar.bz2") -sha1sums=('77dcbdaa2046db56f31936f921843bd05df2255f') - +sha1sums=('6b05706ed39382b5d08c5351c00ba7e127709eec') groups=('xorg-apps' 'xorg') build() { diff --git a/extra/xorg-xwd/PKGBUILD b/extra/xorg-xwd/PKGBUILD index 1634c5d93..feb6e74d9 100644 --- a/extra/xorg-xwd/PKGBUILD +++ b/extra/xorg-xwd/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 113841 2011-03-10 16:01:03Z jgc $ +# $Id: PKGBUILD 150823 2012-02-23 07:34:14Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xwd -pkgver=1.0.4 -pkgrel=2 +pkgver=1.0.5 +pkgrel=1 pkgdesc="X Window System image dumping utility" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('libx11') -makedepends=('xorg-util-macros') +makedepends=('xorg-util-macros' 'libxt') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xwd-${pkgver}.tar.bz2) -sha1sums=('4ef4fd9072a507e9a1ee88ba1d28b314006cc109') +sha1sums=('3b0e4f3f9d28a07444e72952342e21544d4785b6') build() { cd "${srcdir}/xwd-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xwd-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD index e58444200..3ea9bf7a9 100644 --- a/extra/zsh/PKGBUILD +++ b/extra/zsh/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 150666 2012-02-19 20:58:33Z pierre $ +# $Id: PKGBUILD 150931 2012-02-23 23:42:48Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zsh -pkgver=4.3.16 +pkgver=4.3.17 pkgrel=1 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ install=zsh.install source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" 'zprofile') backup=('etc/zsh/zprofile') -md5sums=('4bf0b8947b5acc0ac4334d75adc87239' +md5sums=('8258967060b2654f30001a011946ac6a' '24a9335edf77252a7b5f52e079f7aef7') build() { diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 90df2d6b5..c84aa9217 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Maintainer: Thomas Baechler <thomas@archlinux.org> -# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> -# Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org> +# Maintainer: Si Feng <sci.feng at gmail.com> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Thomas Baechler <thomas@archlinux.org> +# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> +# Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org> # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> pkgbase=linux-libre-xen @@ -10,7 +10,7 @@ pkgname=('linux-libre-xen' 'linux-libre-xen-headers' 'linux-libre-xen-docs') # B # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.2 -pkgver=${_basekernel}.6 +pkgver=${_basekernel}.7 pkgrel=1 arch=('i686' 'x86_64') url="http://linux-libre.fsfla.org/" @@ -28,9 +28,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'i915-fix-ghost-tv-output.patch' 'i915-gpu-finish.patch') md5sums=('27c641c4f6785fc647cdd3e44963a55c' - 'c4b411e90294fcb768d5242a6c21c0d7' - '79d5dd186fd129aad90a880317201619' - '4964d8e664925afe9a148db701cce725' + '37a0fdc7ad19c9489faf09925b4fae5b' + 'a56e949b6c872d0d40ee3fd6969e0352' + '6685fcb15d021dff6e02667c60113577' '67463f7a6e88305d7cd14a430e9efe92' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' @@ -90,7 +90,7 @@ build() { #return 1 #################### - yes "" | make + yes "" | make config # build! make ${MAKEFLAGS} bzImage modules diff --git a/kernels/linux-libre-xen/config.i686 b/kernels/linux-libre-xen/config.i686 index 7973b2fe0..0e11985ee 100644 --- a/kernels/linux-libre-xen/config.i686 +++ b/kernels/linux-libre-xen/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.2.6-libre Kernel Configuration +# Linux/i386 3.2.7-libre Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -430,8 +430,8 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_CLEANCACHE=y # CONFIG_HIGHPTE is not set CONFIG_X86_CHECK_BIOS_CORRUPTION=y @@ -725,7 +725,7 @@ CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=m +CONFIG_IPV6=y CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -3262,7 +3262,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m CONFIG_SBC_EPX_C3_WATCHDOG=m -CONFIG_XEN_WDT=m +# CONFIG_XEN_WDT is not set # # ISA-based Watchdog Cards @@ -3587,7 +3587,6 @@ CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_SAA7164=m CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_VIDEO_VIA_CAMERA=m CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_IMX074=m CONFIG_SOC_CAMERA_MT9M001=m @@ -4002,7 +4001,7 @@ CONFIG_FB_SYS_IMAGEBLIT=m CONFIG_FB_SYS_FOPS=m # CONFIG_FB_WMT_GE_ROPS is not set CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_SVGALIB=m +# CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set CONFIG_FB_BACKLIGHT=y CONFIG_FB_MODE_HELPERS=y @@ -4011,73 +4010,48 @@ CONFIG_FB_TILEBLITTING=y # # Frame buffer hardware drivers # -CONFIG_FB_CIRRUS=m -CONFIG_FB_PM2=m -CONFIG_FB_PM2_FIFO_DISCONNECT=y -CONFIG_FB_CYBER2000=m -CONFIG_FB_CYBER2000_DDC=y +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set # CONFIG_FB_ARC is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set -# CONFIG_FB_VGA16 is not set +CONFIG_FB_VGA16=m CONFIG_FB_UVESA=m CONFIG_FB_VESA=y CONFIG_FB_EFI=y # CONFIG_FB_N411 is not set # CONFIG_FB_HGA is not set # CONFIG_FB_S1D13XXX is not set -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -CONFIG_FB_RIVA=m -CONFIG_FB_RIVA_I2C=y -# CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_RIVA_BACKLIGHT=y +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set CONFIG_FB_I810=m -# CONFIG_FB_I810_GTF is not set -CONFIG_FB_LE80578=m -CONFIG_FB_CARILLO_RANCH=m +CONFIG_FB_I810_GTF=y +CONFIG_FB_I810_I2C=y +# CONFIG_FB_LE80578 is not set # CONFIG_FB_MATROX is not set -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_BACKLIGHT=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=m -CONFIG_FB_ATY128_BACKLIGHT=y -CONFIG_FB_ATY=m -CONFIG_FB_ATY_CT=y -CONFIG_FB_ATY_GENERIC_LCD=y -CONFIG_FB_ATY_GX=y -CONFIG_FB_ATY_BACKLIGHT=y -CONFIG_FB_S3=m -CONFIG_FB_S3_DDC=y -CONFIG_FB_SAVAGE=m -CONFIG_FB_SAVAGE_I2C=y -CONFIG_FB_SAVAGE_ACCEL=y -CONFIG_FB_SIS=m -CONFIG_FB_SIS_300=y -CONFIG_FB_SIS_315=y -CONFIG_FB_VIA=m -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -CONFIG_FB_VIA_X_COMPATIBILITY=y -CONFIG_FB_NEOMAGIC=m -CONFIG_FB_KYRO=m -CONFIG_FB_3DFX=m -CONFIG_FB_3DFX_ACCEL=y -CONFIG_FB_3DFX_I2C=y +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_VIA is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set CONFIG_FB_VOODOO1=m -CONFIG_FB_VT8623=m -CONFIG_FB_TRIDENT=m +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CARMINE is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_TMIO is not set # CONFIG_FB_SM501 is not set -CONFIG_FB_SMSCUFX=m +# CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m -# CONFIG_FB_VIRTUAL is not set +CONFIG_FB_VIRTUAL=m CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set @@ -4097,7 +4071,6 @@ CONFIG_LCD_AMS369FG06=m CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=m CONFIG_BACKLIGHT_PROGEAR=m -CONFIG_BACKLIGHT_CARILLO_RANCH=m CONFIG_BACKLIGHT_APPLE=m CONFIG_BACKLIGHT_SAHARA=m CONFIG_BACKLIGHT_WM831X=m @@ -5255,23 +5228,14 @@ CONFIG_SIGMA=m # # File systems # -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m -CONFIG_EXT3_DEFAULTS_TO_ORDERED=y -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set -CONFIG_JBD=m -# CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m # CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=m diff --git a/kernels/linux-libre-xen/config.x86_64 b/kernels/linux-libre-xen/config.x86_64 index ef79ec35b..7bc5bd2e7 100644 --- a/kernels/linux-libre-xen/config.x86_64 +++ b/kernels/linux-libre-xen/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.2.6-libre Kernel Configuration +# Linux/x86_64 3.2.7-libre Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -410,8 +410,8 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_CLEANCACHE=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y @@ -685,7 +685,7 @@ CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=m +CONFIG_IPV6=y CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -3130,7 +3130,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m CONFIG_SBC_EPX_C3_WATCHDOG=m -CONFIG_XEN_WDT=m +# CONFIG_XEN_WDT is not set # # PCI-based Watchdog Cards @@ -3445,7 +3445,6 @@ CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_SAA7164=m CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_VIDEO_VIA_CAMERA=m CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_IMX074=m CONFIG_SOC_CAMERA_MT9M001=m @@ -3842,7 +3841,7 @@ CONFIG_FB_SYS_IMAGEBLIT=m CONFIG_FB_SYS_FOPS=m # CONFIG_FB_WMT_GE_ROPS is not set CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_SVGALIB=m +# CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set CONFIG_FB_BACKLIGHT=y CONFIG_FB_MODE_HELPERS=y @@ -3851,71 +3850,48 @@ CONFIG_FB_TILEBLITTING=y # # Frame buffer hardware drivers # -CONFIG_FB_CIRRUS=m -CONFIG_FB_PM2=m -CONFIG_FB_PM2_FIFO_DISCONNECT=y -CONFIG_FB_CYBER2000=m -CONFIG_FB_CYBER2000_DDC=y +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set # CONFIG_FB_ARC is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set -# CONFIG_FB_VGA16 is not set +CONFIG_FB_VGA16=m CONFIG_FB_UVESA=m CONFIG_FB_VESA=y CONFIG_FB_EFI=y # CONFIG_FB_N411 is not set # CONFIG_FB_HGA is not set # CONFIG_FB_S1D13XXX is not set -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -CONFIG_FB_RIVA=m -CONFIG_FB_RIVA_I2C=y -# CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_RIVA_BACKLIGHT=y -CONFIG_FB_LE80578=m -CONFIG_FB_CARILLO_RANCH=m +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +CONFIG_FB_I810=m +CONFIG_FB_I810_GTF=y +CONFIG_FB_I810_I2C=y +# CONFIG_FB_LE80578 is not set # CONFIG_FB_MATROX is not set -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_BACKLIGHT=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=m -CONFIG_FB_ATY128_BACKLIGHT=y -CONFIG_FB_ATY=m -CONFIG_FB_ATY_CT=y -CONFIG_FB_ATY_GENERIC_LCD=y -CONFIG_FB_ATY_GX=y -CONFIG_FB_ATY_BACKLIGHT=y -CONFIG_FB_S3=m -CONFIG_FB_S3_DDC=y -CONFIG_FB_SAVAGE=m -CONFIG_FB_SAVAGE_I2C=y -CONFIG_FB_SAVAGE_ACCEL=y -CONFIG_FB_SIS=m -CONFIG_FB_SIS_300=y -CONFIG_FB_SIS_315=y -CONFIG_FB_VIA=m -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -CONFIG_FB_VIA_X_COMPATIBILITY=y -CONFIG_FB_NEOMAGIC=m -CONFIG_FB_KYRO=m -CONFIG_FB_3DFX=m -CONFIG_FB_3DFX_ACCEL=y -CONFIG_FB_3DFX_I2C=y +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_VIA is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set CONFIG_FB_VOODOO1=m -CONFIG_FB_VT8623=m -CONFIG_FB_TRIDENT=m +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CARMINE is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_TMIO is not set # CONFIG_FB_SM501 is not set -CONFIG_FB_SMSCUFX=m +# CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m -# CONFIG_FB_VIRTUAL is not set +CONFIG_FB_VIRTUAL=m CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set @@ -3935,7 +3911,6 @@ CONFIG_LCD_AMS369FG06=m CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=m CONFIG_BACKLIGHT_PROGEAR=m -CONFIG_BACKLIGHT_CARILLO_RANCH=m CONFIG_BACKLIGHT_APPLE=m CONFIG_BACKLIGHT_SAHARA=m CONFIG_BACKLIGHT_WM831X=m @@ -5012,23 +4987,14 @@ CONFIG_SIGMA=m # # File systems # -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m -CONFIG_EXT3_DEFAULTS_TO_ORDERED=y -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set -CONFIG_JBD=m -# CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m # CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=m diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 2b9ef501b..16b877724 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.1.5-1-LIBRE-XEN +KERNEL_VERSION=3.2.7-1-LIBRE-XEN post_install () { # updating module dependencies @@ -18,7 +18,8 @@ post_install () { if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then # add compat symlinks for the initramfs images ln -sf initramfs-linux-libre${KERNEL_NAME}.img /boot/kernel26${KERNEL_NAME}.img - ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img /boot/kernel26${KERNEL_NAME}-fallback.img + ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \ + boot/kernel26${KERNEL_NAME}-fallback.img ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME} fi fi @@ -43,12 +44,8 @@ post_upgrade() { echo ">>>" fi - if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then - if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then - echo "WARNING: /boot appears to be a seperate partition but is not mounted" - echo " This is most likely not what you want. Please mount your /boot" - echo " partition and reinstall the kernel unless you are sure this is OK" - fi + if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then + echo "WARNING: /boot appears to be a separate partition but is not mounted." fi # updating module dependencies diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD index dee7e1dd1..abef16537 100644 --- a/libre/kile-libre/PKGBUILD +++ b/libre/kile-libre/PKGBUILD @@ -1,11 +1,11 @@ # Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu> -# $Id: PKGBUILD 135613 2011-08-16 16:22:12Z andrea $ +# $Id: PKGBUILD 147972 2012-01-29 10:07:14Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> _pkgname=kile pkgname=kile-libre -pkgver=2.1 +pkgver=2.1.1 pkgrel=2 pkgdesc="A user friendly TeX/LaTeX frontend for KDE" arch=("i686" "x86_64") @@ -19,7 +19,7 @@ provides=('kile') install=${_pkgname}.install source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2" "no-acroread.patch") -sha1sums=('860ac96b68b6026f48b8a9c401c6024ba78e3cdf' +sha1sums=('36987669dd9db05b063a0b4650ef3589dc79f711' '9bbe5d1b0e2a78b13667fcf4e5e21f801447f9d6') build() { diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD index 92b995aa9..5fc5179b9 100644 --- a/multilib/lib32-glibc/PKGBUILD +++ b/multilib/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63938 2012-02-07 16:25:56Z heftig $ +# $Id: PKGBUILD 66282 2012-02-23 10:49:16Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.15 -pkgrel=5 +pkgrel=6 _glibcdate=20111227 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -33,8 +33,11 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda glibc-2.15-scanf.patch glibc-2.15-ifunc.patch glibc-2.15-avx.patch + glibc-2.15-strcasecmp-disable-avx.patch glibc-2.15-gb18030.patch glibc-2.15-revert-netlink-cache.patch + glibc-2.15-arena.patch + glibc-2.15-negative-result-cache.patch lib32-glibc.conf) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '4dadb9203b69a3210d53514bb46f41c3' @@ -51,8 +54,11 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '39353f53168f4a7509ba5fe0d9f218b8' '136eb969f5d6bb6f5155f72a1a7cf23e' '41ae047ac88e8f6f547c70b0a0bc3b72' + 'fccb89f6628f59752278e125c35941f8' 'c4cd34f20ccd37817f6c1374bd4ee68e' '6771b0b2bb8aa3870a259fd2f46c424f' + 'a9ffadcfd2d357f91fee0b861fd4a7c6' + '2c46b8e294de24c531f2253ff69aeef3' '6e052f1cb693d5d3203f50f9d4e8c33b') build() { @@ -64,8 +70,9 @@ build() { # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 + # Undefine __i686 for gcc <= 4.6 # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html + # fix in http://sourceware.org/git/?p=glibc.git;a=commit;h=d4a54ac6 requires additional backporting... patch -Np1 -i ${srcdir}/glibc-__i686.patch # http://www.exploit-db.com/exploits/15274/ @@ -99,6 +106,8 @@ build() { # revert commit c5a0802a - causes various hangs # https://bugzilla.redhat.com/show_bug.cgi?id=769421 + # Note: fedora may have actual fix (not submitted upstream yet...) + # http://pkgs.fedoraproject.org/gitweb/?p=glibc.git;a=blob_plain;f=glibc-rh552960-2.patch patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch # fix realloc usage in vfscanf @@ -113,6 +122,8 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09 # http://sourceware.org/git/?p=glibc.git;a=commit;h=08cf777f patch -Np1 -i ${srcdir}/glibc-2.15-avx.patch + # and "fix" strcasecmp + patch -Np1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch # fix GB18030 charmap # http://sourceware.org/bugzilla/show_bug.cgi?id=11837 @@ -121,10 +132,18 @@ build() { patch -Np1 -i ${srcdir}/glibc-2.15-gb18030.patch # fix crash in __nscd_get_mapping if nscd not running - # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 + # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential "fix" in comment) # reverts commit 3a2c0242 and other necessary following changes... patch -Np1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch + # handle ARENA_TEST correctly + # http://sourceware.org/git/?p=glibc.git;a=commit;h=41b81892 + patch -Np1 -i ${srcdir}/glibc-2.15-arena.patch + + # Do not cache negative results in nscd if these are transient + # http://sourceware.org/git/?p=glibc.git;a=commit;h=3e1aa84e + patch -Np1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch + cd ${srcdir} mkdir glibc-build diff --git a/multilib/lib32-glibc/glibc-2.15-arena.patch b/multilib/lib32-glibc/glibc-2.15-arena.patch new file mode 100644 index 000000000..46f52e98d --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.15-arena.patch @@ -0,0 +1,29 @@ +diff --git a/malloc/arena.c b/malloc/arena.c +index d3cf4b9..b1c9469 100644 +--- a/malloc/arena.c ++++ b/malloc/arena.c +@@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size) + { + if (mp_.arena_max != 0) + narenas_limit = mp_.arena_max; +- else ++ else if (narenas > mp_.arena_test) + { + int n = __get_nprocs (); + +@@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size) + } + repeat:; + size_t n = narenas; +- if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0)) ++ /* NB: the following depends on the fact that (size_t)0 - 1 is a ++ very large number and that the underflow is OK. If arena_max ++ is set the value of arena_test is irrelevant. If arena_test ++ is set but narenas is not yet larger or equal to arena_test ++ narenas_limit is 0. There is no possibility for narenas to ++ be too big for the test to always fail since there is not ++ enough address space to create that many arenas. */ ++ if (__builtin_expect (n <= narenas_limit - 1, 0)) + { + if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n)) + goto repeat; diff --git a/multilib/lib32-glibc/glibc-2.15-negative-result-cache.patch b/multilib/lib32-glibc/glibc-2.15-negative-result-cache.patch new file mode 100644 index 000000000..c09e79a17 --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.15-negative-result-cache.patch @@ -0,0 +1,138 @@ +diff --git a/nscd/aicache.c b/nscd/aicache.c +index aaaf80d..e1f1244 100644 +--- a/nscd/aicache.c ++++ b/nscd/aicache.c +@@ -1,5 +1,5 @@ + /* Cache handling for host lookup. +- Copyright (C) 2004-2008, 2009, 2010, 2011 Free Software Foundation, Inc. ++ Copyright (C) 2004-2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. + +@@ -514,8 +514,9 @@ next_nip: + if (fd != -1) + TEMP_FAILURE_RETRY (send (fd, ¬found, total, MSG_NOSIGNAL)); + +- /* If we cannot permanently store the result, so be it. */ +- if (__builtin_expect (db->negtimeout == 0, 0)) ++ /* If we have a transient error or cannot permanently store the ++ result, so be it. */ ++ if (rc4 == EAGAIN || __builtin_expect (db->negtimeout == 0, 0)) + { + /* Mark the old entry as obsolete. */ + if (dh != NULL) +diff --git a/nscd/grpcache.c b/nscd/grpcache.c +index e9607c6..a698f36 100644 +--- a/nscd/grpcache.c ++++ b/nscd/grpcache.c +@@ -1,5 +1,5 @@ + /* Cache handling for group lookup. +- Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. + +@@ -120,8 +120,9 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req, + else + written = total; + +- /* If we cannot permanently store the result, so be it. */ +- if (db->negtimeout == 0) ++ /* If we have a transient error or cannot permanently store ++ the result, so be it. */ ++ if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0)) + { + /* Mark the old entry as obsolete. */ + if (dh != NULL) +diff --git a/nscd/hstcache.c b/nscd/hstcache.c +index 4d68ade..c72feaa 100644 +--- a/nscd/hstcache.c ++++ b/nscd/hstcache.c +@@ -1,5 +1,5 @@ + /* Cache handling for host lookup. +- Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. + +@@ -141,8 +141,9 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req, + MSG_NOSIGNAL)) != total) + all_written = false; + +- /* If we cannot permanently store the result, so be it. */ +- if (__builtin_expect (db->negtimeout == 0, 0)) ++ /* If we have a transient error or cannot permanently store ++ the result, so be it. */ ++ if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0)) + { + /* Mark the old entry as obsolete. */ + if (dh != NULL) +diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c +index 4ac9942..2019991 100644 +--- a/nscd/initgrcache.c ++++ b/nscd/initgrcache.c +@@ -1,5 +1,5 @@ + /* Cache handling for host lookup. +- Copyright (C) 2004-2006, 2008, 2009, 2011 Free Software Foundation, Inc. ++ Copyright (C) 2004-2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. + +@@ -202,8 +202,9 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req, + written = TEMP_FAILURE_RETRY (send (fd, ¬found, total, + MSG_NOSIGNAL)); + +- /* If we cannot permanently store the result, so be it. */ +- if (__builtin_expect (db->negtimeout == 0, 0)) ++ /* If we have a transient error or cannot permanently store ++ the result, so be it. */ ++ if (all_tryagain || __builtin_expect (db->negtimeout == 0, 0)) + { + /* Mark the old entry as obsolete. */ + if (dh != NULL) +diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c +index 49e130c..e2ba09d 100644 +--- a/nscd/pwdcache.c ++++ b/nscd/pwdcache.c +@@ -1,5 +1,5 @@ + /* Cache handling for passwd lookup. +- Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. + +@@ -124,8 +124,9 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req, + written = TEMP_FAILURE_RETRY (send (fd, ¬found, total, + MSG_NOSIGNAL)); + +- /* If we cannot permanently store the result, so be it. */ +- if (__builtin_expect (db->negtimeout == 0, 0)) ++ /* If we have a transient error or cannot permanently store ++ the result, so be it. */ ++ if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0)) + { + /* Mark the old entry as obsolete. */ + if (dh != NULL) +diff --git a/nscd/servicescache.c b/nscd/servicescache.c +index d3d5dce..a6337e3 100644 +--- a/nscd/servicescache.c ++++ b/nscd/servicescache.c +@@ -1,5 +1,5 @@ + /* Cache handling for services lookup. +- Copyright (C) 2007, 2008, 2009, 2011 Free Software Foundation, Inc. ++ Copyright (C) 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@drepper.com>, 2007. + +@@ -108,8 +108,9 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req, + written = TEMP_FAILURE_RETRY (send (fd, ¬found, total, + MSG_NOSIGNAL)); + +- /* If we cannot permanently store the result, so be it. */ +- if (__builtin_expect (db->negtimeout == 0, 0)) ++ /* If we have a transient error or cannot permanently store ++ the result, so be it. */ ++ if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0)) + { + /* Mark the old entry as obsolete. */ + if (dh != NULL) diff --git a/multilib/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch b/multilib/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch new file mode 100644 index 000000000..4c104fa55 --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch @@ -0,0 +1,48 @@ +diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S +index f93c83d..d8aa889 100644 +--- a/sysdeps/x86_64/multiarch/strcmp.S ++++ b/sysdeps/x86_64/multiarch/strcmp.S +@@ -105,11 +105,6 @@ ENTRY(__strcasecmp) + jne 1f + call __init_cpu_features + 1: +-# ifdef HAVE_AVX_SUPPORT +- leaq __strcasecmp_avx(%rip), %rax +- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) +- jnz 2f +-# endif + leaq __strcasecmp_sse42(%rip), %rax + testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) + jnz 2f +@@ -128,11 +123,6 @@ ENTRY(__strncasecmp) + jne 1f + call __init_cpu_features + 1: +-# ifdef HAVE_AVX_SUPPORT +- leaq __strncasecmp_avx(%rip), %rax +- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) +- jnz 2f +-# endif + leaq __strncasecmp_sse42(%rip), %rax + testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) + jnz 2f +@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp) + # include "strcmp-sse42.S" + + +-# ifdef HAVE_AVX_SUPPORT +-# if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L +-# define LABEL(l) .L##l##_avx +-# define GLABEL(l) l##_avx +-# define USE_AVX 1 +-# undef STRCMP_SSE42 +-# define STRCMP_SSE42 STRCMP_AVX +-# define SECTION avx +-# include "strcmp-sse42.S" +-# endif +-# endif +- +- + # undef ENTRY + # define ENTRY(name) \ + .type STRCMP_SSE2, @function; \ diff --git a/multilib/q4wine/PKGBUILD b/multilib/q4wine/PKGBUILD index 0e1457979..1e6e7c2b4 100644 --- a/multilib/q4wine/PKGBUILD +++ b/multilib/q4wine/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62212 2012-01-18 10:47:43Z heftig $ +# $Id: PKGBUILD 66267 2012-02-23 06:02:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Chris Giles <Chris.G.27 (at) Gmail.com> pkgname=q4wine pkgver=0.121 -pkgrel=3 +pkgrel=4 pkgdesc="A Qt4 GUI for Wine" arch=("i686" "x86_64") url="http://sourceforge.net/projects/${pkgname}/" diff --git a/multilib/winegame/PKGBUILD b/multilib/winegame/PKGBUILD new file mode 100644 index 000000000..b1e038d18 --- /dev/null +++ b/multilib/winegame/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 66338 2012-02-23 16:33:57Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> + +pkgname=winegame +pkgver=0.2.0 +pkgrel=2 +pkgdesc="An interface to install windows programs in Wine" +arch=('i686' 'x86_64') +url="http://code.google.com/p/winegame/" +license=('GPL3') +depends=('libnotify' 'winestuff') +makedepends=('cmake') +source=(http://winegame.googlecode.com/files/$pkgname-$pkgver.tar.gz) +md5sums=('631dd218707c6efb2901ef1206092538') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + mkdir -p build + cd build + + cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr .. + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + + make DESTDIR="$pkgdir/" install +} + diff --git a/multilib/winestuff/PKGBUILD b/multilib/winestuff/PKGBUILD new file mode 100644 index 000000000..bdb5cb568 --- /dev/null +++ b/multilib/winestuff/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 66336 2012-02-23 16:29:35Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> + +pkgname=winestuff +pkgver=0.2.0 +pkgrel=2 +pkgdesc="Library utility for winegame" +arch=('i686' 'x86_64') +url="http://code.google.com/p/winegame/" +license=('LGPL2.1') +makedepends=('qt' 'cmake') +source=(http://winegame.googlecode.com/files/$pkgname-$pkgver.tar.gz) +md5sums=('a01f55d30bd0e1dcee3a44aa0fa5369d') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + mkdir -p build + cd build + + cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr .. + + make translations + make +} + +package() { + depends=('qt' 'fuseiso' 'winetricks') + + cd "$srcdir/$pkgname-$pkgver/build" + + make DESTDIR="$pkgdir/" install +} + diff --git a/staging/nmap/ChangeLog b/staging/nmap/ChangeLog new file mode 100644 index 000000000..f87ec482e --- /dev/null +++ b/staging/nmap/ChangeLog @@ -0,0 +1,19 @@ +2012-02-22 Angel Velasquez <angvp@archlinux.org> + * Lua 5.2 rebuild + +2008-10-28 Douglas Soares de Andrade <douglas@archlinux.org> + + * Python 2.6 rebuild. + +2008-07-23 Hugo Doria <hugo@archlinux.org> + + * Added pygtk in optdepends: 4.68-3 + +2008-07-09 Douglas Soares de Andrade <douglas@archlinux.org> + + * Fixing the pixmaps path for i686: 4.68 + +2008-07-09 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated for i686: 4.68 + diff --git a/staging/nmap/PKGBUILD b/staging/nmap/PKGBUILD new file mode 100644 index 000000000..ceb05eae7 --- /dev/null +++ b/staging/nmap/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 150913 2012-02-23 15:15:39Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Hugo Doria <hugo@archlinux.org> + +pkgname=nmap +pkgver=5.51 +pkgrel=4 +pkgdesc="A network exploration tool and security/port scanner" +arch=('i686' 'x86_64') +url="http://nmap.org" +license=('GPL') +depends=('pcre' 'openssl' 'libpcap' 'lua') +# python is needed for zenmap +makedepends=('python2') +optdepends=('pygtk: gui for nmap') +options=('!makeflags') +source=(http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2) +md5sums=('0b80d2cb92ace5ebba8095a4c2850275') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap.desktop + echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap-root.desktop + + # Force usage of external libpcap + # OSX bug check fails because of missing types + # autoreconf fails because our autotools are too new (?) + sed -i 's/have_libpcap=no/have_libpcap=yes/g' {.,ncat,nping}/configure + + ./configure --prefix=/usr --mandir=/usr/share/man \ + --libexecdir=/usr/lib + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + # remove zenmap uninstall script + rm "${pkgdir}/usr/bin/uninstall_zenmap" + + # install custom GPL2 license + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/dovecot/PKGBUILD b/testing/dovecot/PKGBUILD index b91386d37..894d24e3b 100644 --- a/testing/dovecot/PKGBUILD +++ b/testing/dovecot/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 150441 2012-02-17 19:35:29Z andyrtr $ +# $Id: PKGBUILD 150923 2012-02-23 17:51:46Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> # Contributor: GARETTE Emmanuel <gnunux at laposte dot net> pkgname=dovecot -pkgver=2.1.0 -pkgrel=1 +pkgver=2.1.1 +pkgrel=2 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') url="http://dovecot.org/" license=("LGPL") depends=('krb5' 'openssl' 'sqlite3>=3.7.5' 'libmysqlclient>=5.5.10' 'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl') -makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22') -optdepends=('libldap: ldap plugin') +makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene') +optdepends=('libldap: ldap plugin' + 'clucene: alternative FTS indexer') provides=('imap-server' 'pop3-server') options=('!libtool') backup=(etc/dovecot/dovecot.conf @@ -25,8 +26,8 @@ backup=(etc/dovecot/dovecot.conf etc/ssl/dovecot-openssl.cnf) install=$pkgname.install source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh) -md5sums=('32a52cc45bf099bbb537b46052d23014' - 'e2d7783ebe0f10aee259c86c69bd0a46' +md5sums=('db41a4de848d2bc834c30af0eb5575fd' + 'e3bf2c4989ccb8a30a5d80ae89b06f76' '587159e84e2da6f83d70b3c706ba87cc') build() { @@ -47,6 +48,7 @@ build() { --with-zlib --with-bzlib \ --with-libcap \ --with-solr \ + --with-lucene \ --with-docs make } diff --git a/testing/file/PKGBUILD b/testing/file/PKGBUILD new file mode 100644 index 000000000..eee03d3bb --- /dev/null +++ b/testing/file/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 150825 2012-02-23 08:25:19Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> + +pkgname=file +pkgver=5.11 +pkgrel=1 +pkgdesc="File type identification utility" +arch=('i686' 'x86_64') +license=('custom') +groups=('base') +url="http://www.darwinsys.com/file/" +depends=('glibc' 'zlib') +options=('!libtool') +source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('16a407bd66d6c7a832f3a5c0d609c27b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's#\$(datadir)/misc#\$(datadir)#' configure + + ./configure --prefix=/usr --datadir=/usr/share/file + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR=${pkgdir} install + install -dm755 ${pkgdir}/usr/share/misc + ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc + + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} |