diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-30 11:55:09 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-30 11:55:09 +0200 |
| commit | b0fdec08ea3b6e162b710ca98b0dd56f9ae105eb (patch) | |
| tree | 376cc5751d9a587815d7270caa61070f38832766 | |
| parent | 8abbf69cf497489fb7a0ac3538cb6975285486b7 (diff) | |
| parent | 76ee9007095484a113d1856786b81e2d2fae8202 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apcupsd/PKGBUILD
community/bmp-musepack/PKGBUILD
community/bmp-wma/PKGBUILD
community/bonnie++/PKGBUILD
community/cantata/PKGBUILD
community/checkinstall/PKGBUILD
community/chrootuid/PKGBUILD
community/compiz-bcop/PKGBUILD
community/compiz-fusion-plugins-extra/PKGBUILD
community/compiz-fusion-plugins-main/PKGBUILD
community/compiz/PKGBUILD
community/compizconfig-backend-gconf/PKGBUILD
community/compizconfig-python/PKGBUILD
community/ekg2/PKGBUILD
community/emerald/PKGBUILD
community/fbgetty/PKGBUILD
community/flumotion/PKGBUILD
community/leafnode/PKGBUILD
community/libcompizconfig/PKGBUILD
community/libdnet/PKGBUILD
community/libee/PKGBUILD
community/libtxc_dxtn/PKGBUILD
community/linux-tools/PKGBUILD
community/openntpd/PKGBUILD
community/osiris/PKGBUILD
community/perl-package-stash-xs/PKGBUILD
community/perl-params-util/PKGBUILD
community/procstatd/PKGBUILD
community/scponly/PKGBUILD
community/sniffit/PKGBUILD
community/synergy/PKGBUILD
community/turbojpeg/PKGBUILD
community/unbound/PKGBUILD
community/uucp/PKGBUILD
core/gawk/PKGBUILD
core/ifenslave/PKGBUILD
core/jfsutils/PKGBUILD
core/openldap/PKGBUILD
core/rfkill/PKGBUILD
core/systemd/PKGBUILD
core/wireless_tools/PKGBUILD
core/xinetd/PKGBUILD
extra/avahi/PKGBUILD
extra/calligra/PKGBUILD
extra/clutter-gst/PKGBUILD
extra/flac/PKGBUILD
extra/hddtemp/PKGBUILD
extra/libbluray/PKGBUILD
extra/libdmx/PKGBUILD
extra/libfs/PKGBUILD
extra/libjpeg-turbo/PKGBUILD
extra/libtiff/PKGBUILD
extra/libxau/PKGBUILD
extra/libxfixes/PKGBUILD
extra/licq/PKGBUILD
extra/mariadb/PKGBUILD
extra/mesa/PKGBUILD
extra/perl-guard/PKGBUILD
extra/perl-template-toolkit/PKGBUILD
extra/pidgin/PKGBUILD
extra/pigeonhole/PKGBUILD
extra/poppler/PKGBUILD
extra/postgresql/PKGBUILD
extra/python-geoip/PKGBUILD
extra/python/PKGBUILD
extra/samba/PKGBUILD
extra/sqlite/PKGBUILD
extra/vde2/PKGBUILD
extra/vim/PKGBUILD
extra/vlc/PKGBUILD
extra/wireshark/PKGBUILD
extra/xfce4-dict/PKGBUILD
libre/libquicktime-libre/PKGBUILD
libre/xscreensaver-libre/PKGBUILD
696 files changed, 8229 insertions, 6007 deletions
diff --git a/community/anyfs-tools/PKGBUILD b/community/anyfs-tools/PKGBUILD index b96198172..9cfb60279 100644 --- a/community/anyfs-tools/PKGBUILD +++ b/community/anyfs-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66269 2012-02-23 06:54:24Z spupykin $ +# $Id: PKGBUILD 91828 2013-05-28 17:03:05Z 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=3 +pkgrel=4 pkgdesc="unix-way toolset for recovering and converting filesystems" arch=('i686' 'x86_64' 'mips64el') url="http://anyfs-tools.sourceforge.net/" @@ -17,6 +17,11 @@ source=(http://downloads.sourceforge.net/sourceforge/anyfs-tools/${pkgname}-${pk md5sums=('d3da0004cd0f037ec3e926acd3f520c2' '5ea91297b605d51b03243adda1efed27') +prepare() { + cd $srcdir/$pkgname-${pkgver} + find . -name Makefile.in -exec sed -i 's|$(INSTALLPATH)/sbin|$(INSTALLPATH)/bin|g' {} \; +} + build() { cd $srcdir/$pkgname-${pkgver} @@ -25,8 +30,13 @@ build() { 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 + CFLAGS="-DNO_INLINE_FUNCS -D_INLINE_=static" \ + ./configure --prefix=/usr --build=i686-linux-gnu make -j1 sed -i 's|ldconfig||' src/anysurrect/Makefile +} + +package() { + cd $srcdir/$pkgname-${pkgver} make INSTALLPATH=$pkgdir/usr install } diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD index e59d5c500..e47e1b16f 100644 --- a/community/apcupsd/PKGBUILD +++ b/community/apcupsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90645 2013-05-13 14:17:50Z spupykin $ +# $Id: PKGBUILD 91912 2013-05-29 10:15:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Todd Musall <tmusall@comcast.net> # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=apcupsd pkgver=3.14.10 -pkgrel=4 +pkgrel=5 pkgdesc="Power mangement and controlling most of APC's UPS models" arch=(i686 x86_64 mips64el) url="http://www.apcupsd.org" @@ -21,16 +21,13 @@ source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz apcupsd.service apcupsd-tmpfiles.conf) sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032' - 'cae38570847f5d90f38a0634e502f35d6c76a9c928b3a322e3fe1a097fbbc04a' - 'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d' - 'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55') -sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032' - 'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d' + '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7' 'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --build=$CHOST --libexecdir=/usr/lib/$pkgname \ + --sbindir=/usr/bin \ --enable-cgi --enable-usb --enable-net \ --with-upstype=usb --with-upscable=usb \ --with-serial-dev=/dev/usb/hid/hiddev[0-9] \ @@ -43,7 +40,7 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service" install -Dm644 "$srcdir/apcupsd-tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf" - chmod 755 "$pkgdir"/sbin/* + chmod 755 "$pkgdir"/usr/bin/* install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin" mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin" } diff --git a/community/apcupsd/apcupsd.service b/community/apcupsd/apcupsd.service index 9cec6e441..b8dfb9b4a 100644 --- a/community/apcupsd/apcupsd.service +++ b/community/apcupsd/apcupsd.service @@ -2,7 +2,7 @@ Description=APC UPS Monitor [Service] -ExecStart=/sbin/apcupsd -b +ExecStart=/usr/bin/apcupsd -b [Install] WantedBy=multi-user.target diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 2b521e3f1..60e5462fd 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88658 2013-04-21 10:47:57Z bpiotrowski $ +# $Id: PKGBUILD 91644 2013-05-26 08:19:25Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.17.0 +pkgver=1.17.1 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ license=('GPL') depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates') checkdepends=('cppunit') source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.xz) -sha256sums=('e3b533a33d33ad2392acc37d4510e5cd660af8ac23943c6402a0172f4a347c9c') +sha256sums=('7e18cf15afa17cf725c2ab4338751bc165e33d41917a4af9927da0855298efc0') build() { cd $pkgname-$pkgver diff --git a/community/arpwatch/PKGBUILD b/community/arpwatch/PKGBUILD index a5d2f0975..108c360e6 100644 --- a/community/arpwatch/PKGBUILD +++ b/community/arpwatch/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87787 2013-04-06 15:38:17Z seblu $ +# $Id: PKGBUILD 91484 2013-05-23 10:11:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sébastien Luttringer pkgname=arpwatch pkgver=2.1a15 -pkgrel=10 +pkgrel=11 pkgdesc='Ethernet/FDDI station activity monitor' arch=('i686' 'x86_64' 'mips64el') url='ftp://ftp.ee.lbl.gov/' @@ -16,7 +16,7 @@ source=("ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz" "$pkgname.service") md5sums=('cebfeb99c4a7c2a6cee2564770415fe7' '9359518c500562281e76cdb0b2fa9062' - '2324a202222303daa1a41d8abd7a7e4a') + '43e2358ba0532da38e5296250a7fcfd8') prepare() { cd $pkgname-$pkgver @@ -28,13 +28,13 @@ prepare() { build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man - make SENDMAIL=/usr/sbin/sendmail + ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin + make SENDMAIL=`which sendmail` } package() { cd $pkgname-$pkgver - install -d -m 0755 "$pkgdir"/usr/{sbin,share/man} + install -d -m 0755 "$pkgdir"/usr/{bin,share/man} make DESTDIR="$pkgdir" install install-man # install ether prefix database install -Dm644 ethercodes.dat "$pkgdir/var/lib/$pkgname/ethercodes.dat" diff --git a/community/arpwatch/arpwatch.service b/community/arpwatch/arpwatch.service index 570f93852..ede31f3f7 100644 --- a/community/arpwatch/arpwatch.service +++ b/community/arpwatch/arpwatch.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking ExecStartPre=/usr/bin/touch /var/lib/arpwatch/%I.dat -ExecStart=/usr/sbin/arpwatch -f /var/lib/arpwatch/%I.dat -i %I +ExecStart=/usr/bin/arpwatch -f /var/lib/arpwatch/%I.dat -i %I [Install] WantedBy=multi-user.target diff --git a/community/bmp-musepack/PKGBUILD b/community/bmp-musepack/PKGBUILD deleted file mode 100644 index b5637201c..000000000 --- a/community/bmp-musepack/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 83122 2013-01-27 16:08:38Z pierre $ -# Maintainer: damir <damir@archlinux.org> -# Contributor: Nikos Kouremenos <nk@ebox.gr> - -pkgname=bmp-musepack -pkgver=1.2 -pkgrel=4.1 -pkgdesc="A BMP plugin for playing sounds in Musepack (MPC) format" -arch=('i686' 'x86_64' 'mips64el') -url="http://musepack.net/" -license=('BSD') -depends=('bmp' 'libmpcdec' 'taglib') -groups=('bmp-plugins' 'bmp-io-plugins') -options=('!libtool') -source=("http://files.musepack.net/linux/plugins/${pkgname}-${pkgver}.tar.bz2") -md5sums=('5fe0c9d341ca37d05c780a478f829a5f') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community/bmp-wma/PKGBUILD b/community/bmp-wma/PKGBUILD deleted file mode 100644 index 62dfc89ef..000000000 --- a/community/bmp-wma/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 83124 2013-01-27 16:09:09Z pierre $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Ewoud Nuyts <ewoud.nuyts@gmail.com> - -pkgname=bmp-wma -pkgver=0.1.1 -pkgrel=4.1 -pkgdesc="WMA plugin for Beep Media Player" -url="http://bmp-plugins.berlios.de/novelian/project.php?p=bmp-wma" -license=('GPL') -arch=('x86_64' 'i686' 'mips64el') -depends=('bmp') -groups=('bmp-plugins' 'bmp-io-plugins') -options=('!libtool' '!emptydirs') -source=("http://download.berlios.de/bmp-plugins/${pkgname}-${pkgver}.tar.gz" - 'bmp-wma-gcc4.patch') -md5sums=('8dcf3fcdb10e8e2e386f70745812412b' - '730eba8f41e989dd8b56c18bcc826cc4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch" - if [ "${CARCH}" != "i686" ]; then - export CFLAGS="${CFLAGS} -fPIC" - fi - ./configure --prefix=/usr --disable-static - echo '#define HAVE_LRINTF 1' >> config.h - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/bmp-wma/bmp-wma-gcc4.patch b/community/bmp-wma/bmp-wma-gcc4.patch deleted file mode 100644 index 9d773e89e..000000000 --- a/community/bmp-wma/bmp-wma-gcc4.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- src/libffwma/avcodec.h.orig 2005-10-07 11:49:36.000000000 -0400 -+++ src/libffwma/avcodec.h 2005-10-07 11:51:09.000000000 -0400 -@@ -11,6 +11,43 @@ - extern "C" { - #endif - -+ -+/** -+ * AVOption. -+ */ -+typedef struct AVOption { -+ /** options' name */ -+ const char *name; /* if name is NULL, it indicates a link to next */ -+ /** short English text help or const struct AVOption* subpointer */ -+ const char *help; // const struct AVOption* sub; -+ /** offset to context structure where the parsed value should be stored */ -+ int offset; -+ /** options' type */ -+ int type; -+#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence) -+#define FF_OPT_TYPE_DOUBLE 2 ///< double -+#define FF_OPT_TYPE_INT 3 ///< integer -+#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0) -+#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags -+//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option -+#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40) -+#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80) -+ /** min value (min == max -> no limits) */ -+ double min; -+ /** maximum value for double/int */ -+ double max; -+ /** default boo [0,1]l/double/int value */ -+ double defval; -+ /** -+ * default string value (with optional semicolon delimited extra option-list -+ * i.e. option1;option2;option3 -+ * defval might select other then first argument as default -+ */ -+ const char *defstr; -+#define FF_OPT_MAX_DEPTH 10 -+} AVOption; -+ -+ - #include "common.h" - #include <sys/types.h> /* size_t */ - -@@ -1396,41 +1433,6 @@ - - - /** -- * AVOption. -- */ --typedef struct AVOption { -- /** options' name */ -- const char *name; /* if name is NULL, it indicates a link to next */ -- /** short English text help or const struct AVOption* subpointer */ -- const char *help; // const struct AVOption* sub; -- /** offset to context structure where the parsed value should be stored */ -- int offset; -- /** options' type */ -- int type; --#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence) --#define FF_OPT_TYPE_DOUBLE 2 ///< double --#define FF_OPT_TYPE_INT 3 ///< integer --#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0) --#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags --//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option --#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40) --#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80) -- /** min value (min == max -> no limits) */ -- double min; -- /** maximum value for double/int */ -- double max; -- /** default boo [0,1]l/double/int value */ -- double defval; -- /** -- * default string value (with optional semicolon delimited extra option-list -- * i.e. option1;option2;option3 -- * defval might select other then first argument as default -- */ -- const char *defstr; --#define FF_OPT_MAX_DEPTH 10 --} AVOption; -- --/** - * Parse option(s) and sets fields in passed structure - * @param strct structure where the parsed results will be written - * @param list list with AVOptions ---- src/libffwma/dsputil.h.orig 2005-10-07 11:51:59.000000000 -0400 -+++ src/libffwma/dsputil.h 2005-10-07 11:52:17.000000000 -0400 -@@ -28,7 +28,6 @@ - #ifndef DSPUTIL_H - #define DSPUTIL_H - --#include "common.h" - #include "avcodec.h" - - diff --git a/community/bonnie++/PKGBUILD b/community/bonnie++/PKGBUILD index 28d4c6a9b..8836306f5 100644 --- a/community/bonnie++/PKGBUILD +++ b/community/bonnie++/PKGBUILD @@ -4,19 +4,20 @@ pkgname=bonnie++ pkgver=1.03e -pkgrel=6.1 +pkgrel=7 pkgdesc="Based on the Bonnie hard drive benchmark by Tim Bray" arch=('i686' 'x86_64' 'mips64el') url="http://www.coker.com.au/bonnie++/" license=('GPL') depends=('perl') -source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz) -sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb') +source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz move_away_from_sbin.patch) +sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb' + 'c100df652c26f38c950baaf3fe25a74d51ba830066f9d02d273cbb5fc5660814') build() { cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr + ./configure --prefix=/usr sed -i "s:CFLAGS=-O2 -DNDEBUG \$(WFLAGS) \$(MORECFLAGS):CFLAGS=${CFLAGS}:" Makefile make } @@ -24,6 +25,8 @@ build() { package() { cd $srcdir/${pkgname}-${pkgver} + # https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/ + patch -Np1 -i $srcdir/move_away_from_sbin.patch make prefix="${pkgdir}/usr" install install -d $pkgdir/usr/share/doc/bonnie++ diff --git a/community/bonnie++/move_away_from_sbin.patch b/community/bonnie++/move_away_from_sbin.patch new file mode 100644 index 000000000..18e99e976 --- /dev/null +++ b/community/bonnie++/move_away_from_sbin.patch @@ -0,0 +1,14 @@ +diff -aur bonnie++-1.03e/Makefile bonnie++-1.03ef/Makefile +--- bonnie++-1.03e/Makefile 2013-05-13 08:40:45.122959831 +0000 ++++ bonnie++-1.03ef/Makefile 2013-05-13 08:43:20.365248937 +0000 +@@ -33,8 +33,8 @@ + $(CXX) zcav.cpp -o zcav $(ZCAVOBJS) $(LFLAGS) + + install-bin: $(EXES) +- mkdir -p $(eprefix)/bin $(eprefix)/sbin +- ${INSTALL} -s $(EXES) $(eprefix)/sbin ++ mkdir -p $(eprefix)/bin ++ ${INSTALL} -s $(EXES) $(eprefix)/bin + ${INSTALL} $(SCRIPTS) $(eprefix)/bin + + install: install-bin diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index 1c696163b..f7ee72159 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85655 2013-03-04 13:07:52Z spupykin $ +# $Id: PKGBUILD 91555 2013-05-23 15:08:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Pranaitis <jens@jenux.homelinux.org> pkgname=busybox pkgver=1.20.2 -pkgrel=2 +pkgrel=5 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64" 'mips64el') url="http://www.busybox.net" @@ -27,5 +27,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - install -Dm755 busybox $pkgdir/bin/busybox + install -Dm755 busybox $pkgdir/usr/bin/busybox } diff --git a/community/busybox/busybox.install b/community/busybox/busybox.install index ecbeec39a..7bf2a83ac 100644 --- a/community/busybox/busybox.install +++ b/community/busybox/busybox.install @@ -1,13 +1,14 @@ post_install() { - echo "You may want to do setuid on /bin/busybox" - echo " chmod 4555 /bin/busybox" + echo "You may want to do setuid on /usr/bin/busybox" + echo " chmod 4555 /usr/bin/busybox" } pre_upgrade() { - busybox stat -c %a bin/busybox >tmp/busybox.upgrade.script + busybox stat -c %a usr/bin/busybox >tmp/busybox.upgrade.script } post_upgrade() { - [ -f tmp/busybox.upgrade.script ] && busybox chmod `busybox cat tmp/busybox.upgrade.script` bin/busybox + [ -f tmp/busybox.upgrade.script ] && busybox chmod `busybox cat tmp/busybox.upgrade.script` usr/bin/busybox busybox rm -f tmp/busybox.upgrade.script + echo "busybox is un /usr/bin now. Readjust its mode if you modified it." } diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD index 8eb49da90..0f74356f1 100644 --- a/community/cantata/PKGBUILD +++ b/community/cantata/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 86462 2013-03-17 20:07:56Z cinelli $ +# $Id: PKGBUILD 91619 2013-05-25 12:01:52Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Mcder3 <mcder3[at]gmail[dot]com> # Contributor: MisterFred <mister.fred[at]free[dot]fr> pkgname=cantata -pkgver=0.9.2 +pkgver=1.0.2 pkgdesc="A KDE client for the music player daemon (MPD)" -pkgrel=3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde-apps.org/content/show.php/Cantata?content=147733" license=('GPL') @@ -15,7 +15,7 @@ depends=('kdebase-runtime' 'taglib-extras' 'mpg123' 'libmtp') makedepends=('cmake' 'automoc4') install="$pkgname.install" source=("http://cantata.googlecode.com/files/$pkgname-$pkgver.tar.bz2") -md5sums=('882cec90eb01d190b899689675e990b0') +md5sums=('b69c568be6a2738d5ce640e759ae0253') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD index bdda0434f..b15cef97e 100644 --- a/community/cgit/PKGBUILD +++ b/community/cgit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88266 2013-04-15 11:13:22Z spupykin $ +# $Id: PKGBUILD 91791 2013-05-27 21:33:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Current Maintainer: Patrick Palka <patrick@parcs.ath.cx> # Previous Maintainer: Loui Chang <louipc.ist at gmail com> @@ -6,9 +6,9 @@ # Development: http://closure.ath.cx/aur-dev pkgname=cgit -pkgver=0.9.1 -_gitver=1.7.4 -pkgrel=2 +pkgver=0.9.2 +_gitver=1.8.3 +pkgrel=1 pkgdesc="A web interface for git written in plain C" arch=('i686' 'x86_64' 'mips64el') url="http://hjemli.net/git/cgit" @@ -19,8 +19,8 @@ install=cgit.install source=("http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz" "git-${_gitver}.tar.gz::https://github.com/git/git/archive/v${_gitver}.tar.gz" "apache.example.conf") -md5sums=('272ee8fec2d81ac1e65117578e64df1e' - 'c63cc7ca8a4bbf97c8802f354511223e' +md5sums=('fe11018eff8d79caad112f4fac64b90f' + '73224d3dc86c4999cc49484b49c9acc4' 'bd5696bea0654bfcf98f249b1a36737d') build() { diff --git a/community/checkinstall/PKGBUILD b/community/checkinstall/PKGBUILD index c0ed0cbbc..6cf08ad70 100644 --- a/community/checkinstall/PKGBUILD +++ b/community/checkinstall/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65086 2012-02-20 03:34:38Z spupykin $ +# $Id: PKGBUILD 91846 2013-05-28 17:24:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=checkinstall pkgver=1.6.2 -pkgrel=2.1 +pkgrel=3 pkgdesc="spy for 'make install' and build rpm or deb" arch=('i686' 'x86_64' 'mips64el') url="http://asic-linux.com.mx/~izto/checkinstall/" @@ -13,11 +13,15 @@ backup=(etc/checkinstall/checkinstallrc) source=(http://asic-linux.com.mx/~izto/checkinstall/files/source/$pkgname-$pkgver.tar.gz build-fix.patch) md5sums=('d7b43c92001e68243a93bcce8b1e5480' - '5c68cb7e29cf6da4b845ce57fb5ea080') + 'eac0c843781c300e7bc15c55be262e51') build() { cd $srcdir/$pkgname-$pkgver patch -Np1 <../build-fix.patch make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/checkinstall/build-fix.patch b/community/checkinstall/build-fix.patch index 341b7dfca..9ab00cde5 100644 --- a/community/checkinstall/build-fix.patch +++ b/community/checkinstall/build-fix.patch @@ -134,7 +134,7 @@ diff -wbBur checkinstall-1.6.2/Makefile checkinstall-1.6.2.my/Makefile -LCDIR=$(PREFIX)/lib/checkinstall/locale -CONFDIR=$(PREFIX)/lib/checkinstall +PREFIX=/usr -+BINDIR=$(DESTDIR)/$(PREFIX)/sbin ++BINDIR=$(DESTDIR)/$(PREFIX)/bin +LCDIR=$(DESTDIR)/$(PREFIX)/share/locale +CONFDIR=$(DESTDIR)/etc/checkinstall diff --git a/community/chromium-bsu/PKGBUILD b/community/chromium-bsu/PKGBUILD index e7c294cca..81b8728c0 100644 --- a/community/chromium-bsu/PKGBUILD +++ b/community/chromium-bsu/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 85755 2013-03-06 11:30:49Z jelle $ +# $Id: PKGBUILD 91634 2013-05-25 20:26:07Z jelle $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=chromium-bsu -pkgver=0.9.15 -pkgrel=4 +pkgver=0.9.15.1 +pkgrel=1 pkgdesc="A fast paced top scrolling shooter" arch=('i686' 'x86_64' 'mips64el') url="http://chromium-bsu.sourceforge.net/" license=('custom:artistic') -depends=('freeglut' 'glu' 'sdl' 'openal' 'freealut' 'ftgl' 'fontconfig' 'sdl_image') +depends=('freeglut' 'glu' 'sdl_image' 'openal' 'freealut' 'ftgl' 'fontconfig') install=chromium-bsu.install -source=(http://downloads.sourceforge.net/project/$pkgname/Chromium%20B.S.U.%20source%20code/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('d57137a1ac2292363b35192724c7e3be') +source=(http://downloads.sourceforge.net/project/chromium-bsu/Chromium%20B.S.U.%20source%20code/chromium-bsu-$pkgver.tar.gz) +md5sums=('bd332a890ae9e5115f2808198a51a92b') build(){ cd $srcdir/$pkgname-$pkgver diff --git a/community/chrootuid/PKGBUILD b/community/chrootuid/PKGBUILD index 8f907410c..70049c9c8 100644 --- a/community/chrootuid/PKGBUILD +++ b/community/chrootuid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65090 2012-02-20 03:36:03Z spupykin $ +# $Id: PKGBUILD 91848 2013-05-28 17:25:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Frop Doe <mrmr@rizla.org> # Contributor: Guillermo A. Amaral <me@guillermoamaral.com> (thewonka) @@ -6,7 +6,7 @@ pkgname=chrootuid pkgver=1.3 -pkgrel=5.1 +pkgrel=6 arch=(i686 x86_64 'mips64el') pkgdesc="Runs a command in a restricted environment." url="ftp://ftp.porcupine.org/pub/security/index.html" @@ -20,7 +20,11 @@ md5sums=('15510abadf5de189e1c22a1544dc926a' build() { cd $srcdir/$pkgname$pkgver make - install -D -m755 $srcdir/$pkgname$pkgver/chrootuid $pkgdir/usr/sbin/chrootuid +} + +package() { + cd $srcdir/$pkgname$pkgver + install -D -m755 $srcdir/$pkgname$pkgver/chrootuid $pkgdir/usr/bin/chrootuid install -D -m644 $srcdir/$pkgname$pkgver/chrootuid.1 $pkgdir/usr/share/man/man1/chrootuid.1 install -D -m644 $srcdir/chrootuid_license $pkgdir/usr/share/licenses/$pkgname/license } diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index 44b904a24..3f91c7ad4 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90971 2013-05-16 22:26:24Z bgyorgy $ +# $Id: PKGBUILD 91472 2013-05-23 01:19:04Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com # Based on gnome-control-center: # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Jan de Groot <jgc@archlinux.org> pkgname=cinnamon-control-center -pkgver=1.8.0 -pkgrel=2 +pkgver=1.8.2 +pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64' 'mips64el') depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet') @@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz" "gnomerrlabeler.patch" "idle-delay.patch") -sha256sums=('7230d509f5837906b5497279cfbd96180e5c8dad89777fb31a81fd0c73354fa9' +sha256sums=('78effed26a8fdce481cfe467889c9afdb6db78a961aec61b918c83c9781ccf4f' 'a01db243251c3da59c969d4538a35a63020d1e20866ff700ef273debd05456db' '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67') diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 950712169..a47a56f4f 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90347 2013-05-11 17:08:40Z faidoc $ +# $Id: PKGBUILD 91564 2013-05-23 20:10:59Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=1.8.2 -pkgrel=2 +pkgver=1.8.6 +pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64' 'mips64el') url="http://cinnamon.linuxmint.com/" @@ -31,14 +31,16 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/ "switch-applications.patch" "fallback-helpers.patch" "idle-dim.patch") -sha256sums=('83179f98f9e6c88928146d43a9d3f581c64706c0a60dac5e58d845a30a275a91' +sha256sums=('6b1d606e9b42892877b481f456f2dee4684c4d7aedf8e656ec1114037d7b5fc8' 'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30' 'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426' - '9a091c0b651a5af1700c8eca90b9e81bb9a50a8a9bfa6a7352d0c0daa2f3f271' + '01508c4f41664d5e29f700dc77c9f5c5441f128ab759f0ae8325c5fdda70b00e' '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262' 'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e' 'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100') + + build() { cd ${srcdir}/linuxmint-Cinnamon* diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch index 5af7c3a79..b79ea497a 100644 --- a/community/cinnamon/gnome-3.8.patch +++ b/community/cinnamon/gnome-3.8.patch @@ -1404,7 +1404,9 @@ index 50c4e1e..c8427ac 100644 this._trackInfosTop.set_child(this.infos_top); this._trackInfosBottom.set_child(this.infos_bottom); -@@ -414,90 +256,39 @@ Player.prototype = { +--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js +@@ -414,45 +414,20 @@ this._trackControls.set_child(this.controls); this.addActor(this._trackControls); @@ -1463,14 +1465,8 @@ index 50c4e1e..c8427ac 100644 + } /* this players don't support seek */ -- if (support_seek.indexOf(this._name) == -1) { -+ if (support_seek.indexOf(this._name) == -1) - this._time.hide(); -- this.showPosition = false; -- this._positionSlider.hide(); -- } - this._getStatus(); - this._trackId = {}; + if (support_seek.indexOf(this._name) == -1) { +@@ -465,39 +440,23 @@ this._getMetadata(); this._currentTime = 0; this._getPosition(); @@ -1486,14 +1482,17 @@ index 50c4e1e..c8427ac 100644 - this._setMetadata(iface, value["Metadata"]); - //qmmp - if(sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') { -- if (value["playbackStatus"]) ++ this._setMetadata(value["Metadata"]); ++ // qmmp ++ if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') { + if (value["playbackStatus"]) - this._setStatus(iface, value["playbackStatus"]); -- if (value["metadata"]) ++ this._setStatus(value["playbackStatus"]); + if (value["metadata"]) - this._setMetadata(sender, value["metadata"]); - } -+ this._setMetadata(value["Metadata"]); - })); - +- })); +- - this._mediaServerPlayer.connect('Seeked', Lang.bind(this, function(sender, value) { - if (value > 0) { - this._setPosition(value); @@ -1504,17 +1503,20 @@ index 50c4e1e..c8427ac 100644 - // when the track is seeked so we set the position at the - // value we set on the slider - this._setPosition(this._wantedSeekValue); -- } ++ this._setMetadata(value["metadata"]); + } - // Seek value send by the player - else - this._setPosition(value); -- ++ })); + - this._wantedSeekValue = 0; + this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) { + this._setPosition(sender, value); })); Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition)); + @@ -512,45 +303,26 @@ Player.prototype = { this._playerInfo.setText(this._getName() + " - " + _(status)); }, @@ -3923,20 +3925,7 @@ index c8427ac..a7b2e09 100644 /* dummy vars for translation */ let x = _("Playing"); x = _("Paused"); -@@ -285,6 +285,13 @@ Player.prototype = { - this._setStatus(value["PlaybackStatus"]); - if (value["Metadata"]) - this._setMetadata(value["Metadata"]); -+ // qmmp -+ if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') { -+ if (value["playbackStatus"]) -+ this._setStatus(value["playbackStatus"]); -+ if (value["metadata"]) -+ this._setMetadata(value["metadata"]); -+ } - })); - - this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) { + @@ -377,7 +384,8 @@ Player.prototype = { cover.read_async(null, null, Lang.bind(this, this._onReadCover)); } @@ -4181,3 +4170,17 @@ index 418fb60..773fb65 100644 static void -- 1.8.1.6 + +--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js +@@ -801,7 +801,7 @@ + this._players = {}; + // watch players + for (var p=0; p<compatible_players.length; p++) { +- DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false, ++ Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE, + Lang.bind(this, this._addPlayer), + Lang.bind(this, this._removePlayer) + ); +-- +1.8.1.6
\ No newline at end of file diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index ec2720150..9f8449bbb 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88406 2013-04-17 07:01:42Z bisson $ +# $Id: PKGBUILD 91648 2013-05-26 09:24:29Z bluewind $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd pkgver=5.3.0 -pkgrel=1 +pkgrel=3 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' arch=('i686' 'x86_64' 'mips64el') @@ -40,12 +40,10 @@ depends=('libltdl' 'iptables') source=("${url}files/${pkgname}-${pkgver}.tar.gz" 'libperl.patch' - 'service' - 'rc.d') + 'service') sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539' '245c098d121a4a05594553583310953b3a2f6461' - 'b56907f532b9174e1b6995aadb518228d7464d3b' - '0f441718d5519cb043b1130e5a1d0379078adbcc') + '04f676d0b76c34df0bbf94629813e035b1febe04') backup=('etc/collectd.conf') options=('!libtool') @@ -64,7 +62,8 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-static=no \ + --sbindir=/usr/bin \ + --disable-static \ --with-python=/usr/bin/python2 make all } @@ -73,7 +72,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install rmdir "${pkgdir}/var/run" # FS#30201 - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl } diff --git a/community/collectd/rc.d b/community/collectd/rc.d deleted file mode 100644 index 442f2324a..000000000 --- a/community/collectd/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=collectd -prog="/usr/sbin/collectdmon" - -PID=$(pidof -o %PPID $prog) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && $prog \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 2 - $0 start - ;; -reload) - stat_busy "Sending SIGHUP to $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - exit 1 - ;; -esac diff --git a/community/collectd/service b/community/collectd/service index 9581ec0c9..30540645a 100644 --- a/community/collectd/service +++ b/community/collectd/service @@ -5,7 +5,7 @@ After=local-fs.target network.target [Service] Type=forking PIDFile=/run/collectdmon.pid -ExecStart=/usr/sbin/collectdmon +ExecStart=/usr/bin/collectdmon ExecReload=/bin/kill -HUP $MAINPID Restart=always diff --git a/community/compiz-bcop/PKGBUILD b/community/compiz-bcop/PKGBUILD deleted file mode 100644 index b4f3b7b5a..000000000 --- a/community/compiz-bcop/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 68296 2012-03-21 10:32:03Z pschmitz $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=compiz-bcop -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compiz option code generator" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core>=0.8.8' 'libxslt') -makedepends=('intltool' 'pkgconfig') -conflicts=('compiz-bcop-git') -source=(http://releases.compiz-fusion.org/$pkgver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('9210bd2a537480bdb11df0e3cc5f6d4548fd12da') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community/compiz-fusion-plugins-extra/PKGBUILD b/community/compiz-fusion-plugins-extra/PKGBUILD deleted file mode 100644 index b006aea7b..000000000 --- a/community/compiz-fusion-plugins-extra/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 68298 2012-03-21 10:33:42Z pschmitz $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=compiz-fusion-plugins-extra -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compiz Fusion Extra plugins" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core' 'compiz-bcop' 'compiz-fusion-plugins-main' 'libnotify') -makedepends=('intltool' 'pkg-config' 'gettext' 'gconf') -groups=('compiz-fusion' 'compiz-fusion-gtk' 'compiz-fusion-kde') -conflicts=('compiz-fusion-plugins-extra-git') -options=('!libtool') -source=(http://releases.compiz-fusion.org/${pkgver}/compiz-plugins-extra-${pkgver}.tar.bz2) -sha1sums=('ce592993696c0b5d4e0bb13171897b4c25b3844e') - -build() { - cd "${srcdir}/compiz-plugins-extra-${pkgver}" - - sed -i 's/if text "x$use/if test "x$use/' configure - sed -i 's/iconUri, NULL);/iconUri);/' src/notification/notification.c - ./configure --prefix=/usr - - make -} - -package() { - cd "${srcdir}/compiz-plugins-extra-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/compiz-fusion-plugins-main/PKGBUILD b/community/compiz-fusion-plugins-main/PKGBUILD deleted file mode 100644 index 868d26369..000000000 --- a/community/compiz-fusion-plugins-main/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 68300 2012-03-21 10:35:13Z pschmitz $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=compiz-fusion-plugins-main -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compiz Fusion Main plugins" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core' 'libjpeg>=7' 'librsvg' 'compiz-bcop' 'libxdamage' 'libxcomposite' - 'libxinerama' 'startup-notification') -makedepends=('intltool' 'pkgconfig' 'gettext') -groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk') -conflicts=('compiz-fusion-plugins-main-git') -source=(http://releases.compiz-fusion.org/${pkgver}/compiz-plugins-main-${pkgver}.tar.bz2) -options=(!libtool) -sha1sums=('3c99841b744ae6c4a3edf2019626484880607dc6') - -build() { - cd "${srcdir}/compiz-plugins-main-${pkgver}" - - CPPFLAGS="$CPPFLAGS -I/usr/include/compiz -I/usr/include/startup-notification-1.0 \ - -I/usr/include/libxml2" ./configure --prefix=/usr --sysconfdir=/etc - - make -} - -package() { - cd "${srcdir}/compiz-plugins-main-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/compiz-fusion-plugins-main/magiclamp.patch b/community/compiz-fusion-plugins-main/magiclamp.patch deleted file mode 100644 index 3a9e4a21e..000000000 --- a/community/compiz-fusion-plugins-main/magiclamp.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- src/animation/animation.c.orig 2007-12-01 02:22:12.008115484 +0100 -+++ src/animation/animation.c 2007-12-01 02:27:41.541651382 +0100 -@@ -1148,7 +1148,7 @@ - { "horizontal_folds_zoom_to_taskbar", "bool", 0, 0, 0 }, - { "magic_lamp_moving_end", "bool", 0, 0, 0 }, - { "magic_lamp_grid_res", "int", "<min>4</min>", 0, 0 }, -- { "magic_lamp_max_waves", "int", "<min>3</min>", 0, 0 }, -+ { "magic_lamp_max_waves", "int", "<min>0</min>", 0, 0 }, - { "magic_lamp_amp_min", "float", "<min>200</min>", 0, 0 }, - { "magic_lamp_amp_max", "float", "<min>200</min>", 0, 0 }, - { "magic_lamp_open_start_width", "int", "<min>0</min>", 0, 0 }, ---- metadata/animation.xml.in.orig 2007-12-01 02:25:24.011432269 +0100 -+++ metadata/animation.xml.in 2007-12-01 02:27:02.724750938 +0100 -@@ -1272,7 +1272,7 @@ - <_short>Magic Lamp Max Waves</_short> - <_long>The maximum number of waves for Magic Lamp.</_long> - <default>3</default> -- <min>3</min> -+ <min>0</min> - <max>20</max> - </option> - <option name="magic_lamp_amp_min" type="float"> ---- metadata/animation.xml.orig 2007-12-01 02:25:14.584765435 +0100 -+++ metadata/animation.xml 2007-12-01 02:35:07.068035601 +0100 -@@ -3962,7 +3962,7 @@ - <long xml:lang="pt">Número máximo de ondas para Lâmpada Mágica.</long> - <long xml:lang="sv">Den Magiska Lampans maximala antal vågor</long> - <default>3</default> -- <min>3</min> -+ <min>0</min> - <max>20</max> - </option> - <option type="float" name="magic_lamp_amp_min"> diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD deleted file mode 100644 index b69e9e0f5..000000000 --- a/community/compiz/PKGBUILD +++ /dev/null @@ -1,142 +0,0 @@ -# $Id: PKGBUILD 90011 2013-05-06 19:36:27Z foutrelis $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Hussam Al-Tayeb ht990332@gmail.com -# Contributor: Khashayar Naderehvandi <khashayar [at] naderehvandi [dot] net> -# Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com> - -pkgbase=compiz -pkgname=('compiz-core' - 'compiz-decorator-kde' - 'compiz-decorator-gtk') -pkgver=0.8.8 -pkgrel=5 -pkgdesc="Composite manager for Aiglx and Xgl" -url="http://www.compiz.org/" -license=('GPL' 'LGPL' 'MIT') -arch=('i686' 'x86_64' 'mips64el') -groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion') -makedepends=('intltool' 'gnome-control-center' 'gconf' 'libwnck' 'kdebase-workspace' - 'startup-notification' 'librsvg' 'libgl' 'dbus' 'glu' 'libxslt' 'fuse' 'metacity') -options=(!libtool !emptydirs) -conflicts=('compiz' 'compiz-core-git' 'compiz-git') -replaces=('compiz') -source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz - compiz-kde-4.8.patch - compiz-kde-4.9.patch - compiz-kde-4.10.patch - compiz-gcc-4.7.patch) -sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e' - '148656352f8a20b3781ee185025c5c8d4b7d720f' - '2b6fa7398ccb96172a99f4d12990bbc0491e355c' - 'f3c97cc9835643d48058682506eac98d6deceeb7' - '2138342ae9f253bae003e96e91fdd0bc9918291a') - -prepare() -{ - cd "$srcdir/compiz-$pkgver" - - patch -p0 -i ../compiz-gcc-4.7.patch - patch -p1 -i ../compiz-kde-4.8.patch - patch -p1 -i ../compiz-kde-4.9.patch - patch -p0 -i ../compiz-kde-4.10.patch -} - -build() -{ - cd "$srcdir/compiz-$pkgver" - - ./configure --prefix=/usr \ - --enable-gnome \ - --enable-gtk \ - --enable-metacity \ - --enable-gconf \ - --with-gconf-schema-file-dir=/etc/gconf/schemas \ - --enable-dbus \ - --enable-librsvg \ - --disable-kde \ - --enable-kde4 - - make QDBUSXML2CPP=/usr/bin/qdbusxml2cpp-qt4 -} - -package_compiz-core() -{ - - pkgdesc="Composite manager for Aiglx and Xgl" - depends=('startup-notification' 'librsvg' \ - 'libgl' 'dbus' 'glu' 'libxslt' 'fuse') - - cd "$srcdir/compiz-$pkgver" - make DESTDIR="$pkgdir" install - - # remove stuff which is in one of the decorations - rm -rf "$pkgdir"/usr/bin/{gtk-window-decorator,kde4-window-decorator} - rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center} - rm -rf "${pkgdir}"/usr/lib/{window-manager-settings,pkgconfig/compiz-gconf.pc,compiz/libgconf*} - rm -rf "${pkgdir}"/etc - - # install MIT license - install -Dm644 "$srcdir/compiz-$pkgver/COPYING.MIT" \ - "$pkgdir/usr/share/licenses/compiz-core/COPYING.MIT" -} - -package_compiz-decorator-gtk() -{ - pkgdesc="Compiz decorator for GNOME" - depends=('gnome-control-center' 'gconf' 'libwnck' 'compiz-core' 'metacity') - install=compiz-decorator-gtk.install - - cd "$srcdir/compiz-$pkgver" - - pushd gtk - make DESTDIR="$pkgdir" install - install -Dm644 window-decorator/gwd.schemas \ - "$pkgdir/usr/share/gconf/schemas/gwd.schemas" - popd - - for i in dbus gconf ini inotify png regex svg glib kconfig - do - rm "$srcdir"/compiz-$pkgver/metadata/compiz-$i.schemas - done - - gconf-merge-schema \ - "${pkgdir}"/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \ - "${srcdir}"/compiz-$pkgver/metadata/*.schemas - - make DESTDIR="$pkgdir" install - - # remove stuff which is in one of the other packages - rm -rf "${pkgdir}"/etc - rm -rf "$pkgdir"/usr/bin/{compiz,kde4-window-decorator} - rm -rf "$pkgdir"/usr/include - cd "$pkgdir"/usr/lib - rm libdecoration* - rm pkgconfig/{compiz-cube.pc,compiz-scale.pc,compiz.pc,libdecoration.pc} - cd "${pkgdir}"/usr/lib/compiz - rm $(ls --hide=*gconf*) - rm -rf "${pkgdir}"/usr/share/{compiz,locale} - - # install MIT license - install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \ - "$pkgdir"/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT -} - -package_compiz-decorator-kde() -{ - pkgdesc="Compiz decorator for KDE" - depends=('kdebase-workspace' 'compiz-core') - - cd "$srcdir"/compiz-$pkgver - make DESTDIR="$pkgdir" install - - # Let's remove stuff that are in compiz-core package or gtk decorator - rm -rf "$pkgdir"/usr/{include,lib} - rm -rf "$pkgdir"/usr/bin/{compiz,gtk-window-decorator} - rm -rf "${pkgdir}"/etc - rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center,locale,compiz} - - # install MIT license - install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \ - "$pkgdir"/usr/share/licenses/compiz-decorator-kde/COPYING.MIT -} - diff --git a/community/compiz/compiz-decorator-gtk.install b/community/compiz/compiz-decorator-gtk.install deleted file mode 100644 index b3738fda9..000000000 --- a/community/compiz/compiz-decorator-gtk.install +++ /dev/null @@ -1,28 +0,0 @@ -post_install() { - export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` - usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/gwd.schemas > /dev/null - usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null - kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1 - update-desktop-database -q - -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` - usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/gwd.schemas >/dev/null - usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null -} - -post_remove() { - kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1 - update-desktop-database -q -} - diff --git a/community/compiz/compiz-gcc-4.7.patch b/community/compiz/compiz-gcc-4.7.patch deleted file mode 100644 index 28315baec..000000000 --- a/community/compiz/compiz-gcc-4.7.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- kde/window-decorator-kde4/window.cpp 2010-05-21 11:18:14.000000000 +0000 -+++ kde/window-decorator-kde4/window.cpp 2012-09-12 18:05:00.000000000 +0000 -@@ -59,6 +59,9 @@ - - #include "paintredirector.h" - -+// header for gcc-4.7 compatibility -+#include "unistd.h" -+ - KWD::Window::Window (WId parentId, - WId clientId, - WId frame, ---- configure.ac.orig 2012-09-12 23:39:54.093812000 +0400 -+++ configure.ac 2012-09-12 23:40:37.253686000 +0400 -@@ -72,11 +72,6 @@ - *) CFLAGS="$CFLAGS -Wnested-externs" ;; - esac - -- case " $CFLAGS " in -- *[[\ \ ]]-D_FORTIFY_SOURCE=2[[\ \ ]]*) ;; -- *) CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ;; -- esac -- - if test "x$enable_ansi" = "xyes"; then - case " $CFLAGS " in - *[[\ \ ]]-ansi[[\ \ ]]*) ;; -@@ -95,11 +90,6 @@ - *[[\ \ ]]-Wall[[\ \ ]]*) ;; - *) CXXFLAGS="$CXXFLAGS -Wall" ;; - esac -- -- case " $CXXFLAGS " in -- *[[\ \ ]]-D_FORTIFY_SOURCE=2[[\ \ ]]*) ;; -- *) CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" ;; -- esac - fi - - AC_C_BIGENDIAN diff --git a/community/compiz/compiz-kde-4.10.patch b/community/compiz/compiz-kde-4.10.patch deleted file mode 100644 index a30d54b90..000000000 --- a/community/compiz/compiz-kde-4.10.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- kde/window-decorator-kde4/window.cpp 2012-11-14 10:17:09 +0000 -+++ kde/window-decorator-kde4/window.cpp 2012-11-23 06:43:18 +0000 -@@ -554,6 +554,15 @@ - showWindowMenu (pos.bottomLeft ()); - } - -+void KWD::Window::showApplicationMenu (const QPoint &p) -+{ -+} -+ -+bool KWD::Window::menuAvailable () const -+{ -+ return false; -+} -+ - KWD::Options::MouseCommand - KWD::Window::buttonToCommand (Qt::MouseButtons button) - { - ---- kde/window-decorator-kde4/window.h 2012-09-03 07:19:30 +0000 -+++ kde/window-decorator-kde4/window.h 2012-11-23 06:43:18 +0000 -@@ -92,6 +92,8 @@ - virtual void processMousePressEvent (QMouseEvent *); - virtual void showWindowMenu (const QRect &); - virtual void showWindowMenu (const QPoint &); -+ virtual void showApplicationMenu (const QPoint &); -+ virtual bool menuAvailable () const; - virtual void performWindowOperation (WindowOperation); - virtual void setMask (const QRegion &, int); - virtual bool isPreview (void) const; diff --git a/community/compiz/compiz-kde-4.8.patch b/community/compiz/compiz-kde-4.8.patch deleted file mode 100644 index f22a3fa21..000000000 --- a/community/compiz/compiz-kde-4.8.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp ---- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp 2012-01-29 22:05:54.000000000 -0500 -+++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp 2012-01-29 22:10:38.000000000 -0500 -@@ -986,10 +986,10 @@ - { - Atom atom = Atoms::compizWindowBlurDecor; - QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; -- Region topRegion = NULL; -- Region bottomRegion = NULL; -- Region leftRegion = NULL; -- Region rightRegion = NULL; -+ ::Region topRegion = NULL; -+ ::Region bottomRegion = NULL; -+ ::Region leftRegion = NULL; -+ ::Region rightRegion = NULL; - int size = 0; - int w, h; - diff --git a/community/compiz/compiz-kde-4.9.patch b/community/compiz/compiz-kde-4.9.patch deleted file mode 100644 index 7b56da95c..000000000 --- a/community/compiz/compiz-kde-4.9.patch +++ /dev/null @@ -1,196 +0,0 @@ -From 3c6f698c12f455661807c4115feaa73007fc33d1 Mon Sep 17 00:00:00 2001 -From: Dennis Kasprzyk <onestone@compiz.org> -Date: Mon, 06 Aug 2012 18:23:17 +0000 -Subject: KDE 4.9 support. - -Little modification for compatibility with KDE 4.8 patch was added by Sergey Popov - ---- -diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp -index a65f99f..78d1a47 100644 ---- a/kde/window-decorator-kde4/window.cpp -+++ b/kde/window-decorator-kde4/window.cpp -@@ -768,6 +768,22 @@ KWD::Window::transparentRect () const - return QRect (); - } - -+KDecorationDefines::WindowOperation -+KWD::Window::buttonToWindowOperation(Qt::MouseButtons button) -+{ -+ Options::MouseCommand com = buttonToCommand (button); -+ -+ if (com == Options::MouseOperationsMenu) -+ return KDecorationDefines::OperationsOp; -+ -+ return KDecorationDefines::NoOp; -+} -+ -+ -+#endif -+ -+#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80) -+ - bool - KWD::Window::isClientGroupActive () - { -@@ -837,19 +853,82 @@ KWD::Window::displayClientMenu (int index, const QPoint& pos) - showWindowMenu (pos); - } - --KDecorationDefines::WindowOperation --KWD::Window::buttonToWindowOperation(Qt::MouseButtons button) -+#endif -+ -+#if KDE_IS_VERSION(4,8,80) -+QString -+KWD::Window::caption(int idx) const - { -- Options::MouseCommand com = buttonToCommand (button); -+ return mName; -+} - -- if (com == Options::MouseOperationsMenu) -- return KDecorationDefines::OperationsOp; -+void -+KWD::Window::closeTab(long id) -+{ -+ closeWindow (); -+} - -- return KDecorationDefines::NoOp; -+void -+KWD::Window::closeTabGroup() -+{ -+ closeWindow (); -+} -+ -+long -+KWD::Window::currentTabId() const -+{ -+ return (long) mClientId; -+} -+ -+QIcon -+KWD::Window::icon(int idx) const -+{ -+ QIcon icon (mIcon); -+ icon.addPixmap (mMiniIcon); -+ return icon; -+} -+ -+void -+KWD::Window::setCurrentTab(long id) -+{ -+} -+ -+void -+KWD::Window::showWindowMenu(const QPoint& pos, long id) -+{ -+ showWindowMenu (pos); -+} -+ -+void -+KWD::Window::tab_A_before_B(long A, long B) -+{ -+} -+ -+void -+KWD::Window::tab_A_behind_B(long A, long B) -+{ -+} -+ -+int -+KWD::Window::tabCount() const -+{ -+ return 1; -+} -+ -+long -+KWD::Window::tabId(int idx) const -+{ -+ return (long) mClientId; -+} -+ -+void -+KWD::Window::untab(long id, const QRect& newGeom) -+{ - } - - #endif - -+ - void - KWD::Window::createDecoration (void) - { -@@ -987,14 +1066,14 @@ KWD::Window::updateBlurProperty (int topOffset, - int leftOffset, - int rightOffset) - { -- Atom atom = Atoms::compizWindowBlurDecor; -- QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; -- ::Region topRegion = NULL; -- ::Region bottomRegion = NULL; -- ::Region leftRegion = NULL; -- ::Region rightRegion = NULL; -- int size = 0; -- int w, h; -+ Atom atom = Atoms::compizWindowBlurDecor; -+ QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; -+ _XRegion *topRegion = NULL; -+ _XRegion *bottomRegion = NULL; -+ _XRegion *leftRegion = NULL; -+ _XRegion *rightRegion = NULL; -+ int size = 0; -+ int w, h; - - w = mGeometry.width () + mBorder.left + mBorder.right; - h = mGeometry.height () + mBorder.top + mBorder.bottom; -diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h -index c2b274b..1ddfbd1 100644 ---- a/kde/window-decorator-kde4/window.h -+++ b/kde/window-decorator-kde4/window.h -@@ -114,7 +114,10 @@ class Window: public QObject, public KDecorationBridgeUnstable { - virtual bool compositingActive () const; - #if KDE_IS_VERSION(4,3,90) - virtual QRect transparentRect () const; -- -+ virtual WindowOperation -+ buttonToWindowOperation(Qt::MouseButtons button); -+#endif -+#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80) - virtual bool isClientGroupActive (); - virtual QList<ClientGroupItem> clientGroupItems () const; - virtual long itemId (int index); -@@ -126,10 +129,27 @@ class Window: public QObject, public KDecorationBridgeUnstable { - virtual void closeClientGroupItem (int index); - virtual void closeAllInClientGroup (); - virtual void displayClientMenu (int index, const QPoint& pos); -- -- virtual WindowOperation -- buttonToWindowOperation(Qt::MouseButtons button); -+ -+#endif -+#if KDE_IS_VERSION(4,8,80) -+ using KDecorationBridge::caption; -+ virtual QString caption(int idx) const; -+ virtual void closeTab(long id); -+ virtual void closeTabGroup(); -+ virtual long currentTabId() const; -+ using KDecorationBridge::icon; -+ virtual QIcon icon(int idx) const; -+ virtual void setCurrentTab(long id); -+ using KDecorationBridge::showWindowMenu; -+ virtual void showWindowMenu(const QPoint& pos, long id); -+ virtual void tab_A_before_B(long A, long B); -+ virtual void tab_A_behind_B(long A, long B); -+ virtual int tabCount() const; -+ virtual long tabId(int idx) const; -+ virtual void untab(long id, const QRect& newGeom); - #endif -+ -+ - virtual bool eventFilter (QObject* o, QEvent* e); - - void handleActiveChange (void); --- -cgit v0.8.3.1-30-gff3a diff --git a/community/compizconfig-backend-gconf/PKGBUILD b/community/compizconfig-backend-gconf/PKGBUILD deleted file mode 100644 index 43c8e29b7..000000000 --- a/community/compizconfig-backend-gconf/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 68302 2012-03-21 10:36:50Z pschmitz $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: kasa <biuta.jr@gmail.com> - -pkgname=compizconfig-backend-gconf -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compizconfig backend for gconf" -arch=('i686' 'x86_64' 'mips64el') -url="http://opencompositing.org" -license=('GPL') -depends=('libcompizconfig' 'gconf') -makedepends=('intltool' 'pkgconfig') -conflicts=('compizconfig-backend-gconf-git') -groups=('compiz-fusion-gtk' 'compiz-fusion') -options=('!libtool') -source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('3869e83a50e82caa4bfda5474a3bf44095ee78dc') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --sysconfdir=/etc - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} - diff --git a/community/compizconfig-python/PKGBUILD b/community/compizconfig-python/PKGBUILD deleted file mode 100644 index 6ae0eea50..000000000 --- a/community/compizconfig-python/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 68381 2012-03-23 15:45:56Z rvanharen $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=compizconfig-python -pkgver=0.8.4 -pkgrel=4 -pkgdesc="Compizconfig bindings for python" -arch=('i686' 'x86_64' 'mips64el') -url="http://opencompositing.org" -license=('GPL') -depends=('compiz-core' 'libcompizconfig' 'glib2' 'python2' 'libxrandr') -makedepends=('intltool' 'pkgconfig' 'pyrex') -conflicts=('compizconfig-python-git') -source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('702f83f63ce5dc3c6c1d27e07fb62fc3') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - PYTHON=python2 ./configure --prefix=/usr - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD index aff1ce2ca..648c4df12 100644 --- a/community/dante/PKGBUILD +++ b/community/dante/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90649 2013-05-13 14:18:47Z spupykin $ +# $Id: PKGBUILD 91850 2013-05-28 17:25:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Guillem Rieu <guillemr@gmx.net> pkgname=dante pkgver=1.3.2 -pkgrel=4 +pkgrel=5 pkgdesc="SOCKS v4 and v5 compatible proxy server and client" url="http://www.inet.no/dante" arch=(i686 x86_64 'mips64el') @@ -16,11 +16,12 @@ options=('!libtool') source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz sockd.service) md5sums=('250c6456cd3fefa17f07fa80c9ccf6bd' - 'ceb86b5bd97f7e3ceff28c6e6172a25b') + '9bb18a0165764092bd01da0ff6303fbf') build() { cd ${srcdir}/${pkgname}-${pkgver} [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc \ + --sbindir=/usr/bin \ --disable-libwrap make } diff --git a/community/dante/sockd.service b/community/dante/sockd.service index a2a964304..68201577a 100644 --- a/community/dante/sockd.service +++ b/community/dante/sockd.service @@ -5,8 +5,8 @@ After=network.target [Service] Type=forking EnvironmentFile=/etc/conf.d/sockd.conf -PIDFile=/var/run/sockd.pid -ExecStart=/usr/sbin/sockd $SOCKD_OPTS +PIDFile=/run/sockd.pid +ExecStart=/usr/bin/sockd $SOCKD_OPTS [Install] WantedBy=multi-user.target diff --git a/community/darkhttpd/PKGBUILD b/community/darkhttpd/PKGBUILD index a1aba40ca..247f77f7e 100644 --- a/community/darkhttpd/PKGBUILD +++ b/community/darkhttpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89410 2013-04-29 10:56:40Z spupykin $ +# $Id: PKGBUILD 91852 2013-05-28 17:25:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=darkhttpd pkgver=1.9 -pkgrel=1 +pkgrel=2 pkgdesc="A small, static webserver" arch=('i686' 'x86_64' 'mips64el') url="http://dmr.ath.cx/net/darkhttpd/" @@ -20,7 +20,7 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - install -D $srcdir/$pkgname-$pkgver/darkhttpd $pkgdir/usr/sbin/darkhttpd + install -D $srcdir/$pkgname-$pkgver/darkhttpd $pkgdir/usr/bin/darkhttpd mkdir -p $pkgdir/usr/share/licenses/$pkgname head -n 18 darkhttpd.c >$pkgdir/usr/share/licenses/$pkgname/license } diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD index 9f4bedc22..43663d797 100644 --- a/community/darkstat/PKGBUILD +++ b/community/darkstat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90651 2013-05-13 14:19:19Z spupykin $ +# $Id: PKGBUILD 91854 2013-05-28 17:26:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=darkstat pkgver=3.0.715 -pkgrel=9 +pkgrel=10 pkgdesc="Network statistics gatherer (packet sniffer)" url="http://dmr.ath.cx/net/darkstat/" license=("GPL") @@ -21,7 +21,7 @@ options=(!makeflags !distcc) build() { cd $srcdir/darkstat-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index a4f646cad..207228bfa 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90013 2013-05-06 19:36:35Z foutrelis $ +# $Id: PKGBUILD 91822 2013-05-28 13:42:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=1.2 +pkgver=1.2.1 _pkgver=1.2 -pkgrel=4 +pkgrel=1 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ @@ -19,7 +19,7 @@ optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz) -md5sums=('31bfd13d4786aac4f99d5155a811602b') +md5sums=('f970573777752b1b4447997d1f1f65fa') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 6078bb543..ab4fadc71 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90653 2013-05-13 14:20:23Z spupykin $ +# $Id: PKGBUILD 91488 2013-05-23 10:12:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail pkgver=3.0.2 -pkgrel=10 +pkgrel=11 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64' 'mips64el') depends=('gmime24' 'libzdb' 'mhash' 'libevent') @@ -31,19 +31,19 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz dbmail-timsieved.xinetd) md5sums=('eb32235abffdf967253ee9d004e0e4a9' 'c4b5793c5422b62a675d4c66ff7e9300' - '84efa46eaac66057c4eb131d9bc27fa8' - '19560277f6a56d1f3f2fdb02315dcf0f' - '89a0f793737eaf36291409f8c840891e' - 'dd1b5b2c542f55d9d934a58a36d0513d' - '8fa791f2e4d107ba461453c054359477' - '069cd4285c4b2ec95dfdcebc2cfee387' - '44f87ce81e786fcee501daa17e55412a' - 'a66927cb94d4f26428211e3ad2d540c8') + '5a6297cb03c8d0b424f978ea1d7402de' + '070db88538af9833f003f4cb516d337b' + '422f0399f97a780b7cab84443e8f429a' + '15c7d367d4242aebac5f87649a2250aa' + '890de13361afbdf4fed12d6d7eb53e66' + '961593658cd596297d03d25eb9c9e98f' + '4cb764894abd3914802e90602bf90a0c' + 'e78dc86355f9aaf24590bc7c6611162f') build() { cd $srcdir/dbmail-${pkgver/_/-}/ - - [ -f Makefile ] || ./configure --prefix=/usr --with-ldap --with-sieve + [ -f Makefile ] || ./configure --prefix=/usr --sbindir=/usr/bin \ + --with-ldap --with-sieve make } diff --git a/community/dbmail/dbmail-imapd.service b/community/dbmail/dbmail-imapd.service index e67e0c4e8..bc3319fd0 100644 --- a/community/dbmail/dbmail-imapd.service +++ b/community/dbmail/dbmail-imapd.service @@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service [Service] Type=forking -PIDFile=/var/run/dbmail/dbmail-imapd.pid -ExecStart=/usr/sbin/dbmail-imapd -p /var/run/dbmail/dbmail-imapd.pid +PIDFile=/run/dbmail/dbmail-imapd.pid +ExecStart=/usr/bin/dbmail-imapd -p /run/dbmail/dbmail-imapd.pid [Install] WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-imapd.xinetd b/community/dbmail/dbmail-imapd.xinetd index eee3635df..20f7d607d 100644 --- a/community/dbmail/dbmail-imapd.xinetd +++ b/community/dbmail/dbmail-imapd.xinetd @@ -3,9 +3,11 @@ service imap socket_type = stream wait = no user = nobody - server = /usr/sbin/dbmail-imapd + server = /usr/bin/dbmail-imapd protocol = tcp server_args = -n log_on_failure += USERID disable = yes +# env = EVENT_NOEPOLL=yes +# instances = 200 } diff --git a/community/dbmail/dbmail-lmtpd.service b/community/dbmail/dbmail-lmtpd.service index 2a059a15c..570ba1ec7 100644 --- a/community/dbmail/dbmail-lmtpd.service +++ b/community/dbmail/dbmail-lmtpd.service @@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service [Service] Type=forking -PIDFile=/var/run/dbmail/dbmail-lmtpd.pid -ExecStart=/usr/sbin/dbmail-lmtpd -p /var/run/dbmail/dbmail-lmtpd.pid +PIDFile=/run/dbmail/dbmail-lmtpd.pid +ExecStart=/usr/bin/dbmail-lmtpd -p /run/dbmail/dbmail-lmtpd.pid [Install] WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-lmtpd.xinetd b/community/dbmail/dbmail-lmtpd.xinetd index 63365fee4..0a0e05620 100644 --- a/community/dbmail/dbmail-lmtpd.xinetd +++ b/community/dbmail/dbmail-lmtpd.xinetd @@ -5,7 +5,7 @@ service lmtp socket_type = stream wait = no user = nobody - server = /usr/sbin/dbmail-lmtpd + server = /usr/bin/dbmail-lmtpd protocol = tcp server_args = -n log_on_failure += USERID diff --git a/community/dbmail/dbmail-pop3d.service b/community/dbmail/dbmail-pop3d.service index 907f43b2b..edfa2570a 100644 --- a/community/dbmail/dbmail-pop3d.service +++ b/community/dbmail/dbmail-pop3d.service @@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service [Service] Type=forking -PIDFile=/var/run/dbmail/dbmail-pop3d.pid -ExecStart=/usr/sbin/dbmail-pop3d -p /var/run/dbmail/dbmail-pop3d.pid +PIDFile=/run/dbmail/dbmail-pop3d.pid +ExecStart=/usr/bin/dbmail-pop3d -p /run/dbmail/dbmail-pop3d.pid [Install] WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-pop3d.xinetd b/community/dbmail/dbmail-pop3d.xinetd index 6c5b06735..f073aca8b 100644 --- a/community/dbmail/dbmail-pop3d.xinetd +++ b/community/dbmail/dbmail-pop3d.xinetd @@ -3,9 +3,11 @@ service pop3 socket_type = stream wait = no user = nobody - server = /usr/sbin/dbmail-pop3d + server = /usr/bin/dbmail-pop3d protocol = tcp server_args = -n log_on_failure += USERID disable = yes +# env = EVENT_NOEPOLL=yes +# instances = 200 } diff --git a/community/dbmail/dbmail-timsieved.service b/community/dbmail/dbmail-timsieved.service index 7f34bacec..32623e038 100644 --- a/community/dbmail/dbmail-timsieved.service +++ b/community/dbmail/dbmail-timsieved.service @@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service [Service] Type=forking -PIDFile=/var/run/dbmail/dbmail-timsieved.pid -ExecStart=/usr/sbin/dbmail-timsieved -p /var/run/dbmail/dbmail-timsieved.pid +PIDFile=/run/dbmail/dbmail-timsieved.pid +ExecStart=/usr/bin/dbmail-timsieved -p /run/dbmail/dbmail-timsieved.pid [Install] WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-timsieved.xinetd b/community/dbmail/dbmail-timsieved.xinetd index 77ed27c31..69f6dd66b 100644 --- a/community/dbmail/dbmail-timsieved.xinetd +++ b/community/dbmail/dbmail-timsieved.xinetd @@ -1,11 +1,15 @@ service sieve { +# port = 2000 +# type = UNLISTED socket_type = stream wait = no user = nobody - server = /usr/sbin/dbmail-timsieved + server = /usr/bin/dbmail-timsieved protocol = tcp server_args = -n log_on_failure += USERID disable = yes +# env = EVENT_NOEPOLL=yes +# instances = 200 } diff --git a/community/delegate/PKGBUILD b/community/delegate/PKGBUILD index 40a9833c3..ef8cb910c 100644 --- a/community/delegate/PKGBUILD +++ b/community/delegate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65112 2012-02-20 04:49:31Z spupykin $ +# $Id: PKGBUILD 91876 2013-05-28 17:59:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=delegate pkgver=9.9.7 -pkgrel=2 +pkgrel=3 pkgdesc="Caching and converting multyprotocol proxy. For example, you may use it as NNTP web interface" arch=('i686' 'x86_64' 'mips64el') url="http://www.delegate.org/" @@ -18,13 +18,17 @@ md5sums=('86c833e95cd16a54d54fa3c7e4ab7929') build() { cd $srcdir/$pkgname$pkgver make ADMIN="root@localhost" +} + +package() { + cd $srcdir/$pkgname$pkgver install -D -m0755 src/delegated $pkgdir/usr/bin/delegated - install -D -m0755 subin/dgbind $pkgdir/usr/sbin/dgbind - install -D -m0755 subin/dgchroot $pkgdir/usr/sbin/dgchroot - install -D -m0755 subin/dgcpnod $pkgdir/usr/sbin/dgcpnod - install -D -m0755 subin/dgpam $pkgdir/usr/sbin/dgpam + install -D -m0755 subin/dgbind $pkgdir/usr/bin/dgbind + install -D -m0755 subin/dgchroot $pkgdir/usr/bin/dgchroot + install -D -m0755 subin/dgcpnod $pkgdir/usr/bin/dgcpnod + install -D -m0755 subin/dgpam $pkgdir/usr/bin/dgpam install -D -m0644 doc/Manual.htm $pkgdir/usr/share/delegate/manual.htm install -D -m0644 doc/tutor-en.htm $pkgdir/usr/share/delegate/tutor-en.htm diff --git a/community/delegate/delegate.install b/community/delegate/delegate.install index f7c7096b4..39883a261 100644 --- a/community/delegate/delegate.install +++ b/community/delegate/delegate.install @@ -1,11 +1,6 @@ -pre_install() { - /bin/true -} - post_install() { echo "--" echo "-- Delegate supports too many protocols, so I did not write any rc-script" echo "-- Please read documentation in /usr/share/delegate/" echo "--" - /bin/true } diff --git a/community/dictd/PKGBUILD b/community/dictd/PKGBUILD index 73f0f1f67..6b68492d5 100644 --- a/community/dictd/PKGBUILD +++ b/community/dictd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90655 2013-05-13 14:21:09Z spupykin $ +# $Id: PKGBUILD 91830 2013-05-28 17:03:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: SmackleFunky <smacklefunky@optusnet.com.au> # Contributor: Enrico Morelli <morelli@cerm.unifi.it> pkgname=dictd pkgver=1.12.1 -pkgrel=2 +pkgrel=3 pkgdesc="Online dictionary client and server" url="http://sourceforge.net/projects/dict/" license=('GPL') @@ -31,14 +31,14 @@ md5sums=('62696491174c22079f664830d07c0623' 'fb72f7d8c55f84b1b37bbc8d33a8e55a' '64cd6ffdb40fb3367224f91ac44926ac' '838887fee38ae4cebd652d399b1f2266' - '574e316d1f08885882d7b3075e1ea522' + 'd94fa6c43514c158c80e85f856c65365' 'b8cabf913876e544d919c7f20ff8db9e' - 'b7dbc9529df13ff895dae2b4abd080d6' + 'bd3fd3f68625bad0c23754686ae2e99c' '978c9c079a0fc8d7d42a4cd4000190e7') build() { cd $srcdir/$pkgname-$pkgver - ./configure --enable-dictorg --prefix=/usr --sysconfdir=/etc/dict + ./configure --enable-dictorg --prefix=/usr --sysconfdir=/etc/dict --sbindir=/usr/bin make } diff --git a/community/dictd/dictd.service b/community/dictd/dictd.service index fa219f72a..f62bf275f 100644 --- a/community/dictd/dictd.service +++ b/community/dictd/dictd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking EnvironmentFile=-/etc/conf.d/dictd -ExecStart=/usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS +ExecStart=/usr/bin/dictd $DICTD_ARGS -- $DICTD_EARGS [Install] WantedBy=multi-user.target diff --git a/community/dictd/dictd.xinetd b/community/dictd/dictd.xinetd index a3e3773dc..0ae5cb411 100644 --- a/community/dictd/dictd.xinetd +++ b/community/dictd/dictd.xinetd @@ -7,6 +7,6 @@ service dict protocol = tcp wait = no user = daemon - server = /usr/sbin/dictd + server = /usr/bin/dictd server_args = -c /etc/dict/dictd.conf -i --locale en_US.UTF-8 } diff --git a/community/dsniff/PKGBUILD b/community/dsniff/PKGBUILD index d7bcb0f4a..e0a357243 100644 --- a/community/dsniff/PKGBUILD +++ b/community/dsniff/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61947 2012-01-11 15:21:36Z stephane $ +# $Id: PKGBUILD 91568 2013-05-24 09:42:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ViNS <gladiator@fastwebnet.it> pkgname=dsniff pkgver=2.4b1 -pkgrel=21 +pkgrel=22 pkgdesc="Collection of tools for network auditing and penetration testing" url="http://www.monkey.org/~dugsong/dsniff/" arch=('i686' 'x86_64' 'mips64el') @@ -15,22 +15,26 @@ source=("http://www.monkey.org/~dugsong/${pkgname}/beta/$pkgname-$pkgver.tar.gz" md5sums=('2f761fa3475682a7512b0b43568ee7d6' 'fbc9f62f9ab2f98f24f53ad497c1ce5d') -build() { +prepare() { cd $srcdir/$pkgname-2.4 patch -N < "${srcdir}"/dsniff_2.4b1+debian-18.diff for i in *.dpatch; do patch -N < "$i" done + sed -i 's|${CC-cc} -E|${CC-cc} -O2 -E|g' configure +} - LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure --prefix=/usr - make +build() { + cd $srcdir/$pkgname-2.4 + LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure \ + --prefix=/usr --sbindir=/usr/bin + make -j1 } package() { cd "$srcdir"/$pkgname-2.4 - make prefix="$pkgdir"/usr install + make install_prefix="$pkgdir" install install -D -m0644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE - install -d "$pkgdir"/usr/share mv "$pkgdir"/usr/man "$pkgdir"/usr/share/ } diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index cec6cba38..961e9d00e 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90663 2013-05-13 14:23:23Z spupykin $ +# $Id: PKGBUILD 91490 2013-05-23 10:12:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ejabberd pkgver=2.1.12 -pkgrel=2 +pkgrel=4 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686' 'mips64el') url="http://www.ejabberd.im/" @@ -35,8 +35,10 @@ package() { install -d "$pkgdir/var/lib/$pkgname" install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname" chmod ug+r "$pkgdir/etc/$pkgname/"* - chmod a+rx "$pkgdir/usr/sbin/ejabberdctl" - rm -rf "$pkgdir/var/lock" + mkdir -p $pkgdir/usr/bin + mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl + chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh" + rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin" install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service } diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD index 0e4cbcba9..236515763 100644 --- a/community/ekg2/PKGBUILD +++ b/community/ekg2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72899 2012-06-24 16:20:06Z bpiotrowski $ +# $Id: PKGBUILD 91649 2013-05-26 09:24:30Z bluewind $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Mateusz Herych <heniekk@gmail.com> pkgname=ekg2 pkgver=0.3.1 -pkgrel=5.1 +pkgrel=6 pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client" arch=('i686' 'x86_64' 'mips64el') url="http://ekg2.org/" diff --git a/community/emerald/PKGBUILD b/community/emerald/PKGBUILD deleted file mode 100644 index a664796a1..000000000 --- a/community/emerald/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 63540 2012-02-05 11:54:48Z ibiru $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=emerald -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Emerald window decorator" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core' 'libwnck' 'gtk2' 'libxres' 'shared-mime-info' 'xdg-utils' \ - 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'pkg-config' 'gettext') -groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk') -options=(!libtool) -conflicts=('emerald-git') -install=emerald.install -source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('a5deb2ae135d1c4dac7b57b2a0415f320ae7c0aa') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - LIBS+="-lm -ldl" ./configure --prefix=/usr - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/emerald/deprecated_symbols.patch b/community/emerald/deprecated_symbols.patch deleted file mode 100644 index b32ce154a..000000000 --- a/community/emerald/deprecated_symbols.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 30e3d45437b4285818ec016905151390c9604441 Mon Sep 17 00:00:00 2001 -From: ShadowKyogre <shadowkyogre@aim.com> -Date: Fri, 05 Nov 2010 01:53:24 +0000 -Subject: Fix deprecated symbols and incorrect decoration property setting - ---- -diff --git a/src/main.c b/src/main.c -index 5f0ec35..150da99 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -27,8 +27,8 @@ - #include <emerald.h> - #include <engine.h> - --#define BASE_PROP_SIZE 12 --#define QUAD_PROP_SIZE 9 -+//#define BASE_PROP_SIZE 12 -+//#define QUAD_PROP_SIZE 9 - - #ifndef DECOR_INTERFACE_VERSION - #define DECOR_INTERFACE_VERSION 0 -@@ -2457,7 +2457,7 @@ static gboolean get_window_prop(Window xwindow, Atom atom, Window * val) - gdk_error_trap_push(); - - type = None; -- result = XGetWindowProperty(gdk_display, -+ result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), - xwindow, - atom, - 0, G_MAXLONG, -@@ -4246,10 +4246,10 @@ static void force_quit_dialog_realize(GtkWidget * dialog, void *data) - WnckWindow *win = data; - - gdk_error_trap_push(); -- XSetTransientForHint(gdk_display, -+ XSetTransientForHint(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), - GDK_WINDOW_XID(dialog->window), - wnck_window_get_xid(win)); -- XSync(gdk_display, FALSE); -+ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE); - gdk_error_trap_pop(); - } - -@@ -4262,11 +4262,11 @@ static char *get_client_machine(Window xwindow) - int format, result; - char *retval; - -- atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE); -+ atom = XInternAtom(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE); - - gdk_error_trap_push(); - -- result = XGetWindowProperty(gdk_display, -+ result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), - xwindow, atom, - 0, G_MAXLONG, - FALSE, XA_STRING, &type, &format, &nitems, -@@ -4318,8 +4318,8 @@ static void kill_window(WnckWindow * win) - } - - gdk_error_trap_push(); -- XKillClient(gdk_display, wnck_window_get_xid(win)); -- XSync(gdk_display, FALSE); -+ XKillClient(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid(win)); -+ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE); - gdk_error_trap_pop(); - } - -@@ -4739,7 +4739,7 @@ static XFixed *create_gaussian_kernel(double radius, - - static int update_shadow(frame_settings * fs) - { -- Display *xdisplay = gdk_display; -+ Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); - XRenderPictFormat *format; - GdkPixmap *pixmap; - Picture src, dst, tmp; --- -cgit v0.8.3.1-30-gff3a - ---- a/src/main.c.old 2010-12-07 19:56:08.633333370 +0100 -+++ a/src/main.c 2010-12-07 19:56:39.273333379 +0100 -@@ -3757,7 +3757,7 @@ - - static void hide_tooltip(void) - { -- if (GTK_WIDGET_VISIBLE(tip_window)) -+ if (gtk_widget_get_visible (tip_window)) - g_get_current_time(&tooltip_last_popdown); - - gtk_widget_hide(tip_window); - ---- emerald-0.8.4/libengine/themer.c 2009-10-13 20:56:23.000000000 -0400 -+++ emerald-0.8.4.new/libengine/themer.c 2010-03-10 -01:20:03.046827674 -0500 -@@ -461,7 +461,7 @@ - } - gdouble get_float(SettingItem * item) - { -- if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { -+ if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { - return gtk_spin_button_get_value((GtkSpinButton *)item->widget); - } - else { -@@ -647,7 +647,7 @@ - } - void set_float(SettingItem * item, gdouble f) - { -- if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { -+ if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { - gtk_spin_button_set_value((GtkSpinButton *)item->widget, f); - } - else { - diff --git a/community/f2fs-tools/PKGBUILD b/community/f2fs-tools/PKGBUILD deleted file mode 100644 index a089b0e35..000000000 --- a/community/f2fs-tools/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Christian Hesse <mail@eworm.de> - -pkgname=f2fs-tools -pkgver=1.1.0 -pkgrel=2 -pkgdesc="Tools for Flash-Friendly File System (F2FS)" -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/f2fs-tools/" -depends=('util-linux') -license=('GPL') -source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz') -sha256sums=('c8cfb6895a0b3775f0df00a776fd451558739289684dd43f1fd75f876fa62867') - -build() { - cd "${pkgname}-${pkgver}" - - autoreconf -fi - ./configure --prefix=/usr - make -} - -package() { - cd "${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}/" install -} - diff --git a/community/fbgetty/PKGBUILD b/community/fbgetty/PKGBUILD index 8501ab67f..b202cd172 100644 --- a/community/fbgetty/PKGBUILD +++ b/community/fbgetty/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 65233 2012-02-20 12:23:20Z spupykin $ +# $Id: PKGBUILD 91856 2013-05-28 17:26:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=fbgetty pkgver=0.1.698 -pkgrel=4 +pkgrel=5 license=("GPL") pkgdesc="fbgetty is a console getty like mingetty, which supports framebuffers" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man --build=$CHOST + ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin --build=$CHOST patch src/options.c <<EOF 33a34 @@ -23,6 +23,10 @@ build() EOF make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install mv ${pkgdir}/usr/info ${pkgdir}/usr/share/ } diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD index 271b52fe7..cf512694c 100644 --- a/community/fcron/PKGBUILD +++ b/community/fcron/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90861 2013-05-15 00:13:25Z seblu $ +# $Id: PKGBUILD 91897 2013-05-29 00:39:11Z seblu $ # Contributor: Giorgio Lando <lando at imap dot cc> # Contributor: Sergej Pupykin # Contributor: Thomas Bächler @@ -7,31 +7,26 @@ pkgname=fcron pkgver=3.1.2 -pkgrel=5 +pkgrel=7 pkgdesc='Feature-rich cron implementation' arch=(i686 x86_64 mips64el) url='http://fcron.free.fr' license=('GPL') -depends=('pam') -makedepends=('smtp-server' 'vi') -optdepends=('smtp-server: to receive mails from cron jobs' +depends=('pam' 'run-parts') +makedepends=('smtp-forwarder' 'vi') +optdepends=('smtp-forwarder: to send mails from cron jobs' 'vi: default editor for fcrontab') provides=('cron') conflicts=('dcron') backup=('etc/fcron/fcron.conf' 'etc/fcron/fcron.allow' - 'etc/fcron/fcron.deny' - 'var/spool/fcron/systab' - 'var/spool/fcron/systab.orig') + 'etc/fcron/fcron.deny') options=('emptydirs' '!makeflags') +install=$pkgname.install source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz" - 'systab' - 'systab.orig' - 'run-cron') + 'systab.orig') md5sums=('36bf213e15f3a480f2274f8e46cced0a' - '55be3e80fb2545608feae6f2e0eebece' - '5384c607d842ca3d5cbb612ac1dceb15' - '524eba827447a6b7ef7515eedf305698') + 'afecbfd98caa49e8e4aa239fa1b19255') build() { cd $pkgname-$pkgver @@ -60,11 +55,10 @@ package() { install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron" install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab" - # Install default fcrontab so that fcron can completely replace dcron - install -D -m640 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab" - # In order to preserve the systab crontab in any case it is better to have - # it in non-binary form too + # Install a default fcrontab so that fcron can completely replace dcron + # We doesn't use binary format which is incompatible between arch and may cause crash + # We regenerate the binary format at each update install -D -m640 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig" # Add cron.* directories @@ -73,9 +67,6 @@ package() { install -d -m755 "$pkgdir/etc/cron.monthly" install -d -m755 "$pkgdir/etc/cron.weekly" - # Install run-cron script to make fcron run without dcron - install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/bin/run-cron" - # avoid conflict with filesystem>=2012.06 rmdir "$pkgdir"/{var/,}run diff --git a/community/fcron/fcron.install b/community/fcron/fcron.install new file mode 100644 index 000000000..f7b0abddf --- /dev/null +++ b/community/fcron/fcron.install @@ -0,0 +1,13 @@ +# arg 1: the new package version +post_install() { + # Generate binary format which is incompatible between arch + fcrontab -z -u systab &>/dev/null +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/fcron/run-cron b/community/fcron/run-cron deleted file mode 100644 index 8e65e2fd0..000000000 --- a/community/fcron/run-cron +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - - -if [[ -z "$1" ]]; then - echo "Usage: $0 crondir" - exit 1 -fi - -for cron in "$1"/* ; do - if [[ -x "$cron" ]]; then - "$cron" - fi -done -unset cron diff --git a/community/fcron/systab b/community/fcron/systab Binary files differdeleted file mode 100644 index 7947f3598..000000000 --- a/community/fcron/systab +++ /dev/null diff --git a/community/fcron/systab.orig b/community/fcron/systab.orig index b57ba8ef2..00af327bc 100644 --- a/community/fcron/systab.orig +++ b/community/fcron/systab.orig @@ -1,4 +1,4 @@ -&bootrun 01 * * * * /usr/bin/run-cron /etc/cron.hourly -&bootrun 02 00 * * * /usr/bin/run-cron /etc/cron.daily -&bootrun 22 00 * * 0 /usr/bin/run-cron /etc/cron.weekly -&bootrun 42 00 1 * * /usr/bin/run-cron /etc/cron.monthly +&bootrun 01 * * * * /usr/bin/run-parts /etc/cron.hourly +&bootrun 02 00 * * * /usr/bin/run-parts /etc/cron.daily +&bootrun 22 00 * * 0 /usr/bin/run-parts /etc/cron.weekly +&bootrun 42 00 1 * * /usr/bin/run-parts /etc/cron.monthly diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index 54f9011b7..ddc99181f 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90268 2013-05-10 20:25:25Z bluewind $ +# $Id: PKGBUILD 91731 2013-05-26 17:21:25Z bluewind $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=filezilla -pkgver=3.7.0.1 +pkgver=3.7.0.2 pkgrel=1 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64' 'mips64el') @@ -31,4 +31,4 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('cb07cf02ee4cc767e10e8a022ad0ce0d') +md5sums=('04a6a6aea31a01feda78e509246ae10a') diff --git a/community/flumotion/PKGBUILD b/community/flumotion/PKGBUILD index 069ad5eab..b51e173d9 100644 --- a/community/flumotion/PKGBUILD +++ b/community/flumotion/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74096 2012-07-20 19:52:13Z spupykin $ +# $Id: PKGBUILD 91878 2013-05-28 18:07:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: William Rea <sillywilly@gmail.com> pkgname=flumotion pkgver=0.10.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A streaming media server" url="http://www.flumotion.net" @@ -29,10 +29,14 @@ build() { sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin - install -d "$pkgdir/etc/$pkgname" make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -d "$pkgdir/etc/$pkgname" make DESTDIR="$pkgdir" install cp -R conf/workers "$pkgdir/etc/$pkgname" cp -R conf/managers "$pkgdir/etc/$pkgname" diff --git a/community/freeradius-client/PKGBUILD b/community/freeradius-client/PKGBUILD index 2452bc9ed..ecac54b00 100644 --- a/community/freeradius-client/PKGBUILD +++ b/community/freeradius-client/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65200 2012-02-20 10:12:30Z spupykin $ +# $Id: PKGBUILD 91904 2013-05-29 10:03:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Kalidarn pkgname=freeradius-client pkgver=1.1.6 -pkgrel=4 +pkgrel=5 pkgdesc="FreeRADIUS Client Software" arch=('i686' 'x86_64' 'mips64el') url="http://wiki.freeradius.org/Radiusclient" @@ -16,8 +16,12 @@ md5sums=('2e46564e450ae13aedb70dc133b158ac') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install install -D -m0644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/license mv $pkgdir/etc/radiusclient $pkgdir/etc/radiusclient.default diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 95e554bb1..164d97d3b 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90665 2013-05-13 14:24:07Z spupykin $ +# $Id: PKGBUILD 91902 2013-05-29 10:03:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.2.0 -pkgrel=6 +pkgrel=8 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64' 'mips64el') url="http://www.freeradius.org/" @@ -21,7 +21,7 @@ source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{ md5sums=('0fb333fe6a64eb2b1dd6ef67f7bca119' 'SKIP' 'f959e89812bedfc9f8308076f78cd74e' - '39eba6d34f8249781e9e917646465632' + 'e3f18e3a25df3b692e59f60605354708' 'c6a61de7576933f59154a53bfc12a2d2') build() { @@ -33,6 +33,7 @@ build() { --prefix=/usr --enable-heimdal-krb5 \ --localstatedir=/var \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --libdir=/usr/lib/freeradius \ --with-udpfromto make diff --git a/community/freeradius/freeradius.service b/community/freeradius/freeradius.service index 635b6d6f8..220d352af 100644 --- a/community/freeradius/freeradius.service +++ b/community/freeradius/freeradius.service @@ -4,11 +4,11 @@ After=syslog.target network.target [Service] Type=forking -PIDFile=/var/run/radiusd/radiusd.pid -ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd -ExecStartPre=/usr/sbin/radiusd -C -ExecStart=/usr/sbin/radiusd -d /etc/raddb -ExecReload=/usr/sbin/radiusd -C +PIDFile=/run/radiusd/radiusd.pid +ExecStartPre=-/bin/chown -R radiusd.radiusd /run/radiusd +ExecStartPre=/usr/bin/radiusd -C +ExecStart=/usr/bin/radiusd -d /etc/raddb +ExecReload=/usr/bin/radiusd -C ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 9aa8036d7..b216c0877 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90031 2013-05-06 19:37:10Z foutrelis $ +# $Id: PKGBUILD 91592 2013-05-25 02:56:17Z foutrelis $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -16,7 +16,7 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web') pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples') pkgver=3.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD index 9ad14990e..adeb1a88e 100644 --- a/community/geany-plugins/PKGBUILD +++ b/community/geany-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90241 2013-05-09 23:30:17Z arodseth $ +# $Id: PKGBUILD 91272 2013-05-20 19:14:00Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: djgera @@ -6,12 +6,12 @@ pkgname=geany-plugins pkgver=1.23 -pkgrel=2 +pkgrel=3 pkgdesc='Plugins for Geany' arch=('x86_64' 'i686' 'mips64el') url='http://plugins.geany.org/' license=('GPL') -depends=("geany=$pkgver" 'gtkspell' 'webkitgtk2' 'ctpl' 'gpgme' 'vte' +depends=("geany>=$pkgver" 'gtkspell' 'webkitgtk2' 'ctpl' 'gpgme' 'vte' 'desktop-file-utils' 'gtk-update-icon-cache' 'lua51') makedepends=('intltool' 'vala' 'gdb' 'cppcheck') optdepends=('hspell: hebrew spell checker') diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD index 516ee77b2..302f92ba2 100644 --- a/community/geany/PKGBUILD +++ b/community/geany/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86000 2013-03-10 22:54:45Z arodseth $ +# $Id: PKGBUILD 91268 2013-05-20 18:58:27Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.ro> @@ -6,7 +6,7 @@ # Contributor: Allan McRae <mcrae_allan@hotmail.com> pkgname=geany -pkgver=1.23 +pkgver=1.23.1 pkgrel=1 pkgdesc='Fast and lightweight IDE' arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,17 @@ optdepends=('vte: for terminal support' install="$pkgname.install" options=('!libtool') source=("http://download.geany.org/$pkgname-$pkgver.tar.bz2") -sha256sums=('cdd4a772694803c837ae59e56f7bdc2faba174509317211f522e7d25dfcbe8b0') +sha256sums=('8815b16e59d8679ec359a1a5754fee05e77f7bca53083c939654bfc77d978fad') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # Python2 fix + sed -i '0,/on/s//on2/' data/templates/files/main.py + + # Syntax highlighting for PKGBUILD files + sed -i 's/Sh=/Sh=PKGBUILD;/' data/filetype_extensions.conf +} build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,14 +38,8 @@ build() { ./configure --prefix=/usr make - # Python2 fix - sed -i '0,/on/s//on2/' data/templates/files/main.py - # Fix for FS#10318 setconf geany.desktop MimeType '' - - # Syntax highlighting for PKGBUILD files - sed -i 's/Sh=/Sh=PKGBUILD;/' data/filetype_extensions.conf } package() { diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index ab057abec..65595c3d0 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88687 2013-04-21 22:17:03Z heftig $ +# $Id: PKGBUILD 91737 2013-05-26 21:49:55Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Plugins for gedit" arch=('x86_64' 'i686' 'mips64el') @@ -19,7 +19,7 @@ optdepends=('gucharmap: for charmap plugin' options=('!libtool' '!emptydirs') install=gedit-plugins.install source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz") -sha256sums=('659d379f9edfbba2db37522991c734c5d50e03eb1f70985e978d93a718273141') +sha256sums=('ee6efad1222b0f74208b5280dbad84d16400f3fc39c227b12c8695999aa2b502') build() { cd $pkgname-$pkgver diff --git a/community/gemrb/PKGBUILD b/community/gemrb/PKGBUILD index 2361b6076..ecf2a1f56 100644 --- a/community/gemrb/PKGBUILD +++ b/community/gemrb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 90034 2013-05-06 19:37:17Z foutrelis $ +# $Id: PKGBUILD 91754 2013-05-27 08:10:59Z bpiotrowski $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=gemrb -pkgver=0.8.0 -pkgrel=2 +pkgver=0.8.0.1 +pkgrel=1 pkgdesc="OSS implementation of Bioware's Infinity Engine which supports eg. Baldur's Gate" arch=('i686' 'x86_64' 'mips64el') url="http://www.gemrb.org/" @@ -13,7 +13,7 @@ makedepends=('cmake') install=gemrb.install options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/gemrb/$pkgname-$pkgver.tar.gz") -md5sums=('dc0306d4d301726ac449225313285ea1') +md5sums=('fdb97cc031cf969938952ce2c79b25fc') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gen2shp/PKGBUILD b/community/gen2shp/PKGBUILD index d0379a3ef..e6796db56 100644 --- a/community/gen2shp/PKGBUILD +++ b/community/gen2shp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86465 2013-03-17 20:20:40Z cinelli $ +# $Id: PKGBUILD 91621 2013-05-25 12:05:10Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=gen2shp pkgver=0.3.1 -pkgrel=7 +pkgrel=8 pkgdesc='Converts ArcInfo generate format to shapefile format' arch=('i686' 'x86_64' 'mips64el') url='http://www.intevation.de/~jan/gen2shp/' diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD index 0e062188c..2fcca6751 100644 --- a/community/glusterfs/PKGBUILD +++ b/community/glusterfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90667 2013-05-13 14:24:32Z spupykin $ +# $Id: PKGBUILD 91880 2013-05-28 18:08:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributors: # Andrei Antoukh - niwi@niwi.be - http://www.niwi.be @@ -7,7 +7,7 @@ pkgname=glusterfs _basever=3.3 pkgver=$_basever.1 -pkgrel=2 +pkgrel=3 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.' arch=(i686 x86_64 mips64el) url='http://www.gluster.org/' @@ -18,12 +18,6 @@ options=(!libtool) source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz glusterd.service) sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' - 'f8c113d2a101c93f0e899ba498d0cb6308caf02da37552f12245a863bec39ab4' - 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') -sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' - 'f8c113d2a101c93f0e899ba498d0cb6308caf02da37552f12245a863bec39ab4' - 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') -sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') build() { @@ -31,6 +25,7 @@ build() { ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/share/man \ diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index 2793070d7..2342b1ded 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90038 2013-05-06 19:37:29Z foutrelis $ +# $Id: PKGBUILD 91613 2013-05-25 11:46:26Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> pkgname=gmerlin pkgver=1.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="Multimedia architecture for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://openmovieeditor.sourceforge.net/HomePage" diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 7578cb815..83d3d3ca6 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90814 2013-05-14 09:02:17Z arodseth $ +# $Id: PKGBUILD 91709 2013-05-26 13:26:56Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -8,11 +8,11 @@ # Contributor: Mike Rosset <mike.rosset@gmail.com> # Contributor: Daniel YC Lin <dlin.tw@gmail.com> -# TODO: Create split packages for the crosscompilation versions as well +# TODO: Create split packages for the crosscompilation versions as well? pkgname=go pkgver=1.1 -pkgrel=1 +pkgrel=2 epoch=2 pkgdesc='Google Go compiler and tools' arch=('x86_64' 'i686') @@ -23,6 +23,7 @@ makedepends=('inetutils') options=('!strip') install="$pkgname.install" backup=('usr/lib/go/bin') + if [ "$CARCH" == 'x86_64' ]; then source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz" "$pkgname.sh") @@ -93,7 +94,8 @@ package() { install -Dm644 misc/vim/$f $pkgdir/usr/share/vim/vimfiles/$f done - mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src,lib/go/site}} + mkdir -p \ + $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src,lib/go/site/src}} cp -r doc misc -t $pkgdir/usr/share/go ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD index 1ac198b22..f3d84a587 100644 --- a/community/golangide/PKGBUILD +++ b/community/golangide/PKGBUILD @@ -1,11 +1,11 @@ -#$Id: PKGBUILD 90755 2013-05-13 16:04:18Z arodseth $ +#$Id: PKGBUILD 91294 2013-05-20 20:42:41Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: spambanane <happy.house@gmx.de> # Contributor: Matteo <matteo.dek@gmail.com> pkgname=golangide pkgver=18.1 -pkgrel=2 +pkgrel=3 pkgdesc='IDE for editing and building projects written in the Go programming language (now LiteIDE X)' license=('LGPL') arch=('x86_64' 'i686') @@ -13,17 +13,17 @@ url='https://github.com/visualfc/liteide' depends=('go' 'libpng12' 'glib2' 'qt5-base' 'qt5-webkit') makedepends=('gendesk') options=('!strip') -source=("$pkgname.tgz::https://github.com/visualfc/liteide/archive/x$pkgver.zip" +source=("$pkgname.zip::https://github.com/visualfc/liteide/archive/x$pkgver.zip" 'golangide.png' 'golangide.sh') -sha256sums=('d3706ff01ebb501eec4d237f418121bbc4523dac793e6c2430f7b5ac3712ce53' +sha256sums=('60ab324bffb5ec4e7b1b3f9cae9729c7c6c499df3bb994861de65e473f2d64fe' '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' '93ef16d59054ef9b37f8781e90f7d0f83d726779d2029660dfd21e84d808bf04') prepare() { cd "$srcdir" - gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name 'Golang IDE' + gendesk -n --name 'Golang IDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc" cd "liteide-x$pkgver/build" chmod +x build_linux.sh } @@ -43,9 +43,10 @@ build() { package() { msg2 'Creating directories...' - mkdir -p "$pkgdir/usr/lib/liteide" - mkdir -p "$pkgdir/usr/share/liteide" - mkdir -p "$pkgdir/usr/share/doc/$pkgname" + mkdir -p \ + "$pkgdir/usr/lib/liteide" \ + "$pkgdir/usr/share/liteide" \ + "$pkgdir/usr/share/doc/$pkgname" cd "$srcdir/liteide-x$pkgver/build/liteide" @@ -58,8 +59,7 @@ package() { cd "$srcdir/liteide-x$pkgver/liteidex" msg2 'Packaging resources...' - cp -r deploy/* "$pkgdir/usr/share/liteide" - cp -r os_deploy/* "$pkgdir/usr/share/liteide" + cp -r deploy/* os_deploy/* "$pkgdir/usr/share/liteide" msg2 'Packaging libraries and plugins...' cp -r liteide/lib/liteide/* "$pkgdir/usr/lib/liteide" diff --git a/community/gputils/PKGBUILD b/community/gputils/PKGBUILD index 942b55e23..404255f32 100644 --- a/community/gputils/PKGBUILD +++ b/community/gputils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88505 2013-04-19 06:14:12Z cinelli $ +# $Id: PKGBUILD 91611 2013-05-25 11:39:42Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Johannes Martin <honzor@gmx.net> # Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com> @@ -6,7 +6,7 @@ pkgname=gputils pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="PIC Programming Utilities" arch=('i686' 'x86_64' 'mips64el') url="http://gputils.sourceforge.net/" diff --git a/community/i2c-tools/PKGBUILD b/community/i2c-tools/PKGBUILD index 58e4491d7..d74b2611f 100644 --- a/community/i2c-tools/PKGBUILD +++ b/community/i2c-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73640 2012-07-12 13:05:49Z tredaelli $ +# $Id: PKGBUILD 91137 2013-05-20 09:47:55Z jelle $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: DonVla <donvla@users.sourceforge.net> pkgname=i2c-tools pkgver=3.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="Heterogeneous set of I2C tools for Linux that used to be part of lm-sensors" arch=('i686' 'x86_64' 'mips64el') url="http://www.lm-sensors.org/wiki/I2CTools" @@ -25,7 +25,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make prefix="${pkgdir}/usr" install - install -Dm755 eepromer/eeprog eepromer/eeprom eepromer/eepromer "${pkgdir}/usr/sbin" + install -Dm755 eepromer/eeprog eepromer/eeprom eepromer/eepromer "${pkgdir}/usr/bin" cd py-smbus python2 setup.py install --prefix "${pkgdir}/usr" rm -rf "${pkgdir}/usr/include" diff --git a/community/igmpproxy/PKGBUILD b/community/igmpproxy/PKGBUILD index fc0ad0f6b..00e4855c3 100644 --- a/community/igmpproxy/PKGBUILD +++ b/community/igmpproxy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90675 2013-05-13 14:26:33Z spupykin $ +# $Id: PKGBUILD 91494 2013-05-23 10:13:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: sda <sda00@himki.net> pkgname=igmpproxy pkgver=0.1 -pkgrel=2 +pkgrel=3 pkgdesc="a simple multicast router for Linux only using the IGMP protocol" arch=(i686 x86_64 mips64el) url="http://sourceforge.net/projects/igmpproxy" @@ -15,11 +15,11 @@ backup=("etc/igmpproxy.conf") source=("http://downloads.sourceforge.net/sourceforge/igmpproxy/igmpproxy-$pkgver.tar.gz" "igmpproxy.service") md5sums=('c56f41ec195bc1fe016369bf74efc5a1' - '2ff8500f8a59cdfaf910e48cd54ab659') + '2a4387442ce00297d97371f729f8b21e') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make } diff --git a/community/igmpproxy/igmpproxy.service b/community/igmpproxy/igmpproxy.service index c10ec63b1..734d600ab 100644 --- a/community/igmpproxy/igmpproxy.service +++ b/community/igmpproxy/igmpproxy.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=simple -ExecStart=/usr/sbin/igmpproxy /etc/igmpproxy.conf +ExecStart=/usr/bin/igmpproxy /etc/igmpproxy.conf [Install] WantedBy=multi-user.target diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD index 12bf9aea2..ff5b70969 100644 --- a/community/incron/PKGBUILD +++ b/community/incron/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90677 2013-05-13 14:26:58Z spupykin $ +# $Id: PKGBUILD 91858 2013-05-28 17:27:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> # Contributor: scj <scj(at)archlinux(dot)us> pkgname=incron pkgver=0.5.10 -pkgrel=4 +pkgrel=5 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods" arch=('i686' 'x86_64' 'mips64el') url="http://incron.aiken.cz/" @@ -16,13 +16,18 @@ options=('emptydirs') source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz" 'incrond.service') md5sums=('67f8b671db8169edccc8ef11c7d2c8be' - '859a90af9e4efe40db381ea07167a66a') + '4be206ba6ecacd9d2006cdc72b4604db') -build() { +prepare() { cd "${srcdir}"/$pkgname-$pkgver sed -i '1,1i#include <unistd.h>' inotify-cxx.cpp icd-main.cpp sed -i '1,1i#include <stdio.h>' icd-main.cpp inotify-cxx.cpp usertable.cpp appargs.cpp sed -i 's|strchr(s,|(char*)strchr(s,|' incroncfg.cpp + sed -i 's|$(DESTDIR)$(PREFIX)/sbin/|$(DESTDIR)$(PREFIX)/bin/|g' Makefile +} + +build() { + cd "${srcdir}"/$pkgname-$pkgver make } diff --git a/community/incron/incron.install b/community/incron/incron.install index fa42d9cdc..9cb53bbe6 100644 --- a/community/incron/incron.install +++ b/community/incron/incron.install @@ -8,7 +8,6 @@ post_install () { pre_remove() { [ -h /var/service/incron ] && rm /var/service/incron - /etc/rc.d/incron stop - usr/sbin/userdel incron >& /dev/null - usr/sbin/groupdel incron >& /dev/null + userdel incron >& /dev/null + groupdel incron >& /dev/null } diff --git a/community/incron/incrond.service b/community/incron/incrond.service index 54fcfa9d2..d46814bf3 100644 --- a/community/incron/incrond.service +++ b/community/incron/incrond.service @@ -4,7 +4,7 @@ Description=Inotify System Scheduler [Service] Type=forking PIDFile=/run/incrond.pid -ExecStart=/usr/sbin/incrond +ExecStart=/usr/bin/incrond [Install] WantedBy=multi-user.target diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD index 63fa464a7..7ce438422 100644 --- a/community/inn/PKGBUILD +++ b/community/inn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90886 2013-05-15 08:03:42Z bpiotrowski $ +# $Id: PKGBUILD 91652 2013-05-26 09:24:36Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Edward Tjörnhammar <xhemi@cube2.se> # Contributor: Edward Tjörnhammar <xhemi@cube2.se> pkgname=inn pkgver=2.5.3 -pkgrel=5 +pkgrel=6 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." url="http://www.isc.org/software/inn/" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/inputattach/PKGBUILD b/community/inputattach/PKGBUILD index 1dac92516..1e66de54b 100644 --- a/community/inputattach/PKGBUILD +++ b/community/inputattach/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90759 2013-05-13 16:35:21Z spupykin $ +# $Id: PKGBUILD 91882 2013-05-28 18:09:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=inputattach pkgver=1.24 -pkgrel=9 +pkgrel=10 pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system" arch=('i686' 'x86_64' 'mips64el') url="http://linuxconsole.sourceforge.net/" @@ -23,7 +23,7 @@ md5sums=('eb595a766ca363edb3b14c25404596ce' '93d34d96cd3ad19ea1aeca7f68a66b4a' '7ca903e54829764c8241233af5069216' 'c19b9ed38b243191cf5378b87a42a4cc' - '84c6463660c10bd34c0390102da087d5' + '7dd0690a9d2fe5e1052900650906e273' 'f1b3ddae308351357f557cbd5c6cda81' '8f76908449cae24a95adbf0bc0a17721') @@ -43,7 +43,7 @@ build() { package() { cd "$srcdir/src" - install -Dm755 inputattach "$pkgdir/usr/sbin/inputattach" + install -Dm755 inputattach "$pkgdir/usr/bin/inputattach" install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach" install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service diff --git a/community/inputattach/inputattachctl b/community/inputattach/inputattachctl index 291c531ae..05dfa4af5 100755 --- a/community/inputattach/inputattachctl +++ b/community/inputattach/inputattachctl @@ -5,7 +5,7 @@ case "$1" in start) for i in "${IAPARAMS[@]}"; do - /usr/sbin/inputattach --daemon $i || exit 1 + /usr/bin/inputattach --daemon $i || exit 1 done ;; stop) diff --git a/community/ipguard/PKGBUILD b/community/ipguard/PKGBUILD index d7c799816..b9bc5b333 100644 --- a/community/ipguard/PKGBUILD +++ b/community/ipguard/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65572 2012-02-21 09:01:48Z spupykin $ +# $Id: PKGBUILD 91832 2013-05-28 17:04:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ipguard pkgver=1.04 -pkgrel=2 +pkgrel=3 pkgdesc="ipguard - arp<->ip relation checking tool" arch=(i686 x86_64 'mips64el') url="http://ipguard.deep.perm.ru/" @@ -15,14 +15,20 @@ source=(http://ipguard.deep.perm.ru/files/$pkgname-$pkgver.tar.gz md5sums=('7f44f7c31876f0d68792f02047e25409' 'b27cfc9e8ad4ef9459d7274a2e624831') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver - patch -Np1 <../build-fix-le.patch + sed -i 's|$(PREFIX)/sbin|$(PREFIX)/bin|g' Makefile +} +build() { + cd $srcdir/$pkgname-$pkgver CFLAGS="-DLIBNET_LIL_ENDIAN" make - make PREFIX=$pkgdir/usr install +} +package() { + cd $srcdir/$pkgname-$pkgver + make PREFIX=$pkgdir/usr install mkdir -p $pkgdir/usr/share mv $pkgdir/usr/man $pkgdir/usr/share/ } diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD index ba92882cb..e953aaebc 100644 --- a/community/ipsec-tools/PKGBUILD +++ b/community/ipsec-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90745 2013-05-13 14:45:21Z spupykin $ +# $Id: PKGBUILD 91860 2013-05-28 17:37:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Allan Henriksen <allan.henriksen@gmail.com> pkgname=ipsec-tools pkgver=0.8.1 -pkgrel=2 +pkgrel=4 pkgdesc="KAME IPSec tools ported to Linux" arch=('i686' 'x86_64' 'mips64el') url="http://ipsec-tools.sourceforge.net/" @@ -17,8 +17,8 @@ source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgve ipsec.service ipsec-tools-linux-3.7-compat.patch) md5sums=('d38b39f291ba2962387c3232e7335dd8' - '1632fce55ba5592dea1f8bf661106e7d' - '5bf7478590c751b465617681a31619fe' + '3a64a9e3b498c6da90450ffb0b758aea' + '387a0b0c4f10e42b2bb62282885cdc9c' 'ae1dd20c83dcfce3dedb46ee73e83613') build() { @@ -28,7 +28,7 @@ build() { sed -i 's#-Werror##' configure.ac ./bootstrap - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \ --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \ --enable-adminport --enable-gssapi \ --with-kernel-headers=/lib/modules/`pacman -Q linux-headers | cut -f2 -d\ `-ARCH/build/include diff --git a/community/ipsec-tools/ipsec.service b/community/ipsec-tools/ipsec.service index 3a6dea38b..483a5b58d 100644 --- a/community/ipsec-tools/ipsec.service +++ b/community/ipsec-tools/ipsec.service @@ -5,8 +5,8 @@ After=syslog.target network.target [Service] Type=oneshot RemainAfterExit=true -ExecStart=/usr/sbin/setkey -f /etc/ipsec.conf -ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F +ExecStart=/usr/bin/setkey -f /etc/ipsec.conf +ExecStop=/usr/bin/setkey -F -P ; /usr/bin/setkey -F [Install] WantedBy=multi-user.target diff --git a/community/ipsec-tools/racoon.service b/community/ipsec-tools/racoon.service index 792cfd395..95324bd5d 100644 --- a/community/ipsec-tools/racoon.service +++ b/community/ipsec-tools/racoon.service @@ -4,7 +4,7 @@ After=syslog.target network.target [Service] Type=forking -ExecStart=/usr/sbin/racoon +ExecStart=/usr/bin/racoon [Install] WantedBy=multi-user.target diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD index 7574d167c..7405e80dc 100644 --- a/community/kmess/PKGBUILD +++ b/community/kmess/PKGBUILD @@ -1,22 +1,29 @@ -# $Id: PKGBUILD 67104 2012-03-04 10:22:10Z andrea $ +# $Id: PKGBUILD 91296 2013-05-20 21:10:18Z foutrelis $ # Maintainer: # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com> pkgname=kmess pkgver=2.0.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="A MSN Messenger client for Linux" arch=('i686' 'x86_64' 'mips64el') url='http://kmess.sourceforge.net/' license=('GPL') depends=('kdebase-lib') -makedepends=('automoc4' 'cmake') +makedepends=('automoc4' 'cmake' 'optipng') optdepends=('cabextract: provides winks support') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2") md5sums=('a2e57911713308bef81b9347135cc5dd') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix invalid PNG images to work with libpng 1.6 + find -name '*.png' -exec optipng -quiet -force -fix {} + +} + build() { cd "${srcdir}" mkdir build diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index d5b2fd11f..5cfdaa45a 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85367 2013-03-01 10:34:38Z andrea $ +# $Id: PKGBUILD 91653 2013-05-26 09:24:37Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=kvirc pkgver=4.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="Qt-based IRC client" url="http://www.kvirc.net" depends=('python2' 'libxss' 'qtwebkit') diff --git a/community/leafnode/PKGBUILD b/community/leafnode/PKGBUILD index 6e2ce806d..58a1a1858 100644 --- a/community/leafnode/PKGBUILD +++ b/community/leafnode/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64337 2012-02-11 23:22:13Z allan $ +# $Id: PKGBUILD 91512 2013-05-23 11:13:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=leafnode pkgver=1.11.8 -pkgrel=5.1 +pkgrel=6 pkgdesc="implements a store & forward NNTP proxy (client and server) with IPv4 and IPv6" arch=('i686' 'x86_64' 'mips64el') url="http://leafnode.sourceforge.net/" @@ -15,11 +15,11 @@ backup=('etc/xinetd.d/leafnode') source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 leafnode.xinetd) md5sums=('a3edafeb854efaa3fbb0f7951d02160f' - 'db3c6ad1ff9fc03442949456d1d21304') + '08cd0a81d6efe0803b5d0747ab31903f') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode \ + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode --sbindir=/usr/bin \ --with-user=9 \ --with-group=13 sed -i 's|#define NEWS_USER .*|#define NEWS_USER "news"|' config.h diff --git a/community/leafnode/leafnode.install b/community/leafnode/leafnode.install index 5f8a74c04..8c5f10484 100644 --- a/community/leafnode/leafnode.install +++ b/community/leafnode/leafnode.install @@ -1,7 +1,7 @@ post_install() { echo "-- Adding user 'news' and group 'news', chowning /var/spool/news" - grep -e "^news:" /etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&- - grep -e "^news:" /etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&- + grep -e "^news:" etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&- + grep -e "^news:" etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&- chown -R root:news etc/leafnode # create dir if necessary if [ ! -d var/spool/news ]; then diff --git a/community/leafnode/leafnode.xinetd b/community/leafnode/leafnode.xinetd index 94c7c6ca7..98b5c24e0 100644 --- a/community/leafnode/leafnode.xinetd +++ b/community/leafnode/leafnode.xinetd @@ -7,7 +7,7 @@ service nntp socket_type = stream wait = no user = news - server = /usr/sbin/leafnode + server = /usr/bin/leafnode log_type = SYSLOG news log_on_success += USERID log_on_failure += USERID diff --git a/community/lib32-libtxc_dxtn/PKGBUILD b/community/lib32-libtxc_dxtn/PKGBUILD new file mode 100644 index 000000000..6306e1c7e --- /dev/null +++ b/community/lib32-libtxc_dxtn/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 91929 2013-05-29 16:41:31Z lcarlier $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> + +_pkgbasename=libtxc_dxtn +pkgname=lib32-$_pkgbasename +pkgver=1.0.1 +pkgrel=4 +arch=(x86_64) +pkgdesc="S3 Texture Compression (S3TC) library for Mesa (32-bit)" +url="http://dri.freedesktop.org/wiki/S3TC" +license=(custom:BSD) +depends=(lib32-mesa) +makedepends=(gcc-multilib) +options=(!libtool) +source=(http://people.freedesktop.org/~cbrill/$_pkgbasename/$_pkgbasename-$pkgver.tar.bz2) +md5sums=('7105107f07ac49753f4b61ba9d0c79c5') + +build() { + cd "$srcdir/$_pkgbasename-$pkgver" + + CC="gcc -m32" ./configure --prefix=/usr --libdir=/usr/lib32 + make +} + +package() { + cd "$srcdir/$_pkgbasename-$pkgver" + + make DESTDIR="$pkgdir" install + + rm -rf "$pkgdir/usr/include" + + # License + mkdir -p "$pkgdir/usr/share/licenses/$pkgname" + sed -n '5,22{s|^ \* \?||;p}' txc_dxtn.h \ + > "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/libcompizconfig/PKGBUILD b/community/libcompizconfig/PKGBUILD deleted file mode 100644 index be6488340..000000000 --- a/community/libcompizconfig/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 68306 2012-03-21 10:40:24Z pschmitz $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=libcompizconfig -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compiz configuration system library" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core' 'libxml2' 'libxcomposite' 'libxinerama' 'startup-notification' - 'libxml++') -makedepends=('intltool' 'pkgconfig') -conflicts=('libcompizconfig-git') -source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -options=('!emptydirs' '!libtool') -sha1sums=('8ea1f15fd9e1e2eb37a9814646659a31a8018fd8') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - CPPFLAGS="$CPPFLAGS -I/usr/include/compiz -I/usr/include/startup-notification-1.0 \ - -I/usr/include/libxml2" ./configure --prefix=/usr --sysconfdir=/etc - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD index 2ba06e4b6..2b2493659 100644 --- a/community/libdnet/PKGBUILD +++ b/community/libdnet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61173 2011-12-23 18:40:57Z spupykin $ +# $Id: PKGBUILD 91834 2013-05-28 17:04:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: James Fryman <jfryman@gmail.com> pkgname=libdnet pkgver=1.12 -pkgrel=6.1 +pkgrel=7 pkgdesc="A simplified, portable interface to several low-level networking routines" arch=(i686 x86_64 'mips64el') makedepends=(python2) @@ -19,7 +19,7 @@ build() { cd $srcdir/$pkgname-$pkgver sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.in autoreconf -I config --force --install - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/community/libee/PKGBUILD b/community/libee/PKGBUILD index 133b11128..a46834697 100644 --- a/community/libee/PKGBUILD +++ b/community/libee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80464 2012-11-22 10:27:21Z spupykin $ +# $Id: PKGBUILD 91836 2013-05-28 17:04:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Brian Knox <taotetek@gmail.com> pkgname=libee pkgver=0.4.1 -pkgrel=1.1 +pkgrel=2 pkgdesc="event expression library inspired by CEE" url="http://www.libee.org/" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ md5sums=('7bbf4160876c12db6193c06e2badedb2') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make -j1 } diff --git a/community/libtxc_dxtn/PKGBUILD b/community/libtxc_dxtn/PKGBUILD index 0419da5e8..375d6aa79 100644 --- a/community/libtxc_dxtn/PKGBUILD +++ b/community/libtxc_dxtn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81456 2012-12-21 10:04:07Z lcarlier $ +# $Id: PKGBUILD 91927 2013-05-29 16:38:35Z lcarlier $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=libtxc_dxtn pkgver=1.0.1 -pkgrel=3 +pkgrel=4 arch=(i686 x86_64 mips64el) -pkgdesc="Texture compression library for Mesa" +pkgdesc="S3 Texture Compression (S3TC) library for Mesa" url="http://dri.freedesktop.org/wiki/S3TC" license=(custom:BSD) depends=(mesa) diff --git a/community/libuser/PKGBUILD b/community/libuser/PKGBUILD index ff1143354..03f8fe40b 100644 --- a/community/libuser/PKGBUILD +++ b/community/libuser/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88522 2013-04-19 10:31:27Z spupykin $ +# $Id: PKGBUILD 91838 2013-05-28 17:05:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Dziedzic < gostrc at gmail > pkgname=libuser pkgver=0.59 -pkgrel=1 +pkgrel=2 pkgdesc='A standardized interface for manipulating and administering user and group accounts.' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -21,6 +21,7 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --disable-gtk-doc-html \ --disable-rpath sed -i 's/SUBDIRS = po docs/SUBDIRS = po/' Makefile diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 17794f665..93d023134 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90887 2013-05-15 08:03:43Z bpiotrowski $ +# $Id: PKGBUILD 91813 2013-05-28 11:39:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=1.0.5 -pkgrel=4 +pkgrel=5 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -55,15 +55,11 @@ build() { --with-storage-lvm --without-xen --with-udev --without-hal --disable-static \ --with-init-script=systemd --with-audit \ --with-qemu-user=nobody --with-qemu-group=nobody \ - --without-netcf --with-interface + --without-netcf --with-interface \ + --with-dnsmasq-path=/usr/bin/dnsmasq make - sed -i 's|/etc/sysconfig/libvirtd|/etc/conf.d/libvirtd|' daemon/libvirtd.service - sed -i \ - -e 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' \ - -e 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' \ - -e 's|After=.*|After=syslog.target network.target libvirtd.service|' \ - tools/libvirt-guests.service + sed -i 's|/etc/sysconfig/|/etc/conf.d/|' daemon/libvirtd.service tools/libvirt-guests.service sed -i 's|@sbindir@|/usr/sbin|g' src/virtlockd.service sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf } diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD index f47d44565..d4e752e51 100755 --- a/community/lightdm-gtk2-greeter/PKGBUILD +++ b/community/lightdm-gtk2-greeter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90810 2013-05-14 08:06:07Z alucryd $ +# $Id: PKGBUILD 91482 2013-05-23 08:41:25Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk2-greeter pkgver=1.5.2 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="GTK+ greeter for LightDM" arch=('i686' 'x86_64') @@ -13,6 +13,7 @@ license=('GPL3' 'LGPL3') depends=('gtk2' 'lightdm') makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool') provides=("${pkgname/2/}") +conflicts=("${pkgname/2/3}") backup=('etc/lightdm/lightdm-gtk-greeter.conf') source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz") sha256sums=('0de611783a9306130b0f0865c533fcaf2d21fcda9f85e7ee81b58cfa5bd781cc') diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD index ba226848f..deab1db66 100755 --- a/community/lightdm-gtk3-greeter/PKGBUILD +++ b/community/lightdm-gtk3-greeter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90802 2013-05-14 07:23:18Z alucryd $ +# $Id: PKGBUILD 91480 2013-05-23 08:39:59Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk3-greeter pkgver=1.5.2 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="GTK+ greeter for LightDM" arch=('i686' 'x86_64' 'mips64el') @@ -13,6 +13,7 @@ license=('GPL3' 'LGPL3') depends=('gtk3' 'lightdm') makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool') provides=("${pkgname/3/}") +conflicts=("${pkgname/3/2}") backup=('etc/lightdm/lightdm-gtk-greeter.conf') source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz") sha256sums=('0de611783a9306130b0f0865c533fcaf2d21fcda9f85e7ee81b58cfa5bd781cc') diff --git a/community/lshw/PKGBUILD b/community/lshw/PKGBUILD index 1d511ce1b..fd8973a58 100644 --- a/community/lshw/PKGBUILD +++ b/community/lshw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87848 2013-04-08 09:23:17Z spupykin $ +# $Id: PKGBUILD 91516 2013-05-23 11:14:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com> # Contributor: Chuck Yang <Chuck.Yang@gmail.com> pkgname=lshw pkgver=B.02.16 -pkgrel=4 +pkgrel=5 pkgdesc="A small tool to provide detailed information on the hardware configuration of the machine." url="http://ezix.org/project/wiki/HardwareLiSter" license=('GPL') @@ -19,14 +19,14 @@ md5sums=('67479167add605e8f001097c30e96d0d') build() { cd $srcdir/$pkgname-$pkgver sed -i 's|/usr/bin/gtk-lshw|/usr/sbin/gtk-lshw|' src/gui/integration/gtk-lshw.desktop - make - make gui + make SBINDIR=/usr/bin + make SBINDIR=/usr/bin gui } package() { cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir/ install - make DESTDIR=$pkgdir/ install-gui + make DESTDIR=$pkgdir/ SBINDIR=/usr/bin install + make DESTDIR=$pkgdir/ SBINDIR=/usr/bin install-gui install -Dm0644 src/gui/integration/gtk-lshw.desktop $pkgdir/usr/share/applications/gtk-lshw.desktop install -Dm0644 src/gui/integration/gtk-lshw.pam $pkgdir/usr/share/doc/$pkgname/gtk-lshw.pam install -Dm0644 src/gui/integration/console.apps $pkgdir/usr/share/doc/$pkgname/console.apps diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index da8dd8dc9..e79668599 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90434 2013-05-12 10:57:52Z dwallace $ +# $Id: PKGBUILD 91463 2013-05-23 00:34:07Z dwallace $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=21 +pkgrel=22 pkgdesc='Lightweight X11 Display Manager' arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/lxdm/" @@ -13,6 +13,7 @@ license=('GPL') groups=('lxde') depends=('gtk2' 'xorg-server') makedepends=('intltool') +optdepends=('librsvg: display the default background') install=${pkgname}.install backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' 'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin' @@ -25,13 +26,27 @@ source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz lxdm-0.4.1-industrial-greeter-ui.patch lxdm-0.4.1-modern-systems.patch lxdm-0.4.1-nolang-show-sessions.patch - lxdm-0.4.1-pam-env-vars.patch) + lxdm-0.4.1-pam-env-vars.patch + lxdm-0.4.1-kill_user_processes.patch + ) +md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' + '9cc734228696a3c6f06d91bba61b03c1' + 'b86317143ae44d7ed38c150fe4f25502' + 'd2e4a4a22ee2aa1a986be154c647b6c6' + 'c50dd01b715b0a236407d48066191601' + 'a1e3c46a8bef691bc544028f5b6cfe22' + '2c4afdbe3532be4f90d8f6240d352766' + 'baed9055e8825a5511712bc095197519' + '28475239d0c8b4fd778ec49f5ec72962' + '4c1d43e81e9a256e8d1ea7686c24b3d3' + '3ac63085f9df9296dfa645fa623af0e2') prepare(){ cd $srcdir/$pkgname-$pkgver patch -Np1 -i $srcdir/lxdm-0.4.1-event-check-bug.patch patch -Np1 -i $srcdir/lxdm-0.4.1-nolang-show-sessions.patch patch -Np1 -i $srcdir/lxdm-0.4.1-pam-env-vars.patch + patch -Np1 -i $srcdir/lxdm-0.4.1-kill_user_processes.patch } build() { @@ -65,14 +80,3 @@ package() { # avoid conflict with filesystem>=2012.06 rm -r $pkgdir/var/run } - -md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' - '9cc734228696a3c6f06d91bba61b03c1' - 'b86317143ae44d7ed38c150fe4f25502' - 'd2e4a4a22ee2aa1a986be154c647b6c6' - 'c50dd01b715b0a236407d48066191601' - 'a1e3c46a8bef691bc544028f5b6cfe22' - '2c4afdbe3532be4f90d8f6240d352766' - 'baed9055e8825a5511712bc095197519' - '28475239d0c8b4fd778ec49f5ec72962' - '4c1d43e81e9a256e8d1ea7686c24b3d3') diff --git a/community/lxdm/lxdm-0.4.1-kill_user_processes.patch b/community/lxdm/lxdm-0.4.1-kill_user_processes.patch new file mode 100644 index 000000000..f267b105a --- /dev/null +++ b/community/lxdm/lxdm-0.4.1-kill_user_processes.patch @@ -0,0 +1,35 @@ +diff -aur lxdm/src/xconn.c lxdm.modified/src/xconn.c +--- lxdm/src/xconn.c 2012-12-23 19:27:04.512531088 -0800 ++++ lxdm/src/xconn.c 2012-12-23 19:28:31.659227448 -0800 +@@ -172,7 +172,7 @@ + free(c); + } + +-#if 0 ++//#if 0 + static xcb_window_t xconn_get_root(xconn_t c) + { + const xcb_setup_t *setup; +@@ -181,11 +181,11 @@ + xcb_screen_t *screen = iter.data; + return screen->root; + } +-#endif ++//#endif + + void xconn_clean(xconn_t c) + { +-#if 0 ++//#if 0 + xcb_query_tree_cookie_t wintree; + xcb_query_tree_reply_t *rep; + xcb_window_t *children; +@@ -202,7 +202,7 @@ + xcb_kill_client(c->c,children[i]); + free(rep); + xcb_flush(c->c); +-#endif ++//#endif + } + + #endif diff --git a/community/lxdm/lxdm.install b/community/lxdm/lxdm.install index 4d1285dc5..875dc59e3 100644 --- a/community/lxdm/lxdm.install +++ b/community/lxdm/lxdm.install @@ -1,18 +1,21 @@ post_install() { - if ! getent group lxdm > /dev/null ; then - groupadd --system lxdm - chgrp -R lxdm /var/lib/lxdm - chgrp lxdm /etc/lxdm/lxdm.conf - chmod +r /etc/lxdm/lxdm.conf - fi + getent group lxdm >/dev/null && groupmod -g 121 lxdm || groupadd -g 121 lxdm + getent passwd lxdm >/dev/null && usermod -u 121 -g 121 lxdm || useradd -r -d /var/lib/lxdm -u 121 -g 121 lxdm + chown -R 121:121 /var/lib/lxdm + chgrp 121 /etc/lxdm/lxdm.conf + chmod +r /etc/lxdm/lxdm.conf } post_upgrade() { - post_install $1 + post_install $1 + if [[ $(vercmp $2 0.4.1-22) < 0 ]]; then + groupmod -g 121 lxdm + usermod -g 121 -u 121 lxdm + fi } post_remove() { - if ! getent group lxdm > /dev/null ; then - groupdel lxdm - fi + userdel -f lxdm + groupdel lxdm + true } diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD index 30889c09c..ef87348b4 100644 --- a/community/mailutils/PKGBUILD +++ b/community/mailutils/PKGBUILD @@ -1,38 +1,34 @@ -# $Id: PKGBUILD 59712 2011-11-29 13:35:07Z stephane $ +# $Id: PKGBUILD 91917 2013-05-29 10:59:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=mailutils pkgver=2.2 -pkgrel=4 +pkgrel=5 pkgdesc="MUA command line tool (mailx)" arch=(i686 x86_64 'mips64el') url="http://www.gnu.org/software/mailutils/" license=('GPL') depends=('libldap' 'pam' 'gnutls' 'guile') -makedepends=('python2' 'emacs') -optdepends=('python2') +makedepends=('emacs') conflicts=('libsieve') install=mailutils.install options=(zipman !emptydirs) -source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2) -md5sums=('834d2f616b922856127ecfe6c2de7d1a') +source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2 + build-fix.patch) +md5sums=('834d2f616b922856127ecfe6c2de7d1a' + 'e83709ffdcdb257dfab443ef77c89574') -build() { +prepare() { cd "$srcdir/mailutils-$pkgver" + patch -p1 <$srcdir/build-fix.patch +} - py2=`pacman -Q python2 | cut -d\ -f2 | cut -d. -f1-2` - py3=`pacman -Q python | cut -d\ -f2 | cut -d. -f1-2` - - export PYTHON=/usr/bin/python2 - export PYTHON_CONFIG=/usr/bin/python2-config - export CFLAGS="$CFLAGS `pkg-config --cflags python-$py2`" - export LDFLAGS="$LDFLAGS `pkg-config --libs python-$py2`" - +build() { + cd "$srcdir/mailutils-$pkgver" [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \ --libexecdir=/usr/lib/$pkgname --without-fribidi \ - --without-tcp-wrappers -# [ -z "$py3" ] || find -type f -name Makefile -exec sed -i "s|python$py3|python$py2|" {} \; + --without-tcp-wrappers --sbindir=/usr/bin make -j1 } diff --git a/community/mailutils/build-fix.patch b/community/mailutils/build-fix.patch new file mode 100644 index 000000000..ec4afd5e3 --- /dev/null +++ b/community/mailutils/build-fix.patch @@ -0,0 +1,13 @@ +diff -wbBur mailutils-2.2/lib/Makefile.in mailutils-2.2.q/lib/Makefile.in +--- mailutils-2.2/lib/Makefile.in 2010-09-08 13:58:58.000000000 +0400 ++++ mailutils-2.2.q/lib/Makefile.in 2013-05-29 14:51:14.064888989 +0400 +@@ -1861,7 +1861,8 @@ + -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ ++ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ ++ -e 's|_GL_WARN_ON_USE (gets.*||'; \ + } > $@-t && \ + mv $@-t $@ + diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD index 8658fd99a..3c6576657 100644 --- a/community/mcelog/PKGBUILD +++ b/community/mcelog/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90683 2013-05-13 14:28:13Z spupykin $ +# $Id: PKGBUILD 91518 2013-05-23 11:14:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Thomas Mudrunka <harvie@@email..cz> # Maintainer: Thomas Mudrunka <harvie@@email..cz> pkgname=mcelog -pkgver=20130411 -pkgrel=2 +pkgver=20130523 +pkgrel=1 pkgdesc="Print machine check event log from x86-64 kernel" url="http://freshmeat.net/projects/mcelog/" license=("GPL") @@ -16,7 +16,12 @@ backup=('etc/mcelog/mcelog.conf') source=("git://github.com/andikleen/mcelog.git" "mcelog.service") md5sums=('SKIP' - 'b71eb82e532aed3918ebf6b30e158e7f') + 'afd7fc2b7a2f92a75e040b23d6b15958') + +prepare() { + cd "${srcdir}/mcelog" + sed -i 's|sbin|bin|g' Makefile mcelog.cron +} build() { cd "${srcdir}/mcelog" diff --git a/community/mcelog/mcelog.service b/community/mcelog/mcelog.service index 35c18bc6f..9d6c84f40 100644 --- a/community/mcelog/mcelog.service +++ b/community/mcelog/mcelog.service @@ -4,7 +4,7 @@ After=syslog.target [Service] PIDFile=/run/mcelog.pid -ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground --pidfile /run/mcelog.pid +ExecStart=/usr/bin/mcelog --ignorenodev --daemon --foreground --pidfile /run/mcelog.pid StandardOutput=syslog [Install] diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index becf5f95f..2643d6ed4 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90574 2013-05-13 09:53:22Z spupykin $ +# $Id: PKGBUILD 91520 2013-05-23 11:15:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -7,7 +7,7 @@ pkgname=minidlna pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/minidlna/" @@ -21,12 +21,12 @@ source=(http://downloads.sourceforge.net/project/minidlna/minidlna/$pkgver/minid minidlna.service minidlna.tmpfiles) md5sums=('26484a84af3fceafdee26595aae097f7' - '10ef548e6b2ad15b17b5090e6e074db8' + '7e3890ee50aa4dfa4d1754261e6cc965' '26de27b12d6a37c47d9714107d07aac9') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/community/minidlna/minidlna.service b/community/minidlna/minidlna.service index a2a20720e..bc79e96ef 100644 --- a/community/minidlna/minidlna.service +++ b/community/minidlna/minidlna.service @@ -5,8 +5,8 @@ After=network.target [Service] Type=forking User=nobody -ExecStart=/usr/sbin/minidlnad -P /run/minidlna/minidlna.pid -PIDFile=/var/run/minidlna/minidlna.pid +ExecStart=/usr/bin/minidlnad -P /run/minidlna/minidlna.pid +PIDFile=/run/minidlna/minidlna.pid [Install] WantedBy=multi-user.target diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD index 91105df4a..acf9f36d5 100644 --- a/community/miredo/PKGBUILD +++ b/community/miredo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90687 2013-05-13 14:29:09Z spupykin $ +# $Id: PKGBUILD 91522 2013-05-23 11:15:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=miredo pkgver=1.2.5 -pkgrel=4 +pkgrel=5 pkgdesc="Teredo client and server." arch=('i686' 'x86_64' 'mips64el') url="http://www.remlab.net/miredo/" @@ -17,7 +17,7 @@ source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz miredo.service) md5sums=('5114debbf9fcab5d292176e4548f8cd1' 'd1b655d7a851cdb46c91c3418ed1962f' - 'abd7d8831cab7f3ea6d0d4e51b8f8f6a') + 'fd6d5b355b2356426eeefd6047f6bb7c') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,6 +27,7 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib \ + --sbindir=/usr/bin \ --with-Judy make } diff --git a/community/miredo/miredo.service b/community/miredo/miredo.service index d28803efd..e824f99e1 100644 --- a/community/miredo/miredo.service +++ b/community/miredo/miredo.service @@ -3,7 +3,7 @@ Description=Teredo IPv6 Tunneling Daemon After=network.target [Service] -ExecStart=/usr/sbin/miredo -f +ExecStart=/usr/bin/miredo -f ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index b2b1fc493..8d71d1522 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90969 2013-05-16 21:05:16Z bgyorgy $ +# $Id: PKGBUILD 91466 2013-05-23 00:58:44Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Adam Hani Schakaki <adam@schakaki.net> # Contributor: Ner0 pkgname=muffin -pkgver=1.8.1 -pkgrel=2 +pkgver=1.8.2 +pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/linuxmint/muffin" @@ -16,11 +16,9 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!libtool' '!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz" - "switch-applications.patch" - "fix-dnd.patch") -sha256sums=('6907d2b2fb78c7b710c4454ef321d40cffe5ab1273df14facbbd5cda691ccb34' - '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96' - '4d8f5ed1bec02160d252a956ffd441ab3c119db29f690f86568dbd34474d1a90') + "switch-applications.patch") +sha256sums=('903c6ab5e228c8a1b8e05f460ba34c111e8a92ce9382ebd0b014416af4dd7049' + '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96') build() { cd ${pkgname}-${pkgver} @@ -28,8 +26,6 @@ build() { # Fix windows switcher keybinding with default settings in GNOME 3.8 patch -Np1 -i ../switch-applications.patch - # Fix unresponsive panel on DND - patch -Np1 -i ../fix-dnd.patch PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ --localstatedir=/var --disable-static --disable-schemas-compile diff --git a/community/muffin/fix-dnd.patch b/community/muffin/fix-dnd.patch deleted file mode 100644 index 268ea296e..000000000 --- a/community/muffin/fix-dnd.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 9f3216b081104c92c4ce5ce3ca2cc48f14bad85a Mon Sep 17 00:00:00 2001 -From: Albert Pool <albertpool@solcon.nl> -Date: Mon, 13 May 2013 12:04:17 +0200 -Subject: [PATCH 1/2] Remove NOTIFICATION from top window group - ---- - src/compositor/meta-window-actor.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c -index de8d292..7b0f83c 100644 ---- a/src/compositor/meta-window-actor.c -+++ b/src/compositor/meta-window-actor.c -@@ -1514,7 +1514,6 @@ const char *meta_window_actor_get_description (MetaWindowActor *self) - if (window->type == META_WINDOW_DROPDOWN_MENU || - window->type == META_WINDOW_POPUP_MENU || - window->type == META_WINDOW_COMBO || -- window->type == META_WINDOW_NOTIFICATION || - window->type == META_WINDOW_OVERRIDE_OTHER){ - clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group), - CLUTTER_ACTOR (self)); --- -1.8.1.6 - - -From bbbde724320036f894779c2402fc6eba969428d2 Mon Sep 17 00:00:00 2001 -From: Albert Pool <albertpool@solcon.nl> -Date: Mon, 13 May 2013 12:09:58 +0200 -Subject: [PATCH 2/2] Remove OVERRIDE_OTHER from top window group - ---- - src/compositor/meta-window-actor.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c -index 7b0f83c..fb77f1d 100644 ---- a/src/compositor/meta-window-actor.c -+++ b/src/compositor/meta-window-actor.c -@@ -1513,8 +1513,7 @@ const char *meta_window_actor_get_description (MetaWindowActor *self) - - if (window->type == META_WINDOW_DROPDOWN_MENU || - window->type == META_WINDOW_POPUP_MENU || -- window->type == META_WINDOW_COMBO || -- window->type == META_WINDOW_OVERRIDE_OTHER){ -+ window->type == META_WINDOW_COMBO) { - clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group), - CLUTTER_ACTOR (self)); - } --- -1.8.1.6 - diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index f839ec21d..479914db7 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90132 2013-05-06 22:22:04Z faidoc $ +# $Id: PKGBUILD 91469 2013-05-23 00:59:51Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Ner0 pkgname=nemo -pkgver=1.8.0 +pkgver=1.8.2 pkgrel=1 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" "tracker-0.16.patch" "remove-desktop-background.patch") -sha256sums=('4812381bd2e926fa3cd4efcddc79585bab3ff1c226d1db69e7ce3802c783d18a' +sha256sums=('93ab8b21938de249e60cf278b6e2abf65720fdb2ae0c3a8c7301ca6983f5ca59' '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626' '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5') diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 5aa868fb1..cc5114965 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91055 2013-05-18 15:35:13Z bpiotrowski $ +# $Id: PKGBUILD 91630 2013-05-25 17:27:12Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.10.7 +pkgver=0.10.8 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('22d1d211f5260dfa5b842cebdb04633f28df180843105ff3eb792ca35ed425e0') +sha256sums=('edf6f766c8ccc7ef5b02a50c94567343eb1ffae479db93684ba89976e3f18354') prepare() { cd node-v$pkgver diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD index e6e18a19c..b8d257e9d 100644 --- a/community/nsd/PKGBUILD +++ b/community/nsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83750 2013-02-04 22:23:27Z bisson $ +# $Id: PKGBUILD 91246 2013-05-20 14:50:30Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=nsd pkgver=3.2.15 -pkgrel=1 +pkgrel=2 pkgdesc='Authoritative only, high performance and simple DNS server' url='http://www.nlnetlabs.nl/nsd/' license=('BSD') @@ -15,32 +15,25 @@ arch=('i686' 'x86_64' 'mips64el') source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'service') sha1sums=('e31a81ab7877422b34e1f163f9509cd93f395664' - '1cfa2d7254139be50f11753d4e07281ed2af36eb') + 'f35ecb887e86ae0a54ac70aef5a7577fc8761877') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ --prefix=/ \ - --exec-prefix=/usr \ + --sbindir=/usr/bin \ --datarootdir=/usr/share \ --with-pidfile=/run/nsd.pid \ - --enable-ratelimit \ - + --enable-ratelimit make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}"/etc/rc.d - ln -s ../../usr/sbin/nsdc "${pkgdir}"/etc/rc.d/nsd install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/nsd.service - rm doc/differences.pdf install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" install -m644 doc/* "${pkgdir}"/usr/share/doc/"${pkgname}" diff --git a/community/nsd/service b/community/nsd/service index 28bb1c5b7..ca423c29c 100644 --- a/community/nsd/service +++ b/community/nsd/service @@ -5,9 +5,9 @@ After=network.target [Service] Type=forking PIDFile=/run/nsd.pid -ExecStart=/usr/sbin/nsdc start -ExecReload=/usr/sbin/nsdc reload -ExecStop=/usr/sbin/nsdc stop +ExecStart=/usr/bin/nsdc start +ExecReload=/usr/bin/nsdc reload +ExecStop=/usr/bin/nsdc stop [Install] WantedBy=multi-user.target diff --git a/community/nss-pam-ldapd/PKGBUILD b/community/nss-pam-ldapd/PKGBUILD index 19cacfa2f..bc3ddd0ea 100644 --- a/community/nss-pam-ldapd/PKGBUILD +++ b/community/nss-pam-ldapd/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> pkgname=nss-pam-ldapd -pkgver=0.8.12 -pkgrel=3 +pkgver=0.8.13 +pkgrel=1 pkgdesc='LDAP module for NSS and PAM' arch=('i686' 'x86_64' 'mips64el') url="http://arthurdejong.org/$pkgname/" @@ -16,7 +16,7 @@ install=nss-pam-ldapd.install backup=('etc/nslcd.conf') source=("http://arthurdejong.org/$pkgname/$pkgname-$pkgver.tar.gz" "nslcd.service") -sha1sums=('9c320172df0cdd4eca6cd97ad4c2438e6552ffe0' +sha1sums=('0567cfea104defabeacd88a3a3200b311b8071ec' '40afa421f05c2128a5219504fea45b2e76830973') build() { diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index 6afba6f7c..d88c3a5f1 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90693 2013-05-13 14:31:00Z spupykin $ +# $Id: PKGBUILD 91498 2013-05-23 10:14:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim pkgver=2.8.3 -pkgrel=2 +pkgrel=3 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) url="http://www.opendkim.org/" @@ -19,11 +19,11 @@ source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.g opendkim.service) md5sums=('0ae9d37e3221a244eb34c3e0e2d665cc' '3e2bb1058ac0662f01e675aa6ac7ee8f' - 'bc1b73856bc1941faaa4842e00437cb5') + '85010750a21954e2d3cf5d57fe210d3f') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --with-db + ./configure --prefix=/usr --sbindir=/usr/bin --with-db make } diff --git a/community/opendkim/opendkim.service b/community/opendkim/opendkim.service index d34c62960..7d2eb79aa 100644 --- a/community/opendkim/opendkim.service +++ b/community/opendkim/opendkim.service @@ -5,7 +5,7 @@ After=network.target remote-fs.target nss-lookup.target [Service] Type=forking EnvironmentFile=/etc/conf.d/opendkim -ExecStart=/usr/sbin/opendkim $OPENDKIM_FILTER +ExecStart=/usr/bin/opendkim $OPENDKIM_FILTER [Install] WantedBy=multi-user.target diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD index 0f701c4a7..cd0412116 100644 --- a/community/openntpd/PKGBUILD +++ b/community/openntpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80248 2012-11-18 11:40:59Z jelle $ +# $Id: PKGBUILD 91455 2013-05-22 23:28:35Z seblu $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Mark Rosenstand <mark@borkware.net> # Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch) @@ -6,32 +6,35 @@ pkgname=openntpd pkgver=3.9p1 -pkgrel=21 -pkgdesc="Free, easy to use implementation of the Network Time Protocol." -url="http://www.openntpd.org/" +pkgrel=22 +pkgdesc='Free, easy to use implementation of the Network Time Protocol.' +url='http://www.openntpd.org/' arch=('x86_64' 'i686' 'mips64el') license=('BSD') depends=('openssl') conflicts=('ntp') -backup=('etc/ntpd.conf' 'etc/conf.d/openntpd') +backup=('etc/ntpd.conf') install=$pkgname.install -source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz - 'openntpd' 'openntpd.conf' 'linux-adjtimex.patch' 'openntpd.tmpfiles' 'openntpd.service') +source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz" + 'linux-adjtimex.patch' + 'openntpd.tmpfiles' + 'openntpd.service') sha256sums=('83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49' - 'b486b7034b8d3d790b6bc1793dd8a44c68b82c8dc833b617c60674b0a7c9d98f' - '77a0d1f3439d779c2ce259becf3fa583c21a16682a4f5327094da2e9837f6f96' '3abcec94c072b5913ef7156a22049d796ff04e19105befe1ea81a66522928fd2' 'fe12841110c3c080519e248988c4b6334f54bd9646b015753c7e15de2a9600c5' - '7ad4d3ce4af3a6ff47ba2e5428092139666ad821101dafe1599b209d53f6943f') + '3239fc6f69d661cd9233233da9e68bebdf7b12888febbc2f2d794742db2d8ed1') -build() { - cd "$srcdir/$pkgname-$pkgver" +prepare() { + patch -Np1 -d $pkgname-$pkgver < linux-adjtimex.patch +} - patch -Np1 -i ../linux-adjtimex.patch +build() { + cd $pkgname-$pkgver autoreconf -fi ./configure \ --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --with-privsep-user=ntp \ --with-privsep-path=/run/openntpd/ \ --with-adjtimex @@ -42,8 +45,6 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname" - install -Dm644 "$srcdir/$pkgname.conf" "$pkgdir/etc/conf.d/$pkgname" install -Dm644 "$srcdir/$pkgname-$pkgver/LICENCE" \ "$pkgdir/usr/share/licenses/$pkgname/LICENCE" sed -i 's/\*/0.0.0.0/' $pkgdir/etc/ntpd.conf diff --git a/community/openntpd/openntpd b/community/openntpd/openntpd deleted file mode 100644 index 59fa8107d..000000000 --- a/community/openntpd/openntpd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -CONF=/etc/conf.d/openntpd - -. /etc/rc.conf -. /etc/rc.d/functions -[[ -f $CONF ]] && . "$CONF" - -PID=$(pidof -o %PPID /usr/sbin/ntpd) -case $1 in - start) - stat_busy "Starting OpenNTPD" - [[ -d /run/openntpd ]] || mkdir /run/openntpd - if [[ $PID ]] || ! /usr/sbin/ntpd $PARAMS; then - stat_fail - else - pidof -o %PPID /usr/sbin/ntpd >/run/openntpd.pid - add_daemon openntpd - stat_done - fi - ;; - stop) - stat_busy "Stopping OpenNTPD" - if [[ -z $PID ]] || ! kill $PID &>/dev/null; then - stat_fail - else - rm_daemon openntpd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/openntpd/openntpd.conf b/community/openntpd/openntpd.conf deleted file mode 100644 index a2af277f7..000000000 --- a/community/openntpd/openntpd.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -s Set the time immediately at startup if the local clock is off by more than# 180 seconds. -PARAMS="-s" - - diff --git a/community/openntpd/openntpd.service b/community/openntpd/openntpd.service index e419204d4..ebaf10540 100644 --- a/community/openntpd/openntpd.service +++ b/community/openntpd/openntpd.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/ntpd -s +ExecStart=/usr/bin/ntpd -s [Install] WantedBy=multi-user.target diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index f1e968e93..1fc2bfdd9 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90577 2013-05-13 09:54:15Z spupykin $ +# $Id: PKGBUILD 91536 2013-05-23 11:21:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=opensips pkgver=1.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..." url="http://www.opensips.org" depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2') @@ -26,10 +26,9 @@ options=('!emptydirs' 'zipman' '!makeflags' 'docs') source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz opensips.service) md5sums=('0b7b93f4df29a96daedf12e490e7ec86' - '7b786d758fe3174af34e2ced44b549e7') + '35cdcb3692f6925236fd5fe7e9484c58') -build() -{ +prepare() { cd $srcdir/$pkgname-$pkgver-tls/ # python2 fix @@ -38,6 +37,13 @@ build() sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done + sed -i 's|sbin|bin|g' Makefile + sed -i 's|bin-dir = sbin/|bin-dir = bin/|' Makefile.defs +} + +build() { + cd $srcdir/$pkgname-$pkgver-tls/ + make \ include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \ TLS=1 LIBDIR=lib @@ -62,7 +68,7 @@ package() { cd $pkgdir/usr/lib/opensips/opensipsctl find -type f -exec sed -i "s#$pkgdir##" {} \; - cd $pkgdir/usr/sbin + cd $pkgdir/usr/bin sed -i "s#$pkgdir##" opensipsctl opensipsdbctl osipsconsole cd $pkgdir/etc diff --git a/community/opensips/opensips.init b/community/opensips/opensips.init deleted file mode 100644 index 1c883c4c2..000000000 --- a/community/opensips/opensips.init +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -BINNAME=opensips -OSRDIR=/usr/sbin -OPENSIPS=$OSRDIR/$BINNAME - -TMPDIR=/var/tmp -CORE=$TMPDIR/core - -ETC=/etc/opensips/opensips.cfg -PIDFILE=/var/run/opensips.pid - -case "$1" in - start) - stat_busy "Starting OpenSIPS server" - cd $TMPDIR - $OPENSIPS -f $ETC -w $TMPDIR -P $PIDFILE 2>&1 > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon opensips - stat_done - fi - ;; - stop) - stat_busy "Stopping OpenSIPS server" - if [ -r $PIDFILE ] - then - cat $PIDFILE | xargs kill - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon opensips - stat_done - fi - else - stat_fail - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/opensips/opensips.install b/community/opensips/opensips.install index 9e8f2a47b..40973a77a 100644 --- a/community/opensips/opensips.install +++ b/community/opensips/opensips.install @@ -1,5 +1,3 @@ -post_install() -{ - echo "To use MySQL, you should install mysql package and run '/usr/sbin/openser_mysql.sh create'" - /bin/true +post_install() { + echo "To use MySQL, you should install mysql package and run '/usr/bin/openser_mysql.sh create'" } diff --git a/community/opensips/opensips.service b/community/opensips/opensips.service index 81f6fd93e..220a5d419 100644 --- a/community/opensips/opensips.service +++ b/community/opensips/opensips.service @@ -4,8 +4,8 @@ After=network.target remote-fs.target nss-lookup.target [Service] Type=forking -PIDFile=/var/run/opensips.pid -ExecStart=/usr/sbin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /var/run/opensips.pid +PIDFile=/run/opensips.pid +ExecStart=/usr/bin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /run/opensips.pid [Install] WantedBy=multi-user.target diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD index dd35bcb2f..6345b3475 100644 --- a/community/osiris/PKGBUILD +++ b/community/osiris/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90697 2013-05-13 14:32:32Z spupykin $ +# $Id: PKGBUILD 91866 2013-05-28 17:38:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: jlvsimoes pkgname=osiris pkgver=4.2.3 -pkgrel=6 +pkgrel=7 pkgdesc="A file integrity management system" arch=('i686' 'x86_64' 'mips64el') url="http://osiris.shmoo.com/" @@ -16,13 +16,16 @@ source=(http://arch.p5n.pp.ru/~sergej/dl/2011/osiris-$pkgver.tar.gz osirismd.service osirisd.service) md5sums=('1951c7dc0fe729af9ffaf58910340d12' - '48644676b88b231803785b8e2da956e5' - 'c0355b453770f6bbc6a58f5cd80766b4') + '8398d60bcbf0c90034473365abc3ece6' + '758d029a1ff53be11756330de595e77f') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --enable-fancy-cli --with-md-root-dir=/usr/share/$pkgname --build=$CHOST + sed -i "s|/sbin|/bin|g" src/install/install.sh.in + + ./configure --prefix=/usr --sbindir=/usr/bin --build=$CHOST \ + --enable-fancy-cli --with-md-root-dir=/usr/share/$pkgname make all # Arch-ify install locations @@ -39,7 +42,7 @@ package() { make DESTDIR=$pkgdir install - rm -rf $pkgdir/usr/osiris + rm -rf $pkgdir/usr/osiris $pkgdir/etc/init.d install -Dm0644 $srcdir/osirisd.service $pkgdir/usr/lib/systemd/system/osirisd.service install -Dm0644 $srcdir/osirismd.service $pkgdir/usr/lib/systemd/system/osirismd.service diff --git a/community/osiris/osirisd.service b/community/osiris/osirisd.service index 199737c9f..3b162160f 100644 --- a/community/osiris/osirisd.service +++ b/community/osiris/osirisd.service @@ -4,7 +4,7 @@ Description=A file integrity management system [Service] User=osiris Type=forking -ExecStart=/usr/sbin/osirisd +ExecStart=/usr/bin/osirisd [Install] WantedBy=multi-user.target diff --git a/community/osiris/osirismd.service b/community/osiris/osirismd.service index d51cef22c..ec4c40702 100644 --- a/community/osiris/osirismd.service +++ b/community/osiris/osirismd.service @@ -4,7 +4,7 @@ Description=A file integrity management system [Service] User=osiris Type=forking -ExecStart=/usr/sbin/osirismd +ExecStart=/usr/bin/osirismd [Install] WantedBy=multi-user.target diff --git a/community/ozerocdoff/PKGBUILD b/community/ozerocdoff/PKGBUILD index e4225e508..cd38e3956 100644 --- a/community/ozerocdoff/PKGBUILD +++ b/community/ozerocdoff/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69167 2012-04-09 22:11:35Z spupykin $ +# $Id: PKGBUILD 91884 2013-05-28 18:09:59Z spupykin $ # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> pkgname=ozerocdoff pkgver=2 -pkgrel=7 +pkgrel=8 pkgdesc="Userspace driver for Option High Speed Mobile Devices" arch=('i686' 'x86_64' 'mips64el') url="http://www.pharscape.org/ozerocdoff.html" @@ -15,10 +15,15 @@ source=(udev.tar.gz::"http://www.pharscape.org/forum/index.php?action=dlattach;t md5sums=('88a78f9380d9591f8d20a657b72e3e5c' '28ed1afd16fdec92de3baf66b32b0b12') +prepare() { + cd "${srcdir}/udev" + patch -p1 <$srcdir/remove-old-rules.patch + sed -i 's|usr/sbin|usr/bin|g' Makefile +} + build() { cd "${srcdir}/udev" make clean - patch -p1 <$srcdir/remove-old-rules.patch make } diff --git a/community/p3scan/PKGBUILD b/community/p3scan/PKGBUILD index ddd20b33f..4900ee892 100644 --- a/community/p3scan/PKGBUILD +++ b/community/p3scan/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90699 2013-05-13 14:33:03Z spupykin $ +# $Id: PKGBUILD 91863 2013-05-28 17:37:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: v01d <phreakuencies@gmail.com> pkgname=p3scan pkgver=2.3.2 -pkgrel=8 +pkgrel=9 pkgdesc="Fully transparent POP3/SMTP proxy with Anti-Virus and SPAM protection" arch=('i686' 'x86_64' 'mips64el') url="http://p3scan.sourceforge.net/" @@ -15,7 +15,7 @@ source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver. "p3scan.service" "p3scan.tmpfiles") md5sums=('9f8decc7d4701228788e3c8717096ca0' - 'dc724b50963d80be7924fc4d9d4856f0' + '74a3a5e52e6714ac5001985061248a34' '265a730e20e3d8aaf0cd7816dc98ca71') build() { @@ -25,7 +25,7 @@ build() { unset CFLAGS sed -ri "s|^CFLAGS=-Wall( -g)? -O2|CFLAGS=-Wall $CFLAGS|" Makefile ripmime/Makefile ripmime/tnef/Makefile ripmime/ripOLE/Makefile sed -ri 's|^LOCATION=.+$|LOCATION=/usr|' ripmime/Makefile - sed -ri 's|\$\(SYSINS\) -v -m 550 --strip p3scan \$\(PREFIX\)/sbin/|$(SYSINS) -D -v -m 550 --strip p3scan $(DESTDIR)/usr/sbin/|' Makefile + sed -ri 's|\$\(SYSINS\) -v -m 550 --strip p3scan \$\(PREFIX\)/sbin/|$(SYSINS) -D -v -m 550 --strip p3scan $(DESTDIR)/usr/bin/|' Makefile make } @@ -33,7 +33,7 @@ package() { cd $srcdir/$pkgname-$pkgver # Create base dirs, the Makefile assumes they're there - install -d $pkgdir/usr/sbin $pkgdir/usr/man/man8 $pkgdir/etc/rc.d + install -d $pkgdir/usr/bin $pkgdir/usr/man/man8 $pkgdir/etc/rc.d # install with root set on $pkgdir make DESTDIR=$pkgdir install diff --git a/community/p3scan/p3scan.service b/community/p3scan/p3scan.service index 0bab3e7ec..bdd34b75c 100644 --- a/community/p3scan/p3scan.service +++ b/community/p3scan/p3scan.service @@ -3,8 +3,8 @@ Description=p3scan proxy [Service] Type=forking -PIDFile=/var/run/p3scan/p3scan.pid -ExecStart=/usr/sbin/p3scan +PIDFile=/run/p3scan/p3scan.pid +ExecStart=/usr/bin/p3scan [Install] WantedBy=multi-user.target diff --git a/community/pam_mount/PKGBUILD b/community/pam_mount/PKGBUILD index dc77371c8..bf243f18b 100644 --- a/community/pam_mount/PKGBUILD +++ b/community/pam_mount/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77500 2012-10-11 11:40:42Z spupykin $ +# $Id: PKGBUILD 91874 2013-05-28 17:46:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributors: Sirius Bakke <sirius\at/nonline.org> pkgname=pam_mount pkgver=2.13 -pkgrel=4 +pkgrel=5 pkgdesc="A PAM module that can mount volumes for a user session" arch=('i686' 'x86_64' 'mips64el') url="http://pam-mount.sourceforge.net/" @@ -22,12 +22,13 @@ build() { cd -- "$srcdir/$pkgname-$pkgver" patch -p1 <$srcdir/$pkgname-git.patch aclocal - automake --add-missing libtoolize + automake --add-missing autoreconf ./configure \ --prefix=/usr \ - --with-ssbindir=/usr/sbin \ + --with-ssbindir=/usr/bin \ + --sbindir=/usr/bin \ --with-slibdir=/usr/lib \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/community/pcsc-perl/PKGBUILD b/community/pcsc-perl/PKGBUILD index f3562ada8..28de1def2 100644 --- a/community/pcsc-perl/PKGBUILD +++ b/community/pcsc-perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87531 2013-04-02 15:53:32Z giovanni $ +# $Id: PKGBUILD 91655 2013-05-26 09:24:45Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com> # Contributor: marc0s <marc0s@fsfe.org> pkgname=pcsc-perl pkgver=1.4.13 -pkgrel=1 +pkgrel=2 pkgdesc="A Perl Module for PC/SC SmartCard access" arch=('i686' 'x86_64' 'mips64el') url="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/" diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index 26f1ff262..38a311ed0 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88656 2013-04-21 08:48:16Z jelle $ +# $Id: PKGBUILD 91593 2013-05-25 02:56:18Z foutrelis $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu pkgver=0.7.16 -pkgrel=4 +pkgrel=6 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64' 'mips64el') url="http://pdf2djvu.googlecode.com" @@ -12,22 +12,26 @@ license=('GPL') depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs' 'graphicsmagick') makedepends=('pstreams' 'python2-nose' 'ttf-liberation') source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz") +md5sums=('6ba1e576212e129111518a8c4afd1092') build() { cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + + sed -i 's/nosetests/nosetests2/' tests/Makefile + make test +} + package() { cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1 } -check() { - cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's/nosetests/nosetests2/' tests/Makefile - make test -} -md5sums=('6ba1e576212e129111518a8c4afd1092') diff --git a/community/pdnsd/PKGBUILD b/community/pdnsd/PKGBUILD index 4b2956ad8..62579bfaf 100644 --- a/community/pdnsd/PKGBUILD +++ b/community/pdnsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90701 2013-05-13 14:33:26Z spupykin $ +# $Id: PKGBUILD 91500 2013-05-23 10:14:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrik Nymann Jensen <h@henriknj.dk> pkgname=pdnsd pkgver=1.2.9.a _pkgver=${pkgver/.a/a} -pkgrel=2 +pkgrel=4 pkgdesc="Proxy DNS server with permanent caching" arch=(i686 x86_64 mips64el) url="http://members.home.nl/p.a.rombouts/pdnsd/" @@ -14,16 +14,16 @@ depends=('glibc') source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$_pkgver-par.tar.gz service) md5sums=('2f3e705d59a0f9308ad9504b24400769' - 'fad5e518d126b29fc947941d57a0a494') + '4f86bdbd8495b53341070d5720491996') build() { - cd $srcdir/$pkgname-$_pkgver - ./configure --prefix=/usr --sysconfdir=/etc + cd $srcdir/$pkgname-${_pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --enable-ipv6 make } package() { - cd $srcdir/$pkgname-$_pkgver + cd $srcdir/$pkgname-${_pkgver} make DESTDIR=$pkgdir install install -Dm0644 $srcdir/service $pkgdir/usr/lib/systemd/system/pdnsd.service } diff --git a/community/pdnsd/service b/community/pdnsd/service index 5821dbcb2..d284cd933 100644 --- a/community/pdnsd/service +++ b/community/pdnsd/service @@ -3,7 +3,7 @@ Description=proxy name server After=network.target [Service] -ExecStart=/usr/sbin/pdnsd +ExecStart=/usr/bin/pdnsd [Install] WantedBy=multi-user.target diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index 3c8fe9edd..584d016a3 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 88094 2013-04-11 13:45:38Z mtorromeo $ +# $Id: PKGBUILD 91599 2013-05-25 10:17:47Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.30_rel30.2 +pkgver=5.5.31_rel30.3 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64' 'mips64el') @@ -97,7 +97,7 @@ package() { rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 } -sha256sums=('d30876033cd5590f8e1d68aff6a2eaad677dbe59168d4610c580c4e4e2e923a7' +sha256sums=('808fea7fa2a10e61a3767819f4f9275afc8e5a66a7567b7b6d9e3bde2b79fce3' '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48' '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869' 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60') diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index a7032ac70..7dfa16a58 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90076 2013-05-06 19:39:02Z foutrelis $ +# $Id: PKGBUILD 91562 2013-05-23 19:50:14Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.7.0 -pkgrel=6 +pkgrel=7 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64' 'mips64el') url="http://performous.org/" @@ -13,15 +13,25 @@ depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'li makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa') optdepends=('performous-freesongs: free songs for performous') source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2 - performous-0.7.0-cmake.patch) + performous-0.7.0-cmake.patch + fix-noisy-sound-output.patch) md5sums=('60f3f72b51a630a4aa996484aedb9526' - '7da8aef3f4dd28e19f95957ae9ac2bb1') + '7da8aef3f4dd28e19f95957ae9ac2bb1' + '820dc6d1a91c23f0ef56e2cd1759afb6') -build() { +prepare() { cd performous-${pkgver} + # patch from gentoo patch -Np0 -i ../performous-0.7.0-cmake.patch + # fix FS#33948 (merged upstream) + patch -Np1 -i ../fix-noisy-sound-output.patch +} + +build() { + cd performous-${pkgver} + mkdir -p build cd build diff --git a/community/performous/fix-noisy-sound-output.patch b/community/performous/fix-noisy-sound-output.patch new file mode 100644 index 000000000..e4ba0c246 --- /dev/null +++ b/community/performous/fix-noisy-sound-output.patch @@ -0,0 +1,440 @@ +diff -ur performous-0.7.0/game/audio.cc performous-0.7.0b/game/audio.cc +--- performous-0.7.0/game/audio.cc 2012-11-12 23:14:08.000000000 +0100 ++++ performous-0.7.0b/game/audio.cc 2013-05-23 19:38:26.568498744 +0200 +@@ -140,7 +140,8 @@ + FFmpeg mpeg; + float fadeLevel; + float pitchFactor; +- Track(std::string const& filename, unsigned int sr): mpeg(false, true, filename, sr), fadeLevel(1.0f), pitchFactor(0.0f) {} ++ //Track(std::string const& filename, unsigned int sr): mpeg(false, true, filename, sr), fadeLevel(1.0f), pitchFactor(0.0f) {} ++ Track(std::string const& filename, unsigned int sr): mpeg(filename, sr), fadeLevel(1.0f), pitchFactor(0.0f) {} + }; + typedef boost::ptr_map<std::string, Track> Tracks; + Tracks tracks; ///< Audio decoders +@@ -241,7 +242,8 @@ + FFmpeg mpeg; + bool eof; + public: +- Sample(std::string const& filename, unsigned sr) : srate(sr), m_pos(), mpeg(false, true, filename, sr), eof(true) { } ++ //Sample(std::string const& filename, unsigned sr) : srate(sr), m_pos(), mpeg(false, true, filename, sr), eof(true) { } ++ Sample(std::string const& filename, unsigned sr) : m_pos(), mpeg(filename, sr), eof(true) { } + void operator()(float* begin, float* end) { + if(eof) { + // No more data to play in this sample +diff -ur performous-0.7.0/game/ffmpeg.cc performous-0.7.0b/game/ffmpeg.cc +--- performous-0.7.0/game/ffmpeg.cc 2012-11-12 23:14:08.000000000 +0100 ++++ performous-0.7.0b/game/ffmpeg.cc 2013-05-23 21:41:09.057986491 +0200 +@@ -3,6 +3,7 @@ + #include "config.hh" + #include "util.hh" + #include "xtime.hh" ++#include <boost/smart_ptr/shared_ptr.hpp> + #include <iostream> + #include <stdexcept> + +@@ -20,15 +21,20 @@ + + /*static*/ boost::mutex FFmpeg::s_avcodec_mutex; + +-FFmpeg::FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& _filename, unsigned int rate): +- width(), height(), m_filename(_filename), m_rate(rate), m_quit(), m_running(), m_eof(), +- m_seekTarget(getNaN()), m_position(), m_streamId(-1), m_mediaType(), +- m_formatContext(), m_codecContext(), m_codec(), m_resampleContext(), m_swsContext(), ++//FFmpeg::FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& _filename, unsigned int rate): ++// width(), height(), m_filename(_filename), m_rate(rate), m_quit(), m_running(), m_eof(), ++// m_seekTarget(getNaN()), m_position(), m_streamId(-1), m_mediaType(), ++// m_formatContext(), m_codecContext(), m_codec(), m_resampleContext(), m_swsContext(), ++FFmpeg::FFmpeg(std::string const& _filename, unsigned int rate): ++ width(), height(), m_filename(_filename), m_rate(rate), m_quit(), ++ m_seekTarget(getNaN()), m_position(), m_duration(), m_streamId(-1), ++ m_mediaType(rate ? AVMEDIA_TYPE_AUDIO : AVMEDIA_TYPE_VIDEO), ++ m_formatContext(), m_codecContext(), m_resampleContext(), m_swsContext(), + m_thread(new boost::thread(boost::ref(*this))) + { +- if (decodeVideo) m_mediaType = AVMEDIA_TYPE_VIDEO; +- else if (decodeAudio) m_mediaType = AVMEDIA_TYPE_AUDIO; +- else throw std::logic_error("Can only decode one track"); ++// if (decodeVideo) m_mediaType = AVMEDIA_TYPE_VIDEO; ++// else if (decodeAudio) m_mediaType = AVMEDIA_TYPE_AUDIO; ++// else throw std::logic_error("Can only decode one track"); + } + + FFmpeg::~FFmpeg() { +@@ -36,20 +42,20 @@ + videoQueue.reset(); + audioQueue.quit(); + m_thread->join(); +- // TODO: use RAII for freeing resources (to prevent memory leaks) +- boost::mutex::scoped_lock l(s_avcodec_mutex); // avcodec_close is not thread-safe +- if (m_resampleContext) audio_resample_close(m_resampleContext); +- if (m_codecContext) avcodec_close(m_codecContext); +-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0) +- if (m_formatContext) avformat_close_input(&m_formatContext); +-#else +- if (m_formatContext) av_close_input_file(m_formatContext); +-#endif +-} +- +-double FFmpeg::duration() const { +- double d = m_running ? m_formatContext->duration / double(AV_TIME_BASE) : getNaN(); +- return d >= 0.0 ? d : getInf(); ++// // TODO: use RAII for freeing resources (to prevent memory leaks) ++// boost::mutex::scoped_lock l(s_avcodec_mutex); // avcodec_close is not thread-safe ++// if (m_resampleContext) audio_resample_close(m_resampleContext); ++// if (m_codecContext) avcodec_close(m_codecContext); ++// #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0) ++// if (m_formatContext) avformat_close_input(&m_formatContext); ++// #else ++// if (m_formatContext) av_close_input_file(m_formatContext); ++// #endif ++// } ++// ++// double FFmpeg::duration() const { ++// double d = m_running ? m_formatContext->duration / double(AV_TIME_BASE) : getNaN(); ++// return d >= 0.0 ? d : getInf(); + } + + void FFmpeg::open() { +@@ -60,11 +66,14 @@ + if (avformat_find_stream_info(m_formatContext, NULL) < 0) throw std::runtime_error("Cannot find stream information"); + m_formatContext->flags |= AVFMT_FLAG_GENPTS; + // Find a track and open the codec +- m_streamId = av_find_best_stream(m_formatContext, (AVMediaType)m_mediaType, -1, -1, &m_codec, 0); ++// m_streamId = av_find_best_stream(m_formatContext, (AVMediaType)m_mediaType, -1, -1, &m_codec, 0); ++ AVCodec* codec = NULL; ++ m_streamId = av_find_best_stream(m_formatContext, (AVMediaType)m_mediaType, -1, -1, &codec, 0); + if (m_streamId < 0) throw std::runtime_error("No suitable track found"); + + AVCodecContext* cc = m_formatContext->streams[m_streamId]->codec; +- if (avcodec_open2(cc, m_codec, NULL) < 0) throw std::runtime_error("Cannot open audio codec"); ++// if (avcodec_open2(cc, m_codec, NULL) < 0) throw std::runtime_error("Cannot open audio codec"); ++ if (avcodec_open2(cc, codec, NULL) < 0) throw std::runtime_error("Cannot open codec"); + cc->workaround_bugs = FF_BUG_AUTODETECT; + m_codecContext = cc; + +@@ -90,18 +99,20 @@ + + void FFmpeg::operator()() { + try { open(); } catch (std::exception const& e) { std::clog << "ffmpeg/error: Failed to open " << m_filename << ": " << e.what() << std::endl; m_quit = true; return; } +- m_running = true; +- audioQueue.setDuration(duration()); ++// m_running = true; ++// audioQueue.setDuration(duration()); ++ m_duration = m_formatContext->duration / double(AV_TIME_BASE); ++ audioQueue.setDuration(m_duration); + int errors = 0; + while (!m_quit) { + try { + if (audioQueue.wantSeek()) m_seekTarget = 0.0; + if (m_seekTarget == m_seekTarget) seek_internal(); + decodePacket(); +- m_eof = false; ++// m_eof = false; + errors = 0; + } catch (eof_error&) { +- m_eof = true; ++// m_eof = true; + videoQueue.push(new VideoFrame()); // EOF marker + boost::thread::sleep(now() + 0.1); + } catch (std::exception& e) { +@@ -109,10 +120,19 @@ + if (++errors > 2) { std::clog << "ffmpeg/error: FFMPEG terminating due to multiple errors" << std::endl; m_quit = true; } + } + } +- m_running = false; +- m_eof = true; ++// m_running = false; ++// m_eof = true; + audioQueue.setEof(); + videoQueue.push(new VideoFrame()); // EOF marker ++ // TODO: use RAII for freeing resources (to prevent memory leaks) ++ boost::mutex::scoped_lock l(s_avcodec_mutex); // avcodec_close is not thread-safe ++ if (m_resampleContext) audio_resample_close(m_resampleContext); ++ if (m_codecContext) avcodec_close(m_codecContext); ++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0) ++ if (m_formatContext) avformat_close_input(&m_formatContext); ++#else ++ if (m_formatContext) av_close_input_file(m_formatContext); ++#endif + } + + void FFmpeg::seek(double time, bool wait) { +@@ -125,7 +145,8 @@ + videoQueue.reset(); + audioQueue.reset(); + int flags = 0; +- if (m_seekTarget < position()) flags |= AVSEEK_FLAG_BACKWARD; ++// if (m_seekTarget < position()) flags |= AVSEEK_FLAG_BACKWARD; ++ if (m_seekTarget < m_position) flags |= AVSEEK_FLAG_BACKWARD; + av_seek_frame(m_formatContext, -1, m_seekTarget * AV_TIME_BASE, flags); + m_seekTarget = getNaN(); // Signal that seeking is done + } +@@ -139,16 +160,16 @@ + ~ReadFramePacket() { av_free_packet(this); } + }; + +- struct AVFrameWrapper { +- AVFrame* m_frame; +- AVFrameWrapper(): m_frame(avcodec_alloc_frame()) { +- if (!m_frame) throw std::runtime_error("Unable to allocate AVFrame"); +- } +- ~AVFrameWrapper() { av_free(m_frame); } +- operator AVFrame*() { return m_frame; } +- AVFrame* operator->() { return m_frame; } +- }; +- ++// struct AVFrameWrapper { ++// AVFrame* m_frame; ++// AVFrameWrapper(): m_frame(avcodec_alloc_frame()) { ++// if (!m_frame) throw std::runtime_error("Unable to allocate AVFrame"); ++// } ++// ~AVFrameWrapper() { av_free(m_frame); } ++// operator AVFrame*() { return m_frame; } ++// AVFrame* operator->() { return m_frame; } ++// }; ++// + // Read an AVPacket and decode it into AVFrames + ReadFramePacket packet(m_formatContext); + int packetSize = packet.size; +@@ -156,19 +177,27 @@ + if (packetSize < 0) throw std::logic_error("negative packet size?!"); + if (m_quit || m_seekTarget == m_seekTarget) return; + if (packet.stream_index != m_streamId) return; +- AVFrameWrapper frame; ++// AVFrameWrapper frame; ++ boost::shared_ptr<AVFrame> frame(avcodec_alloc_frame(), &av_free); + int frameFinished = 0; + int decodeSize = (m_mediaType == AVMEDIA_TYPE_VIDEO ? +- avcodec_decode_video2(m_codecContext, frame, &frameFinished, &packet) : +- avcodec_decode_audio4(m_codecContext, frame, &frameFinished, &packet)); +- if (decodeSize < 0) throw std::runtime_error("cannot decode avframe"); ++// avcodec_decode_video2(m_codecContext, frame, &frameFinished, &packet) : ++// avcodec_decode_audio4(m_codecContext, frame, &frameFinished, &packet)); ++// if (decodeSize < 0) throw std::runtime_error("cannot decode avframe"); ++ avcodec_decode_video2(m_codecContext, frame.get(), &frameFinished, &packet) : ++ avcodec_decode_audio4(m_codecContext, frame.get(), &frameFinished, &packet)); ++ if (decodeSize < 0) return; // Packet didn't produce any output (could be waiting for B frames or something) + packetSize -= decodeSize; // Move forward within the packet + if (!frameFinished) continue; + // Update current position if timecode is available +- if (frame->pkt_pts != uint64_t(AV_NOPTS_VALUE)) { +- m_position = double(frame->pkt_pts) * av_q2d(m_formatContext->streams[m_streamId]->time_base); +- } +- if (m_mediaType == AVMEDIA_TYPE_VIDEO) processVideo(frame); else processAudio(frame); ++// if (frame->pkt_pts != uint64_t(AV_NOPTS_VALUE)) { ++ if (int64_t(frame->pkt_pts) != int64_t(AV_NOPTS_VALUE)) { ++// m_position = double(frame->pkt_pts) * av_q2d(m_formatContext->streams[m_streamId]->time_base); ++ m_position = double(frame->pkt_pts) * av_q2d(m_formatContext->streams[m_streamId]->time_base) ++ - double(m_formatContext->start_time) / AV_TIME_BASE; ++ } ++// if (m_mediaType == AVMEDIA_TYPE_VIDEO) processVideo(frame); else processAudio(frame); ++ if (m_mediaType == AVMEDIA_TYPE_VIDEO) processVideo(frame.get()); else processAudio(frame.get()); + } + } + +@@ -189,9 +218,29 @@ + } + + void FFmpeg::processAudio(AVFrame* frame) { ++ void* data = frame->data[0]; ++ // New FFmpeg versions use non-interleaved audio decoding and samples may be in float format. ++ // Do a conversion here, allowing us to use the old (deprecated) avcodec audio_resample(). ++ std::vector<int16_t> input; ++ unsigned inFrames = frame->nb_samples; ++ if (frame->data[1]) { ++ unsigned channels = m_codecContext->channels; ++ input.reserve(channels * inFrames); ++ for (unsigned i = 0; i < inFrames; ++i) { ++ for (unsigned ch = 0; ch < channels; ++ch) { ++ data = frame->data[ch]; ++ input.push_back(m_codecContext->sample_fmt == AV_SAMPLE_FMT_FLTP ? ++ da::conv_to_s16(reinterpret_cast<float*>(data)[i]) : ++ reinterpret_cast<int16_t*>(data)[i] ++ ); ++ } ++ } ++ data = &input[0]; ++ } + // Resample to output sample rate, then push to audio queue and increment timecode + std::vector<int16_t> resampled(AVCODEC_MAX_AUDIO_FRAME_SIZE); +- int frames = audio_resample(m_resampleContext, &resampled[0], (short*)frame->data[0], frame->nb_samples); ++// int frames = audio_resample(m_resampleContext, &resampled[0], (short*)frame->data[0], frame->nb_samples); ++ int frames = audio_resample(m_resampleContext, &resampled[0], reinterpret_cast<short*>(data), inFrames); + resampled.resize(frames * AUDIO_CHANNELS); + audioQueue.push(resampled, m_position); // May block + m_position += double(frames)/m_formatContext->streams[m_streamId]->codec->sample_rate; +diff -ur performous-0.7.0/game/ffmpeg.hh performous-0.7.0b/game/ffmpeg.hh +--- performous-0.7.0/game/ffmpeg.hh 2012-11-12 23:14:08.000000000 +0100 ++++ performous-0.7.0b/game/ffmpeg.hh 2013-05-23 20:42:22.868566247 +0200 +@@ -3,7 +3,8 @@ + #include "util.hh" + #include "libda/sample.hpp" + #include <boost/circular_buffer.hpp> +-#include <boost/ptr_container/ptr_set.hpp> ++//#include <boost/ptr_container/ptr_set.hpp> ++#include <boost/ptr_container/ptr_deque.hpp> + #include <boost/scoped_ptr.hpp> + #include <boost/thread/condition.hpp> + #include <boost/thread/mutex.hpp> +@@ -47,25 +48,29 @@ + } + }; + +-static bool operator<(VideoFrame const& a, VideoFrame const& b) { +- return a.timestamp < b.timestamp; +-} ++// static bool operator<(VideoFrame const& a, VideoFrame const& b) { ++// return a.timestamp < b.timestamp; ++// } + + /// video queue: first in first out + class VideoFifo { + public: +- VideoFifo(): m_available(), m_timestamp(), m_eof() {} ++// VideoFifo(): m_available(), m_timestamp(), m_eof() {} ++ VideoFifo(): m_timestamp(), m_eof() {} + /// trys to pop a VideoFrame from queue + bool tryPop(VideoFrame& f) { + boost::mutex::scoped_lock l(m_mutex); +- if (!m_queue.empty() && m_queue.begin()->data.empty()) { m_eof = true; return false; } +- statsUpdate(); +- if (m_available == 0) return false; // Nothing to deliver ++// if (!m_queue.empty() && m_queue.begin()->data.empty()) { m_eof = true; return false; } ++// statsUpdate(); ++// if (m_available == 0) return false; // Nothing to deliver ++ if (m_queue.empty()) return false; // Nothing to deliver ++ if (m_queue.begin()->data.empty()) { m_eof = true; return false; } + f.swap(*m_queue.begin()); +- m_queue.erase(m_queue.begin()); ++// m_queue.erase(m_queue.begin()); ++ m_queue.pop_front(); + m_cond.notify_all(); + m_timestamp = f.timestamp; +- statsUpdate(); ++// statsUpdate(); + return true; + } + /// pushes VideoFrames to queue +@@ -73,38 +78,41 @@ + boost::mutex::scoped_lock l(m_mutex); + while (m_queue.size() > m_max) m_cond.wait(l); + if (m_queue.empty()) m_timestamp = f->timestamp; +- m_queue.insert(f); +- statsUpdate(); +- } +- /// updates stats +- void statsUpdate() { +- m_available = std::max(0, int(m_queue.size()) - int(m_min)); +- if (m_available == 0 && !m_queue.empty() && m_queue.rbegin()->data.empty()) m_available = m_queue.size() - 1; ++// m_queue.insert(f); ++// statsUpdate(); ++// } ++// /// updates stats ++// void statsUpdate() { ++// m_available = std::max(0, int(m_queue.size()) - int(m_min)); ++// if (m_available == 0 && !m_queue.empty() && m_queue.rbegin()->data.empty()) m_available = m_queue.size() - 1; ++ m_queue.push_back(f); + } + /// resets video queue + void reset() { + boost::mutex::scoped_lock l(m_mutex); + m_queue.clear(); + m_cond.notify_all(); +- statsUpdate(); ++// statsUpdate(); + m_eof = false; + } + /// returns current position + double position() const { return m_timestamp; } +- /// returns m_available / m_max +- double percentage() const { return double(m_available) / m_max; } ++// /// returns m_available / m_max ++// double percentage() const { return double(m_available) / m_max; } + /// simple eof check + double eof() const { return m_eof; } + + private: +- boost::ptr_set<VideoFrame> m_queue; ++// boost::ptr_set<VideoFrame> m_queue; ++ boost::ptr_deque<VideoFrame> m_queue; + mutable boost::mutex m_mutex; + boost::condition m_cond; +- volatile unsigned m_available; ++// volatile unsigned m_available; + double m_timestamp; + bool m_eof; +- static const unsigned m_min = 16; // H.264 may have 16 consecutive B frames +- static const unsigned m_max = 50; ++// static const unsigned m_min = 16; // H.264 may have 16 consecutive B frames ++// static const unsigned m_max = 50; ++ static const unsigned m_max = 20; + }; + + class AudioBuffer { +@@ -195,7 +203,7 @@ + + // ffmpeg forward declarations + extern "C" { +- struct AVCodec; ++// struct AVCodec; + struct AVCodecContext; + struct AVFormatContext; + struct AVFrame; +@@ -206,8 +214,10 @@ + /// ffmpeg class + class FFmpeg { + public: +- /// constructor +- FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& file, unsigned int rate = 48000); ++// /// constructor ++// FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& file, unsigned int rate = 48000); ++ /// Decode file; if no rate is specified, decode video, otherwise decode audio. ++ FFmpeg(std::string const& file, unsigned int rate = 0); + ~FFmpeg(); + void operator()(); ///< Thread runs here, don't call directly + unsigned width, ///< width of video +@@ -220,8 +230,8 @@ + void seek(double time, bool wait = true); + /// duration + double duration() const; +- /// return current position +- double position() { return videoQueue.position(); /* FIXME: remove */ } ++// /// return current position ++// double position() { return videoQueue.position(); /* FIXME: remove */ } + bool terminating() const { return m_quit; } + + class eof_error: public std::exception {}; +@@ -234,16 +244,17 @@ + std::string m_filename; + unsigned int m_rate; + volatile bool m_quit; +- volatile bool m_running; +- volatile bool m_eof; ++// volatile bool m_running; ++// volatile bool m_eof; + volatile double m_seekTarget; + double m_position; ++ double m_duration; + // libav-specific variables + int m_streamId; + int m_mediaType; // enum AVMediaType + AVFormatContext* m_formatContext; + AVCodecContext* m_codecContext; +- AVCodec* m_codec; ++// AVCodec* m_codec; + ReSampleContext* m_resampleContext; + SwsContext* m_swsContext; + // Make sure the thread starts only after initializing everything else +diff -ur performous-0.7.0/game/video.cc performous-0.7.0b/game/video.cc +--- performous-0.7.0/game/video.cc 2012-11-12 23:14:08.000000000 +0100 ++++ performous-0.7.0b/game/video.cc 2013-05-23 20:33:30.612096870 +0200 +@@ -3,7 +3,8 @@ + #include "util.hh" + #include <cmath> + +-Video::Video(std::string const& _videoFile, double videoGap): m_mpeg(true, false, _videoFile), m_videoGap(videoGap), m_surfaceTime(), m_lastTime(), m_alpha(-0.5, 1.5) {} ++// Video::Video(std::string const& _videoFile, double videoGap): m_mpeg(true, false, _videoFile), m_videoGap(videoGap), m_surfaceTime(), m_lastTime(), m_alpha(-0.5, 1.5) {} ++Video::Video(std::string const& _videoFile, double videoGap): m_mpeg(_videoFile), m_videoGap(videoGap), m_surfaceTime(), m_lastTime(), m_alpha(-0.5, 1.5) {} + + void Video::prepare(double time) { + time += m_videoGap; diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD index 21f7f5f14..108c806d7 100644 --- a/community/perl-berkeleydb/PKGBUILD +++ b/community/perl-berkeleydb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73833 2012-07-16 05:37:51Z spupykin $ +# $Id: PKGBUILD 91656 2013-05-26 09:24:46Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-berkeleydb pkgver=0.51 -pkgrel=1 +pkgrel=2 pkgdesc="Interface to Berkeley DB version 2, 3 or 4" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/BerkeleyDB/" diff --git a/community/perl-class-methodmaker/PKGBUILD b/community/perl-class-methodmaker/PKGBUILD index c2c0b292c..0bcf76cb3 100644 --- a/community/perl-class-methodmaker/PKGBUILD +++ b/community/perl-class-methodmaker/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71753 2012-06-02 10:29:34Z bluewind $ +# $Id: PKGBUILD 91657 2013-05-26 09:24:47Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-class-methodmaker pkgver=2.18 -pkgrel=6 +pkgrel=7 pkgdesc="Create generic class methods" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Class-MethodMaker" @@ -18,6 +18,10 @@ build() { cd $srcdir/Class-MethodMaker-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Class-MethodMaker-$pkgver make install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-clone/PKGBUILD b/community/perl-clone/PKGBUILD index f07ed1629..4830160de 100644 --- a/community/perl-clone/PKGBUILD +++ b/community/perl-clone/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-clone pkgver=0.34 -pkgrel=1 +pkgrel=2 pkgdesc='Recursive copy of nested objects.' arch=('i686' 'x86_64' 'mips64el') url='http://search.cpan.org/~RDF/Clone' diff --git a/community/perl-crypt-blowfish/PKGBUILD b/community/perl-crypt-blowfish/PKGBUILD index 0edfcab11..39d303e26 100644 --- a/community/perl-crypt-blowfish/PKGBUILD +++ b/community/perl-crypt-blowfish/PKGBUILD @@ -1,21 +1,32 @@ -# $Id: PKGBUILD 71757 2012-06-02 10:29:42Z bluewind $ +# $Id: PKGBUILD 91659 2013-05-26 09:24:50Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-crypt-blowfish pkgver=2.12 -pkgrel=5 +pkgrel=6 pkgdesc="Perl/CPAN Module Crypt::Blowfish : XSbased implementation of Blowfish" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/Crypt-Blowfish" license=("GPL" "PerlArtistic") -source=("http://search.cpan.org/CPAN/authors/id/D/DP/DPARIS/Crypt-Blowfish-$pkgver.tar.gz") -md5sums=('a0eca17addc8bdaf38c044c365a8800c') +source=("http://search.cpan.org/CPAN/authors/id/D/DP/DPARIS/Crypt-Blowfish-$pkgver.tar.gz" + "perl-5.18.patch") +md5sums=('a0eca17addc8bdaf38c044c365a8800c' + '700129e690f239f9c1a318fffd3504c7') + +prepare() { + cd $srcdir/Crypt-Blowfish-$pkgver + patch -p1 <$srcdir/perl-5.18.patch +} build() { cd $srcdir/Crypt-Blowfish-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Crypt-Blowfish-$pkgver make pure_install doc_install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-crypt-blowfish/perl-5.18.patch b/community/perl-crypt-blowfish/perl-5.18.patch new file mode 100644 index 000000000..291733cb9 --- /dev/null +++ b/community/perl-crypt-blowfish/perl-5.18.patch @@ -0,0 +1,13 @@ +diff -wbBur Crypt-Blowfish-2.12.org/Blowfish.xs Crypt-Blowfish-2.12/Blowfish.xs +--- Crypt-Blowfish-2.12.org/Blowfish.xs 2000-11-30 09:25:21.000000000 +0300 ++++ Crypt-Blowfish-2.12/Blowfish.xs 2013-05-20 15:31:52.481940353 +0400 +@@ -63,8 +63,7 @@ + output = sv_newmortal(); + output_len = 8; + +- if (!SvUPGRADE(output, SVt_PV)) +- croak("cannot use output argument as lvalue"); ++ SvUPGRADE(output, SVt_PV); + + /* blowfish_crypt_8bytes(input, SvGROW(output, 8), ks, dir); */ + /* HP-UX (HP cc) fix below, thanks Addi! */ diff --git a/community/perl-crypt-des/PKGBUILD b/community/perl-crypt-des/PKGBUILD index 1a8097f1c..19b7ed1cb 100644 --- a/community/perl-crypt-des/PKGBUILD +++ b/community/perl-crypt-des/PKGBUILD @@ -1,20 +1,32 @@ -# $Id: PKGBUILD 71759 2012-06-02 10:29:46Z bluewind $ +# $Id: PKGBUILD 91660 2013-05-26 09:24:51Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> #Contributor: Pete Morris <pete dot morris at gmail dot com> pkgname=perl-crypt-des pkgver=2.05 -pkgrel=5 +pkgrel=6 pkgdesc="Perl DES encryption module" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/~dparis/Crypt-DES" license=("GPL" "PerlArtistic") depends=('glibc') -source=("http://www.cpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$pkgver.tar.gz") -md5sums=('a8a0bea7064e11d2af434f3e468c17bb') +source=("http://www.cpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$pkgver.tar.gz" + "perl-5.18.patch") +md5sums=('a8a0bea7064e11d2af434f3e468c17bb' + '836d1a954281257efe00503d98b42dc8') + +prepare() { + cd $srcdir/Crypt-DES-$pkgver + patch -p1 <$srcdir/perl-5.18.patch +} + build() { - cd Crypt-DES-$pkgver + cd $srcdir/Crypt-DES-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Crypt-DES-$pkgver make pure_install doc_install DESTDIR=${pkgdir} find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-crypt-des/perl-5.18.patch b/community/perl-crypt-des/perl-5.18.patch new file mode 100644 index 000000000..16e5aac85 --- /dev/null +++ b/community/perl-crypt-des/perl-5.18.patch @@ -0,0 +1,13 @@ +diff -wbBur Crypt-DES-2.05.org/DES.xs Crypt-DES-2.05/DES.xs +--- Crypt-DES-2.05.org/DES.xs 2005-12-08 18:52:50.000000000 +0300 ++++ Crypt-DES-2.05/DES.xs 2013-05-20 15:35:58.668612530 +0400 +@@ -64,8 +64,7 @@ + output = sv_newmortal(); + output_len = 8; + +- if (!SvUPGRADE(output, SVt_PV)) +- croak("cannot use output argument as lvalue"); ++ SvUPGRADE(output, SVt_PV); + + perl_des_crypt(input, SvGROW(output, output_len), (i32 *)ks, enc_flag); + diff --git a/community/perl-curses/PKGBUILD b/community/perl-curses/PKGBUILD index cd14d69d7..aed65a17d 100644 --- a/community/perl-curses/PKGBUILD +++ b/community/perl-curses/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71761 2012-06-02 10:29:50Z bluewind $ +# $Id: PKGBUILD 91661 2013-05-26 09:24:52Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-curses pkgver=1.28 -pkgrel=5 +pkgrel=6 pkgdesc="Character screen handling and windowing" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Curses" @@ -19,6 +19,10 @@ build() { cd $srcdir/Curses-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Curses-$pkgver make pure_install doc_install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-data-dumper/PKGBUILD b/community/perl-data-dumper/PKGBUILD new file mode 100644 index 000000000..2f96b2588 --- /dev/null +++ b/community/perl-data-dumper/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=perl-data-dumper +pkgver=2.145 +pkgrel=2 +pkgdesc="stringified perl data structures, suitable for both printing and eval" +arch=(i686 x86_64) +license=('GPL' 'PerlArtistic') +url="http://search.cpan.org/dist/Data-Dumper/" +depends=('perl') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/S/SM/SMUELLER/Data-Dumper-$pkgver.tar.gz) +md5sums=('b773c875afcca866faf8481adc3464b0') + +build() { + cd $srcdir/Data-Dumper-${pkgver} + perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd $srcdir/Data-Dumper-${pkgver} + make install DESTDIR=$pkgdir + find $pkgdir -name perllocal.pod -delete + find $pkgdir -name .packlist -delete +} diff --git a/community/perl-data-structure-util/PKGBUILD b/community/perl-data-structure-util/PKGBUILD index 81cff6e8b..d34c8ab22 100644 --- a/community/perl-data-structure-util/PKGBUILD +++ b/community/perl-data-structure-util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71763 2012-06-02 10:29:54Z bluewind $ +# $Id: PKGBUILD 91662 2013-05-26 09:24:54Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-data-structure-util pkgver=0.15 -pkgrel=6 +pkgrel=7 pkgdesc="Perl/CPAN Module Data::Structure::Util" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/Data-Structure-Util" @@ -16,6 +16,10 @@ build() { cd $srcdir/Data-Structure-Util-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Data-Structure-Util-$pkgver make install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD index 324066153..9f6a4e829 100644 --- a/community/perl-datetime/PKGBUILD +++ b/community/perl-datetime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90635 2013-05-13 12:43:00Z spupykin $ +# $Id: PKGBUILD 91663 2013-05-26 09:24:55Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime pkgver=1.03 -pkgrel=1 +pkgrel=2 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/DateTime" diff --git a/community/perl-dbd-odbc/PKGBUILD b/community/perl-dbd-odbc/PKGBUILD index 49097474e..186632e86 100644 --- a/community/perl-dbd-odbc/PKGBUILD +++ b/community/perl-dbd-odbc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88252 2013-04-15 10:48:00Z spupykin $ +# $Id: PKGBUILD 91664 2013-05-26 09:24:58Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-dbd-odbc pkgver=1.43 -pkgrel=1 +pkgrel=2 pkgdesc="ODBC Driver for DBI" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/DBD-ODBC/" diff --git a/community/perl-dbd-pg/PKGBUILD b/community/perl-dbd-pg/PKGBUILD index afdc17312..5bdb15d52 100644 --- a/community/perl-dbd-pg/PKGBUILD +++ b/community/perl-dbd-pg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82880 2013-01-25 09:55:54Z spupykin $ +# $Id: PKGBUILD 91665 2013-05-26 09:25:00Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-dbd-pg pkgver=2.19.3 -pkgrel=1 +pkgrel=2 pkgdesc="Postgres Driver for DBI" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/DBD-Pg" diff --git a/community/perl-dbd-sqlite2/PKGBUILD b/community/perl-dbd-sqlite2/PKGBUILD index 67ca8b084..5331e6fe4 100644 --- a/community/perl-dbd-sqlite2/PKGBUILD +++ b/community/perl-dbd-sqlite2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88254 2013-04-15 10:48:22Z spupykin $ +# $Id: PKGBUILD 91666 2013-05-26 09:25:02Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-dbd-sqlite2 pkgver=0.36 -pkgrel=1 +pkgrel=2 pkgdesc="Perl/CPAN Module DBD::SQLite2" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/DBD-SQLite2" diff --git a/community/perl-dbd-sybase/PKGBUILD b/community/perl-dbd-sybase/PKGBUILD index 5c5482b10..dca40f850 100644 --- a/community/perl-dbd-sybase/PKGBUILD +++ b/community/perl-dbd-sybase/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88257 2013-04-15 10:48:59Z spupykin $ +# $Id: PKGBUILD 91667 2013-05-26 09:25:03Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-dbd-sybase pkgver=1.15 -pkgrel=1 +pkgrel=2 pkgdesc="Sybase Driver for DBI" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/DBD-Sybase/" diff --git a/community/perl-device-serialport/PKGBUILD b/community/perl-device-serialport/PKGBUILD index dadbb6fa4..ea915dfaf 100644 --- a/community/perl-device-serialport/PKGBUILD +++ b/community/perl-device-serialport/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71775 2012-06-02 10:30:18Z bluewind $ +# $Id: PKGBUILD 91668 2013-05-26 09:25:04Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Ross melin <rdmelin@gmail.com> pkgname=perl-device-serialport pkgver=1.04 -pkgrel=4 +pkgrel=5 pkgdesc="POSIX clone of Win32::SerialPort" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Device-SerialPort" @@ -19,6 +19,10 @@ build() { eval `perl -V:archname` PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Device-SerialPort-$pkgver make DESTDIR=$pkgdir install find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-file-rsyncp/PKGBUILD b/community/perl-file-rsyncp/PKGBUILD index f963baba7..45f512a49 100644 --- a/community/perl-file-rsyncp/PKGBUILD +++ b/community/perl-file-rsyncp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71777 2012-06-02 10:30:22Z bluewind $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 91669 2013-05-26 09:25:06Z bluewind $ +# Maintainer: Sébastien Luttringer pkgname=perl-file-rsyncp pkgver=0.70 -pkgrel=2 +pkgrel=3 pkgdesc='Perl interface to rsync file list encoding and decoding' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') @@ -28,4 +28,4 @@ package() { make install DESTDIR="$pkgdir/" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/perl-fuse/PKGBUILD b/community/perl-fuse/PKGBUILD index ff5b42f56..dccb0d40a 100644 --- a/community/perl-fuse/PKGBUILD +++ b/community/perl-fuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71779 2012-06-02 10:30:26Z bluewind $ +# $Id: PKGBUILD 91670 2013-05-26 09:25:07Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-fuse pkgver=0.14 -pkgrel=2 +pkgrel=3 pkgdesc="write filesystems in Perl using FUSE" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Fuse" diff --git a/community/perl-gd/PKGBUILD b/community/perl-gd/PKGBUILD index edb1da252..b51591150 100644 --- a/community/perl-gd/PKGBUILD +++ b/community/perl-gd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86698 2013-03-21 10:52:41Z spupykin $ +# $Id: PKGBUILD 91671 2013-05-26 09:25:08Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+aur@gmail.com> pkgname=perl-gd pkgver=2.49 -pkgrel=1 +pkgrel=2 pkgdesc="Interface to Gd Graphics Library" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/GD" diff --git a/community/perl-gnome2-wnck/PKGBUILD b/community/perl-gnome2-wnck/PKGBUILD index 56b07a88d..beac8756e 100644 --- a/community/perl-gnome2-wnck/PKGBUILD +++ b/community/perl-gnome2-wnck/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87815 2013-04-07 02:33:26Z bgyorgy $ +# $Id: PKGBUILD 91672 2013-05-26 09:25:09Z bluewind $ # Maintainer Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=perl-gnome2-wnck pkgver=0.16 -pkgrel=7 +pkgrel=8 pkgdesc="Perl interface to the Window Navigator Construction Kit" arch=('i686' 'x86_64' 'mips64el') license=("GPL" "PerlArtistic") diff --git a/community/perl-gssapi/PKGBUILD b/community/perl-gssapi/PKGBUILD index 095078f27..0a50fbdb8 100644 --- a/community/perl-gssapi/PKGBUILD +++ b/community/perl-gssapi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71785 2012-06-02 10:30:38Z bluewind $ +# $Id: PKGBUILD 91673 2013-05-26 09:25:11Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-gssapi pkgver=0.28 -pkgrel=6 +pkgrel=7 pkgdesc="Perl/CPAN Module GSSAPI" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/GSSAPI" diff --git a/community/perl-gstreamer-interfaces/PKGBUILD b/community/perl-gstreamer-interfaces/PKGBUILD index 119ef1882..01dd3220b 100644 --- a/community/perl-gstreamer-interfaces/PKGBUILD +++ b/community/perl-gstreamer-interfaces/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71789 2012-06-02 10:30:46Z bluewind $ +# $Id: PKGBUILD 91675 2013-05-26 09:25:18Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Corrado Primier <bardo@aur.archlinux.org> pkgname=perl-gstreamer-interfaces pkgver=0.06 -pkgrel=5 +pkgrel=6 pkgdesc="GStreamer::Interfaces" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/GStreamer-Interfaces" diff --git a/community/perl-gstreamer/PKGBUILD b/community/perl-gstreamer/PKGBUILD index d5baa978c..744cbac3e 100644 --- a/community/perl-gstreamer/PKGBUILD +++ b/community/perl-gstreamer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86700 2013-03-21 10:53:05Z spupykin $ +# $Id: PKGBUILD 91674 2013-05-26 09:25:14Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=perl-gstreamer pkgver=0.18 -pkgrel=1 +pkgrel=2 pkgdesc="Interface to the GStreamer library" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/GStreamer" diff --git a/community/perl-gtk2-sexy/PKGBUILD b/community/perl-gtk2-sexy/PKGBUILD index a9e2568d0..939abd262 100644 --- a/community/perl-gtk2-sexy/PKGBUILD +++ b/community/perl-gtk2-sexy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71791 2012-06-02 10:30:50Z bluewind $ +# $Id: PKGBUILD 91676 2013-05-26 09:25:19Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Charles Mauch <cmauch@gmail.com> # Creator: Florian Ragwitz <http://search.cpan.org/~/> pkgname=perl-gtk2-sexy pkgver=0.05 -pkgrel=7 +pkgrel=8 pkgdesc="Perl/CPAN Module Gtk2::Sexy" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Gtk2-Sexy" diff --git a/community/perl-gtk2-trayicon/PKGBUILD b/community/perl-gtk2-trayicon/PKGBUILD index 30de9b127..6cac850f1 100644 --- a/community/perl-gtk2-trayicon/PKGBUILD +++ b/community/perl-gtk2-trayicon/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71793 2012-06-02 10:30:54Z bluewind $ +# $Id: PKGBUILD 91677 2013-05-26 09:25:21Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-gtk2-trayicon pkgver=0.06 -pkgrel=9 +pkgrel=10 pkgdesc="Perl interface to the EggTrayIcon library" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Gtk2-TrayIcon/" diff --git a/community/perl-gtk2-webkit/PKGBUILD b/community/perl-gtk2-webkit/PKGBUILD index 68833be68..a1a9b800c 100644 --- a/community/perl-gtk2-webkit/PKGBUILD +++ b/community/perl-gtk2-webkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71795 2012-06-02 10:30:58Z bluewind $ +# $Id: PKGBUILD 91678 2013-05-26 09:25:22Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=perl-gtk2-webkit pkgver=0.09 -pkgrel=3 +pkgrel=4 pkgdesc="Gtk2::WebKit" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Gtk2-WebKit" diff --git a/community/perl-html-strip/PKGBUILD b/community/perl-html-strip/PKGBUILD index 820c36d81..66907cd50 100644 --- a/community/perl-html-strip/PKGBUILD +++ b/community/perl-html-strip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71797 2012-06-02 10:31:02Z bluewind $ +# $Id: PKGBUILD 91679 2013-05-26 09:25:24Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-html-strip pkgver=1.06 -pkgrel=8 +pkgrel=9 pkgdesc="Perl/CPAN Module HTML::Strip" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/~kilinrax/HTML-Strip/" diff --git a/community/perl-inline-java/PKGBUILD b/community/perl-inline-java/PKGBUILD index f6042cbf6..40d874ee6 100644 --- a/community/perl-inline-java/PKGBUILD +++ b/community/perl-inline-java/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71799 2012-06-02 10:31:06Z bluewind $ +# $Id: PKGBUILD 91680 2013-05-26 09:25:26Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> pkgname=perl-inline-java pkgver=0.53 -pkgrel=4 +pkgrel=5 pkgdesc="The Inline::Java module allows you to put Java source code directly inline in a Perl script or module." arch=('i686' 'x86_64' 'mips64el') depends=('perl' 'perl-inline' 'java-runtime') diff --git a/community/perl-io-dirent/PKGBUILD b/community/perl-io-dirent/PKGBUILD index d27c607e0..5ebf46b34 100644 --- a/community/perl-io-dirent/PKGBUILD +++ b/community/perl-io-dirent/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71801 2012-06-02 10:31:10Z bluewind $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 91681 2013-05-26 09:25:30Z bluewind $ +# Maintainer: Sébastien Luttringer pkgname=perl-io-dirent pkgver=0.05 -pkgrel=2 +pkgrel=3 pkgdesc='Perl IO::Dirent module - Access to dirent structs returned by readdir' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') @@ -28,4 +28,4 @@ package() { make install DESTDIR="$pkgdir/" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/perl-io-tty/PKGBUILD b/community/perl-io-tty/PKGBUILD index 33593d4f0..3899cd93f 100644 --- a/community/perl-io-tty/PKGBUILD +++ b/community/perl-io-tty/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71803 2012-06-02 10:31:14Z bluewind $ +# $Id: PKGBUILD 91682 2013-05-26 09:25:34Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Charles Mauch <cmauch@gmail.com> pkgname=perl-io-tty pkgver=1.10 -pkgrel=2 +pkgrel=3 pkgdesc="Provide an interface to TTYs and PTYs" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/IO-Tty/" diff --git a/community/perl-json-xs/PKGBUILD b/community/perl-json-xs/PKGBUILD index 773cf0b9e..66b930adb 100644 --- a/community/perl-json-xs/PKGBUILD +++ b/community/perl-json-xs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82882 2013-01-25 09:56:15Z spupykin $ +# $Id: PKGBUILD 91683 2013-05-26 09:25:38Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> pkgname=perl-json-xs pkgver=2.33 -pkgrel=1 +pkgrel=2 pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast" url="http://search.cpan.org/dist/JSON-XS/" license=("GPL") diff --git a/community/perl-lchown/PKGBUILD b/community/perl-lchown/PKGBUILD index 1984b2eb9..c8ba16422 100644 --- a/community/perl-lchown/PKGBUILD +++ b/community/perl-lchown/PKGBUILD @@ -2,7 +2,7 @@ pkgname=perl-lchown pkgver=1.01 -pkgrel=1 +pkgrel=2 pkgdesc="use the lchown(2) system call from Perl" arch=(i686 x86_64 mips64el) license=(PerlArtistic GPL) @@ -12,7 +12,6 @@ url=https://metacpan.org/release/Lchown source=("http://search.cpan.org/CPAN/authors/id/N/NC/NCLEATON/Lchown-${pkgver}.tar.gz") md5sums=(e3db31be650437eb5d9bfc4da6252ee3) sha512sums=(f3b7bf7b3b71a7d92449d4ae8249d76b456869e48105db401a49f39f687ee5d97e079485fb2bbaae991a3a27d408959fc132b843c6f69487eeb2958c85f683a8) -_distdir="${srcdir}/Lchown-${pkgver}" build() ( @@ -22,7 +21,7 @@ build() PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/Lchown-${pkgver}" /usr/bin/perl Build.PL ./Build ) @@ -30,12 +29,12 @@ build() check() ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" + cd "${srcdir}/Lchown-${pkgver}" ./Build test ) package() { - cd "$_distdir" + cd "${srcdir}/Lchown-${pkgver}" ./Build install find "$pkgdir" -name .packlist -o -name perllocal.pod -delete } diff --git a/community/perl-linux-pid/PKGBUILD b/community/perl-linux-pid/PKGBUILD index 44c6e2894..17808ec64 100644 --- a/community/perl-linux-pid/PKGBUILD +++ b/community/perl-linux-pid/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 86747 2013-03-21 21:01:12Z eric $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 91685 2013-05-26 09:25:43Z bluewind $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Generator : CPANPLUS::Dist::Arch 1.12 pkgname='perl-linux-pid' pkgver='0.04' -pkgrel='2' +pkgrel='3' pkgdesc="Interface to Linux getpp?id functions" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic' 'GPL') options=('!emptydirs') depends=('perl') url='http://search.cpan.org/dist/Linux-Pid' -source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-$pkgver.tar.gz') +source=(http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-$pkgver.tar.gz) md5sums=('130c4d299f827abf1f2285fddf03fccb') build() { diff --git a/community/perl-mail-box-parser-c/PKGBUILD b/community/perl-mail-box-parser-c/PKGBUILD index 3cbc720ce..a4299f106 100644 --- a/community/perl-mail-box-parser-c/PKGBUILD +++ b/community/perl-mail-box-parser-c/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71811 2012-06-02 10:31:30Z bluewind $ +# $Id: PKGBUILD 91686 2013-05-26 09:25:45Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-mail-box-parser-c pkgver=3.006 -pkgrel=8 +pkgrel=9 pkgdesc="Perl/CPAN Module Mail::Box::Parser::C : extends MailBox with the speed of C" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/Mail-Box-Parser-C" diff --git a/community/perl-mail-transport-dbx/PKGBUILD b/community/perl-mail-transport-dbx/PKGBUILD index 8742685cb..8cb763a47 100644 --- a/community/perl-mail-transport-dbx/PKGBUILD +++ b/community/perl-mail-transport-dbx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71813 2012-06-02 10:31:34Z bluewind $ +# $Id: PKGBUILD 91687 2013-05-26 09:25:47Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-mail-transport-dbx pkgver=0.07 -pkgrel=8 +pkgrel=9 pkgdesc="Perl/CPAN Module Mail::Transport::Dbx : Parse Outlook Express mailboxes" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/Mail-Transport-Dbx" diff --git a/community/perl-net-dbus/PKGBUILD b/community/perl-net-dbus/PKGBUILD index 8f90b6f76..1e2c3bbe7 100644 --- a/community/perl-net-dbus/PKGBUILD +++ b/community/perl-net-dbus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71815 2012-06-02 10:31:38Z bluewind $ +# $Id: PKGBUILD 91688 2013-05-26 09:25:48Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-net-dbus pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Binding for DBus messaging protocol" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Net-DBus" diff --git a/community/perl-net-libidn/PKGBUILD b/community/perl-net-libidn/PKGBUILD index 33c45f4b2..a35d9245f 100644 --- a/community/perl-net-libidn/PKGBUILD +++ b/community/perl-net-libidn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71817 2012-06-02 10:31:42Z bluewind $ +# $Id: PKGBUILD 91689 2013-05-26 09:25:49Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-net-libidn pkgver=0.12 -pkgrel=6 +pkgrel=7 pkgdesc="Perl/CPAN Module Net::LibIDN" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/Net-LibIDN/" diff --git a/community/perl-package-stash-xs/PKGBUILD b/community/perl-package-stash-xs/PKGBUILD index 43c93b42c..805749e53 100644 --- a/community/perl-package-stash-xs/PKGBUILD +++ b/community/perl-package-stash-xs/PKGBUILD @@ -1,17 +1,18 @@ -# Maintainer: Justin Davis <jrcd83@gmail.com> -# $Id: PKGBUILD 86634 2013-03-20 19:09:56Z eric $ +# $Id: PKGBUILD 91690 2013-05-26 09:25:52Z bluewind $ +# Maintainer: Jonathan Steel <mail@jsteel.org> +# Contributor: Justin Davis <jrcd83@gmail.com> pkgname=perl-package-stash-xs pkgver=0.26 -pkgrel=1 +pkgrel=2 pkgdesc="Faster and more correct implementation of the Package::Stash API" arch=(i686 x86_64 mips64el) -license=(PerlArtistic GPL) -options=(!emptydirs) +url="http://search.cpan.org/dist/Package-Stash-XS" +license=('PerlArtistic' 'GPL') depends=('perl') makedepends=('perl-extutils-makemaker') checkdepends=('perl-test-fatal' 'perl-test-simple' 'perl-test-requires') -url="http://search.cpan.org/dist/Package-Stash-XS" +options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-${pkgver}.tar.gz") md5sums=('33b07af6344d4a16ecd4e9ae3fa48984') diff --git a/community/perl-params-classify/PKGBUILD b/community/perl-params-classify/PKGBUILD index 7518329af..b349b490c 100644 --- a/community/perl-params-classify/PKGBUILD +++ b/community/perl-params-classify/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71821 2012-06-02 10:31:50Z bluewind $ +# $Id: PKGBUILD 91691 2013-05-26 09:25:54Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-params-classify pkgver=0.013 -pkgrel=2 +pkgrel=3 pkgdesc="argument type classification" arch=(i686 x86_64 'mips64el') license=('PerlArtistic') @@ -17,6 +17,10 @@ build() { cd $srcdir/Params-Classify-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Params-Classify-$pkgver make install DESTDIR=${pkgdir} find ${pkgdir} -name perllocal.pod -delete find ${pkgdir} -name .packlist -delete diff --git a/community/perl-params-util/PKGBUILD b/community/perl-params-util/PKGBUILD index 229eec160..d7a3cab2d 100644 --- a/community/perl-params-util/PKGBUILD +++ b/community/perl-params-util/PKGBUILD @@ -1,23 +1,22 @@ -# Maintainer: Justin Davis (juster) <jrcd83@gmail.com> -# $Id: PKGBUILD 72466 2012-06-15 00:05:46Z juster $ +# $Id: PKGBUILD 91692 2013-05-26 09:25:55Z bluewind $ +# Maintainer: Jonathan Steel <mail@jsteel.org> +# Contributor: Justin Davis (juster) <jrcd83@gmail.com> pkgname=perl-params-util pkgver=1.07 -pkgrel=1 +pkgrel=2 pkgdesc='Simple, compact and correct param-checking functions' arch=(i686 x86_64 mips64el) -license=(PerlArtistic GPL) -options=(!emptydirs) -depends=('perl>=5.5.30') -url=https://metacpan.org/release/Params-Util +url="https://metacpan.org/release/Params-Util" +license=('PerlArtistic' 'GPL') +depends=('perl') +options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-$pkgver.tar.gz") -md5sums=(02db120c0eef87aae1830cc62bdec37b) -sha512sums=(ff471b01b33414fc5e1c68d97c21171a95d3418c33e3c45f9910cc768898690e35051506a83ad9403a200336654c14b8efc9d471c4b3fe3321047a7603d6fd56) -_dir="$srcdir/Params-Util-$pkgver" +sha256sums=('30f1ec3f2cf9ff66ae96f973333f23c5f558915bb6266881eac7423f52d7c76c') build() ( - cd "$_dir" + cd "$srcdir/Params-Util-$pkgver" export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps unset PERL5LIB PERL_MM_OPT /usr/bin/perl Makefile.PL @@ -26,7 +25,7 @@ build() check() ( - cd "$_dir" + cd "$srcdir/Params-Util-$pkgver" export PERL_MM_USE_DEFAULT=1 unset PERL5LIB make test @@ -34,7 +33,7 @@ check() package() ( - cd "$_dir" + cd "$srcdir/Params-Util-$pkgver" make install INSTALLDIRS=vendor DESTDIR="$pkgdir" find "$pkgdir" -name .packlist -o -name perllocal.pod -delete ) diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD index acd7959e3..c868ca892 100644 --- a/community/perl-params-validate/PKGBUILD +++ b/community/perl-params-validate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79319 2012-11-02 19:11:19Z spupykin $ +# $Id: PKGBUILD 91693 2013-05-26 09:25:57Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-params-validate pkgver=1.07 -pkgrel=1 +pkgrel=2 pkgdesc="Validate sub params against a spec" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Params-Validate" diff --git a/community/perl-string-crc32/PKGBUILD b/community/perl-string-crc32/PKGBUILD index 08bc5c316..45af750c0 100644 --- a/community/perl-string-crc32/PKGBUILD +++ b/community/perl-string-crc32/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71827 2012-06-02 10:32:02Z bluewind $ +# $Id: PKGBUILD 91694 2013-05-26 09:26:00Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-string-crc32 pkgver=1.4 -pkgrel=8 +pkgrel=9 pkgdesc="Perl/CPAN Module String::CRC32 : ZMODEMlike CRC32 generation" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/String-CRC32" diff --git a/community/perl-term-readline-gnu/PKGBUILD b/community/perl-term-readline-gnu/PKGBUILD index ea03ba7f4..579c2929b 100644 --- a/community/perl-term-readline-gnu/PKGBUILD +++ b/community/perl-term-readline-gnu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83559 2013-02-03 00:44:54Z dwallace $ +# $Id: PKGBUILD 91695 2013-05-26 09:26:04Z bluewind $ # CPAN Name : Term-ReadLine-Gnu # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: jason ryan <jasonwryan@gmail.com> @@ -7,7 +7,7 @@ pkgname=perl-term-readline-gnu pkgver=1.20 -pkgrel=5 +pkgrel=6 pkgdesc="GNU Readline XS library wrapper" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic' 'GPL') @@ -18,7 +18,6 @@ source=('http://search.cpan.org/CPAN/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1 'termcap-bad-ncurses-good.patch') md5sums=('fa33510193b89a2ada74fcef00816322' 'a000706b89792f822b5ec20baa370910') -_distdir="${srcdir}/Term-ReadLine-Gnu-1.20" build() { export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -27,21 +26,20 @@ build() { PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/Term-ReadLine-Gnu-1.20" patch --forward -p1 < "${srcdir}/termcap-bad-ncurses-good.patch" /usr/bin/perl Makefile.PL make - } check() { - cd "$_distdir" + cd "${srcdir}/Term-ReadLine-Gnu-1.20" export PERL_MM_USE_DEFAULT=1 PERL5LIB="" make test } package() { - cd "$_distdir" + cd "${srcdir}/Term-ReadLine-Gnu-1.20" make pure_install PERL_INSTALL_ROOT="$pkgdir" find "$pkgdir" -name .packlist -o -name perllocal.pod -delete } diff --git a/community/perl-text-charwidth/PKGBUILD b/community/perl-text-charwidth/PKGBUILD index 1056ade3c..30e54d76c 100644 --- a/community/perl-text-charwidth/PKGBUILD +++ b/community/perl-text-charwidth/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71829 2012-06-02 10:32:06Z bluewind $ +# $Id: PKGBUILD 91696 2013-05-26 09:26:06Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-text-charwidth pkgver=0.04 -pkgrel=8 +pkgrel=9 pkgdesc="Perl/CPAN Module Text::CharWidth" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/Text-CharWidth" diff --git a/community/perl-text-kakasi/PKGBUILD b/community/perl-text-kakasi/PKGBUILD index 724ce4b8c..5f43e4479 100644 --- a/community/perl-text-kakasi/PKGBUILD +++ b/community/perl-text-kakasi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71831 2012-06-02 10:32:12Z bluewind $ +# $Id: PKGBUILD 91697 2013-05-26 09:26:08Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Allan McRae <mcrae_allan@hotmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-text-kakasi pkgver=2.04 -pkgrel=9 +pkgrel=10 pkgdesc="Perl frontend to kakasi" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Text-Kakasi" diff --git a/community/perl-tie-hash-indexed/PKGBUILD b/community/perl-tie-hash-indexed/PKGBUILD index 02446da64..746ad3c50 100644 --- a/community/perl-tie-hash-indexed/PKGBUILD +++ b/community/perl-tie-hash-indexed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71833 2012-06-02 10:32:16Z bluewind $ +# $Id: PKGBUILD 91698 2013-05-26 09:26:10Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-tie-hash-indexed pkgver=0.05 -pkgrel=8 +pkgrel=9 pkgdesc="Ordered hashes for Perl" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Tie-Hash-Indexed" diff --git a/community/perl-tk-tablematrix/PKGBUILD b/community/perl-tk-tablematrix/PKGBUILD index a4add0047..509a84f54 100644 --- a/community/perl-tk-tablematrix/PKGBUILD +++ b/community/perl-tk-tablematrix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71835 2012-06-02 10:32:20Z bluewind $ +# $Id: PKGBUILD 91699 2013-05-26 09:26:12Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-tk-tablematrix pkgver=1.23 -pkgrel=9 +pkgrel=10 pkgdesc="Display data in TableSpreadsheet format" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/Tk-TableMatrix" diff --git a/community/perl-www-curl/PKGBUILD b/community/perl-www-curl/PKGBUILD index 2ee3f68a1..d6d030cbd 100644 --- a/community/perl-www-curl/PKGBUILD +++ b/community/perl-www-curl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71837 2012-06-02 10:32:24Z bluewind $ +# $Id: PKGBUILD 91700 2013-05-26 09:26:14Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-www-curl pkgver=4.15 -pkgrel=3 +pkgrel=4 pkgdesc="Perl/CPAN Module WWW::Curl" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/WWW-Curl/" diff --git a/community/perl-xml-fast/PKGBUILD b/community/perl-xml-fast/PKGBUILD index e0f140e60..9388cb5b2 100644 --- a/community/perl-xml-fast/PKGBUILD +++ b/community/perl-xml-fast/PKGBUILD @@ -1,10 +1,10 @@ -$Id: PKGBUILD 76693 2012-09-27 04:18:50Z dwallace $ +# $Id: PKGBUILD 91701 2013-05-26 09:26:15Z bluewind $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: trizen .= x@gmail.com pkgname=perl-xml-fast pkgver=0.11 -pkgrel=3 +pkgrel=4 pkgdesc="Simple and very fast XML to hash conversion." arch=('x86_64' 'i686' 'mips64el') url="http://search.cpan.org/dist/XML-Fast/" diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD index 040e569df..5ba9a9447 100644 --- a/community/perl-xml-libxml/PKGBUILD +++ b/community/perl-xml-libxml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89886 2013-05-04 19:42:51Z jsteel $ +# $Id: PKGBUILD 91702 2013-05-26 09:26:18Z bluewind $ # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> # Contributor: Justin "juster" Davis <jrcd83@gmail.com> # Contributor: François Charette <francois.archlinux.org> pkgname=perl-xml-libxml -pkgver=2.0016 +pkgver=2.0018 pkgrel=1 pkgdesc="Interface to the libxml library" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ conflicts=('perl-libxml' 'perl-xml-libxml-common') options=('!emptydirs') install=perl-xml-libxml.install source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz) -md5sums=('d3bbc3437f6b39eca5825e9d0b0c187a') +md5sums=('c5db1c6ba5f588802a5e1a15b5b6d653') build() { cd XML-LibXML-$pkgver diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD index 09a6ce057..2379f6f5d 100644 --- a/community/perl-xml-libxslt/PKGBUILD +++ b/community/perl-xml-libxslt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86669 2013-03-21 01:03:52Z eric $ +# $Id: PKGBUILD 91703 2013-05-26 09:26:22Z bluewind $ # Maintainer: Justin "juster" Davis <jrcd83@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-xml-libxslt pkgver=1.80 -pkgrel=1 +pkgrel=2 pkgdesc="Interface to the gnome libxslt library" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/XML-LibXSLT" diff --git a/community/perl-xmms/PKGBUILD b/community/perl-xmms/PKGBUILD index 2fbdc9113..1c2acdfd0 100644 --- a/community/perl-xmms/PKGBUILD +++ b/community/perl-xmms/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71843 2012-06-02 10:32:38Z bluewind $ +# $Id: PKGBUILD 91704 2013-05-26 09:26:24Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Georg Grabler <ggrabler@gmail.com> pkgname=perl-xmms pkgver=0.12 -pkgrel=8 +pkgrel=9 pkgdesc="Bundle::Xmms - Bundle for xmms remote control shell" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/~dougm/Xmms-Perl/" diff --git a/community/pork/PKGBUILD b/community/pork/PKGBUILD index 0f2291598..87c643a98 100644 --- a/community/pork/PKGBUILD +++ b/community/pork/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71845 2012-06-02 10:32:42Z bluewind $ +# $Id: PKGBUILD 91705 2013-05-26 09:26:27Z bluewind $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=pork pkgver=0.99.8.1 -pkgrel=6 +pkgrel=7 pkgdesc="Console-based AOL Instant Messenger & IRC client" arch=('i686' 'x86_64' 'mips64el') url="http://dev.ojnk.net/" diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD index 9a5b7daef..00069ada2 100644 --- a/community/pound/PKGBUILD +++ b/community/pound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90705 2013-05-13 14:34:19Z spupykin $ +# $Id: PKGBUILD 91868 2013-05-28 17:43:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=pound pkgver=2.6 -pkgrel=4 +pkgrel=5 pkgdesc="A reverse proxy, load balancer, and SSL wrapper" arch=('i686' 'x86_64' 'mips64el') url="http://www.apsis.ch/pound/index_html" @@ -17,13 +17,13 @@ source=(http://www.apsis.ch/pound/Pound-$pkgver.tgz pound.service pound.cfg) md5sums=('8c913b527332694943c4c67c8f152071' - '4bd5e2a8d8e707eb900ae88929e00d4c' - '23c70776fcd1cf71572f90a8809f7408' + '2a555ee5871a849cb1f6e6ba2ff054df' + 'c0d0726a96dfda0e83843362e401b3dc' '8937808acd22c6391ebe4340af8df854') build() { cd $srcdir/Pound-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc/pound + ./configure --prefix=/usr --sysconfdir=/etc/pound --sbindir=/usr/bin make } diff --git a/community/pound/pound.runit b/community/pound/pound.runit index ed59ea046..ae904583c 100644 --- a/community/pound/pound.runit +++ b/community/pound/pound.runit @@ -4,7 +4,7 @@ exec 2>&1 . /etc/rc.conf . /etc/rc.d/functions -BIN=/usr/sbin/pound +BIN=/usr/bin/pound OPTS="-f /etc/pound/pound.cfg -p /var/run/pound.pid" SVC=pound diff --git a/community/pound/pound.service b/community/pound/pound.service index 0a91f3424..5ec089c9a 100644 --- a/community/pound/pound.service +++ b/community/pound/pound.service @@ -3,8 +3,8 @@ Description=A reverse proxy, load balancer, and SSL wrapper [Service] Type=forking -PIDFile=/var/run/pound.pid -ExecStart=/usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid +PIDFile=/run/pound.pid +ExecStart=/usr/bin/pound -f /etc/pound/pound.cfg -p /run/pound.pid [Install] WantedBy=multi-user.target diff --git a/community/pptpd/PKGBUILD b/community/pptpd/PKGBUILD index 9818d82a0..db5d84eea 100644 --- a/community/pptpd/PKGBUILD +++ b/community/pptpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90707 2013-05-13 14:34:48Z spupykin $ +# $Id: PKGBUILD 91528 2013-05-23 11:16:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=pptpd pkgver=1.3.4 -pkgrel=12 +pkgrel=13 pkgdesc="Poptop server" arch=(i686 x86_64 'mips64el') url="http://poptop.sourceforge.net/" @@ -14,7 +14,7 @@ source=(http://downloads.sourceforge.net/sourceforge/poptop/pptpd-$pkgver.tar.gz pptpd.service unrecognized-opt.patch) md5sums=('b38df9c431041922c997c1148bedf591' - '144c17c7d5c1b95cfb3450eb73aa2e50' + 'f17df2a137282adbd04c75dd25784a9c' 'cfa02c86d0413eb94fac15599986f54c') build() { @@ -26,7 +26,12 @@ build() { patch -p1 <$srcdir/unrecognized-opt.patch sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g' configure.in autoreconf -i - ./configure --prefix=/usr --libdir=/usr/lib --exec-prefix=/usr --mandir=/usr/share/man + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + --sbindir=/usr/bin \ + --exec-prefix=/usr \ + --mandir=/usr/share/man sed -i "s|#define VERSION.*|#define VERSION \"${_pppver}\"|" plugins/patchlevel.h make sed -i 's|install -o root|install|g' plugins/Makefile diff --git a/community/pptpd/pptpd.service b/community/pptpd/pptpd.service index 739508b60..c907c0b9f 100644 --- a/community/pptpd/pptpd.service +++ b/community/pptpd/pptpd.service @@ -3,7 +3,7 @@ Description=PPTP Server After=network.target [Service] -ExecStart=/usr/sbin/pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid -f +ExecStart=/usr/bin/pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid -f StandardOutput=null [Install] diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD index e4a8509ca..63ef3cdaa 100644 --- a/community/processing/PKGBUILD +++ b/community/processing/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 85228 2013-02-27 19:59:51Z andrea $ +# $Id: PKGBUILD 91372 2013-05-21 10:01:44Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=processing -pkgver=2.0b8 +pkgver=2.0b9 pkgrel=1 arch=('x86_64' 'i686') pkgdesc='Programming language and environment for creating images, animations and interactions' @@ -15,19 +15,19 @@ options=(!strip) if [ "$CARCH" == "x86_64" ]; then source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux64.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('5eab47cd67f3160a71ff694b45e74f8a17f0b0ca31cd3ae545104fb70babb58e' + sha256sums=('df6ab1042a09e72dec6eee8ae3bf21ed2fb47fc1eb63668960bea31a6cd62108' '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') else source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux32.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('ba113199c5ca3c0d9a274088a62eacd6c3872dea9151e34ed1f312d78bad6f17' + sha256sums=('9a1cc4b41c3eee3835347bc198252a2b30fea1c811abda18a42e295b5544048b' '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') fi -build() { +prepare() { cd "$srcdir" - gendesk + gendesk --pkgname="$pkgname" --pkgdesc="$pkgdesc" } package() { diff --git a/community/procstatd/PKGBUILD b/community/procstatd/PKGBUILD index 35a4f35a7..846b045f8 100644 --- a/community/procstatd/PKGBUILD +++ b/community/procstatd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66164 2012-02-23 02:23:03Z spupykin $ +# $Id: PKGBUILD 91870 2013-05-28 17:44:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Jason Chu <jason@archlinux.org> pkgname=procstatd pkgver=1.4.2 -pkgrel=6.1 +pkgrel=8 pkgdesc="A daemon that can be run either from userspace or inetd that can be queried via a simple API to parse various files in /proc" arch=('i686 x86_64' 'mips64el') license=('GPL') @@ -17,8 +17,12 @@ md5sums=('1fdeaf05ca6337f5c02e76a76c53c407') build() { cd $srcdir/$pkgname # Get rid of the funky make install forever bug - sed -i 's/make install/echo/;s/cd watchman/echo/' Makefile + sed -i 's/make install/echo/;s/cd watchman/echo/;s@$(INSTDIR)/sbin@$(INSTDIR)/bin@' Makefile make +} + +package() { + cd $srcdir/$pkgname make INSTDIR=$pkgdir/usr install mkdir ${pkgdir}/usr/share mv ${pkgdir}/usr/man ${pkgdir}/usr/share/man diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index cd822c75c..527e56025 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=puzzles -pkgver=9838 +pkgver=9840 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index 3f56285fe..e66640a6e 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86969 2013-03-25 14:30:39Z arodseth $ +# $Id: PKGBUILD 91711 2013-05-26 13:45:28Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Jelle van der Waa <jelle@vdwaa.nl> pkgbase=python-pymongo pkgname=('python-pymongo' 'python2-pymongo') -pkgver=2.5 +pkgver=2.5.1 pkgrel=1 pkgdesc='Python driver for MongoDB' arch=('x86_64' 'i686' 'mips64el') @@ -13,7 +13,7 @@ license=('APACHE') url='http://pypi.python.org/pypi/pymongo/' makedepends=('python-distribute' 'python2-distribute') source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") -sha256sums=('79aff1c77ec6be6158a4d1a11002400ee0eb8f74dc6f4f67527f59bfac78c222') +sha256sums=('85949837c807b19af6c3972e311a6eaaae6b2b6e15daa1d207a296b8d2027d36') build() { cd "$srcdir" diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index 8fae12b29..2a94c6e94 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,57 +1,69 @@ -# $Id: PKGBUILD 90083 2013-05-06 19:39:17Z foutrelis $ +# $Id: PKGBUILD 91930 2013-05-29 16:59:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Giovanni Scafora <linuxmania@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=qcad -pkgver=2.0.5.0 -pkgrel=12 +pkgver=3.0.14.0 +pkgrel=1 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64' 'mips64el') url="http://www.ribbonsoft.com/qcad.html" license=('GPL2') -depends=('qt3') +depends=('qtwebkit') makedepends=('glu') options=(libtool) -source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz - qcad.xpm - QCad.desktop - qcad-intptr.patch - qcad.patch) -md5sums=('96b6a56027782aec953c9c4e64c5998c' - 'da32fec0d2fb85d96126bf28bb0ab9ff' - 'b4d1eb6724b4b41f191f1ab6fd859c39' - '92f900fe1fd3a8f841232b587b49c7da' - '7e6779b1e3b10da1eb4daf36d93f8479') -# http://ghost1227.com/files/misc/qm.tar.gz) +#source=(https://github.com/qcad/qcad/archive/v${pkgver}.zip +source=(http://cl.ly/1u1Y3H290M1S/download/qcad-v${pkgver}.zip + QCad.desktop) +md5sums=('6f52fe016e915850ba942fa760909d4c' + '8c4288986b78b14a813b005e81b6ba53') + +prepare() { + cd ${srcdir} + + sed -i '1,1i#include <unistd.h>' src/core/{RLocalPeer,RS}.cpp + sed -i '1,1i#include <sys/sysinfo.h>' src/core/{RScriptHandler,RS}.cpp +} build() { - cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src - - [ "$CARCH" = "x86_64" ] && { - patch -p1 < ../qcad-intptr.patch; - sed -i '1,1i#include <stdint.h>' qcadlib/src/engine/rs_layer.cpp qcadlib/src/engine/rs_entity.cpp; - } - patch -p1 < ../qcad.patch - sed -i "s:"-pedantic"::g" mkspecs/defs.pro - - cd scripts - sed -i "s|INCLUDEPATH += ../include|INCLUDEPATH += ../include /usr/include/qt3|" ../*/src/*.pro - sed -i "s|../../qcadlib/include|../../qcadlib/include /usr/include/qt3|" ../qcad/src/qcad.pro - sed -i "s/qmake/qmake-qt3/" build_qcad.sh - sed -i 's|eval $MAKE|sed -i "s/-lqt/-lqt-mt/" ../qcad/src/Makefile;eval $MAKE|' build_qcad.sh - QTDIR=/usr/lib/qt3 ./build_qcad.sh notrans + cd ${srcdir} + + qmake-qt4 + make PREFIX=/usr CXX="g++ -fpermissive" } package() { - cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad - - install -D -m755 qcad ${pkgdir}/usr/bin/qcad - install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications} - install -m644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm - install -m644 ../../QCad.desktop \ - ${pkgdir}/usr/share/applications/QCad.desktop - cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad - #cp -r ${srcdir}/qm ${pkgdir}/usr/share/qcad/ + cd ${srcdir} + + # remove project files + find . \( -name '*.pri' -or -name '.pro' -or -name '*.ts' \) -delete + find . \( -name 'Makefile' -name '.gitignore' \) -delete + + install -dm755 ${pkgdir}/usr/share/{qcad,pixmaps,applications} + cp -r examples fonts libraries patterns plugins scripts ts ${pkgdir}/usr/share/qcad + cp release/* ${pkgdir}/usr/share/qcad + + install -m755 qcad ${pkgdir}/usr/share/qcad/qcad + install -m755 readme.txt ${pkgdir}/usr/share/qcad/readme.txt + + # qtwebkit + ln -s /usr/lib/qt4/plugins/designer/libqwebview.so ${pkgdir}/usr/share/qcad/plugins/designer/libqwebview.so + # qt + for sofiles in /usr/lib/qt4/plugins/imageformats/*.so + do + ln -s ${sofiles} ${pkgdir}/usr/share/qcad/plugins/imageformats/${sofiles##/*/} + done + for sofiles in /usr/lib/qt4/plugins/sqldrivers/*.so + do + ln -s ${sofiles} ${pkgdir}/usr/share/qcad/plugins/sqldrivers/${sofiles##/*/} + done + + install -Dm644 scripts/qcad_icon.png ${pkgdir}/usr/share/pixmaps/qcad_icon.png + install -Dm644 QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop + + install -dm0755 $pkgdir/usr/bin + echo -e '#!/bin/sh\ncd /usr/share/qcad\nexec ./qcad' >$pkgdir/usr/bin/qcad + chmod 0755 $pkgdir/usr/bin/qcad } diff --git a/community/qcad/QCad.desktop b/community/qcad/QCad.desktop index a55f5940f..5841b786e 100644 --- a/community/qcad/QCad.desktop +++ b/community/qcad/QCad.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 -Exec=/usr/bin/qcad -Icon=/usr/share/pixmaps/qcad.xpm +Exec=/usr/share/qcad/qcad +Icon=/usr/share/pixmaps/qcad_icon.png Name=QCad StartupNotify=true Terminal=false diff --git a/community/qcad/qcad-intptr.patch b/community/qcad/qcad-intptr.patch deleted file mode 100644 index 6d8b6acca..000000000 --- a/community/qcad/qcad-intptr.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp ---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp 2004-09-14 15:13:02.000000000 -0500 -+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp 2006-06-23 14:21:40.000000000 -0500 -@@ -849,7 +849,7 @@ - os << " layer: NULL "; - } else { - os << " layer: " << e.layer->getName().latin1() << " "; -- os << " layer address: " << (int)(e.layer) << " "; -+ os << " layer address: " << (intptr_t)(e.layer) << " "; - } - - os << e.pen << "\n"; -diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp ---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp 2004-09-14 15:13:02.000000000 -0500 -+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp 2006-06-23 14:21:23.000000000 -0500 -@@ -57,7 +57,7 @@ - os << " name: " << l.getName().latin1() - << " pen: " << l.getPen() - << " frozen: " << (int)l.isFrozen() -- << " address: " << (int)(&l) -+ << " address: " << (intptr_t)(&l) - << std::endl; - return os; - } diff --git a/community/qcad/qcad.patch b/community/qcad/qcad.patch deleted file mode 100644 index f051f29af..000000000 --- a/community/qcad/qcad.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -aur qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h ---- qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h 2008-12-11 22:29:51.000000000 +0100 -@@ -37,6 +37,7 @@ - #endif - - #include <iostream> -+#include <cstring> - - #include "dl_attributes.h" - #include "dl_codes.h" -diff -aur qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp ---- qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp 2008-12-11 22:29:51.000000000 +0100 -@@ -23,7 +23,7 @@ - ** not clear to you. - ** - **********************************************************************/ -- -+#include <cstdlib> - #include "rs_actionzoompan.h" - #include "rs_snapper.h" - #include "rs_point.h" -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.orig.rej. -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.rej. -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.orig.rej. -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.rej. -diff -aur qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp ---- qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp 2008-12-11 22:30:18.000000000 +0100 -@@ -25,7 +25,7 @@ - **********************************************************************/ - - #include "rs_information.h" -- -+#include <cstdlib> - #include "rs_constructionline.h" - - -diff -aur qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh ---- qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh 2008-12-11 22:31:37.000000000 +0100 -@@ -16,9 +16,6 @@ - echo " distcc use distcc for distributed compilation. DISTCC_HOSTS must be set." - echo - --echo "QTDIR is: $QTDIR" --echo "QMAKESPEC is: $QMAKESPEC" -- - # detect system: - if [ "x$OS" == "xWindows_NT" ] - then diff --git a/community/qcad/qcad.xpm b/community/qcad/qcad.xpm deleted file mode 100644 index e747fa984..000000000 --- a/community/qcad/qcad.xpm +++ /dev/null @@ -1,132 +0,0 @@ -/* XPM */ -static const char * qcad_xpm[] = { -"32 32 97 2", -" c None", -". c #3F3F3F", -"+ c #010180", -"@ c #FFFFFF", -"# c #E0E0EF", -"$ c #41419F", -"% c #4545A1", -"& c #4949A3", -"* c #4D4DA5", -"= c #5151A7", -"- c #5555A9", -"; c #5959AB", -"> c #4444A2", -", c #3C3C9D", -"' c #40409F", -") c #4444A1", -"! c #4848A3", -"~ c #4C4CA5", -"{ c #5050A7", -"] c #5454A9", -"^ c #5858AB", -"/ c #5D5DAD", -"( c #6161AF", -"_ c #6565B1", -": c #5C5CAD", -"< c #6060AF", -"[ c #6464B1", -"} c #6868B3", -"| c #6C6CB5", -"1 c #7070B7", -"2 c #7474B9", -"3 c #7878BB", -"4 c #3F3F9E", -"5 c #4343A0", -"6 c #4747A3", -"7 c #4B4BA5", -"8 c #000000", -"9 c #7C7CBD", -"0 c #8080BF", -"a c #4747A2", -"b c #4B4BA4", -"c c #4F4FA6", -"d c #7B7BBD", -"e c #7F7FBF", -"f c #8383C1", -"g c #5353A8", -"h c #8787C3", -"i c #5757AA", -"j c #8B8BC5", -"k c #4E4EA6", -"l c #5252A8", -"m c #5656AA", -"n c #5A5AAC", -"o c #8787C2", -"p c #8F8FC7", -"q c #5E5EAE", -"r c #8B8BC4", -"s c #8F8FC6", -"t c #9393C8", -"u c #6262B0", -"v c #8E8EC6", -"w c #9292C8", -"x c #9696CA", -"y c #6666B2", -"z c #9A9ACC", -"A c #6A6AB4", -"B c #9E9ECE", -"C c #6565B2", -"D c #6969B4", -"E c #6D6DB6", -"F c #7171B8", -"G c #7575BA", -"H c #9D9DCE", -"I c #A1A1D0", -"J c #7171B7", -"K c #7575B9", -"L c #7979BC", -"M c #7D7DBE", -"N c #8181C0", -"O c #8585C2", -"P c #8989C4", -"Q c #8D8DC6", -"R c #9191C8", -"S c #9595CA", -"T c #9999CC", -"U c #A5A5D2", -"V c #7979BB", -"W c #7D7DBD", -"X c #8181BF", -"Y c #8585C1", -"Z c #8989C3", -"` c #A9A9D4", -" . c #8D8DC5", -".. c #9191C7", -"+. c #9595C9", -"@. c #9999CB", -"#. c #ADADD6", -" ", -" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -" . . . . . . . . ", -" . . . + + + + + + + . . . ", -" . @ . @ + + # # # # # # # + + @ . @ . @ . ", -" . . . . . . . + # # $ % & * = - ; > > + . . . . . . . . . ", -" . . + # , ' ) ! ~ { ] ^ / ( _ > + . . ", -" . . + # , ' ) ! ~ { ] ^ : < [ } | > + . . ", -" . @ + # , ' ) ! ~ { ] ^ : < [ } | 1 2 > + @ . @ . ", -" . . . . + # ' ) ! . . . . . . . . . 1 2 3 > + . . . . . . ", -" . + # 4 5 6 7 . @ @ @ @ @ @ @ . 8 3 9 0 > + . . ", -" . + # 5 a b c . @ @ @ @ @ @ @ . 8 d e f > + . . ", -" . + # a b c g . @ @ @ @ @ @ @ . 8 e f h > + . @ . ", -" . . . + # b c g i . @ @ @ @ @ @ @ . 8 f h j > + . . . . . ", -" . + # k l m n . @ @ @ @ @ @ @ . 8 o j p > + . . ", -" . + # l m n q . @ @ @ @ @ @ @ . 8 r s t > + . . ", -" . + # m n q u . @ @ @ @ @ @ @ . 8 v w x > + . @ . ", -" . . . + # n q u y . @ @ @ @ @ @ @ . 8 w x z > + . . . . . ", -" . + # q u y A . @ @ @ @ @ @ @ . 8 x z B > + . . ", -" . + > C D E . . . . . . . . . 8 z B > + . . ", -" . @ + > D E F G 8 8 8 8 8 8 8 8 8 H I > + @ . @ . ", -" . . . . . + > J K L M N O P Q R S T H I U + . . . . . . . ", -" . . + > V W X Y Z Q R S T H I U ` > + . . ", -" . . + > > Y Z ...+.@.H > U ` #.#.> + . . ", -" . @ . @ + + > > > > > > > + > #.#.#.> + . @ . ", -" . . . . . . . . . . + + + + + + + . + > #.#.> + . . . . . ", -" . . . . . + > > + . . ", -" . . . . . + + . . ", -" . @ . @ . @ . @ . @ . @ . @ . ", -" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -" ", -" "}; diff --git a/community/qpxtool/PKGBUILD b/community/qpxtool/PKGBUILD index 7bb4da70a..7a34262ed 100644 --- a/community/qpxtool/PKGBUILD +++ b/community/qpxtool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90084 2013-05-06 19:39:19Z foutrelis $ +# $Id: PKGBUILD 91840 2013-05-28 17:05:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Stasiorowski <krzysiekst@gmail.com> pkgname=qpxtool pkgver=0.7.2 -pkgrel=3 +pkgrel=4 pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings." arch=('i686' 'x86_64' 'mips64el') url="http://qpxtool.sourceforge.net/" @@ -24,7 +24,7 @@ build() { -e 's|lrelease|lrelease-qt4|' \ configure patch -p1 <$srcdir/libpng15.patch - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD index d47a1edc8..da26dca53 100644 --- a/community/quassel/PKGBUILD +++ b/community/quassel/PKGBUILD @@ -1,50 +1,90 @@ -# $Id: PKGBUILD 79252 2012-11-01 19:02:54Z mtorromeo $ +# $Id: PKGBUILD 91733 2013-05-26 19:25:26Z jelle $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -pkgname=quassel -pkgver=0.8.0 -pkgrel=2 +pkgbase=quassel +pkgname=('quassel-client' 'quassel-core') +pkgver=0.9.0 +pkgrel=1 pkgdesc="QT4 irc client with a separated core" arch=('i686' 'x86_64' 'mips64el') url="http://quassel-irc.org/" license=('GPL') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=quassel.install -backup=(etc/conf.d/quassel) -source=("http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2" +makedepends=('cmake' 'automoc4' 'qt4' 'icu') +source=("http://quassel-irc.org/pub/quassel-$pkgver.tar.bz2" 'quassel.service' - 'rc.quassel' 'quassel.conf') -sha256sums=('a3515bd18e2b100eb9a72480e76b1faefaa5e84cdb236b6af1f05b477a1e9071' + +sha256sums=('2e3fe06ae3731c829aa3c2f6bb5320619bad264c831f322985c3aa3fe58b6027' '91a1aaae47d41c11aa418dd560039ddbbfb659e02b86379d8c4789c5ada362d3' - '845e621448a51ec181554e9327bfcc3a3de1501ae8f70410f0b9b8991ac171b0' 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8') - build() { + cd $srcdir [[ ! -d build ]] && mkdir build + mkdir build-client + + # Core cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr/ \ - -DWITH_KDE=1 \ + -DWITH_KDE=0 \ + -DCMAKE_BUILD_TYPE="Release" \ + -DWITH_OPENSSL=ON \ + -DWANT_CORE=ON \ + -DWANT_MONO=OFF \ + -DWANT_QTCLIENT=OFF \ + -DWITH_DBUS=OFF \ + -DWITH_OXYGEN=OFF \ + -DWITH_PHONON=OFF \ + -DWITH_WEBKIT=OFF \ + -DCMAKE_BUILD_TYPE="Release" \ + ../quassel-${pkgver}/ \ + -Wno-dev + + make + + # Client + cd $srcdir/build-client + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr/ \ + -DWITH_KDE=0 \ + -DWITH_OPENSSL=ON \ -DCMAKE_BUILD_TYPE="Release" \ - ../${pkgname}-${pkgver}/ \ + -DWANT_CORE=OFF \ + -DWANT_QTCLIENT=ON \ + -DWANT_MONO=ON \ + ../quassel-${pkgver}/ \ -Wno-dev make + } -package() { - cd build +package_quassel-core() { +pkgdesc="Qt4 IRC client with a separated core - core only" +depends=('qt4' 'icu') +backup=(etc/conf.d/quassel) +install=quassel.install + cd $srcdir/build make DESTDIR="${pkgdir}" install + + # Remove unneeded pixmap icons + rm -r $pkgdir/usr/share + + + install -Dm644 "${srcdir}"/$pkgbase.service \ + "${pkgdir}"/usr/lib/systemd/system/$pkgbase.service + install -Dm644 "${srcdir}"/$pkgbase.conf \ + "${pkgdir}"/etc/conf.d/$pkgbase +} + +package_quassel-client() { +pkgdesc="Qt4 IRC client with a separated core - client only" +depends=('qt4') +install=quassel-client.install + cd $srcdir/build-client - install -Dm644 "${srcdir}"/$pkgname.service \ - "${pkgdir}"/usr/lib/systemd/system/$pkgname.service - install -D "${srcdir}"/rc.$pkgname \ - "${pkgdir}"/etc/rc.d/$pkgname - install -Dm644 "${srcdir}"/$pkgname.conf \ - "${pkgdir}"/etc/conf.d/$pkgname + make DESTDIR=${pkgdir} install } diff --git a/community/quassel/quassel-client.install b/community/quassel/quassel-client.install new file mode 100644 index 000000000..1c93ee3f9 --- /dev/null +++ b/community/quassel/quassel-client.install @@ -0,0 +1,9 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} +post_upgrade() { + post_install +} +post_remove() { + post_install +} diff --git a/community/quassel/quassel.install b/community/quassel/quassel.install index 289ecc63f..5cd29276b 100644 --- a/community/quassel/quassel.install +++ b/community/quassel/quassel.install @@ -1,7 +1,7 @@ post_install() { useradd -r -s /bin/sh -d /var/lib/quassel quassel mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel - xdg-icon-resource forceupdate --theme hicolor &> /dev/null +# xdg-icon-resource forceupdate --theme hicolor &> /dev/null } post_upgrade() { @@ -12,15 +12,10 @@ post_upgrade() { ==> - quasselcore now listens to port 127.0.0.1 by default ==> - both of above are configurable: /etc/conf.d/quassel EOF - /etc/rc.d/quassel stop post_install ) || true } -pre_remove() { - /etc/rc.d/quassel stop -} - post_remove() { userdel quassel } diff --git a/community/quassel/rc.quassel b/community/quassel/rc.quassel deleted file mode 100644 index 99b82eec9..000000000 --- a/community/quassel/rc.quassel +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/quassel - -PIDFILE=/var/run/quassel.pid -PID=`pidof -o %PPID /usr/bin/quasselcore` - -case "$1" in - start) - stat_busy "Starting Quassel Core" - [ -z "$PID" ] && su -l -c "/usr/bin/quasselcore --configdir=/var/lib/quassel --listen=$LISTEN &" $QUASSEL_USER &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > $PIDFILE - add_daemon quassel - stat_done - fi - ;; - stop) - stat_busy "Stopping Quassel Core" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f $PIDFILE - rm_daemon quassel - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 4a7b22570..90f24a027 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90719 2013-05-13 14:37:04Z spupykin $ +# $Id: PKGBUILD 91908 2013-05-29 10:07:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog pkgver=7.2.7 -pkgrel=2 +pkgrel=3 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') @@ -22,12 +22,13 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog.logrotate' 'rsyslog.conf') md5sums=('4a61d182acb5b5487e7b99dea8974857' - '8065db4bef3061a4f000ba58779f6829' + '304bc9ea26aa1ff910870899a30512f1' 'd61dd424e660eb16401121eed20d98bc') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --enable-mysql \ --enable-pgsql \ --enable-mail \ diff --git a/community/rsyslog/rsyslog.logrotate b/community/rsyslog/rsyslog.logrotate index 76306c560..354581767 100644 --- a/community/rsyslog/rsyslog.logrotate +++ b/community/rsyslog/rsyslog.logrotate @@ -2,6 +2,6 @@ missingok sharedscripts postrotate - /usr/bin/killall -HUP /usr/sbin/rsyslogd + /usr/bin/killall -HUP /usr/bin/rsyslogd endscript } diff --git a/community/rxvt-unicode/01-fix-tabber-perl-ext.patch b/community/rxvt-unicode/01-fix-tabber-perl-ext.patch new file mode 100644 index 000000000..adb140bcc --- /dev/null +++ b/community/rxvt-unicode/01-fix-tabber-perl-ext.patch @@ -0,0 +1,12 @@ +# https://bugs.archlinux.org/task/35420 +--- a/src/perl/tabbed 2012-09-12 17:32:04.000000000 +0900 ++++ b/src/perl/tabbed 2013-05-24 13:04:37.000000000 +0900 +@@ -402,7 +402,7 @@ + # simply proxies all interesting calls back to the tabbed class. + + { +- for my $hook qw(start destroy key_press property_notify) { ++ for my $hook (qw(start destroy key_press property_notify)) { + eval qq{ + sub on_$hook { + my \$parent = \$_[0]{term}{parent} diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD index a362b9f26..4881e7f10 100644 --- a/community/rxvt-unicode/PKGBUILD +++ b/community/rxvt-unicode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90167 2013-05-07 19:14:34Z seblu $ +# $Id: PKGBUILD 91706 2013-05-26 09:26:28Z bluewind $ # Maintainer: Sébastien Luttringer # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: tobias <tobias@archlinux.org> @@ -6,7 +6,7 @@ pkgname=rxvt-unicode pkgver=9.18 -pkgrel=3 +pkgrel=5 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)' arch=('i686' 'x86_64' 'mips64el') url='http://software.schmorp.de/pkg/rxvt-unicode.html' @@ -18,11 +18,17 @@ source=( 'urxvt.desktop' 'urxvtc.desktop' 'urxvt-tabbed.desktop' + '01-fix-tabber-perl-ext.patch' ) md5sums=('963ccc748fe5bca925e7b92c0404d68b' 'fec94dc986fa37ec380079d81de3e0b2' 'fac55f0a8404c86dad3e702146762332' - '8a5599197568c63720e282b9722a7990') + '8a5599197568c63720e282b9722a7990' + '0c26ae7022a128e68981577785358b63') + +prepare() { + patch -p1 -d $pkgname-$pkgver < 01-fix-tabber-perl-ext.patch +} build() { cd $pkgname-$pkgver diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index 27c573cb0..57d6934a8 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87136 2013-03-27 19:52:53Z dwallace $ +# $Id: PKGBUILD 91566 2013-05-23 21:46:56Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Antonio Rojas < nqn1976 @ gmail.com > # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sage-mathematics -pkgver=5.8 +pkgver=5.9 pkgrel=1 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' @@ -15,17 +15,16 @@ arch=('i686' 'x86_64') license=('GPL') #depends=('xz' 'java-environment=7' 'desktop-file-utils' 'libxmu' 'libtiff' 'sqlite' 'libjpeg-turbo') depends=('desktop-file-utils') -makedepends=('gcc-fortran' ) +makedepends=('gcc-fortran' 'freetype2') optdepends=('imagemagick: some plotting functionality benefits from it' 'texlive-core: some plotting functionality benefits from it, also to use SageTeX' 'openssh: to use the notebook in secure mode' - 'ffmpeg: to show animations') -options=('!makeflags') + 'ffmpeg: to show animations' + 'cairo: R plots') install="${pkgname}.install" source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" - 'SAGE-notebook.desktop') -md5sums=('fc5b401174ee1efa7aea163e804c2b42' - 'b82f94383829eee26648feb977e2d89b') + 'SAGE-notebook.desktop' + 'sage.service') build() { cd sage-${pkgver} @@ -38,8 +37,7 @@ build() { unset LDFLAGS # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS - export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }') - export MAKE="make -j${SAGE_BUILD_THREADS}" + export MAKE="make -j$(nproc)" # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran export FC=/usr/bin/gfortran @@ -52,7 +50,11 @@ build() { export SAGE_FAT_BINARY='yes' # can't write to root in a clean chroot - export DOT_SAGE='/build/src/' + mkdir "$srcdir/buiild" + export DOT_SAGE="$srcdir/build" + + # Singular is broken + export CPP='/usr/bin/cpp' # only build sage, no documents #make build @@ -95,8 +97,12 @@ package() { # remove source packages, since they are rarely needed, they are 300mb in size (compressed) rm -f ${pkgdir}/opt/sage/spkg/base/*spkg rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg + + # install a systemd user unit + install -Dm755 $srcdir/sage.service $pkgdir/usr/lib/systemd/user/sage.service } # vim :set ts=2 sw=2 et: -md5sums=('b91d6c20798f396a9c875527c78b3587' - 'b82f94383829eee26648feb977e2d89b') +md5sums=('708520904f2d42039c714ac72a631948' + 'b82f94383829eee26648feb977e2d89b' + '985da1c1d1dcdc3ea9aa73035cb7996b') diff --git a/community/sage-mathematics/sage-mathematics.install b/community/sage-mathematics/sage-mathematics.install index ab5dae235..3da751689 100644 --- a/community/sage-mathematics/sage-mathematics.install +++ b/community/sage-mathematics/sage-mathematics.install @@ -41,6 +41,8 @@ echo ' post_upgrade() { post_install $1 + echo "There is now a user session unit included to run a sage notebook as your user." + echo "The wiki includes a guide on starting systemd user sessions" } post_remove() { diff --git a/community/sage-mathematics/sage.service b/community/sage-mathematics/sage.service new file mode 100644 index 000000000..d999414de --- /dev/null +++ b/community/sage-mathematics/sage.service @@ -0,0 +1,8 @@ +[Unit] +Description=A free open-source mathematics software system + +[Service] +ExecStart=/opt/sage/sage -n + +[Install] +WantedBy=default.target diff --git a/community/scponly/PKGBUILD b/community/scponly/PKGBUILD index 004b76ec2..a2e3164f9 100644 --- a/community/scponly/PKGBUILD +++ b/community/scponly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65429 2012-02-21 05:43:32Z spupykin $ +# $Id: PKGBUILD 91530 2013-05-23 11:17:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=scponly pkgver=4.8 -pkgrel=8 +pkgrel=9 pkgdesc="A limited shell for ssh/scp" arch=(i686 x86_64 'mips64el') url="http://sublimation.org/scponly/" @@ -19,9 +19,9 @@ md5sums=('139ac9abd7f3b8dbc5c5520745318f8a' build() { cd $srcdir/$pkgname-$pkgver - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --build=$CHOST --sysconfdir=/etc \ - --enable-scp-compat --enable-winscp-compat --enable-chrooted-binary + --enable-scp-compat --enable-winscp-compat --enable-chrooted-binary \ + --sbindir=/usr/bin sed -i 's|^#elif|#else|' helper.c make } diff --git a/community/sdcc/PKGBUILD b/community/sdcc/PKGBUILD index 8b43b2ade..210848517 100644 --- a/community/sdcc/PKGBUILD +++ b/community/sdcc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78263 2012-10-17 10:27:37Z allan $ +# $Id: PKGBUILD 91250 2013-05-20 17:00:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jose Negron <josenj.arch@mailnull.net> pkgname=sdcc -pkgver=3.2.0 -pkgrel=2 +pkgver=3.3.0 +pkgrel=1 pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,15 +14,25 @@ optdepends=('python') url="http://sdcc.sourceforge.net/" options=(!strip) source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2) -md5sums=('0808a9b4109d2ba6046ddd7b679a0012') +md5sums=('c7c6aa75415580795ecc4fd31948e5ba') + +prepare() { + cd $srcdir/$pkgname-$pkgver + sed -i 's|CC -E|CC -O2 -E|g' support/sdbinutils/libiberty/configure +} build() { - cd $srcdir/$pkgname + cd $srcdir/$pkgname-$pkgver ./configure \ --prefix=/usr \ --includedir=/usr/include/sdcc \ --libdir=/usr/lib/sdcc make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make install DESTDIR=$pkgdir if [ -d $pkgdir/usr/lib/lib ]; then diff --git a/community/ser2net/PKGBUILD b/community/ser2net/PKGBUILD index e72a02d71..917763d9c 100644 --- a/community/ser2net/PKGBUILD +++ b/community/ser2net/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90721 2013-05-13 14:37:29Z spupykin $ +# $Id: PKGBUILD 91532 2013-05-23 11:17:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=ser2net pkgver=2.8rc3 -pkgrel=2 +pkgrel=3 pkgdesc="A proxy that allows telnet/tcp connections to be made to serial ports" arch=(i686 x86_64 'mips64el') url="http://sourceforge.net/projects/ser2net" @@ -14,11 +14,11 @@ backup=(etc/ser2net.conf) source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver/rc/-rc}.tar.gz ser2net.service) md5sums=('bbe95fb557781c314d321356897a50b9' - '7f9d879325b9ed6ddc313dcbc3f83e56') + '9a94f9ba5595359c92d099465ab7c828') build() { cd $srcdir/${pkgname}-${pkgver/rc/-rc} - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/community/ser2net/ser2net.service b/community/ser2net/ser2net.service index fcf054e22..7bb3137d4 100644 --- a/community/ser2net/ser2net.service +++ b/community/ser2net/ser2net.service @@ -4,7 +4,7 @@ After=syslog.target network.target [Service] Type=forking -ExecStart=/usr/sbin/ser2net +ExecStart=/usr/bin/ser2net [Install] WantedBy=multi-user.target diff --git a/community/siege/PKGBUILD b/community/siege/PKGBUILD index a5b491226..eee3f1403 100644 --- a/community/siege/PKGBUILD +++ b/community/siege/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90182 2013-05-08 09:32:40Z bluewind $ +# $Id: PKGBUILD 91394 2013-05-21 16:28:38Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Sven Kauber <celeon@gmail.com> pkgname=siege -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -29,4 +29,4 @@ package() { sed -i 's/^# file =$/file = \/etc\/urls.txt/' "$pkgdir/etc/siegerc" } -md5sums=('e0ace61f7e01c6b545ac767fc499f817') +md5sums=('3401d9c8a02f227b63a0d10e2718ab37') diff --git a/community/smem/PKGBUILD b/community/smem/PKGBUILD index aa03be4fc..7f8253657 100644 --- a/community/smem/PKGBUILD +++ b/community/smem/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88078 2013-04-11 05:47:45Z cinelli $ +# $Id: PKGBUILD 91603 2013-05-25 11:22:11Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Dave Reisner <d@falconindy.com> # Contributor: Isaac Dupree <id@isaac.cedarswampstudios.org> @@ -6,7 +6,7 @@ pkgname=smem pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Generate reports on memory usage." url="http://www.selenic.com/smem/" license=("GPL") diff --git a/community/sniffit/PKGBUILD b/community/sniffit/PKGBUILD index 2bd24d7f9..3c93a9cbd 100644 --- a/community/sniffit/PKGBUILD +++ b/community/sniffit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 65453 2012-02-21 05:52:41Z spupykin $ +# $Id: PKGBUILD 91886 2013-05-28 18:10:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> pkgname=sniffit pkgver=0.3.7.beta -pkgrel=11 -pkgdesc="very good packet sniffer for unix with ncurses interactive mode." +pkgrel=12 +pkgdesc="Very good packet sniffer for unix with ncurses interactive mode" arch=('i686' 'x86_64' 'mips64el') url="http://packages.ubuntu.com/source/sniffit" #seems the website are out, ubuntu have all sources @@ -27,8 +27,12 @@ build() { rm -f config.sub config.guess cp /usr/share/libtool/config/config.{guess,sub} . - ./configure --prefix=/usr --no-recursion + ./configure --prefix=/usr --no-recursion --sbindir=/usr/bin make +} + +package() { + cd "${srcdir}/${pkgname}.${pkgver}" install -d -m0755 -g root -o root ${pkgdir}/usr/{sbin,share/licenses/${pkgname}} install -D -m0744 -g root -o root sniffit ${pkgdir}/usr/sbin/sniffit install -D -m0644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname} diff --git a/community/squashfs-tools/PKGBUILD b/community/squashfs-tools/PKGBUILD index 00d33aaa0..4376cea85 100644 --- a/community/squashfs-tools/PKGBUILD +++ b/community/squashfs-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65461 2012-02-21 05:55:21Z spupykin $ +# $Id: PKGBUILD 91872 2013-05-28 17:44:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Aaron Griffin <aaron@archlinux.org> # Original TU: Jeff Mickey <j@codemac.net> @@ -6,7 +6,7 @@ pkgname=squashfs-tools pkgver=4.2 -pkgrel=2 +pkgrel=3 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux." url="http://squashfs.sourceforge.net" license=("GPL") @@ -24,6 +24,6 @@ build() { package() { cd ${srcdir}/squashfs${pkgver}/${pkgname} - install -Dm755 mksquashfs ${pkgdir}/sbin/mksquashfs - install -m755 unsquashfs ${pkgdir}/sbin/unsquashfs + install -Dm755 mksquashfs ${pkgdir}/bin/mksquashfs + install -m755 unsquashfs ${pkgdir}/bin/unsquashfs } diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index 3a4116600..396e514a3 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90888 2013-05-15 08:03:45Z bpiotrowski $ +# $Id: PKGBUILD 91502 2013-05-23 10:15:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Coolen <mark.coolen@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=squid -pkgver=3.3.4 -pkgrel=3 +pkgver=3.3.5 +pkgrel=2 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686' 'mips64el') url='http://www.squid-cache.org' @@ -21,10 +21,10 @@ source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2" 'squid.pam' 'squid.cron' 'squid.service') -md5sums=('0ef8e63a980389c62130fa639079fb54' +md5sums=('c7991aa8528034af0e21a69edf26e41b' '270977cdd9b47ef44c0c427ab9034777' - 'b499c2b725aefd7bd60bec2f1a9de392' - '20e00e1aa1198786795f3da32db3c1d8') + 'a71425c4951f2e5b640d19e6a5048531' + 'ceeb57c69ebb165676219222f109a24e') build() { cd "$srcdir/$pkgname-$pkgver" @@ -41,6 +41,7 @@ build() { ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --datadir=/usr/share/squid \ --sysconfdir=/etc/squid \ --libexecdir=/usr/lib/squid \ diff --git a/community/squid/squid.cron b/community/squid/squid.cron index c78e51105..7425df894 100644 --- a/community/squid/squid.cron +++ b/community/squid/squid.cron @@ -4,6 +4,6 @@ { read pid </run/squid.pid; } 2>/dev/null || exit 0 # make sure found PID really is a squid process -if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then - /usr/sbin/squid -k rotate +if [ /proc/$pid/exec -ef /usr/bin/squid ]; then + /usr/bin/squid -k rotate fi diff --git a/community/squid/squid.install b/community/squid/squid.install index e7aa5ff68..a7c76d87a 100644 --- a/community/squid/squid.install +++ b/community/squid/squid.install @@ -1,10 +1,10 @@ post_install() { if [ -z "$(grep ^proxy: /etc/group)" ]; then - usr/sbin/groupadd -g 15 proxy &>/dev/null + groupadd -g 15 proxy &>/dev/null fi id proxy &>/dev/null || \ - usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy + useradd -u 15 -g proxy -d /var/empty proxy chown proxy.proxy var/{cache,log}/squid @@ -18,9 +18,9 @@ post_upgrade() { } pre_remove() { - usr/sbin/userdel proxy &> /dev/null + userdel proxy &> /dev/null if [ ! -z "$(grep ^proxy: /etc/group)" ]; then - usr/sbin/groupdel proxy &>/dev/null + groupdel proxy &>/dev/null fi } diff --git a/community/squid/squid.service b/community/squid/squid.service index 9d41cc243..1db8860e5 100644 --- a/community/squid/squid.service +++ b/community/squid/squid.service @@ -5,9 +5,9 @@ After=network.target [Service] Type=forking PIDFile=/run/squid.pid -ExecStart=/usr/sbin/squid -sYC -ExecStop=/usr/sbin/squid -k shutdown -ExecReload=/usr/sbin/squid -k reconfigure +ExecStart=/usr/bin/squid -sYC +ExecStop=/usr/bin/squid -k shutdown +ExecReload=/usr/bin/squid -k reconfigure [Install] WantedBy=multi-user.target diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD index 578ad1447..c93ee70a1 100644 --- a/community/supertux/PKGBUILD +++ b/community/supertux/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78943 2012-10-27 23:45:45Z ebelanger $ +# $Id: PKGBUILD 91300 2013-05-20 22:16:28Z foutrelis $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: vande198 @@ -6,24 +6,32 @@ pkgname=supertux pkgver=0.3.3 -pkgrel=7 +pkgrel=8 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" arch=('i686' 'x86_64' 'mips64el') url="http://super-tux.sourceforge.net/" license=('GPL') depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew') -makedepends=('cmake' 'boost' 'mesa') -source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 +makedepends=('cmake' 'boost' 'mesa' 'optipng') +source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 supertux2-0.3.3-squirrel-gcc47.patch) md5sums=('f3f803e629ee51a9de0b366a036e393d' 'eb06315514be4f200428f14b927beb66') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch" sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp sed -i '/types\.h/d' src/addon/addon_manager.cpp + + # Fix invalid PNG image to work with libpng 1.6 + optipng -quiet -force -fix data/images/creatures/flame_fish/left-0.png +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . make } diff --git a/community/swftools/PKGBUILD b/community/swftools/PKGBUILD index eef2325c0..4fcf46c12 100644 --- a/community/swftools/PKGBUILD +++ b/community/swftools/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 70956 2012-05-20 17:24:25Z jlichtblau $ +# $Id: PKGBUILD 91933 2013-05-29 20:22:20Z lcarlier $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=swftools pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="A collection of SWF manipulation and creation utilities" arch=('i686' 'x86_64' 'mips64el') url="http://www.swftools.org/" license=('GPL') -depends=('avifile' 'giflib' 'freeglut' 'lame' 't1lib' 'libjpeg' 'fontconfig') +depends=('giflib' 'freeglut' 'lame' 't1lib' 'libjpeg' 'fontconfig') makedepends=('bison' 'flex' 'zlib' 'patch') changelog=$pkgname.changelog source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz @@ -17,6 +17,12 @@ source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz sha256sums=('bf6891bfc6bf535a1a99a485478f7896ebacbe3bbf545ba551298080a26f01f1' '80f69c86ed06b315f576a733fd1e24145b88aef9934085f3790179a119b7923d') +prepare() { + cd ${srcdir}/$pkgname-$pkgver + + sed -i 's#PrintGifError()#fprintf(stderr, "%s\\n", GifErrorString())#g' src/gif2swf.c +} + build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/synce-serial/PKGBUILD b/community/synce-serial/PKGBUILD index 5dcf03feb..9eeee0884 100644 --- a/community/synce-serial/PKGBUILD +++ b/community/synce-serial/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65481 2012-02-21 06:01:39Z spupykin $ +# $Id: PKGBUILD 91842 2013-05-28 17:05:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zhukov Pavel <gelios@gmail.com> pkgname=synce-serial pkgver=0.11 -pkgrel=4 +pkgrel=5 pkgdesc="provide a means of communication with a Windows CE device - helper scripts for setting up a serial connection" arch=('i686' 'x86_64' 'mips64el') url="http://synce.sourceforge.net/" @@ -15,10 +15,13 @@ md5sums=('a83f20eb59c845de192645158d051062') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname + ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --sbindir=/usr/bin make - make DESTDIR=$pkgdir install +} +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install sed -i 's#/usr/etc/#/etc/#' $pkgdir/usr/share/synce/synce-serial-common sed -i 's#/usr/etc/#/etc/#' $pkgdir/usr/share/synce/synce-serial.conf } diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD index 1c1817a07..55df83ac8 100644 --- a/community/synergy/PKGBUILD +++ b/community/synergy/PKGBUILD @@ -2,15 +2,16 @@ # Contributor: Jelle van der Waa <jelle vdwaa nl> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> +# Contributor: Michael Düll <mail@akurei.me> pkgname=synergy -pkgver=1.4.10 -pkgrel=2 +pkgver=1.4.12 +pkgrel=1 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org" arch=('i686' 'x86_64' 'mips64el') -depends=('gcc-libs' 'libxtst' 'libxinerama') -makedepends=('libxt' 'cmake' 'qt4') +depends=('gcc-libs' 'libxtst' 'libxinerama' 'crypto++') +makedepends=('libxt' 'cmake' 'qt4' 'unzip') optdepends=('qt4: gui support') license=('GPL2') source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" @@ -18,15 +19,13 @@ source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" "synergys.service" "synergy.png" "synergy.desktop") -md5sums=('18aee04a7e232e4d821f46ff24da3364' - '58f48336836d6faf3d5eecbe4155b77e' - 'b95e4b83d8a19c0bd81a15280078fcd5' - '11fdb13390908e02c6e2f19c4c09eded' - '1e8d574c19994d13e6f342ed08e531bb') build() { cd "${srcdir}/${pkgname}-${pkgver}-Source" + # Unzip the crypto library + unzip -d tools/cryptopp562 tools/cryptopp562.zip + cmake -D CMAKE_INSTALL_PREFIX=/usr . make @@ -55,3 +54,9 @@ package() { install -Dm644 "$srcdir/synergy.png" "$pkgdir/usr/share/pixmaps/synergy.png" install -Dm644 "$srcdir/synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop" } + +sha512sums=('5305e03d871e5408640ece55364067418f9b8b160dda31f994ebafe807b31291bdaa688a901f2e81710acb0857952c37f0c1823a50c927573feaec0c8659be9d' + 'f7d918faf4a25654786f270fc48b6e4089ecd1b2f504bb90de543b47a862733f7be067e06fd613d621bba48d20dc63214966e2cfbd2cb3fcbfe623d6d41f10ad' + 'a10dfe5b24ac6f4a2ef3a3a9f8a6a3c432b91d5e59d1fae2258d37c5be00ac8f172656fa0d213012c7dc94ab8c04c3945ae33acfcd5db5fad8b37ccc9f5e980f' + 'cb3db9593c943bce11ce5ae962e120feb70e6afa9206887a6971c77491711afcebc78653e7413e87e33d031c43a507f4a9a6e8747d10b60c6642106ae1690f18' + 'c1c76ecfbed5c22f1a2a7562dce20971a784ff6b0edbf5c9b5f7c796f9ead882b82f970bb24f35533b928c341f87f66b0b10d9d96e122d14d74102cac8997445') diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index bf555e1cf..85dfb62ac 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90725 2013-05-13 14:38:23Z spupykin $ +# $Id: PKGBUILD 91152 2013-05-20 09:56:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat pkgver=10.1.5 -pkgrel=2 +pkgrel=3 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64' 'mips64el') url="http://pagesperso-orange.fr/sebastien.godard/" @@ -37,4 +37,5 @@ package() { install -D -m 744 cron/sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat chown -R root:root $pkgdir install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + mv $pkgdir/usr/bin/nfsiostat $pkgdir/usr/bin/$pkgname-nfsiostat } diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD index 8ba258d91..916c25874 100644 --- a/community/texmaker/PKGBUILD +++ b/community/texmaker/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 89278 2013-04-28 12:14:49Z cinelli $ +# $Id: PKGBUILD 91601 2013-05-25 11:19:17Z bpiotrowski $ #Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> pkgname=texmaker -pkgver=4.0.1 +pkgver=4.0.2 pkgrel=1 pkgdesc='Free cross-platform LaTeX editor' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('ghostscript: LaTeX to HTML conversion command' 'poppler: PDF rendering support') install="$pkgname.install" source=("http://www.xm1math.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('62f87f7b44e92ca68817663d3d5aeca4') +md5sums=('2097b5911acc461a85fd631dd1e2e5dc') build() { cd "$pkgname-$pkgver" diff --git a/community/tnftp/PKGBUILD b/community/tnftp/PKGBUILD index 1dfa52704..7fc5fabe6 100644 --- a/community/tnftp/PKGBUILD +++ b/community/tnftp/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 56963 2011-10-17 10:15:04Z spupykin $ +# $Id: PKGBUILD 91426 2013-05-22 10:27:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Previous Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> pkgname=tnftp -pkgver=20100108 -pkgrel=2 +pkgver=20130505 +pkgrel=1 pkgdesc="NetBSD FTP client with several advanced features" arch=('i686' 'x86_64' 'mips64el') url="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/" license=('BSD') -depends=('ncurses' 'dante') +depends=('ncurses' 'dante' 'openssl') source=(ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/$pkgname-$pkgver.tar.gz) -md5sums=('192aac255abd515d7d4cc9b397dc0cba') +md5sums=('66e218d02ec7d9fc39ab70ba2900305a') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --enable-editcomplete + ./configure --prefix=/usr --enable-editcomplete --enable-ssl make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make install DESTDIR=$pkgdir install -Dm755 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD index 3e1d64afd..40a71d07f 100644 --- a/community/tomoyo-tools/PKGBUILD +++ b/community/tomoyo-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87706 2013-04-05 10:24:39Z spupykin $ +# $Id: PKGBUILD 91910 2013-05-29 10:07:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> @@ -7,7 +7,7 @@ _basever=2.5.0 _timestamp=20130214 _file=53357 pkgver=${_basever}.${_timestamp} -pkgrel=2 +pkgrel=3 pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2' arch=('i686' 'x86_64' 'mips64el') url='http://tomoyo.sourceforge.jp' @@ -21,10 +21,10 @@ md5sums=('ffff6b531ed9ac32b01722a9cd749a2f') build() { cd "${srcdir}/${pkgname}" - make + make USRSBINDIR=/usr/bin SBINDIR=/usr/bin } package() { cd "${srcdir}/${pkgname}" - make INSTALLDIR="${pkgdir}" install + make USRSBINDIR=/usr/bin SBINDIR=/usr/bin INSTALLDIR="${pkgdir}" install } diff --git a/community/torsocks/PKGBUILD b/community/torsocks/PKGBUILD index 30aa15133..0497dd696 100644 --- a/community/torsocks/PKGBUILD +++ b/community/torsocks/PKGBUILD @@ -4,7 +4,7 @@ pkgname=torsocks pkgver=1.3 -pkgrel=3 +pkgrel=4 pkgdesc='Wrapper to safely torify applications' arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/torsocks' @@ -13,36 +13,18 @@ depends=('tor') makedepends=('git') options=(!libtool) backup=("etc/${pkgname}.conf") - -__gitroot=https://git.torproject.org/torsocks -__gitname=torsocks +source=("git://git.torproject.org/torsocks.git#tag=1.3") +md5sums=(SKIP) build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [[ -d "$__gitname" ]]; then - cd "$__gitname" && git pull origin - msg "The local files are updated." - else - git clone "$__gitroot" "$__gitname" - fi - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$__gitname-build" - git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build" - cd "$srcdir/$__gitname-build" - - git checkout $pkgver - + cd $pkgname ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd "$srcdir/$__gitname-build" + cd $pkgname make DESTDIR="$pkgdir/" install + find "$pkgdir/usr/share" -maxdepth 1 -type f -delete } diff --git a/community/turbojpeg/PKGBUILD b/community/turbojpeg/PKGBUILD deleted file mode 100644 index d6f7dba16..000000000 --- a/community/turbojpeg/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> - -pkgname=turbojpeg -pkgver=1.2.1 -pkgrel=1 -pkgdesc="turbojpeg library from libjpeg-turbo" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.libjpeg-turbo.org/About/TurboJPEG" -license=('GPL' 'custom') -depends=('glibc' 'libjpeg') -makedepends=('nasm') -options=('!libtool') -source=(http://sourceforge.net/projects/libjpeg-turbo/files/$pkgver/libjpeg-turbo-$pkgver.tar.gz) -sha1sums=('a4992e102c6d88146709e8e6ce5896d5d0b5a361') - -build() { - cd "$srcdir/libjpeg-turbo-$pkgver" - - ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man - make -} - -check() { - cd "$srcdir/libjpeg-turbo-$pkgver" - - make test -} - -package() { - cd "$srcdir/libjpeg-turbo-$pkgver" - - make DESTDIR="$pkgdir/" install - - # only distribute libturbojpeg - rm -rf "$pkgdir"/usr/share - rm "$pkgdir"/usr/include/j*.h - rm "$pkgdir"/usr/lib/libj* - rm "$pkgdir"/usr/bin/{djpeg,rdjpgcom,wrjpgcom,jpegtran,cjpeg} - - install -Dm644 README "$pkgdir/usr/share/licenses/$pkgname/README" - install -Dm644 README-turbo.txt "$pkgdir/usr/share/licenses/$pkgname/README-turbo.txt" -} - diff --git a/community/twin/PKGBUILD b/community/twin/PKGBUILD index 2c37d9c3c..fdcea7796 100644 --- a/community/twin/PKGBUILD +++ b/community/twin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70178 2012-05-01 12:01:36Z andrea $ +# $Id: PKGBUILD 91844 2013-05-28 17:06:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> pkgname=twin pkgver=0.6.2 -pkgrel=3 +pkgrel=4 pkgdesc="A text-mode window environment" arch=('i686' 'x86_64' 'mips64el') url='http://sourceforge.net/projects/twin/' @@ -17,7 +17,7 @@ md5sums=('6211c8b2e655003eb96b1fc5dc37e7d9') build() { cd $srcdir/$pkgname-$pkgver - LDFLAGS="-lX11" ./configure --prefix=/usr \ + LDFLAGS="-lX11" ./configure --prefix=/usr --sbindir=/usr/bin \ --enable-tt=yes \ --enable-tt-hw-twin=yes --enable-tt-hw-twin-tunnel=yes --enable-tt-hw-twin-detunnel=yes \ --enable-tt-hw-xml=yes diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index c9e0357c4..38dde02e3 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -1,54 +1,48 @@ -# $Id: PKGBUILD 87924 2013-04-08 17:07:36Z bisson $ +# $Id: PKGBUILD 91247 2013-05-20 14:50:41Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=unbound pkgver=1.4.20 -pkgrel=1 +pkgrel=2 pkgdesc='Validating, recursive, and caching DNS resolver' url='http://unbound.net/' license=('custom:BSD') arch=('i686' 'x86_64' 'mips64el') -options=('!libtool') depends=('openssl' 'ldns') makedepends=('expat') optdepends=('expat: unbound-anchor') backup=('etc/unbound/unbound.conf') source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz" - 'unbound.service' - 'unbound.conf' - 'rc.d') + 'service' + 'conf') sha1sums=('1752976533be2a4f0c9cdbab9d2cbb67d4f27c43' - 'a2493cb105ff6aa23d756514badb13b02d37f319' - '5d473ec2943fd85367cdb653fcd58e186f07383f' - 'dc96e772f467b32555df21d16fdb15e98194c228') + 'b543ae6f8b87423bec095fca6b335a9ee43739a8' + '5d473ec2943fd85367cdb653fcd58e186f07383f') +options=('!libtool') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-static=no \ + --sbindir=/usr/bin \ + --disable-static \ --disable-rpath \ --with-conf-file=/etc/unbound/unbound.conf \ - --with-pidfile=/run/unbound.pid \ - + --with-pidfile=/run/unbound.pid make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" - install -D -m644 ../unbound.conf "${pkgdir}/etc/unbound/unbound.conf" - install -D -m644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example" - install -D -m644 ../unbound.service "${pkgdir}/usr/lib/systemd/system/unbound.service" + install -Dm644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/unbound.service" + install -Dm644 ../conf "${pkgdir}/etc/unbound/unbound.conf" } diff --git a/community/unbound/unbound.conf b/community/unbound/conf index 445bceff1..445bceff1 100644 --- a/community/unbound/unbound.conf +++ b/community/unbound/conf diff --git a/community/unbound/rc.d b/community/unbound/rc.d deleted file mode 100644 index b5b6466de..000000000 --- a/community/unbound/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=unbound -prog="/usr/sbin/unbound" - -PID=$(pidof -o %PPID $prog) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && eval $prog &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -reload) - stat_busy "Reloading $name daemon" - [[ -n "$PID" ]] && kill -SIGHUP $PID &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 2 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - exit 1 - ;; -esac diff --git a/community/unbound/unbound.service b/community/unbound/service index 8e59e5a6a..c569602de 100644 --- a/community/unbound/unbound.service +++ b/community/unbound/service @@ -4,7 +4,7 @@ After=network.target [Service] PIDFile=/run/unbound.pid -ExecStart=/usr/sbin/unbound -d +ExecStart=/usr/bin/unbound -d ExecReload=/bin/kill -HUP $MAINPID Restart=always diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index 0bfb47bd4..8ed04aa6b 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90731 2013-05-13 14:39:46Z spupykin $ +# $Id: PKGBUILD 91865 2013-05-28 17:38:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd pkgver=3.2.10 -pkgrel=2 +pkgrel=4 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64' 'mips64el') url="http://unrealircd.com" @@ -18,7 +18,7 @@ source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz unrealircd.service arch-fixes.patch) md5sums=('05b0bbdbfab9ffc2304f7595951d7cec' - '2103ce8a4a4e79f6955920bfebea0202' + '93276a1cd426e4a811c072c35fc31e94' '77807313c4578f2c30286b9f9e3fb21c') build() { @@ -36,6 +36,7 @@ build() { --enable-dynamic-linking \ --enable-ziplinks \ --enable-ssl \ + --enable-ipv6 \ --enable-libcurl=/usr \ --with-system-cares diff --git a/community/unrealircd/unrealircd.service b/community/unrealircd/unrealircd.service index 42279fae0..a81419f2a 100644 --- a/community/unrealircd/unrealircd.service +++ b/community/unrealircd/unrealircd.service @@ -6,7 +6,7 @@ After=network.target remote-fs.target nss-lookup.target Type=forking User=ircd PIDFile=/var/run/unrealircd.pid -ExecStart=/usr/bin/unrealircd -p +ExecStart=/usr/bin/unrealircd [Install] WantedBy=multi-user.target diff --git a/community/uptimed/PKGBUILD b/community/uptimed/PKGBUILD index e7b20d257..e3dbdc641 100644 --- a/community/uptimed/PKGBUILD +++ b/community/uptimed/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90733 2013-05-13 14:40:26Z spupykin $ +# $Id: PKGBUILD 91504 2013-05-23 10:15:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Tom Killian <tomk@runbox.com> @@ -6,7 +6,7 @@ pkgname=uptimed pkgver=0.3.17 -pkgrel=3 +pkgrel=4 pkgdesc="A system uptime record daemon" arch=(i686 x86_64 'mips64el') url="http://podgorny.cz/uptimed/" @@ -18,7 +18,7 @@ install=$pkgname.install source=(http://podgorny.cz/$pkgname/releases/$pkgname-$pkgver.tar.bz2 service) md5sums=('528b62c33454b33537c3bf2366977bdb' - '657102b06613ddb9811427bee1973c6b') + '6d1e97b9c54d622edc0bd607acbf3c10') build() { cd $srcdir/$pkgname-$pkgver @@ -33,7 +33,7 @@ build() { autoreconf libtoolize --force - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make } diff --git a/community/uptimed/service b/community/uptimed/service index 2fd785318..36e074d04 100644 --- a/community/uptimed/service +++ b/community/uptimed/service @@ -4,8 +4,8 @@ Description=System uptime record daemon [Service] Type=forking PIDFile=/var/run/uptimed -ExecStartPre=/usr/sbin/uptimed -b -ExecStart=/usr/sbin/uptimed +ExecStartPre=/usr/bin/uptimed -b +ExecStart=/usr/bin/uptimed [Install] WantedBy=multi-user.target diff --git a/community/uptimed/uptimed.install b/community/uptimed/uptimed.install index 178061706..7edd1f66c 100644 --- a/community/uptimed/uptimed.install +++ b/community/uptimed/uptimed.install @@ -1,7 +1,3 @@ -# arg 1: the old package version pre_remove() { - # clean up after ourselves - # - /bin/rm -rf /var/log/uptimed + rm -rf var/log/uptimed } - diff --git a/community/uriparser/PKGBUILD b/community/uriparser/PKGBUILD index d482a3e4b..a9b6b7e44 100644 --- a/community/uriparser/PKGBUILD +++ b/community/uriparser/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88337 2013-04-16 13:32:04Z spupykin $ +# $Id: PKGBUILD 91154 2013-05-20 09:57:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar> pkgname=uriparser -pkgver=0.7.7 +pkgver=0.7.8 pkgrel=1 pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode" url="http://sourceforge.net/projects/uriparser/" @@ -12,7 +12,7 @@ makedepends=(doxygen graphviz) arch=('i686' 'x86_64' 'mips64el') license=("custom") source=(http://downloads.sourceforge.net/sourceforge/uriparser/$pkgname-$pkgver.tar.bz2) -md5sums=('2da950ef006be5a842dcc383cbbeaa78') +md5sums=('1ff590e25e8d9f5eaaa409c741fc387b') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD index 456616062..97ff732c9 100644 --- a/community/usb_modeswitch/PKGBUILD +++ b/community/usb_modeswitch/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80001 2012-11-15 11:55:13Z spupykin $ +# $Id: PKGBUILD 91584 2013-05-24 18:58:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=usb_modeswitch pkgver=1.2.5 -pkgrel=1 +pkgrel=3 _pkgdata=20121109 pkgdesc="Activating switchable USB devices on Linux." arch=('i686' 'x86_64' 'mips64el') @@ -19,10 +19,15 @@ md5sums=('c393603908eceab95444c5bde790f6f0' 'a7d23a03157871013a0d708ab2b1b6df' '9918bbdc0f68873410688604c80d25c4') +prepare() { + cd $srcdir/usb-modeswitch-$pkgver/ + sed -i 's|/usr/sbin/usb_mode|/usr/bin/usb_mode|g' usb_modeswitch.{conf,tcl,sh} +} + build() { cd $srcdir/usb-modeswitch-$pkgver/ make clean - make + make SBINDIR=/usr/bin } package() { @@ -32,7 +37,7 @@ package() { mkdir -p $pkgdir/etc mkdir -p $pkgdir/usr/share/man/man1 - make DESTDIR=${pkgdir} UDEVDIR=${pkgdir}/usr/lib/udev install + make DESTDIR=${pkgdir} UDEVDIR=${pkgdir}/usr/lib/udev SBINDIR=$pkgdir/usr/bin install cp $srcdir/usb-modeswitch-${pkgver}-device_reference.txt $pkgdir/etc/usb_modeswitch.setup diff --git a/community/uucp/PKGBUILD b/community/uucp/PKGBUILD index b4b7ee31d..d8cf4e153 100644 --- a/community/uucp/PKGBUILD +++ b/community/uucp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61375 2011-12-29 09:59:32Z spupykin $ +# $Id: PKGBUILD 91914 2013-05-29 10:32:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jick Nan <jick.nan@gmail.com> pkgname=uucp pkgver=1.07 -pkgrel=3.1 +pkgrel=4 pkgdesc="Taylor UUCP is a free implementation of UUCP and is the standard UUCP used on the GNU system" arch=(i686 x86_64 'mips64el') url="http://www.gnu.org/software/uucp/uucp.html" @@ -16,11 +16,25 @@ backup=('etc/uucp/config' source=(http://ftp.gnu.org/gnu/uucp/${pkgname}-${pkgver}.tar.gz) md5sums=('64c54d43787339a7cced48390eb3e1d0') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|${CC-cc} -E|${CC-cc} -E -O2|g' configure +# sed -i \ +# -e '1,1i#include <unistd.h>' \ +# -e '1,1i#include <fcntl.h>' \ +# -e '1,1i#include <sys/types.h>' \ +# uuconf/rdlocs.c unix/{efopen,cusub,init}.c +# sed -i '1,1i#include <sys/statvfs.h>' unix/fsusg.c +} - ./configure --prefix=/usr --mandir=/usr/share/man --with-newconfigdir=/etc/uucp +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man --with-newconfigdir=/etc/uucp --sbindir=/usr/bin make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -D -m644 sample/config ${pkgdir}/etc/uucp/config @@ -28,4 +42,3 @@ build() { install -D -m644 sample/port ${pkgdir}/etc/uucp/port mv ${pkgdir}/usr/info ${pkgdir}/usr/share/ } - diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 838f836fd..b03e92a2d 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 90419 2013-05-12 09:09:05Z thomas $ +# $Id: PKGBUILD 91789 2013-05-27 20:00:36Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.12 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('linux-headers' +makedepends=('linux' + 'linux-headers' "virtualbox-host-dkms>=$pkgver" "virtualbox-guest-dkms>=$pkgver" 'expac' + 'sed' 'bc') build() { - _kernver=$(expac -Q '%v' linux-headers)-ARCH - #_kernver=3.9.0-1-ARCH + _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') + _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version) # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -30,39 +32,36 @@ build() { } package_virtualbox-host-modules(){ - _kernver=$(expac -Q '%v' linux-headers)-ARCH - #_kernver=3.9.0-1-ARCH - _extraver=extramodules-${_kernver%.*}-ARCH + _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') + _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version) pkgdesc='Host kernel modules for VirtualBox' - depends=("linux>=${_kernver%.*}" "linux<$(echo "${_kernver%.*}+0.1"|bc)") + depends=("linux>=$_kernmaj" "linux<$(echo "$_kernmaj+0.1"|bc)") replaces=('virtualbox-modules') conflicts=('virtualbox-modules') install=virtualbox-host-modules.install - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" + install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules.install" + sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-host-modules.install" } package_virtualbox-guest-modules(){ - _kernver=$(expac -Q '%v' linux-headers)-ARCH - #_kernver=3.9.0-1-ARCH - _extraver=extramodules-${_kernver%.*}-ARCH - + _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') + _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version) pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=("linux>=${_kernver%.*}" "linux<$(echo "${_kernver%.*}+0.1"|bc)") + depends=("linux>=$_kernmaj" "linux<$(echo "$_kernmaj+0.1"|bc)") replaces=('virtualbox-archlinux-modules') conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" + install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules.install" + sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-guest-modules.install" } # vim:set ts=2 sw=2 et: diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index 9084c05fd..8706a7205 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -1,17 +1,18 @@ +VERSION='3.9.4-1-ARCH' + post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.9-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $VERSION } post_upgrade() { - EXTRAMODULES='extramodules-3.9-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $VERSION } post_remove() { - EXTRAMODULES='extramodules-3.9-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $VERSION } + +# vim:set ts=2 sw=2 et: diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index 78791f71d..c75dd089c 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -1,19 +1,20 @@ +VERSION='3.9.4-1-ARCH' + post_install() { cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - EXTRAMODULES='extramodules-3.9-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $VERSION } post_upgrade() { - EXTRAMODULES='extramodules-3.9-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use the new version, reload all virtualbox modules manually.' + depmod $VERSION + echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - EXTRAMODULES='extramodules-3.9-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $VERSION } + +# vim:set ts=2 sw=2 et: diff --git a/community/virtualgl/PKGBUILD b/community/virtualgl/PKGBUILD index 8bf79dcd3..0f6721646 100644 --- a/community/virtualgl/PKGBUILD +++ b/community/virtualgl/PKGBUILD @@ -4,12 +4,12 @@ pkgname=virtualgl pkgver=2.3.2 -pkgrel=3 +pkgrel=4 pkgdesc="Redirects 3D commands from an OpenGL application onto a server-side 3D graphics card" arch=('i686' 'x86_64' 'mips64el') url="http://virtualgl.org" license=('LGPL') -depends=('libxv' 'glu' 'turbojpeg') +depends=('libxv' 'glu' 'libjpeg-turbo') makedepends=('cmake' 'mesa') source=("http://downloads.sourceforge.net/project/virtualgl/VirtualGL/$pkgver/VirtualGL-$pkgver.tar.gz") sha1sums=('f042862c21ceaba57c6e1f0ec72adb4f838725e9') diff --git a/community/vnstat/PKGBUILD b/community/vnstat/PKGBUILD index 58575ddcd..bf84f067f 100644 --- a/community/vnstat/PKGBUILD +++ b/community/vnstat/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90737 2013-05-13 14:41:25Z spupykin $ +# $Id: PKGBUILD 91534 2013-05-23 11:17:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=vnstat pkgver=1.11 -pkgrel=4 +pkgrel=5 pkgdesc="A console-based network traffic monitor" arch=('i686' 'x86_64' 'mips64el') url="http://humdi.net/vnstat/" @@ -17,16 +17,16 @@ backup=(etc/vnstat.conf) source=(http://humdi.net/vnstat/$pkgname-$pkgver.tar.gz service) md5sums=('a5a113f9176cd61fb954f2ba297f5fdb' - 'fcc189e3dee616ff414dac72637c1a19') + 'df452896729db4a569005f1ebf6b57f4') build() { cd $srcdir/$pkgname-$pkgver - make all + make all SBIN=/usr/bin } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install SBIN=$pkgdir/usr/bin install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/vnstat.service diff --git a/community/vnstat/service b/community/vnstat/service index f312351ea..5c593eb1b 100644 --- a/community/vnstat/service +++ b/community/vnstat/service @@ -2,7 +2,7 @@ Description=Network traffic monitor [Service] -ExecStart=/usr/sbin/vnstatd -n +ExecStart=/usr/bin/vnstatd -n ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/community/xe-guest-utilities/PKGBUILD b/community/xe-guest-utilities/PKGBUILD index 3fd142e5c..f3af11392 100644 --- a/community/xe-guest-utilities/PKGBUILD +++ b/community/xe-guest-utilities/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90393 2013-05-12 07:10:12Z dwallace $ +# $Id: PKGBUILD 91549 2013-05-23 14:44:31Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at code gtmanfred com> # Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gnu-tech.pl> @@ -6,7 +6,7 @@ pkgbase=xe-guest-utilities pkgname=('xe-guest-utilities' 'xenstore') pkgver=6.1.0 -pkgrel=5 +pkgrel=6 pkgdesc="Citrix XenServer Tools" arch=('i686' 'x86_64') url="http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US" @@ -69,6 +69,7 @@ package_xe-guest-utilities(){ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" install -Dm644 $srcdir/xe-daemon.service "$pkgdir/usr/lib/systemd/system/xe-daemon.service" install -Dm644 $srcdir/xe-linux-distribution.service "$pkgdir/usr/lib/systemd/system/" + sed -i 's:sbin:bin:' $pkgdir/usr/bin/xe-daemon } # vim:set ts=2 sw=2 et: diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD index 015af9715..258f5d9de 100644 --- a/community/xl2tpd/PKGBUILD +++ b/community/xl2tpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90739 2013-05-13 14:42:05Z spupykin $ +# $Id: PKGBUILD 91508 2013-05-23 10:16:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Hengfu <rhfcaesar@gmail.com> pkgname=xl2tpd pkgver=1.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation" arch=('i686' 'x86_64' 'mips64el') url="http://www.xelerance.com/services/software/xl2tpd/" @@ -23,7 +23,7 @@ md5sums=('38c2461d3562f98b08454ca403706886' '5f0ae07026e61a3dd15a76fd4144a6d5' '16ed0886115d4dcc21072cfb847250bb' 'ed57eb67335cdf246251285dad502cc7' - '5ba9ddaf66c9827fe4a2caef67cf61c2' + '219942dd098ce4fdba37d1db327baf57' '2e95e4fc03e1521ab20fd7e249efab5a' '4d258a58cc109d5c4d96af8f81d481cf') @@ -32,13 +32,13 @@ build() { patch -p1 <$srcdir/ipparam.patch - make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr + make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr SBINDIR=/usr/bin } package() { cd "$srcdir/$pkgname-$pkgver" - make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr DESTDIR=$pkgdir install + make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr DESTDIR=$pkgdir SBINDIR=$pkgdir/usr/bin install install -D -m0644 $srcdir/xl2tpd.conf.client-example $pkgdir/etc/xl2tpd/xl2tpd.conf.client-example install -D -m0644 $srcdir/xl2tpd.conf.server-example $pkgdir/etc/xl2tpd/xl2tpd.conf.server-example diff --git a/community/xl2tpd/xl2tpd.service b/community/xl2tpd/xl2tpd.service index b47cadf02..e55b9cb12 100644 --- a/community/xl2tpd/xl2tpd.service +++ b/community/xl2tpd/xl2tpd.service @@ -7,8 +7,8 @@ After=ipsec.service [Service] Type=simple -PIDFile=/var/run/xl2tpd/xl2tpd.pid -ExecStart=/usr/sbin/xl2tpd -D +PIDFile=/run/xl2tpd/xl2tpd.pid +ExecStart=/usr/bin/xl2tpd -D Restart=on-abort [Install] diff --git a/community/zathura-djvu/PKGBUILD b/community/zathura-djvu/PKGBUILD index 8bdff37a9..2b788f819 100644 --- a/community/zathura-djvu/PKGBUILD +++ b/community/zathura-djvu/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 82565 2013-01-21 01:01:19Z dwallace $ +# $Id: PKGBUILD 91452 2013-05-22 23:23:11Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: karnath <karnathtorjian@gmail.com> pkgname=zathura-djvu -pkgver=0.2.2 +pkgver=0.2.3 pkgrel=1 pkgdesc="Adds DjVu support to zathura by using the djvulibre library" arch=('i686' 'x86_64' 'mips64el') url="https://pwmt.org/projects/zathura/plugins/zathura-djvu/" license=('custom') depends=('djvulibre' 'zathura') +install="$pkgname.install" source=("https://pwmt.org/projects/zathura/plugins/download/zathura-djvu-$pkgver.tar.gz") -md5sums=('38344cb762e1f5b5fe66f6ef49ac173f') +md5sums=('a472f706d6f6384d8bc2750141a84fc6') build(){ make -C "${srcdir}/$pkgname-$pkgver" diff --git a/community/zathura-djvu/zathura-djvu.install b/community/zathura-djvu/zathura-djvu.install new file mode 100644 index 000000000..247455a1d --- /dev/null +++ b/community/zathura-djvu/zathura-djvu.install @@ -0,0 +1,6 @@ +post_install(){ + update-desktop-database -q +} +post_remove(){ + update-desktop-database -q +} diff --git a/community/zathura-pdf-poppler/PKGBUILD b/community/zathura-pdf-poppler/PKGBUILD index e18440510..cfa86d218 100644 --- a/community/zathura-pdf-poppler/PKGBUILD +++ b/community/zathura-pdf-poppler/PKGBUILD @@ -4,15 +4,17 @@ # Contributor: karnath <karnathtorjian@gmail.com> pkgname=zathura-pdf-poppler -pkgver=0.2.2 -pkgrel=1 +pkgver=0.2.3 +pkgrel=2 pkgdesc="Adds pdf support to zathura by using the poppler engine" arch=('i686' 'x86_64' 'mips64el') url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/" license=('custom') depends=('poppler-glib' 'zathura') +install="$pkgname.install" + source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz") -md5sums=('83f2dba1f6d715f5b1a33044d2a64829') +md5sums=('1d8deb2d2ee5a6847267f977b8f2e542') build() { make -C "${srcdir}/$pkgname-$pkgver" diff --git a/community/zathura-pdf-poppler/zathura-pdf-poppler.install b/community/zathura-pdf-poppler/zathura-pdf-poppler.install new file mode 100644 index 000000000..247455a1d --- /dev/null +++ b/community/zathura-pdf-poppler/zathura-pdf-poppler.install @@ -0,0 +1,6 @@ +post_install(){ + update-desktop-database -q +} +post_remove(){ + update-desktop-database -q +} diff --git a/community/zathura-ps/PKGBUILD b/community/zathura-ps/PKGBUILD index a74eab3c6..b470d5a34 100644 --- a/community/zathura-ps/PKGBUILD +++ b/community/zathura-ps/PKGBUILD @@ -3,15 +3,16 @@ # Contributor: karnath <karnathtorjian@gmail.com> pkgname=zathura-ps -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc="Adds ps support to zathura by using the libspectre library" arch=('i686' 'x86_64' 'mips64el') url="https://pwmt.org/projects/zathura/plugins/zathura-ps/" license=('custom') depends=('libspectre' 'zathura') +install="$pkgname.install" source=(https://pwmt.org/projects/zathura/plugins/download/zathura-ps-$pkgver.tar.gz) -md5sums=('45619e744b69bf16b408b50cf32f2df5') +md5sums=('338af976c03c0aa1471b156a0efdc45c') build(){ make -C "$pkgname-$pkgver" diff --git a/community/zathura-ps/zathura-ps.install b/community/zathura-ps/zathura-ps.install new file mode 100644 index 000000000..247455a1d --- /dev/null +++ b/community/zathura-ps/zathura-ps.install @@ -0,0 +1,6 @@ +post_install(){ + update-desktop-database -q +} +post_remove(){ + update-desktop-database -q +} diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index 42a1f3a97..b82957a75 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90889 2013-05-15 08:03:46Z bpiotrowski $ +# $Id: PKGBUILD 91707 2013-05-26 09:26:32Z bluewind $ # Maintainer: Sébastien Luttringer # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mickael9 <mickael9 at gmail dot com> pkgname=znc pkgver=1.0 -pkgrel=6 +pkgrel=7 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' license=('GPL2') diff --git a/core/cracklib/PKGBUILD b/core/cracklib/PKGBUILD index b673bd9fe..929e840e4 100644 --- a/core/cracklib/PKGBUILD +++ b/core/cracklib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185681 2013-05-17 08:28:48Z tpowa $ +# $Id: PKGBUILD 186294 2013-05-24 07:56:30Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> pkgname=cracklib pkgver=2.8.22 -pkgrel=2 +pkgrel=3 pkgdesc="Password Checking Library" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,7 +16,7 @@ md5sums=('463177b5c29c7a598c991e12a4898e06') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --without-python + ./configure --prefix=/usr --sbindir=/usr/bin --without-python make } diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD index fff9f3511..2a6568539 100644 --- a/core/crda/PKGBUILD +++ b/core/crda/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179635 2013-03-08 23:40:38Z foutrelis $ +# $Id: PKGBUILD 186207 2013-05-22 04:47:50Z foutrelis $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=crda @@ -9,7 +9,7 @@ arch=(i686 x86_64 'mips64el') url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" license=('custom') depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd-tools' 'iw') -makedepends=('python-m2crypto') +makedepends=('python2-m2crypto') install=crda.install source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 set-wireless-regdom) diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD index 795b8882e..ccd6b5de5 100644 --- a/core/cronie/PKGBUILD +++ b/core/cronie/PKGBUILD @@ -3,7 +3,7 @@ pkgname='cronie' pkgver=1.4.9 -pkgrel=2 +pkgrel=4 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://fedorahosted.org/cronie/' license=('custom:BSD') @@ -16,13 +16,11 @@ optdepends=('pm-utils: defer anacron on battery power' source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'cron.deny' 'service' - 'pam.d' - 'rc.d') + 'pam.d') sha1sums=('40405cb30b62bd60323e4daf5198f26f0e65c4c4' '0f279b8fb820340267d578dc85511c980715f91e' - 'fa91ebee59df127ff3983b8d6fb9e1cc5fca53d0' - '5eff7fb31f6bc0a924243ff046704726cf20c221' - 'c08c040ed5cb12bc4fd15639a5242d31ec247ef5') + 'de455f11a310e64d6930390e57726ed70f3295d0' + '5eff7fb31f6bc0a924243ff046704726cf20c221') backup=('etc/anacrontab' 'etc/conf.d/crond' @@ -33,6 +31,11 @@ conflicts=('cron') provides=('cron') groups=('base') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's:usr/sbin:usr/bin:g' -i contrib/0anacron +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -40,6 +43,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --sbindir=/usr/bin \ --enable-anacron \ --with-inotify \ --with-pam \ @@ -56,7 +60,6 @@ package() { install -d "${pkgdir}"/var/spool/{ana,}cron install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly} - install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service diff --git a/core/cronie/rc.d b/core/cronie/rc.d deleted file mode 100755 index d0659685c..000000000 --- a/core/cronie/rc.d +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=crond -. /etc/conf.d/crond -PID=$(pidof -o %PPID /usr/sbin/crond) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -reload) - stat_busy "Reloading $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 1 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/core/cronie/service b/core/cronie/service index 4fa4d4593..cc671f7b6 100644 --- a/core/cronie/service +++ b/core/cronie/service @@ -2,7 +2,7 @@ Description=Periodic Command Scheduler [Service] -ExecStart=/usr/sbin/crond -n +ExecStart=/usr/bin/crond -n ExecReload=/bin/kill -HUP $MAINPID KillMode=process Restart=always diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD index 077ae8ff2..34752d162 100644 --- a/core/dialog/PKGBUILD +++ b/core/dialog/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175124 2013-01-14 12:47:12Z stephane $ +# $Id: PKGBUILD 186478 2013-05-27 12:00:13Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=dialog -pkgver=1.2_20121230 +pkgver=1.2_20130523 pkgrel=1 pkgdesc="A tool to display dialog boxes from shell scripts" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url="http://invisible-island.net/dialog/" license=('LGPL2.1') depends=('ncurses') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz) -sha1sums=('f6ba16481e04c707c7cbfc3c3c1340040bdb0aa3') +sha1sums=('54768b8443af3de2e6cd16073ec666f19d4ded7a') build() { cd "${srcdir}/$pkgname-${pkgver/_/-}" @@ -24,4 +24,6 @@ build() { package() { cd "${srcdir}/$pkgname-${pkgver/_/-}" make DESTDIR="${pkgdir}" install install-lib + + rm "${pkgdir}"/usr/lib/libdialog.a } diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD index 91063cf9a..64564e85c 100644 --- a/core/dmraid/PKGBUILD +++ b/core/dmraid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173944 2012-12-28 19:27:14Z dreisner $ +# $Id: PKGBUILD 186295 2013-05-24 07:56:32Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=8 +pkgrel=9 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/" conflicts=('mkinitcpio<0.7') @@ -19,10 +19,10 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 dmraid.service) install=dmraid.install md5sums=('819338fcef98e8e25819f0516722beeb' - 'dea048cc09b49b02da1009adae563866' + '7a040ebcba305aba1e47dfe6ca8323b5' 'faec669dc85f87187b45b5d3968efe2c' '56a8bb0ece8d206cd8efb504ee072ddd' - '1cd201496e52bd05c1c3048bf6dd809f') + 'ea6d280fc6f63fb799abcd882bca53c8') build() { cd "$pkgname/1.0.0.rc16-3/$pkgname" @@ -32,7 +32,7 @@ build() { package() { cd "$pkgname/1.0.0.rc16-3/$pkgname" - make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install + make DESTDIR="$pkgdir" sbindir=/usr/bin prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid install -D -m644 "$srcdir"/dmraid_tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/dmraid.conf diff --git a/core/dmraid/dmraid.service b/core/dmraid/dmraid.service index a31f8b39f..c5d3d5309 100644 --- a/core/dmraid/dmraid.service +++ b/core/dmraid/dmraid.service @@ -8,7 +8,7 @@ Conflicts=shutdown.target [Service] Type=oneshot -ExecStart=/sbin/dmraid --ignorelocking --activate y -Z +ExecStart=/usr/bin/dmraid --ignorelocking --activate y -Z RemainAfterExit=true [Install] diff --git a/core/dmraid/dmraid_install b/core/dmraid/dmraid_install index 2003b5cdf..acbc43d95 100644 --- a/core/dmraid/dmraid_install +++ b/core/dmraid/dmraid_install @@ -6,6 +6,7 @@ build() { add_binary 'dmraid' add_binary 'dmsetup' + add_file "/usr/lib/device-mapper/libdmraid-events-isw.so" add_file "/usr/lib/udev/rules.d/10-dm.rules" add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD index 8c6c199ad..447c2c22f 100644 --- a/core/fakeroot/PKGBUILD +++ b/core/fakeroot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160939 2012-06-07 07:26:49Z allan $ +# $Id: PKGBUILD 186069 2013-05-20 23:10:56Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=fakeroot -pkgver=1.18.4 +pkgver=1.19 pkgrel=1 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ install=fakeroot.install depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh') options=('!libtool') source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2) -md5sums=('706171d8d520b1ca1576ac73f2ceb4f3') +md5sums=('3a00a1264cb31a815552050ef0c2468b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/gawk/PKGBUILD b/core/gawk/PKGBUILD index 5adb1153f..288e552d6 100644 --- a/core/gawk/PKGBUILD +++ b/core/gawk/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 174267 2013-01-03 13:58:07Z allan $ +# $Id: PKGBUILD 186293 2013-05-24 07:53:32Z tpowa $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gawk -pkgver=4.0.2 -pkgrel=1.1 +pkgver=4.1.0 +pkgrel=1 pkgdesc="GNU version of awk" arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnu.org/directory/GNU/gawk.html" +url="http://www.gnu.org/software/gawk/" license=('GPL') groups=('base' 'base-devel') -depends=('sh' 'glibc') +depends=('sh' 'glibc' 'mpfr') provides=('awk') install=gawk.install source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('4d505dc2c9f1eb3e9f8d6cac87d4bd1a' - '131f79e5aa1528649c90ccf0440db0a6') +md5sums=('13e02513105417818a31ef375f9f9f42' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --libexecdir=/usr/lib + ./configure --prefix=/usr --libexecdir=/usr/lib --without-libsigsegv make } @@ -32,7 +32,7 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - install -dm755 ${pkgdir}/bin - ln -sf /usr/bin/gawk ${pkgdir}/bin/ - ln -sf gawk ${pkgdir}/bin/awk + #install -dm755 ${pkgdir}/bin + #ln -sf /usr/bin/gawk ${pkgdir}/bin/ + #ln -sf gawk ${pkgdir}/bin/awk } diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD index 410d1e736..2f651d2c0 100644 --- a/core/gmp/PKGBUILD +++ b/core/gmp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178046 2013-02-14 11:43:39Z allan $ +# $Id: PKGBUILD 186344 2013-05-25 03:05:31Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gmp -pkgver=5.1.1 +pkgver=5.1.2 pkgrel=1 pkgdesc="A free library for arbitrary precision arithmetic" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('LGPL3') options=('!libtool') install=gmp.install source=(ftp://ftp.gmplib.org/pub/gmp-${pkgver}/gmp-${pkgver}.tar.xz{,.sig}) -md5sums=('485b1296e6287fa381e6015b19767989' - '5cec115b99dc498b079430dd62084d9c') +md5sums=('06fe2ca164221c59ce74867155cfc1ac' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD index 9e0f895ea..5c5e106c5 100644 --- a/core/gpm/PKGBUILD +++ b/core/gpm/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 182863 2013-04-15 21:02:26Z eric $ +# $Id: PKGBUILD 186057 2013-05-20 18:53:27Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpm pkgver=1.20.7 -pkgrel=2 +pkgrel=3 pkgdesc="A mouse server for the console and xterm" arch=('i686' 'x86_64' 'mips64el') url="http://www.nico.schottelius.org/software/gpm/" license=('GPL') -depends=('ncurses' 'bash') +depends=('bash') options=('!makeflags') install=gpm.install source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \ gpm.sh gpm.service) sha1sums=('8d9f3655c80ce7667d31ede2a100b44986480369' '88fe5ff10916c68a87abc8418a56eb0073f69fa9' - '20b92360f0ad38a2032fcae37bdbd01b31e43f77') + 'f9bde96eb9c78da9f225bcf40822647f6592cf23') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make } diff --git a/core/gpm/gpm.service b/core/gpm/gpm.service index 59e837d80..510ee9f85 100644 --- a/core/gpm/gpm.service +++ b/core/gpm/gpm.service @@ -3,7 +3,7 @@ Description=Virtual console mouse server [Service] Type=forking -ExecStart=/usr/sbin/gpm -m /dev/input/mice -t imps2 +ExecStart=/usr/bin/gpm -m /dev/input/mice -t imps2 [Install] WantedBy=multi-user.target diff --git a/core/hdparm/PKGBUILD b/core/hdparm/PKGBUILD index 2ab0c823b..980f98214 100644 --- a/core/hdparm/PKGBUILD +++ b/core/hdparm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172450 2012-12-02 17:54:26Z tpowa $ +# $Id: PKGBUILD 186146 2013-05-21 09:12:32Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hdparm pkgver=9.43 -pkgrel=1 +pkgrel=2 pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters" arch=(i686 x86_64 'mips64el') depends=('glibc') @@ -17,25 +17,27 @@ options=('emptydirs') md5sums=('f73233be118d86c779a8463d8b6a3cdb' '74e368f384166a7710b447573cda120a') -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} # Fix Range input/output error when wiping Intel G2 and OCZ drives patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch - - # build +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} make } package() { cd ${srcdir}/${pkgname}-${pkgver} # install - mkdir -p ${pkgdir}/{usr,sbin} - make DESTDIR=${pkgdir} install - install -m755 contrib/idectl ${pkgdir}/sbin - install -m755 contrib/ultrabayd ${pkgdir}/sbin + mkdir -p ${pkgdir}/usr/bin + make DESTDIR=${pkgdir} sbindir=/usr/bin install + install -m755 contrib/idectl ${pkgdir}/usr/bin + install -m755 contrib/ultrabayd ${pkgdir}/usr/bin install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt - install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/sbin/wiper.sh + install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/bin/wiper.sh #install license file install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT diff --git a/core/ifenslave/PKGBUILD b/core/ifenslave/PKGBUILD index 77eff3bac..e998eb2ef 100644 --- a/core/ifenslave/PKGBUILD +++ b/core/ifenslave/PKGBUILD @@ -1,21 +1,17 @@ -# $Id: PKGBUILD 142704 2011-11-13 10:10:10Z bisson $ -# Maintainer: +# $Id: PKGBUILD 186263 2013-05-23 06:41:01Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=ifenslave pkgver=1.1.0 -pkgrel=7.1 +pkgrel=8 pkgdesc='Utility for bonding ethernet interfaces' -arch=('i686' 'x86_64' 'mips64el') url='http://www.linuxfoundation.org/en/Net:Bonding' +arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('glibc') makedepends=('linux-api-headers') -backup=('etc/conf.d/bonding') -source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=65968fbf' - 'bonding.conf.d') -sha1sums=('c657d9e6b8acb983bb8ef856f8f7f25ee6bf4f73' - '6843971c0254768868b556af33289d7d32d6208d') +source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=450faacc') +sha1sums=('cf0ca36e4a82f259f4bd5d7268ce758581a76fb0') build() { cd "${srcdir}" @@ -24,6 +20,5 @@ build() { package() { cd "${srcdir}" - install -Dm755 ifenslave "${pkgdir}"/sbin/ifenslave - install -Dm644 bonding.conf.d "${pkgdir}"/etc/conf.d/bonding + install -Dm755 ifenslave "${pkgdir}"/usr/bin/ifenslave } diff --git a/core/ifenslave/bonding.conf.d b/core/ifenslave/bonding.conf.d deleted file mode 100644 index 3092c5e95..000000000 --- a/core/ifenslave/bonding.conf.d +++ /dev/null @@ -1,12 +0,0 @@ -# -# Settings for ethernet bonding -# -# For each bond interface declared in INTERFACES (in rc.conf), declare -# a bond_${IF} variable that contains the real ethernet interfaces that -# should be bonded to the bond interface with the ifenslave utility. -# Then list the bond interface name in the BOND_INTERFACES array. -# - -#bond_bond0="eth0 eth1" -#BOND_INTERFACES=(bond0) - diff --git a/core/jfsutils/PKGBUILD b/core/jfsutils/PKGBUILD index 31368268b..7c5f74615 100644 --- a/core/jfsutils/PKGBUILD +++ b/core/jfsutils/PKGBUILD @@ -1,21 +1,30 @@ -# $Id: PKGBUILD 142848 2011-11-17 00:38:27Z bisson $ +# $Id: PKGBUILD 186264 2013-05-23 06:41:02Z bisson $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=jfsutils pkgver=1.1.15 -pkgrel=3.1 +pkgrel=4 pkgdesc='JFS filesystem utilities' -arch=('i686' 'x86_64' 'mips64el') url='http://jfs.sourceforge.net' +arch=('i686' 'x86_64' 'mips64el') license=('GPL') +depends=('util-linux') +source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz" + 'inttypes.patch') +sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50' + '88551e7d8418bab0df4643dce248110d4c9b0a53') + groups=('base') -depends=('util-linux-ng') -source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz") -sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../inttypes.patch +} build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --sbindir=/sbin + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/core/jfsutils/inttypes.patch b/core/jfsutils/inttypes.patch new file mode 100644 index 000000000..2018bb8a8 --- /dev/null +++ b/core/jfsutils/inttypes.patch @@ -0,0 +1,12 @@ +diff -Naur old/libfs/devices.h new/libfs/devices.h +--- old/libfs/devices.h 2005-11-23 07:43:55.000000000 +1100 ++++ new/libfs/devices.h 2013-01-06 11:30:25.381538024 +1100 +@@ -40,6 +40,8 @@ + #define ERROR_INVALID_PARAMETER 87 + #define ERROR_DISK_FULL 112 + ++#include <inttypes.h> ++ + struct stat; + + int ujfs_get_dev_size(FILE *, int64_t * size); diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD index 425d03a23..4487c9e94 100644 --- a/core/kbd/PKGBUILD +++ b/core/kbd/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 175749 2013-01-21 10:51:33Z tpowa $ +# $Id: PKGBUILD 186234 2013-05-22 12:12:20Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kbd pkgver=1.15.5 -pkgrel=3 +pkgrel=4 pkgdesc="Keytable files and keyboard utilities" arch=('i686' 'x86_64' 'mips64el') url="http://www.kbd-project.org" license=('GPL') depends=('glibc' 'pam') source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz - 'fix-keymap-loading-1.15.5.patch') + 'fix-keymap-loading-1.15.5.patch' + 'fix-dvorak-es.patch' + 'fix-euro2.patch') provides=('vlock') conflicts=('vlock') replaces=('vlock') -md5sums=('34c71feead8ab9c01ec638acea8cd877' - '4362091d5e23bab2d158f8c7693a45d8') -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} # rename keymap files with the same names # this is needed because when only name of keymap is specified @@ -32,6 +32,14 @@ build() { # fix https://bugs.archlinux.org/task/33308 # keymap loading is broken for cetain keymaps patch -Np1 -i ../fix-keymap-loading-1.15.5.patch + # fix es-dvorak #33662 + patch -Np1 -i ../fix-dvorak-es.patch + # fix euro2 #28213 + patch -Np1 -i ../fix-euro2.patch +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes } @@ -40,3 +48,7 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install } +md5sums=('34c71feead8ab9c01ec638acea8cd877' + '4362091d5e23bab2d158f8c7693a45d8' + '998957c4f815347dcc874c4d7555dc66' + 'd869200acbc0aab6a9cafa43cb140d4e') diff --git a/core/kbd/fix-dvorak-es.patch b/core/kbd/fix-dvorak-es.patch new file mode 100644 index 000000000..95760fd3a --- /dev/null +++ b/core/kbd/fix-dvorak-es.patch @@ -0,0 +1,11 @@ +--- kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map.old 2013-05-08 14:58:03.393349828 +0200 ++++ kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map 2013-05-08 14:58:20.206415053 +0200 +@@ -4,7 +4,7 @@ + + keymaps 0-2,4,5,6,8-10,12,14 + include "linux-with-alt-and-altgr" +-include "euro" ++include "euro.map" + strings as usual + + keycode 1 = Escape diff --git a/core/kbd/fix-euro2.patch b/core/kbd/fix-euro2.patch new file mode 100644 index 000000000..572cba740 --- /dev/null +++ b/core/kbd/fix-euro2.patch @@ -0,0 +1,9 @@ +--- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old 2013-05-08 15:00:25.917752313 +0200 ++++ kbd-1.15.5/data/keymaps/i386/include/euro2.map 2013-05-08 15:00:54.943957367 +0200 +@@ -2,5 +2,5 @@ + # [Say: "loadkeys euro2" to get Euro and cent with AltGr (right alt) + # on the positions where many keyboards have E and C. + # To get it displayed, use a latin0 (i.e., latin9) font.] +-altgr keycode 18 = currency ++altgr keycode 18 = euro + altgr keycode 46 = cent diff --git a/core/krb5/CVE-2002-2443.patch b/core/krb5/CVE-2002-2443.patch new file mode 100644 index 000000000..3ef88155c --- /dev/null +++ b/core/krb5/CVE-2002-2443.patch @@ -0,0 +1,69 @@ +From cf1a0c411b2668c57c41e9c4efd15ba17b6b322c Mon Sep 17 00:00:00 2001 +From: Tom Yu <tlyu@mit.edu> +Date: Fri, 3 May 2013 16:26:46 -0400 +Subject: [PATCH] Fix kpasswd UDP ping-pong [CVE-2002-2443] + +The kpasswd service provided by kadmind was vulnerable to a UDP +"ping-pong" attack [CVE-2002-2443]. Don't respond to packets unless +they pass some basic validation, and don't respond to our own error +packets. + +Some authors use CVE-1999-0103 to refer to the kpasswd UDP ping-pong +attack or UDP ping-pong attacks in general, but there is discussion +leading toward narrowing the definition of CVE-1999-0103 to the echo, +chargen, or other similar built-in inetd services. + +Thanks to Vincent Danen for alerting us to this issue. + +CVSSv2: AV:N/AC:L/Au:N/C:N/I:N/A:P/E:P/RL:O/RC:C + +ticket: 7637 (new) +target_version: 1.11.3 +tags: pullup +--- + src/kadmin/server/schpw.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c +index 15b0ab5..7f455d8 100644 +--- a/src/kadmin/server/schpw.c ++++ b/src/kadmin/server/schpw.c +@@ -52,7 +52,7 @@ + ret = KRB5KRB_AP_ERR_MODIFIED; + numresult = KRB5_KPASSWD_MALFORMED; + strlcpy(strresult, "Request was truncated", sizeof(strresult)); +- goto chpwfail; ++ goto bailout; + } + + ptr = req->data; +@@ -67,7 +67,7 @@ + numresult = KRB5_KPASSWD_MALFORMED; + strlcpy(strresult, "Request length was inconsistent", + sizeof(strresult)); +- goto chpwfail; ++ goto bailout; + } + + /* verify version number */ +@@ -80,7 +80,7 @@ + numresult = KRB5_KPASSWD_BAD_VERSION; + snprintf(strresult, sizeof(strresult), + "Request contained unknown protocol version number %d", vno); +- goto chpwfail; ++ goto bailout; + } + + /* read, check ap-req length */ +@@ -93,7 +93,7 @@ + numresult = KRB5_KPASSWD_MALFORMED; + strlcpy(strresult, "Request was truncated in AP-REQ", + sizeof(strresult)); +- goto chpwfail; ++ goto bailout; + } + + /* verify ap_req */ +-- +1.8.1.6 + diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index 4d143920f..d1cc0c166 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185696 2013-05-17 11:13:34Z stephane $ +# $Id: PKGBUILD 186200 2013-05-22 00:37:41Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.11.2 -pkgrel=3 +pkgrel=4 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') url="http://web.mit.edu/kerberos/" @@ -12,6 +12,7 @@ depends=('e2fsprogs' 'libldap' 'keyutils') makedepends=('perl') backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-signed.tar + CVE-2002-2443.patch krb5-config_LDFLAGS.patch krb5-kadmind.service krb5-kdc.service @@ -19,6 +20,7 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-si krb5-kpropd@.service krb5-kpropd.socket) sha1sums=('3863f7bdb2d8fc3e50484fb566124373c4b0a250' + '78ec307c2b5e32481a6da401013c428e0b867f36' '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa' 'a2a01e7077d9e89cda3457ea0e216debb3dc353c' 'f5e4fa073e11b0fcb4e3098a5d58a4f791ec841e' @@ -34,6 +36,9 @@ build() { # cf https://bugs.gentoo.org/show_bug.cgi?id=448778 patch -Np2 -i "${srcdir}"/krb5-config_LDFLAGS.patch + # Fix kpasswd UDP ping-pong (CVE-2002-2443) + patch -Np2 -i "${srcdir}"/CVE-2002-2443.patch + rm lib/krb5/krb/deltat.c # FS#25384 diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD index a3f080220..fc1aaba80 100644 --- a/core/libsasl/PKGBUILD +++ b/core/libsasl/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 185567 2013-05-15 08:03:34Z bpiotrowski $ +# $Id: PKGBUILD 186318 2013-05-24 17:00:55Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> -# This package spans multiple repositories. +# This package spans multiple repositories. # Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk. #pkgbase=('cyrus-sasl') #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') pkgname=libsasl pkgver=2.1.26 -pkgrel=2 +pkgrel=3 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/" license=('custom') options=('!makeflags' '!libtool') -makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl') +makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2') source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz cyrus-sasl-2.1.22-qa.patch cyrus-sasl-2.1.26-size_t.patch @@ -23,8 +23,10 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz 0025_ld_as_needed.patch 0026_drop_krb5support_dependency.patch 0030-dont_use_la_files_for_opening_plugins.patch + saslauthd.service saslauthd.conf.d - saslauthd) + saslauthd + tmpfiles.conf) md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' 'f45aa8c42b32e0569ab3d14a83485b37' @@ -33,12 +35,14 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '62bf892fe4d1df41ff748e91a1afaf67' 'b7848957357e7c02d6490102be496bf9' '8e7106f32e495e9ade69014fd1b3352a' + '3499dcd610ad1ad58e0faffde2aa7a23' '49219af5641150edec288a3fdb65e7c1' - '75542f613185d5a90520ad0d7d926a20') + '75542f613185d5a90520ad0d7d926a20' + '45bb0192d2f188066240b9a66ee6365f') build() { export CFLAGS="$CFLAGS -fPIC" - + cd "${srcdir}/cyrus-sasl-${pkgver}" patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch" @@ -105,7 +109,7 @@ build() { package_libsasl() { pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library" - depends=('openssl' 'krb5') + depends=('openssl') conflicts=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}" @@ -117,21 +121,22 @@ package_libsasl() { rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so* rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so* rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libgs2.so* install -m755 -d "${pkgdir}/usr/share/licenses/libsasl" install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/" } package_cyrus-sasl() { - depends=("libsasl=${pkgver}-${pkgrel}") + depends=("libsasl=${pkgver}" 'krb5') pkgdesc="Cyrus saslauthd SASL authentication daemon" backup=('etc/conf.d/saslauthd') cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 -d "${pkgdir}/etc/conf.d" - install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/" - install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" + install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd" + install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" + install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service" + install -Dm644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf" install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl" ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/" @@ -139,12 +144,13 @@ package_cyrus-sasl() { package_cyrus-sasl-gssapi() { pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" - depends=("libsasl=${pkgver}-${pkgrel}" 'krb5') + depends=("libsasl=${pkgver}" 'krb5') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" install -m755 -d "${pkgdir}/usr/lib/sasl2" cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" + cp -a .libs/libgs2.so* "${pkgdir}/usr/lib/sasl2/" install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi" ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/" @@ -152,7 +158,7 @@ package_cyrus-sasl-gssapi() { package_cyrus-sasl-ldap() { pkgdesc="ldapdb auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}-${pkgrel}" 'libldap') + depends=("libsasl=${pkgver}" 'libldap') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" @@ -165,7 +171,7 @@ package_cyrus-sasl-ldap() { package_cyrus-sasl-sql() { pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmariadbclient') + depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" diff --git a/core/libsasl/saslauthd.service b/core/libsasl/saslauthd.service new file mode 100644 index 000000000..978dbd37d --- /dev/null +++ b/core/libsasl/saslauthd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Cyrus SASL authentication daemon + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/saslauthd +ExecStart=/usr/sbin/saslauthd $SASLAUTHD_OPTS +PIDFile=/var/run/saslauthd/saslauthd.pid + +[Install] +WantedBy=multi-user.target diff --git a/core/libsasl/tmpfiles.conf b/core/libsasl/tmpfiles.conf new file mode 100644 index 000000000..7258b1a9f --- /dev/null +++ b/core/libsasl/tmpfiles.conf @@ -0,0 +1 @@ +d /run/saslauthd 0755 root root - - diff --git a/core/linux-atm/PKGBUILD b/core/linux-atm/PKGBUILD index e84fe6afc..a14393a05 100644 --- a/core/linux-atm/PKGBUILD +++ b/core/linux-atm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158611 2012-05-05 03:12:24Z dreisner $ +# $Id: PKGBUILD 186297 2013-05-24 07:57:23Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Surain Mallawa Arachchi <mas@crc32.net> pkgname=linux-atm pkgver=2.5.2 -pkgrel=2 +pkgrel=3 pkgdesc="Drivers and tools to support ATM networking under Linux." arch=('i686' 'x86_64' 'mips64el') depends=('glibc') @@ -23,7 +23,7 @@ build() { # install firmware in /usr/lib sed -i "s#/lib/firmware#/usr/lib/firmware#" src/extra/Makefile.in - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc make } diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD index 818087e98..304458770 100644 --- a/core/man-db/PKGBUILD +++ b/core/man-db/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 166836 2012-09-19 19:45:35Z andyrtr $ +# $Id: PKGBUILD 186047 2013-05-20 18:28:50Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> pkgname=man-db pkgver=2.6.3 -pkgrel=1 +pkgrel=3 pkgdesc="A utility for reading man pages" arch=('i686' 'x86_64' 'mips64el') url="http://www.nongnu.org/man-db/" license=('GPL' 'LGPL') groups=('base') -depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline') -optdepends=('less' 'gzip') +depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline' 'less') +optdepends=('gzip') backup=('etc/man_db.conf' - 'etc/cron.daily/man-db') + 'etc/cron.daily/man-db') conflicts=('man') provides=('man') replaces=('man') @@ -22,21 +22,26 @@ source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig convert-mans man-db.cron.daily) options=('!libtool') md5sums=('a593a095599ae97bcacf8d038659a146' - '64975c20b1a6453f9b860ff7f916bcf1' + 'SKIP' '2b7662a7d5b33fe91f9f3e034361a2f6' - 'd30c39ae47560304471b5461719e0f03') + '934fd047fecb915038bf4bf844ea609c') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --with-db=gdbm --disable-setuid --enable-mandirs=GNU \ + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --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" make } check() { cd ${srcdir}/${pkgname}-${pkgver} - make check + make -k check } package() { diff --git a/core/man-db/man-db.cron.daily b/core/man-db/man-db.cron.daily index 53e66e1e9..9b4abd894 100755 --- a/core/man-db/man-db.cron.daily +++ b/core/man-db/man-db.cron.daily @@ -12,7 +12,7 @@ IONICE_PRIORITY=7 UPDATEMANDB="/usr/bin/mandb --quiet" # Update the "whatis" database -#/usr/sbin/makewhatis -u -w +#/usr/bin/makewhatis -u -w # taken from Debian # man-db cron daily diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index 1ceafa35a..8c8d6aa83 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177952 2013-02-12 12:13:48Z thomas $ +# $Id: PKGBUILD 186140 2013-05-21 09:11:15Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm pkgver=3.2.6 -pkgrel=3 +pkgrel=4 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -13,7 +13,6 @@ conflicts=('mkinitcpio<0.7') depends=('glibc') backup=('etc/mdadm.conf') source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 - mdadm mdadm.conf mdadm_install mdadm_hook @@ -22,12 +21,24 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 disable-werror.patch mdadm-fix-udev-rules.patch) replaces=('raidtools') +md5sums=('3e255dc71e5144bbcb872788ca647267' + '5a37c112aa07dccdde62f9fa5b888607' + 'af2f73f0094ebee66f503ca4710c7142' + 'fbfb7d07efcbaf5dc61af424c5f6e352' + 'b6b0bfd6487c99264578630616dfe5eb' + 'eb1786b18fa4d13cfd7b71d6b05cfb4f' + '4ad87b74a4bc9a34621280abe0e0c3e4' + '6c76f2f261c1c3397c7290633f0a9acc') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver patch -Np0 -i ../disable-werror.patch patch -p1 -i ../mdadm-fix-udev-rules.patch - make CXFLAGS="$CFLAGS" +} + +build() { + cd $srcdir/$pkgname-$pkgver + make CXFLAGS="$CFLAGS" BINDIR=/usr/bin # build static mdassemble for Arch's initramfs make MDASSEMBLE_AUTO=1 mdassemble @@ -35,22 +46,12 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - make INSTALL=/usr/bin/install DESTDIR=$pkgdir install - install -D -m755 mdassemble $pkgdir/sbin/mdassemble + make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir install + install -D -m755 mdassemble $pkgdir/usr/bin/mdassemble install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf - install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev # systemd service file install -D -m644 $srcdir/mdadm.service $pkgdir/usr/lib/systemd/system/mdadm.service } -md5sums=('3e255dc71e5144bbcb872788ca647267' - '8333d405f550317c2bacd5510bf1cb60' - '00cbed931db4f15b6ce49e3e7d433966' - '815245a3af16a73ec1c5e5989fb892e9' - 'fbb5542d9bdf87441a11dd7e7a0a17f8' - '0e35422d0cc007c3654a5e2591a9f9b5' - 'aafb5f9ac8437a284cbf948b9b13b179' - '4ad87b74a4bc9a34621280abe0e0c3e4' - '0bf45d6dcb3ea14facddbb10b3303806') diff --git a/core/mdadm/mdadm b/core/mdadm/mdadm deleted file mode 100755 index 9bf468e98..000000000 --- a/core/mdadm/mdadm +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -pidfile=/run/mdadm.pid -if [[ -r $pidfile ]]; then - read -r PID <"$pidfile" - if [[ $PID && ! -d /proc/$PID ]]; then - # stale pidfile - unset PID - rm -f "$pidfile" - fi -fi - -case $1 in - start) - stat_busy "Starting mdadm RAID Monitor" - if [[ -z $PID ]] && mdadm --monitor --scan -i "$pidfile" -f; then - add_daemon mdadm - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping mdadm RAID Monitor" - if [[ $PID ]] && kill "$PID" &>/dev/null; then - rm_daemon mdadm - stat_done - else - stat_fail - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/core/mdadm/mdadm-fix-udev-rules.patch b/core/mdadm/mdadm-fix-udev-rules.patch index 60f5ae131..941cadf3a 100644 --- a/core/mdadm/mdadm-fix-udev-rules.patch +++ b/core/mdadm/mdadm-fix-udev-rules.patch @@ -39,7 +39,7 @@ index 0000000..883ee4d +ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end" +LABEL="md_ignore_state" + -+IMPORT{program}="/sbin/mdadm --detail --export $devnode" ++IMPORT{program}="/usr/bin/mdadm --detail --export $devnode" +ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace" +ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}" +ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}" @@ -75,9 +75,9 @@ index 0000000..b89775e + +# remember you can limit what gets auto/incrementally assembled by +# mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY' -+ACTION=="add", RUN+="/sbin/mdadm --incremental $devnode --offroot" -+ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}" -+ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name" ++ACTION=="add", RUN+="/usr/bin/mdadm --incremental $devnode --offroot" ++ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/usr/bin/mdadm -If $name --path $env{ID_PATH}" ++ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/usr/bin/mdadm -If $name" + +LABEL="md_inc_end" diff --git a/udev-md-raid.rules b/udev-md-raid.rules diff --git a/core/mdadm/mdadm.conf b/core/mdadm/mdadm.conf index 57bd4c683..36eaa0cc0 100644 --- a/core/mdadm/mdadm.conf +++ b/core/mdadm/mdadm.conf @@ -59,8 +59,8 @@ DEVICE partitions # When used in --follow (aka --monitor) mode, mdadm needs a -# mail address and/or a program. To start mdadm's monitor mode, add -# "mdadm" to your DAEMONS array in /etc/rc.conf +# mail address and/or a program. To start mdadm's monitor mode, enable +# mdadm.service in systemd. # # If the lines are not found, mdadm will exit quietly #MAILADDR root@mydomain.tld diff --git a/core/mdadm/mdadm.service b/core/mdadm/mdadm.service index 8389715e8..b3ca5f7a7 100644 --- a/core/mdadm/mdadm.service +++ b/core/mdadm/mdadm.service @@ -2,7 +2,7 @@ Description=MDADM Event Monitor [Service] -ExecStart=/sbin/mdadm --monitor --scan +ExecStart=/usr/bin/mdadm --monitor --scan [Install] WantedBy=multi-user.target diff --git a/core/mdadm/mdadm_hook b/core/mdadm/mdadm_hook index 787be5d0c..5371baaca 100755 --- a/core/mdadm/mdadm_hook +++ b/core/mdadm/mdadm_hook @@ -43,7 +43,7 @@ run_hook() { fi # assemble everything - [ -s "$mdconfig" ] && /sbin/mdassemble + [ -s "$mdconfig" ] && /usr/bin/mdassemble } # vim: set ft=sh ts=4 sw=4 et: diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install index 36b37fd0b..7390509fa 100644 --- a/core/mdadm/mdadm_install +++ b/core/mdadm/mdadm_install @@ -8,7 +8,7 @@ build() { echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." add_file "/etc/mdadm.conf" fi - add_binary "/sbin/mdassemble" + add_binary "/usr/bin/mdassemble" add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules" add_runscript diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install index 5635b8f63..c01cbaf24 100644 --- a/core/mdadm/mdadm_udev_install +++ b/core/mdadm/mdadm_udev_install @@ -9,7 +9,7 @@ build() { add_file "/etc/mdadm.conf" fi - add_binary "mdadm" + add_binary "/usr/bin/mdadm" add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules" add_file "/usr/lib/udev/rules.d/64-md-raid-assembly.rules" } @@ -17,7 +17,7 @@ build() { help() { cat <<HELPEOF This hook loads the necessary modules for a RAID array and uses incremental -assembly via udev at runtime to create the devices. This hook with NOT work +assembly via udev at runtime to create the devices. This hook will NOT work without the udev hook included on the image. HELPEOF } diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 1c87625e3..876ca439c 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185566 2013-05-15 08:03:32Z bpiotrowski $ +# $Id: PKGBUILD 186436 2013-05-26 15:20:21Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') pkgver=2.4.35 -pkgrel=3.1 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://www.openldap.org/" license=('custom') @@ -12,7 +12,7 @@ makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz slapd.service slapd.tmpfiles openldap-ntlm.patch openldap-nssov.patch) sha1sums=('db02243150b050baac6a8ea4145ad73a1f6d2266' - '9c7f3441e6a6ee13cdcfe8d965081c7a574c3393' + '2441815efbfa01ad7a1d39068e5503b53d1d04b0' 'f86a82e35ebe15026980467c9dee4007e686b795' 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' 'b2d11b4c522750ad9da3409333094fb599ac2c85') @@ -30,7 +30,7 @@ prepare() { build() { cd ${pkgbase}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \ - --sysconfdir=/etc --localstatedir=/var/lib/openldap \ + --sysconfdir=/etc --localstatedir=/var/lib/openldap --sbindir=/usr/bin \ --enable-ipv6 --enable-syslog --enable-local \ --enable-bdb --enable-hdb \ --enable-crypt --enable-dynamic \ @@ -100,7 +100,7 @@ package_openldap() { # get rid of duplicate default conf files rm "${pkgdir}"/etc/openldap/*.default - ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd + ln -s ../lib/slapd "${pkgdir}"/usr/bin/slapd chown root:439 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example} chmod 640 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example} diff --git a/core/openldap/slapd.service b/core/openldap/slapd.service index 79b2cf81f..a664fa38e 100644 --- a/core/openldap/slapd.service +++ b/core/openldap/slapd.service @@ -3,7 +3,7 @@ Description=OpenLDAP server daemon [Service] Type=forking -ExecStart=/usr/sbin/slapd -u ldap -g ldap +ExecStart=/usr/bin/slapd -u ldap -g ldap [Install] WantedBy=multi-user.target diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 43f9709e1..c3d65deb3 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180812 2013-03-26 12:05:13Z bisson $ +# $Id: PKGBUILD 186025 2013-05-20 14:49:38Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh -pkgver=6.2p1 +pkgver=6.2p2 pkgrel=1 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' @@ -15,31 +15,28 @@ depends=('krb5' 'openssl' 'libedit' 'ldns') optdepends=('xorg-xauth: X11 forwarding' 'x11-ssh-askpass: input passphrase in X') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" - 'sshd.close-sessions' 'sshdgenkeys.service' 'sshd@.service' 'sshd.service' 'sshd.socket' - 'sshd.confd' - 'sshd.pam' - 'sshd') -sha1sums=('8824708c617cc781b2bb29fa20bd905fd3d2a43d' - '954bf1660aa32620c37034320877f4511b767ccb' + 'sshd.pam') +sha1sums=('c2b4909eba6f5ec6f9f75866c202db47f3b501ba' '6df5be396f8c593bb511a249a1453294d18a01a6' - 'bd6eae36c7ef9efb7147778baad7858b81f2d660' - 'f9af4a442b804ab661cec0edb25dd76dee16d8d2' + '6a0ff3305692cf83aca96e10f3bb51e1c26fccda' + '2d87de52a6b2f764180f9f67cb9747392784b4a5' 'e12fa910b26a5634e5a6ac39ce1399a132cf6796' - 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - 'd93dca5ebda4610ff7647187f8928a3de28703f3' - '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7') + 'd93dca5ebda4610ff7647187f8928a3de28703f3') -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') +backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') + +install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --libexecdir=/usr/lib/ssh \ --sysconfdir=/etc/ssh \ --with-ldns \ @@ -69,20 +66,14 @@ package() { make DESTDIR="${pkgdir}" install - rm "${pkgdir}"/usr/share/man/man1/slogin.1 - ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - + ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1 install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket - - install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 - install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id diff --git a/core/openssh/install b/core/openssh/install new file mode 100644 index 000000000..6f0cd3703 --- /dev/null +++ b/core/openssh/install @@ -0,0 +1,10 @@ +post_upgrade() { + if [[ $(vercmp $2 6.2p2) = -1 ]]; then + cat <<EOF + +==> The sshd daemon has been moved to /usr/bin alongside all binaries. +==> Please update this path in your scripts if applicable. + +EOF + fi +} diff --git a/core/openssh/sshd b/core/openssh/sshd deleted file mode 100755 index d60804e84..000000000 --- a/core/openssh/sshd +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sshd - -PIDFILE=/run/sshd.pid -PID=$(cat $PIDFILE 2>/dev/null) -if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then - PID= - rm $PIDFILE 2>/dev/null -fi - -case "$1" in - start) - stat_busy 'Starting Secure Shell Daemon' - /usr/bin/ssh-keygen -A - [[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon sshd - stat_done - fi - ;; - stop) - stat_busy 'Stopping Secure Shell Daemon' - [[ ! -z $PID ]] && kill $PID &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon sshd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/openssh/sshd.close-sessions b/core/openssh/sshd.close-sessions deleted file mode 100644 index be2a709fc..000000000 --- a/core/openssh/sshd.close-sessions +++ /dev/null @@ -1,17 +0,0 @@ -# Close sshd sessions before shutting down the network; see FS#17389. - -sshd_close_sessions () { - if ck_daemon sshd; then - return - fi - /etc/rc.d/sshd stop - stat_busy "Stopping Secure Shell Sessions" - for i in $(pgrep sshd); do - if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then - kill $i - fi - done &>/dev/null - stat_done -} - -add_hook shutdown_start sshd_close_sessions diff --git a/core/openssh/sshd.confd b/core/openssh/sshd.confd deleted file mode 100644 index 5ce7c0079..000000000 --- a/core/openssh/sshd.confd +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to sshd -# -SSHD_ARGS="" diff --git a/core/openssh/sshd.service b/core/openssh/sshd.service index 633164e5d..349bde59d 100644 --- a/core/openssh/sshd.service +++ b/core/openssh/sshd.service @@ -4,7 +4,7 @@ Wants=sshdgenkeys.service After=sshdgenkeys.service [Service] -ExecStart=/usr/sbin/sshd -D +ExecStart=/usr/bin/sshd -D ExecReload=/bin/kill -HUP $MAINPID KillMode=process Restart=always diff --git a/core/openssh/sshd@.service b/core/openssh/sshd@.service index 2fd9b0814..7ce3d37ba 100644 --- a/core/openssh/sshd@.service +++ b/core/openssh/sshd@.service @@ -3,6 +3,6 @@ Description=OpenSSH Per-Connection Daemon After=sshdgenkeys.service [Service] -ExecStart=-/usr/sbin/sshd -i +ExecStart=-/usr/bin/sshd -i StandardInput=socket StandardError=syslog diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD index 0257a6aa3..a562da503 100644 --- a/core/pam/PKGBUILD +++ b/core/pam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185040 2013-05-10 16:21:45Z tomegun $ +# $Id: PKGBUILD 186139 2013-05-21 09:11:14Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=pam pkgver=1.1.6 -pkgrel=3 +pkgrel=4 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -25,13 +25,13 @@ md5sums=('7b73e58b7ce79ffa321d408de06db2c4' build() { cd $srcdir/Linux-PAM-$pkgver - ./configure --libdir=/usr/lib + ./configure --libdir=/usr/lib --sbindir=/usr/bin patch -Np0 -i ../pam_namespace-build-1.1.6.patch make cd $srcdir/pam_unix2-2.9.1 patch -Np1 -i ../pam_unix2-glibc216.patch - ./configure --libdir=/usr/lib + ./configure --libdir=/usr/lib --sbindir=/usr/bin make } @@ -62,5 +62,5 @@ _EOT ln -s pam_unix.so pam_unix_session.so # set unix_chkpwd uid - chmod +s $pkgdir/sbin/unix_chkpwd + chmod +s $pkgdir/usr/bin/unix_chkpwd } diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD index 2327821f6..960c043e4 100644 --- a/core/pciutils/PKGBUILD +++ b/core/pciutils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184187 2013-05-03 10:22:45Z tpowa $ +# $Id: PKGBUILD 186143 2013-05-21 09:11:35Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pciutils pkgver=3.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="PCI bus configuration space access library and tools" arch=(i686 x86_64 'mips64el') license=('GPL2') @@ -15,15 +15,15 @@ md5sums=('3fccb0b28879adb57d8156115f8003c8') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man lib/libpci.a + make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a cp lib/libpci.a "${srcdir}/" make clean - make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all + make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib + make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/" # this is now supplied by the hwids package rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}} diff --git a/core/perl/CVE-2012-6329.patch b/core/perl/CVE-2012-6329.patch deleted file mode 100644 index 5f59e03c1..000000000 --- a/core/perl/CVE-2012-6329.patch +++ /dev/null @@ -1,79 +0,0 @@ -commit 1735f6f53ca19f99c6e9e39496c486af323ba6a8 -Author: Brian Carlson <brian.carlson@cpanel.net> -Date: Wed Nov 28 08:54:33 2012 -0500 - - Fix misparsing of maketext strings. - - Case 61251: This commit fixes a misparse of maketext strings that could - lead to arbitrary code execution. Basically, maketext was compiling - bracket notation into functions, but neglected to escape backslashes - inside the content or die on fully-qualified method names when - generating the code. This change escapes all such backslashes and dies - when a method name with a colon or apostrophe is specified. ---- - AUTHORS | 1 + - dist/Locale-Maketext/lib/Locale/Maketext.pm | 24 ++++++++---------------- - 2 files changed, 9 insertions(+), 16 deletions(-) - -diff --git a/AUTHORS b/AUTHORS -index 70734b0..009dea0 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -154,6 +154,7 @@ Breno G. de Oliveira <garu@cpan.org> - Brent Dax <brentdax@cpan.org> - Brooks D Boyd - Brian Callaghan <callagh@itginc.com> -+Brian Carlson <brian.carlson@cpanel.net> - Brian Clarke <clarke@appliedmeta.com> - brian d foy <brian.d.foy@gmail.com> - Brian Fraser <fraserbn@gmail.com> -diff --git a/dist/Locale-Maketext/lib/Locale/Maketext.pm b/dist/Locale-Maketext/lib/Locale/Maketext.pm -index 4822027..63e5fba 100644 ---- a/dist/Locale-Maketext/lib/Locale/Maketext.pm -+++ b/dist/Locale-Maketext/lib/Locale/Maketext.pm -@@ -625,21 +625,9 @@ sub _compile { - # 0-length method name means to just interpolate: - push @code, ' ('; - } -- elsif($m =~ /^\w+(?:\:\:\w+)*$/s -- and $m !~ m/(?:^|\:)\d/s -- # exclude starting a (sub)package or symbol with a digit -+ elsif($m =~ /^\w+$/s -+ # exclude anything fancy, especially fully-qualified module names - ) { -- # Yes, it even supports the demented (and undocumented?) -- # $obj->Foo::bar(...) syntax. -- $target->_die_pointing( -- $string_to_compile, q{Can't use "SUPER::" in a bracket-group method}, -- 2 + length($c[-1]) -- ) -- if $m =~ m/^SUPER::/s; -- # Because for SUPER:: to work, we'd have to compile this into -- # the right package, and that seems just not worth the bother, -- # unless someone convinces me otherwise. -- - push @code, ' $_[0]->' . $m . '('; - } - else { -@@ -693,7 +681,9 @@ sub _compile { - elsif(substr($1,0,1) ne '~') { - # it's stuff not containing "~" or "[" or "]" - # i.e., a literal blob -- $c[-1] .= $1; -+ my $text = $1; -+ $text =~ s/\\/\\\\/g; -+ $c[-1] .= $text; - - } - elsif($1 eq '~~') { # "~~" -@@ -731,7 +721,9 @@ sub _compile { - else { - # It's a "~X" where X is not a special character. - # Consider it a literal ~ and X. -- $c[-1] .= $1; -+ my $text = $1; -+ $text =~ s/\\/\\\\/g; -+ $c[-1] .= $text; - } - } - } diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index 59542f137..039a7c240 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183473 2013-04-21 22:15:16Z bluewind $ +# $Id: PKGBUILD 186370 2013-05-26 09:24:10Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: kevin <kevin.archlinux.org> @@ -6,8 +6,8 @@ # Contributor: francois <francois.archlinux.org> pkgname=perl -pkgver=5.16.3 -pkgrel=3 +pkgver=5.18.0 +pkgrel=1 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64 'mips64el') license=('GPL' 'PerlArtistic') @@ -15,32 +15,27 @@ url="http://www.perl.org" groups=('base') depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 - cgi-cr-escaping.diff perlbin.sh perlbin.csh - CVE-2012-6329.patch provides.pl) install=perl.install options=('makeflags' '!purge') -md5sums=('025102de0e4a597cf541e57da80c6aa3' - '0486659c9eefe682364a3e364d814296' +md5sums=('a832e928adfd36d162d2a5d3b631265c' '5ed2542fdb9a60682f215bd33701e61a' '1f0cbbee783e8a6d32f01be5118e0d5e' - '5dc374e095d896fb30618e414aeb9017' '999c3eea6464860704abbb055a0f0896') + # workaround to let the integrity check find the correct provides array if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p')) fi -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} +} - patch -i "$srcdir/cgi-cr-escaping.diff" -p1 - patch -i "$srcdir/CVE-2012-6329.patch" -p1 - - # Fix FS#34531; in perl upstream >= 5.17.9 - sed -i "s/Is_dos/is_dos/" cpan/Pod-Perldoc/lib/Pod/Perldoc.pm +build() { + cd ${srcdir}/${pkgname}-${pkgver} if [ "${CARCH}" != "i686" ]; then # for x86_64 @@ -69,7 +64,7 @@ build() { check() { cd ${srcdir}/${pkgname}-${pkgver} - TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness + TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness || true # make test } diff --git a/core/perl/cgi-cr-escaping.diff b/core/perl/cgi-cr-escaping.diff deleted file mode 100644 index 51adf7231..000000000 --- a/core/perl/cgi-cr-escaping.diff +++ /dev/null @@ -1,75 +0,0 @@ -From 18b607e4544c0cffc85207a8f9901ba37ac917d9 Mon Sep 17 00:00:00 2001 -From: Ryo Anazawa <anazawa@cpan.org> -Date: Wed, 14 Nov 2012 09:47:32 +0900 -Subject: CR escaping for P3P and Set-Cookie headers - -Bug: https://github.com/markstos/CGI.pm/pull/23 -Bug-Debian: http://bugs.debian.org/693420 -Origin: https://github.com/markstos/CGI.pm/commit/cb39938b45206093a363e36fd104e4a0f26deecb -Patch-Name: fixes/cgi-cr-escaping.diff ---- - cpan/CGI/lib/CGI.pm | 24 ++++++++++++------------ - cpan/CGI/t/headers.t | 6 ++++++ - 2 files changed, 18 insertions(+), 12 deletions(-) - -diff --git a/cpan/CGI/lib/CGI.pm b/cpan/CGI/lib/CGI.pm -index 1a52c70..c70e9c1 100644 ---- a/cpan/CGI/lib/CGI.pm -+++ b/cpan/CGI/lib/CGI.pm -@@ -1550,8 +1550,17 @@ sub header { - 'EXPIRES','NPH','CHARSET', - 'ATTACHMENT','P3P'],@p); - -+ # Since $cookie and $p3p may be array references, -+ # we must stringify them before CR escaping is done. -+ my @cookie; -+ for (ref($cookie) eq 'ARRAY' ? @{$cookie} : $cookie) { -+ my $cs = UNIVERSAL::isa($_,'CGI::Cookie') ? $_->as_string : $_; -+ push(@cookie,$cs) if defined $cs and $cs ne ''; -+ } -+ $p3p = join ' ',@$p3p if ref($p3p) eq 'ARRAY'; -+ - # CR escaping for values, per RFC 822 -- for my $header ($type,$status,$cookie,$target,$expires,$nph,$charset,$attachment,$p3p,@other) { -+ for my $header ($type,$status,@cookie,$target,$expires,$nph,$charset,$attachment,$p3p,@other) { - if (defined $header) { - # From RFC 822: - # Unfolding is accomplished by regarding CRLF immediately -@@ -1595,18 +1604,9 @@ sub header { - - push(@header,"Status: $status") if $status; - push(@header,"Window-Target: $target") if $target; -- if ($p3p) { -- $p3p = join ' ',@$p3p if ref($p3p) eq 'ARRAY'; -- push(@header,qq(P3P: policyref="/w3c/p3p.xml", CP="$p3p")); -- } -+ push(@header,"P3P: policyref=\"/w3c/p3p.xml\", CP=\"$p3p\"") if $p3p; - # push all the cookies -- there may be several -- if ($cookie) { -- my(@cookie) = ref($cookie) && ref($cookie) eq 'ARRAY' ? @{$cookie} : $cookie; -- for (@cookie) { -- my $cs = UNIVERSAL::isa($_,'CGI::Cookie') ? $_->as_string : $_; -- push(@header,"Set-Cookie: $cs") if $cs ne ''; -- } -- } -+ push(@header,map {"Set-Cookie: $_"} @cookie); - # if the user indicates an expiration time, then we need - # both an Expires and a Date header (so that the browser is - # uses OUR clock) -diff --git a/cpan/CGI/t/headers.t b/cpan/CGI/t/headers.t -index 661b74b..4b4922c 100644 ---- a/cpan/CGI/t/headers.t -+++ b/cpan/CGI/t/headers.t -@@ -22,6 +22,12 @@ like($@,qr/contains a newline/,'invalid header blows up'); - like $cgi->header( -type => "text/html".$CGI::CRLF." evil: stuff " ), - qr#Content-Type: text/html evil: stuff#, 'known header, with leading and trailing whitespace on the continuation line'; - -+eval { $cgi->header( -p3p => ["foo".$CGI::CRLF."bar"] ) }; -+like($@,qr/contains a newline/,'P3P header with CRLF embedded blows up'); -+ -+eval { $cgi->header( -cookie => ["foo".$CGI::CRLF."bar"] ) }; -+like($@,qr/contains a newline/,'Set-Cookie header with CRLF embedded blows up'); -+ - eval { $cgi->header( -foobar => "text/html".$CGI::CRLF."evil: stuff" ) }; - like($@,qr/contains a newline/,'unknown header with CRLF embedded blows up'); - diff --git a/core/popt/PKGBUILD b/core/popt/PKGBUILD index 504665858..1f65bae8d 100644 --- a/core/popt/PKGBUILD +++ b/core/popt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 156453 2012-04-18 12:20:42Z stephane $ +# $Id: PKGBUILD 186305 2013-05-24 13:04:43Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -7,7 +7,7 @@ pkgname=popt pkgver=1.16 -pkgrel=5 +pkgrel=6 pkgdesc="A commandline option parser" arch=('i686' 'x86_64' 'mips64el') url="http://rpm5.org" @@ -20,7 +20,7 @@ sha1sums=('cfe94a15a2404db85858a81ff8de27c8ff3e235e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD index dfcaa3ea3..e59222069 100644 --- a/core/procps-ng/PKGBUILD +++ b/core/procps-ng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180917 2013-03-28 02:20:12Z bisson $ +# $Id: PKGBUILD 186026 2013-05-20 14:49:45Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org> pkgname=procps-ng pkgver=3.3.7 -pkgrel=1 +pkgrel=2 pkgdesc='Utilities for monitoring your system and its processes' url='http://gitorious.org/procps' license=('GPL' 'LGPL') @@ -23,11 +23,22 @@ replaces=('procps') options=('!libtool') -build() { +prepare() { cd "${srcdir}/procps-procps" echo ${pkgver} > .tarball-version ./autogen.sh - ./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib +} + +build() { + cd "${srcdir}/procps-procps" + ./configure \ + --prefix=/usr \ + --exec-prefix=/ \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + --bindir=/usr/bin \ + --sbindir=/usr/bin \ + --disable-static make } @@ -37,6 +48,6 @@ package() { install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf" # provided by util-linux - rm "${pkgdir}/bin/kill" + rm "${pkgdir}/usr/bin/kill" rm "${pkgdir}/usr/share/man/man1/kill.1" } diff --git a/core/reiserfsprogs/PKGBUILD b/core/reiserfsprogs/PKGBUILD index bac2a687a..a3c94bdf1 100644 --- a/core/reiserfsprogs/PKGBUILD +++ b/core/reiserfsprogs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176315 2013-01-29 16:20:21Z andrea $ +# $Id: PKGBUILD 186498 2013-05-27 20:01:02Z tpowa $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=reiserfsprogs pkgver=3.6.22 -pkgrel=1 +pkgrel=2 pkgdesc="Reiserfs utilities" arch=('i686' 'x86_64' 'mips64el') url="http://www.kernel.org/" @@ -16,7 +16,7 @@ md5sums=('91d2fdb5eeaa15c8afcc9e815179690d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sbindir=/sbin + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD index 580296392..32e24b430 100644 --- a/core/rfkill/PKGBUILD +++ b/core/rfkill/PKGBUILD @@ -1,29 +1,23 @@ -# $Id: PKGBUILD 175740 2013-01-21 04:49:48Z bisson $ +# $Id: PKGBUILD 186265 2013-05-23 06:41:04Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rfkill -pkgver=0.4 -pkgrel=7 +pkgver=0.5 +pkgrel=1 pkgdesc='Tool for enabling and disabling wireless devices' -url='http://linuxwireless.org/en/users/Documentation/rfkill' +url='http://wireless.kernel.org/en/users/Documentation/rfkill' license=('custom') arch=('i686' 'x86_64' 'mips64el') -source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2" +source=("https://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'service.unblock' 'service.block' - 'rules.d' - 'conf.d' - 'rc.d') -sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b' - '4d0ef151891c32c882dcec8b03ab7204f015d0d1' - 'c44581c4cc19509f53afd0abea1341cc30751fe2' - '6390eaa793b473098aaa11b13c5254d611a4c13a' - 'd969fe927a9fb2926af43a311a7c1fa126fe59a9' - '380af0b002f51543557306ed68a27f0059fd5a6f') - -backup=('etc/conf.d/rfkill') + 'rules.d') +sha1sums=('03025d4ae285c40d5c19ec99ef7b317afda9d900' + '5f4a04a434df2ca28ca6687326c67c1f125aa3d4' + '6cc294af37232469cd5ba63455b571fe258e1cc6' + '6390eaa793b473098aaa11b13c5254d611a4c13a') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -32,11 +26,9 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make SBINDIR=/usr/bin DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules" install -Dm644 ../service.block "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service" install -Dm644 ../service.unblock "${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service" - install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill" - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill" } diff --git a/core/rfkill/conf.d b/core/rfkill/conf.d deleted file mode 100644 index 4483da26c..000000000 --- a/core/rfkill/conf.d +++ /dev/null @@ -1,20 +0,0 @@ -# -# /etc/conf.d/rfkill -# Configuration for the rfkill startup script -# - -# List of devices to block on startup (space-separated) -RFKILL_BLOCK="" - -# List of devices to unblock on startup (space-separated) -RFKILL_UNBLOCK="all" - -# Supported device names are: all, wifi, bluetooth, umb, wimax, wwan, gps and specific device names like phy0, hci0, ... -# See "rfkill list" for available devices -# Examples: -# -# Block all bluetooth devices: -# RFKILL_BLOCK="bluetooth" -# -# Unblock the phy0 wifi device and all wwan devices: -# RFKILL_UNBLOCK="phy0 wwan" diff --git a/core/rfkill/rc.d b/core/rfkill/rc.d deleted file mode 100755 index ce90ee150..000000000 --- a/core/rfkill/rc.d +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/rfkill - -case "$1" in - start) - for device in ${RFKILL_BLOCK}; do - stat_busy "Blocking rfkill device: ${device}" - /usr/sbin/rfkill block ${device} - if [ $? -eq 0 ]; then - stat_done - else - stat_fail - fi - done - for device in ${RFKILL_UNBLOCK}; do - stat_busy "Unblocking rfkill device: ${device}" - /usr/sbin/rfkill unblock ${device} - if [ $? -eq 0 ]; then - stat_done - else - stat_fail - fi - done - ;; - stop) - ;; - restart) - $0 start - ;; - *) - echo "usage: $0 {start}" - exit 1 - ;; -esac -exit 0 diff --git a/core/rfkill/service.block b/core/rfkill/service.block index 420272c5d..ede74d12d 100644 --- a/core/rfkill/service.block +++ b/core/rfkill/service.block @@ -4,7 +4,7 @@ After=rfkill-unblock@all.service [Service] Type=oneshot -ExecStart=/usr/sbin/rfkill block %I +ExecStart=/usr/bin/rfkill block %I [Install] WantedBy=multi-user.target diff --git a/core/rfkill/service.unblock b/core/rfkill/service.unblock index 40f4e3244..94ebf35af 100644 --- a/core/rfkill/service.unblock +++ b/core/rfkill/service.unblock @@ -4,7 +4,7 @@ After=rfkill-block@all.service [Service] Type=oneshot -ExecStart=/usr/sbin/rfkill unblock %I +ExecStart=/usr/bin/rfkill unblock %I [Install] WantedBy=multi-user.target diff --git a/core/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch b/core/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch new file mode 100644 index 000000000..84cce7121 --- /dev/null +++ b/core/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch @@ -0,0 +1,255 @@ +From 3f92e4b4b61042391bd44de4dceb18177df0dd57 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Thu, 16 May 2013 00:19:03 +0200 +Subject: [PATCH] utmp: turn systemd-update-utmp-shutdown.service into a normal + runtime service + +With this change systemd-update-utmp-shutdown.service is replaced by +systemd-update-utmp.service which is started at boot and stays around +until shutdown. This allows us to properly order the unit against both +/var/log and auditd. + +https://bugzilla.redhat.com/show_bug.cgi?id=853104 +https://bugs.freedesktop.org/show_bug.cgi?id=64365 +--- + Makefile-man.am | 12 ++++++------ + Makefile.am | 8 ++++---- + ....service.xml => systemd-update-utmp.service.xml} | 16 ++++++++-------- + src/update-utmp/update-utmp.c | 2 +- + units/.gitignore | 2 +- + units/systemd-update-utmp-runlevel.service.in | 8 +++++--- + units/systemd-update-utmp-shutdown.service.in | 19 ------------------- + units/systemd-update-utmp.service.in | 21 +++++++++++++++++++++ + 8 files changed, 46 insertions(+), 42 deletions(-) + rename man/{systemd-update-utmp-runlevel.service.xml => systemd-update-utmp.service.xml} (82%) + delete mode 100644 units/systemd-update-utmp-shutdown.service.in + create mode 100644 units/systemd-update-utmp.service.in + +diff --git a/Makefile-man.am b/Makefile-man.am +index 7d62094..5888158 100644 +--- a/Makefile-man.am ++++ b/Makefile-man.am +@@ -72,7 +72,7 @@ MANPAGES += \ + man/systemd-tmpfiles.8 \ + man/systemd-tty-ask-password-agent.1 \ + man/systemd-udevd.service.8 \ +- man/systemd-update-utmp-runlevel.service.8 \ ++ man/systemd-update-utmp.service.8 \ + man/systemd.1 \ + man/systemd.automount.5 \ + man/systemd.device.5 \ +@@ -191,7 +191,7 @@ MANPAGES_ALIAS += \ + man/systemd-udevd-control.socket.8 \ + man/systemd-udevd-kernel.socket.8 \ + man/systemd-udevd.8 \ +- man/systemd-update-utmp-shutdown.service.8 \ ++ man/systemd-update-utmp-runlevel.service.8 \ + man/systemd-update-utmp.8 \ + man/systemd-user.conf.5 + man/SD_ALERT.3: man/sd-daemon.3 +@@ -289,8 +289,8 @@ man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8 + man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8 + man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8 + man/systemd-udevd.8: man/systemd-udevd.service.8 +-man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8 +-man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8 ++man/systemd-update-utmp-runlevel.service.8: man/systemd-update-utmp.service.8 ++man/systemd-update-utmp.8: man/systemd-update-utmp.service.8 + man/systemd-user.conf.5: man/systemd-system.conf.5 + man/SD_ALERT.html: man/sd-daemon.html + $(html-alias) +@@ -577,10 +577,10 @@ man/systemd-udevd-kernel.socket.html: man/systemd-udevd.service.html + man/systemd-udevd.html: man/systemd-udevd.service.html + $(html-alias) + +-man/systemd-update-utmp-shutdown.service.html: man/systemd-update-utmp-runlevel.service.html ++man/systemd-update-utmp-runlevel.service.html: man/systemd-update-utmp.service.html + $(html-alias) + +-man/systemd-update-utmp.html: man/systemd-update-utmp-runlevel.service.html ++man/systemd-update-utmp.html: man/systemd-update-utmp.service.html + $(html-alias) + + man/systemd-user.conf.html: man/systemd-system.conf.html +diff --git a/Makefile.am b/Makefile.am +index 8d8139c..4c5e6fc 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -417,8 +417,8 @@ nodist_systemunit_DATA = \ + units/systemd-initctl.service \ + units/systemd-shutdownd.service \ + units/systemd-remount-fs.service \ ++ units/systemd-update-utmp.service \ + units/systemd-update-utmp-runlevel.service \ +- units/systemd-update-utmp-shutdown.service \ + units/systemd-tmpfiles-setup-dev.service \ + units/systemd-tmpfiles-setup.service \ + units/systemd-tmpfiles-clean.service \ +@@ -463,8 +463,8 @@ EXTRA_DIST += \ + units/systemd-initctl.service.in \ + units/systemd-shutdownd.service.in \ + units/systemd-remount-fs.service.in \ ++ units/systemd-update-utmp.service.in \ + units/systemd-update-utmp-runlevel.service.in \ +- units/systemd-update-utmp-shutdown.service.in \ + units/systemd-tmpfiles-setup-dev.service.in \ + units/systemd-tmpfiles-setup.service.in \ + units/systemd-tmpfiles-clean.service.in \ +@@ -4070,8 +4070,8 @@ RUNLEVEL4_TARGET_WANTS += \ + RUNLEVEL5_TARGET_WANTS += \ + systemd-update-utmp-runlevel.service + endif +-SHUTDOWN_TARGET_WANTS += \ +- systemd-update-utmp-shutdown.service ++SYSINIT_TARGET_WANTS += \ ++ systemd-update-utmp.service + LOCAL_FS_TARGET_WANTS += \ + systemd-remount-fs.service \ + systemd-fsck-root.service \ +diff --git a/man/systemd-update-utmp-runlevel.service.xml b/man/systemd-update-utmp.service.xml +similarity index 82% +rename from man/systemd-update-utmp-runlevel.service.xml +rename to man/systemd-update-utmp.service.xml +index 867b958..846fc95 100644 +--- a/man/systemd-update-utmp-runlevel.service.xml ++++ b/man/systemd-update-utmp.service.xml +@@ -19,10 +19,10 @@ + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. + --> +-<refentry id="systemd-update-utmp-runlevel.service"> ++<refentry id="systemd-update-utmp.service"> + + <refentryinfo> +- <title>systemd-update-utmp-runlevel.service</title> ++ <title>systemd-update-utmp.service</title> + <productname>systemd</productname> + + <authorgroup> +@@ -36,21 +36,21 @@ + </refentryinfo> + + <refmeta> +- <refentrytitle>systemd-update-utmp-runlevel.service</refentrytitle> ++ <refentrytitle>systemd-update-utmp.service</refentrytitle> + <manvolnum>8</manvolnum> + </refmeta> + + <refnamediv> ++ <refname>systemd-update-utmp.service</refname> + <refname>systemd-update-utmp-runlevel.service</refname> +- <refname>systemd-update-utmp-shutdown.service</refname> + <refname>systemd-update-utmp</refname> +- <refpurpose>Write audit and utmp updates at runlevel ++ <refpurpose>Write audit and utmp updates at bootup, runlevel + changes and shutdown</refpurpose> + </refnamediv> + + <refsynopsisdiv> ++ <para><filename>systemd-update-utmp.service</filename></para> + <para><filename>systemd-update-utmp-runlevel.service</filename></para> +- <para><filename>systemd-update-utmp-shutdown.service</filename></para> + <para><filename>/usr/lib/systemd/systemd-update-utmp</filename></para> + </refsynopsisdiv> + +@@ -60,8 +60,8 @@ + <para><filename>systemd-update-utmp-runlevel.service</filename> + is a service that writes SysV runlevel changes to utmp + and wtmp, as well as the audit logs, as they +- occur. <filename>systemd-update-utmp-shutdown.service</filename> +- does the same for shut-down requests.</para> ++ occur. <filename>systemd-update-utmp.service</filename> ++ does the same for system reboots and shut-down requests.</para> + </refsect1> + + <refsect1> +diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c +index 9184025..202aa98 100644 +--- a/src/update-utmp/update-utmp.c ++++ b/src/update-utmp/update-utmp.c +@@ -104,7 +104,7 @@ static int get_current_runlevel(Context *c) { + { '3', SPECIAL_RUNLEVEL3_TARGET }, + { '4', SPECIAL_RUNLEVEL4_TARGET }, + { '2', SPECIAL_RUNLEVEL2_TARGET }, +- { 'S', SPECIAL_RESCUE_TARGET }, ++ { '1', SPECIAL_RESCUE_TARGET }, + }; + const char + *interface = "org.freedesktop.systemd1.Unit", +diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in +index 27fae2c..99783e2 100644 +--- a/units/systemd-update-utmp-runlevel.service.in ++++ b/units/systemd-update-utmp-runlevel.service.in +@@ -7,12 +7,14 @@ + + [Unit] + Description=Update UTMP about System Runlevel Changes +-Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5) ++Documentation=man:systemd-update-utmp.service(8) man:utmp(5) + DefaultDependencies=no + RequiresMountsFor=/var/log/wtmp +-After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service ++Conflicts=shutdown.target ++Requisite=systemd-update-utmp.service ++After=systemd-update-utmp.service + After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target +-Before=final.target ++Before=shutdown.target + + [Service] + Type=oneshot +diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in +deleted file mode 100644 +index aa93562..0000000 +--- a/units/systemd-update-utmp-shutdown.service.in ++++ /dev/null +@@ -1,19 +0,0 @@ +-# This file is part of systemd. +-# +-# systemd is free software; you can redistribute it and/or modify it +-# under the terms of the GNU Lesser General Public License as published by +-# the Free Software Foundation; either version 2.1 of the License, or +-# (at your option) any later version. +- +-[Unit] +-Description=Update UTMP about System Shutdown +-Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5) +-DefaultDependencies=no +-RequiresMountsFor=/var/log/wtmp +-After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service +-After=systemd-update-utmp-runlevel.service +-Before=final.target +- +-[Service] +-Type=oneshot +-ExecStart=@rootlibexecdir@/systemd-update-utmp shutdown +diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in +new file mode 100644 +index 0000000..e7c20a5 +--- /dev/null ++++ b/units/systemd-update-utmp.service.in +@@ -0,0 +1,21 @@ ++# This file is part of systemd. ++# ++# systemd is free software; you can redistribute it and/or modify it ++# under the terms of the GNU Lesser General Public License as published by ++# the Free Software Foundation; either version 2.1 of the License, or ++# (at your option) any later version. ++ ++[Unit] ++Description=Update UTMP about System Reboot/Shutdown ++Documentation=man:systemd-update-utmp.service(8) man:utmp(5) ++DefaultDependencies=no ++RequiresMountsFor=/var/log/wtmp ++Conflicts=shutdown.target ++After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service ++Before=sysinit.target shutdown.target ++ ++[Service] ++Type=oneshot ++RemainAfterExit=yes ++ExecStart=@rootlibexecdir@/systemd-update-utmp reboot ++ExecStop=@rootlibexecdir@/systemd-update-utmp shutdown +-- +1.8.2.3 + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 1a106b14e..d26c533fb 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=204 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -13,11 +13,13 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection 'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz') options=('!libtool' '!distcc') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" + 0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' 'use-split-usr-path.patch') md5sums=('a07619bb19f48164fbf0761d12fd39a8' + '7f39f9fde1ff7b48293ed1e3d0a6c213' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' @@ -28,6 +30,9 @@ prepare() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" + + patch -Np1 <"$srcdir/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch" + autoreconf } build() { @@ -102,9 +107,6 @@ package_systemd() { install -d "$pkgdir/sbin" ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" - # udevd is no longer udevd because systemd. why isn't udevadm now udevctl? - ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd" - # add back tmpfiles.d/legacy.conf install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" diff --git a/core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch b/core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch new file mode 100644 index 000000000..86bb6e572 --- /dev/null +++ b/core/util-linux/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch @@ -0,0 +1,163 @@ +From 4fb18cde32a6cb672090762c785d89a6ed02ef57 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Thu, 9 May 2013 13:06:02 +0200 +Subject: [PATCH] libfdisk: do not use va_list in the Ask API + + # fdisk /dev/sda + Welcome to fdisk (util-linux 2.23). + + [...] + + Command (m for help): a + Segmentation fault (core dumped) + +It's too fragile, the va_list implementation is architecture specific +and it seems we need such thing in libfdisk at all. + +Reported-by: "Gabor Z. Papp" <gzp@papp.hu> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + fdisks/fdisk-ask.c | 13 +++---------- + libfdisk/src/ask.c | 35 +++++++++-------------------------- + libfdisk/src/fdiskP.h | 2 -- + libfdisk/src/libfdisk.h | 2 -- + 4 files changed, 12 insertions(+), 40 deletions(-) + +diff --git a/fdisks/fdisk-ask.c b/fdisks/fdisk-ask.c +index 7495d85..61dc0c2 100644 +--- a/fdisks/fdisk-ask.c ++++ b/fdisks/fdisk-ask.c +@@ -167,7 +167,6 @@ static int ask_offset(struct fdisk_context *cxt, + int ask_callback(struct fdisk_context *cxt, struct fdisk_ask *ask, + void *data __attribute__((__unused__))) + { +- va_list ap; + int rc = 0; + char buf[BUFSIZ]; + +@@ -180,23 +179,17 @@ int ask_callback(struct fdisk_context *cxt, struct fdisk_ask *ask, + case FDISK_ASKTYPE_OFFSET: + return ask_offset(cxt, ask, buf, sizeof(buf)); + case FDISK_ASKTYPE_INFO: +- fdisk_ask_print_get_va(ask, ap); +- vfprintf(stdout, fdisk_ask_print_get_mesg(ask), ap); ++ fputs(fdisk_ask_print_get_mesg(ask), stdout); + fputc('\n', stdout); +- va_end(ap); + break; + case FDISK_ASKTYPE_WARNX: +- fdisk_ask_print_get_va(ask, ap); +- vfprintf(stderr, fdisk_ask_print_get_mesg(ask), ap); ++ fputs(fdisk_ask_print_get_mesg(ask), stderr); + fputc('\n', stderr); +- va_end(ap); + break; + case FDISK_ASKTYPE_WARN: +- fdisk_ask_print_get_va(ask, ap); +- vfprintf(stderr, fdisk_ask_print_get_mesg(ask), ap); ++ fputs(fdisk_ask_print_get_mesg(ask), stderr); + errno = fdisk_ask_print_get_errno(ask); + fprintf(stderr, ": %m\n"); +- va_end(ap); + break; + case FDISK_ASKTYPE_YESNO: + fputc('\n', stdout); +diff --git a/libfdisk/src/ask.c b/libfdisk/src/ask.c +index d2325d5..cdb4d01 100644 +--- a/libfdisk/src/ask.c ++++ b/libfdisk/src/ask.c +@@ -18,11 +18,6 @@ void fdisk_reset_ask(struct fdisk_ask *ask) + case FDISK_ASKTYPE_NUMBER: + free(ask->data.num.range); + break; +- case FDISK_ASKTYPE_WARNX: +- case FDISK_ASKTYPE_WARN: +- if (ask->data.print.has_va) +- va_end(ask->data.print.va); +- break; + default: + break; + } +@@ -452,44 +447,32 @@ int fdisk_ask_print_set_mesg(struct fdisk_ask *ask, const char *mesg) + return 0; + } + +-/* caller has to call va_end(ap) */ +-int fdisk_ask_print_get_va(struct fdisk_ask *ask, va_list ap) +-{ +- assert(ask); +- assert(is_print_ask(ask)); +- va_copy(ap, ask->data.print.va); +- return 0; +-} +- +-/* note that fdisk_free_ask() calls va_end() to free the private va list. */ +-int fdisk_ask_print_set_va(struct fdisk_ask *ask, va_list ap) +-{ +- assert(ask); +- va_copy(ask->data.print.va, ap); +- ask->data.print.has_va = 1; +- return 0; +-} +- + static int do_vprint(struct fdisk_context *cxt, int errnum, int type, + const char *fmt, va_list va) + { + struct fdisk_ask *ask; + int rc; ++ char *mesg; + + assert(cxt); + ++ if (vasprintf(&mesg, fmt, va) < 0) ++ return -ENOMEM; ++ + ask = fdisk_new_ask(); +- if (!ask) ++ if (!ask) { ++ free(mesg); + return -ENOMEM; ++ } + + fdisk_ask_set_type(ask, type); +- fdisk_ask_print_set_mesg(ask, fmt); +- fdisk_ask_print_set_va(ask, va); ++ fdisk_ask_print_set_mesg(ask, mesg); + if (errnum >= 0) + fdisk_ask_print_set_errno(ask, errnum); + rc = fdisk_do_ask(cxt, ask); + + fdisk_free_ask(ask); ++ free(mesg); + return rc; + } + +diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h +index 570108c..ce42860 100644 +--- a/libfdisk/src/fdiskP.h ++++ b/libfdisk/src/fdiskP.h +@@ -231,8 +231,6 @@ struct fdisk_ask { + /* FDISK_ASKTYPE_{WARN,WARNX,..} */ + struct ask_print { + const char *mesg; +- va_list va; +- unsigned int has_va:1; + int errnum; /* errno */ + } print; + /* FDISK_ASKTYPE_YESNO */ +diff --git a/libfdisk/src/libfdisk.h b/libfdisk/src/libfdisk.h +index 0a23236..8a44067 100644 +--- a/libfdisk/src/libfdisk.h ++++ b/libfdisk/src/libfdisk.h +@@ -182,8 +182,6 @@ extern int fdisk_ask_print_get_errno(struct fdisk_ask *ask); + extern int fdisk_ask_print_set_errno(struct fdisk_ask *ask, int errnum); + extern const char *fdisk_ask_print_get_mesg(struct fdisk_ask *ask); + extern int fdisk_ask_print_set_mesg(struct fdisk_ask *ask, const char *mesg); +-extern int fdisk_ask_print_get_va(struct fdisk_ask *ask, va_list ap); +-extern int fdisk_ask_print_set_va(struct fdisk_ask *ask, va_list ap); + + #ifdef __cplusplus + } +-- +1.8.2.3 + diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 9143a4872..2172701f9 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185607 2013-05-15 22:53:31Z tomegun $ +# $Id: PKGBUILD 186531 2013-05-28 12:25:50Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.23 -pkgrel=2 +pkgrel=3 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64' 'mips64el') @@ -19,6 +19,7 @@ options=('!libtool') source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.23/$pkgname-$pkgver.tar.xz" 0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch 0001-losetup-use-warn_size-for-regular-files-only.patch + 0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch uuidd.tmpfiles pam-login pam-common @@ -32,6 +33,7 @@ install=util-linux.install md5sums=('cf5e9bb402371beaaffc3a5f276d5783' 'fdb627fbb3d6a42e0b36978649b4c064' 'de0ba450945a60f27c5df86e64523d57' + 'df949d15dbff01fe9fcda5d999a35b15' 'a39554bfd65cccfd8254bb46922f4a67' '4368b3f98abd8a32662e094c54e7f9b1' 'a31374fef2cba0ca34dfc7078e2969e4' @@ -42,6 +44,7 @@ prepare() { patch -Np1 <"$srcdir"/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch patch -Np1 <"$srcdir"/0001-losetup-use-warn_size-for-regular-files-only.patch + patch -Np1 <"$srcdir"/0001-libfdisk-do-not-use-va_list-in-the-Ask-API.patch } build() { diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD index 92d2f15d0..8a6b6cb41 100644 --- a/core/wireless_tools/PKGBUILD +++ b/core/wireless_tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165574 2012-08-25 15:33:20Z bisson $ +# $Id: PKGBUILD 186266 2013-05-23 06:41:05Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jason Chu <jchu@xentac.net> pkgname=wireless_tools pkgver=29 -pkgrel=7.1 +pkgrel=8 pkgdesc='Tools allowing to manipulate the Wireless Extensions' url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html' license=('GPL') @@ -15,16 +15,20 @@ source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgve sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710' '5c297c7dff1ec1d2a3d918c20622ab3c6daf5b72') -build() { +prepare() { cd "${srcdir}/${pkgname}.${pkgver}" patch -p1 -i ../dense.patch # FS#15363 +} + +build() { + cd "${srcdir}/${pkgname}.${pkgver}" make CFLAGS="${CFLAGS} -I." LDFLAGS="${LDFLAGS}" } package() { cd "${srcdir}/${pkgname}.${pkgver}" make \ - INSTALL_DIR="${pkgdir}/usr/sbin" \ + INSTALL_DIR="${pkgdir}/usr/bin" \ INSTALL_LIB="${pkgdir}/usr/lib" \ INSTALL_INC="${pkgdir}/usr/include" \ INSTALL_MAN="${pkgdir}/usr/share/man" \ diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD index c56832ad2..eeb8d3b10 100644 --- a/core/xfsprogs/PKGBUILD +++ b/core/xfsprogs/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 175120 2013-01-14 07:38:18Z tpowa $ +# $Id: PKGBUILD 186296 2013-05-24 07:56:54Z tpowa $ # pkgname=xfsprogs -pkgver=3.1.10 +pkgver=3.1.11 pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64' 'mips64el') @@ -12,20 +12,20 @@ depends=('util-linux') options=('!makeflags' '!libtool') # We mirror the sources as upstream tends to move them once a new release is out source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") -md5sums=('d6159f7a664d95b4c150d580399d4400') +md5sums=('de9f1f45026c2f4e0776058d429ff4b6') build() { cd "${srcdir}/${pkgname}-${pkgver}" export OPTIMIZER="-march=${CARCH/_/-} -O1" [ "$CARCH" = "mips64el" ] && export OPTIMIZER="-mabi=n32 -march=mips3 -mtune=loongson2f -O1" export DEBUG=-DNDEBUG - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DIST_ROOT="${pkgdir}" install install-dev + make DIST_ROOT="${pkgdir}" PKG_ROOT_SBIN_DIR="/usr/bin" install install-dev chown -R root $pkgdir chgrp -R root $pkgdir # add hack as we cannot set rootlibdir diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD index 5bee80902..fbdf3d48d 100644 --- a/core/xinetd/PKGBUILD +++ b/core/xinetd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162234 2012-06-24 05:44:41Z tpowa $ +# $Id: PKGBUILD 186292 2013-05-24 07:53:31Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd <jvinet@zeroflux.org> pkgname=xinetd pkgver=2.3.15 -pkgrel=2 +pkgrel=3 pkgdesc="A secure replacement for inetd" arch=('i686' 'x86_64' 'mips64el') url="http://www.xinetd.org/" @@ -13,30 +13,31 @@ optdepends=('perl: for xconv.pl script') backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services') source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz xinetd.conf - xinetd servers services xinetd.service) md5sums=('77358478fd58efa6366accae99b8b04c' 'f109f699a07bc8cfb5791060f5e87f9e' - 'ea37a2794f202e6b953d9b6956dad16a' '21f47b4aa20921cfaddddd9f9a407f81' '9fa2061dc7dd738c8424251deb86f81e' - '08466ed714ea8ba42ad81f6fb3aa62e7') + '38be35b6e7146dc59902e243d9063b4c') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver sed -i "s#${prefix}/man#${prefix}/share/man#" configure - ./configure --prefix=/usr --without-libwrap \ +} + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --sbindir=/usr/bin --without-libwrap \ --build=${CHOST} --host=${CHOST} make } package() { cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr install + make prefix=$pkgdir/usr DAEMONDIR=$pkgdir/usr/bin install - install -Dm755 $srcdir/xinetd $pkgdir/etc/rc.d/xinetd install -Dm644 $srcdir/xinetd.conf $pkgdir/etc/xinetd.conf install -Dm644 $srcdir/servers $pkgdir/etc/xinetd.d/servers install -Dm644 $srcdir/services $pkgdir/etc/xinetd.d/services diff --git a/core/xinetd/xinetd.service b/core/xinetd/xinetd.service index c6f6271fd..1c587e291 100644 --- a/core/xinetd/xinetd.service +++ b/core/xinetd/xinetd.service @@ -3,7 +3,7 @@ Description=A secure replacement for inetd After=network.target [Service] -ExecStart=/usr/sbin/xinetd -dontfork +ExecStart=/usr/bin/xinetd -dontfork ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index b67790a53..f40c2a88f 100644 --- a/extra/alsa-lib/PKGBUILD +++ b/extra/alsa-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184466 2013-05-07 10:49:12Z tpowa $ +# $Id: PKGBUILD 186216 2013-05-22 06:35:12Z tpowa $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=alsa-lib -pkgver=1.0.27 -pkgrel=2 +pkgver=1.0.27.1 +pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -12,20 +12,7 @@ optdepends=('python2: for python smixer plugin') makedepends=('python2') license=('GPL') options=(!libtool) -source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2 - alsa-lib-1.0.27-segfault.patch - alsa-lib-1.0.27-kernel.patch - alsa-lib-1.0.27-inline.patch - alsa-lib-1.0.27-inline2.patch) - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - # add upstream patches - patch -Np1 -i "$srcdir/alsa-lib-1.0.27-segfault.patch" - patch -Np1 -i "$srcdir/alsa-lib-1.0.27-kernel.patch" - patch -Np1 -i "$srcdir/alsa-lib-1.0.27-inline.patch" - patch -Np1 -i "$srcdir/alsa-lib-1.0.27-inline2.patch" -} +source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2) build() { cd "$srcdir/$pkgname-$pkgver" @@ -37,8 +24,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('f090c7dbd0fe57d786d82e411eac2d08' - '755cfcd116c28feac437eb6b5bdc51bb' - '277e2bc587de25e3294a0f597ae9246e' - 'db14deccb57d8dbcfc6f6d22bed45c1e' - '92ca1fec0cb99bfc302896cf9393a936') +md5sums=('17102aaab10e9d4b19f6b02937bab015') diff --git a/extra/alsa-lib/alsa-lib-1.0.27-inline.patch b/extra/alsa-lib/alsa-lib-1.0.27-inline.patch deleted file mode 100644 index cc5cb8d75..000000000 --- a/extra/alsa-lib/alsa-lib-1.0.27-inline.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 30122df4faf7ccc79b9525db95f55c5a8ed6fe4d Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Thu, 25 Apr 2013 09:52:33 +0200 -Subject: [PATCH] Use __inline__ for exported headers - -Some programs are still using C90. - -Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=817077 -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - include/control.h | 4 ++-- - include/iatomic.h | 14 +++++++------- - include/pcm.h | 2 +- - include/pcm_extplug.h | 4 ++-- - include/use-case.h | 4 ++-- - 5 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/include/control.h b/include/control.h -index 27fe2ac..5fdf379 100644 ---- a/include/control.h -+++ b/include/control.h -@@ -234,7 +234,7 @@ int snd_ctl_open_lconf(snd_ctl_t **ctl, const char *name, int mode, snd_config_t - int snd_ctl_open_fallback(snd_ctl_t **ctl, snd_config_t *root, const char *name, const char *orig_name, int mode); - int snd_ctl_close(snd_ctl_t *ctl); - int snd_ctl_nonblock(snd_ctl_t *ctl, int nonblock); --static inline int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); } -+static __inline__ int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); } - int snd_async_add_ctl_handler(snd_async_handler_t **handler, snd_ctl_t *ctl, - snd_async_callback_t callback, void *private_data); - snd_ctl_t *snd_async_handler_get_ctl(snd_async_handler_t *handler); -@@ -532,7 +532,7 @@ int snd_hctl_open(snd_hctl_t **hctl, const char *name, int mode); - int snd_hctl_open_ctl(snd_hctl_t **hctlp, snd_ctl_t *ctl); - int snd_hctl_close(snd_hctl_t *hctl); - int snd_hctl_nonblock(snd_hctl_t *hctl, int nonblock); --static inline int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); } -+static __inline__ int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); } - int snd_hctl_poll_descriptors_count(snd_hctl_t *hctl); - int snd_hctl_poll_descriptors(snd_hctl_t *hctl, struct pollfd *pfds, unsigned int space); - int snd_hctl_poll_descriptors_revents(snd_hctl_t *ctl, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); -diff --git a/include/iatomic.h b/include/iatomic.h -index e92dbfd..5711fe8 100644 ---- a/include/iatomic.h -+++ b/include/iatomic.h -@@ -980,7 +980,7 @@ static __inline__ int atomic_dec_and_test(volatile atomic_t *v) - return result; - } - --static inline int atomic_add_negative(int i, volatile atomic_t *v) -+static __inline__ int atomic_add_negative(int i, volatile atomic_t *v) - { - unsigned long flags; - int result; -@@ -1160,36 +1160,36 @@ typedef struct { - - void snd_atomic_read_wait(snd_atomic_read_t *t); - --static inline void snd_atomic_write_init(snd_atomic_write_t *w) -+static __inline__ void snd_atomic_write_init(snd_atomic_write_t *w) - { - w->begin = 0; - w->end = 0; - } - --static inline void snd_atomic_write_begin(snd_atomic_write_t *w) -+static __inline__ void snd_atomic_write_begin(snd_atomic_write_t *w) - { - w->begin++; - wmb(); - } - --static inline void snd_atomic_write_end(snd_atomic_write_t *w) -+static __inline__ void snd_atomic_write_end(snd_atomic_write_t *w) - { - wmb(); - w->end++; - } - --static inline void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w) -+static __inline__ void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w) - { - r->write = w; - } - --static inline void snd_atomic_read_begin(snd_atomic_read_t *r) -+static __inline__ void snd_atomic_read_begin(snd_atomic_read_t *r) - { - r->end = r->write->end; - rmb(); - } - --static inline int snd_atomic_read_ok(snd_atomic_read_t *r) -+static __inline__ int snd_atomic_read_ok(snd_atomic_read_t *r) - { - rmb(); - return r->end == r->write->begin; -diff --git a/include/pcm.h b/include/pcm.h -index e440030..95b8aed 100644 ---- a/include/pcm.h -+++ b/include/pcm.h -@@ -451,7 +451,7 @@ int snd_pcm_poll_descriptors_count(snd_pcm_t *pcm); - int snd_pcm_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space); - int snd_pcm_poll_descriptors_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); - int snd_pcm_nonblock(snd_pcm_t *pcm, int nonblock); --static inline int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); } -+static __inline__ int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); } - int snd_async_add_pcm_handler(snd_async_handler_t **handler, snd_pcm_t *pcm, - snd_async_callback_t callback, void *private_data); - snd_pcm_t *snd_async_handler_get_pcm(snd_async_handler_t *handler); -diff --git a/include/pcm_extplug.h b/include/pcm_extplug.h -index 884f322..e3b71bc 100644 ---- a/include/pcm_extplug.h -+++ b/include/pcm_extplug.h -@@ -188,7 +188,7 @@ int snd_pcm_extplug_set_slave_param_minmax(snd_pcm_extplug_t *extplug, int type, - /** - * set the parameter constraint with a single value - */ --static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) -+static __inline__ int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) - { - return snd_pcm_extplug_set_param_list(extplug, type, 1, &val); - } -@@ -196,7 +196,7 @@ static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type - /** - * set the parameter constraint for slave PCM with a single value - */ --static inline int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) -+static __inline__ int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) - { - return snd_pcm_extplug_set_slave_param_list(extplug, type, 1, &val); - } -diff --git a/include/use-case.h b/include/use-case.h -index defd4ea..93b3456 100644 ---- a/include/use-case.h -+++ b/include/use-case.h -@@ -354,7 +354,7 @@ int snd_use_case_mgr_reset(snd_use_case_mgr_t *uc_mgr); - * \param list Returned allocated list - * \return Number of list entries if success, otherwise a negative error code - */ --static inline int snd_use_case_card_list(const char **list[]) -+static __inline__ int snd_use_case_card_list(const char **list[]) - { - return snd_use_case_get_list(NULL, NULL, list); - } -@@ -365,7 +365,7 @@ static inline int snd_use_case_card_list(const char **list[]) - * \param list Returned list of verbs - * \return Number of list entries if success, otherwise a negative error code - */ --static inline int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr, -+static __inline__ int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr, - const char **list[]) - { - return snd_use_case_get_list(uc_mgr, "_verbs", list); --- -1.7.11.7 - diff --git a/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch b/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch deleted file mode 100644 index e99bae864..000000000 --- a/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a8f405b8f90d752c3609b9e918dc949c4efadf87 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Thu, 25 Apr 2013 09:55:49 +0200 -Subject: [PATCH] Add definition of __inline__ for non-GCC - -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - include/asoundlib-head.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/asoundlib-head.h b/include/asoundlib-head.h -index 6edbab0..71b5c29 100644 ---- a/include/asoundlib-head.h -+++ b/include/asoundlib-head.h -@@ -40,6 +40,10 @@ - #include <errno.h> - #include <stdarg.h> - -+#ifndef __GNUC__ -+#define __inline__ inline -+#endif -+ - #include <alsa/asoundef.h> - #include <alsa/version.h> - #include <alsa/global.h> --- -1.7.11.7 - diff --git a/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch b/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch deleted file mode 100644 index 3d4eaf3cb..000000000 --- a/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 886f0cc3c274643de464e646535afb4ceee1d816 Mon Sep 17 00:00:00 2001 -From: Daniel Mack <zonque@gmail.com> -Date: Thu, 18 Apr 2013 10:37:50 +0200 -Subject: [PATCH] bring pcm.h and pcm.c in sync with the kernel list - -In particular, this adds definitions and descriptions for G.723 and -DSD types. - -Signed-off-by: Daniel Mack <zonque@gmail.com> -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - include/pcm.h | 14 +++++++++++++- - src/pcm/pcm.c | 12 ++++++++++++ - 2 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/include/pcm.h b/include/pcm.h -index d94ba90..e440030 100644 ---- a/include/pcm.h -+++ b/include/pcm.h -@@ -199,7 +199,19 @@ typedef enum _snd_pcm_format { - SND_PCM_FORMAT_U18_3LE, - /** Unsigned 18bit Big Endian in 3bytes format */ - SND_PCM_FORMAT_U18_3BE, -- SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_U18_3BE, -+ /* G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes */ -+ SND_PCM_FORMAT_G723_24, -+ /* G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte */ -+ SND_PCM_FORMAT_G723_24_1B, -+ /* G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes */ -+ SND_PCM_FORMAT_G723_40, -+ /* G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte */ -+ SND_PCM_FORMAT_G723_40_1B, -+ /* Direct Stream Digital (DSD) in 1-byte samples (x8) */ -+ SND_PCM_FORMAT_DSD_U8, -+ /* Direct Stream Digital (DSD) in 2-byte samples (x16) */ -+ SND_PCM_FORMAT_DSD_U16_LE, -+ SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_DSD_U16_LE, - - #if __BYTE_ORDER == __LITTLE_ENDIAN - /** Signed 16 bit CPU endian */ -diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c -index 2a87a7b..438fb3f 100644 ---- a/src/pcm/pcm.c -+++ b/src/pcm/pcm.c -@@ -1558,6 +1558,12 @@ static const char *const snd_pcm_format_names[] = { - FORMAT(S18_3BE), - FORMAT(U18_3LE), - FORMAT(U18_3BE), -+ FORMAT(G723_24), -+ FORMAT(G723_24_1B), -+ FORMAT(G723_40), -+ FORMAT(G723_40_1B), -+ FORMAT(DSD_U8), -+ FORMAT(DSD_U16_LE), - }; - - static const char *const snd_pcm_format_aliases[SND_PCM_FORMAT_LAST+1] = { -@@ -1611,6 +1617,12 @@ static const char *const snd_pcm_format_descriptions[] = { - FORMATD(S18_3BE, "Signed 18 bit Big Endian in 3bytes"), - FORMATD(U18_3LE, "Unsigned 18 bit Little Endian in 3bytes"), - FORMATD(U18_3BE, "Unsigned 18 bit Big Endian in 3bytes"), -+ FORMATD(G723_24, "G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes"), -+ FORMATD(G723_24_1B, "G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte"), -+ FORMATD(G723_40, "G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes"), -+ FORMATD(G723_40_1B, "G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte"), -+ FORMATD(DSD_U8, "Direct Stream Digital, 1-byte (x8), oldest bit in MSB"), -+ FORMATD(DSD_U16_LE, "Direct Stream Digital, 2-byte (x16), little endian, oldest bits in MSB"), - }; - - static const char *const snd_pcm_type_names[] = { --- -1.7.11.7 - diff --git a/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch b/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch deleted file mode 100644 index 72df46185..000000000 --- a/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch +++ /dev/null @@ -1,102 +0,0 @@ -From e1e40c25535af35fa5cdf7ffc95a01fbff098ddd Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Mon, 15 Apr 2013 18:12:17 +0200 -Subject: [PATCH] Fix doubly call of dlclose() in dlobj caching code - -When multiple dlobj_cache items point to the same dlobj, dlclose() may -be called wrongly multiple times when these items are cleared, because -we manage the dlobj_cache list as a flat list. This results in a bad -segfault we've seen in openal-soft, for example. - -For fixing this, we need the refcounting of dlobj itself. But, in -this case, we don't have to manage yet another list, since dlopen() -does a proper refcounting by itself. That is, we can just call always -dlopen() at each time a new function is assigned, and also call -dlclose() for each released dlobj_cache item at cleanup. - -Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=814250 - -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - src/dlmisc.c | 31 +++++++++++-------------------- - 1 file changed, 11 insertions(+), 20 deletions(-) - -diff --git a/src/dlmisc.c b/src/dlmisc.c -index 3788382..2de0234 100644 ---- a/src/dlmisc.c -+++ b/src/dlmisc.c -@@ -208,8 +208,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, - { - struct list_head *p; - struct dlobj_cache *c; -- void *func, *dlobj = NULL; -- int dlobj_close = 0; -+ void *func, *dlobj; - - snd_dlobj_lock(); - list_for_each(p, &pcm_dlobj_list) { -@@ -220,7 +219,6 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, - continue; - if (!lib && c->lib) - continue; -- dlobj = c->dlobj; - if (strcmp(c->name, name) == 0) { - c->refcnt++; - func = c->func; -@@ -228,17 +226,16 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, - return func; - } - } -+ -+ dlobj = snd_dlopen(lib, RTLD_NOW); - if (dlobj == NULL) { -- dlobj = snd_dlopen(lib, RTLD_NOW); -- if (dlobj == NULL) { -- if (verbose) -- SNDERR("Cannot open shared library %s", -+ if (verbose) -+ SNDERR("Cannot open shared library %s", - lib ? lib : "[builtin]"); -- snd_dlobj_unlock(); -- return NULL; -- } -- dlobj_close = 1; -+ snd_dlobj_unlock(); -+ return NULL; - } -+ - func = snd_dlsym(dlobj, name, version); - if (func == NULL) { - if (verbose) -@@ -257,8 +254,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, - free((void *)c->lib); - free(c); - __err: -- if (dlobj_close) -- snd_dlclose(dlobj); -+ snd_dlclose(dlobj); - snd_dlobj_unlock(); - return NULL; - } -@@ -298,16 +294,11 @@ void snd_dlobj_cache_cleanup(void) - struct list_head *p, *npos; - struct dlobj_cache *c; - -- /* clean up caches only when really no user is present */ - snd_dlobj_lock(); -- list_for_each(p, &pcm_dlobj_list) { -- c = list_entry(p, struct dlobj_cache, list); -- if (c->refcnt) -- goto unlock; -- } -- - list_for_each_safe(p, npos, &pcm_dlobj_list) { - c = list_entry(p, struct dlobj_cache, list); -+ if (c->refcnt) -+ continue; - list_del(p); - snd_dlclose(c->dlobj); - free((void *)c->name); /* shut up gcc warning */ --- -1.7.11.7 - diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index 6fbdb9dd3..6dfe5274a 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185745 2013-05-18 09:51:58Z tpowa $ +# $Id: PKGBUILD 186452 2013-05-26 17:55:09Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-utils -pkgver=1.0.27 -pkgrel=5 +pkgver=1.0.27.1 +pkgrel=2 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -13,27 +13,18 @@ depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc' 'libsamplerate makedepends=('xmlto' 'docbook-xsl') license=('GPL') source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 - 90alsa - alsa-restore-1.0.27.service.patch - alsactl-fix-buffer-overflow-1.0.27.patch - arecord-1.0.27.patch) + 90alsa) backup=(etc/conf.d/alsa) -prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/alsa-restore-1.0.27.service.patch - patch -Np1 -i ${srcdir}/alsactl-fix-buffer-overflow-1.0.27.patch - patch -Np1 -i ${srcdir}/arecord-1.0.27.patch - # remove wrong udev file from sources - rm alsactl/90-alsa-restore.rules -} - build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --disable-alsaconf --sbindir=/usr/bin \ --with-udev-rules-dir=/usr/lib/udev/rules.d \ --with-systemdsystemunitdir=/usr/lib/systemd/system make + # fix udev rules genaration + cd alsactl + make 90-alsa-restore.rules } package() { @@ -41,11 +32,12 @@ package() { make DESTDIR=${pkgdir} install install -D -m755 ../90alsa ${pkgdir}/etc/pm/sleep.d/90alsa + # install alsa udev rule file + install -D -m644 alsactl/90-alsa-restore.rules \ + ${pkgdir}/usr/lib/udev/rules.d/90-alsa-restore.rules + # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('cbfb21a24f63fb052b3392195639ce48' - '529216f6a46e61a546640e08ea7a0879' - '0a27f7b80351d6baa274c32d859bf037' - 'cd577445636542f9f60b420e4ffe3f0f' - 'cecb38f03bd245d0584bfd63370e9a05') +md5sums=('3d81357b997744a139881ef72bc6921a' + '529216f6a46e61a546640e08ea7a0879') diff --git a/extra/alsa-utils/alsa-restore-1.0.27.service.patch b/extra/alsa-utils/alsa-restore-1.0.27.service.patch deleted file mode 100644 index b3a9d48fd..000000000 --- a/extra/alsa-utils/alsa-restore-1.0.27.service.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- alsa-utils-1.0.27/alsactl/alsa-restore.service.in.old 2013-04-15 14:37:57.326541394 +0200 -+++ alsa-utils-1.0.27/alsactl/alsa-restore.service.in 2013-04-15 14:38:10.179673494 +0200 -@@ -12,6 +12,6 @@ - Conflicts=shutdown.target - - [Service] --Type=oneshop -+Type=oneshot - ExecStart=-@sbindir@/alsactl restore - StandardOutput=syslog diff --git a/extra/alsa-utils/alsa.conf.d b/extra/alsa-utils/alsa.conf.d deleted file mode 100644 index bd50dcca2..000000000 --- a/extra/alsa-utils/alsa.conf.d +++ /dev/null @@ -1,15 +0,0 @@ -# Arguments for alsactl -# example: ALSA_ARGS="--file /var/lib/alsa/asound.state" -ALSA_ARGS="--file /var/lib/alsa/asound.state" - -# Enables powersaving mode for AC97 and hda_intel audio chips. -# Set to 1 to enable powersaving. -# Set to 0 to disable powersaving (default). -POWERSAVE=0 - -# Whether to save volume levels when stopped ("yes" or "no"). -SAVE_VOLUME="yes" - -# Whether to mute the master volume when stopped ("yes" or "no"). -# Useful for bad audio cards which make a noise on system poweroff. -MUTE_VOLUME="no" diff --git a/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch b/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch deleted file mode 100644 index d4b526614..000000000 --- a/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Jaroslav Kysela <perex@perex.cz> -Date: Mon, 15 Apr 2013 12:44:13 +0000 (+0200) -Subject: alsactl: Fix the string size for the lock file contents -X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=95788fea25c1a59985828d4b91af0772d077600b - -alsactl: Fix the string size for the lock file contents - -The string length is 10 characters + LF + '\0' = 12 characters. - -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - -diff --git a/alsactl/lock.c b/alsactl/lock.c -index d34d013..fce208b 100644 ---- a/alsactl/lock.c -+++ b/alsactl/lock.c -@@ -35,7 +35,7 @@ static int state_lock_(const char *file, int lock, int timeout) - int fd = -1, err = 0; - struct flock lck; - struct stat st; -- char lcktxt[11]; -+ char lcktxt[12]; - char *nfile; - - if (!do_lock) diff --git a/extra/alsa-utils/arecord-1.0.27.patch b/extra/alsa-utils/arecord-1.0.27.patch deleted file mode 100644 index f9edb2d21..000000000 --- a/extra/alsa-utils/arecord-1.0.27.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Jaroslav Kysela <perex@perex.cz> -Date: Wed, 17 Apr 2013 06:34:34 +0000 (+0200) -Subject: arecord: add a missing break to the capture loop -X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=b4f34ac26037c10ac51c4bb29203500165848977 - -arecord: add a missing break to the capture loop - -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - -diff --git a/aplay/aplay.c b/aplay/aplay.c -index 5bdc39c..000d25b 100644 ---- a/aplay/aplay.c -+++ b/aplay/aplay.c -@@ -3021,6 +3021,9 @@ static void capture(char *orig_name) - fd = -1; - } - -+ if (in_aborting) -+ break; -+ - /* repeat the loop when format is raw without timelimit or - * requested counts of data are recorded - */ diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index 9957c26ce..ade163a66 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185456 2013-05-14 10:24:22Z heftig $ +# $Id: PKGBUILD 186137 2013-05-21 08:51:28Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgbase=anjuta pkgname=('libanjuta' 'anjuta') -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') @@ -14,19 +14,12 @@ makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme v python) url="http://www.anjuta.org/" options=('!libtool' '!emptydirs') -source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz - fix-compile-error.patch) -sha256sums=('096203a294e0a7d8d7048fa74810495d590d32f96b7a7f014f34e532faa1c76e' - 'd072af4c1c52ce65f84026b83baa642a9bcfa06b10913b356b5cd99d98931b1d') +source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +sha256sums=('06afea1de911067419b774eda2548a729668f93c5463726b353f5db686493f95') build() { cd "$pkgbase-$pkgver" - patch -Np1 -i ../fix-compile-error.patch - - # Bump vala version - sed -i '/vala/s/-0\.18/-0.20/' configure.ac - ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --enable-glade-catalog --enable-compile-warnings=minimum make diff --git a/extra/anjuta/fix-compile-error.patch b/extra/anjuta/fix-compile-error.patch deleted file mode 100644 index bc8fa7c41..000000000 --- a/extra/anjuta/fix-compile-error.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -u -r anjuta-3.8.0/libanjuta/anjuta-token.c anjuta-3.8.0-fix/libanjuta/anjuta-token.c ---- anjuta-3.8.0/libanjuta/anjuta-token.c 2013-01-14 22:45:09.000000000 +0100 -+++ anjuta-3.8.0-fix/libanjuta/anjuta-token.c 2013-03-31 13:56:11.722332230 +0200 -@@ -329,7 +329,7 @@ - if (string == NULL) - { - /* Value doesn't contain a newline */ -- fprintf (stderr, "(%lu)", length); -+ fprintf (stderr, "(%lu)", (long unsigned)length); - } - else - { -diff -u -r anjuta-3.8.0/plugins/dir-project/dir-project.c anjuta-3.8.0-fix/plugins/dir-project/dir-project.c ---- anjuta-3.8.0/plugins/dir-project/dir-project.c 2012-11-19 00:34:57.000000000 +0100 -+++ anjuta-3.8.0-fix/plugins/dir-project/dir-project.c 2013-03-31 13:55:35.922610895 +0200 -@@ -268,7 +268,7 @@ - { - ptr++; - } while (*ptr == '?'); -- g_string_append_printf (regex, "(.{%d})", ptr - next); -+ g_string_append_printf (regex, "(.{%ld})", (long)(ptr - next)); - } - else if (*ptr == '\\') - { diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index dbe9af7b7..08e5895df 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184361 2013-05-06 19:36:36Z foutrelis $ +# $Id: PKGBUILD 186027 2013-05-20 14:49:50Z bisson $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=7 +pkgrel=9 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') @@ -30,34 +30,32 @@ backup=('etc/avahi/hosts' 'etc/avahi/services/sftp-ssh.service' 'usr/lib/avahi/service-types.db' 'usr/share/avahi/service-types') -source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" - 'rc.d.patch') -sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684' - '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') +source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz") +sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684') conflicts=('howl' 'mdnsresponder') provides=('howl' 'mdnsresponder') install=install -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf + sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action +} - sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf - patch -p1 -i ../rc.d.patch - - [ "$CARCH" = "mips64el" ] && \ - extra="--disable-mono" - +build() { + cd "${srcdir}/${pkgname}-${pkgver}" export MOC_QT3=/usr/bin/moc-qt3 export MOC_QT4=/usr/bin/moc-qt4 + export PYTHON=/usr/bin/python2 + [ "$CARCH" = "mips64el" ] && extra="--disable-mono" - # pygtk requires python2; make it explicit in case other python are installed: FS#21865 - PYTHON=python2 \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --sbindir=/usr/bin \ --disable-static \ --disable-monodoc \ --enable-compat-libdns_sd \ @@ -66,8 +64,8 @@ build() { --with-avahi-priv-access-group=network \ --with-autoipd-user=avahi \ --with-autoipd-group=avahi \ - $extra \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ + $extra make } @@ -75,12 +73,9 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - cd "${pkgdir}" - sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} - sed -i 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' etc/avahi/avahi-dnsconfd.action + rm -fr "${pkgdir}"/etc/rc.d # howl and mdnsresponder compatability - (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) - (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) + cd "${pkgdir}"/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl + cd "${pkgdir}"/usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc } diff --git a/extra/avahi/rc.d.patch b/extra/avahi/rc.d.patch deleted file mode 100644 index fd735734b..000000000 --- a/extra/avahi/rc.d.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in ---- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200 -+++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200 -@@ -33,6 +33,7 @@ - - case "$1" in - start) -+ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; } - stat_busy "Starting $DESC" - $DAEMON -D > /dev/null 2>&1 - if [ $? -gt 0 ]; then diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD index e1ae6bf4c..6c1d840d9 100644 --- a/extra/banshee/PKGBUILD +++ b/extra/banshee/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: György Balló <ballogy@freestart.hu> pkgname=banshee -pkgver=2.6.0 -pkgrel=2 +pkgver=2.6.1 +pkgrel=1 pkgdesc="Music management and playback for GNOME" arch=('i686' 'x86_64') url="http://banshee.fm/" @@ -18,7 +18,7 @@ optdepends=('gstreamer0.10-good-plugins: Extra media codecs' options=('!libtool') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz) -sha256sums=('a47cc741f8ef2f81726ec4872e8179b17efa271c0c991e912e384fabf777394a') +md5sums=('3c7775eecc079a018c468e9b4ab6cbe3') build() { export MONO_SHARED_DIR="$srcdir/.wabi" diff --git a/extra/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD index b6fa0a72c..91b9e4fb2 100644 --- a/extra/cairo-perl/PKGBUILD +++ b/extra/cairo-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183105 2013-04-17 15:04:54Z jgc $ +# $Id: PKGBUILD 186371 2013-05-26 09:24:20Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cairo-perl pkgver=1.103 -pkgrel=1 +pkgrel=2 pkgdesc="Perl wrappers for cairo" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 25086fd32..d82a4890a 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184364 2013-05-06 19:36:46Z foutrelis $ +# $Id: PKGBUILD 186337 2013-05-25 02:56:27Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -18,7 +18,7 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.6.3 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') diff --git a/extra/capi4hylafax/PKGBUILD b/extra/capi4hylafax/PKGBUILD index cd19fe056..2eb3af3eb 100644 --- a/extra/capi4hylafax/PKGBUILD +++ b/extra/capi4hylafax/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159422 2012-05-24 06:11:44Z tpowa $ +# $Id: PKGBUILD 186226 2013-05-22 09:28:57Z tpowa $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=capi4hylafax pkgver=010300 -pkgrel=8 +pkgrel=9 pkgdesc="capi plugin for hylafax to enable isdn faxing" arch=(i686 x86_64 'mips64el') url="ftp://ftp.avm.de/tools" @@ -11,18 +11,24 @@ license=('GPL') depends=('glibc' 'isdn4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog') source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz config.faxCAPI - capi4hylafax.rc c2faxrecv.service - capi4hylafax.conf) + capi4hylafax.conf + capi4hylafax-compile-gcc48-fix.patch) install=capi4hylafax.install backup=(var/spool/hylafax/etc/config.faxCAPI) -build() { +prepare() { cd "$srcdir"/$pkgname-01.03.00 -# fix config file + # fix compiling with gcc48 + patch -Np1 -i $srcdir/capi4hylafax-compile-gcc48-fix.patch + # fix config file sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in autoreconf --force --install +} + +build() { + cd "$srcdir"/$pkgname-01.03.00 ./configure make } @@ -33,7 +39,6 @@ package() { install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI - install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax # adding FIFO mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI @@ -59,6 +64,10 @@ EOF } md5sums=('d37dc652ac80d1525ef8693be55ee67f' '653b60695d21c128f020a86274ca9192' - '1fe40c58289fa3ba625ce6fe2fdb3d07' 'e2c085a00189ded0a659642c689a1be2' '7c41d4fa5c5ef7b1372813341fd0d02b') +md5sums=('d37dc652ac80d1525ef8693be55ee67f' + '653b60695d21c128f020a86274ca9192' + 'e2c085a00189ded0a659642c689a1be2' + '7c41d4fa5c5ef7b1372813341fd0d02b' + 'fa01597396c5493f90243a8d9e2841c0') diff --git a/extra/capi4hylafax/capi4hylafax-compile-gcc48-fix.patch b/extra/capi4hylafax/capi4hylafax-compile-gcc48-fix.patch new file mode 100644 index 000000000..88d948366 --- /dev/null +++ b/extra/capi4hylafax/capi4hylafax-compile-gcc48-fix.patch @@ -0,0 +1,11 @@ +--- capi4hylafax-01.03.00/src/standard/aStdLib.cpp.old 2013-05-21 16:55:37.031658830 +0200 ++++ capi4hylafax-01.03.00/src/standard/aStdLib.cpp 2013-05-21 16:55:42.314905957 +0200 +@@ -233,7 +233,7 @@ + + tUInt a_pointer2string (void *pointer, tWiChar *string) { + tULong p = (tULong) pointer; +- tWiChar *fmt = (sizeof (p) > 4) ? L" . : . " : L" : "; // must be symmetric! ++ const tWiChar *fmt = (sizeof (p) > 4) ? L" . : . " : L" : "; // must be symmetric! + unsigned i = s_strlen (fmt); + + string[i] = '\0'; diff --git a/extra/capi4hylafax/capi4hylafax.rc b/extra/capi4hylafax/capi4hylafax.rc deleted file mode 100755 index 51025b020..000000000 --- a/extra/capi4hylafax/capi4hylafax.rc +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/c2faxrecv` -case "$1" in - start) - stat_busy "Starting capi4hylafax" - if [ -z "$PID" ]; then - /usr/bin/c2faxrecv > /dev/null & - faxmodem faxCAPI - fi - if [ ! -f /var/run/faxq.pid ]; then - stat_fail - echo "ERROR: hylafax is not running" - exit 1 - fi - if [ ! -f /var/run/hfaxd.pid ]; then - stat_fail - echo "ERROR: hylafax is not running" - exit 1 - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon capi4hylafax - stat_done - fi - ;; - stop) - stat_busy "Stopping capi4hylafax" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon capi4hylafax - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index 070495a47..039a58c76 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,30 +1,26 @@ -# $Id: PKGBUILD 183595 2013-04-24 06:52:38Z bisson $ +# $Id: PKGBUILD 186028 2013-05-20 14:50:00Z bisson $ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=clamav pkgver=0.97.8 -pkgrel=1 +pkgrel=2 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' license=('GPL') options=('!libtool') arch=('i686' 'x86_64' 'mips64el') depends=('bzip2' 'libltdl') -backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav') +backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'rc.d' - 'conf.d' 'service' 'service.fresh' 'logrotate' 'tmpfiles.d' 'config.patch') sha1sums=('078c0ac2b4e69d27eecd7544a8361abcd859e73c' - 'c9d508c1e5972f0f849d8694c1872455fa9e74de' - 'cb116cdab49a810381a515cbcfb6a6c148547f07' - 'df522b0488f3901e491f148c9300f6bae348c605' + 'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb' 'cda9a087e5593992150cb456e34c5f6f589aca82' '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee' 'a224ea9b4d0f4f196827347d54bed51e11c197ea' @@ -41,6 +37,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc/clamav \ --with-dbdir=/var/lib/clamav \ --disable-clamav \ @@ -61,8 +58,6 @@ package() { install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav - install -Dm644 ../conf.d "${pkgdir}"/etc/conf.d/clamav - install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/clamav install -d -o 64 -g 64 "${pkgdir}"/run/clamav install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav diff --git a/extra/clamav/conf.d b/extra/clamav/conf.d deleted file mode 100644 index 9cd44d9f8..000000000 --- a/extra/clamav/conf.d +++ /dev/null @@ -1,8 +0,0 @@ -# clamav startup script config options - -# change these to "yes" to start -START_FRESHCLAM="no" -START_CLAMD="no" - -# Options to pass to freshclam (man freshclam for more info). -FRESHCLAM_OPTS="-c 12" diff --git a/extra/clamav/rc.d b/extra/clamav/rc.d deleted file mode 100644 index 127c86c0f..000000000 --- a/extra/clamav/rc.d +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav - -PID_FC=$(pidof -o %PPID /usr/bin/freshclam) -PID_CD=$(pidof -o %PPID /usr/sbin/clamd) - -case "$1" in - start) - if [[ $START_CLAMD = yes ]]; then - stat_busy "Starting ClamD" - [[ -z $PID_CD ]] && /usr/sbin/clamd - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi - sleep 1 - if [[ $START_FRESHCLAM = yes ]]; then - stat_busy "Starting FreshClam" - [[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi - ;; - stop) - if [[ $START_CLAMD = yes ]]; then - stat_busy "Stopping ClamD" - [[ -n $PID_CD ]] && kill $PID_CD &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - - if [[ $START_FRESHCLAM = yes ]]; then - stat_busy "Stopping FreshClam" - [[ -n $PID_FC ]] && kill $PID_FC &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/clamav/service b/extra/clamav/service index 5bf9eb14e..86608c40e 100644 --- a/extra/clamav/service +++ b/extra/clamav/service @@ -4,7 +4,7 @@ Description=clamav daemon [Service] Type=forking PIDFile=/run/clamav/clamd.pid -ExecStart=/usr/sbin/clamd +ExecStart=/usr/bin/clamd [Install] WantedBy=multi-user.target diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index 54891f7b8..beb3041e3 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 183340 2013-04-21 22:08:41Z heftig $ +# $Id: PKGBUILD 186311 2013-05-24 16:14:27Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=clutter-gst -pkgver=2.0.2 -pkgrel=2 +pkgver=2.0.4 +pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64' 'mips64el') url="http://www.clutter-project.org/" -license=('LGPL') -depends=('clutter' 'gst-plugins-base-libs' 'libxdamage') -makedepends=('gobject-introspection') +license=(LGPL) +depends=(clutter gst-plugins-base-libs libxdamage gst-plugins-bad) +makedepends=(gobject-introspection) options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('577957598d6ee407348dc5d78879da2b212ae54fb3071f86f8409e393dde34c4') +sha256sums=('bad69cca7dd9c0d54d4f9fc27cba59dd8d8b329db058844716dbdecec6caba97') build() { cd $pkgname-$pkgver @@ -24,6 +24,11 @@ build() { make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index f6ae39a5c..35d1b4d71 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,33 +1,24 @@ -# $Id: PKGBUILD 179599 2013-03-07 17:46:37Z andrea $ +# $Id: PKGBUILD 186227 2013-05-22 10:21:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake -pkgver=2.8.10.2 -pkgrel=5 +pkgver=2.8.11 +pkgrel=1 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64' 'mips64el') url="http://www.cmake.org/" license=('custom') depends=('curl' 'libarchive' 'shared-mime-info') -makedepends=('qt5-base' 'emacs') -optdepends=('qt5-base: cmake-gui') +makedepends=('qt4' 'emacs') +optdepends=('qt4: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" - 'qt4.patch') -md5sums=('097278785da7182ec0aea8769d06860c' - '4933fbe934d3989923f0a60a78dac44e') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") +md5sums=('be6008f2299613d23fe82ab53ef7472e') build() { cd ${pkgname}-${pkgver} - # qmake refers to Qt5 - patch -p1 -i "${srcdir}"/qt4.patch - - # Qt is built with reduce-relocations - export CFLAGS="${CFLAGS} -fPIC" - export CXXFLAGS="${CXXFLAGS} -fPIC" - ./bootstrap --prefix=/usr \ --mandir=/share/man \ --docdir=/share/doc/cmake \ diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index 117c2434f..7915d580f 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185591 2013-05-15 13:17:58Z eric $ +# $Id: PKGBUILD 186312 2013-05-24 16:21:18Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # This package spans multiple repositories. @@ -8,7 +8,7 @@ pkgbase=('cyrus-sasl') pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') #pkgname=libsasl pkgver=2.1.26 -pkgrel=2 +pkgrel=3 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/" @@ -121,6 +121,7 @@ package_libsasl() { rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so* rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so* rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libgs2.so* install -m755 -d "${pkgdir}/usr/share/licenses/libsasl" install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/" } @@ -149,6 +150,7 @@ package_cyrus-sasl-gssapi() { cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" install -m755 -d "${pkgdir}/usr/lib/sasl2" cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" + cp -a .libs/libgs2.so* "${pkgdir}/usr/lib/sasl2/" install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi" ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/" diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD index d2c623b26..b7d0acc4b 100644 --- a/extra/dosfstools/PKGBUILD +++ b/extra/dosfstools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185832 2013-05-19 14:15:45Z tpowa $ +# $Id: PKGBUILD 186197 2013-05-22 00:02:48Z eric $ # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=dosfstools @@ -7,9 +7,7 @@ pkgrel=2 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64 'mips64el') depends=('glibc') -#source=(http://www.daniel-baumann.ch/software/dosfstools/$pkgname-$pkgver.tar.xz) -# using debian source, main page is down since quite some time -source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.orig.tar.xz{,.sig}) +source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) url="http://www.daniel-baumann.ch/software/dosfstools/" license=('GPL2') diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 6090075f7..c21a98267 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185725 2013-05-17 17:33:15Z andyrtr $ +# $Id: PKGBUILD 186001 2013-05-20 08:28:29Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -8,8 +8,8 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.2.1 -pkgrel=2 +pkgver=2.2.2 +pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') url="http://dovecot.org/" @@ -24,7 +24,7 @@ options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.tmpfilesd) -md5sums=('6628f513ca841846176e81db870052f8' +md5sums=('e6c011b4bbddf19e79205d012723449a' 'SKIP' '342a28251d40f983c98c0d1f1bf3d07d') diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 3e2eb0c07..0ba87960e 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183346 2013-04-21 22:08:49Z heftig $ +# $Id: PKGBUILD 186309 2013-05-24 14:23:00Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.8.1 +pkgver=3.8.3 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ options=('!libtool' '!makeflags') groups=(gnome) install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('45accc06e9c1711741b0f1476971c7e705b57ea0718a2b10ee66c5dd0397b917') +sha256sums=('61e547c6f0929b3111219349482e2395a32f41bbd0852046405d835acba965c0') build() { cd $pkgname-$pkgver diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index b93a6bb85..cfde39745 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185667 2013-05-16 20:55:27Z ronald $ +# $Id: PKGBUILD 186339 2013-05-25 02:56:29Z foutrelis $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders pkgver=1.7.7 -pkgrel=1 +pkgrel=2 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" diff --git a/extra/f2fs-tools/PKGBUILD b/extra/f2fs-tools/PKGBUILD new file mode 100644 index 000000000..d033c1e3b --- /dev/null +++ b/extra/f2fs-tools/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 186280 2013-05-23 15:59:36Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Christian Hesse <mail@eworm.de> + +pkgname=f2fs-tools +pkgver=1.1.0_130404 +pkgrel=1 +pkgdesc="Tools for Flash-Friendly File System (F2FS)" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/f2fs-tools/" +depends=('util-linux') +license=('GPL') +#source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz') +source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz2") +md5sums=('0bb44c174a2da2a7dd1216cc46b4612c') +options=(!libtool) + +build() { + cd "${pkgname}-${pkgver}" + + autoreconf -fi + ./configure --prefix=/usr --sbindir=/usr/bin + make +} + +package() { + cd "${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" sbindir=/usr/bin install +} + diff --git a/extra/flac/PKGBUILD b/extra/flac/PKGBUILD index fa69e9dba..6c8f47393 100644 --- a/extra/flac/PKGBUILD +++ b/extra/flac/PKGBUILD @@ -1,46 +1,37 @@ -# $Id: PKGBUILD 135033 2011-08-09 23:31:20Z eric $ +# $Id: PKGBUILD 186549 2013-05-28 18:39:02Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=flac pkgname=('flac' 'flac-doc') -pkgver=1.2.1 -pkgrel=3.2 +pkgver=1.3.0 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://flac.sourceforge.net/" license=('BSD' 'GPL') depends=('libogg') -makedepends=('nasm' 'xmms') -[ "$CARCH" = "mips64el" ] && \ -makedepends=('nasm') # xmms doesn't build on mips +makedepends=('doxygen') +[ "$CARCH" = "mips64el" ] || makedepends+=('nasm' 'xmms') options=('!libtool' '!makeflags') -source=(http://downloads.sf.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}.tar.gz - flac-1.2.1-gcc-4.3-includes.patch) -md5sums=('153c8b15a54da428d1f0fadc756c22c7' - 'b9d245422bbc547b18a72897366bea77') -sha1sums=('bd54354900181b59db3089347cc84ad81e410b38' - '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560') +source=(http://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz) +sha1sums=('a136e5748f8fb1e6c524c75000a765fc63bb7b1b') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - patch -Np1 -i "${srcdir}/flac-1.2.1-gcc-4.3-includes.patch" - ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared \ - --disable-sse --disable-rpath --with-pic + cd ${pkgbase}-${pkgver} + ./configure --prefix=/usr --disable-sse make } check() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make check } package_flac() { pkgdesc="Free Lossless Audio Codec" - optdepends=('xmms: for using the xmms plugin') -[ "$CARCH" = "mips64el" ] && \ - unset optdepends + [ "$CARCH" = "mips64el" ] || optdepends=('xmms: for using the xmms plugin') options=('!libtool' '!docs') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } @@ -49,7 +40,8 @@ package_flac-doc() { pkgdesc="Developer documentation for the Free Lossless Audio Codec" depends=('flac') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" -C doc install + sed -i "s|$srcdir/${pkgbase}-${pkgver}|/usr|" "${pkgdir}/usr/share/doc/${pkgbase}-${pkgver}/FLAC.tag" install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/flac/flac-1.2.1-gcc-4.3-includes.patch b/extra/flac/flac-1.2.1-gcc-4.3-includes.patch deleted file mode 100644 index 52fec8be5..000000000 --- a/extra/flac/flac-1.2.1-gcc-4.3-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp ---- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2007-09-13 09:58:03.000000000 -0600 -+++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2007-11-18 12:59:45.000000000 -0600 -@@ -30,6 +30,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <cstring> - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" - diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index d04e83746..611ae6a84 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183357 2013-04-21 22:09:09Z heftig $ +# $Id: PKGBUILD 186044 2013-05-20 18:22:18Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fontconfig -pkgver=2.10.92 -pkgrel=4 +pkgver=2.10.93 +pkgrel=1 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64 'mips64el') url="http://www.fontconfig.org/release/" @@ -13,7 +13,7 @@ options=('!libtool') install=fontconfig.install source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2 29-replace-bitmap-fonts.conf git_fixes.diff) -sha256sums=('1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22' +sha256sums=('ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c' '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6' '7dc98137405ee0e5f98f3266a760a4da27d78e3c2bc7b7ef4db6b481df3c39f0') @@ -24,7 +24,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" # post release fixes - patch -Np1 -i ${srcdir}/git_fixes.diff + #patch -Np1 -i ${srcdir}/git_fixes.diff # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well libtoolize -f diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD index ee103c530..2a7718ba0 100644 --- a/extra/fping/PKGBUILD +++ b/extra/fping/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 185814 2013-05-19 12:00:14Z giovanni $ +# $Id: PKGBUILD 186276 2013-05-23 15:38:45Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fping -pkgver=3.4 -pkgrel=2 +pkgver=3.5 +pkgrel=1 pkgdesc="A utility to ping multiple hosts at once" arch=('i686' 'x86_64' 'mips64el') url="http://www.fping.org/" license=('custom') depends=('glibc') source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz") -md5sums=('a4bc97804e630dbf26dfac8f28c78091') +md5sums=('2e17cb655aa4eb59b5a4a38a89e746ed') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/frozen-bubble/PKGBUILD b/extra/frozen-bubble/PKGBUILD index 319170b24..5381824f0 100644 --- a/extra/frozen-bubble/PKGBUILD +++ b/extra/frozen-bubble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160465 2012-06-02 10:25:48Z bluewind $ +# $Id: PKGBUILD 186373 2013-05-26 09:24:23Z bluewind $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Brandon Niemczyk <maccorin@cfl.rr.com> @@ -6,7 +6,7 @@ pkgname=frozen-bubble _pkgver=2.2.1-beta1 pkgver=${_pkgver/-/} -pkgrel=4 +pkgrel=5 pkgdesc="A game in which you throw colorful bubbles and build groups to destroy the bubbles" arch=(i686 x86_64 'mips64el') url="http://www.frozen-bubble.org" diff --git a/extra/gconf-perl/PKGBUILD b/extra/gconf-perl/PKGBUILD index bca9b4528..8b3ee55a9 100644 --- a/extra/gconf-perl/PKGBUILD +++ b/extra/gconf-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160467 2012-06-02 10:25:52Z bluewind $ +# $Id: PKGBUILD 186374 2013-05-26 09:24:24Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gconf-perl pkgver=1.044 -pkgrel=7 +pkgrel=8 pkgdesc="Gnome2-GConf perl bindings for gconf" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 420b9cbe0..161a431da 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185043 2013-05-10 16:49:05Z dan $ +# $Id: PKGBUILD 186460 2013-05-26 20:12:59Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.2.3 +pkgver=1.8.3 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -107,7 +107,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('03ebfd403a8cf355da0e3f15e53b8925' - '891481ec6ecd9ee530701378e5b61d3f' +md5sums=('d91b6099fb6763cf92c696977a247060' + '0b469c0fd81b4a56b9059d7c443282f0' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/glade-perl/PKGBUILD b/extra/glade-perl/PKGBUILD index cf7eaf91c..f1047ceea 100644 --- a/extra/glade-perl/PKGBUILD +++ b/extra/glade-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160469 2012-06-02 10:25:54Z bluewind $ +# $Id: PKGBUILD 186375 2013-05-26 09:24:26Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glade-perl _realname=Gtk2-GladeXML pkgver=1.007 -pkgrel=6 +pkgrel=7 pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch b/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch new file mode 100644 index 000000000..fe92fbd94 --- /dev/null +++ b/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch @@ -0,0 +1,230 @@ +From ebf55199407d3be92162f5c2573c7f9c34614cb1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= <kaffeetisch@gmx.de> +Date: Thu, 2 Aug 2012 21:41:41 +0200 +Subject: [PATCH] Make Glib::Object subclassing more robust +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Rearrange how we register the interfaces, properties and signals of a newly +created type so that: + +• The outcome is independent of the order of the arguments passed to +Glib::Object::Subclass or Glib::Type->register. This also avoids fallout from +the change to hash randomization in perl 5.17.6. + +• We register things in the correct order: interfaces first, before entering +class_init; then properties and signals from within class_init. This also +avoids prematurely creating the new type's class. +--- + GType.xs | 92 ++++++++++++++++++++++++++++++++++++++++++++++++---------------- + NEWS | 7 +++++ + 2 files changed, 77 insertions(+), 22 deletions(-) + +diff --git a/GType.xs b/GType.xs +index 02e24a4..fdaad68 100644 +--- a/GType.xs ++++ b/GType.xs +@@ -1234,13 +1234,10 @@ parse_signal_hash (GType instance_type, + + + static void +-add_signals (GType instance_type, HV * signals) ++add_signals (GType instance_type, HV * signals, AV * interfaces) + { +- GObjectClass *oclass; + HE * he; + +- oclass = g_type_class_ref (instance_type); +- + hv_iterinit (signals); + while (NULL != (he = hv_iternext (signals))) { + I32 keylen; +@@ -1250,9 +1247,36 @@ add_signals (GType instance_type, HV * signals) + + /* the key is the signal name */ + signal_name = hv_iterkey (he, &keylen); +- /* if the signal is defined at this point, we're going to +- * override the installed closure. */ +- signal_id = g_signal_lookup (signal_name, instance_type); ++ ++ /* if, at this point, the signal is already defined in the ++ * ancestry or the interfaces we just added to instance_type, ++ * we can only override the installed closure. trying to ++ * create a new signal with the same name is an error. ++ * ++ * unfortunately, we cannot simply use instance_type to do the ++ * lookup because g_signal_lookup would complain about it since ++ * it hasn't been fully loaded yet. see ++ * <https://bugzilla.gnome.org/show_bug.cgi?id=691096>. ++ * ++ * FIXME: the "if (signal_id)" check in the hash ref block ++ * below could be removed since g_signal_newv also checks this. ++ * consequently, this lookup code could be moved into the class ++ * closure block below. */ ++ signal_id = g_signal_lookup (signal_name, ++ g_type_parent (instance_type)); ++ if (!signal_id && interfaces) { ++ int i; ++ for (i = 0; i <= av_len (interfaces); i++) { ++ GType interface_type; ++ SV ** svp = av_fetch (interfaces, i, FALSE); ++ if (!svp || !gperl_sv_is_defined (*svp)) ++ continue; ++ interface_type = gperl_object_type_from_package (SvPV_nolen (*svp)); ++ signal_id = g_signal_lookup (signal_name, interface_type); ++ if (signal_id) ++ break; ++ } ++ } + + /* parse the key's value... */ + value = hv_iterval (signals, he); +@@ -1310,8 +1334,6 @@ add_signals (GType instance_type, HV * signals) + signal_name); + } + } +- +- g_type_class_unref (oclass); + } + + typedef struct { +@@ -1407,13 +1429,10 @@ prop_handler_lookup (GType instance_type, + } + + static void +-add_properties (GType instance_type, AV * properties) ++add_properties (GType instance_type, GObjectClass * oclass, AV * properties) + { +- GObjectClass *oclass; + int propid; + +- oclass = g_type_class_ref (instance_type); +- + for (propid = 0; propid <= av_len (properties); propid++) { + SV * sv = *av_fetch (properties, propid, 1); + GParamSpec * pspec = NULL; +@@ -1452,8 +1471,6 @@ add_properties (GType instance_type, AV * properties) + } + g_object_class_install_property (oclass, propid + 1, pspec); + } +- +- g_type_class_unref (oclass); + } + + /* +@@ -1776,12 +1793,26 @@ gperl_type_reg_quark (void) + return q; + } + ++typedef struct { ++ GType instance_type; ++ AV *interfaces; ++ AV *properties; ++ HV *signals; ++} GPerlClassData; ++ + static void +-gperl_type_class_init (GObjectClass * class) ++gperl_type_class_init (GObjectClass * class, GPerlClassData * class_data) + { + class->finalize = gperl_type_finalize; + class->get_property = gperl_type_get_property; + class->set_property = gperl_type_set_property; ++ ++ if (class_data->properties) ++ add_properties (class_data->instance_type, class, ++ class_data->properties); ++ if (class_data->signals) ++ add_signals (class_data->instance_type, ++ class_data->signals, class_data->interfaces); + } + + static void +@@ -2152,15 +2183,18 @@ g_type_register_object (class, parent_package, new_package, ...); + PREINIT: + int i; + GTypeInfo type_info; ++ GPerlClassData class_data; + GTypeQuery query; + GType parent_type, new_type; + char * new_type_name; + CODE: + /* start with a clean slate */ + memset (&type_info, 0, sizeof (GTypeInfo)); ++ memset (&class_data, 0, sizeof (GPerlClassData)); + type_info.base_init = (GBaseInitFunc) gperl_type_base_init; + type_info.class_init = (GClassInitFunc) gperl_type_class_init; + type_info.instance_init = (GInstanceInitFunc) gperl_type_instance_init; ++ type_info.class_data = &class_data; + + /* yeah, i could just call gperl_object_type_from_package directly, + * but i want the error messages to be more informative. */ +@@ -2196,29 +2230,43 @@ g_type_register_object (class, parent_package, new_package, ...); + /* mark this type as "one of ours". */ + g_type_set_qdata (new_type, gperl_type_reg_quark (), (gpointer) TRUE); + +- /* now look for things we should initialize presently, e.g. +- * signals and properties and interfaces and such, things that +- * would generally go into a class_init. */ ++ /* put it into the class data so that add_signals and add_properties ++ * can use it. */ ++ class_data.instance_type = new_type; ++ ++ /* now look for things we should initialize, e.g. signals and ++ * properties and interfaces. put the corresponding data into the ++ * class_data struct. the interfaces will be handled directly further ++ * below, while the properties and signals will be handled in the ++ * class_init function so that they have access to the class instance. ++ * this mimics the way things are supposed to be done in C: register ++ * interfaces in the get_type function, and register properties and ++ * signals in the class_init function. */ + for (i = 3 ; i < items ; i += 2) { + char * key = SvPV_nolen (ST (i)); + if (strEQ (key, "signals")) { + if (gperl_sv_is_hash_ref (ST (i+1))) +- add_signals (new_type, (HV*)SvRV (ST (i+1))); ++ class_data.signals = (HV*)SvRV (ST (i+1)); + else + croak ("signals must be a hash of signalname => signalspec pairs"); + } else if (strEQ (key, "properties")) { + if (gperl_sv_is_array_ref (ST (i+1))) +- add_properties (new_type, (AV*)SvRV (ST (i+1))); ++ class_data.properties = (AV*)SvRV (ST (i+1)); + else + croak ("properties must be an array of GParamSpecs"); + } else if (strEQ (key, "interfaces")) { + if (gperl_sv_is_array_ref (ST (i+1))) +- add_interfaces (new_type, (AV*)SvRV (ST (i+1))); ++ class_data.interfaces = (AV*)SvRV (ST (i+1)); + else + croak ("interfaces must be an array of package names"); + } + } + ++ /* add the interfaces to the type now before we create its class and ++ * enter the class_init function. */ ++ if (class_data.interfaces) ++ add_interfaces (new_type, class_data.interfaces); ++ + /* instantiate the class right now. perl doesn't let classes go + * away once they've been defined, so we'll just leak this ref and + * let the GObjectClass live as long as the program. in fact, +diff --git a/NEWS b/NEWS +index 5606566..ad71da0 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,10 @@ ++Overview of changes in Glib <next> (unstable) ++============================================ ++ ++* Make Glib::Object subclassing more robust. This should in particular fix ++ issues revealed by the change to hash randomization introduced in perl ++ 5.17.6. ++ + Overview of changes in Glib 1.280 (stable) + ========================================== + +-- +1.8.2.3 + diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD index 8d1ad7ffd..ee1300607 100644 --- a/extra/glib-perl/PKGBUILD +++ b/extra/glib-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183484 2013-04-21 22:21:04Z heftig $ +# $Id: PKGBUILD 186376 2013-05-26 09:24:27Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=glib-perl pkgver=1.280 -pkgrel=1 +pkgrel=3 pkgdesc="Perl wrappers for glib 2.x, including GObject" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -12,8 +12,17 @@ url="http://gtk2-perl.sourceforge.net/" options=('!emptydirs') depends=('glib2' 'perl') makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz) -md5sums=('1d81a8aec5f7f1182a96cfaaf119d866') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz + 0001-Make-Glib-Object-subclassing-more-robust.patch) +md5sums=('1d81a8aec5f7f1182a96cfaaf119d866' + 'ebe39d50eff182a1ad4390cbbef46e41') + +prepare() { + cd "${srcdir}/Glib-${pkgver}" + + # Needed for gtk2-perl to compile against Perl 5.18 + patch -Np1 -i "${srcdir}/0001-Make-Glib-Object-subclassing-more-robust.patch" +} build() { cd "${srcdir}/Glib-${pkgver}" diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD index ebf26d532..17afe93d1 100644 --- a/extra/gnome-disk-utility/PKGBUILD +++ b/extra/gnome-disk-utility/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183379 2013-04-21 22:09:51Z heftig $ +# $Id: PKGBUILD 186559 2013-05-29 01:23:46Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Silvio Knizek (killermoehre) pkgname=gnome-disk-utility -pkgver=3.8.0 -pkgrel=2 +pkgver=3.8.2 +pkgrel=1 pkgdesc="Disk Management Utility for GNOME" arch=('i686' 'x86_64' 'mips64el') license=(GPL) @@ -14,8 +14,17 @@ depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify hi makedepends=(intltool docbook-xsl gnome-settings-daemon) options=('!libtool' '!emptydirs') install=gnome-disk-utility.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2657aad8d06e5511bc34ee5ec1ff9426f70b7140b8687be528f693175759bd5e') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + typefixes.patch) +sha256sums=('6a64de6f40ddfebfe7566f3ef7856c1cb33fab7d21d9be43db74f014309298c3' + '0a1f2f80f1c741119639b3b2b8cf32d6261b126baa85189309d6473e171894d2') + +prepare() { + cd $pkgname-$pkgver + + # Gets rid of warnings and compilation errors on i686 + patch -Np1 -i ../typefixes.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/gnome-disk-utility/typefixes.patch b/extra/gnome-disk-utility/typefixes.patch new file mode 100644 index 000000000..79439e4de --- /dev/null +++ b/extra/gnome-disk-utility/typefixes.patch @@ -0,0 +1,97 @@ +diff -u -r gnome-disk-utility-3.8.2/src/disks/gducreatediskimagedialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatediskimagedialog.c +--- gnome-disk-utility-3.8.2/src/disks/gducreatediskimagedialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatediskimagedialog.c 2013-05-29 03:17:37.201963964 +0200 +@@ -610,7 +610,7 @@ + error)) + { + g_prefix_error (error, +- "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ", ++ "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ", + num_bytes_to_write, + offset); + goto out; +diff -u -r gnome-disk-utility-3.8.2/src/disks/gducreatefilesystemwidget.c gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatefilesystemwidget.c +--- gnome-disk-utility-3.8.2/src/disks/gducreatefilesystemwidget.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatefilesystemwidget.c 2013-05-29 03:18:30.224935009 +0200 +@@ -429,7 +429,7 @@ + if (widget->drive != NULL && udisks_drive_get_removable (widget->drive)) + { + /* default FAT for flash and disks/media smaller than 20G (assumed to be flash cards) */ +- if (is_flash (widget->drive) || udisks_drive_get_size (widget->drive) < 20L * 1000L*1000L*1000L) ++ if (is_flash (widget->drive) || udisks_drive_get_size (widget->drive) < (guint64)(20ULL * 1000ULL*1000ULL*1000ULL)) + { + gtk_combo_box_set_active_id (GTK_COMBO_BOX (widget->type_combobox), "vfat"); + } +diff -u -r gnome-disk-utility-3.8.2/src/disks/gduformatdiskdialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gduformatdiskdialog.c +--- gnome-disk-utility-3.8.2/src/disks/gduformatdiskdialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gduformatdiskdialog.c 2013-05-29 03:17:37.338629696 +0200 +@@ -293,7 +293,7 @@ + /* Default to MBR for removable drives < 2TB... GPT otherwise */ + if (data->drive != NULL && + udisks_drive_get_removable (data->drive) && +- udisks_drive_get_size (data->drive) < 2 * 1000L*1000L*1000L*1000L) ++ udisks_drive_get_size (data->drive) < (guint64)(2ULL * 1000ULL*1000ULL*1000ULL*1000ULL)) + { + gtk_combo_box_set_active_id (GTK_COMBO_BOX (data->type_combobox), "dos"); + } +diff -u -r gnome-disk-utility-3.8.2/src/disks/gdupartitiondialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gdupartitiondialog.c +--- gnome-disk-utility-3.8.2/src/disks/gdupartitiondialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gdupartitiondialog.c 2013-05-29 03:17:37.338629696 +0200 +@@ -91,11 +91,11 @@ + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->bootable_checkbutton))) + flags |= (1UL<<2); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton))) +- flags |= (1UL<<60); ++ flags |= (1ULL<<60); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton))) +- flags |= (1UL<<62); ++ flags |= (1ULL<<62); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton))) +- flags |= (1UL<<63); ++ flags |= (1ULL<<63); + } + else if (g_strcmp0 (data->partition_table_type, "dos") == 0) + { +@@ -245,9 +245,9 @@ + flags = udisks_partition_get_flags (data->partition); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->system_checkbutton), (flags & (1UL<< 0)) != 0); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->bootable_checkbutton), (flags & (1UL<< 2)) != 0); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton), (flags & (1UL<<60)) != 0); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton), (flags & (1UL<<62)) != 0); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton), (flags & (1UL<<63)) != 0); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton), (flags & (1ULL<<60)) != 0); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton), (flags & (1ULL<<62)) != 0); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton), (flags & (1ULL<<63)) != 0); + } + else if (g_strcmp0 (data->partition_table_type, "dos") == 0) + { +diff -u -r gnome-disk-utility-3.8.2/src/disks/gdurestorediskimagedialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gdurestorediskimagedialog.c +--- gnome-disk-utility-3.8.2/src/disks/gdurestorediskimagedialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gdurestorediskimagedialog.c 2013-05-29 03:17:37.485295361 +0200 +@@ -587,7 +587,7 @@ + &error)) + { + g_prefix_error (&error, +- "Error reading %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ", ++ "Error reading %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ", + num_bytes_to_read, + num_bytes_completed); + goto out; +@@ -595,7 +595,7 @@ + if (num_bytes_read != num_bytes_to_read) + { + g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Requested %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GUINT64_FORMAT " bytes", ++ "Requested %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GSIZE_FORMAT " bytes", + num_bytes_read, + num_bytes_completed, + num_bytes_to_read); +@@ -610,7 +610,7 @@ + goto copy_write_again; + + g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m", ++ "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m", + num_bytes_read, + num_bytes_completed); + goto out; diff --git a/extra/gnome-perl/PKGBUILD b/extra/gnome-perl/PKGBUILD index 9c101b8dd..62b340582 100644 --- a/extra/gnome-perl/PKGBUILD +++ b/extra/gnome-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160473 2012-06-02 10:26:01Z bluewind $ +# $Id: PKGBUILD 186378 2013-05-26 09:24:29Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-perl _realname=Gnome2 pkgver=1.042 -pkgrel=8 +pkgrel=9 pkgdesc="Perl bindings for libgnome" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 49028081e..7c92bf002 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185543 2013-05-14 21:40:21Z andrea $ +# $Id: PKGBUILD 186358 2013-05-25 15:54:34Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell pkgver=3.8.2 -pkgrel=2 +pkgrel=3 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64 mips64el) url="http://live.gnome.org/GnomeShell" @@ -19,16 +19,23 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - nm-libexecdir.patch) + nm-libexecdir.patch popupmenu.patch) sha256sums=('ffdf42d382d50cd756f1f51a31eaa6877edb51a08f0ca80b6e973f05072416df' - 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607' + '7df2a128d12350fe8e349c6aa5e125eb5d90b05e0201a842d6f3e1c2683b351d') -build() { +prepare() { cd $pkgname-$pkgver # FS#30747 FS#32730 Problems due to libexecdir different from NM patch -Np1 -i ../nm-libexecdir.patch + # FS#35326 (from gnome-3-8 branch) + patch -Np1 -i ../popupmenu.patch +} + +build() { + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-shell \ --localstatedir=/var --disable-static \ diff --git a/extra/gnome-shell/popupmenu.patch b/extra/gnome-shell/popupmenu.patch new file mode 100644 index 000000000..035432cd5 --- /dev/null +++ b/extra/gnome-shell/popupmenu.patch @@ -0,0 +1,28 @@ +From dd8ca024254341258a9e54c253c080f25be6f9cd Mon Sep 17 00:00:00 2001 +From: Florian Müllner <fmuellner@gnome.org> +Date: Tue, 14 May 2013 16:55:08 +0000 +Subject: PopupMenuManager: Fix child menus + +Since commit c84dc6254d2d65c, popup menus are closed automatically +when another menu opens (to catch the case where a menu is opened +by keyboard shortcut, which wasn't handled before). However in the +case of child menus, both child and parent are expected to be visible, +so handle this case explicitly. + +https://bugzilla.gnome.org/show_bug.cgi?id=699678 +--- +diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js +index fc37dd8..ab6c795 100644 +--- a/js/ui/popupMenu.js ++++ b/js/ui/popupMenu.js +@@ -2124,7 +2124,7 @@ const PopupMenuManager = new Lang.Class({ + + _onMenuOpenState: function(menu, open) { + if (open) { +- if (this.activeMenu) ++ if (this.activeMenu && !this.activeMenu.isChildMenu(menu)) + this.activeMenu.close(BoxPointer.PopupAnimation.FADE); + this._grabHelper.grab({ actor: menu.actor, modal: true, focus: menu.sourceActor, + onUngrab: Lang.bind(this, this._closeMenu, menu) }); +-- +cgit v0.9.1 diff --git a/extra/gnome-vfs-perl/PKGBUILD b/extra/gnome-vfs-perl/PKGBUILD index 7807693af..0f6acbe2a 100644 --- a/extra/gnome-vfs-perl/PKGBUILD +++ b/extra/gnome-vfs-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177009 2013-02-04 08:18:57Z jgc $ +# $Id: PKGBUILD 186379 2013-05-26 09:24:30Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-vfs-perl _realname=Gnome2-VFS pkgver=1.081 -pkgrel=6 +pkgrel=7 pkgdesc="Gnome2-VFS perl bindings for gnome-vfs" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/gnomecanvas-perl/PKGBUILD b/extra/gnomecanvas-perl/PKGBUILD index ce12da891..5a6cd5a5d 100644 --- a/extra/gnomecanvas-perl/PKGBUILD +++ b/extra/gnomecanvas-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160477 2012-06-02 10:26:08Z bluewind $ +# $Id: PKGBUILD 186377 2013-05-26 09:24:28Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnomecanvas-perl _realname=Gnome2-Canvas pkgver=1.002 -pkgrel=10 +pkgrel=11 pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index 863ea8b3c..52c40c691 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184239 2013-05-04 19:38:00Z foutrelis $ +# $Id: PKGBUILD 186380 2013-05-26 09:24:31Z bluewind $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric pkgver=1.12.2 -pkgrel=1 +pkgrel=2 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/projects/gnumeric/" @@ -38,6 +38,7 @@ prepare() { # Fix invalid PNG images to work with libpng 1.6 # https://bugzilla.gnome.org/show_bug.cgi?id=699683 + # XXX: PNGs have been fixed upsteam; remove when gnumeric 1.12.3 is out find -name '*.png' -exec optipng -quiet -force -fix {} + } diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index 8de5e3fc8..6fb18992c 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185866 2013-05-19 16:28:55Z giovanni $ +# $Id: PKGBUILD 186367 2013-05-26 06:28:56Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gparted pkgver=0.16.1 -pkgrel=3 +pkgrel=5 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64' 'mips64el') url="http://gparted.sourceforge.net" @@ -26,9 +26,11 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions' 'mtools: utilities to access MS-DOS disks') install=gparted.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" - 'org.archlinux.pkexec.gparted.policy') + 'org.archlinux.pkexec.gparted.policy' + 'gparted_polkit') md5sums=('3f399bff031b5ce14d11a8c346f4b89c' - '122ed3120c846376bead22b25f6a3b19') + '122ed3120c846376bead22b25f6a3b19' + '0b68a4e2bc6bc15440730ebe2d7bf9f6') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -45,14 +47,10 @@ package() { make DESTDIR="${pkgdir}" install # Install policy file - install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy" + install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" \ + "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy" # Install launcher script - echo '#!/bin/sh' > ${pkgdir}/usr/bin/gparted_polkit - echo 'if [ $(which pkexec) ]; then' >> ${pkgdir}/usr/bin/gparted_polkit - echo ' pkexec --disable-internal-agent "/usr/bin/gparted" "$@"' >> ${pkgdir}/usr/bin/gparted_polkit - echo 'else' >> ${pkgdir}/usr/bin/gparted_polkit - echo ' /usr/bin/gparted "$@"' >> ${pkgdir}/usr/bin/gparted_polkit - echo 'fi' >> ${pkgdir}/usr/bin/gparted_polkit - chmod 755 ${pkgdir}/usr/bin/gparted_polkit + install -m755 "${srcdir}/gparted_polkit" \ + "${pkgdir}/usr/bin/gparted_polkit" } diff --git a/extra/gparted/gparted.install b/extra/gparted/gparted.install index e8f6bed8f..1a05f573e 100644 --- a/extra/gparted/gparted.install +++ b/extra/gparted/gparted.install @@ -1,14 +1,11 @@ post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - echo 'If you use a lightweight windowmanager, remember to run' - echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable' - echo 'graphical authentication, which may be needed for pkexec to work.' } post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } diff --git a/extra/gparted/gparted_polkit b/extra/gparted/gparted_polkit new file mode 100644 index 000000000..d9f94d1bd --- /dev/null +++ b/extra/gparted/gparted_polkit @@ -0,0 +1,6 @@ +#!/bin/bash +if [ $(which pkexec) ]; then + pkexec --disable-internal-agent "/usr/bin/gparted" "$@" +else + /usr/bin/gparted "$@" +fi diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD index eadbb0559..9802dd885 100644 --- a/extra/graphicsmagick/PKGBUILD +++ b/extra/graphicsmagick/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184386 2013-05-06 19:37:35Z foutrelis $ +# $Id: PKGBUILD 186381 2013-05-26 09:24:32Z bluewind $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgname=graphicsmagick pkgver=1.3.18 -pkgrel=2 +pkgrel=3 pkgdesc='Image processing system' url='http://www.graphicsmagick.org/' arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD index 9a254119d..dbf1df9d3 100644 --- a/extra/graphite/PKGBUILD +++ b/extra/graphite/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179056 2013-03-02 11:28:27Z andyrtr $ +# $Id: PKGBUILD 186328 2013-05-24 20:18:53Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=graphite -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 epoch=1 arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('cmake' 'freetype2' 'python2') # 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') - only for docs - target doesn't install properly options=('!libtool' '!emptydirs') source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz") -md5sums=('edf70ab2f7d789be219f47b1df00d67e') +md5sums=('4bfd5db6c91a4097cd76a699beaca70e') build() { cd "${srcdir}" diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 197b40c88..f8952e875 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184387 2013-05-06 19:37:39Z foutrelis $ +# $Id: PKGBUILD 186382 2013-05-26 09:24:35Z bluewind $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.30.1 -pkgrel=3 +pkgrel=4 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') @@ -37,6 +37,9 @@ install=install prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed \ + -e 's/ qw(\([^)]*\))/ (qw(\1))/g' \ + -i config/config_perl.pl + sed \ -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-2.0.0/{$CARCH-linux,ruby/backward,})"'":' \ -e '/CONFIG/s:site:vendor:' \ -i config/config_ruby.rb diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index 3de37287c..ec36f1b32 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185629 2013-05-16 14:07:24Z heftig $ +# $Id: PKGBUILD 186336 2013-05-25 00:10:26Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo-plugins -pkgver=0.2.7 +pkgver=0.2.8 pkgrel=1 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" @@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el') license=(LGPL) depends=(grilo sqlite libgcrypt) makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing - json-glib) + json-glib intltool) optdepends=('gupnp-av: uPnP plugin' 'libgdata: Youtube plugin' 'libquvi: Youtube plugin, Vimeo plugin' @@ -22,7 +22,7 @@ optdepends=('gupnp-av: uPnP plugin' 'json-glib: TMDb plugin') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('0495a9717189049c16c96b51a2aad6dd348c11e82be243a9a7b65ea68507af3e') +sha256sums=('28f83fd701b33aed7b843e5e3850d7d961310c7cb33ffebcb652160fff8ccd80') build() { cd $pkgname-$pkgver diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD index c7347a34b..f3087f4bc 100644 --- a/extra/gssdp/PKGBUILD +++ b/extra/gssdp/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 183414 2013-04-21 22:10:50Z heftig $ +# $Id: PKGBUILD 186533 2013-05-28 12:29:38Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gssdp -pkgver=0.14.2 +pkgver=0.14.3 pkgrel=1 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP" arch=('i686' 'x86_64' 'mips64el') url="http://gupnp.org/" license=(LGPL) depends=(libsoup) -makedepends=(gobject-introspection gtk2 gtk-doc vala) -optdepends=('gtk2: gssdp-device-sniffer') +makedepends=(gobject-introspection gtk3 gtk-doc vala) +optdepends=('gtk3: gssdp-device-sniffer') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a1a255ed45b45fbf0004dfc5d8e566551f4857bc16599e7f756965733f9411fc') +sha256sums=('79dbdc5f79cc406632a783826b3dbe6acc0fbf41eb801b642bce1a02ecc3c66d') build() { cd $pkgname-$pkgver diff --git a/extra/gtk2-perl/PKGBUILD b/extra/gtk2-perl/PKGBUILD index 7856f69d6..749a698de 100644 --- a/extra/gtk2-perl/PKGBUILD +++ b/extra/gtk2-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183485 2013-04-21 22:21:05Z heftig $ +# $Id: PKGBUILD 186383 2013-05-26 09:24:36Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=gtk2-perl pkgver=1.247 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for GTK+ 2.x" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index 90cdbe831..1d005d29f 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183266 2013-04-20 05:39:22Z heftig $ +# $Id: PKGBUILD 186346 2013-05-25 04:11:23Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=harfbuzz -pkgver=0.9.16 -pkgrel=1 +pkgver=0.9.17 +pkgrel=2 pkgdesc="OpenType text shaping engine." arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/HarfBuzz" @@ -13,7 +13,7 @@ makedepends=('icu' 'cairo' 'glib2' 'freetype2') optdepends=('cairo: hb-view program') options=(!libtool) source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6da7e032f705d8a5c91487cd296628d64975672a5b0c1704829cf2285072c92b') +sha256sums=('a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed') build() { cd ${pkgname}-${pkgver} diff --git a/extra/hddtemp/PKGBUILD b/extra/hddtemp/PKGBUILD index a25f2411b..9b13f06b9 100644 --- a/extra/hddtemp/PKGBUILD +++ b/extra/hddtemp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163630 2012-07-17 14:24:03Z bisson $ +# $Id: PKGBUILD 186029 2013-05-20 14:50:15Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -9,22 +9,17 @@ pkgname=hddtemp _origver=0.3-beta15 _patchver=${_origver}-52 pkgver=${_patchver//-/.} -pkgrel=1.1 +pkgrel=2 pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information" url='https://savannah.nongnu.org/projects/hddtemp/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') -backup=('etc/conf.d/hddtemp') source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${_origver}.tar.bz2" "http://ftp.debian.org/debian/pool/main/h/${pkgname}/${pkgname}_${_patchver}.diff.gz" - 'rc.d' - 'conf.d' 'service') sha1sums=('65393b0a4d9862c030c81702d95c1acd00da275b' 'b9bcdd0537c1540e55e5056445b571ea61d5a4a3' - '71159486b1505ec6acfb7585e0d8fbe78afe54ec' - 'd45e3022f614dbf8904ecb1a3e702bb71fcaa808' - '501fcf4faf8b2689d010f9cbbf39f917211f611f') + '9b02e5bed22f81ceab2b69bae788a9a3aa5c2147') options=('!libtool') @@ -35,6 +30,7 @@ build() { ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --mandir=/usr/share/man \ --with-db-path="/usr/share/${pkgname}/hddtemp.db" @@ -48,6 +44,4 @@ package() { install -Dm644 "../${pkgname}-${_origver}/debian/hddtemp.db" "${pkgdir}/usr/share/${pkgname}/hddtemp.db" install -Dm644 '../service' "${pkgdir}/usr/lib/systemd/system/hddtemp.service" - install -Dm644 '../conf.d' "${pkgdir}/etc/conf.d/hddtemp" - install -Dm755 '../rc.d' "${pkgdir}/etc/rc.d/hddtemp" } diff --git a/extra/hddtemp/conf.d b/extra/hddtemp/conf.d deleted file mode 100644 index 6a1e18e0b..000000000 --- a/extra/hddtemp/conf.d +++ /dev/null @@ -1,2 +0,0 @@ -PARAMS="-q -l 127.0.0.1" -DRIVES="/dev/sda" diff --git a/extra/hddtemp/rc.d b/extra/hddtemp/rc.d deleted file mode 100644 index 62f090808..000000000 --- a/extra/hddtemp/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PARAMS= -DRIVES= -[ -f /etc/conf.d/hddtemp ] && . /etc/conf.d/hddtemp -PID=$(pidof -o %PPID /usr/sbin/hddtemp) -case "$1" in - start) - stat_busy "Starting HDDTemp" - [ -z "$PID" ] && /usr/sbin/hddtemp -d $PARAMS $DRIVES - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon hddtemp - stat_done - fi - ;; - stop) - stat_busy "Stopping HDDTemp" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon hddtemp - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/hddtemp/service b/extra/hddtemp/service index bc56d16b0..992b898ad 100644 --- a/extra/hddtemp/service +++ b/extra/hddtemp/service @@ -2,8 +2,7 @@ Description=Hard drive temperature monitor daemon [Service] -EnvironmentFile=/etc/conf.d/hddtemp -ExecStart=/usr/sbin/hddtemp -dF $PARAMS $DRIVES +ExecStart=/usr/bin/hddtemp -dF /dev/sda [Install] WantedBy=multi-user.target diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD index bcba8cdbc..984cf0134 100644 --- a/extra/hylafax/PKGBUILD +++ b/extra/hylafax/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185691 2013-05-17 10:55:17Z tpowa $ +# $Id: PKGBUILD 186073 2013-05-21 07:34:09Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hylafax pkgver=6.0.6 -pkgrel=3 +pkgrel=4 pkgdesc="Fax Server" arch=('i686' 'x86_64' 'mips64el') install='hylafax.install' @@ -45,8 +45,8 @@ package () { install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT } md5sums=('d063d45049c8fcbabefe09d662313067' - '52beffe7dc296b4f9ce9fd0387f7804e' + 'b0b8d19a10c2145476d9fbb18c0478fe' '5f3a89fbfb10c47755d3ca19183b8a59' - '832c8e8098e2dfa56040c975b554590c' + 'a10aa2ef613551a88d750f6602b5f2f7' '38a00db6d9d765d130b2d8d3a98e5c24' 'fe10ea597e786fe8c09e4104fbdf16de') diff --git a/extra/hylafax/faxq.service b/extra/hylafax/faxq.service index 0760a5b85..7ab8de318 100644 --- a/extra/hylafax/faxq.service +++ b/extra/hylafax/faxq.service @@ -3,7 +3,7 @@ Description=Hyla FAX queue manager [Service] Type=forking -ExecStart=/usr/sbin/faxq +ExecStart=/usr/bin/faxq ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/hylafax/hylafax.cron.daily b/extra/hylafax/hylafax.cron.daily index 2d1a77e5c..567dd8ed3 100644 --- a/extra/hylafax/hylafax.cron.daily +++ b/extra/hylafax/hylafax.cron.daily @@ -1,4 +1,4 @@ #!/bin/sh -/usr/sbin/faxqclean -/usr/sbin/faxcron -rcv 30 +/usr/bin/faxqclean +/usr/bin/faxcron -rcv 30 diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD index 952c377bb..e9c3a0f2b 100644 --- a/extra/icu/PKGBUILD +++ b/extra/icu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185844 2013-05-19 15:04:46Z andyrtr $ +# $Id: PKGBUILD 186326 2013-05-24 19:56:49Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Art Gramlich <art@gramlich-net.com> pkgname=icu -pkgver=51.1 -pkgrel=2 +pkgver=51.2 +pkgrel=1 pkgdesc="International Components for Unicode library" arch=(i686 x86_64 'mips64el') url="http://www.icu-project.org/" @@ -14,7 +14,7 @@ depends=('gcc-libs>=4.7.1-5' 'sh') source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz icu.8198.revert.icu5431.patch) -md5sums=('6eef33b229d0239d654983028c9c7053' +md5sums=('072e501b87065f3a0ca888f1b5165709' 'ebd5470fc969c75e52baf4af94a9ee82') build() { diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 12adcd4be..df0d77d66 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185248 2013-05-12 14:13:52Z eric $ +# $Id: PKGBUILD 186384 2013-05-26 09:24:37Z bluewind $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.5.6 +pkgver=6.8.5.7 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -13,7 +13,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('3c932aa3febb1e992a780e9091925bdbc0d61613' +sha1sums=('f393612e9797a6129f2cac7f83df337bb54ecf76' 'e143cf9d530fabf3b58023899b5cc544ba93daec') prepare() { diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 7b2777482..98b4c7b5a 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184396 2013-05-06 19:38:01Z foutrelis $ +# $Id: PKGBUILD 186340 2013-05-25 02:56:30Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: tobias <tobias@archlinux.org> pkgname=inkscape pkgver=0.48.4 -pkgrel=7 +pkgrel=8 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') @@ -35,6 +35,7 @@ prepare() { sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py sed -i 's|"python"|"python2"|g' src/main.cpp + sed -i '/^#include <g.kmm/i #include <glibmm.h>' src/*{,/*{,/*{,/*}}}.{h,cpp} } build() { diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD index 0d81df2b6..543f99e93 100644 --- a/extra/intel-tbb/PKGBUILD +++ b/extra/intel-tbb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179910 2013-03-11 19:50:39Z stephane $ +# $Id: PKGBUILD 186302 2013-05-24 12:22:34Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Denis Martinez <deuns.martinez AT gmail.com> pkgname=intel-tbb -pkgver=4.1_20130116 +pkgver=4.1_20130314 pkgrel=1 pkgdesc='High level abstract threading library' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url='http://www.threadingbuildingblocks.org/' license=('GPL') depends=('gcc-libs') source=("http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${pkgver/\./}oss_src.tgz") -sha1sums=('fd7ea56612f145a1f9b3d961a424e9d553bab527') +sha1sums=('e2bf74c1e492b06faf3ecdf2321e64ca698c0921') build() { cd "${srcdir}"/tbb${pkgver/\./}oss diff --git a/extra/irssi/PKGBUILD b/extra/irssi/PKGBUILD index 69f70f20f..d1dc17947 100644 --- a/extra/irssi/PKGBUILD +++ b/extra/irssi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160489 2012-06-02 10:26:29Z bluewind $ +# $Id: PKGBUILD 186385 2013-05-26 09:24:38Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dan McGee <dan@archlinux.org> pkgname=irssi pkgver=0.8.15 -pkgrel=6 +pkgrel=7 pkgdesc="Modular text mode IRC client with Perl scripting" arch=('i686' 'x86_64' 'mips64el') url="http://irssi.org/" diff --git a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/extra/java7-openjdk/01_fix_openjdk_cmds_path.diff index 6cac91dd6..bb588a072 100644 --- a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff +++ b/extra/java7-openjdk/01_fix_openjdk_cmds_path.diff @@ -1,15 +1,18 @@ ---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2011-08-06 15:46:01.000000000 +0200 -+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-08-06 15:59:26.000000000 +0200 -@@ -91,7 +91,7 @@ +--- openjdk/jdk/make/common/shared/Defs-utils.gmk.orig 2013-05-19 20:01:25.676093296 +0000 ++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2013-05-19 20:01:54.312572109 +0000 +@@ -98,9 +98,9 @@ CHMOD = $(UTILS_COMMAND_PATH)chmod CMP = $(UTILS_USR_BIN_PATH)cmp COMM = $(UTILS_USR_BIN_PATH)comm -COMPRESS = $(UTILS_USR_BIN_PATH)compress +COMPRESS = $(UTILS_COMMAND_PATH)compress CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio +-CPIO = $(UTILS_COMMAND_PATH)cpio ++CPIO = $(UTILS_USR_BIN_PATH)cpio CUT = $(UTILS_USR_BIN_PATH)cut -@@ -101,13 +101,13 @@ + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df +@@ -108,13 +108,13 @@ DIRNAME = $(UTILS_USR_BIN_PATH)dirname DUMP = $(UTILS_CCS_BIN_PATH)dump ECHO = $(UTILS_COMMAND_PATH)echo @@ -25,7 +28,7 @@ GUNZIP = $(UTILS_COMMAND_PATH)gunzip # GZIP is used for solaris. Linux and windows use tar czf GZIP = $(UTILS_COMMAND_PATH)gzip -@@ -140,7 +140,7 @@ +@@ -148,7 +148,7 @@ TAIL = $(UTILS_USR_BIN_PATH)tail TAR = $(UTILS_COMMAND_PATH)tar TEST = $(UTILS_USR_BIN_PATH)test diff --git a/extra/java7-openjdk/fix_corba_cmds_path.diff b/extra/java7-openjdk/02_fix_corba_cmds_path.diff index 7a3db9567..8a22e3229 100644 --- a/extra/java7-openjdk/fix_corba_cmds_path.diff +++ b/extra/java7-openjdk/02_fix_corba_cmds_path.diff @@ -1,15 +1,18 @@ ---- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300 -+++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300 -@@ -76,7 +76,7 @@ +--- openjdk/corba/make/common/shared/Defs-utils.gmk.orig 2013-05-19 19:57:58.530784147 +0000 ++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2013-05-19 19:58:44.777147938 +0000 +@@ -83,9 +83,9 @@ CHMOD = $(UTILS_COMMAND_PATH)chmod CMP = $(UTILS_USR_BIN_PATH)cmp COMM = $(UTILS_USR_BIN_PATH)comm -COMPRESS = $(UTILS_USR_BIN_PATH)compress +COMPRESS = $(UTILS_COMMAND_PATH)compress CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio +-CPIO = $(UTILS_COMMAND_PATH)cpio ++CPIO = $(UTILS_USR_BIN_PATH)cpio CUT = $(UTILS_USR_BIN_PATH)cut -@@ -125,7 +125,7 @@ + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df +@@ -131,7 +131,7 @@ TAIL = $(UTILS_USR_BIN_PATH)tail TAR = $(UTILS_COMMAND_PATH)tar TEST = $(UTILS_USR_BIN_PATH)test @@ -18,10 +21,10 @@ TR = $(UTILS_USR_BIN_PATH)tr TRUE = $(UTILS_COMMAND_PATH)true UNAME = $(UTILS_COMMAND_PATH)uname -@@ -176,7 +176,7 @@ +@@ -182,7 +182,7 @@ # others have it in /usr/bin. SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ - $(wildcard $(UTILS_USR_BIN_PATH)sort)) + $(wildcard $(UTILS_USR_BIN_PATH)sort)) - NAWK = $(USRBIN_PATH)gawk + NAWK = $(UTILS_COMMAND_PATH)gawk # Intrinsic unix command, with backslash-escaped character interpretation diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index efdfea91e..0c5e6b813 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185582 2013-05-15 08:29:48Z guillaume $ +# $Id: PKGBUILD 186020 2013-05-20 13:53:06Z guillaume $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=ad5a321edea2 # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -43,8 +43,8 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz fontconfig-paths.diff - fix_corba_cmds_path.diff - openjdk7_fix_jdk_cmds_path.diff + 01_fix_openjdk_cmds_path.diff + 02_fix_corba_cmds_path.diff openjdk7_nonreparenting-wm.diff jdk7-openjdk.profile jdk7-openjdk.profile.csh @@ -59,8 +59,8 @@ sha256sums=('7e1fdd4c53c9772337c971b6f6f8058dabd99d7f4c4fcc85c88d836c9005c6da' '2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12' 'c184f29b13626e7327f58e4c1df506daf2b57d8084b7a2d2106504ab0fd5eaac' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' - '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' - 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' + '583af9025df545264a15665e4c9f981bc7286aaecc6d312dced485102cf5dda9' + 'd57754ff320475023688bd7c7af38a9ea37e27ed8c1edd3b1572e4d8b41b78d3' 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' 'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea' '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' @@ -89,7 +89,10 @@ build() { . /etc/profile.d/apache-ant.sh cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches - export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff" + export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \ + patches/01_fix_openjdk_cmds_path.diff \ + patches/02_fix_corba_cmds_path.diff \ + patches/openjdk7_nonreparenting-wm.diff" if [ "$_bootstrap" = "1" ]; then BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar" @@ -327,6 +330,9 @@ package_jdk7-openjdk() { install -m755 -d ${pkgdir}/etc/profile.d/ install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh + + # Temporarily fixing FS#35141 + chmod go+r ${pkgdir}/usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar } package_openjdk7-src() { diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 519c90f25..736e7712e 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184887 2013-05-09 09:43:00Z andrea $ +# $Id: PKGBUILD 186386 2013-05-26 09:24:39Z bluewind $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde pkgver=4.10.3 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" arch=('i686' 'x86_64' 'mips64el') @@ -11,22 +11,22 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' - 'kdegraphics-okular' 'kdesdk-kate') + 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") sha1sums=('7db692b0a06ba421caa870fc254f03c2e3bf4e79') build() { - cd "${srcdir}" mkdir build cd build cmake ../perlkde-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 65bf601b3..723c9b265 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184858 2013-05-09 09:42:29Z andrea $ +# $Id: PKGBUILD 186387 2013-05-26 09:24:45Z bluewind $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt pkgver=4.10.3 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,6 @@ source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") sha1sums=('261e1c4d9a6a216d7b5b5e2962ba5266f0d62bdf') build() { - cd "${srcdir}" mkdir build cd build cmake ../perlqt-${pkgver} \ @@ -27,6 +26,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index 95240c5dc..a1ea2f5a8 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184889 2013-05-09 09:43:02Z andrea $ +# $Id: PKGBUILD 186565 2013-05-29 07:12:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor pkgver=4.10.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" arch=('i686' 'x86_64' 'mips64el') @@ -15,11 +15,17 @@ optdepends=('maxima: Maxima backend' 'octave: Octave backend' 'r: R backend') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('ae2c9c50cc79030a3f15106d059997da5c37a886') +source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz" + 'sage58.patch') +sha1sums=('ae2c9c50cc79030a3f15106d059997da5c37a886' + 'c02051c30ece57800d693da60280b0bdb5f45697') + +prepare() { + cd cantor-${pkgver} + patch -p1 -i "${srcdir}"/sage58.patch +} build() { - cd "${srcdir}" mkdir build cd build cmake ../cantor-${pkgver} \ diff --git a/extra/kdeedu-cantor/sage58.patch b/extra/kdeedu-cantor/sage58.patch new file mode 100644 index 000000000..d17b55a99 --- /dev/null +++ b/extra/kdeedu-cantor/sage58.patch @@ -0,0 +1,123 @@ +diff --git a/src/backends/sage/sagecompletionobject.cpp b/src/backends/sage/sagecompletionobject.cpp +index dec0c8f..a132295 100644 +--- a/src/backends/sage/sagecompletionobject.cpp ++++ b/src/backends/sage/sagecompletionobject.cpp +@@ -52,7 +52,7 @@ void SageCompletionObject::fetchCompletions() + + //cache the value of the "_" variable into __hist_tmp__, so we can restore the previous result + //after complete() was evaluated +- m_expression=session()->evaluateExpression("__hist_tmp__=_; __IPYTHON__.complete(\""+command()+"\");_=__hist_tmp__"); ++ m_expression=session()->evaluateExpression("__hist_tmp__=_; __CANTOR_IPYTHON_SHELL__.complete(\""+command()+"\");_=__hist_tmp__"); + connect(m_expression, SIGNAL(gotResult()), this, + SLOT(extractCompletions())); + +@@ -71,11 +71,19 @@ void SageCompletionObject::extractCompletions() + kDebug()<<"something went wrong fetching tab completion"; + return; + } +- ++ + //the result looks like "['comp1', 'comp2']" parse it ++ ++ //for sage version 5.7 this looks like ++ //('s1', ['comp1','comp2']) where s1 is the string we called complete with ++ + QString txt=res->toHtml().trimmed(); ++ txt.remove("<br/>"); ++ txt=txt.mid(txt.indexOf(command())+command().length()+2).trimmed(); + txt=txt.mid(1); //remove [ +- txt.chop(1); //remove ] ++ txt.chop(2); //remove ] ++ ++ kDebug()<<"completion string: "<<txt; + + QStringList tmp=txt.split(','); + QStringList completions; +diff --git a/src/backends/sage/sageexpression.cpp b/src/backends/sage/sageexpression.cpp +index eabdda2..fbde7c1 100644 +--- a/src/backends/sage/sageexpression.cpp ++++ b/src/backends/sage/sageexpression.cpp +@@ -122,7 +122,7 @@ void SageExpression::parseOutput(const QString& text) + //reset the indices + index=index2=-1; + } +- ++ + m_outputCache+=output; + + if(m_promptCount<=0) +@@ -160,11 +160,9 @@ void SageExpression::addFileResult( const QString& path ) + { + KUrl url( path ); + KMimeType::Ptr type=KMimeType::findByUrl(url); +- kDebug()<<"MimeType: "<<type->name(); +- if(type->name().contains("image")) ++ if(m_imagePath.isEmpty()||type->name().contains("image")||path.endsWith(".png")||path.endsWith(".gif")) + { +- kDebug()<<"adding file "<<path<<" "<<url; +- m_imagePath=path; ++ m_imagePath=path; + } + } + +@@ -172,8 +170,11 @@ void SageExpression::evalFinished() + { + kDebug()<<"evaluation finished"; + kDebug()<<m_outputCache; ++ ++ //check if our image path contains a valid image that we can try to show ++ bool hasImage=!m_imagePath.isNull(); + +- if ( m_imagePath.isNull() ) //If this result contains a file, drop the text information ++ if ( !hasImage ) //If this result contains a file, drop the text information + { + Cantor::TextResult* result=0; + +@@ -219,7 +220,7 @@ void SageExpression::evalFinished() + } + else + { +- KMimeType::Ptr type=KMimeType::findByUrl(m_imagePath); ++ KMimeType::Ptr type=KMimeType::findByUrl(m_imagePath); + if(type->is("image/gif")) + setResult( new Cantor::AnimationResult( KUrl(m_imagePath ),i18n("Result of %1" , command() ) ) ); + else +diff --git a/src/backends/sage/sagesession.cpp b/src/backends/sage/sagesession.cpp +index a535277..d8ac325 100644 +--- a/src/backends/sage/sagesession.cpp ++++ b/src/backends/sage/sagesession.cpp +@@ -38,10 +38,13 @@ const QByteArray SageSession::SageAlternativePrompt="....: "; //Text, sage outpu + static QByteArray initCmd="os.environ['PAGER'] = 'cat' \n "\ + "sage.misc.pager.EMBEDDED_MODE = True \n "\ + "sage.misc.viewer.BROWSER='' \n "\ ++ "sage.misc.viewer.viewer.png_viewer('') \n" \ + "sage.plot.plot3d.base.SHOW_DEFAULTS['viewer'] = 'tachyon' \n"\ + "sage.misc.latex.EMBEDDED_MODE = True \n "\ + "os.environ['PAGER'] = 'cat' \n "\ +- " __IPYTHON__.shell.autoindent=False \n "\ ++ "%colors nocolor \n "\ ++ "__CANTOR_IPYTHON_SHELL__=get_ipython() \n "\ ++ "__CANTOR_IPYTHON_SHELL__.autoindent=False \n "\ + "print '____TMP_DIR____', sage.misc.misc.SAGE_TMP\n"\ + "print '____END_OF_INIT____' \n "; + +@@ -277,6 +280,7 @@ void SageSession::waitForNextPrompt() + + void SageSession::fileCreated( const QString& path ) + { ++ kDebug()<<"got a file "<<path; + SageExpression* expr=m_expressionQueue.first(); + if ( expr ) + expr->addFileResult( path ); +@@ -290,9 +294,9 @@ void SageSession::setTypesettingEnabled(bool enable) + //the _ and __IP.outputcache() are needed to keep the + // _ operator working + if (enable) +- evaluateExpression("sage.misc.latex.pretty_print_default(true);_;__IP.outputcache()", Cantor::Expression::DeleteOnFinish); ++ evaluateExpression("sage.misc.latex.pretty_print_default(true)", Cantor::Expression::DeleteOnFinish); + else +- evaluateExpression("sage.misc.latex.pretty_print_default(false);_;__IP.outputcache()", Cantor::Expression::DeleteOnFinish); ++ evaluateExpression("sage.misc.latex.pretty_print_default(false)", Cantor::Expression::DeleteOnFinish); + } + + Cantor::CompletionObject* SageSession::completionFor(const QString& command, int index) diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index c4ed90a22..92ba11dc4 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184851 2013-05-09 09:42:22Z andrea $ +# $Id: PKGBUILD 186222 2013-05-22 07:16:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime pkgver=4.10.3 -pkgrel=1 +pkgrel=2 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdepim-runtime' diff --git a/extra/kdevelop-python/PKGBUILD b/extra/kdevelop-python/PKGBUILD index acbcf2f6e..90088d2f4 100644 --- a/extra/kdevelop-python/PKGBUILD +++ b/extra/kdevelop-python/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184199 2013-05-03 13:03:50Z andrea $ +# $Id: PKGBUILD 186211 2013-05-22 06:00:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-python -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=1 pkgdesc="Python language and documentation plugin for KDevelop" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') depends=('kdevelop') makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt') source=("http://download.kde.org/stable/kdevelop/kdev-python/${pkgver}/src/kdev-python-v${pkgver}.tar.bz2") -sha1sums=('fb9af112910c5655ce52bf9cfef19bacbab4f62f') +sha1sums=('accc8950a380e663bcfe3f51e4e5a6653ff8c146') build() { mkdir build diff --git a/extra/konversation/PKGBUILD b/extra/konversation/PKGBUILD index ff8df1217..92423728f 100644 --- a/extra/konversation/PKGBUILD +++ b/extra/konversation/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172103 2012-11-28 12:37:26Z stephane $ +# $Id: PKGBUILD 186022 2013-05-20 14:06:29Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: James Rayner <iphitus@gmail.com> @@ -6,12 +6,12 @@ pkgname=konversation pkgver=1.4 -pkgrel=5 +pkgrel=6 pkgdesc="A user friendly IRC client for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://konversation.kde.org" depends=('kdebase-runtime' 'kdepimlibs') -makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml') +makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml' 'optipng') optdepends=('python: python scripting support' 'kdebase-konsole: open a terminal in konversation' 'qca-ossl: Diffie-Hellman key exchange and Blowfish ECB/CBC support') @@ -21,6 +21,12 @@ options=('!makeflags') source=("http://download.kde.org/download.php?url=stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777') +prepare() { + cd "$srcdir/$pkgname-$pkgver" + # libpng16 fix + find -name '*.png' -exec optipng -quiet -force -fix {} + +} + build() { cd "${srcdir}" mkdir build diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD index 9ddd39c29..4ca0e6706 100644 --- a/extra/kwebkitpart/PKGBUILD +++ b/extra/kwebkitpart/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179888 2013-03-10 21:31:07Z andrea $ +# $Id: PKGBUILD 186557 2013-05-28 23:46:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kwebkitpart -pkgver=1.3.2 -pkgrel=2 +pkgver=1.3.3 +pkgrel=1 pkgdesc="A WebKit browser component for KDE" url="https://projects.kde.org/projects/extragear/base/kwebkitpart/" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,8 @@ license=('LGPL') depends=('kdelibs') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2df1c70371b99e5f638fff702f789ba1') +source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz") +md5sums=('0c90cc05b4f9b6cba9e62941ae4d3ba0') build() { sed -i '/add_subdirectory(kdelauncher)/d' ${pkgname}-${pkgver}/CMakeLists.txt diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index f77cf1333..5cb642dd3 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185764 2013-05-18 14:49:17Z andyrtr $ +# $Id: PKGBUILD 186572 2013-05-29 15:13:14Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.4.6 +pkgver=4.4.8 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh') optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') -source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('377cc2caa2fc92755160270768e51604') +source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 ) +md5sums=('7140263fbe12f17f74183cf065a7d381') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/libaio/PKGBUILD b/extra/libaio/PKGBUILD index 5d4dfa04c..ac29bc982 100644 --- a/community/libaio/PKGBUILD +++ b/extra/libaio/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 186545 2013-05-28 18:17:04Z tpowa $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Thomas S Hatch <thatch45 at gmail dot com> diff --git a/extra/libbluray/PKGBUILD b/extra/libbluray/PKGBUILD index ba2ee7b36..1f4d9c706 100644 --- a/extra/libbluray/PKGBUILD +++ b/extra/libbluray/PKGBUILD @@ -1,46 +1,30 @@ -# $Id: PKGBUILD 167258 2012-09-29 12:58:04Z ibiru $ +# $Id: PKGBUILD 186521 2013-05-28 10:28:20Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrew Cook <ariscop@gmail.com> pkgname=libbluray -pkgver=0.2.3 +pkgver=0.3.0 pkgrel=1 pkgdesc="Library to access Blu-Ray disks for video playback" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/developers/libbluray.html" license=('LGPL2.1') -depends=('libxml2') -if [ "$CARCH" != "mips64el" ]; then -makedepends=('apache-ant' 'jdk7-openjdk') -optdepends=('java-environment: Blu-ray Disc Java support library') -fi +depends=('libxml2' 'freetype2') options=(!libtool) source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -sha512sums=('b84fd172523facb207134bb1fee09c7f65914d22f6120fbfd6f312f0435229f3b110e8cc8ea121159929cda3760cfac4b52f84de39d0fb976f8c88d1f7e6d278') +sha512sums=('96eedf23ff756e97fa64d9624a49608daccbac169714b9b231a284ed4eb63c77ee2ecbdfc42c311781571146cfa0fe340854ac831d3fe1312131e1742a4a7b02') build() { cd "$pkgname-$pkgver" -if [ "$CARCH" != "mips64el" ]; then - . /etc/profile.d/jdk.sh ./configure --prefix=/usr \ - --enable-bdjava \ - --with-jdk=${JAVA_HOME} \ --disable-static -else - ./configure --prefix=/usr \ - --disable-static -fi make } package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install - #install bdj -if [ "$CARCH" != "mips64el" ]; then - install -Dm644 src/.libs/libbluray.jar "$pkgdir/usr/share/java/libbluray.jar" -fi } # vim:set ts=2 sw=2 et: diff --git a/extra/libdmx/PKGBUILD b/extra/libdmx/PKGBUILD index 323e1f733..8c7b0a4a1 100644 --- a/extra/libdmx/PKGBUILD +++ b/extra/libdmx/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152803 2012-03-09 17:01:00Z andyrtr $ +# $Id: PKGBUILD 186576 2013-05-29 15:18:36Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdmx -pkgver=1.1.2 -pkgrel=1.1 +pkgver=1.1.3 +pkgrel=1 pkgdesc="X11 Distributed Multihead extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('dmxproto' 'libxext') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('76956d4127ded2e6d1bb5746a6d1603ee23b442a') +sha256sums=('c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libfs/PKGBUILD b/extra/libfs/PKGBUILD index 9d16938d1..a06ca8611 100644 --- a/extra/libfs/PKGBUILD +++ b/extra/libfs/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 151846 2012-03-03 13:40:06Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186578 2013-05-29 15:21:31Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libfs -pkgver=1.0.4 -pkgrel=1.1 +pkgver=1.0.5 +pkgrel=1 pkgdesc="X11 Font Services Library" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -12,7 +13,7 @@ depends=('glibc' 'xproto' 'fontsproto') makedepends=('xorg-util-macros' 'xtrans') options=('!libtool') source=("${url}/releases/individual/lib/libFS-${pkgver}.tar.bz2") -sha1sums=('f114f32f60eb84d3e1d0e6f0dfe7679b07e91295') +sha256sums=('22eb3005dd8053aef7ff82758da5dd59ca9738410bcf847e675780e3a1f96107') build() { cd "${srcdir}/libFS-${pkgver}" diff --git a/extra/libiscsi/PKGBUILD b/extra/libiscsi/PKGBUILD new file mode 100644 index 000000000..26f3c5381 --- /dev/null +++ b/extra/libiscsi/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 186551 2013-05-28 18:43:28Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=libiscsi +pkgver=1.7.0 +pkgrel=1 +depends=('glibc' 'popt') +pkgdesc="Library that provides generic access to USB device" +arch=(i686 x86_64) +url="https://github.com/sahlberg/libiscsi" +license=('LGPL') +source=(https://github.com/downloads/sahlberg/${pkgname}/${pkgname}-${pkgver}.tar.gz) +options=(!libtool) + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh + ./configure --prefix=/usr --disable-static --libdir=/usr/lib + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package () { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} +md5sums=('4ba621f47d016d48ab93d5301ae5a363') diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index 13e60a270..306bd875e 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -1,53 +1,42 @@ -# $Id: PKGBUILD 162914 2012-07-03 20:59:56Z eric $ +# $Id: PKGBUILD 186466 2013-05-26 22:08:45Z eric $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> pkgname=libjpeg-turbo -pkgver=1.2.1 -pkgrel=1.1 +pkgver=1.3.0 +pkgrel=2 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression" arch=('i686' 'x86_64' 'mips64el') url="http://libjpeg-turbo.virtualgl.org/" license=('GPL' 'custom') depends=('glibc') makedepends=('nasm') -provides=('libjpeg=8.0.2') -conflicts=('libjpeg') -replaces=('libjpeg') +provides=('libjpeg=8.0.2' 'turbojpeg') +conflicts=('libjpeg' 'turbojpeg') +replaces=('libjpeg' 'turbojpeg') options=('!libtool') source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz) -sha1sums=('a4992e102c6d88146709e8e6ce5896d5d0b5a361') +sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28') build() { - cd "$srcdir/$pkgname-$pkgver" - - # put documentation in a reasonable directory... - sed -i "/docdir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in - sed -i "/exampledir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in - + cd $pkgname-$pkgver ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man make } check() { cd "$srcdir/$pkgname-$pkgver" - make test } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" docdir=/usr/share/doc/libjpeg-turbo \ + exampledir=/usr/share/doc/libjpeg-turbo install # provide jpegint.h as it is required by various software install -m644 jpegint.h "$pkgdir/usr/include/" - # do not distributre libturbojpeg as it is unversioned - rm "$pkgdir"/usr/lib/libturbojpeg.{so,a} - rm "$pkgdir/usr/include/turbojpeg.h" - rm "$pkgdir/usr/bin/tjbench" - install -dm755 "$pkgdir/usr/share/licenses/libjpeg-turbo/" ln -s ../../doc/libjpeg-turbo/README \ "$pkgdir/usr/share/licenses/libjpeg-turbo/README" diff --git a/extra/libkgapi/PKGBUILD b/extra/libkgapi/PKGBUILD index 31f48faa7..3b3c876a2 100644 --- a/extra/libkgapi/PKGBUILD +++ b/extra/libkgapi/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 173820 2012-12-24 04:23:51Z andrea $ +# $Id: PKGBUILD 186220 2013-05-22 07:15:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkgapi -pkgver=0.4.4 +pkgver=2.0.0 pkgrel=1 pkgdesc="A KDE-based library for accessing various Google services via their public API" url='https://projects.kde.org/projects/extragear/libs/libkgapi' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') -depends=('kdepimlibs' 'qjson') +depends=('kdepimlibs') makedepends=('cmake' 'automoc4' 'boost') replaces=('akonadi-google' 'libkgoogle') conflicts=('akonadi-google' 'libkgoogle') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('a26ddd6da675075f7529652f36f5c9f5') +md5sums=('e7938dcec05b0f73e6a0b24c1674378d') build() { mkdir build diff --git a/extra/libproxy/PKGBUILD b/extra/libproxy/PKGBUILD index 70f9e5041..7bcc2a9a5 100644 --- a/extra/libproxy/PKGBUILD +++ b/extra/libproxy/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 24494 2009-01-17 20:42:01Z jgc $ +# $Id: PKGBUILD 186388 2013-05-26 09:24:47Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libproxy pkgver=0.4.11 -pkgrel=1 +pkgrel=2 pkgdesc="A library that provides automatic proxy configuration management" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index ac39bf8cd..a81628eb0 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185016 2013-05-10 07:10:14Z andyrtr $ +# $Id: PKGBUILD 186348 2013-05-25 05:24:32Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -21,7 +21,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=4.0.3.3 pkgver=4.0.3 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -33,7 +33,7 @@ makedepends=( # makedepends # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.3' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.4' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -274,8 +274,8 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install - depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' - 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.3" + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.4" 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' diff --git a/community/libseccomp/PKGBUILD b/extra/libseccomp/PKGBUILD index 9bdaee4fc..9bdaee4fc 100644 --- a/community/libseccomp/PKGBUILD +++ b/extra/libseccomp/PKGBUILD diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD index 08e987e47..cf529d757 100644 --- a/extra/libtiff/PKGBUILD +++ b/extra/libtiff/PKGBUILD @@ -1,33 +1,55 @@ -# $Id: PKGBUILD 167697 2012-10-03 05:10:48Z eric $ +# $Id: PKGBUILD 186503 2013-05-28 01:47:37Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libtiff pkgver=4.0.3 -pkgrel=1.1 +pkgrel=2 pkgdesc="Library for manipulation of TIFF images" arch=('i686' 'x86_64' 'mips64el') url="http://www.remotesensing.org/libtiff/" license=('custom') -depends=('libjpeg' 'zlib' 'xz') -makedepends=('freeglut') +depends=('gcc-libs' 'libjpeg' 'zlib' 'xz') +makedepends=('freeglut' 'glu' 'mesa') optdepends=('freeglut: for using tiffgt') options=('!libtool') -source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) -sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0') +source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz + tiff-3.9.7-CVE-2012-4447.patch + tiff-3.9.7-CVE-2012-4564.patch + tiff-4.0.3-CVE-2013-1960.patch + tiff-4.0.3-CVE-2013-1961.patch + tiff-4.0.3-libjpeg-turbo.patch + tiff-4.0.3-tiff2pdf-colors.patch) +sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0' + '41be661638282dae0d07bd2788414cb6650f8981' + '6cb3d480908132335c05c769b5a51f951413725d' + '5903355afdd0bb27ea3746339e2196720f9fac9d' + '29a91870cca5d4cd9ca1c464f8074088eddc3fb8' + '02d57835df50d3f84587571ec52b36f5af838de2' + '23443ad0bc130d70860b6cc6d19b69584ae7a6cc') + +prepare() { + cd tiff-${pkgver} + patch -p0 -i "${srcdir}/tiff-4.0.3-tiff2pdf-colors.patch" + patch -p1 -i "${srcdir}/tiff-3.9.7-CVE-2012-4447.patch" + patch -p1 -i "${srcdir}/tiff-3.9.7-CVE-2012-4564.patch" + patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1960.patch" + patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1961.patch" + patch -p1 -i "${srcdir}/tiff-4.0.3-libjpeg-turbo.patch" +} build() { - cd "${srcdir}/tiff-${pkgver}" + cd tiff-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}/tiff-${pkgver}" -# make check + cd tiff-${pkgver} + make check } package() { - cd "${srcdir}/tiff-${pkgver}" + cd tiff-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libtiff/tiff-3.9.7-CVE-2012-4447.patch b/extra/libtiff/tiff-3.9.7-CVE-2012-4447.patch new file mode 100644 index 000000000..f23e98466 --- /dev/null +++ b/extra/libtiff/tiff-3.9.7-CVE-2012-4447.patch @@ -0,0 +1,37 @@ +Upstream patch for CVE-2012-4447. This also covers an out-of-bounds-read +possibility in the same file, which wasn't given a separate CVE. + + +diff -Naur tiff-3.9.4.orig/libtiff/tif_pixarlog.c tiff-3.9.4/libtiff/tif_pixarlog.c +--- tiff-3.9.4.orig/libtiff/tif_pixarlog.c 2010-06-08 14:50:42.000000000 -0400 ++++ tiff-3.9.4/libtiff/tif_pixarlog.c 2012-12-10 15:50:14.421538317 -0500 +@@ -641,6 +641,20 @@ + return bytes; + } + ++static tsize_t ++add_ms(tsize_t m1, tsize_t m2) ++{ ++ tsize_t bytes = m1 + m2; ++ ++ /* if either input is zero, assume overflow already occurred */ ++ if (m1 == 0 || m2 == 0) ++ bytes = 0; ++ else if (bytes <= m1 || bytes <= m2) ++ bytes = 0; ++ ++ return bytes; ++} ++ + static int + PixarLogSetupDecode(TIFF* tif) + { +@@ -661,6 +675,8 @@ + td->td_samplesperpixel : 1); + tbuf_size = multiply(multiply(multiply(sp->stride, td->td_imagewidth), + td->td_rowsperstrip), sizeof(uint16)); ++ /* add one more stride in case input ends mid-stride */ ++ tbuf_size = add_ms(tbuf_size, sizeof(uint16) * sp->stride); + if (tbuf_size == 0) + return (0); + sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size); diff --git a/extra/libtiff/tiff-3.9.7-CVE-2012-4564.patch b/extra/libtiff/tiff-3.9.7-CVE-2012-4564.patch new file mode 100644 index 000000000..98a6e6c44 --- /dev/null +++ b/extra/libtiff/tiff-3.9.7-CVE-2012-4564.patch @@ -0,0 +1,77 @@ +Upstream patch for CVE-2012-4564. + + +diff -Naur tiff-3.9.4.orig/tools/ppm2tiff.c tiff-3.9.4/tools/ppm2tiff.c +--- tiff-3.9.4.orig/tools/ppm2tiff.c 2010-06-08 14:50:44.000000000 -0400 ++++ tiff-3.9.4/tools/ppm2tiff.c 2012-12-10 16:16:05.154045877 -0500 +@@ -68,6 +68,17 @@ + exit(-2); + } + ++static tsize_t ++multiply_ms(tsize_t m1, tsize_t m2) ++{ ++ tsize_t bytes = m1 * m2; ++ ++ if (m1 && bytes / m1 != m2) ++ bytes = 0; ++ ++ return bytes; ++} ++ + int + main(int argc, char* argv[]) + { +@@ -85,6 +96,7 @@ + int c; + extern int optind; + extern char* optarg; ++ tsize_t scanline_size; + + if (argc < 2) { + fprintf(stderr, "%s: Too few arguments\n", argv[0]); +@@ -217,7 +229,8 @@ + } + switch (bpp) { + case 1: +- linebytes = (spp * w + (8 - 1)) / 8; ++ /* if round-up overflows, result will be zero, OK */ ++ linebytes = (multiply_ms(spp, w) + (8 - 1)) / 8; + if (rowsperstrip == (uint32) -1) { + TIFFSetField(out, TIFFTAG_ROWSPERSTRIP, h); + } else { +@@ -226,15 +239,31 @@ + } + break; + case 8: +- linebytes = spp * w; ++ linebytes = multiply_ms(spp, w); + TIFFSetField(out, TIFFTAG_ROWSPERSTRIP, + TIFFDefaultStripSize(out, rowsperstrip)); + break; + } +- if (TIFFScanlineSize(out) > linebytes) ++ if (linebytes == 0) { ++ fprintf(stderr, "%s: scanline size overflow\n", infile); ++ (void) TIFFClose(out); ++ exit(-2); ++ } ++ scanline_size = TIFFScanlineSize(out); ++ if (scanline_size == 0) { ++ /* overflow - TIFFScanlineSize already printed a message */ ++ (void) TIFFClose(out); ++ exit(-2); ++ } ++ if (scanline_size < linebytes) + buf = (unsigned char *)_TIFFmalloc(linebytes); + else +- buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out)); ++ buf = (unsigned char *)_TIFFmalloc(scanline_size); ++ if (buf == NULL) { ++ fprintf(stderr, "%s: Not enough memory\n", infile); ++ (void) TIFFClose(out); ++ exit(-2); ++ } + if (resolution > 0) { + TIFFSetField(out, TIFFTAG_XRESOLUTION, resolution); + TIFFSetField(out, TIFFTAG_YRESOLUTION, resolution); diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-1960.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-1960.patch new file mode 100644 index 000000000..1c8dfb7bc --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-CVE-2013-1960.patch @@ -0,0 +1,145 @@ +diff -Naur tiff-4.0.3.orig/tools/tiff2pdf.c tiff-4.0.3/tools/tiff2pdf.c +--- tiff-4.0.3.orig/tools/tiff2pdf.c 2012-07-25 22:56:43.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2pdf.c 2013-05-02 12:04:49.057090227 -0400 +@@ -3341,33 +3341,56 @@ + uint32 height){ + + tsize_t i=0; +- uint16 ri =0; +- uint16 v_samp=1; +- uint16 h_samp=1; +- int j=0; +- +- i++; +- +- while(i<(*striplength)){ ++ ++ while (i < *striplength) { ++ tsize_t datalen; ++ uint16 ri; ++ uint16 v_samp; ++ uint16 h_samp; ++ int j; ++ int ncomp; ++ ++ /* marker header: one or more FFs */ ++ if (strip[i] != 0xff) ++ return(0); ++ i++; ++ while (i < *striplength && strip[i] == 0xff) ++ i++; ++ if (i >= *striplength) ++ return(0); ++ /* SOI is the only pre-SOS marker without a length word */ ++ if (strip[i] == 0xd8) ++ datalen = 0; ++ else { ++ if ((*striplength - i) <= 2) ++ return(0); ++ datalen = (strip[i+1] << 8) | strip[i+2]; ++ if (datalen < 2 || datalen >= (*striplength - i)) ++ return(0); ++ } + switch( strip[i] ){ +- case 0xd8: +- /* SOI - start of image */ ++ case 0xd8: /* SOI - start of image */ + _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), 2); + *bufferoffset+=2; +- i+=2; + break; +- case 0xc0: +- case 0xc1: +- case 0xc3: +- case 0xc9: +- case 0xca: ++ case 0xc0: /* SOF0 */ ++ case 0xc1: /* SOF1 */ ++ case 0xc3: /* SOF3 */ ++ case 0xc9: /* SOF9 */ ++ case 0xca: /* SOF10 */ + if(no==0){ +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); +- for(j=0;j<buffer[*bufferoffset+9];j++){ +- if( (buffer[*bufferoffset+11+(2*j)]>>4) > h_samp) +- h_samp = (buffer[*bufferoffset+11+(2*j)]>>4); +- if( (buffer[*bufferoffset+11+(2*j)] & 0x0f) > v_samp) +- v_samp = (buffer[*bufferoffset+11+(2*j)] & 0x0f); ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); ++ ncomp = buffer[*bufferoffset+9]; ++ if (ncomp < 1 || ncomp > 4) ++ return(0); ++ v_samp=1; ++ h_samp=1; ++ for(j=0;j<ncomp;j++){ ++ uint16 samp = buffer[*bufferoffset+11+(3*j)]; ++ if( (samp>>4) > h_samp) ++ h_samp = (samp>>4); ++ if( (samp & 0x0f) > v_samp) ++ v_samp = (samp & 0x0f); + } + v_samp*=8; + h_samp*=8; +@@ -3381,45 +3404,43 @@ + (unsigned char) ((height>>8) & 0xff); + buffer[*bufferoffset+6]= + (unsigned char) (height & 0xff); +- *bufferoffset+=strip[i+2]+2; +- i+=strip[i+2]+2; +- ++ *bufferoffset+=datalen+2; ++ /* insert a DRI marker */ + buffer[(*bufferoffset)++]=0xff; + buffer[(*bufferoffset)++]=0xdd; + buffer[(*bufferoffset)++]=0x00; + buffer[(*bufferoffset)++]=0x04; + buffer[(*bufferoffset)++]=(ri >> 8) & 0xff; + buffer[(*bufferoffset)++]= ri & 0xff; +- } else { +- i+=strip[i+2]+2; + } + break; +- case 0xc4: +- case 0xdb: +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); +- *bufferoffset+=strip[i+2]+2; +- i+=strip[i+2]+2; ++ case 0xc4: /* DHT */ ++ case 0xdb: /* DQT */ ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); ++ *bufferoffset+=datalen+2; + break; +- case 0xda: ++ case 0xda: /* SOS */ + if(no==0){ +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); +- *bufferoffset+=strip[i+2]+2; +- i+=strip[i+2]+2; ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); ++ *bufferoffset+=datalen+2; + } else { + buffer[(*bufferoffset)++]=0xff; + buffer[(*bufferoffset)++]= + (unsigned char)(0xd0 | ((no-1)%8)); +- i+=strip[i+2]+2; + } +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), (*striplength)-i-1); +- *bufferoffset+=(*striplength)-i-1; ++ i += datalen + 1; ++ /* copy remainder of strip */ ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i]), *striplength - i); ++ *bufferoffset+= *striplength - i; + return(1); + default: +- i+=strip[i+2]+2; ++ /* ignore any other marker */ ++ break; + } ++ i += datalen + 1; + } +- + ++ /* failed to find SOS marker */ + return(0); + } + #endif diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-1961.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-1961.patch new file mode 100644 index 000000000..0ea9b52e3 --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-CVE-2013-1961.patch @@ -0,0 +1,759 @@ +diff -Naur tiff-4.0.3.orig/contrib/dbs/xtiff/xtiff.c tiff-4.0.3/contrib/dbs/xtiff/xtiff.c +--- tiff-4.0.3.orig/contrib/dbs/xtiff/xtiff.c 2010-06-08 14:55:15.000000000 -0400 ++++ tiff-4.0.3/contrib/dbs/xtiff/xtiff.c 2013-05-02 12:02:42.782287939 -0400 +@@ -512,9 +512,9 @@ + Arg args[1]; + + if (tfMultiPage) +- sprintf(buffer, "%s - page %d", fileName, tfDirectory); ++ snprintf(buffer, sizeof(buffer), "%s - page %d", fileName, tfDirectory); + else +- strcpy(buffer, fileName); ++ snprintf(buffer, sizeof(buffer), "%s", fileName); + XtSetArg(args[0], XtNlabel, buffer); + XtSetValues(labelWidget, args, 1); + } +diff -Naur tiff-4.0.3.orig/libtiff/tif_codec.c tiff-4.0.3/libtiff/tif_codec.c +--- tiff-4.0.3.orig/libtiff/tif_codec.c 2010-12-14 09:18:28.000000000 -0500 ++++ tiff-4.0.3/libtiff/tif_codec.c 2013-05-02 12:02:42.783287946 -0400 +@@ -108,7 +108,8 @@ + const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression); + char compression_code[20]; + +- sprintf( compression_code, "%d", tif->tif_dir.td_compression ); ++ snprintf(compression_code, sizeof(compression_code), "%d", ++ tif->tif_dir.td_compression ); + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "%s compression support is not configured", + c ? c->name : compression_code ); +diff -Naur tiff-4.0.3.orig/libtiff/tif_dirinfo.c tiff-4.0.3/libtiff/tif_dirinfo.c +--- tiff-4.0.3.orig/libtiff/tif_dirinfo.c 2012-08-19 12:56:34.000000000 -0400 ++++ tiff-4.0.3/libtiff/tif_dirinfo.c 2013-05-02 12:02:42.784287953 -0400 +@@ -711,7 +711,7 @@ + * note that this name is a special sign to TIFFClose() and + * _TIFFSetupFields() to free the field + */ +- sprintf(fld->field_name, "Tag %d", (int) tag); ++ snprintf(fld->field_name, 32, "Tag %d", (int) tag); + + return fld; + } +diff -Naur tiff-4.0.3.orig/tools/rgb2ycbcr.c tiff-4.0.3/tools/rgb2ycbcr.c +--- tiff-4.0.3.orig/tools/rgb2ycbcr.c 2011-05-31 13:03:16.000000000 -0400 ++++ tiff-4.0.3/tools/rgb2ycbcr.c 2013-05-02 12:02:42.785287961 -0400 +@@ -332,7 +332,8 @@ + TIFFSetField(out, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); + { char buf[2048]; + char *cp = strrchr(TIFFFileName(in), '/'); +- sprintf(buf, "YCbCr conversion of %s", cp ? cp+1 : TIFFFileName(in)); ++ snprintf(buf, sizeof(buf), "YCbCr conversion of %s", ++ cp ? cp+1 : TIFFFileName(in)); + TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, buf); + } + TIFFSetField(out, TIFFTAG_SOFTWARE, TIFFGetVersion()); +diff -Naur tiff-4.0.3.orig/tools/tiff2bw.c tiff-4.0.3/tools/tiff2bw.c +--- tiff-4.0.3.orig/tools/tiff2bw.c 2010-07-08 12:10:24.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2bw.c 2013-05-02 12:02:42.785287961 -0400 +@@ -205,7 +205,7 @@ + } + } + TIFFSetField(out, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK); +- sprintf(thing, "B&W version of %s", argv[optind]); ++ snprintf(thing, sizeof(thing), "B&W version of %s", argv[optind]); + TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing); + TIFFSetField(out, TIFFTAG_SOFTWARE, "tiff2bw"); + outbuf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out)); +diff -Naur tiff-4.0.3.orig/tools/tiff2pdf.c tiff-4.0.3/tools/tiff2pdf.c +--- tiff-4.0.3.orig/tools/tiff2pdf.c 2012-07-25 22:56:43.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2pdf.c 2013-05-02 12:02:42.788287983 -0400 +@@ -3609,7 +3609,9 @@ + char buffer[16]; + int buflen=0; + +- buflen=sprintf(buffer, "%%PDF-%u.%u ", t2p->pdf_majorversion&0xff, t2p->pdf_minorversion&0xff); ++ buflen = snprintf(buffer, sizeof(buffer), "%%PDF-%u.%u ", ++ t2p->pdf_majorversion&0xff, ++ t2p->pdf_minorversion&0xff); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t)"\n%\342\343\317\323\n", 7); + +@@ -3623,10 +3625,10 @@ + tsize_t t2p_write_pdf_obj_start(uint32 number, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + +- buflen=sprintf(buffer, "%lu", (unsigned long)number); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number); + written += t2pWriteFile(output, (tdata_t) buffer, buflen ); + written += t2pWriteFile(output, (tdata_t) " 0 obj\n", 7); + +@@ -3665,13 +3667,13 @@ + written += t2pWriteFile(output, (tdata_t) "/", 1); + for (i=0;i<namelen;i++){ + if ( ((unsigned char)name[i]) < 0x21){ +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + nextchar=1; + } + if ( ((unsigned char)name[i]) > 0x7E){ +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + nextchar=1; +@@ -3679,57 +3681,57 @@ + if (nextchar==0){ + switch (name[i]){ + case 0x23: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x25: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x28: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x29: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x2F: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x3C: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x3E: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x5B: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x5D: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x7B: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x7D: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; +@@ -3844,14 +3846,14 @@ + tsize_t t2p_write_pdf_stream_dict(tsize_t len, uint32 number, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "/Length ", 8); + if(len!=0){ + written += t2p_write_pdf_stream_length(len, output); + } else { +- buflen=sprintf(buffer, "%lu", (unsigned long)number); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); + } +@@ -3892,10 +3894,10 @@ + tsize_t t2p_write_pdf_stream_length(tsize_t len, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + +- buflen=sprintf(buffer, "%lu", (unsigned long)len); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)len); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n", 1); + +@@ -3909,7 +3911,7 @@ + tsize_t t2p_write_pdf_catalog(T2P* t2p, TIFF* output) + { + tsize_t written = 0; +- char buffer[16]; ++ char buffer[32]; + int buflen = 0; + + written += t2pWriteFile(output, +@@ -3948,7 +3950,6 @@ + written += t2p_write_pdf_string(t2p->pdf_datetime, output); + } + written += t2pWriteFile(output, (tdata_t) "\n/Producer ", 11); +- _TIFFmemset((tdata_t)buffer, 0x00, sizeof(buffer)); + snprintf(buffer, sizeof(buffer), "libtiff / tiff2pdf - %d", TIFFLIB_VERSION); + written += t2p_write_pdf_string(buffer, output); + written += t2pWriteFile(output, (tdata_t) "\n", 1); +@@ -4089,7 +4090,7 @@ + { + tsize_t written=0; + tdir_t i=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + int page=0; +@@ -4097,7 +4098,7 @@ + (tdata_t) "<< \n/Type /Pages \n/Kids [ ", 26); + page = t2p->pdf_pages+1; + for (i=0;i<t2p->tiff_pagecount;i++){ +- buflen=sprintf(buffer, "%d", page); ++ buflen=snprintf(buffer, sizeof(buffer), "%d", page); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); + if ( ((i+1)%8)==0 ) { +@@ -4112,8 +4113,7 @@ + } + } + written += t2pWriteFile(output, (tdata_t) "] \n/Count ", 10); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%d", t2p->tiff_pagecount); ++ buflen=snprintf(buffer, sizeof(buffer), "%d", t2p->tiff_pagecount); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " \n>> \n", 6); + +@@ -4128,28 +4128,28 @@ + + unsigned int i=0; + tsize_t written=0; +- char buffer[16]; ++ char buffer[256]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "<<\n/Type /Page \n/Parent ", 24); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_pages); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_pages); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); + written += t2pWriteFile(output, (tdata_t) "/MediaBox [", 11); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x1); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y1); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x2); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x2); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y2); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y2); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "] \n", 3); + written += t2pWriteFile(output, (tdata_t) "/Contents ", 10); +- buflen=sprintf(buffer, "%lu", (unsigned long)(object + 1)); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(object + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); + written += t2pWriteFile(output, (tdata_t) "/Resources << \n", 15); +@@ -4157,15 +4157,13 @@ + written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12); + for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount;i++){ + written += t2pWriteFile(output, (tdata_t) "/Im", 3); +- buflen = sprintf(buffer, "%u", t2p->pdf_page+1); ++ buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "_", 1); +- buflen = sprintf(buffer, "%u", i+1); ++ buflen = snprintf(buffer, sizeof(buffer), "%u", i+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen = sprintf( +- buffer, +- "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4177,12 +4175,10 @@ + } else { + written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12); + written += t2pWriteFile(output, (tdata_t) "/Im", 3); +- buflen = sprintf(buffer, "%u", t2p->pdf_page+1); ++ buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen = sprintf( +- buffer, +- "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4191,9 +4187,7 @@ + if(t2p->tiff_transferfunctioncount != 0) { + written += t2pWriteFile(output, (tdata_t) "/ExtGState <<", 13); + t2pWriteFile(output, (tdata_t) "/GS1 ", 5); +- buflen = sprintf( +- buffer, +- "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(object + 3)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4566,7 +4560,7 @@ + if(t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount>0){ + for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount; i++){ + box=t2p->tiff_tiles[t2p->pdf_page].tiles_tiles[i].tile_box; +- buflen=sprintf(buffer, ++ buflen=snprintf(buffer, sizeof(buffer), + "q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d_%ld Do Q\n", + t2p->tiff_transferfunctioncount?"/GS1 gs ":"", + box.mat[0], +@@ -4581,7 +4575,7 @@ + } + } else { + box=t2p->pdf_imagebox; +- buflen=sprintf(buffer, ++ buflen=snprintf(buffer, sizeof(buffer), + "q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d Do Q\n", + t2p->tiff_transferfunctioncount?"/GS1 gs ":"", + box.mat[0], +@@ -4606,59 +4600,48 @@ + TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2p_write_pdf_stream_dict(0, t2p->pdf_xrefcount+1, output); + written += t2pWriteFile(output, + (tdata_t) "/Type /XObject \n/Subtype /Image \n/Name /Im", + 42); +- buflen=sprintf(buffer, "%u", t2p->pdf_page+1); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + if(tile != 0){ + written += t2pWriteFile(output, (tdata_t) "_", 1); +- buflen=sprintf(buffer, "%lu", (unsigned long)tile); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)tile); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } + written += t2pWriteFile(output, (tdata_t) "\n/Width ", 8); +- _TIFFmemset((tdata_t)buffer, 0x00, 16); + if(tile==0){ +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_width); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_width); + } else { + if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){ +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth); + } else { +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth); + } + } + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n/Height ", 9); +- _TIFFmemset((tdata_t)buffer, 0x00, 16); + if(tile==0){ +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_length); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_length); + } else { + if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){ +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength); + } else { +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength); + } + } + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n/BitsPerComponent ", 19); +- _TIFFmemset((tdata_t)buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n/ColorSpace ", 13); + written += t2p_write_pdf_xobject_cs(t2p, output); +@@ -4702,11 +4685,10 @@ + t2p->pdf_colorspace ^= T2P_CS_PALETTE; + written += t2p_write_pdf_xobject_cs(t2p, output); + t2p->pdf_colorspace |= T2P_CS_PALETTE; +- buflen=sprintf(buffer, "%u", (0x0001 << t2p->tiff_bitspersample)-1 ); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", (0x0001 << t2p->tiff_bitspersample)-1 ); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_palettecs ); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_palettecs ); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ]\n", 7); + return(written); +@@ -4740,10 +4722,10 @@ + X_W /= Y_W; + Z_W /= Y_W; + Y_W = 1.0F; +- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Range ", 7); +- buflen=sprintf(buffer, "[%d %d %d %d] \n", ++ buflen=snprintf(buffer, sizeof(buffer), "[%d %d %d %d] \n", + t2p->pdf_labrange[0], + t2p->pdf_labrange[1], + t2p->pdf_labrange[2], +@@ -4759,26 +4741,26 @@ + tsize_t t2p_write_pdf_transfer(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "<< /Type /ExtGState \n/TR ", 25); + if(t2p->tiff_transferfunctioncount == 1){ +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); + } else { + written += t2pWriteFile(output, (tdata_t) "[ ", 2); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 2)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 3)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4800,7 +4782,7 @@ + written += t2pWriteFile(output, (tdata_t) "/FunctionType 0 \n", 17); + written += t2pWriteFile(output, (tdata_t) "/Domain [0.0 1.0] \n", 19); + written += t2pWriteFile(output, (tdata_t) "/Range [0.0 1.0] \n", 18); +- buflen=sprintf(buffer, "/Size [%u] \n", (1<<t2p->tiff_bitspersample)); ++ buflen=snprintf(buffer, sizeof(buffer), "/Size [%u] \n", (1<<t2p->tiff_bitspersample)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/BitsPerSample 16 \n", 19); + written += t2p_write_pdf_stream_dict(((tsize_t)1)<<(t2p->tiff_bitspersample+1), 0, output); +@@ -4827,7 +4809,7 @@ + tsize_t t2p_write_pdf_xobject_calcs(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[128]; ++ char buffer[256]; + int buflen=0; + + float X_W=0.0; +@@ -4895,16 +4877,16 @@ + written += t2pWriteFile(output, (tdata_t) "<< \n", 4); + if(t2p->pdf_colorspace & T2P_CS_CALGRAY){ + written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12); +- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Gamma 2.2 \n", 12); + } + if(t2p->pdf_colorspace & T2P_CS_CALRGB){ + written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12); +- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Matrix ", 8); +- buflen=sprintf(buffer, "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", + X_R, Y_R, Z_R, + X_G, Y_G, Z_G, + X_B, Y_B, Z_B); +@@ -4923,11 +4905,11 @@ + tsize_t t2p_write_pdf_xobject_icccs(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "[/ICCBased ", 11); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_icccs); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_icccs); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R] \n", 7); + +@@ -4937,11 +4919,11 @@ + tsize_t t2p_write_pdf_xobject_icccs_dict(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "/N ", 3); +- buflen=sprintf(buffer, "%u \n", t2p->tiff_samplesperpixel); ++ buflen=snprintf(buffer, sizeof(buffer), "%u \n", t2p->tiff_samplesperpixel); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Alternate ", 11); + t2p->pdf_colorspace ^= T2P_CS_ICCBASED; +@@ -5006,7 +4988,7 @@ + tsize_t t2p_write_pdf_xobject_stream_filter(ttile_t tile, T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + if(t2p->pdf_compression==T2P_COMPRESS_NONE){ +@@ -5021,41 +5003,33 @@ + written += t2pWriteFile(output, (tdata_t) "<< /K -1 ", 9); + if(tile==0){ + written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_width); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_length); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } else { + if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){ + written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } else { + written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } + if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){ + written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } else { + written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } +@@ -5082,21 +5056,17 @@ + if(t2p->pdf_compressionquality%100){ + written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13); + written += t2pWriteFile(output, (tdata_t) "<< /Predictor ", 14); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->pdf_compressionquality%100); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_compressionquality%100); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /Columns ", 10); +- _TIFFmemset(buffer, 0x00, 16); +- buflen = sprintf(buffer, "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_width); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /Colors ", 9); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->tiff_samplesperpixel); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_samplesperpixel); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /BitsPerComponent ", 19); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) ">>\n", 3); + } +@@ -5116,16 +5086,16 @@ + tsize_t t2p_write_pdf_xreftable(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[21]; ++ char buffer[64]; + int buflen=0; + uint32 i=0; + + written += t2pWriteFile(output, (tdata_t) "xref\n0 ", 7); +- buflen=sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " \n0000000000 65535 f \n", 22); + for (i=0;i<t2p->pdf_xrefcount;i++){ +- sprintf(buffer, "%.10lu 00000 n \n", ++ snprintf(buffer, sizeof(buffer), "%.10lu 00000 n \n", + (unsigned long)t2p->pdf_xrefoffsets[i]); + written += t2pWriteFile(output, (tdata_t) buffer, 20); + } +@@ -5149,17 +5119,14 @@ + snprintf(t2p->pdf_fileid + i, 9, "%.8X", rand()); + + written += t2pWriteFile(output, (tdata_t) "trailer\n<<\n/Size ", 17); +- buflen = sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount+1)); ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount+1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) "\n/Root ", 7); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_catalog); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_catalog); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) " 0 R \n/Info ", 12); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_info); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_info); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) " 0 R \n/ID[<", 11); + written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, + sizeof(t2p->pdf_fileid) - 1); +@@ -5167,9 +5134,8 @@ + written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, + sizeof(t2p->pdf_fileid) - 1); + written += t2pWriteFile(output, (tdata_t) ">]\n>>\nstartxref\n", 16); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_startxref); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_startxref); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) "\n%%EOF\n", 7); + + return(written); +diff -Naur tiff-4.0.3.orig/tools/tiff2ps.c tiff-4.0.3/tools/tiff2ps.c +--- tiff-4.0.3.orig/tools/tiff2ps.c 2011-05-31 13:10:18.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2ps.c 2013-05-02 12:02:42.789287990 -0400 +@@ -1781,8 +1781,8 @@ + imageOp = "imagemask"; + + (void)strcpy(im_x, "0"); +- (void)sprintf(im_y, "%lu", (long) h); +- (void)sprintf(im_h, "%lu", (long) h); ++ (void)snprintf(im_y, sizeof(im_y), "%lu", (long) h); ++ (void)snprintf(im_h, sizeof(im_h), "%lu", (long) h); + tile_width = w; + tile_height = h; + if (TIFFIsTiled(tif)) { +@@ -1803,7 +1803,7 @@ + } + if (tile_height < h) { + fputs("/im_y 0 def\n", fd); +- (void)sprintf(im_y, "%lu im_y sub", (unsigned long) h); ++ (void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h); + } + } else { + repeat_count = tf_numberstrips; +@@ -1815,7 +1815,7 @@ + fprintf(fd, "/im_h %lu def\n", + (unsigned long) tile_height); + (void)strcpy(im_h, "im_h"); +- (void)sprintf(im_y, "%lu im_y sub", (unsigned long) h); ++ (void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h); + } + } + +diff -Naur tiff-4.0.3.orig/tools/tiffcrop.c tiff-4.0.3/tools/tiffcrop.c +--- tiff-4.0.3.orig/tools/tiffcrop.c 2010-12-14 09:18:28.000000000 -0500 ++++ tiff-4.0.3/tools/tiffcrop.c 2013-05-02 12:02:42.791288005 -0400 +@@ -2077,7 +2077,7 @@ + return 1; + } + +- sprintf (filenum, "-%03d%s", findex, export_ext); ++ snprintf(filenum, sizeof(filenum), "-%03d%s", findex, export_ext); + filenum[14] = '\0'; + strncat (exportname, filenum, 15); + } +@@ -2230,8 +2230,8 @@ + + /* dump.infilename is guaranteed to be NUL termimated and have 20 bytes + fewer than PATH_MAX */ +- memset (temp_filename, '\0', PATH_MAX + 1); +- sprintf (temp_filename, "%s-read-%03d.%s", dump.infilename, dump_images, ++ snprintf(temp_filename, sizeof(temp_filename), "%s-read-%03d.%s", ++ dump.infilename, dump_images, + (dump.format == DUMP_TEXT) ? "txt" : "raw"); + if ((dump.infile = fopen(temp_filename, dump.mode)) == NULL) + { +@@ -2249,8 +2249,8 @@ + + /* dump.outfilename is guaranteed to be NUL termimated and have 20 bytes + fewer than PATH_MAX */ +- memset (temp_filename, '\0', PATH_MAX + 1); +- sprintf (temp_filename, "%s-write-%03d.%s", dump.outfilename, dump_images, ++ snprintf(temp_filename, sizeof(temp_filename), "%s-write-%03d.%s", ++ dump.outfilename, dump_images, + (dump.format == DUMP_TEXT) ? "txt" : "raw"); + if ((dump.outfile = fopen(temp_filename, dump.mode)) == NULL) + { +diff -Naur tiff-4.0.3.orig/tools/tiffdither.c tiff-4.0.3/tools/tiffdither.c +--- tiff-4.0.3.orig/tools/tiffdither.c 2010-03-10 13:56:50.000000000 -0500 ++++ tiff-4.0.3/tools/tiffdither.c 2013-05-02 12:02:42.792288013 -0400 +@@ -260,7 +260,7 @@ + TIFFSetField(out, TIFFTAG_FILLORDER, fillorder); + else + CopyField(TIFFTAG_FILLORDER, shortv); +- sprintf(thing, "Dithered B&W version of %s", argv[optind]); ++ snprintf(thing, sizeof(thing), "Dithered B&W version of %s", argv[optind]); + TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing); + CopyField(TIFFTAG_PHOTOMETRIC, shortv); + CopyField(TIFFTAG_ORIENTATION, shortv); diff --git a/extra/libtiff/tiff-4.0.3-libjpeg-turbo.patch b/extra/libtiff/tiff-4.0.3-libjpeg-turbo.patch new file mode 100644 index 000000000..92cff7ea4 --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-libjpeg-turbo.patch @@ -0,0 +1,122 @@ +Back-port upstream patch to avoid assuming quite so much about what libjpeg +will return. Needed because libjpeg-turbo with the jpeg8 API broke the +expectations of the previous coding. + + +diff -Naur tiff-4.0.3.orig/test/raw_decode.c tiff-4.0.3/test/raw_decode.c +--- tiff-4.0.3.orig/test/raw_decode.c 2012-07-06 13:05:16.000000000 -0400 ++++ tiff-4.0.3/test/raw_decode.c 2012-12-19 13:04:37.609738276 -0500 +@@ -71,33 +71,54 @@ + return 1; + } + +-static int check_rgb_pixel( int pixel, int red, int green, int blue, unsigned char *buffer ) { ++static int check_rgb_pixel( int pixel, ++ int min_red, int max_red, ++ int min_green, int max_green, ++ int min_blue, int max_blue, ++ unsigned char *buffer ) { + unsigned char *rgb = buffer + 3 * pixel; + +- if( rgb[0] == red && rgb[1] == green && rgb[2] == blue ) { ++ if( rgb[0] >= min_red && rgb[0] <= max_red && ++ rgb[1] >= min_green && rgb[1] <= max_green && ++ rgb[2] >= min_blue && rgb[2] <= max_blue ) { + return 0; + } + + fprintf( stderr, "Pixel %d did not match expected results.\n", pixel ); +- fprintf( stderr, "Expect: %3d %3d %3d\n", red, green, blue ); +- fprintf( stderr, " Got: %3d %3d %3d\n", rgb[0], rgb[1], rgb[2] ); ++ fprintf( stderr, "Got R=%d (expected %d..%d), G=%d (expected %d..%d), B=%d (expected %d..%d)\n", ++ rgb[0], min_red, max_red, ++ rgb[1], min_green, max_green, ++ rgb[2], min_blue, max_blue ); + return 1; + } + +-static int check_rgba_pixel( int pixel, int red, int green, int blue, int alpha, uint32 *buffer ) { ++static int check_rgba_pixel( int pixel, ++ int min_red, int max_red, ++ int min_green, int max_green, ++ int min_blue, int max_blue, ++ int min_alpha, int max_alpha, ++ uint32 *buffer ) { + /* RGBA images are upside down - adjust for normal ordering */ + int adjusted_pixel = pixel % 128 + (127 - (pixel/128)) * 128; + uint32 rgba = buffer[adjusted_pixel]; + +- if( TIFFGetR(rgba) == (uint32) red && TIFFGetG(rgba) == (uint32) green && +- TIFFGetB(rgba) == (uint32) blue && TIFFGetA(rgba) == (uint32) alpha ) { ++ if( TIFFGetR(rgba) >= (uint32) min_red && ++ TIFFGetR(rgba) <= (uint32) max_red && ++ TIFFGetG(rgba) >= (uint32) min_green && ++ TIFFGetG(rgba) <= (uint32) max_green && ++ TIFFGetB(rgba) >= (uint32) min_blue && ++ TIFFGetB(rgba) <= (uint32) max_blue && ++ TIFFGetA(rgba) >= (uint32) min_alpha && ++ TIFFGetA(rgba) <= (uint32) max_alpha ) { + return 0; + } + + fprintf( stderr, "Pixel %d did not match expected results.\n", pixel ); +- fprintf( stderr, "Expect: %3d %3d %3d %3d\n", red, green, blue, alpha ); +- fprintf( stderr, " Got: %3d %3d %3d %3d\n", +- TIFFGetR(rgba), TIFFGetG(rgba), TIFFGetB(rgba), TIFFGetA(rgba) ); ++ fprintf( stderr, "Got R=%d (expected %d..%d), G=%d (expected %d..%d), B=%d (expected %d..%d), A=%d (expected %d..%d)\n", ++ TIFFGetR(rgba), min_red, max_red, ++ TIFFGetG(rgba), min_green, max_green, ++ TIFFGetB(rgba), min_blue, max_blue, ++ TIFFGetA(rgba), min_alpha, max_alpha ); + return 1; + } + +@@ -191,15 +212,17 @@ + return 1; + } + +-#if JPEG_LIB_VERSION >= 70 +- pixel_status |= check_rgb_pixel( 0, 18, 0, 41, buffer ); +- pixel_status |= check_rgb_pixel( 64, 0, 0, 0, buffer ); +- pixel_status |= check_rgb_pixel( 512, 5, 34, 196, buffer ); +-#else +- pixel_status |= check_rgb_pixel( 0, 15, 0, 18, buffer ); +- pixel_status |= check_rgb_pixel( 64, 0, 0, 2, buffer ); +- pixel_status |= check_rgb_pixel( 512, 6, 36, 182, buffer ); +-#endif ++ /* ++ * JPEG decoding is inherently inexact, so we can't test for exact ++ * pixel values. (Well, if we knew exactly which libjpeg version ++ * we were using, and with what settings, we could expect specific ++ * values ... but it's not worth the trouble to keep track of.) ++ * Hence, use ranges of expected values. The ranges may need to be ++ * widened over time as more versions of libjpeg appear. ++ */ ++ pixel_status |= check_rgb_pixel( 0, 15, 18, 0, 0, 18, 41, buffer ); ++ pixel_status |= check_rgb_pixel( 64, 0, 0, 0, 0, 0, 2, buffer ); ++ pixel_status |= check_rgb_pixel( 512, 5, 6, 34, 36, 182, 196, buffer ); + + free( buffer ); + +@@ -224,15 +247,12 @@ + * accomplish it from the YCbCr subsampled buffer ourselves in which + * case the results may be subtly different but similar. + */ +-#if JPEG_LIB_VERSION >= 70 +- pixel_status |= check_rgba_pixel( 0, 18, 0, 41, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 64, 0, 0, 0, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 512, 5, 34, 196, 255, rgba_buffer ); +-#else +- pixel_status |= check_rgba_pixel( 0, 15, 0, 18, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 64, 0, 0, 2, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 512, 6, 36, 182, 255, rgba_buffer ); +-#endif ++ pixel_status |= check_rgba_pixel( 0, 15, 18, 0, 0, 18, 41, 255, 255, ++ rgba_buffer ); ++ pixel_status |= check_rgba_pixel( 64, 0, 0, 0, 0, 0, 2, 255, 255, ++ rgba_buffer ); ++ pixel_status |= check_rgba_pixel( 512, 5, 6, 34, 36, 182, 196, 255, 255, ++ rgba_buffer ); + + free( rgba_buffer ); + TIFFClose(tif); diff --git a/extra/libtiff/tiff-4.0.3-tiff2pdf-colors.patch b/extra/libtiff/tiff-4.0.3-tiff2pdf-colors.patch new file mode 100644 index 000000000..a503444b1 --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-tiff2pdf-colors.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/145055 + +http://build.opensuse.org/package/view_file?file=tiff-4.0.2-tiff2pdf-colors.patch&package=tiff&project=openSUSE%3AFactory + +--- tools/tiff2pdf.c ++++ tools/tiff2pdf.c +@@ -4991,7 +4991,7 @@ + + if(t2p->tiff_photometric != PHOTOMETRIC_YCBCR) { + written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13); +- written += t2pWriteFile(output, (tdata_t) "<< /ColorTransform 0 >>\n", 24); ++ written += t2pWriteFile(output, (tdata_t) "<< /ColorTransform 1 >>\n", 24); + } + break; + #endif diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 728f89d57..b00864a6e 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181124 2013-03-31 19:16:50Z stephane $ +# $Id: PKGBUILD 186514 2013-05-28 09:58:04Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar -pkgver=0.16.9 -pkgrel=2 +pkgver=0.16.10 +pkgrel=1 epoch=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" @@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2') makedepends=('boost') options=('!libtool' '!emptydirs') source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('4335c8b275f041d6d34a493b21f2d7234ffca34b') +sha1sums=('8b24442132e52f8765c79b20ffdea8b33bc5aa42') build() { cd $pkgname-$pkgver diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD index 9384d2a88..4a107f84c 100644 --- a/extra/libwps/PKGBUILD +++ b/extra/libwps/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183268 2013-04-20 07:13:33Z andyrtr $ +# $Id: PKGBUILD 186454 2013-05-26 18:05:27Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Robert McCathie <archaur at rmcc dot com dot au> pkgname=libwps -pkgver=0.2.8 +pkgver=0.2.9 pkgrel=1 pkgdesc="a Microsoft Works file word processor format import filter library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('libwpd>=0.9.6') makedepends=('boost') options=(!libtool) source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2") -md5sums=('78196c097db366fac66841d032b1ddac') +md5sums=('46eb0e7f213ad61bd5dee0c494132cb0') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libxau/PKGBUILD b/extra/libxau/PKGBUILD index be159570b..939afbe5b 100644 --- a/extra/libxau/PKGBUILD +++ b/extra/libxau/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 152650 2012-03-07 19:44:52Z andyrtr $ +# $Id: PKGBUILD 186350 2013-05-25 08:48:08Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxau -pkgver=1.0.7 -pkgrel=1.1 +pkgver=1.0.8 +pkgrel=1 pkgdesc="X11 authorisation library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -13,7 +14,7 @@ makedepends=('pkgconfig') license=('custom') options=('!libtool') source=(${url}/releases/individual/lib/libXau-${pkgver}.tar.bz2) -sha1sums=('29c47207fd246425b906f525b2220235ce4cd0f6') +sha256sums=('fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2') build() { cd "${srcdir}/libXau-${pkgver}" diff --git a/extra/libxfixes/PKGBUILD b/extra/libxfixes/PKGBUILD index 8801230ba..c4fc9f965 100644 --- a/extra/libxfixes/PKGBUILD +++ b/extra/libxfixes/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 151418 2012-02-26 10:42:43Z pierre $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186580 2013-05-29 15:23:58Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxfixes -pkgver=5.0 -pkgrel=2.1 +pkgver=5.0.1 +pkgrel=1 pkgdesc="X11 miscellaneous 'fixes' extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libx11' 'fixesproto>=5.0') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2") -sha1sums=('3e4d374e9026111a04cd669d4b3434273fc34fe0') +sha256sums=('63bec085084fa3caaee5180490dd871f1eb2020ba9e9b39a30f93693ffc34767') build() { cd "${srcdir}/libXfixes-${pkgver}" diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD index 1e87777ff..ea2478447 100644 --- a/extra/licq/PKGBUILD +++ b/extra/licq/PKGBUILD @@ -1,32 +1,39 @@ -# $Id: PKGBUILD 181125 2013-03-31 19:16:53Z stephane $ +# $Id: PKGBUILD 186068 2013-05-20 21:46:39Z foutrelis $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=licq pkgver=1.7.1 -pkgrel=3 -pkgdesc="Advanced graphical ICQ clone and more for Unix" +pkgrel=4 +pkgdesc="Advanced graphical ICQ clone and more for Unix" arch=('i686' 'x86_64' 'mips64el') url="http://www.licq.org" license=('GPL') depends=('boost-libs' 'gpgme' 'libxss' 'qt4') -makedepends=('cmake' 'boost') +makedepends=('cmake' 'boost' 'optipng') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2) md5sums=('701e57efedc2b7ece64c3d2d2e9f9e16') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + mkdir {,plugins/qt4-gui/}build + + # Fix invalid PNG images to work with libpng 1.6 + # https://github.com/licq-im/licq/pull/32 + optipng -quiet -force -fix plugins/qt4-gui/share/skins/Mirabilis/*.png +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" # licq - mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX=/usr .. make # qt4-gui - cd ../plugins/qt4-gui - mkdir build - cd build + cd ../plugins/qt4-gui/build cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake" .. make } diff --git a/community/llvm-amdgpu-snapshot/PKGBUILD b/extra/llvm-amdgpu-snapshot/PKGBUILD index cd96dcb81..cdac9521c 100644 --- a/community/llvm-amdgpu-snapshot/PKGBUILD +++ b/extra/llvm-amdgpu-snapshot/PKGBUILD @@ -1,4 +1,5 @@ -# $Id: PKGBUILD 90882 2013-05-15 07:40:34Z lcarlier $ +# $Id: PKGBUILD 186322 2013-05-24 18:14:34Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Roberto Alsina <ralsina@kde.org> @@ -9,13 +10,13 @@ pkgbase=llvm-amdgpu-snapshot pkgname=('llvm-amdgpu-snapshot' 'llvm-amdgpu-lib-snapshot') pkgver=20130403 -pkgrel=2 +pkgrel=3 pkgdesc='Low Level Virtual Machine with AMDGPU enabled to build r600g shader llvm support' arch=('i686' 'x86_64') url="http://llvm.org" license=('custom:University of Illinois/NCSA Open Source License') makedepends=('libffi' 'python2' 'ocaml') -source=(ftp://ftp.archlinux.org/other/community/llvm-amdgpu/llvm-amdgpu-master.${pkgver}.tar.gz) +source=(ftp://ftp.archlinux.org/other/packages/llvm-amdgpu/llvm-amdgpu-master.${pkgver}.tar.gz) md5sums=('4baa7b8da9eff4811952b6f855c141ca') prepare() { diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index 06f0fe0a9..a68e230c5 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185203 2013-05-12 06:52:48Z eric $ +# $Id: PKGBUILD 186563 2013-05-29 04:09:51Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lm_sensors -pkgver=3.3.3 -pkgrel=3 +pkgver=3.3.4 +pkgrel=1 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64' 'mips64el') url="http://www.lm-sensors.org/" @@ -16,7 +16,7 @@ options=('!emptydirs') source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \ healthd healthd.conf fancontrol.service sensord.service healthd.service \ linux_3.0.patch lm_sensors-fancontrol.patch) -sha1sums=('b55c06f425993e42f13553f204066c446da36fd3' +sha1sums=('4e62538ca99973ff505f2eeb5b841bb402e996d8' 'SKIP' '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5' '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc' @@ -24,7 +24,7 @@ sha1sums=('b55c06f425993e42f13553f204066c446da36fd3' 'cea1ff07374a784cc4be1d28dc6c80641fcae99d' 'd72ec328e9303acef86342483b6f8537de6117d9' '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c' - 'd3e419b4019451fb039ae3d3b8e0ec55121b9f17') + 'b0bc977348610d6a008d75a43f65800251c4c9f7') prepare() { cd ${pkgname}-${pkgver} diff --git a/extra/lm_sensors/lm_sensors-fancontrol.patch b/extra/lm_sensors/lm_sensors-fancontrol.patch index e58891695..c42d7b870 100644 --- a/extra/lm_sensors/lm_sensors-fancontrol.patch +++ b/extra/lm_sensors/lm_sensors-fancontrol.patch @@ -4,8 +4,8 @@ cd $DIR # Check for configuration change --if [ -z "$DEVPATH" -o -z "$DEVNAME" ] -+if [ -z "$DEVPATH" ] || [ -z "$DEVNAME" ] +-if [ "$DIR" != "/" ] && [ -z "$DEVPATH" -o -z "$DEVNAME" ] ++if [[ "$DIR" != "/" && ( -z "$DEVPATH" || -z "$DEVNAME" ) ]] then echo "Configuration is too old, please run pwmconfig again" >&2 exit 1 diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 2a10ef5b1..81e62cbbc 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180833 2013-03-26 15:59:12Z bpiotrowski $ +# $Id: PKGBUILD 186282 2013-05-23 19:15:33Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') -pkgver=5.5.30 -pkgrel=2 +pkgver=5.5.31 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='http://mariadb.org/' @@ -14,7 +14,7 @@ source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunt mariadb.service mariadb-post.sh mariadb-tmpfile.conf) -sha256sums=('64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f' +sha256sums=('70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28' 'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334' '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd' '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd') @@ -106,7 +106,7 @@ package_mariadb() { pkgdesc='Fast SQL database server, drop-in replacement for MySQL' backup=('etc/mysql/my.cnf') install=mariadb.install - depends=('mariadb-clients') + depends=('mariadb-clients' 'inetutils') conflicts=('mysql' 'mytop') provides=("mysql=$pkgver" 'mytop') optdepends=('perl-dbd-mysql: mytop dependency' diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 83648b26f..013152b1c 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184295 2013-05-05 17:57:33Z bpiotrowski $ +# $Id: PKGBUILD 186351 2013-05-25 08:49:44Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('mesa' 'mesa-libgl') -pkgver=9.1.2 +pkgver=9.1.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' @@ -19,7 +19,7 @@ options=('!libtool') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 #ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing LICENSE) -md5sums=('df2aab86ff4a510ce5b0d074caa0a59f' +md5sums=('952ccd03547ed72333b64e1746cf8ada' '5c65a0fe315dd347e09b1f2826a1df5a') build() { @@ -43,6 +43,7 @@ build() { --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ + --with-llvm-shared-libs \ --enable-gallium-llvm \ --enable-egl \ --enable-gallium-egl \ @@ -70,7 +71,7 @@ build() { package_ati-dri() { pkgdesc="Mesa drivers for AMD/ATI Radeon" - depends=("mesa-libgl=${pkgver}") + depends=("mesa-libgl=${pkgver}" 'llvm-amdgpu-lib-snapshot') conflicts=('xf86-video-ati<6.9.0-6') install -m755 -d ${pkgdir}/usr/lib/vdpau/ @@ -99,7 +100,7 @@ package_intel-dri() { package_nouveau-dri() { pkgdesc="Mesa drivers for Nouveau" - depends=("mesa-libgl=${pkgver}") + depends=("mesa-libgl=${pkgver}" 'llvm-amdgpu-lib-snapshot') install -m755 -d ${pkgdir}/usr/lib/vdpau/ mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/ @@ -116,7 +117,7 @@ package_nouveau-dri() { package_svga-dri() { pkgdesc="Gallium3D VMware guest GL driver" - depends=('gcc-libs' 'libdrm' 'expat' 'libffi') + depends=('gcc-libs' 'libdrm' 'expat' 'libffi' 'llvm-amdgpu-lib-snapshot') install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ @@ -135,7 +136,7 @@ package_mesa() { provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') - [ "$CARCH" != "mips64el" ] && depends+=('libvdpau') + [ "$CARCH" != "mips64el" ] && depends+=('libvdpau' 'llvm-amdgpu-lib-snapshot') mv -v ${srcdir}/fakeinstall/* ${pkgdir} # rename libgl.so to not conflict with blobs - may break gl.pc ? diff --git a/extra/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD new file mode 100644 index 000000000..ed7751ba4 --- /dev/null +++ b/extra/misdnuser/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 186032 2013-05-20 17:17:10Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=misdnuser +pkgver=2.0.17_20120917 +pkgrel=2 +pkgdesc="Tools and library for mISDN" +arch=('i686' 'x86_64') +url="http://www.misdn.org" +license=('GPL') +depends=('isdn4k-utils' 'spandsp') +backup=('etc/capi20.conf') +options=('!makeflags' '!libtool' '!strip') +source=(ftp://ftp.archlinux.org/other/misdnuser/${pkgname}-${pkgver}.tar.gz + mISDNcapid.service + c2faxrecv-mISDNcapid.service + mISDNcapid.conf + fix-compile-gcc48.patch) + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + # fix gcc48 compile error + patch -Np1 -i ${srcdir}/fix-compile-gcc48.patch +} + +build() { + # only enable for debugging! + #export CFLAGS+=" -g -O0" + #export CXXFLAGS+=" -g -O0" + cd ${srcdir}/${pkgname}-${pkgver} + make + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --enable-capi --enable-softdsp --with-mISDN_group=uucp + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + # fix udev rule + mkdir -p ${pkgdir}/usr/lib/udev/rules.d + mv ${pkgdir}/etc/udev/rules.d/45-misdn.rules ${pkgdir}/usr/lib/udev/rules.d + rm -r ${pkgdir}/etc/udev/ + # add systemd files + install -D -m644 ${srcdir}/mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/mISDNcapid.service + # mISDNcapid: + # tends to crash on avmfritz card, add an extra systemd file for + # restarting the services until segfaults are fixed! + install -D -m644 ${srcdir}/c2faxrecv-mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/c2faxrecv-mISDNcapid.service + install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf +} +md5sums=('4cdb52f2c0ff1a1426573ac5ef09e9f8' + 'bfd47480a54b41394ba5cc3f53587130' + '32ead7f063e007c784aa883d441f33c2' + '42c3b46880a68c3883ee1ed00af34b45' + 'b291e9a04378decec33c420a62a5a4b7') diff --git a/extra/misdnuser/c2faxrecv-mISDNcapid.service b/extra/misdnuser/c2faxrecv-mISDNcapid.service new file mode 100644 index 000000000..7a98ca435 --- /dev/null +++ b/extra/misdnuser/c2faxrecv-mISDNcapid.service @@ -0,0 +1,11 @@ +[Unit] +Description=mISDN CAPI to fax receive +Requires=faxq.service mISDNcapid.service +After=faxq.service mISDNcapid.service + +[Service] +ExecStart=/usr/bin/c2faxrecv +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/misdnuser/fix-compile-gcc48.patch b/extra/misdnuser/fix-compile-gcc48.patch new file mode 100644 index 000000000..61f52d22e --- /dev/null +++ b/extra/misdnuser/fix-compile-gcc48.patch @@ -0,0 +1,15 @@ +X-Git-Url: http://misdn.eu/?p=projects%2FmISDNuser.git;a=blobdiff_plain;f=lib%2Flayer3%2Fq931.c;h=75716fe121a48a3c62fb785af85d856a688889bf;hp=705caf3e167bb5c50828c464151fcfe49af89e64;hb=ec4ac2763f737dc9100f9f4f9e91f4d7064a77b2;hpb=1dc4c24d27ed9c46e2fdbf7fb4b178e549a58e8d + +diff --git a/lib/layer3/q931.c b/lib/layer3/q931.c +index 705caf3..75716fe 100644 +--- a/lib/layer3/q931.c ++++ b/lib/layer3/q931.c +@@ -357,7 +357,7 @@ mi_encode_hlc(struct l3_msg *l3m, int hlc, int ehlc) + ie[1] = hlc & 0x7f; + + if (ehlc < 0) +- ie[1] | 0x80; ++ ie[1] |= 0x80; + else { + l = 3; + ie[2] = 0x80 | (ehlc & 0x7f); diff --git a/extra/misdnuser/mISDNcapid.conf b/extra/misdnuser/mISDNcapid.conf new file mode 100644 index 000000000..7607e262d --- /dev/null +++ b/extra/misdnuser/mISDNcapid.conf @@ -0,0 +1 @@ +D /var/run/mISDNcapid 0755 root root - diff --git a/extra/misdnuser/mISDNcapid.service b/extra/misdnuser/mISDNcapid.service new file mode 100644 index 000000000..53871dd95 --- /dev/null +++ b/extra/misdnuser/mISDNcapid.service @@ -0,0 +1,11 @@ +[Unit] +Description=mISDN CAPI daemon + +[Service] +Type=forking +ExecStart=/usr/bin/mISDNcapid +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/extra/mod_perl/PKGBUILD b/extra/mod_perl/PKGBUILD index d35ca0723..65437b6f4 100644 --- a/extra/mod_perl/PKGBUILD +++ b/extra/mod_perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160911 2012-06-06 19:20:20Z foutrelis $ +# $Id: PKGBUILD 186389 2013-05-26 09:24:48Z bluewind $ # Maintainer: # Contributor: Firmicus <francois.archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=mod_perl -pkgver=2.0.7 +pkgver=2.0.8 pkgrel=1 pkgdesc="Apache module that embeds the Perl interpreter within the server" arch=('i686' 'x86_64' 'mips64el') @@ -12,12 +12,12 @@ url="http://perl.apache.org/" license=('APACHE') depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid') options=('!emptydirs') -source=(http://perl.apache.org/dist/$pkgname-$pkgver.tar.gz +source=(http://apache.org/dist/perl/$pkgname-$pkgver.tar.gz mod_perl-2.0.6-nolfs.patch) -sha256sums=('53414be9db843054b927f23a35edb7b82d99e32e031b3cd81d5ff2473f51e3c6' +sha256sums=('35dc1b7a40a90a395ce88bba2df84f22289975f34d1757de6d715560c20a20e6' '5d1b6a051d847108b23b5dc06ea5885c37dd81d3a9156b69d179d95b5cf92f08') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # Patch from openSUSE to fix segfaults on i686 (FS#25008): @@ -25,6 +25,10 @@ build() { # FILE_OFFSET_BITS=64 because the conflict isn't real and causes the perl # structures to be invalid if only the apache flags are used patch -Np1 -i "$srcdir/mod_perl-2.0.6-nolfs.patch" +} + +build() { + cd "$srcdir/$pkgname-$pkgver" # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD index 4830eb61f..1a1200a8e 100644 --- a/extra/mono/PKGBUILD +++ b/extra/mono/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184799 2013-05-08 17:55:32Z bpiotrowski $ +# $Id: PKGBUILD 186332 2013-05-24 20:45:34Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Brice Carpentier <brice@dlfp.org> pkgname=mono -pkgver=2.10.9 +pkgver=3.0.7 pkgrel=1 pkgdesc="Free implementation of the .NET platform including runtime and compiler" arch=(i686 x86_64) @@ -16,14 +16,13 @@ provides=('monodoc') conflicts=('monodoc') source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 mono.binfmt.d) -md5sums=('bbbff9d3d0c36b904437ada36a27eb9e' +md5sums=('76ebec9c97347aac13d9f28fc58b347d' 'b9ef8a65fea497acf176cca16c1e2402') build() { cd "${srcdir}"/${pkgname}-${pkgver} # build mono - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-libgdiplus=installed + ./configure --prefix=/usr --sysconfdir=/etc make # build jay diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 7aaeb4c1f..e1eba8ade 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178505 2013-02-24 19:40:36Z daniel $ +# $Id: PKGBUILD 186330 2013-05-24 20:45:12Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=monodevelop -pkgver=4.0 +pkgver=4.0.8 pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" @@ -14,12 +14,12 @@ arch=('i686' 'x86_64') url="http://www.monodevelop.com" license=('GPL') depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('rsync') +makedepends=('rsync' 'git') options=(!makeflags) install=monodevelop.install -source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz monodevelop-core-addins.pc.in.patch) -md5sums=('811e09cbddc262d138fed1e119a52df7' +md5sums=('84a03fabcd3399807c7bf2c2027c87bf' '8466d032735130e37d4091a793a7966c') build() { @@ -30,13 +30,16 @@ build() { # fix location for MonoDevelop.Gettext.dll - breaks gdb build # patch -Np0 -i ${srcdir}/monodevelop-core-addins.pc.in.patch - ./configure --prefix=/usr --disable-update-mimedb --disable-update-desktopdb + ./configure --prefix=/usr --profile stable LD_PRELOAD="" make } package() { cd $srcdir/$pkgname-$pkgver + LD_PRELOAD="" make DESTDIR=$pkgdir install + # delete conflicting files + find $pkgdir/usr/share/mime/ -type f -exec rm {} \; rm -r $MONO_SHARED_DIR } diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD index 0671606be..15855b9e2 100644 --- a/extra/mpg123/PKGBUILD +++ b/extra/mpg123/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181379 2013-04-04 01:34:05Z eric $ +# $Id: PKGBUILD 186257 2013-05-23 01:22:39Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=mpg123 -pkgver=1.15.3 +pkgver=1.15.4 pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64' 'mips64el') @@ -13,22 +13,20 @@ makedepends=('sdl' 'jack' 'libpulse') optdepends=('sdl: for sdl audio support' 'jack: for jack audio support' 'libpulse: for pulse audio support') -conflicts=('mpg321') -provides=('mpg321') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -sha1sums=('915eb8782106a62b103a1171364571d69cb64e25' - '90614c85da88f965d9aa3165c111b6eeba711903') +sha1sums=('f39d927bcf7abf4f9d857f10cd97c8ceccaffbfa' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --enable-int-quality --with-module-suffix=.so \ --with-audio="alsa oss sdl jack pulse" make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 scripts/conplay "${pkgdir}/usr/bin/conplay" } diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index b2e46127c..039094166 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185295 2013-05-13 03:05:59Z eric $ +# $Id: PKGBUILD 186390 2013-05-26 09:24:49Z bluewind $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> pkgname=net-snmp pkgver=5.7.2 -pkgrel=5 +pkgrel=7 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('i686' 'x86_64' 'mips64el') url="http://www.net-snmp.org/" @@ -16,10 +16,11 @@ optdepends=('perl-term-readkey: for snmpcheck application' 'python2: for the python modules') options=('!libtool' '!emptydirs' '!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} - snmpd.service libnl32.patch) + snmpd.service snmptrapd.service libnl32.patch) sha1sums=('c493027907f32400648244d81117a126aecd27ee' 'SKIP' '84e32c54d32e6b608747054e04a3ddfe6d6638cc' + '0244e91c7baa0abebfb5c0560e8ce04c966c5992' '74a9848b95f63378eb1753fc309d2b74de5afb0f') prepare() { @@ -52,5 +53,6 @@ package() { sed -i -e "s:install --basedir=\$\$dir:install --basedir=\$\$dir --root=${pkgdir}:" Makefile make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install install -D -m644 "${srcdir}/snmpd.service" "${pkgdir}/usr/lib/systemd/system/snmpd.service" + install -D -m644 "${srcdir}/snmptrapd.service" "${pkgdir}/usr/lib/systemd/system/snmptrapd.service" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/net-snmp/snmptrapd.service b/extra/net-snmp/snmptrapd.service new file mode 100644 index 000000000..50eee7ac8 --- /dev/null +++ b/extra/net-snmp/snmptrapd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Simple Network Management Protocol (SNMP) TRAP Daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/snmptrapd.pid +ExecStart=/usr/bin/snmptrapd -p /run/snmptrapd.pid +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD index e80bd360c..22c6d4233 100644 --- a/extra/openconnect/PKGBUILD +++ b/extra/openconnect/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 167256 2012-09-29 12:54:29Z ibiru $ +# $Id: PKGBUILD 186524 2013-05-28 10:31:58Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=openconnect -pkgver=4.07 +pkgver=5.00 pkgrel=1 epoch=1 pkgdesc="Open client for Cisco AnyConnect VPN" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.infradead.org/openconnect.html" -depends=('libxml2' 'openssl' 'libproxy' 'vpnc') -makedepends=('intltool') +depends=('libxml2' 'gnutls' 'libproxy' 'vpnc') +makedepends=('intltool' 'python2') options=('!libtool' '!emptydirs') source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('61f26e7936d8b26c0f7e8119b7ef84b2') +md5sums=('b3677a4b15f8c530615f4c42dadce275') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr \ + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --disable-static make } diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD index ff27d987f..96efe63a1 100644 --- a/extra/p11-kit/PKGBUILD +++ b/extra/p11-kit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183529 2013-04-22 13:10:36Z heftig $ +# $Id: PKGBUILD 186511 2013-05-28 09:43:54Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=p11-kit -pkgver=0.18.1 +pkgver=0.18.2 pkgrel=1 pkgdesc="Library to work with PKCS#11 modules" arch=(i686 x86_64 mips64el) @@ -11,7 +11,7 @@ license=('BSD') depends=('glibc' 'libtasn1') options=(!libtool) source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('e4ef21592dbd126b62e1a6d4ad65ce5c' +md5sums=('7bb1703f38fb778054bf57477c78dc8f' 'SKIP') build() { diff --git a/extra/pango-perl/PKGBUILD b/extra/pango-perl/PKGBUILD index d8e794ad3..32599db1e 100644 --- a/extra/pango-perl/PKGBUILD +++ b/extra/pango-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183483 2013-04-21 22:21:03Z heftig $ +# $Id: PKGBUILD 186391 2013-05-26 09:24:50Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango-perl pkgver=1.224 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for Pango" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -25,7 +25,7 @@ check() { make test } -package() { +package() { cd "${srcdir}/Pango-${pkgver}" make install DESTDIR="${pkgdir}" } diff --git a/extra/perl-async-interrupt/PKGBUILD b/extra/perl-async-interrupt/PKGBUILD index 3484ea0de..d3d154910 100644 --- a/extra/perl-async-interrupt/PKGBUILD +++ b/extra/perl-async-interrupt/PKGBUILD @@ -1,10 +1,10 @@ # Packager: Justin Davis (juster) <jrcd83@gmail.com> -# $Id: PKGBUILD 160503 2012-06-02 10:26:54Z bluewind $ +# $Id: PKGBUILD 186392 2013-05-26 09:24:51Z bluewind $ pkgname=perl-async-interrupt _ver=1.1 pkgver=1.10 -pkgrel=2 +pkgrel=3 pkgdesc='allow C/XS libraries to interrupt perl asynchronously' arch=(i686 x86_64 'mips64el') license=(PerlArtistic GPL) @@ -14,11 +14,10 @@ url=https://metacpan.org/release/Async-Interrupt source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Async-Interrupt-$_ver.tar.gz") md5sums=(18f19b1537ecf5d6195a6a243110e64b) sha512sums=(e8e62efc053c8103f509c08a19bfa0fefbfe760ca4e1e4670187de4ed4fbdec2e5a9a19bba1696cd2b721ad7fa6d4b723c24e342118b69dc8b7b1597f5e1385e) -_dir="$srcdir/Async-Interrupt-$_ver" build() ( - cd "$_dir" + cd "$srcdir/Async-Interrupt-$_ver" export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps unset PERL5LIB PERL_MM_OPT /usr/bin/perl Makefile.PL @@ -27,7 +26,7 @@ build() check() ( - cd "$_dir" + cd "$srcdir/Async-Interrupt-$_ver" export PERL_MM_USE_DEFAULT=1 unset PERL5LIB make test @@ -35,7 +34,7 @@ check() package() ( - cd "$_dir" + cd "$srcdir/Async-Interrupt-$_ver" make install INSTALLDIRS=vendor DESTDIR="$pkgdir" find "$pkgdir" -name .packlist -o -name perllocal.pod -delete ) diff --git a/extra/perl-bit-vector/Bit-Vector-destroy.patch b/extra/perl-bit-vector/Bit-Vector-destroy.patch new file mode 100644 index 000000000..580f4cf21 --- /dev/null +++ b/extra/perl-bit-vector/Bit-Vector-destroy.patch @@ -0,0 +1,27 @@ +From 0646f34fc3eeb47627822df860986cf7bee4ebed Mon Sep 17 00:00:00 2001 +From: Gisle Aas <gisle@activestate.com> +Date: Thu, 28 Mar 2013 00:41:07 -0700 +Subject: [PATCH] eval { 1->method } triggers different error in 5.17.11 + +--- + t/02_____destroy.t | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/t/02_____destroy.t b/t/02_____destroy.t +index 41e3aa3..adcf995 100644 +--- a/t/02_____destroy.t ++++ b/t/02_____destroy.t +@@ -17,7 +17,9 @@ if (ref($set) eq '') + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + eval { $set->DESTROY(); }; +-if ($@ =~ /Can't call method "DESTROY" without a package or object reference/) ++if ($@ =~ /Can't call method "DESTROY" without a package or object reference/ || ++ $@ =~ /Can't locate object method "DESTROY" via package "1"/ ++) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + eval { Bit::Vector::DESTROY($set); }; +-- +1.7.0.5 + diff --git a/extra/perl-bit-vector/PKGBUILD b/extra/perl-bit-vector/PKGBUILD index 648a65b45..e0852fbc8 100644 --- a/extra/perl-bit-vector/PKGBUILD +++ b/extra/perl-bit-vector/PKGBUILD @@ -1,19 +1,29 @@ -# $Id: PKGBUILD 160505 2012-06-02 10:26:56Z bluewind $ -# Maintainer: Kevin Piche <kevin@archlinux.org> +# $Id: PKGBUILD 186393 2013-05-26 09:24:52Z bluewind $ +# Maintainer: +# Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: K. Piche <kpiche@rogers.com> pkgname=perl-bit-vector _cpanname=Bit-Vector pkgver=7.2 -pkgrel=2 +pkgrel=3 pkgdesc='Efficient bit vector, set of integers and "big int" math library' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_cpanname}/" depends=('perl-carp-clan' 'perl') options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz) -md5sums=('bc6ae34738b8f889290bf50099ff8aed') +source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz + Bit-Vector-destroy.patch) +md5sums=('bc6ae34738b8f889290bf50099ff8aed' + 'c86a55b84cb05dd04004ee8f56ee2ee3') + +prepare() { + cd "${srcdir}/${_cpanname}-$pkgver" + + # https://rt.cpan.org/Public/Bug/Display.html?id=84250 + patch -Np1 -i "${srcdir}/Bit-Vector-destroy.patch" +} build() { cd "${srcdir}/${_cpanname}-$pkgver" diff --git a/extra/perl-compress-bzip2/PKGBUILD b/extra/perl-compress-bzip2/PKGBUILD index 88c9d0eed..788ff4ddb 100644 --- a/extra/perl-compress-bzip2/PKGBUILD +++ b/extra/perl-compress-bzip2/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 160507 2012-06-02 10:27:00Z bluewind $ +# $Id: PKGBUILD 186394 2013-05-26 09:24:54Z bluewind $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=perl-compress-bzip2 _realname=Compress-Bzip2 -pkgver=2.09 -pkgrel=5 +pkgver=2.15 +pkgrel=1 pkgdesc="Interface to Bzip2 compression library" arch=(i686 x86_64 'mips64el') license=(GPL2) depends=(perl bzip2) url="http://search.cpan.org/dist/Compress-Bzip2" options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY/$_realname-$pkgver.tar.gz") -md5sums=('1699fde3e86f2a036f135ae606d456bf') +source=("http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/$_realname-$pkgver.tar.gz") +md5sums=('f1cc338445e60dfd22f5a3a302fc22ca') build() { cd "$srcdir/$_realname-$pkgver" diff --git a/extra/perl-crypt-openssl-bignum/PKGBUILD b/extra/perl-crypt-openssl-bignum/PKGBUILD index 845e348c4..08a00553e 100644 --- a/extra/perl-crypt-openssl-bignum/PKGBUILD +++ b/extra/perl-crypt-openssl-bignum/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-crypt-openssl-bignum pkgver=0.04 -pkgrel=7 +pkgrel=9 pkgdesc="OpenSSL's multiprecision integer arithmetic " arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum" diff --git a/extra/perl-crypt-openssl-random/PKGBUILD b/extra/perl-crypt-openssl-random/PKGBUILD index 54091888d..37b05c472 100644 --- a/extra/perl-crypt-openssl-random/PKGBUILD +++ b/extra/perl-crypt-openssl-random/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-crypt-openssl-random pkgver=0.04 -pkgrel=7 +pkgrel=9 pkgdesc="Interface to OpenSSL PRNG methods" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Crypt-OpenSSL-Random" diff --git a/extra/perl-crypt-openssl-rsa/PKGBUILD b/extra/perl-crypt-openssl-rsa/PKGBUILD index e8ebbf7c6..f1c0e7f21 100644 --- a/extra/perl-crypt-openssl-rsa/PKGBUILD +++ b/extra/perl-crypt-openssl-rsa/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-crypt-openssl-rsa pkgver=0.28 -pkgrel=3 +pkgrel=4 pkgdesc="Interface to OpenSSL RSA methods" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Crypt-OpenSSL-RSA" diff --git a/extra/perl-crypt-ssleay/PKGBUILD b/extra/perl-crypt-ssleay/PKGBUILD index fd7e53650..e14a7078a 100644 --- a/extra/perl-crypt-ssleay/PKGBUILD +++ b/extra/perl-crypt-ssleay/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164793 2012-08-06 08:07:22Z giovanni $ +# $Id: PKGBUILD 186398 2013-05-26 09:25:03Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-crypt-ssleay pkgver=0.64 -pkgrel=1 +pkgrel=2 pkgdesc="OpenSSL glue that provides LWP https support" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Crypt-SSLeay" diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD index 8b8ff0183..dd12529d5 100644 --- a/extra/perl-dbd-mysql/PKGBUILD +++ b/extra/perl-dbd-mysql/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 185631 2013-05-16 14:46:08Z bpiotrowski $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 186399 2013-05-26 09:25:04Z bluewind $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: kevin <kevin@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=perl-dbd-mysql _realname=DBD-mysql pkgver=4.023 -pkgrel=1 +pkgrel=2 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD index 99ae66f19..be6f51b14 100644 --- a/extra/perl-dbd-sqlite/PKGBUILD +++ b/extra/perl-dbd-sqlite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163611 2012-07-17 02:14:42Z eric $ +# $Id: PKGBUILD 186400 2013-05-26 09:25:06Z bluewind $ # Maintainer: # Contributor: Tom Killian <tomk@runbox.com> # Contributor: francois at archlinux dot org @@ -6,12 +6,12 @@ pkgname=perl-dbd-sqlite _cpanname=DBD-SQLite pkgver=1.37 -pkgrel=1 +pkgrel=2 pkgdesc="Self-contained RDBMS in a DBI driver" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/${_cpanname}" license=('GPL' 'PerlArtistic') -depends=('perl-dbi>=1.61' 'sqlite') +depends=('perl-dbi' 'sqlite') options=('!emptydirs') source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz) md5sums=('b8ac1c584befa63cd5ffc391b2366e84') diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD index a93b49575..c67d5c757 100644 --- a/extra/perl-dbi/PKGBUILD +++ b/extra/perl-dbi/PKGBUILD @@ -1,10 +1,8 @@ -# $Id: PKGBUILD 182702 2013-04-12 23:53:53Z eric $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Matt Thompson <mattt@defunct.ca> +# $Id: PKGBUILD 186584 2013-05-29 15:44:45Z eric $ +# Maintainer: pkgname=perl-dbi -_realname=DBI -pkgver=1.625 +pkgver=1.627 pkgrel=1 pkgdesc="Database independent interface for Perl" arch=('i686' 'x86_64' 'mips64el') @@ -12,25 +10,21 @@ license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) -md5sums=('b0521be412faff4ec8d511cd5f3f6a31') +source=(http://www.cpan.org/authors/id/T/TI/TIMB/DBI-${pkgver}.tar.gz) +md5sums=('aab49be51b0f4867a1894145b023d2c5') build() { - cd "${srcdir}/${_realname}-${pkgver}" - - # install module in vendor directories. + cd DBI-${pkgver} perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_realname}-${pkgver}" + cd DBI-${pkgver} make test } package() { - cd "${srcdir}/${_realname}-${pkgver}" + cd DBI-${pkgver} make install DESTDIR="${pkgdir}" } - -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/perl-digest-nilsimsa/PKGBUILD b/extra/perl-digest-nilsimsa/PKGBUILD index c7ee8a74e..9cf565b89 100644 --- a/extra/perl-digest-nilsimsa/PKGBUILD +++ b/extra/perl-digest-nilsimsa/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 160523 2012-06-02 10:27:26Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 186402 2013-05-26 09:25:08Z bluewind $ +# Maintainer: +# Contributor: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-digest-nilsimsa _realname=Digest-Nilsimsa pkgver=0.06 -pkgrel=8 +pkgrel=9 pkgdesc="Perl version of Nilsimsa code" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -13,7 +14,7 @@ url="http://search.cpan.org/dist/${_realname}/" depends=('perl') replaces=('digest-nilsimsa') provides=('digest-nilsimsa') -options=(!emptydirs) +options=('!emptydirs') source=(http://www.cpan.org/authors/id/V/VI/VIPUL/${_realname}-${pkgver}.tar.gz) md5sums=('08e940bd7f5d1167ef3fd1aa7ce234d7') diff --git a/extra/perl-digest-sha1/PKGBUILD b/extra/perl-digest-sha1/PKGBUILD index 33ae605ee..558c61a5a 100644 --- a/extra/perl-digest-sha1/PKGBUILD +++ b/extra/perl-digest-sha1/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 160525 2012-06-02 10:27:28Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 186403 2013-05-26 09:25:09Z bluewind $ +# Maintainer: +# Contributor: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-digest-sha1 _realname=Digest-SHA1 pkgver=2.13 -pkgrel=3 +pkgrel=4 pkgdesc="Perl interface to the SHA-1 Algorithm" arch=(i686 x86_64 'mips64el') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl') -options=(!emptydirs) +options=('!emptydirs') source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) replaces=('digest-sha1') provides=('digest-sha1') diff --git a/extra/perl-ev/PKGBUILD b/extra/perl-ev/PKGBUILD index 920638e82..b92bc726c 100644 --- a/extra/perl-ev/PKGBUILD +++ b/extra/perl-ev/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182901 2013-04-16 04:01:09Z eric $ +# $Id: PKGBUILD 186404 2013-05-26 09:25:10Z bluewind $ pkgname=perl-ev pkgver=4.15 -pkgrel=1 +pkgrel=2 pkgdesc='perl interface to libev, a high performance full-featured event loop' arch=(i686 x86_64 'mips64el') license=(PerlArtistic GPL) diff --git a/extra/perl-fcgi/PKGBUILD b/extra/perl-fcgi/PKGBUILD index 377ffc4c9..59b50fd0e 100644 --- a/extra/perl-fcgi/PKGBUILD +++ b/extra/perl-fcgi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160531 2012-06-02 10:27:39Z bluewind $ +# $Id: PKGBUILD 186405 2013-05-26 09:25:13Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-fcgi pkgver=0.74 -pkgrel=3 +pkgrel=4 pkgdesc="Fast CGI" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/FCGI" diff --git a/extra/perl-guard/PKGBUILD b/extra/perl-guard/PKGBUILD index 65a819282..2f37e901d 100644 --- a/extra/perl-guard/PKGBUILD +++ b/extra/perl-guard/PKGBUILD @@ -1,19 +1,17 @@ # Packager: Justin Davis <jrcd83@gmail.com> -# $Id: PKGBUILD 180339 2013-03-20 16:34:29Z eric $ +# $Id: PKGBUILD 186406 2013-05-26 09:25:16Z bluewind $ pkgname=perl-guard pkgver=1.022 -pkgrel=2 +pkgrel=3 pkgdesc="safe cleanup blocks" arch=(i686 x86_64 'mips64el') -license=(custom:unknown) -options=(!emptydirs) +url="https://metacpan.org/release/Guard" +license=('GPL' 'PerlArtistic') depends=('perl') -url=https://metacpan.org/release/Guard +options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Guard-${pkgver}.tar.gz") -md5sums=(8d1d8b942fd5d0240f47906a6d6fac8c) -sha512sums=(9eb1c4fa29f6190115fe11215ff5d27bb3e7f5ab60c7f40c4142ad9ff8aad91b0b169204e4d0f1b1638381c0c99e6a0b5627b8b6d60fad62f1392a9d1e49751e) -_distdir="${srcdir}/Guard-${pkgver}" +md5sums=('8d1d8b942fd5d0240f47906a6d6fac8c') build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -22,7 +20,7 @@ build() { PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/Guard-${pkgver}" /usr/bin/perl Makefile.PL make ) @@ -30,13 +28,13 @@ build() { check() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" + cd "${srcdir}/Guard-${pkgver}" make test ) } package() { - cd "$_distdir" + cd "${srcdir}/Guard-${pkgver}" make DESTDIR="$pkgdir" install } diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD index d505959cf..5e27b6c91 100644 --- a/extra/perl-html-parser/PKGBUILD +++ b/extra/perl-html-parser/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185586 2013-05-15 11:58:32Z eric $ +# $Id: PKGBUILD 186407 2013-05-26 09:25:18Z bluewind $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis -# Contributor: Firmicus <francois.archlinux.org> +# Contributor: Firmicus <francois.archlinux.org> pkgname=perl-html-parser pkgver=3.71 -pkgrel=1 +pkgrel=2 pkgdesc="Perl HTML parser class" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic') diff --git a/extra/perl-libintl-perl/PKGBUILD b/extra/perl-libintl-perl/PKGBUILD index ac9570fc9..b70a97e93 100644 --- a/extra/perl-libintl-perl/PKGBUILD +++ b/extra/perl-libintl-perl/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 182899 2013-04-16 03:42:32Z eric $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 186408 2013-05-26 09:25:20Z bluewind $ +# Maintainer: +# Contributor: kevin <kevin@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=perl-libintl-perl _realname=libintl-perl pkgver=1.23 -pkgrel=1 +pkgrel=2 pkgdesc="Perl Module: Localization support" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/extra/perl-list-moreutils/PKGBUILD b/extra/perl-list-moreutils/PKGBUILD index 6e0eefa61..e905a45c0 100644 --- a/extra/perl-list-moreutils/PKGBUILD +++ b/extra/perl-list-moreutils/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 180362 2013-03-20 17:38:22Z eric $ +# $Id: PKGBUILD 186409 2013-05-26 09:25:22Z bluewind $ # Maintainer : Justin "juster" Davis <jrcd83@gmail.com> # Generator : pbjam 0.01 pkgname=perl-list-moreutils pkgver=0.33 -pkgrel=3 +pkgrel=4 pkgdesc="Provide the stuff missing in List::Util" arch=(i686 x86_64 'mips64el') license=(PerlArtistic GPL) options=(!emptydirs) -depends=('perl>=5.5.30') +depends=('perl') url=http://search.cpan.org/dist/List-MoreUtils source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/List-MoreUtils-${pkgver}.tar.gz") md5sums=(8a33c84028cc2ff3e92c92434b326c0f) sha512sums=(e758b995438c5c5322317aab3602e89b9f683c42d403a0ac97ccd8cc20d0db1a75caefc22f34ad088314867c0bdd9c2b8264e8f2f6a43eab1421aa8c482233b5) -_distdir="${srcdir}/List-MoreUtils-${pkgver}" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -23,7 +22,7 @@ build() { PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/List-MoreUtils-${pkgver}" /usr/bin/perl Makefile.PL make ) @@ -31,13 +30,13 @@ build() { check() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" + cd "${srcdir}/List-MoreUtils-${pkgver}" make test ) } package() { - cd "$_distdir" + cd "${srcdir}/List-MoreUtils-${pkgver}" make DESTDIR="$pkgdir" install } diff --git a/extra/perl-locale-gettext/PKGBUILD b/extra/perl-locale-gettext/PKGBUILD index e18856ef2..af9dcf2ac 100644 --- a/extra/perl-locale-gettext/PKGBUILD +++ b/extra/perl-locale-gettext/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160541 2012-06-02 10:27:56Z bluewind $ +# $Id: PKGBUILD 186410 2013-05-26 09:25:23Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Mark Rosenstand <mark@borkware.net> # Contributor: Paul Mattal <paul@archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-locale-gettext _realname=gettext pkgver=1.05 -pkgrel=9 +pkgrel=10 pkgdesc="Permits access from Perl to the gettext() family of functions" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD index a5ef861ff..acee27788 100644 --- a/extra/perl-net-dns/PKGBUILD +++ b/extra/perl-net-dns/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 175933 2013-01-25 04:57:21Z eric $ +# $Id: PKGBUILD 186412 2013-05-26 09:25:29Z bluewind $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-dns _realname=Net-DNS pkgver=0.72 -pkgrel=1 +pkgrel=2 pkgdesc="Perl Module: Interface to the DNS resolver." arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic') diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index f12fdac29..115fcee5f 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182685 2013-04-12 16:53:38Z giovanni $ +# $Id: PKGBUILD 186413 2013-05-26 09:25:31Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay pkgver=1.54 -pkgrel=1 +pkgrel=2 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64' 'mips64el') license=('custom:BSD') diff --git a/extra/perl-netaddr-ip/PKGBUILD b/extra/perl-netaddr-ip/PKGBUILD index 5b7c530b3..c69974650 100644 --- a/extra/perl-netaddr-ip/PKGBUILD +++ b/extra/perl-netaddr-ip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175931 2013-01-25 04:44:59Z eric $ +# $Id: PKGBUILD 186411 2013-05-26 09:25:25Z bluewind $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Francois Charette <francois.archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-netaddr-ip _realname=NetAddr-IP pkgver=4.066 -pkgrel=1 +pkgrel=2 pkgdesc="Perl module to manage IP addresses and subnets" arch=(i686 x86_64 'mips64el') license=('PerlArtistic' 'GPL') diff --git a/extra/perl-sdl/PKGBUILD b/extra/perl-sdl/PKGBUILD index 4b54e3721..1e38d7bb1 100644 --- a/extra/perl-sdl/PKGBUILD +++ b/extra/perl-sdl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168746 2012-10-15 12:11:10Z heftig $ +# $Id: PKGBUILD 186414 2013-05-26 09:25:36Z bluewind $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=perl-sdl pkgver=2.540 -pkgrel=3 +pkgrel=4 pkgdesc="Simple DirectMedia Layer for Perl" arch=(i686 x86_64 'mips64el') license=(LGPL) diff --git a/extra/perl-socket6/PKGBUILD b/extra/perl-socket6/PKGBUILD index d43eba51f..a852c7849 100644 --- a/extra/perl-socket6/PKGBUILD +++ b/extra/perl-socket6/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180365 2013-03-20 17:57:40Z eric $ +# $Id: PKGBUILD 186415 2013-05-26 09:25:40Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Generator : CPANPLUS::Dist::Arch 1.18 pkgname='perl-socket6' pkgver='0.23' -pkgrel='2' +pkgrel='3' pkgdesc="getaddrinfo/getnameinfo support module" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic' 'GPL') @@ -15,7 +15,6 @@ url='http://search.cpan.org/dist/Socket6' source=('http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-0.23.tar.gz') md5sums=('2c02adb13c449d48d232bb704ddbd492') sha512sums=('39ced223ecdef89e6fa241031019bb5a73e63d2dfdaf3edb55bfea0cb81b91bea09f1cc26b2d15fa28d32227cc13cdb093c70f0ba346c9bdb523359de53d96f9') -_distdir="${srcdir}/Socket6-0.23" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -24,21 +23,21 @@ build() { PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/Socket6-0.23" /usr/bin/perl Makefile.PL make ) } check() { - cd "$_distdir" + cd "${srcdir}/Socket6-0.23" ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" make test ) } package() { - cd "$_distdir" + cd "${srcdir}/Socket6-0.23" make DESTDIR="$pkgdir" install } diff --git a/extra/perl-template-toolkit/PKGBUILD b/extra/perl-template-toolkit/PKGBUILD index 072f8604c..3dedbd70f 100644 --- a/extra/perl-template-toolkit/PKGBUILD +++ b/extra/perl-template-toolkit/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 165152 2012-08-11 20:28:19Z eric $ -# Maintainer: Firmicus <francois.archlinux.org> +# $Id: PKGBUILD 186416 2013-05-26 09:25:42Z bluewind $ +# Maintainer: +# Contributor: Firmicus <francois.archlinux.org> # Contributor: Tom Killian <tomk@runbox.com> # Contributor: FJ <joostef@gmail.com> pkgname=perl-template-toolkit _realname=Template-Toolkit pkgver=2.24 -pkgrel=1 +pkgrel=2 pkgdesc="Perl template processing system" arch=(i686 x86_64 'mips64el') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl-appconfig' 'perl>=5.10.0') -options=(!emptydirs) +options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${_realname}-$pkgver.tar.gz) md5sums=('c25fdab1beebf8818c2e624bc9f9d212') @@ -25,7 +26,10 @@ build() { check() { cd "${srcdir}/${_realname}-${pkgver}" - make test + + # Failing test can be ignored as it doesn't indicate a problem in main code + # https://rt.cpan.org/Public/Bug/Display.html?id=84778 + make test || true } package() { diff --git a/extra/perl-term-readkey/PKGBUILD b/extra/perl-term-readkey/PKGBUILD index d80103978..1de6a2f95 100644 --- a/extra/perl-term-readkey/PKGBUILD +++ b/extra/perl-term-readkey/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 160555 2012-06-02 10:28:20Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 186417 2013-05-26 09:25:44Z bluewind $ +# Maintainer: +# Contributor: kevin <kevin@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor: Francois Charette <francois.archlinux.org> +# Contributor: Francois Charette <francois.archlinux.org> pkgname=perl-term-readkey _realname=TermReadKey pkgver=2.30.02 -pkgrel=2 +pkgrel=3 pkgdesc="Provides simple control over terminal driver modes" arch=('i686' 'x86_64' 'mips64el') license=('custom') diff --git a/extra/perl-text-iconv/PKGBUILD b/extra/perl-text-iconv/PKGBUILD index 733bdbfcb..02af30a9e 100644 --- a/extra/perl-text-iconv/PKGBUILD +++ b/extra/perl-text-iconv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160557 2012-06-02 10:28:23Z bluewind $ -# Maintainer: +# $Id: PKGBUILD 186418 2013-05-26 09:25:46Z bluewind $ +# Maintainer: # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-text-iconv _realname=Text-Iconv pkgver=1.7 -pkgrel=7 +pkgrel=8 pkgdesc="Interface to iconv codeset conversion" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/${_realname}/" diff --git a/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch b/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch new file mode 100644 index 000000000..5b65557c1 --- /dev/null +++ b/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch @@ -0,0 +1,32 @@ +From 8eb3ec51a58dd02334118d8f0aa1bebb5704d15c Mon Sep 17 00:00:00 2001 +From: Father Chrysostomos via RT <bug-Tk@rt.cpan.org> +Date: Mon, 6 Aug 2012 17:42:14 -0400 +Subject: [PATCH] Fix compilation under threaded bleadperl + + Ticket <URL: https://rt.cpan.org/Ticket/Display.html?id=78824 > + +CopSTASHPV is no longer an lvalue under threads. (It never was under non-threaded builds.) +--- + tkGlue.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/tkGlue.c b/tkGlue.c +index 1b7c025..9079302 100644 +--- a/tkGlue.c ++++ b/tkGlue.c +@@ -4154,11 +4154,7 @@ int type; + SV *x = NULL; + int prefix = '?'; + name = SvPV(sv,na); +-#ifdef USE_ITHREADS +- CopSTASHPV(PL_curcop) = NULL; +-#else +- CopSTASH(PL_curcop) = NULL; +-#endif ++ CopSTASH_set(PL_curcop, NULL); + switch (type) + { + case TK_CONFIG_SCALARVAR: +-- +1.8.2.3 + diff --git a/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch b/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch new file mode 100644 index 000000000..95067501f --- /dev/null +++ b/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch @@ -0,0 +1,47 @@ +From 2333fa35c99aae1db1cb8d3ebce31fc21bc66e0a Mon Sep 17 00:00:00 2001 +From: Slaven Rezic <slaven@rezic.de> +Date: Sat, 23 Mar 2013 14:00:58 +0100 +Subject: [PATCH] * fix for 5.17.7 and newer: SvUPGRADE() is no longer an + expression + +--- + IO/IO.xs | 6 +----- + tkGlue.c | 5 +---- + 2 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/IO/IO.xs b/IO/IO.xs +index 8ae2a57..42f7515 100644 +--- a/IO/IO.xs ++++ b/IO/IO.xs +@@ -207,11 +207,7 @@ int offset + info.count = 0; + info.error = 0; + info.eof = 0; +- if (!SvUPGRADE(buf, SVt_PV)) +- { +- RETVAL = &PL_sv_undef; +- return; +- } ++ (void)SvUPGRADE(buf, SVt_PV); + SvPOK_only(buf); /* validate pointer */ + Tcl_CreateFileHandler(fd, TCL_READABLE, read_handler, (ClientData) &info); + do +diff --git a/tkGlue.c b/tkGlue.c +index dd3d283..cdc53ad 100644 +--- a/tkGlue.c ++++ b/tkGlue.c +@@ -3830,10 +3830,7 @@ ClientData clientData; + return EXPIRE((interp, "Cannot trace readonly variable")); + } + } +- if (!SvUPGRADE(sv, SVt_PVMG)) +- { +- return EXPIRE((interp, "Trace SvUPGRADE failed")); +- } ++ (void)SvUPGRADE(sv, SVt_PVMG); + + if (SvTYPE(sv) == SVt_PVAV) + { +-- +1.8.2.3 + diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD index 7fabe3a9c..41ac2a372 100644 --- a/extra/perl-tk/PKGBUILD +++ b/extra/perl-tk/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 184418 2013-05-06 19:39:04Z foutrelis $ -# Maintainer: François Charette <francois ατ archlinux δοτ org> +# $Id: PKGBUILD 186419 2013-05-26 09:25:47Z bluewind $ +# Maintainer: +# Contributor: François Charette <francois ατ archlinux δοτ org> # Contributor: Jason Chu <jchu@xentac.net> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=perl-tk _cpanname=Tk pkgver=804.030 -pkgrel=4 +pkgrel=5 pkgdesc="A graphical user interface toolkit for Perl" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/${_cpanname}" @@ -15,8 +16,22 @@ depends=('libpng' 'libjpeg' 'tk' 'perl') options=('!emptydirs') replaces=('perltk') provides=('perltk') -source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) -md5sums=('13275e85f99ee467a86d9598a437abff') +source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz + 0001-Fix-compilation-under-threaded-bleadperl.patch + 0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch) +md5sums=('13275e85f99ee467a86d9598a437abff' + '361c34978746310e5c31b7a47c016b22' + '46448cdac9d7159f15f2d4b2719d171b') + +prepare() { + cd "$srcdir/${_cpanname}-$pkgver" + + # https://rt.cpan.org/Public/Bug/Display.html?id=78824 + patch -Np1 -i "$srcdir/0001-Fix-compilation-under-threaded-bleadperl.patch" + + # https://rt.cpan.org/Public/Bug/Display.html?id=82677 + patch -Np1 -i "$srcdir/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch" +} build() { cd "$srcdir/${_cpanname}-$pkgver" diff --git a/extra/perl-xml-parser/PKGBUILD b/extra/perl-xml-parser/PKGBUILD index 2fcc86d9f..6f55b09ef 100644 --- a/extra/perl-xml-parser/PKGBUILD +++ b/extra/perl-xml-parser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160565 2012-06-02 10:28:38Z bluewind $ +# $Id: PKGBUILD 186420 2013-05-26 09:25:49Z bluewind $ # Maintainer: # Contributor: firmicus <francois@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -7,7 +7,7 @@ pkgname=perl-xml-parser _realname=XML-Parser pkgver=2.41 -pkgrel=3 +pkgrel=4 pkgdesc="Expat-based XML parser module for perl" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD index 0b4acc826..14940a564 100644 --- a/extra/perl-yaml-syck/PKGBUILD +++ b/extra/perl-yaml-syck/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182872 2013-04-15 21:25:04Z eric $ +# $Id: PKGBUILD 186421 2013-05-26 09:25:51Z bluewind $ # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Maintainer: kevin <kevin@archlinux.org> pkgname=perl-yaml-syck _realname=YAML-Syck pkgver=1.25 -pkgrel=1 +pkgrel=2 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64' 'mips64el') license=('custom') diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 5eb94eb5d..9b34b6938 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185575 2013-05-15 08:05:35Z bpiotrowski $ +# $Id: PKGBUILD 186422 2013-05-26 09:25:53Z bluewind $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.7 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://pidgin.im/" license=('GPL') diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index ae6e6d545..92622c22a 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185125 2013-05-11 09:39:44Z andyrtr $ +# $Id: PKGBUILD 186354 2013-05-25 09:05:56Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributorr: Peter Lewis <plewis@aur.archlinux.org> @@ -7,13 +7,13 @@ # 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.2.1 +_dcpkgver=2.2.2 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.4.0 -pkgrel=1 -pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" +pkgrel=3 +pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" license=('LGPL') @@ -31,6 +31,7 @@ build() { ./configure --prefix=/usr \ --with-dovecot=/usr/lib/dovecot \ + --with-moduledir=/usr/lib/dovecot/modules \ --disable-static make } diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 378e331cb..9711c7064 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184422 2013-05-06 19:39:13Z foutrelis $ +# $Id: PKGBUILD 186342 2013-05-25 02:56:35Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.22.3 -pkgrel=3 +pkgver=0.22.4 +pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('be915388eaad6865cee5a156c8119ec1' +md5sums=('49d55921ce795778c7231fe9f2fe923b' '9dc64c254a31e570507bdd4ad4ba629a') build() { diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index 0b32a5ba3..07109de00 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181849 2013-04-04 14:34:55Z dan $ +# $Id: PKGBUILD 186424 2013-05-26 09:25:57Z bluewind $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=postgresql-old-upgrade pkgver=9.1.9 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index 3a602a88d..d4e739b6c 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 181847 2013-04-04 14:20:11Z dan $ +# $Id: PKGBUILD 186423 2013-05-26 09:25:56Z bluewind $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') pkgver=9.2.4 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" license=('custom:PostgreSQL') diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD index a0d9d737b..e03fa8012 100644 --- a/extra/python-geoip/PKGBUILD +++ b/extra/python-geoip/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 168340 2012-10-08 23:42:19Z eric $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186477 2013-05-27 11:23:42Z foutrelis $ +# Maintainer: +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> -pkgbase=python-geoip pkgname=('python2-geoip') -pkgver=1.2.7 -pkgrel=2 +pkgbase=python-geoip +pkgver=1.2.8 +pkgrel=1 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library" arch=('i686' 'x86_64' 'mips64el') -url="http://www.maxmind.com/app/python" +url="http://dev.maxmind.com/geoip/legacy/downloadable#Python-10" license=('LGPL') depends=('python2' 'geoip') -source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-${pkgver}.tar.gz) -md5sums=('df71f5ae7a5c77bbdf726d512b7d67cf') +source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-$pkgver.tar.gz) +sha256sums=('8b946307355b60cb0f2b0be8ac90c1231286e0e79917509763267fce01a50e73') + +build() { + cd "$srcdir/GeoIP-Python-$pkgver" + python2 setup.py build +} package_python2-geoip() { - cd "${srcdir}/GeoIP-Python-${pkgver}" - python2 setup.py build install --root="${pkgdir}" + cd "$srcdir/GeoIP-Python-$pkgver" + python2 setup.py install --root="$pkgdir" -O1 } + +# vim:set ts=2 sw=2 et: diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index 5ebc686fd..d991489df 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182150 2013-04-08 10:27:25Z stephane $ +# $Id: PKGBUILD 186286 2013-05-23 20:40:14Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python -pkgver=3.3.1 +pkgver=3.3.2 pkgrel=1 _pybasever=3.3 pkgdesc="Next generation of the python high-level scripting language" @@ -18,8 +18,10 @@ optdepends=('tk: for tkinter' 'sqlite') provides=('python3') replaces=('python3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) -sha1sums=('393d7302c48bc911cd7faa7fa9b5fbcb9919bddc') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz + python-3.3.2-CVE-2013-2099.patch) +sha1sums=('87009d0c156c6e1354dfec5c98c328cae93950ad' + 'b7a386b2e2f0811b344898500860ec31ba81ed4d') build() { cd "${srcdir}/Python-${pkgver}" @@ -33,12 +35,14 @@ build() { rm -r Modules/zlib rm -r Modules/_ctypes/{darwin,libffi}* - if [ "$CARCH" != "mips64el" ]; then extraconf=--with-valgrind else extraconf="" fi + + patch -Np1 -i ../python-3.3.2-CVE-2013-2099.patch + ./configure --prefix=/usr \ --enable-shared \ --with-threads \ @@ -55,8 +59,7 @@ build() { check() { cd "${srcdir}/Python-${pkgver}" LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ - "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \ - test_urllib test_uuid test_pydoc test_logging + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_posixpath test_logging } package() { diff --git a/extra/python/python-3.3.2-CVE-2013-2099.patch b/extra/python/python-3.3.2-CVE-2013-2099.patch new file mode 100644 index 000000000..8162d8e54 --- /dev/null +++ b/extra/python/python-3.3.2-CVE-2013-2099.patch @@ -0,0 +1,50 @@ + +# HG changeset patch +# User Antoine Pitrou <solipsis@pitrou.net> +# Date 1368892602 -7200 +# Node ID c627638753e2d25a98950585b259104a025937a9 +# Parent 9682241dc8fcb4b1aef083bd30860efa070c3d6d +Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of service using certificates with many wildcards (CVE-2013-2099). + +diff --git a/Lib/ssl.py b/Lib/ssl.py +--- a/Lib/ssl.py ++++ b/Lib/ssl.py +@@ -129,9 +129,16 @@ class CertificateError(ValueError): + pass + + +-def _dnsname_to_pat(dn): ++def _dnsname_to_pat(dn, max_wildcards=1): + pats = [] + for frag in dn.split(r'.'): ++ if frag.count('*') > max_wildcards: ++ # Issue #17980: avoid denials of service by refusing more ++ # than one wildcard per fragment. A survery of established ++ # policy among SSL implementations showed it to be a ++ # reasonable choice. ++ raise CertificateError( ++ "too many wildcards in certificate DNS name: " + repr(dn)) + if frag == '*': + # When '*' is a fragment by itself, it matches a non-empty dotless + # fragment. +diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py +--- a/Lib/test/test_ssl.py ++++ b/Lib/test/test_ssl.py +@@ -349,6 +349,17 @@ class BasicSocketTests(unittest.TestCase + self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com') + self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com') + ++ # Issue #17980: avoid denials of service by refusing more than one ++ # wildcard per fragment. ++ cert = {'subject': ((('commonName', 'a*b.com'),),)} ++ ok(cert, 'axxb.com') ++ cert = {'subject': ((('commonName', 'a*b.co*'),),)} ++ ok(cert, 'axxb.com') ++ cert = {'subject': ((('commonName', 'a*b*.com'),),)} ++ with self.assertRaises(ssl.CertificateError) as cm: ++ ssl.match_hostname(cert, 'axxbxxc.com') ++ self.assertIn("too many wildcards", str(cm.exception)) ++ + def test_server_side(self): + # server_hostname doesn't work for server sockets + ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) diff --git a/extra/razor/PKGBUILD b/extra/razor/PKGBUILD index f8c9c8f52..13e2dc00b 100644 --- a/extra/razor/PKGBUILD +++ b/extra/razor/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183164 2013-04-18 06:55:29Z eric $ +# $Id: PKGBUILD 186425 2013-05-26 09:26:01Z bluewind $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=razor pkgver=2.85 -pkgrel=1 +pkgrel=2 pkgdesc="A distributed, collaborative, spam detection and filtering network" arch=('i686' 'x86_64' 'mips64el') url="http://razor.sourceforge.net" diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index b28e1b2ed..1f8a9b70a 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184432 2013-05-06 19:39:40Z foutrelis $ +# $Id: PKGBUILD 186426 2013-05-26 09:26:05Z bluewind $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=rrdtool pkgver=1.4.7 -pkgrel=6 +pkgrel=7 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64' 'mips64el') url="http://www.rrdtool.org" diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index b06143892..f45b52785 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -10,12 +10,12 @@ pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=4.0.5 +pkgver=4.0.6 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=4.0.5 -pkgrel=3 +_realver=4.0.6 +pkgrel=1 arch=(i686 x86_64 mips64el) url="http://www.samba.org" license=('GPL3') @@ -67,6 +67,7 @@ _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,a cd ${srcdir}/samba-${_realver} ./configure --enable-fhs \ --prefix=/usr \ + --sbindir=/usr/bin \ --libdir=/usr/lib \ --localstatedir=/var \ --with-configdir=/etc/samba \ @@ -196,12 +197,12 @@ install=samba.install find ${pkgdir}/usr/lib/python${_pyver}/site-packages/ -name '*.py' | \ xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" - find ${pkgdir}/usr/bin ${pkgdir}/usr/sbin -type f -executable | \ + find ${pkgdir}/usr/bin ${pkgdir}/usr/bin -type f -executable | \ xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" # Make admin scripts look in the right place for the samba python module - for script in sbin/samba_dnsupdate sbin/samba_kcc sbin/samba_spnupdate \ - sbin/samba_upgradedns bin/samba-tool + for script in bin/samba_dnsupdate bin/samba_kcc bin/samba_spnupdate \ + bin/samba_upgradedns bin/samba-tool do sed -i "/^sys\.path\.insert/ a\ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ @@ -244,18 +245,17 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } - -md5sums=('58ec2fec08872b72f8fd526f2da20a9e' +md5sums=('db9dc684f167a602c18acc19d3e7e401' '5697da77590ec092cc8a883bae06093c' - 'a4bbfa39fee95bba2e7ad6b535fae7e6' + 'ee8507839745cf17d2fb5401be7da6a8' '96f82c38f3f540b53f3e5144900acf17' - '5602ba59bc60502c99e6d5a5ae16aecf' + 'ee4763a656cf00d92bfda31b6bb2c5cb' '6c447748a064d631435dbef0a3dcf32f' - 'd0b18dd7f5fafc8d25cb3a7c37c6d920' + 'c0c561c47de24d33dd48aae79823810b' 'a78b9aa93eb14b0ac445897395693225' - '90845b89f2321cb19c0b13f385f1782a' - '70186fa43510bf99e3afd5951e814fbf' + 'e8ebc966b5684a557284dd435daaab7f' + '70afd2db60a2e8eff7615dbdecd887ac' '6db11f3dd2112a4b7a73007b189bef3f' - 'b0de262f9c62acd162e873658f33d063' - '64a52bc798033aeabfae3410bd559aa4' + 'fd6be0cf1e5b3f0c3599fdb95455d19f' + '081c20b9d994d69ce5c37dcf96f10572' '49abd7b719e3713a3f75a8a50958e381') diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service index 4f86c4db9..34c66d5d6 100644 --- a/extra/samba/nmbd.service +++ b/extra/samba/nmbd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking PIDFile=/var/run/nmbd.pid -ExecStart=/usr/sbin/nmbd -D +ExecStart=/usr/bin/nmbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/samba b/extra/samba/samba deleted file mode 100755 index 6098ee0cb..000000000 --- a/extra/samba/samba +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba - -[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd) - -case "$1" in - start) - rc=0 - stat_busy "Starting Samba Server" - if [ ! -x /var/log/samba ] ; then - install -m755 -d /var/log/samba - fi - for d in ${SAMBA_DAEMONS[@]}; do - PID=`pidof -o %PPID /usr/sbin/$d` - [ -z "$PID" ] && /usr/sbin/$d -D - rc=$(($rc+$?)) - done - if [ $rc -gt 0 ]; then - stat_fail - else - add_daemon samba - stat_done - fi - ;; - stop) - rc=0 - stat_busy "Stopping Samba Server" - for d in ${SAMBA_DAEMONS[@]}; do - PID=`pidof -o %PPID /usr/sbin/$d` - [ -z "$PID" ] || kill $PID &> /dev/null - rc=$(($rc+$?)) - done - if [ $rc -gt 0 ]; then - stat_fail - else - rm /run/samba/smbd.pid &>/dev/null - rm /run/samba/nmbd.pid &>/dev/null - rm /run/samba/winbindd.pid &>/dev/null - rm_daemon samba - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/samba/samba.service b/extra/samba/samba.service index e423a7d2d..562d42562 100644 --- a/extra/samba/samba.service +++ b/extra/samba/samba.service @@ -7,7 +7,7 @@ Type=forking PIDFile=/var/run/samba.pid LimitNOFILE=16384 EnvironmentFile=-/etc/conf.d/samba -ExecStart=/usr/sbin/samba $SAMBAOPTIONS +ExecStart=/usr/bin/samba $SAMBAOPTIONS ExecReload=/usr/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service index 12c08474a..de34c2a5f 100644 --- a/extra/samba/smbd.service +++ b/extra/samba/smbd.service @@ -5,7 +5,7 @@ After=network.target nmbd.service winbindd.service [Service] Type=forking PIDFile=/var/run/smbd.pid -ExecStart=/usr/sbin/smbd -D +ExecStart=/usr/bin/smbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/smbd@.service b/extra/samba/smbd@.service index e1f71be3f..071eb5788 100644 --- a/extra/samba/smbd@.service +++ b/extra/samba/smbd@.service @@ -2,6 +2,6 @@ Description=Samba SMB/CIFS server instance [Service] -ExecStart=/usr/sbin/smbd -F +ExecStart=/usr/bin/smbd -F ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket diff --git a/extra/samba/swat.xinetd b/extra/samba/swat.xinetd index 2e62a82b2..b083ad860 100644 --- a/extra/samba/swat.xinetd +++ b/extra/samba/swat.xinetd @@ -3,7 +3,7 @@ service swat socket_type = stream wait = no user = root - server = /usr/sbin/swat + server = /usr/bin/swat log_on_success += HOST DURATION log_on_failure += HOST disable = yes diff --git a/extra/samba/swat@.service b/extra/samba/swat@.service index a036b2c03..ebbc31c47 100644 --- a/extra/samba/swat@.service +++ b/extra/samba/swat@.service @@ -3,5 +3,5 @@ Description=SWAT Samba Web Admin Tool After=local-fs.target [Service] -ExecStart=/usr/sbin/swat +ExecStart=/usr/bin/swat StandardInput=socket diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service index 02e3014b1..20bac9a83 100644 --- a/extra/samba/winbindd.service +++ b/extra/samba/winbindd.service @@ -5,7 +5,7 @@ After=network.target nmbd.service [Service] Type=forking PIDFile=/var/run/winbindd.pid -ExecStart=/usr/sbin/winbindd -D +ExecStart=/usr/bin/winbindd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD index 32516b6d8..e81a10f01 100644 --- a/extra/smb4k/PKGBUILD +++ b/extra/smb4k/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179497 2013-03-05 17:07:36Z giovanni $ +# $Id: PKGBUILD 186369 2013-05-26 07:53:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com> pkgname=smb4k -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="A KDE program that browses samba shares" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=smb4k.install source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('438ea64ed1296de6618677758257445b') +md5sums=('1b15d7f0f4ad89b0fe730629ec53c2ae') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD index b15e23f42..fd25d6b87 100644 --- a/extra/socat/PKGBUILD +++ b/extra/socat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 159299 2012-05-21 08:16:43Z bisson $ +# $Id: PKGBUILD 186472 2013-05-27 06:47:24Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=socat -pkgver=1.7.2.1 +pkgver=1.7.2.2 pkgrel=1 pkgdesc='Multipurpose relay' url='http://www.dest-unreach.org/socat/' @@ -12,11 +12,10 @@ license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('readline' 'openssl') source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz") -sha1sums=('6e3328cc409550b2367efa8028fe4436e84eb490') +sha1sums=('588294c17373d52a8ac877dcd599ef26f14b110b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ @@ -26,6 +25,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install } diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index ca5e880db..8a2413b2f 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 182667 2013-04-12 14:07:12Z andyrtr $ +# $Id: PKGBUILD 186040 2013-05-20 18:16:41Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl') -_amalgamationver=3071602 +_amalgamationver=3071700 _docver=${_amalgamationver} #_docver=3071601 -pkgver=3.7.16.2 +pkgver=3.7.17 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz license.txt) options=('!libtool' '!emptydirs') -sha1sums=('85bf857cf86f34831d55d7ba97606dba581b8d62' +sha1sums=('e31958e56b1d7bef9433b1ff2e875c8c290d37f4' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 7c779605d..a5a36561f 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 185569 2013-05-15 08:05:28Z bpiotrowski $ +# $Id: PKGBUILD 186427 2013-05-26 09:26:08Z bluewind $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion pkgver=1.7.9 -pkgrel=4 +pkgrel=6 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') license=('APACHE') -depends=('neon' 'apr-util' 'sqlite' 'file' 'serf') +depends=('neon' 'apr-util' 'sqlite' 'file' 'serf' 'systemd') optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' +makedepends=('krb5' 'apache' 'python2' 'perl>=5.18' 'swig' 'java-runtime' 'java-environment' 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') [ "$CARCH" = "mips64el" ] && \ makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index b16987670..eefe6c3aa 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 185094 2013-05-11 04:02:37Z eric $ +# $Id: PKGBUILD 186486 2013-05-27 16:33:02Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=system-config-printer pkgver=1.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('systemd' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat' +depends=('pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat' 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'dbus-glib' 'gtk3') makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils') optdepends=('gnome-keyring: password management') @@ -34,10 +34,11 @@ build() { --sysconfdir=/etc \ --with-udev-rules - make + make udevhelperdir=/usr/lib/udev } package() { cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" udevhelperdir=/usr/lib/udev \ + udevrulesdir=/usr/lib/udev/rules.d install } diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD index 93507bbfc..8a726cd20 100644 --- a/extra/telepathy-idle/PKGBUILD +++ b/extra/telepathy-idle/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183634 2013-04-25 18:08:44Z ioni $ +# $Id: PKGBUILD 186515 2013-05-28 09:58:49Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Samuel Mendes <heka.lok@gmail.com> pkgname=telepathy-idle -pkgver=0.1.15 +pkgver=0.1.16 pkgrel=1 pkgdesc="An IRC connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('telepathy-glib') makedepends=('libxslt' 'python2') install=telepathy-idle.install source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('56f960ed1d9ed0c01e0b9f7eb68dbebe') +md5sums=('afabda908a798aac3a427f4564af113a') build() { cd $pkgname-$pkgver diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index fd9e78d72..614224917 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183062 2013-04-17 06:09:00Z andrea $ +# $Id: PKGBUILD 186175 2013-05-21 22:00:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-accounts-kcm _pkgname=ktp-accounts-kcm -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('a6ba149da9a52423a41fe99704e57344d384b1cc') +sha1sums=('fc71170f6f7f417b9cd0f4da3cb54ff70e66406e') build() { mkdir build diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD index dc8ab8ad2..63c7defc4 100644 --- a/extra/telepathy-kde-approver/PKGBUILD +++ b/extra/telepathy-kde-approver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183131 2013-04-17 17:57:15Z eric $ +# $Id: PKGBUILD 186177 2013-05-21 22:01:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-approver _pkgname=ktp-approver -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="KDE Channel Approver for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('1ccb773a14fa480e7e4c14611bc6d8a95e970e8e') +sha1sums=('996fabdc858bb48be7b5c277f0a88c0fb357ee8c') build() { mkdir build diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index 6acf90197..b23052552 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183133 2013-04-17 18:23:20Z eric $ +# $Id: PKGBUILD 186179 2013-05-21 22:01:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-auth-handler _pkgname=ktp-auth-handler -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('c3cc980dced0a7d63b287c382cec05fb9ef0348a') +sha1sums=('a27fb07682fb2ce7dde15a40688c12b3d8f2299d') build() { mkdir build diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD index 540a69f78..d07c8f6ba 100644 --- a/extra/telepathy-kde-common-internals/PKGBUILD +++ b/extra/telepathy-kde-common-internals/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183068 2013-04-17 06:14:39Z andrea $ +# $Id: PKGBUILD 186195 2013-05-21 22:02:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-common-internals _pkgname=ktp-common-internals -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Common components for KDE-Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdelibs' 'telepathy-logger-qt' 'telepathy-mission-control') makedepends=('cmake' 'automoc4' 'boost' 'doxygen') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('47f99b56e2faa6ef7c760f2112a7b10445f9c709') +sha1sums=('06fb5a5353f973e254c894be33de79b28089cbc5') build() { mkdir build diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index a47e7f087..adcb867d8 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183065 2013-04-17 06:12:27Z andrea $ +# $Id: PKGBUILD 186182 2013-05-21 22:01:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-contact-list _pkgname=ktp-contact-list -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Telepathy contact list application" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('0fb7888effd4e9a8f584dfbdcce31e088fbe71de') +sha1sums=('fe971a74ab966faea0680b6231c545754b9e00cf') build() { mkdir build diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD index 391ed90b7..2c4a547d6 100644 --- a/extra/telepathy-kde-contact-runner/PKGBUILD +++ b/extra/telepathy-kde-contact-runner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183135 2013-04-17 18:25:34Z eric $ +# $Id: PKGBUILD 186184 2013-05-21 22:01:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-contact-runner _pkgname=ktp-contact-runner -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="KRunner plugin for KDE Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('1acb3f1371008040abf3a75d39a61fbe9f580821') +sha1sums=('98c21256a81b18955628b3c645e36391c1ffca4a') build() { mkdir build diff --git a/extra/telepathy-kde-desktop-applets/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD index 1d228d835..88b275e56 100644 --- a/extra/telepathy-kde-desktop-applets/PKGBUILD +++ b/extra/telepathy-kde-desktop-applets/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183137 2013-04-17 18:33:27Z eric $ +# $Id: PKGBUILD 186186 2013-05-21 22:01:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-desktop-applets _pkgname=ktp-desktop-applets -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="The KDE-Telepathy Plasma desktop applets" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') replaces=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('78cf1e37fbaf2af2b3c14df81dde7417a5bd7c07') +sha1sums=('b0273d52657a31ba56168a4e4db2f56f6c81e2fd') build() { mkdir build diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD index 431f0701d..67901433b 100644 --- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD +++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183140 2013-04-17 18:34:04Z eric $ +# $Id: PKGBUILD 186188 2013-05-21 22:02:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-filetransfer-handler _pkgname=ktp-filetransfer-handler -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Telepathy file transfer handler" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('66e365cf5ec60233d04869570cc89ad70eacb214') +sha1sums=('79bb46d90a3a981cadb2cc2f84832ef91e11deeb') build() { mkdir build diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD index 02605f9dc..b1664d516 100644 --- a/extra/telepathy-kde-integration-module/PKGBUILD +++ b/extra/telepathy-kde-integration-module/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183141 2013-04-17 18:34:18Z eric $ +# $Id: PKGBUILD 186190 2013-05-21 22:02:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-integration-module _pkgname=ktp-kded-integration-module -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('c5121ed5ba4f7ea0e7885b0aa7a42008c3ec6930') +sha1sums=('1aa1b8597acff39f0549ed9f716d733de4d77b63') build() { mkdir build diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD index 888539576..d7cd51288 100644 --- a/extra/telepathy-kde-send-file/PKGBUILD +++ b/extra/telepathy-kde-send-file/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183143 2013-04-17 18:35:12Z eric $ +# $Id: PKGBUILD 186192 2013-05-21 22:02:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-send-file _pkgname=ktp-send-file -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('48ece90d7f2614aa133b8304d4891e0151d26f00') +sha1sums=('51734ea448b6a3338a28fc9e9fc7d371453ed9a6') build() { mkdir build diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index bce31e164..0c73a3158 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183145 2013-04-17 18:35:36Z eric $ +# $Id: PKGBUILD 186213 2013-05-22 06:19:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-text-ui _pkgname=ktp-text-ui -pkgver=0.6.1 +pkgver=0.6.2.1 pkgrel=1 pkgdesc="Telepathy handler for Text Chats" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('GPL') depends=('telepathy-kde-contact-list' 'telepathy-logger-qt') makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') -source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('6dd32df14da326bcaeed8b68a25634b2731f0b6b') +source=("http://download.kde.org/stable/kde-telepathy/0.6.2/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('71951b929ad3caa6a0f46e338bd669c7e542ac15') build() { mkdir build diff --git a/extra/telepathy-logger-qt/PKGBUILD b/extra/telepathy-logger-qt/PKGBUILD index 85c4cc481..031a5f0fd 100644 --- a/extra/telepathy-logger-qt/PKGBUILD +++ b/extra/telepathy-logger-qt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182024 2013-04-05 09:11:10Z andrea $ +# $Id: PKGBUILD 186224 2013-05-22 07:20:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: George Brooke <george+arch.aur@george-brooke.co.uk> pkgname=telepathy-logger-qt -pkgver=0.6.0 +pkgver=0.8.0 pkgrel=1 pkgdesc="Qt bindings for telepathy logger" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,8 @@ url='https://projects.kde.org/projects/extragear/network/telepathy/telepathy-log license=('GPL') depends=('telepathy-qt' 'telepathy-logger' 'qt-gstreamer') makedepends=('automoc4' 'cmake' 'python2' 'doxygen' 'boost') -source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('3e58f7a25ad192d9a62b52784492b317b77a5ffa') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('a61650a06e5b8f6d452d6120ee402567439ef687') build() { mkdir build diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index ccf3a5f7f..578888af4 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169980 2012-10-30 23:00:04Z heftig $ +# $Id: PKGBUILD 186517 2013-05-28 10:02:46Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Andreas Zwinkau <beza1e1@web.de> pkgname=telepathy-mission-control -pkgver=5.14.0 +pkgver=5.14.1 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=('libxslt' 'python2') install=telepathy-mission-control.install options=('!libtool') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('483fa8860891815a540ecf1bb9155122') +md5sums=('e06fb0399ec435e59c74d79a2ace8a2d') build() { cd "$pkgname-$pkgver" diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD index a2d47808f..f8c5ecf60 100644 --- a/extra/ucommon/PKGBUILD +++ b/extra/ucommon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184356 2013-05-06 19:20:44Z eric $ +# $Id: PKGBUILD 186289 2013-05-23 22:11:35Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ucommon -pkgver=6.0.4 +pkgver=6.0.5 pkgrel=1 pkgdesc="A light-weight C++ library to facilitate using C++ design patterns" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL3' 'LGPL3') depends=('openssl') options=('!libtool') source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('b20a43a8cba901c2145778b3d653eef6' +md5sums=('afbcf89264e9c96dccf4104bab52a9c0' 'SKIP') build() { diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD index c8f493dd7..d2ec948de 100644 --- a/extra/udisks/PKGBUILD +++ b/extra/udisks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185610 2013-05-15 22:57:00Z tomegun $ +# $Id: PKGBUILD 186141 2013-05-21 09:11:20Z tpowa $ # Maintainer: Tom Gundersen <teg@jklm.no> pkgname=udisks pkgver=1.0.4 -pkgrel=7 +pkgrel=8 pkgdesc="Disk Management Service" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -21,6 +21,9 @@ build() { patch -p1 < ../drop-pci-db.patch make + # fix mdadm location + sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \ + "${srcdir}/${pkgname}-${pkgver}"/data/80-udisks.rules } package() { diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD index fd8ac016a..becc1ec6c 100644 --- a/extra/udisks2/PKGBUILD +++ b/extra/udisks2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183464 2013-04-21 22:12:17Z heftig $ +# $Id: PKGBUILD 186142 2013-05-21 09:11:21Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=udisks2 pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Disk Management Service, version 2" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -22,6 +22,9 @@ build() { --with-systemdsystemunitdir=/usr/lib/systemd/system \ --localstatedir=/var --disable-static make + # fix mdadm location + sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \ + "${srcdir}/udisks-${pkgver}"/data/80-udisks2.rules } package() { diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD index 929e8686c..392586b3d 100644 --- a/extra/vde2/PKGBUILD +++ b/extra/vde2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169040 2012-10-17 10:21:21Z allan $ +# $Id: PKGBUILD 186164 2013-05-21 13:35:09Z tpowa $ # Contributor: Sergej Pupykin # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=vde2 pkgver=2.3.2 -pkgrel=2.1 +pkgrel=4 pkgdesc="Virtual Distributed Ethernet for emulators like qemu" url="http://sourceforge.net/projects/vde/" license=("GPL" "LGPL" "CUSTOM") @@ -15,24 +15,20 @@ source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2 dhcpd.conf.sample iptables.rules.sample vde-config.sample - vde-connection.sample - vde.conf - vde.rc) + vde-connection.sample) install=vde2.install options=(!libtool !makeflags) build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \ + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \ --enable-experimental make } package() { cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc libexecdir=$pkgdir/usr/lib/vde2 install - install -D -m 755 ../vde.rc $pkgdir/etc/rc.d/vde - install -D -m 644 ../vde.conf $pkgdir/etc/conf.d/vde + make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc sbindir=$pkgdir/usr/bin libexecdir=$pkgdir/usr/lib/vde2 install install -D -m 644 ../vde-config.sample $pkgdir/etc/vde/vde-config.sample install -D -m 644 ../vde-connection.sample $pkgdir/etc/vde/vde-connection.sample install -D -m 644 ../dhcpd.conf.sample $pkgdir/usr/share/vde2/dhcpd.conf.sample @@ -40,11 +36,13 @@ package() { # install slirp license install -D -m 644 COPYING.slirpvde $pkgdir/usr/share/licenses/vde2/COPYING.slirpvde } - md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628' '7d9bc56d2e561d849e915000d1c0f269' 'a920123fc620bcedbccb703a8d1bdc55' 'cb8ace28e8efd4dad128be4be71b3b07' - '63033c33565e2030541c5e05e9d9b063' - 'a22730f051f4840da4a3162a88ff8156' - '6c7dc01bc2f039f0ff1682ee70d3d1da') + '63033c33565e2030541c5e05e9d9b063') +md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628' + '7d9bc56d2e561d849e915000d1c0f269' + 'a920123fc620bcedbccb703a8d1bdc55' + 'f47d3372382dc9d67c1174d2796729fe' + '63033c33565e2030541c5e05e9d9b063') diff --git a/extra/vde2/vde-config.sample b/extra/vde2/vde-config.sample index c5a5b7d88..f7e0660a4 100644 --- a/extra/vde2/vde-config.sample +++ b/extra/vde2/vde-config.sample @@ -6,7 +6,7 @@ VDE_NUMPORTS="32" # Number of ports (default 32) VDE_HUB="no" # [yes|no] Make the switch act as a hub VDE_FSTP="no" # [yes|no] Activate the fast spanning tree protocol VDE_MAC="" # Set the Switch MAC address -VDE_PRIOTIRY="" # Set the priority for FST (MAC extension) +VDE_PRIORITY="" # Set the priority for FST (MAC extension) VDE_HASHSIZE="" # Hash table size # Options from datasock module @@ -32,4 +32,4 @@ SLIRP="no" # [yes|no] enable/disable SLIRP daemon support SLIRP_DHCP="no" # [yes|no] turn on the DHCP server for the network autoconfiguration of all the units connected to the VDE SLIRP_NETWORK="" # specify the network address (default 10.0.2.0) # other options to parse to slirpvde -SLIRP_OPTIONS=""
\ No newline at end of file +SLIRP_OPTIONS="" diff --git a/extra/vde2/vde.conf b/extra/vde2/vde.conf deleted file mode 100644 index bc61dceda..000000000 --- a/extra/vde2/vde.conf +++ /dev/null @@ -1,11 +0,0 @@ -# Set options for a vde daemon script -# -# Array for your vde config files, eg.: "internal-net external-net" -# You need a config file in /etc/vde/ with the same name. -# Sample config file provided: /etc/vde/vde-config.sample -VDE_CONFIG="" - -# Array for your dpipe connections, eg.: "connect-switches" -# You need a config file in /etc/vde/ with the same name. -# Sample config file provided: /etc/vde/vde-connection.sample -VDE_CONNECTION=""
\ No newline at end of file diff --git a/extra/vde2/vde.rc b/extra/vde2/vde.rc deleted file mode 100755 index b368f9955..000000000 --- a/extra/vde2/vde.rc +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/vde - -case "$1" in - start) - # bring up all defined profiles - for i in $VDE_CONFIG; do - [ -e /etc/vde/$i ] && . /etc/vde/$i - stat_busy "Starting vde_switch $i" - # get options from profile - [ -n "$VDE_NUMPORTS" ] && OPTIONS="-n $VDE_NUMPORTS" - [ "$VDE_HUB" = "yes" ] && OPTIONS="$OPTIONS -x" - [ "$VDE_FSTP" = "yes" ] && OPTIONS="$OPTIONS -F" - [ -n "$VDE_MAC" ] && OPTIONS="$OPTIONS --macaddr $VDE_MAC" - [ -n "$VDE_PRIORITY" ] && OPTIONS="$OPTIONS --priority $VDE_PRIORITY" - [ -n "$VDE_HASH" ] && OPTIONS="$OPTIONS --hashsize $VDE_HASH" - [ -n "$VDE_SOCK" ] && OPTIONS="$OPTIONS -s $VDE_SOCK" - [ -n "$VDE_SOCK_MODE" ] && OPTIONS="$OPTIONS -m $VDE_SOCK_MODE" - [ -n "$VDE_SOCK_GROUP" ] && OPTIONS="$OPTIONS -g $VDE_SOCK_GROUP" - [ -n "$VDE_MANAGEMENT_SOCK" ] && OPTIONS="$OPTIONS -M $VDE_MANAGEMENT_SOCK" - [ -n "$VDE_MANAGEMENT_SOCK_MODE" ] && OPTIONS="$OPTIONS --mgmtmode $VDE_MANAGEMENT_SOCK_MODE" - [ -n "$VDE_TAP" ] && OPTIONS="$OPTIONS -t $VDE_TAP" - [ -n "$VDE_OPTIONS" ] && OPTIONS="$OPTIONS $VDE_OPTIONS" - vde_switch $OPTIONS -p /var/run/vde-$i.pid -daemon &>/dev/null - [ -n "$VDE_SOCK" -a -n "$VDE_SOCK_GROUP" ] && chgrp "$VDE_SOCK_GROUP" "$VDE_SOCK" - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - if [ "$SLIRP" = "yes" ]; then - stat_busy "Starting slirpvde for $i" - [ "$SLIRP_DHCP" = "yes" ] && SP_OPTIONS="-D" - [ -n "$SLIRP_NETWORK" ] && SP_OPTIONS="$SP_OPTIONS -n $SLIRP_NETWORK" - [ -n "$SLIRP_OPTIONS" ] && SP_OPTIONS="$SP_OPTIONS $SLIRP_OPTIONS" - [ -n "$VDE_SOCK" ] && SP_OPTIONS="$SP_OPTIONS -s $VDE_SOCK" - [ -n "$VDE_SOCK_MODE" ] && SP_OPTIONS="$SP_OPTIONS -m $VDE_SOCK_MODE" - [ -n "$VDE_SOCK_GROUP" ] && SP_OPTIONS="$SP_OPTIONS -g $VDE_SOCK_GROUP" - slirpvde $SP_OPTIONS -p /var/run/slirpvde-$i.pid -daemon &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - unset OPTIONS - unset SP_OPTIONS - fi - done - for i in $VDE_CONNECTION; do - # connect specified vde_switches - if [ "$(grep ^vde_plug /etc/vde/$i)" ]; then - stat_busy "Connecting VDE switches $i together..." - while read j; do - switch="$(echo $j | grep ^vde_plug)" - [ -n "$switch" ] && (dpipe $switch &) - done </etc/vde/$i - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - fi - done - add_daemon vde - ;; - stop) - # kill vde_plug if switches are connected - [ -n "$VDE_CONNECTION" ] && killall vde_plug >/dev/null 2>&1 - for i in $VDE_CONFIG; do - [ -e /etc/vde/$i ] && . /etc/vde/$i - if [ "$SLIRP" = "yes" ]; then - stat_busy "Stopping slirpvde for $i" - kill $(cat /var/run/slirpvde-$i.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - rm /var/run/slirpvde-$i.pid &> /dev/null - fi - stat_busy "Stopping vde_switch $i" - kill $(cat /var/run/vde-$i.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - rm /var/run/vde-$i.pid &> /dev/null - stat_busy "Removing $i vde sockets" - rm -rf $VDE_SOCK $VDE_MANAGEMENT_SOCK - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - done - unset OPTIONS - unset SP_OPTIONS - [ -e /var/run/vde/gmon.out ] && rm /var/run/vde/gmon.out - rm_daemon vde - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/vde2/vde2.install b/extra/vde2/vde2.install index 74e1710ff..bf538e01f 100644 --- a/extra/vde2/vde2.install +++ b/extra/vde2/vde2.install @@ -1,5 +1,4 @@ post_install() { - echo "Change /etc/conf.d/vde to your needs." echo "vde config files should be placed in /etc/vde, sample files are provided." echo "iptables and dhcpd sample files have been installed to '/usr/share/vde2'." echo "Merge those examples, if needed to the according config files." diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 43b3b8dce..7128a15fa 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -10,7 +10,7 @@ _patchlevel=918 __hgrev=c61da758a9a2 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom:vim') url="http://www.vim.org" diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 0b5a3ed0e..89e79b0ef 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184445 2013-05-06 19:40:05Z foutrelis $ +# $Id: PKGBUILD 186492 2013-05-27 19:38:42Z 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.6 -pkgrel=2 +pkgver=2.0.7 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -13,10 +13,9 @@ license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' - 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' - 'xcb-util-keysyms') + 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms') makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' - 'fluidsynth' 'libdc1394' 'libavc1394' + 'libdc1394' 'libavc1394' 'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd' 'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' @@ -47,7 +46,6 @@ optdepends+=('libcaca: for colored ASCII art video output' 'xosd: for xosd support' 'aalib: for ASCII art plugin' 'libmtp: for MTP devices support' - 'fluidsynth: for synthesizer MIDI FluidSynth' 'smbclient: for SMB access plugin' 'libcdio: for audio CD playback support' 'ttf-freefont: for subtitle font ' @@ -61,7 +59,7 @@ backup=('usr/share/vlc/lua/http/.hosts' options=('!libtool' '!emptydirs') install=vlc.install source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('b45be633c71dca04ca7d6c3d64dd728b') +md5sums=('3b0e465b0990097b65abaf3e25589957') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index d67f26041..cc5c661b3 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,30 +1,24 @@ -# $Id: PKGBUILD 180587 2013-03-23 23:09:44Z td123 $ +# $Id: PKGBUILD 186429 2013-05-26 09:26:13Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat -pkgver=0.4.0 -pkgrel=3 +pkgver=0.4.1 +pkgrel=2 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.weechat.org/" license=('GPL') depends=('gnutls' 'curl' 'libgcrypt') -makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl>=8.6.0' 'ruby' 'aspell' 'guile') +makedepends=('cmake' 'pkg-config' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile') optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile') options=('!libtool') -source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2" - 'ruby-2.0.0-crash-fix.diff') -md5sums=('b2e10ca1e3a72142fcc8d58c7c774b1b' - '8bafb0ec603af018e2d66155640685b4') +source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('071d6f1cd21c892cae126af21095c43f') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # fix: https://bugs.archlinux.org/task/34342 - # original commit: http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=commit;h=4fdbb83a079f24a742633fd4d02084911580c19c - patch -Np1 -i ${srcdir}/ruby-2.0.0-crash-fix.diff - mkdir build cd build cmake .. -DPREFIX=/usr \ diff --git a/extra/weechat/ruby-2.0.0-crash-fix.diff b/extra/weechat/ruby-2.0.0-crash-fix.diff deleted file mode 100644 index bfc816ade..000000000 --- a/extra/weechat/ruby-2.0.0-crash-fix.diff +++ /dev/null @@ -1,76 +0,0 @@ -X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=blobdiff_plain;f=src%2Fplugins%2Fruby%2Fweechat-ruby-api.c;h=101caec961829de03f8097edc63f497eab99aaa3;hp=bbc2fbcbe3c5290a8a975c4676a85a8c7e0998b7;hb=4fdbb83a079f24a742633fd4d02084911580c19c;hpb=55e58811b3df451db4f95b1035a39f5659788989 - -diff --git a/src/plugins/ruby/weechat-ruby-api.c b/src/plugins/ruby/weechat-ruby-api.c -index bbc2fbc..101caec 100644 ---- a/src/plugins/ruby/weechat-ruby-api.c -+++ b/src/plugins/ruby/weechat-ruby-api.c -@@ -1333,28 +1333,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file, - VALUE description, VALUE string_values, - VALUE min, VALUE max, VALUE default_value, - VALUE value, VALUE null_value_allowed, -- VALUE function_check_value, -- VALUE data_check_value, -- VALUE function_change, -- VALUE data_change, -- VALUE function_delete, -- VALUE data_delete) -+ VALUE callbacks) - { - char *c_config_file, *c_section, *c_name, *c_type, *c_description; - char *c_string_values, *c_default_value, *c_value; - char *c_function_check_value, *c_data_check_value, *c_function_change; - char *c_data_change, *c_function_delete, *c_data_delete, *result; - int c_min, c_max, c_null_value_allowed; -- VALUE return_value; -+ VALUE function_check_value, data_check_value, function_change, data_change; -+ VALUE function_delete, data_delete, return_value; - - API_FUNC(1, "config_new_option", API_RETURN_EMPTY); - if (NIL_P (config_file) || NIL_P (section) || NIL_P (name) || NIL_P (type) - || NIL_P (description) || NIL_P (string_values) || NIL_P (min) - || NIL_P (max) || NIL_P (default_value) || NIL_P (value) -- || NIL_P (null_value_allowed) || NIL_P (function_check_value) -- || NIL_P (data_check_value) || NIL_P (function_change) -- || NIL_P (data_change) || NIL_P (function_delete) -- || NIL_P (data_delete)) -+ || NIL_P (null_value_allowed) || NIL_P (callbacks)) - API_WRONG_ARGS(API_RETURN_EMPTY); - - Check_Type (config_file, T_STRING); -@@ -1368,12 +1361,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file, - Check_Type (default_value, T_STRING); - Check_Type (value, T_STRING); - Check_Type (null_value_allowed, T_FIXNUM); -- Check_Type (function_check_value, T_STRING); -- Check_Type (data_check_value, T_STRING); -- Check_Type (function_change, T_STRING); -- Check_Type (data_change, T_STRING); -- Check_Type (function_delete, T_STRING); -- Check_Type (data_delete, T_STRING); -+ Check_Type (callbacks, T_ARRAY); -+ -+ /* -+ * due to a Ruby limitation (15 arguments max by function), we receive the -+ * the callbacks in an array of 6 strings (3 callbacks + 3 data) -+ */ -+ if (RARRAY_LEN(callbacks) != 6) -+ API_WRONG_ARGS(API_RETURN_EMPTY); -+ -+ function_check_value = rb_ary_entry (callbacks, 0); -+ data_check_value = rb_ary_entry (callbacks, 1); -+ function_change = rb_ary_entry (callbacks, 2); -+ data_change = rb_ary_entry (callbacks, 3); -+ function_delete = rb_ary_entry (callbacks, 4); -+ data_delete = rb_ary_entry (callbacks, 5); - - c_config_file = StringValuePtr (config_file); - c_section = StringValuePtr (section); -@@ -5915,7 +5917,7 @@ weechat_ruby_api_init (VALUE ruby_mWeechat) - API_DEF_FUNC(config_new, 3); - API_DEF_FUNC(config_new_section, 14); - API_DEF_FUNC(config_search_section, 2); -- API_DEF_FUNC(config_new_option, 17); -+ API_DEF_FUNC(config_new_option, 12); - API_DEF_FUNC(config_search_option, 3); - API_DEF_FUNC(config_string_to_boolean, 1); - API_DEF_FUNC(config_option_reset, 2); diff --git a/extra/wireshark/01_patch-automake-1.13.diff b/extra/wireshark/01_patch-automake-1.13.diff deleted file mode 100644 index cf03fa060..000000000 --- a/extra/wireshark/01_patch-automake-1.13.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.init 2013-02-02 22:11:27.140322526 +0100 -+++ configure.in 2013-02-02 22:11:42.863854681 +0100 -@@ -1960,7 +1960,7 @@ - sinclude(asn1/Custom.m4) dnl - ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_OUTPUT( - Makefile - doxygen.cfg diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 94d554263..4e7d51f14 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182116 2013-04-07 20:47:05Z guillaume $ +# $Id: PKGBUILD 186024 2013-05-20 14:35:40Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.8.6 -pkgrel=2 +pkgver=1.8.7 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' @@ -12,17 +12,13 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' url='http://www.wireshark.org/' options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 - 01_patch-automake-1.13.diff 02_enable-version.diff) -sha256sums=('2722ed3e926c26648faec31a81b7881d829df85762c21794b9dd9e4f227331ea' - '388a9cf4c924c32a0f7ee8ffeaae060cdbf0c712bcc0032d5dfaa5717b217b80' +sha256sums=('5c7e429c1e410289b49d65a2e635e00c0becdcb56fe703a1d3e7b5e275fca842' 'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b') build() { cd "${srcdir}/${pkgbase}-${pkgver}" -# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8202 - patch -p0 < ${srcdir}/01_patch-automake-1.13.diff patch -p0 < ${srcdir}/02_enable-version.diff ./autogen.sh diff --git a/extra/wireshark/wireshark.install b/extra/wireshark/wireshark.install index 69adcc4bc..001bd0c58 100644 --- a/extra/wireshark/wireshark.install +++ b/extra/wireshark/wireshark.install @@ -1,14 +1,14 @@ post_install() { /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group" } post_upgrade() { /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - - /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + + /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap } post_remove() { diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index d31c79eea..298458759 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185846 2013-05-19 15:18:38Z andyrtr $ +# $Id: PKGBUILD 186036 2013-05-20 18:09:21Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> @@ -8,7 +8,7 @@ pkgname=x2goserver pkgver=4.0.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Open source terminal server" arch=('i686' 'x86_64' 'mips64el') url="http://www.x2go.org/" @@ -19,13 +19,20 @@ makedepends=('man2html') options=('emptydirs') install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') -source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) +source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz + x2goserver.service + revert.patch) md5sums=('6b8cecfdd31a8877203f50d3666c265f' - 'f76081c01e40b6206895d194dc949707') + 'f76081c01e40b6206895d194dc949707' + 'c487c31e7c0aa9a73323313007497764') build() { cd "${srcdir}/${pkgname}-${pkgver}" -#return 1 + + # revert an upstream commit that breaks sessions showing up + # http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=011d14ae076ba6fec96cd1e019c4f82444ab0f9f + patch -Rp1 -i ${srcdir}/revert.patch + # -r option does not exist in Arch linux # (However, html man pages do not get installed anyway...) for Makefile in $(find . -type f -name Makefile); do @@ -49,9 +56,8 @@ package() { install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" # X2go homedir + printing spool dir - #install -dm 755 $pkgdir/var/lib/x2go install -dm 770 $pkgdir/var/lib/x2go - install -dm 755 $pkgdir/var/spool/x2go + install -dm 770 $pkgdir/var/spool/x2go # load fuse module at system start install -dm755 $pkgdir/lib/modules-load.d diff --git a/extra/x2goserver/revert.patch b/extra/x2goserver/revert.patch new file mode 100644 index 000000000..023bbd18c --- /dev/null +++ b/extra/x2goserver/revert.patch @@ -0,0 +1,152 @@ +From 011d14ae076ba6fec96cd1e019c4f82444ab0f9f Mon Sep 17 00:00:00 2001 +From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Date: Sun, 19 May 2013 00:41:32 +0200 +Subject: [PATCH] Security fix for setgid wrapper x2gosqlitewrapper.c. + Hard-code path to x2gosqlitewrapper.pl during build via + defining a macro in the Makefile. Thanks to Richard + Weinberger for spotting this!!! + +--- + Makefile | 2 +- + debian/changelog | 3 +++ + debian/rules | 4 +-- + x2goserver/Makefile | 4 +-- + x2goserver/x2gosqlitewrapper.c | 54 +++------------------------------------- + 5 files changed, 12 insertions(+), 55 deletions(-) + +diff --git a/Makefile b/Makefile +index 3be40f9..588084f 100755 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ RM_FILE=rm -f + RM_DIR=rmdir -p --ignore-fail-on-non-empty + + DESTDIR= +-PREFIX=/usr/local ++PREFIX ?= /usr/local + ETCDIR=/etc/x2go + LIBDIR=$(PREFIX)/lib/x2go + SHAREDIR=$(PREFIX)/share/x2go +diff --git a/debian/changelog b/debian/changelog +index 470a502..2cf2dde 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -12,6 +12,9 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low + * New upstream version (4.0.0.2): + - Use make_path from File::Path in x2godbadmin to create user directory if + not present. (Fixes: #200). ++ - Security fix for setgid wrapper x2gosqlitewrapper.c. Hard-code path to ++ x2gosqlitewrapper.pl during build via defining a macro in the Makefile. ++ Thanks to Richard Weinberger for spotting this!!! + /debian/control: + + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: + #163). +diff --git a/debian/rules b/debian/rules +index b32e08d..5bb94b2 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -1,10 +1,10 @@ + #!/usr/bin/make -f + + %: +- dh $@ ++ PREFIX=/usr dh $@ + + override_dh_auto_install: +- make -f Makefile build-arch ++ PREFIX=/usr make -f Makefile build-arch + + override_dh_auto_clean: + rm -fv x2gosqlitewrapper +diff --git a/x2goserver/Makefile b/x2goserver/Makefile +index 4287478..e9d56e6 100755 +--- a/x2goserver/Makefile ++++ b/x2goserver/Makefile +@@ -15,7 +15,7 @@ RM_FILE=rm -f + RM_DIR=rmdir -p --ignore-fail-on-non-empty + + DESTDIR= +-PREFIX=/usr/local ++PREFIX ?= /usr/local + ETCDIR=/etc/x2go + BINDIR=$(PREFIX)/bin + SBINDIR=$(PREFIX)/sbin +@@ -41,7 +41,7 @@ build: build-arch build-indep + build-arch: build_setgidwrappers + + build_setgidwrappers: +- $(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gosqlitewrapper.pl\" -o x2gosqlitewrapper x2gosqlitewrapper.c + + build-indep: build_man2html + +diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c +index a134efc..ad95eff 100644 +--- a/x2goserver/x2gosqlitewrapper.c ++++ b/x2goserver/x2gosqlitewrapper.c +@@ -21,58 +21,12 @@ + * + */ + +-#include <stdio.h> +-#include <stdlib.h> +-#include <unistd.h> +-#include <libgen.h> +-#include <errno.h> +- + int main( int argc, char *argv[] ) { +- char * x2gosqlitewrapper = NULL; +- size_t path_max; +- +-/* +- The following snippet is taken from the realpath manpage +-*/ +-#ifdef PATH_MAX +- path_max = PATH_MAX; +-#else +- path_max = pathconf (".", _PC_PATH_MAX); +- if (path_max <= 0){ +- path_max = 4096; +- } +-#endif +- { +- // allocate dynamic buffer in stack: this needs C99 or gnu?? +- char buffer[path_max]; +- ssize_t rvrl; +- int rvap; +- +- // resolve link of /proc/self/exe to find out where we are +- rvrl = readlink("/proc/self/exe", buffer, path_max); +- if(rvrl == -1){ +- perror("readlink(\"/proc/self/exe\",buffer,path_max)"); +- exit(EXIT_FAILURE); +- } +- if(rvrl >= path_max){ +- fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max); +- exit(EXIT_FAILURE); +- } +- +- // derive the full path of x2gosqlitewrapper.pl from path of this binary +- rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "x2gosqlitewrapper.pl"); +- if(rvap == -1){ +- fprintf(stderr, "Failed to allocate memory calling asprintf\n"); +- exit(EXIT_FAILURE); +- } +- +- // execute the script, running with user-rights of this binary +- execv(x2gosqlitewrapper, argv); + +- } ++ char x2gosqlitewrapper[] = TRUSTED_BINARY; + +- // ...fail +- fprintf(stderr, "Failed to execute %s: %s\n", x2gosqlitewrapper, strerror(errno)); +- return EXIT_FAILURE; ++ argv[0] = "x2gosqlitewrapper.pl"; ++ // execute the script, running with user-rights of this binary ++ execv(x2gosqlitewrapper, argv); + + } +-- +1.7.9.5 + diff --git a/extra/x2goserver/x2goserver.install b/extra/x2goserver/x2goserver.install index cac06dac8..223eaac62 100644 --- a/extra/x2goserver/x2goserver.install +++ b/extra/x2goserver/x2goserver.install @@ -39,7 +39,7 @@ post_install() { # fix permissions - see INSTALL file chown -R x2goprint:x2goprint /var/spool/x2go chmod 0770 /var/spool/x2go - + chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper chmod 2755 /usr/lib/x2go/x2gosqlitewrapper diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 19c5ed42f..2f0f13e72 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182343 2013-04-08 15:23:26Z andyrtr $ +# $Id: PKGBUILD 186484 2013-05-27 13:17:23Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.6 +pkgver=2.21.8 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9') +sha256sums=('4d850c0515012ca370a72469dfbfa6161aa9ee5bb39779fab5f496f2d94acf8f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD index 4a2d01826..5d38408b6 100644 --- a/extra/xf86-video-openchrome/PKGBUILD +++ b/extra/xf86-video-openchrome/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180937 2013-03-28 18:10:47Z andyrtr $ +# $Id: PKGBUILD 186307 2013-05-24 13:57:21Z andyrtr $ # Contributor: Paul Mattal <paul@mattal.com> # Maintainer: Juergen Hoetzel <juergen@hoetzel.info> pkgname=xf86-video-openchrome -pkgver=0.3.2 +pkgver=0.3.3 pkgrel=1 pkgdesc="X.Org Openchrome drivers" arch=(i686 x86_64) @@ -16,7 +16,7 @@ replaces=('openchrome' 'xf86-video-via') groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs' '!makeflags') source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('e5be9a8200410b3e3e66349bab4c8acd1ead4402') +sha1sums=('1f7b23d4ed53417eda5c6730486b36812f469295') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xfce4-dict/PKGBUILD b/extra/xfce4-dict/PKGBUILD index 9dcac1ab6..5d68de766 100644 --- a/extra/xfce4-dict/PKGBUILD +++ b/extra/xfce4-dict/PKGBUILD @@ -1,41 +1,41 @@ -# $Id: PKGBUILD 157851 2012-04-30 04:20:17Z foutrelis $ +# $Id: PKGBUILD 186157 2013-05-21 10:21:01Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-dict -pkgver=0.6.0 -pkgrel=3 +pkgver=0.7.0 +pkgrel=1 pkgdesc="A dictionary plugin for the Xfce panel" arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') url="http://goodies.xfce.org/projects/applications/xfce4-dict" +license=('GPL2') groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme' 'librsvg') +depends=('xfce4-panel' 'librsvg' 'hicolor-icon-theme') makedepends=('intltool') provides=('xfce4-dict-plugin') conflicts=('xfce4-dict-plugin') replaces=('xfce4-dict-plugin') options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/apps/xfce4-dict/0.6/xfce4-dict-${pkgver}.tar.bz2) -md5sums=('c371c5c0bbe45a2bfac336cfe01dfe01') +install=$pkgname.install +source=(http://archive.xfce.org/src/apps/$pkgname/0.7/$pkgname-$pkgver.tar.bz2) +sha256sums=('407fc0f02adf6ea85dec6993db1e222b548afcdd63a9e35ed2d70a42c9738e58') build() { - cd ${srcdir}/xfce4-dict-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - # Work around DSO linking issue - LDFLAGS+=' -Wl,--copy-dt-needed-entries' - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug make } package() { - cd ${srcdir}/xfce4-dict-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-dict/xfce4-dict.install b/extra/xfce4-dict/xfce4-dict.install index 21b79d2d4..e4f8fd06c 100644 --- a/extra/xfce4-dict/xfce4-dict.install +++ b/extra/xfce4-dict/xfce4-dict.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/xfconf/PKGBUILD b/extra/xfconf/PKGBUILD index ff934d36a..ad711b53a 100644 --- a/extra/xfconf/PKGBUILD +++ b/extra/xfconf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160585 2012-06-02 10:29:16Z bluewind $ +# $Id: PKGBUILD 186431 2013-05-26 09:26:17Z bluewind $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfconf pkgver=4.10.0 -pkgrel=2 +pkgrel=3 pkgdesc="A simple client-server configuration storage and query system" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" @@ -13,8 +13,8 @@ groups=('xfce4') # http://www.xfce.org/documentation/requirements # keep dbus, see also http://bugs.archlinux.org/task/14536 depends=('libxfce4util' 'dbus-glib' 'dbus') -makedepends=('pkgconfig' 'perl-extutils-depends' 'perl-extutils-pkgconfig' - 'glib-perl' 'intltool' 'gtk-doc' 'chrpath') +makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig' 'glib-perl' + 'intltool' 'gtk-doc' 'chrpath') options=('!libtool' '!emptydirs') source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) sha256sums=('175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576') diff --git a/extra/xorg-xdpyinfo/PKGBUILD b/extra/xorg-xdpyinfo/PKGBUILD index 6c589a7ee..dc1b608d5 100644 --- a/extra/xorg-xdpyinfo/PKGBUILD +++ b/extra/xorg-xdpyinfo/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 176903 2013-02-02 07:12:27Z andyrtr $ +# $Id: PKGBUILD 186272 2013-05-23 15:31:13Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xdpyinfo -pkgver=1.3.0 -pkgrel=2 +pkgver=1.3.1 +pkgrel=1 pkgdesc="Display information utility for X" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 'l makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xdpyinfo-${pkgver}.tar.bz2) -sha256sums=('23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f') +sha256sums=('aef9285069a517ed870e5d8a02d13f7d8a953d7f7220146da563e04c7f128b94') build() { cd "${srcdir}/xdpyinfo-${pkgver}" diff --git a/extra/xorg-xlsfonts/PKGBUILD b/extra/xorg-xlsfonts/PKGBUILD new file mode 100644 index 000000000..a2a623685 --- /dev/null +++ b/extra/xorg-xlsfonts/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 156352 2012-04-17 16:02:26Z andyrtr $ +# Contributor: Jan de Groot <jgc@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=xorg-xlsfonts +pkgver=1.0.4 +pkgrel=1 +pkgdesc='List available X fonts' +url='http://xorg.freedesktop.org/' +license=('custom') +arch=('i686' 'x86_64') +depends=('libx11') +makedepends=('xorg-util-macros') +source=("http://xorg.freedesktop.org/archive/individual/app/xlsfonts-${pkgver}.tar.bz2") +sha1sums=('6fc23537797bb1ae4945efd8c01e675edf4a4c3f') + +build() { + cd "${srcdir}/xlsfonts-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xlsfonts-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 2133e855a..05f9129a2 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183672 2013-04-26 12:52:31Z andyrtr $ +# $Id: PKGBUILD 186582 2013-05-29 15:27:30Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=292 +pkgver=293 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('d6e7d1bd31b23fb58ca213c912f32009' +md5sums=('f9dc37486d5f1e550b6dc2e26a8a0439' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index a1e90b3b6..ca6fbb0fa 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 183701 2013-04-27 10:47:26Z tpowa $ +# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.8 -pkgver=${_basekernel}.11 +_basekernel=3.9 +pkgver=${_basekernel}.4 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" # the main kernel config files 'config' # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch') -md5sums=('5c7787be882c343e41fb49136ff60aec' - 'c0ccd5624a61eaae1a00a349e90b5a26' - '6294513cfa9830d48ad1915ff7053a98' +md5sums=('120df29f88622dabf7015a22c7cc8e25' + 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + '7985f1e2cdb6838cf89bd85c0229db6a' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') @@ -35,7 +35,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" fi # Add freedo as boot logo @@ -288,7 +288,7 @@ _package-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} } pkgname=("${pkgbase}" "${pkgbase}-headers") diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index 11b5bb531..dd3549ac6 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.8.5-1 Kernel Configuration +# Linux/x86 3.9.3-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -41,14 +41,12 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" CONFIG_ARCH_CPU_PROBE_RELEASE=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_HAVE_IRQ_WORK=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # -CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="-LIBRE-PAE" @@ -120,6 +118,7 @@ CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y +CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_FANOUT=32 CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_FANOUT_EXACT is not set @@ -216,14 +215,18 @@ CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_KPROBES_ON_FTRACE=y CONFIG_UPROBES=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_KPROBES_ON_FTRACE=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_CONTIGUOUS=y @@ -248,8 +251,9 @@ CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_MODULES_USE_ELF_REL=y -CONFIG_GENERIC_SIGALTSTACK=y CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OLD_SIGACTION=y # # GCOV-based kernel profiling @@ -322,6 +326,8 @@ CONFIG_SMP=y CONFIG_X86_MPPARSE=y # CONFIG_X86_BIGSMP is not set # CONFIG_X86_EXTENDED_PLATFORM is not set +# CONFIG_X86_GOLDFISH is not set +# CONFIG_X86_INTEL_LPSS is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_X86_32_IRIS=m CONFIG_SCHED_OMIT_FRAME_POINTER=y @@ -404,6 +410,9 @@ CONFIG_MICROCODE=m CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_MICROCODE_INTEL_LIB=y +CONFIG_MICROCODE_INTEL_EARLY=y +CONFIG_MICROCODE_EARLY=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m # CONFIG_NOHIGHMEM is not set @@ -425,6 +434,7 @@ CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_MEMORY_ISOLATION=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_BALLOON_COMPACTION=y @@ -527,9 +537,9 @@ CONFIG_ACPI_THERMAL=m CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=m +CONFIG_ACPI_PCI_SLOT=y CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m @@ -570,6 +580,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # # x86 CPU frequency scaling drivers # +CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ_CPB=y @@ -816,6 +827,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=y CONFIG_NF_CT_PROTO_DCCP=m CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m @@ -888,9 +900,11 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m # Xtables matches # CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_BPF=m CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m @@ -988,7 +1002,6 @@ CONFIG_IP_VS_PE_SIP=m CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set -CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -1065,7 +1078,7 @@ CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m # -# DCCP CCIDs Configuration (EXPERIMENTAL) +# DCCP CCIDs Configuration # # CONFIG_IP_DCCP_CCID2_DEBUG is not set CONFIG_IP_DCCP_CCID3=y @@ -1101,8 +1114,10 @@ CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m CONFIG_STP=m +CONFIG_MRP=m CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_HAVE_NET_DSA=y CONFIG_NET_DSA=m CONFIG_NET_DSA_TAG_DSA=y @@ -1110,6 +1125,7 @@ CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_DSA_TAG_TRAILER=y CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_VLAN_8021Q_MVRP=y # CONFIG_DECNET is not set CONFIG_LLC=m CONFIG_LLC2=m @@ -1126,7 +1142,6 @@ CONFIG_IPDDP_ENCAP=y CONFIG_IPDDP_DECAP=y # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_WAN_ROUTER is not set CONFIG_PHONET=m CONFIG_IEEE802154=m CONFIG_IEEE802154_6LOWPAN=m @@ -1195,6 +1210,8 @@ CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y # CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m +CONFIG_VSOCKETS=m +CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -1381,6 +1398,8 @@ CONFIG_NFC_HCI=m # CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m +CONFIG_NFC_PN544=m +CONFIG_NFC_MICROREAD=m # # Device Drivers @@ -1397,6 +1416,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" +# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set @@ -1419,6 +1439,7 @@ CONFIG_MTD_REDBOOT_PARTS=m CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_OF_PARTS=m CONFIG_MTD_AR7_PARTS=m @@ -1582,7 +1603,6 @@ CONFIG_ISAPNP=y CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_XD is not set # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_CPQ_DA=m @@ -1611,6 +1631,7 @@ CONFIG_ATA_OVER_ETH=m CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_RBD=m +CONFIG_BLK_DEV_RSXX=m # # Misc devices @@ -1626,6 +1647,7 @@ CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ICS932S401=m +# CONFIG_ATMEL_SSC is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_CS5535_MFGPT=m CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 @@ -1647,6 +1669,7 @@ CONFIG_BMP085_I2C=m # CONFIG_BMP085_SPI is not set # CONFIG_PCH_PHUB is not set CONFIG_USB_SWITCH_FSA9480=m +# CONFIG_LATTICE_ECP3_CONFIG is not set CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -1674,6 +1697,8 @@ CONFIG_SENSORS_LIS3_I2C=m # CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=y +CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1769,6 +1794,7 @@ CONFIG_SCSI_MPT3SAS=m CONFIG_SCSI_MPT3SAS_MAX_SGE=128 CONFIG_SCSI_MPT3SAS_LOGGING=y CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_FLASHPOINT is not set @@ -1851,6 +1877,7 @@ CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y CONFIG_ATA_ACPI=y +CONFIG_SATA_ZPODD=y CONFIG_SATA_PMP=y # @@ -1956,7 +1983,6 @@ CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m -# CONFIG_MULTICORE_RAID456 is not set CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m @@ -1968,6 +1994,9 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_MQ=m +CONFIG_DM_CACHE_CLEANER=m CONFIG_DM_MIRROR=m CONFIG_DM_RAID=m CONFIG_DM_LOG_USERSPACE=m @@ -2094,7 +2123,6 @@ CONFIG_NET_DSA_MV88E6123_61_65=m CONFIG_ETHERNET=y CONFIG_MDIO=m CONFIG_NET_VENDOR_3COM=y -CONFIG_EL1=m CONFIG_EL3=m CONFIG_3C515=m CONFIG_PCMCIA_3C574=m @@ -2110,7 +2138,6 @@ CONFIG_NET_VENDOR_AMD=y CONFIG_AMD8111_ETH=m CONFIG_LANCE=m CONFIG_PCNET32=m -CONFIG_DEPCA=m CONFIG_PCMCIA_NMCLAN=m CONFIG_NI65=m CONFIG_NET_VENDOR_ATHEROS=y @@ -2130,6 +2157,7 @@ CONFIG_BNX2=m CONFIG_CNIC=m CONFIG_TIGON3=m CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y CONFIG_NET_VENDOR_BROCADE=y CONFIG_BNA=m CONFIG_NET_CALXEDA_XGMAC=m @@ -2146,7 +2174,6 @@ CONFIG_NET_VENDOR_CISCO=y CONFIG_ENIC=m CONFIG_DNET=m CONFIG_NET_VENDOR_DEC=y -CONFIG_EWRK3=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_DE2104X_DSL=0 @@ -2160,8 +2187,6 @@ CONFIG_DM9102=m CONFIG_ULI526X=m CONFIG_PCMCIA_XIRCOM=m CONFIG_NET_VENDOR_DLINK=y -CONFIG_DE600=m -CONFIG_DE620=m CONFIG_DL2K=m CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set @@ -2172,9 +2197,7 @@ CONFIG_S2IO=m CONFIG_VXGE=m # CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_NET_VENDOR_FUJITSU=y -CONFIG_AT1700=m CONFIG_PCMCIA_FMVJ18X=m -CONFIG_ETH16I=m CONFIG_NET_VENDOR_HP=y CONFIG_HP100=m CONFIG_NET_VENDOR_INTEL=y @@ -2182,6 +2205,7 @@ CONFIG_E100=m CONFIG_E1000=m CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGB_HWMON=y CONFIG_IGB_DCA=y CONFIG_IGBVF=m CONFIG_IXGB=m @@ -2190,14 +2214,6 @@ CONFIG_IXGBE_HWMON=y CONFIG_IXGBE_DCA=y CONFIG_IXGBEVF=m CONFIG_NET_VENDOR_I825XX=y -CONFIG_ELPLUS=m -CONFIG_EL16=m -CONFIG_APRICOT=m -CONFIG_EEXPRESS=m -CONFIG_EEXPRESS_PRO=m -CONFIG_LP486E=m -CONFIG_NI52=m -CONFIG_ZNET=m CONFIG_IP1000=m CONFIG_JME=m CONFIG_NET_VENDOR_MARVELL=y @@ -2226,12 +2242,7 @@ CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NATSEMI=m CONFIG_NS83820=m CONFIG_NET_VENDOR_8390=y -CONFIG_EL2=m -CONFIG_AC3200=m CONFIG_PCMCIA_AXNET=m -CONFIG_E2100=m -CONFIG_HPLAN_PLUS=m -CONFIG_HPLAN=m CONFIG_NE2000=m CONFIG_NE2K_PCI=m CONFIG_PCMCIA_PCNET=m @@ -2250,7 +2261,6 @@ CONFIG_QLA3XXX=m CONFIG_QLCNIC=m CONFIG_QLGE=m CONFIG_NETXEN_NIC=m -CONFIG_NET_VENDOR_RACAL=y CONFIG_NET_VENDOR_REALTEK=y CONFIG_ATP=m CONFIG_8139CP=m @@ -2263,7 +2273,6 @@ CONFIG_R8169=m CONFIG_NET_VENDOR_RDC=y CONFIG_R6040=m CONFIG_NET_VENDOR_SEEQ=y -CONFIG_SEEQ8005=m CONFIG_NET_VENDOR_SILAN=y CONFIG_SC92031=m CONFIG_NET_VENDOR_SIS=y @@ -2365,6 +2374,7 @@ CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_NCM=m @@ -2497,6 +2507,7 @@ CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLDVM=m +CONFIG_IWLMVM=m # # Debugging Options @@ -2551,6 +2562,7 @@ CONFIG_RT2800USB_RT35XX=y CONFIG_RT2800USB_RT53XX=y CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_MMIO=m CONFIG_RT2X00_LIB_PCI=m CONFIG_RT2X00_LIB_USB=m CONFIG_RT2X00_LIB=m @@ -2558,13 +2570,13 @@ CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set +CONFIG_RTLWIFI=m +# CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m CONFIG_RTL8723AE=m CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -# CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y CONFIG_WL1251=m @@ -2575,7 +2587,7 @@ CONFIG_WL18XX=m CONFIG_WLCORE=m # CONFIG_WLCORE_SPI is not set CONFIG_WLCORE_SDIO=m -CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_WILINK_PLATFORM_DATA=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_MWIFIEX=m @@ -2794,6 +2806,7 @@ CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_CYPRESS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -2803,6 +2816,7 @@ CONFIG_MOUSE_PS2_OLPC=y CONFIG_MOUSE_SERIAL=y CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_CYAPA=m CONFIG_MOUSE_INPORT=m # CONFIG_MOUSE_ATIXL is not set CONFIG_MOUSE_LOGIBM=m @@ -2972,6 +2986,7 @@ CONFIG_GAMEPORT_FM801=m # # Character devices # +CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y @@ -3003,9 +3018,11 @@ CONFIG_TRACE_SINK=m # Serial drivers # CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=32 @@ -3034,6 +3051,8 @@ CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_XILINX_PS_UART=m CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m @@ -3079,6 +3098,7 @@ CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m +CONFIG_TCG_ST33_I2C=m CONFIG_TELCLOCK=m CONFIG_DEVPORT=y CONFIG_I2C=m @@ -3106,6 +3126,7 @@ CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m CONFIG_I2C_I801=m CONFIG_I2C_ISCH=m +CONFIG_I2C_ISMT=m CONFIG_I2C_PIIX4=m CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m @@ -3208,6 +3229,7 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_DP83640_PHY=m CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIO_DEVRES=y CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y CONFIG_GPIO_ACPI=y @@ -3223,6 +3245,7 @@ CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_VX855 is not set +# CONFIG_GPIO_LYNXPOINT is not set # # I2C GPIO expanders: @@ -3287,6 +3310,7 @@ CONFIG_BATTERY_OLPC=m # CONFIG_CHARGER_GPIO is not set # CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_SMB347 is not set +# CONFIG_BATTERY_GOLDFISH is not set CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_AVS=y @@ -3365,6 +3389,7 @@ CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m CONFIG_SENSORS_MCP3021=m CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87360=m @@ -3399,6 +3424,7 @@ CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m # CONFIG_SENSORS_ADS7871 is not set CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA209=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_TMP102=m @@ -3431,10 +3457,12 @@ CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -CONFIG_FAIR_SHARE=y -CONFIG_STEP_WISE=y -# CONFIG_USER_SPACE is not set +CONFIG_THERMAL_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +# CONFIG_THERMAL_GOV_USER_SPACE is not set # CONFIG_CPU_THERMAL is not set +# CONFIG_THERMAL_EMULATION is not set +CONFIG_INTEL_POWERCLAMP=m CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -3443,6 +3471,7 @@ CONFIG_WATCHDOG_CORE=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_RETU_WATCHDOG=m CONFIG_ACQUIRE_WDT=m CONFIG_ADVANTECH_WDT=m CONFIG_ALIM1535_WDT=m @@ -3603,8 +3632,10 @@ CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m +# CONFIG_VIDEO_V4L2_INT_DEVICE is not set CONFIG_DVB_CORE=m CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m CONFIG_DVB_MAX_ADAPTERS=8 # CONFIG_DVB_DYNAMIC_MINORS is not set @@ -3705,7 +3736,6 @@ CONFIG_USB_SN9C102=m # # Analog TV USB devices # -CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y @@ -3719,6 +3749,8 @@ CONFIG_VIDEO_STK1160_AC97=y # # Analog/digital TV USB devices # +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3835,7 +3867,6 @@ CONFIG_VIDEO_SAA7164=m # # Media digital TV PCI Adapters # -CONFIG_TTPCI_EEPROM=m CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_CORE=m @@ -3856,6 +3887,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_V4L_PLATFORM_DRIVERS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_VIDEO_SH_VEU=m # CONFIG_V4L_TEST_DRIVERS is not set # @@ -3879,6 +3911,7 @@ CONFIG_RADIO_SHARK2=m CONFIG_I2C_SI4713=m CONFIG_RADIO_SI4713=m CONFIG_USB_KEENE=m +CONFIG_USB_MA901=m CONFIG_RADIO_TEA5764=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_TEF6862=m @@ -3900,18 +3933,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y # # common driver options # +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # # Media ancillary drivers (tuners, sensors, i2c, frontends) # -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_VIDEO_IR_I2C=m # @@ -3953,11 +3987,6 @@ CONFIG_VIDEO_SAA717X=m CONFIG_VIDEO_CX25840=m # -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# # Video encoders # CONFIG_VIDEO_SAA7127=m @@ -4057,6 +4086,7 @@ CONFIG_DVB_TDA826X=m CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_SI21XX=m +CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m CONFIG_DVB_MB86A16=m CONFIG_DVB_TDA10071=m @@ -4168,20 +4198,21 @@ CONFIG_DRM_USB=m CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=m + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m -CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_RADEON_UMS is not set CONFIG_DRM_NOUVEAU=m CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y - -# -# I2C encoder or helper chips -# -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y CONFIG_DRM_MGA=m @@ -4197,9 +4228,11 @@ CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m -CONFIG_STUB_POULSBO=m CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m +# CONFIG_OF_DISPLAY_TIMING is not set +# CONFIG_OF_VIDEOMODE is not set +CONFIG_HDMI=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_DDC=m @@ -4268,6 +4301,7 @@ CONFIG_FB_VOODOO1=m # CONFIG_FB_SM501 is not set # CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m +# CONFIG_FB_GOLDFISH is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set @@ -4286,6 +4320,8 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_LD9040 is not set # CONFIG_LCD_AMS369FG06 is not set +# CONFIG_LCD_LMS501KF03 is not set +# CONFIG_LCD_HX8357 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m @@ -4462,6 +4498,7 @@ CONFIG_SND_ES1968_RADIO=y CONFIG_SND_FM801=m CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_DSP_LOADER=y CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_RECONFIG=y @@ -4478,6 +4515,7 @@ CONFIG_SND_HDA_CODEC_CIRRUS=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CA0110=y CONFIG_SND_HDA_CODEC_CA0132=y +CONFIG_SND_HDA_CODEC_CA0132_DSP=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y @@ -4595,6 +4633,7 @@ CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y @@ -4603,6 +4642,7 @@ CONFIG_HID_SMARTJOYPLUS=m CONFIG_SMARTJOYPLUS_FF=y CONFIG_HID_TIVO=m CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m CONFIG_HID_THRUSTMASTER=m CONFIG_THRUSTMASTER_FF=y CONFIG_HID_WACOM=m @@ -4793,6 +4833,7 @@ CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_XSENS_MT=m CONFIG_USB_SERIAL_ZIO=m CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m @@ -4824,10 +4865,13 @@ CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m CONFIG_USB_EZUSB_FX2=m +CONFIG_USB_HSIC_USB3503=m # # USB Physical Layer drivers # +# CONFIG_OMAP_USB3 is not set +# CONFIG_OMAP_CONTROL_USB is not set CONFIG_USB_ISP1301=m CONFIG_USB_RCAR_PHY=m CONFIG_USB_ATM=m @@ -4859,6 +4903,8 @@ CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_DUMMY_HCD=m CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_U_SERIAL=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4871,7 +4917,7 @@ CONFIG_USB_FUNCTIONFS=m CONFIG_USB_FUNCTIONFS_ETH=y CONFIG_USB_FUNCTIONFS_RNDIS=y CONFIG_USB_FUNCTIONFS_GENERIC=y -# CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_GADGET_TARGET=m CONFIG_USB_G_SERIAL=m CONFIG_USB_MIDI_GADGET=m @@ -4955,12 +5001,14 @@ CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set # CONFIG_LEDS_GPIO is not set CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP55XX_COMMON=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA9633=m # CONFIG_LEDS_DAC124S085 is not set +# CONFIG_LEDS_PWM is not set CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m @@ -5014,6 +5062,7 @@ CONFIG_EDAC_I7300=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_SYSTOHC=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set @@ -5063,6 +5112,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_DS3234 is not set # CONFIG_RTC_DRV_PCF2123 is not set +# CONFIG_RTC_DRV_RX4581 is not set # # Platform RTC drivers @@ -5088,6 +5138,11 @@ CONFIG_RTC_DRV_PCF50633=m # CONFIG_RTC_DRV_MC13XXX=m CONFIG_RTC_DRV_SNVS=m + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set @@ -5096,9 +5151,12 @@ CONFIG_DMADEVICES=y # CONFIG_INTEL_MID_DMAC=m CONFIG_INTEL_IOATDMA=m +CONFIG_DW_DMAC=m +# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set CONFIG_TIMB_DMA=m CONFIG_PCH_DMA=m CONFIG_DMA_ENGINE=y +CONFIG_DMA_OF=y # # DMA Clients @@ -5122,7 +5180,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=y # @@ -5208,6 +5269,7 @@ CONFIG_COMEDI_MULTIQ3=m CONFIG_COMEDI_POC=m CONFIG_COMEDI_PCI_DRIVERS=y CONFIG_COMEDI_8255_PCI=m +CONFIG_COMEDI_ADDI_WATCHDOG=m CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -5300,7 +5362,6 @@ CONFIG_RTS5139=m # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_DUMP_PCM is not set # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m @@ -5308,7 +5369,6 @@ CONFIG_VT6656=m CONFIG_DX_SEP=m CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set -# CONFIG_ZCACHE is not set CONFIG_ZSMALLOC=y CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m @@ -5384,18 +5444,18 @@ CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y CONFIG_CSR_WIFI=m -CONFIG_ZCACHE2=y CONFIG_NET_VENDOR_SILICOM=y CONFIG_SBYPASS=m CONFIG_BPCTL=m CONFIG_CED1401=m CONFIG_DGRP=m -CONFIG_SB105X=m CONFIG_FIREWIRE_SERIAL=m +CONFIG_ZCACHE=y CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m CONFIG_ASUS_LAPTOP=m +CONFIG_CHROMEOS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m @@ -5448,6 +5508,7 @@ CONFIG_CLKSRC_I8253=y CONFIG_CLKEVT_I8253=y CONFIG_I8253_LOCK=y CONFIG_CLKBLD_I8253=y +# CONFIG_MAILBOX is not set CONFIG_IOMMU_API=y CONFIG_IOMMU_SUPPORT=y CONFIG_OF_IOMMU=y @@ -5457,13 +5518,13 @@ CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_FLOPPY_WA=y # -# Remoteproc drivers (EXPERIMENTAL) +# Remoteproc drivers # CONFIG_REMOTEPROC=m CONFIG_STE_MODEM_RPROC=m # -# Rpmsg drivers (EXPERIMENTAL) +# Rpmsg drivers # CONFIG_VIRT_DRIVERS=y # CONFIG_PM_DEVFREQ is not set @@ -5473,11 +5534,11 @@ CONFIG_EXTCON=m # Extcon Device Drivers # CONFIG_EXTCON_GPIO=m -CONFIG_EXTCON_ARIZONA=m CONFIG_MEMORY=y # CONFIG_IIO is not set # CONFIG_VME_BUS is not set CONFIG_PWM=y +CONFIG_IRQCHIP=y CONFIG_IPACK_BUS=m CONFIG_BOARD_TPCI200=m CONFIG_SERIAL_IPOCTAL=m @@ -5548,7 +5609,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set @@ -5613,6 +5674,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m CONFIG_ECRYPT_FS=m +# CONFIG_ECRYPT_FS_MESSAGING is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m @@ -5672,7 +5734,7 @@ CONFIG_NFS_V2=m CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m -# CONFIG_NFS_SWAP is not set +CONFIG_NFS_SWAP=y CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m @@ -5681,6 +5743,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y @@ -5694,8 +5757,9 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_SUNRPC_DEBUG is not set +CONFIG_SUNRPC_DEBUG=y CONFIG_CEPH_FS=m CONFIG_CIFS=m CONFIG_CIFS_STATS=y @@ -5824,8 +5888,6 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set -# CONFIG_PROVE_RCU_DELAY is not set -# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set @@ -5847,6 +5909,12 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set + +# +# RCU Debugging +# +# CONFIG_PROVE_RCU_DELAY is not set +# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_VERBOSE is not set @@ -5869,6 +5937,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y @@ -5876,7 +5945,6 @@ CONFIG_TRACER_MAX_TRACE=y CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y -CONFIG_EVENT_POWER_TRACING_DEPRECATED=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING=y @@ -5889,6 +5957,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_PREEMPT_TRACER is not set CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y +CONFIG_TRACER_SNAPSHOT=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set @@ -5898,6 +5967,7 @@ CONFIG_KPROBE_EVENT=y CONFIG_UPROBE_EVENT=y CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set @@ -6045,6 +6115,8 @@ CONFIG_CRYPTO_VMAC=m # CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -6200,3 +6272,4 @@ CONFIG_CORDIC=m CONFIG_DDR=y CONFIG_MPILIB=m CONFIG_OID_REGISTRY=m +CONFIG_UCS2_STRING=y diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index 76fa87eb8..a5e974c9b 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.11-1-LIBRE-PAE +KERNEL_VERSION=3.9.4-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 77ebe521f..d93b6247b 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -9,12 +9,12 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_releasever=10 -_rtpatchver=rt6 +_releasever=13 +_rtpatchver=rt9 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.10 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.13 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,8 +33,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5c7787be882c343e41fb49136ff60aec' - '1a05d0c781ac02fed58ad405a8b8355a' - '23d715c891ecfb436cb2a4c4ea5286af' + '2242024493dcb72a8777e11198f5e743' + '2b8fc5a819ee9bdf79aec69e07565cae' '5ed195b8c44e1e00c1885077566e1f81' 'f97a0be3b9252e788a0cf67e93cb5c6f' '82496e68851d1960543a07ba51cdb44a' @@ -42,7 +42,7 @@ md5sums=('5c7787be882c343e41fb49136ff60aec' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - 'c1a8440ffdae7c352d77bc4002cb6d3d') + '0bb62b946f06edc2f5b0249b7fc773e4') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 4b78a3997..374862298 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.8.10-1-rt6-LIBRE-RT +KERNEL_VERSION=3.8.13-1-rt9-LIBRE-RT # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 2d2ba5338..7ae0ec08c 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 183701 2013-04-27 10:47:26Z tpowa $ +# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.8 -pkgver=${_basekernel}.11 +_basekernel=3.9 +pkgver=${_basekernel}.4 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" # the main kernel config files 'config' # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch') -md5sums=('5c7787be882c343e41fb49136ff60aec' - 'c0ccd5624a61eaae1a00a349e90b5a26' - '2708b6f03f827e2c94ecbd050df4286d' +md5sums=('120df29f88622dabf7015a22c7cc8e25' + 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + '8cc2a43c771d0fbb652c8264c746c007' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') @@ -35,7 +35,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" fi # Add freedo as boot logo @@ -288,7 +288,7 @@ _package-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} } pkgname=("${pkgbase}" "${pkgbase}-headers") diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index 3464a1814..dd2c45fd8 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.8.5-1 Kernel Configuration +# Linux/x86 3.9.3-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -41,14 +41,12 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" CONFIG_ARCH_CPU_PROBE_RELEASE=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_HAVE_IRQ_WORK=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # -CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="-LIBRE-XEN" @@ -120,6 +118,7 @@ CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y +CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_FANOUT=32 CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_FANOUT_EXACT is not set @@ -216,14 +215,18 @@ CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_KPROBES_ON_FTRACE=y CONFIG_UPROBES=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_KPROBES_ON_FTRACE=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_CONTIGUOUS=y @@ -248,8 +251,9 @@ CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_MODULES_USE_ELF_REL=y -CONFIG_GENERIC_SIGALTSTACK=y CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OLD_SIGACTION=y # # GCOV-based kernel profiling @@ -322,6 +326,8 @@ CONFIG_SMP=y CONFIG_X86_MPPARSE=y # CONFIG_X86_BIGSMP is not set # CONFIG_X86_EXTENDED_PLATFORM is not set +# CONFIG_X86_GOLDFISH is not set +# CONFIG_X86_INTEL_LPSS is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_X86_32_IRIS=m CONFIG_SCHED_OMIT_FRAME_POINTER=y @@ -409,6 +415,9 @@ CONFIG_MICROCODE=m CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_MICROCODE_INTEL_LIB=y +CONFIG_MICROCODE_INTEL_EARLY=y +CONFIG_MICROCODE_EARLY=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m # CONFIG_NOHIGHMEM is not set @@ -430,6 +439,7 @@ CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_MEMORY_ISOLATION=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_BALLOON_COMPACTION=y @@ -532,9 +542,9 @@ CONFIG_ACPI_THERMAL=m CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=m +CONFIG_ACPI_PCI_SLOT=y CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m @@ -575,6 +585,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # # x86 CPU frequency scaling drivers # +CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ_CPB=y @@ -823,6 +834,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=y CONFIG_NF_CT_PROTO_DCCP=m CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m @@ -895,9 +907,11 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m # Xtables matches # CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_BPF=m CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m @@ -995,7 +1009,6 @@ CONFIG_IP_VS_PE_SIP=m CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set -CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -1072,7 +1085,7 @@ CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m # -# DCCP CCIDs Configuration (EXPERIMENTAL) +# DCCP CCIDs Configuration # # CONFIG_IP_DCCP_CCID2_DEBUG is not set CONFIG_IP_DCCP_CCID3=y @@ -1108,8 +1121,10 @@ CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m CONFIG_STP=m +CONFIG_MRP=m CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_HAVE_NET_DSA=y CONFIG_NET_DSA=m CONFIG_NET_DSA_TAG_DSA=y @@ -1117,6 +1132,7 @@ CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_DSA_TAG_TRAILER=y CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_VLAN_8021Q_MVRP=y # CONFIG_DECNET is not set CONFIG_LLC=m CONFIG_LLC2=m @@ -1133,7 +1149,6 @@ CONFIG_IPDDP_ENCAP=y CONFIG_IPDDP_DECAP=y # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_WAN_ROUTER is not set CONFIG_PHONET=m CONFIG_IEEE802154=m CONFIG_IEEE802154_6LOWPAN=m @@ -1202,6 +1217,8 @@ CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y # CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m +CONFIG_VSOCKETS=m +CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -1388,6 +1405,8 @@ CONFIG_NFC_HCI=m # CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m +CONFIG_NFC_PN544=m +CONFIG_NFC_MICROREAD=m # # Device Drivers @@ -1404,6 +1423,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" +# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set CONFIG_SYS_HYPERVISOR=y @@ -1426,6 +1446,7 @@ CONFIG_MTD_REDBOOT_PARTS=m CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_OF_PARTS=m CONFIG_MTD_AR7_PARTS=m @@ -1589,7 +1610,6 @@ CONFIG_ISAPNP=y CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_XD is not set # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_CPQ_DA=m @@ -1620,6 +1640,7 @@ CONFIG_XEN_BLKDEV_BACKEND=m CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_RBD=m +CONFIG_BLK_DEV_RSXX=m # # Misc devices @@ -1635,6 +1656,7 @@ CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ICS932S401=m +# CONFIG_ATMEL_SSC is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_CS5535_MFGPT=m CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 @@ -1656,6 +1678,7 @@ CONFIG_BMP085_I2C=m # CONFIG_BMP085_SPI is not set # CONFIG_PCH_PHUB is not set CONFIG_USB_SWITCH_FSA9480=m +# CONFIG_LATTICE_ECP3_CONFIG is not set CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -1683,6 +1706,8 @@ CONFIG_SENSORS_LIS3_I2C=m # CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=y +CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1778,6 +1803,7 @@ CONFIG_SCSI_MPT3SAS=m CONFIG_SCSI_MPT3SAS_MAX_SGE=128 CONFIG_SCSI_MPT3SAS_LOGGING=y CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_FLASHPOINT is not set @@ -1860,6 +1886,7 @@ CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y CONFIG_ATA_ACPI=y +CONFIG_SATA_ZPODD=y CONFIG_SATA_PMP=y # @@ -1965,7 +1992,6 @@ CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m -# CONFIG_MULTICORE_RAID456 is not set CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m @@ -1977,6 +2003,9 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_MQ=m +CONFIG_DM_CACHE_CLEANER=m CONFIG_DM_MIRROR=m CONFIG_DM_RAID=m CONFIG_DM_LOG_USERSPACE=m @@ -2102,7 +2131,6 @@ CONFIG_NET_DSA_MV88E6123_61_65=m CONFIG_ETHERNET=y CONFIG_MDIO=m CONFIG_NET_VENDOR_3COM=y -CONFIG_EL1=m CONFIG_EL3=m CONFIG_3C515=m CONFIG_PCMCIA_3C574=m @@ -2118,7 +2146,6 @@ CONFIG_NET_VENDOR_AMD=y CONFIG_AMD8111_ETH=m CONFIG_LANCE=m CONFIG_PCNET32=m -CONFIG_DEPCA=m CONFIG_PCMCIA_NMCLAN=m CONFIG_NI65=m CONFIG_NET_VENDOR_ATHEROS=y @@ -2138,6 +2165,7 @@ CONFIG_BNX2=m CONFIG_CNIC=m CONFIG_TIGON3=m CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y CONFIG_NET_VENDOR_BROCADE=y CONFIG_BNA=m CONFIG_NET_CALXEDA_XGMAC=m @@ -2154,7 +2182,6 @@ CONFIG_NET_VENDOR_CISCO=y CONFIG_ENIC=m CONFIG_DNET=m CONFIG_NET_VENDOR_DEC=y -CONFIG_EWRK3=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_DE2104X_DSL=0 @@ -2168,8 +2195,6 @@ CONFIG_DM9102=m CONFIG_ULI526X=m CONFIG_PCMCIA_XIRCOM=m CONFIG_NET_VENDOR_DLINK=y -CONFIG_DE600=m -CONFIG_DE620=m CONFIG_DL2K=m CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set @@ -2180,9 +2205,7 @@ CONFIG_S2IO=m CONFIG_VXGE=m # CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_NET_VENDOR_FUJITSU=y -CONFIG_AT1700=m CONFIG_PCMCIA_FMVJ18X=m -CONFIG_ETH16I=m CONFIG_NET_VENDOR_HP=y CONFIG_HP100=m CONFIG_NET_VENDOR_INTEL=y @@ -2190,6 +2213,7 @@ CONFIG_E100=m CONFIG_E1000=m CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGB_HWMON=y CONFIG_IGB_DCA=y CONFIG_IGBVF=m CONFIG_IXGB=m @@ -2198,14 +2222,6 @@ CONFIG_IXGBE_HWMON=y CONFIG_IXGBE_DCA=y CONFIG_IXGBEVF=m CONFIG_NET_VENDOR_I825XX=y -CONFIG_ELPLUS=m -CONFIG_EL16=m -CONFIG_APRICOT=m -CONFIG_EEXPRESS=m -CONFIG_EEXPRESS_PRO=m -CONFIG_LP486E=m -CONFIG_NI52=m -CONFIG_ZNET=m CONFIG_IP1000=m CONFIG_JME=m CONFIG_NET_VENDOR_MARVELL=y @@ -2234,12 +2250,7 @@ CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NATSEMI=m CONFIG_NS83820=m CONFIG_NET_VENDOR_8390=y -CONFIG_EL2=m -CONFIG_AC3200=m CONFIG_PCMCIA_AXNET=m -CONFIG_E2100=m -CONFIG_HPLAN_PLUS=m -CONFIG_HPLAN=m CONFIG_NE2000=m CONFIG_NE2K_PCI=m CONFIG_PCMCIA_PCNET=m @@ -2258,7 +2269,6 @@ CONFIG_QLA3XXX=m CONFIG_QLCNIC=m CONFIG_QLGE=m CONFIG_NETXEN_NIC=m -CONFIG_NET_VENDOR_RACAL=y CONFIG_NET_VENDOR_REALTEK=y CONFIG_ATP=m CONFIG_8139CP=m @@ -2271,7 +2281,6 @@ CONFIG_R8169=m CONFIG_NET_VENDOR_RDC=y CONFIG_R6040=m CONFIG_NET_VENDOR_SEEQ=y -CONFIG_SEEQ8005=m CONFIG_NET_VENDOR_SILAN=y CONFIG_SC92031=m CONFIG_NET_VENDOR_SIS=y @@ -2373,6 +2382,7 @@ CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_NCM=m @@ -2505,6 +2515,7 @@ CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLDVM=m +CONFIG_IWLMVM=m # # Debugging Options @@ -2559,6 +2570,7 @@ CONFIG_RT2800USB_RT35XX=y CONFIG_RT2800USB_RT53XX=y CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_MMIO=m CONFIG_RT2X00_LIB_PCI=m CONFIG_RT2X00_LIB_USB=m CONFIG_RT2X00_LIB=m @@ -2566,13 +2578,13 @@ CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set +CONFIG_RTLWIFI=m +# CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m CONFIG_RTL8723AE=m CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -# CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y CONFIG_WL1251=m @@ -2583,7 +2595,7 @@ CONFIG_WL18XX=m CONFIG_WLCORE=m # CONFIG_WLCORE_SPI is not set CONFIG_WLCORE_SDIO=m -CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_WILINK_PLATFORM_DATA=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_MWIFIEX=m @@ -2804,6 +2816,7 @@ CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_CYPRESS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -2813,6 +2826,7 @@ CONFIG_MOUSE_PS2_OLPC=y CONFIG_MOUSE_SERIAL=y CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_CYAPA=m CONFIG_MOUSE_INPORT=m # CONFIG_MOUSE_ATIXL is not set CONFIG_MOUSE_LOGIBM=m @@ -2983,6 +2997,7 @@ CONFIG_GAMEPORT_FM801=m # # Character devices # +CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y @@ -3014,9 +3029,11 @@ CONFIG_TRACE_SINK=m # Serial drivers # CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=32 @@ -3045,6 +3062,8 @@ CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_XILINX_PS_UART=m CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m @@ -3092,6 +3111,7 @@ CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m +CONFIG_TCG_ST33_I2C=m CONFIG_TELCLOCK=m CONFIG_DEVPORT=y CONFIG_I2C=m @@ -3119,6 +3139,7 @@ CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m CONFIG_I2C_I801=m CONFIG_I2C_ISCH=m +CONFIG_I2C_ISMT=m CONFIG_I2C_PIIX4=m CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m @@ -3221,6 +3242,7 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_DP83640_PHY=m CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIO_DEVRES=y CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y CONFIG_GPIO_ACPI=y @@ -3236,6 +3258,7 @@ CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_VX855 is not set +# CONFIG_GPIO_LYNXPOINT is not set # # I2C GPIO expanders: @@ -3300,6 +3323,7 @@ CONFIG_BATTERY_OLPC=m # CONFIG_CHARGER_GPIO is not set # CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_SMB347 is not set +# CONFIG_BATTERY_GOLDFISH is not set CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_AVS=y @@ -3378,6 +3402,7 @@ CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m CONFIG_SENSORS_MCP3021=m CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87360=m @@ -3412,6 +3437,7 @@ CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m # CONFIG_SENSORS_ADS7871 is not set CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA209=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_TMP102=m @@ -3444,10 +3470,12 @@ CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -CONFIG_FAIR_SHARE=y -CONFIG_STEP_WISE=y -# CONFIG_USER_SPACE is not set +CONFIG_THERMAL_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +# CONFIG_THERMAL_GOV_USER_SPACE is not set # CONFIG_CPU_THERMAL is not set +# CONFIG_THERMAL_EMULATION is not set +CONFIG_INTEL_POWERCLAMP=m CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -3456,6 +3484,7 @@ CONFIG_WATCHDOG_CORE=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_RETU_WATCHDOG=m CONFIG_ACQUIRE_WDT=m CONFIG_ADVANTECH_WDT=m CONFIG_ALIM1535_WDT=m @@ -3617,8 +3646,10 @@ CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m +# CONFIG_VIDEO_V4L2_INT_DEVICE is not set CONFIG_DVB_CORE=m CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m CONFIG_DVB_MAX_ADAPTERS=8 # CONFIG_DVB_DYNAMIC_MINORS is not set @@ -3719,7 +3750,6 @@ CONFIG_USB_SN9C102=m # # Analog TV USB devices # -CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y @@ -3733,6 +3763,8 @@ CONFIG_VIDEO_STK1160_AC97=y # # Analog/digital TV USB devices # +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3849,7 +3881,6 @@ CONFIG_VIDEO_SAA7164=m # # Media digital TV PCI Adapters # -CONFIG_TTPCI_EEPROM=m CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_CORE=m @@ -3870,6 +3901,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_V4L_PLATFORM_DRIVERS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_VIDEO_SH_VEU=m # CONFIG_V4L_TEST_DRIVERS is not set # @@ -3893,6 +3925,7 @@ CONFIG_RADIO_SHARK2=m CONFIG_I2C_SI4713=m CONFIG_RADIO_SI4713=m CONFIG_USB_KEENE=m +CONFIG_USB_MA901=m CONFIG_RADIO_TEA5764=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_TEF6862=m @@ -3914,18 +3947,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y # # common driver options # +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # # Media ancillary drivers (tuners, sensors, i2c, frontends) # -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_VIDEO_IR_I2C=m # @@ -3967,11 +4001,6 @@ CONFIG_VIDEO_SAA717X=m CONFIG_VIDEO_CX25840=m # -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# # Video encoders # CONFIG_VIDEO_SAA7127=m @@ -4071,6 +4100,7 @@ CONFIG_DVB_TDA826X=m CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_SI21XX=m +CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m CONFIG_DVB_MB86A16=m CONFIG_DVB_TDA10071=m @@ -4182,20 +4212,22 @@ CONFIG_DRM_USB=m CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=m + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m -CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_RADEON_UMS is not set CONFIG_DRM_NOUVEAU=m CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y - -# -# I2C encoder or helper chips -# -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y CONFIG_DRM_MGA=m @@ -4211,9 +4243,11 @@ CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m -CONFIG_STUB_POULSBO=m CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m +# CONFIG_OF_DISPLAY_TIMING is not set +# CONFIG_OF_VIDEOMODE is not set +CONFIG_HDMI=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_DDC=m @@ -4282,6 +4316,7 @@ CONFIG_FB_VOODOO1=m # CONFIG_FB_SM501 is not set # CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m +# CONFIG_FB_GOLDFISH is not set CONFIG_FB_VIRTUAL=m CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_METRONOME is not set @@ -4301,6 +4336,8 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_LD9040 is not set # CONFIG_LCD_AMS369FG06 is not set +# CONFIG_LCD_LMS501KF03 is not set +# CONFIG_LCD_HX8357 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m @@ -4477,6 +4514,7 @@ CONFIG_SND_ES1968_RADIO=y CONFIG_SND_FM801=m CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_DSP_LOADER=y CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_RECONFIG=y @@ -4493,6 +4531,7 @@ CONFIG_SND_HDA_CODEC_CIRRUS=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CA0110=y CONFIG_SND_HDA_CODEC_CA0132=y +CONFIG_SND_HDA_CODEC_CA0132_DSP=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y @@ -4610,6 +4649,7 @@ CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y @@ -4618,6 +4658,7 @@ CONFIG_HID_SMARTJOYPLUS=m CONFIG_SMARTJOYPLUS_FF=y CONFIG_HID_TIVO=m CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m CONFIG_HID_THRUSTMASTER=m CONFIG_THRUSTMASTER_FF=y CONFIG_HID_WACOM=m @@ -4808,6 +4849,7 @@ CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_XSENS_MT=m CONFIG_USB_SERIAL_ZIO=m CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m @@ -4839,10 +4881,13 @@ CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m CONFIG_USB_EZUSB_FX2=m +CONFIG_USB_HSIC_USB3503=m # # USB Physical Layer drivers # +# CONFIG_OMAP_USB3 is not set +# CONFIG_OMAP_CONTROL_USB is not set CONFIG_USB_ISP1301=m CONFIG_USB_RCAR_PHY=m CONFIG_USB_ATM=m @@ -4874,6 +4919,8 @@ CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_DUMMY_HCD=m CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_U_SERIAL=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4886,9 +4933,10 @@ CONFIG_USB_FUNCTIONFS=m CONFIG_USB_FUNCTIONFS_ETH=y CONFIG_USB_FUNCTIONFS_RNDIS=y CONFIG_USB_FUNCTIONFS_GENERIC=y -# CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_GADGET_TARGET=m CONFIG_USB_G_SERIAL=m +CONFIG_USB_G_SERIAL=m CONFIG_USB_MIDI_GADGET=m CONFIG_USB_G_PRINTER=m # CONFIG_USB_CDC_COMPOSITE is not set @@ -4970,12 +5018,14 @@ CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set # CONFIG_LEDS_GPIO is not set CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP55XX_COMMON=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA9633=m # CONFIG_LEDS_DAC124S085 is not set +# CONFIG_LEDS_PWM is not set CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m @@ -5029,6 +5079,7 @@ CONFIG_EDAC_I7300=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_SYSTOHC=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set @@ -5078,6 +5129,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_DS3234 is not set # CONFIG_RTC_DRV_PCF2123 is not set +# CONFIG_RTC_DRV_RX4581 is not set # # Platform RTC drivers @@ -5103,6 +5155,11 @@ CONFIG_RTC_DRV_PCF50633=m # CONFIG_RTC_DRV_MC13XXX=m CONFIG_RTC_DRV_SNVS=m + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set @@ -5111,9 +5168,12 @@ CONFIG_DMADEVICES=y # CONFIG_INTEL_MID_DMAC=m CONFIG_INTEL_IOATDMA=m +CONFIG_DW_DMAC=m +# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set CONFIG_TIMB_DMA=m CONFIG_PCH_DMA=m CONFIG_DMA_ENGINE=y +CONFIG_DMA_OF=y # # DMA Clients @@ -5137,7 +5197,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=y # @@ -5246,6 +5309,7 @@ CONFIG_COMEDI_MULTIQ3=m CONFIG_COMEDI_POC=m CONFIG_COMEDI_PCI_DRIVERS=y CONFIG_COMEDI_8255_PCI=m +CONFIG_COMEDI_ADDI_WATCHDOG=m CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -5338,7 +5402,6 @@ CONFIG_RTS5139=m # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_DUMP_PCM is not set # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m @@ -5346,7 +5409,6 @@ CONFIG_VT6656=m CONFIG_DX_SEP=m CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set -# CONFIG_ZCACHE is not set CONFIG_ZSMALLOC=y CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m @@ -5422,18 +5484,18 @@ CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y CONFIG_CSR_WIFI=m -CONFIG_ZCACHE2=y CONFIG_NET_VENDOR_SILICOM=y CONFIG_SBYPASS=m CONFIG_BPCTL=m CONFIG_CED1401=m CONFIG_DGRP=m -CONFIG_SB105X=m CONFIG_FIREWIRE_SERIAL=m +CONFIG_ZCACHE=y CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m CONFIG_ASUS_LAPTOP=m +CONFIG_CHROMEOS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m @@ -5486,6 +5548,7 @@ CONFIG_CLKSRC_I8253=y CONFIG_CLKEVT_I8253=y CONFIG_I8253_LOCK=y CONFIG_CLKBLD_I8253=y +# CONFIG_MAILBOX is not set CONFIG_IOMMU_API=y CONFIG_IOMMU_SUPPORT=y CONFIG_OF_IOMMU=y @@ -5495,13 +5558,13 @@ CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_FLOPPY_WA=y # -# Remoteproc drivers (EXPERIMENTAL) +# Remoteproc drivers # CONFIG_REMOTEPROC=m CONFIG_STE_MODEM_RPROC=m # -# Rpmsg drivers (EXPERIMENTAL) +# Rpmsg drivers # CONFIG_VIRT_DRIVERS=y # CONFIG_PM_DEVFREQ is not set @@ -5511,11 +5574,11 @@ CONFIG_EXTCON=m # Extcon Device Drivers # CONFIG_EXTCON_GPIO=m -CONFIG_EXTCON_ARIZONA=m CONFIG_MEMORY=y # CONFIG_IIO is not set # CONFIG_VME_BUS is not set CONFIG_PWM=y +CONFIG_IRQCHIP=y CONFIG_IPACK_BUS=m CONFIG_BOARD_TPCI200=m CONFIG_SERIAL_IPOCTAL=m @@ -5586,7 +5649,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set @@ -5651,6 +5714,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m CONFIG_ECRYPT_FS=m +# CONFIG_ECRYPT_FS_MESSAGING is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m @@ -5710,7 +5774,7 @@ CONFIG_NFS_V2=m CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m -# CONFIG_NFS_SWAP is not set +CONFIG_NFS_SWAP=y CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m @@ -5719,6 +5783,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y @@ -5732,8 +5797,9 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_SUNRPC_DEBUG is not set +CONFIG_SUNRPC_DEBUG=y CONFIG_CEPH_FS=m CONFIG_CIFS=m CONFIG_CIFS_STATS=y @@ -5862,8 +5928,6 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set -# CONFIG_PROVE_RCU_DELAY is not set -# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set @@ -5885,6 +5949,12 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set + +# +# RCU Debugging +# +# CONFIG_PROVE_RCU_DELAY is not set +# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_VERBOSE is not set @@ -5907,6 +5977,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y @@ -5914,7 +5985,6 @@ CONFIG_TRACER_MAX_TRACE=y CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y -CONFIG_EVENT_POWER_TRACING_DEPRECATED=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING=y @@ -5927,6 +5997,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_PREEMPT_TRACER is not set CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y +CONFIG_TRACER_SNAPSHOT=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set @@ -5936,6 +6007,7 @@ CONFIG_KPROBE_EVENT=y CONFIG_UPROBE_EVENT=y CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set @@ -6083,6 +6155,8 @@ CONFIG_CRYPTO_VMAC=m # CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -6238,3 +6312,4 @@ CONFIG_CORDIC=m CONFIG_DDR=y CONFIG_MPILIB=m CONFIG_OID_REGISTRY=m +CONFIG_UCS2_STRING=y diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index dbbd5e8fd..2bde797ef 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.8.11-1-LIBRE-XEN +KERNEL_VERSION=3.9.4-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD index 4fe7b534b..430ab93d5 100644 --- a/libre-testing/libretools/PKGBUILD +++ b/libre-testing/libretools/PKGBUILD @@ -8,9 +8,9 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20130514 -_libretools_commit=b261c8585cf6aa9e7bf5b960b2a0a047d769dbae -_devtools_commit=89d15e7697da2169493142f78a90b57a784d8f22 +pkgver=20130528.2 +_libretools_commit=e5c22aaf01484e7fa5926952bbcacd56228dbb64 +_devtools_commit=d197eacf8b7aba0796a0f6ac6ac1667564bd614e _packages_url=https://projects.parabolagnulinux.org/packages source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 @@ -19,6 +19,7 @@ source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.ta pkgrel=1 arch=('any') makedepends=(emacs) # emacs --batch is used during the build to process text +checkdepends=(sh-roundup) build() { cd "$srcdir" @@ -27,10 +28,23 @@ build() { make build-libretools build-libretools-mips64el build-doc } +check() { + cd "$srcdir/$pkgbase-$_libretools_commit" + + # some tests require 'sudo'; trick those into passing + mkdir "$srcdir/bin" + ln -s $(which true) "$srcdir/bin/sudo" + _PATH=$PATH + export PATH="$srcdir/bin:$PATH" + + make check + + export PATH=$_PATH +} + package_libretools() { backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) install=libretools.install - groups=(base-devel) replaces=(chroottools) depends=( @@ -40,7 +54,7 @@ package_libretools() { rsync # `librerelease` and `makechrootpkg.sh` subversion # `diff-unfree` tokyocabinet # `treepkg` - wget # `aur` and `pkgbuild-check-nonfree` + wget # `aur` and `lib/blacklist.sh` ) optdepends=('namcap: to check package files') @@ -57,5 +71,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('ce2a406d66033b48cacfb580997c1250' - '21d77c519a7496185c40399d1cfa26bf') +md5sums=('47ff5308a56dd8ae2cf18b82a99b0021' + '05b987e6b39c963154489ac6d01d0965') diff --git a/libre-testing/ronn/PKGBUILD b/libre-testing/ronn/PKGBUILD new file mode 100644 index 000000000..4bd097048 --- /dev/null +++ b/libre-testing/ronn/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net + +_gemname=ronn +pkgname=$_gemname +pkgver=0.7.3 +pkgdesc="The opposite of roff; manual authoring tool" +url="http://rtomayko.github.io/ronn/" +license=('custom:MIT') + +provides=(ruby-$_gemname=$pkgver) + +pkgrel=4 +arch=('any') +depends=('ruby' 'ruby-hpricot' 'ruby-rdiscount' 'ruby-mustache') +makedepends=('rubygems') +source=(http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem) +noextract=($_gemname-$pkgver.gem) +md5sums=('c5aa4ef58d35d0cc635b769281e03225') + +package() { + cd "$srcdir" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/COPYING + shopt -s nullglob + for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do + install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} + done +} diff --git a/libre-testing/ruby-hpricot/PKGBUILD b/libre-testing/ruby-hpricot/PKGBUILD new file mode 100644 index 000000000..ad9aefc36 --- /dev/null +++ b/libre-testing/ruby-hpricot/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net + +_gemname=hpricot +pkgname=ruby-$_gemname +pkgver=0.8.6 +pkgdesc="_why's old HTML parser" +url="http://github.com/hpricot/hpricot" +license=('custom:MIT') + +pkgrel=1 +arch=('i686' 'x86_64') +depends=('ruby') +makedepends=('rubygems') +source=(http://rubygems.org/downloads/${_gemname}-${pkgver}.gem) +noextract=(${_gemname}-${pkgver}.gem) +md5sums=('b0f1f02448037f4f6243c33d5f818fa4') + +package() { + cd "${srcdir}" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} diff --git a/libre-testing/ruby-mustache/PKGBUILD b/libre-testing/ruby-mustache/PKGBUILD new file mode 100644 index 000000000..d7090cc0d --- /dev/null +++ b/libre-testing/ruby-mustache/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (AUR): David Campbell <davekong@archlinux.us> + +_gemname=mustache +pkgname=ruby-$_gemname +pkgver=0.99.4 +pkgdesc="A framework-agnostic way to render logic-free views." +url="http://mustache.github.io/" +license=('custom:MIT') + +pkgrel=3 +arch=('any') +depends=('ruby>=2') +makedepends=('rubygems') +source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem") +md5sums=('650194ec2c166feb087377647414b9dc') +noextract=($_gemname-$pkgver.gem) + +package() { + cd "${srcdir}" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/LICENSE \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + shopt -s nullglob + for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do + install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} + done +} diff --git a/libre-testing/ruby-rdiscount/PKGBUILD b/libre-testing/ruby-rdiscount/PKGBUILD new file mode 100644 index 000000000..76e4b58bd --- /dev/null +++ b/libre-testing/ruby-rdiscount/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net +# Maintainer (AUR): Alexsandr Pavlov <kidoz at mail dot ru> +# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail dot com> + +_gemname=rdiscount +pkgname=ruby-$_gemname +pkgver=1.6.5 +pkgdesc="C implementation of John Gruber's Markdown." +url="http://dafoster.net/projects/rdiscount/" + +# About the license: It is a 4-clause BSD license with the 3rd clause modified +# to mention documentation instead of advertising. Not to be confused with +# "Modified BSD", which the FSF uses to refer to a 3-clause BSD license +# (dropping the 3rd clause). Because of the way it is modified, it doesn't have +# the problems normally associated with the 4-clause BSD license. +license=('custom:modified-BSD4') + +pkgrel=2 +arch=('i686' 'x86_64') +depends=('ruby') +makedepends=('rubygems') +source=(http://rubygems.org/downloads/$_gemname-$pkgver.gem) +noextract=($_gemname-$pkgver.gem) +md5sums=('2de321f1ba826f80b84fe45c0d013fcf') + +package() { + cd "${srcdir}" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/COPYING + shopt -s nullglob + for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do + install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} + done +} diff --git a/libre-testing/sh-roundup/PKGBUILD b/libre-testing/sh-roundup/PKGBUILD new file mode 100644 index 000000000..7c17669d3 --- /dev/null +++ b/libre-testing/sh-roundup/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net + +pkgname=sh-roundup +pkgver=0.0.5.git17 +_gitver='commit=695ae7609353a360556e1f465ac81ce447235179' + +pkgdesc='A unit testing framework for POSIX shell' +license=("custom:MIT") +url="http://bmizerany.github.io/roundup/" + +pkgrel=1 +arch=('any') +depends=(sh) +makedepends=(ronn) + +source=("libre://$pkgname-$pkgver.tar.gz" 'makefile-fix.patch') +md5sums=('8b1f85316d178eb9e809e168f52d0f2d' + '9efcd83d666c1e84302fe611610c60fa') + +mksource=("git://github.com/bmizerany/roundup.git#${_gitver}") +mkmd5sums=('SKIP') +mksource() { + cd "$srcdir" + rm -rf $pkgname-* + mv roundup $pkgname-$pkgver +} + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -i ../makefile-fix.patch Makefile +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix="$pkgdir"/usr + make -j1 build man +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 install install-man + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} + diff --git a/libre-testing/sh-roundup/makefile-fix.patch b/libre-testing/sh-roundup/makefile-fix.patch new file mode 100644 index 000000000..b97bebf23 --- /dev/null +++ b/libre-testing/sh-roundup/makefile-fix.patch @@ -0,0 +1,11 @@ +--- Makefile.orig ++++ Makefile +@@ -79,7 +79,7 @@ + chmod 0755 $(bindir)/roundup + + install-man: man +- -for i in {1..9} ; do cp *.$$i $(mandir)/man$$i 2>/dev/null ; done ++ shopt -s nullglob; for file in *.{1..9}; do install -Dm644 $$file $(mandir)/man$${file##*.}/$${file##*/}; done + + .PHONY: pages + pages : doc diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 31997eb35..fe5469dd0 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.6 _extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install -pkgrel=7 +pkgrel=8 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index a82766f1d..f226b76fd 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -10,10 +10,11 @@ else pkgname=blender-libre _spndesc='' fi -epoch=7 -pkgver=2.67 +epoch=8 +pkgver=2.67a +_jpgver=1.5 _pyver=3.3 -pkgrel=2 +pkgrel=1 pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray and cuda support$_spndesc" arch=( i686 @@ -58,7 +59,7 @@ conflicts=${_pkgname%-$_pkgflag} replaces=${_pkgname%-$_pkgflag} install=$_pkgname.install source=http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz -sha512sums=678ff15b4c7aa5695ac31189c2532d959867dfd003d101a52fc8e294b2d7bc5a4699844db9fa6cc6f5e825aa5ba2da37cec0dc56bfd2686957eca075bf935f44 +sha512sums=1336ed00ab51c581ab5b8ef6ace04b3684290b287745de3260e4072e3527501bf62472057c4c521533678b2529b7d0c2dca93d0ca3854e29d82443a78d5c4061 prepare() { mkdir cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build @@ -67,12 +68,13 @@ prepare() { build() { cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build - [[ $CARCH != x86_64 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF' + [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF' setarch $CARCH cmake ..\ -DCMAKE_BUILD_TYPE=Release\ -DCMAKE_INSTALL_PREFIX=/usr\ -DOPENIMAGEIO_ROOT_DIR=/usr\ + -DOPENJPEG_INCLUDE_DIR=/usr/include/openjpeg-$_jpgver\ -DPYTHON_INCLUDE_DIRS=/usr/include/python${_pyver}m\ -DPYTHON_LIBPATH=/usr/lib\ -DPYTHON_LIBRARY=python${_pyver}m\ @@ -85,7 +87,7 @@ build() { -DWITH_CYCLES_OSL=ON\ -DWITH_FFTW3=ON\ -DWITH_GAMEENGINE=ON\ - -DWITH_IMAGE_REDCODE=OFF\ + -DWITH_IMAGE_REDCODE=ON\ -DWITH_INSTALL_PORTABLE=OFF\ -DWITH_JACK=ON\ -DWITH_MOD_OCEANSIM=ON\ diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 51f0a0c0a..f7dfe3489 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91009 2013-05-17 10:26:19Z jelle $ +# $Id: PKGBUILD 91579 2013-05-24 14:55:19Z dwallace $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.31 +pkgver=0.9.32 pkgrel=1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') @@ -30,13 +30,13 @@ install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('19abde7fd5a065cadfaee4ed12568d96' +md5sums=('3b1c89a84872df900b9cfb706027df67' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') -build() { - cd "${srcdir}/${_pkgname}" +prepare(){ + cd "${srcdir}/${_pkgname}" #rm -rf src/{cherrypy,pyPdf} rm -rf src/cherrypy rm -rf resources/${pkgname}-portable.* @@ -47,7 +47,10 @@ build() { sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ $(find . -regex ".*.py\|.*.recipe") +} +build() { + cd "${srcdir}/${_pkgname}" # Remove nonfree fonts cd resources/fonts; \ rm prs500/tt0003m_.ttf; ln -s ../liberation/LiberationSans-Regular.ttf prs500/tt0003m_.ttf; \ diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index f2138e86a..8ea0dbba7 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90185 2013-05-08 10:46:15Z tpowa $ +# $Id: PKGBUILD 91714 2013-05-26 15:39:48Z tpowa $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,7 +7,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 _extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install -pkgrel=44 +pkgrel=45 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD index ee7019130..e37ffe283 100644 --- a/libre/claws-mail-libre/PKGBUILD +++ b/libre/claws-mail-libre/PKGBUILD @@ -2,95 +2,76 @@ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -pkgbase=claws-mail pkgname=claws-mail-libre -pkgflag=-libre -pkgver=3.9.0 -pkgrel=2 +_pkgflag=libre +_pkgname=${pkgname%-$_pkgflag} +pkgver=3.9.1 +pkgrel=3 pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support' -arch=( - i686 - x86_64 - mips64el -) -license=GPL3 -url="http://www.$pkgbase.org" -depends=( - db - dbus-glib - desktop-file-utils - enchant - gnutls - gpgme - gtk2 - hicolor-icon-theme - 'libetpan>=1.1' - libsm - startup-notification -) -makedepends=( - bogofilter - compface - spamassassin -) -[ "$CARCH" != "mips64el" ] && makedepends+=(valgrind) -optdepends=( - 'python2: needed for some tools' - 'perl: needed for some tools' - 'spamassassin: adds support for spamfiltering' - 'bogofilter: adds support for spamfiltering' -) -provides=( - claws - $pkgbase=$pkgver -) -conflicts=( - $pkgbase -) -replaces=( - $pkgbase - sylpheed-claws -) -options=( - '!libtool' -) -install=$pkgbase.install -source=( - http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$pkgbase-$pkgver.tar.bz2 -) -md5sums=( - 4c5ac7b21f0ed17d0f6404124c2229a4 -) +arch=('i686' 'x86_64' 'mips64el') +license=('GPL3') +url="http://www.$_pkgname.org" +depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' + 'gpgme' 'libetpan>=1.1' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' + # dependencies for plugins + 'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') + #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases +optdepends=('python2: needed for some tools and python plugin' + 'perl: needed for some tools and perl plugin' + 'spamassassin: adds support for spamfiltering' + 'bogofilter: adds support for spamfiltering' + 'libnotify: for notification plugin' + 'libcanberra: for notification plugin' + 'dbus: for notification plugin' + 'libxml2: for gtkhtml2_viewer and rssyl plugins' + 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins' + 'libarchive: for archive plugin and various other plugins' + 'libytnef: for tnef_parse plugin' + 'webkitgtk2: for the fancy webkit html plugin' + 'libsoup: for the fancy webkit html plugin' + 'libgdata: for gdata plugin' + 'poppler-glib: for pdf viewer plugin' + 'ghostscript: for pdf viewer plugin') +replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins") +conflicts=("$_pkgname" "$_pkgname-extra-plugins") +provides=("$_pkgname=$pkgver" 'claws') +options=(!libtool) +install=$_pkgname.install +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc}) +md5sums=('8adc734912ff1b83545cb12850100473' + 'SKIP') build() { - cd $srcdir/$pkgbase-$pkgver + cd $srcdir/$_pkgname-$pkgver + # fixes for python2 + export PYTHON="/usr/bin/python2" sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py + sed -i 's:python -c:python2 -c:g' configure - ./configure --prefix=/usr\ - --disable-dillo-viewer-plugin\ - --disable-static\ - --enable-bogofilter-plugin\ - --enable-crash-dialog\ - --enable-enchant\ - --enable-gnutls\ - --enable-jpilot\ - --enable-ldap\ - --enable-pgpmime-plugin\ - --enable-spamassassin-plugin - - make + setarch $CARCH ./configure --prefix=/usr --disable-static \ + --enable-enchant \ + --enable-gnutls \ + --enable-ldap \ + --enable-crash-dialog \ + --enable-pgpmime-plugin \ + --enable-spamassassin-plugin \ + --enable-bogofilter-plugin \ + --enable-jpilot \ + #--help + setarch $CARCH make } package() { - cd $srcdir/$pkgbase-$pkgver - make DESTDIR=$pkgdir install + cd $srcdir/$_pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install # build and install extra tools cd tools - make + setarch $CARCH make # all executables and .conf files ; only top directory find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do - install -D -m755 $i $pkgdir/usr/lib/$pkgbase/tools/$i + install -D -m755 $i $pkgdir/usr/lib/$_pkgname/tools/$i done } diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index fc3ed3b1f..d29becae5 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 183882 2013-04-29 10:46:59Z foutrelis $ +# $Id: PKGBUILD 185774 2013-05-18 15:32:58Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters pkgver=1.0.34 -pkgrel=3 +pkgrel=4 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') -depends=('lcms2' 'poppler>=0.22.3' 'qpdf>=4.0.0') +depends=('lcms2' 'poppler>=0.22.4' 'qpdf>=4.0.0') makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' @@ -20,7 +20,7 @@ options=(!libtool) source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz cups-browsed.service) md5sums=('fea9cad6bbb14ab0635243ed5d1d5c77' - '4c9f97eae201798000483c4e7109e690') + '9ef68d7c2a84713fd421f4e87dec0a6e') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") @@ -29,6 +29,7 @@ build() { cd "$srcdir/$_pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --with-rcdir=no \ --enable-avahi \ --with-browseremoteprotocols=DNSSD,CUPS \ diff --git a/libre/cups-filters-libre/cups-browsed.service b/libre/cups-filters-libre/cups-browsed.service index 144956c7f..07b342d62 100644 --- a/libre/cups-filters-libre/cups-browsed.service +++ b/libre/cups-filters-libre/cups-browsed.service @@ -4,7 +4,7 @@ After=cups.service avahi-daemon.service Wants=cups.service avahi-daemon.service [Service] -ExecStart=/usr/sbin/cups-browsed +ExecStart=/usr/bin/cups-browsed [Install] WantedBy=multi-user.target diff --git a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch b/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch new file mode 100644 index 000000000..e043633af --- /dev/null +++ b/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch @@ -0,0 +1,50 @@ +From d09689a5a2863043d007c1acb9bf0a8d1d3b776d Mon Sep 17 00:00:00 2001 +From: Colin Watson <cjwatson@ubuntu.com> +Date: Fri, 28 Dec 2012 06:43:35 +0000 +Subject: [PATCH 069/364] Backport gnulib fixes for C11. Fixes Savannah bug + #37738. + +* grub-core/gnulib/stdio.in.h (gets): Warn on use only if +HAVE_RAW_DECL_GETS. +* m4/stdio_h.m4 (gl_STDIO_H): Check for gets. +--- + ChangeLog | 8 ++++++++ + grub-core/gnulib/stdio.in.h | 6 ++++-- + m4/stdio_h.m4 | 2 +- + 3 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/grub-core/gnulib/stdio.in.h b/grub-core/gnulib/stdio.in.h +index 80b9dbf..a8b00c6 100644 +--- a/grub-core/gnulib/stdio.in.h ++++ b/grub-core/gnulib/stdio.in.h +@@ -138,10 +138,12 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " + #endif + + /* It is very rare that the developer ever has full control of stdin, +- so any use of gets warrants an unconditional warning. Assume it is +- always declared, since it is required by C89. */ ++ so any use of gets warrants an unconditional warning; besides, C11 ++ removed it. */ + #undef gets ++#if HAVE_RAW_DECL_GETS + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++#endif + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ +diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 +index f5650cd..8458bec 100644 +--- a/m4/stdio_h.m4 ++++ b/m4/stdio_h.m4 +@@ -37,7 +37,7 @@ AC_DEFUN([gl_STDIO_H], + dnl corresponding gnulib module is not in use, and which is not + dnl guaranteed by C89. + gl_WARN_ON_USE_PREPARE([[#include <stdio.h> +- ]], [dprintf fpurge fseeko ftello getdelim getline popen renameat ++ ]], [dprintf fpurge fseeko ftello getdelim getline gets popen renameat + snprintf tmpfile vdprintf vsnprintf]) + ]) + +-- +1.8.1.4 + diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index b94aed44c..3969d713a 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -9,7 +9,7 @@ _grub_915_ver=9 pkgname=('grub-common' 'grub-bios' 'grub-efi-i386') pkgbase=grub pkgver=2.00 -pkgrel=1.2 +pkgrel=2 url="https://www.gnu.org/software/grub/" arch=('i686' 'x86_64') license=('GPL3') @@ -24,33 +24,22 @@ source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" 'grub.default' 'grub.cfg' '20_memtest86+' - 'grub_bzr_export.sh') + 'grub_bzr_export.sh' + '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch' + 'grub-2.00-fix-docs.patch') noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz") -sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' - '89290031b974780c6df76893836d2477d4add895' - 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' - 'd5ae2efec25616028a9d89e98b6e454f1c4c415f' - 'c631ec04d458c60a3ceffe60d2d1806d54554d9c' - '06b926320cb2add6c157d59d46e553b89dd3aa03' - 'fb69af1ff6c0b7fdf7ce7d42d0f048edc1a50a45' - 'ce35d7ae75cd1b5b677e894e528f96add40e77b9' - '0cfd4e51cdb14a92f06cfd3c607f2aa21f3e55fc') _build_grub-common_and_bios() { - ## fix outdated gnulib on the source - sed 's|#undef gets|#undef gets\n#if 0|' -i "${srcdir}/grub-${pkgver}/grub-core/gnulib/stdio.in.h" - sed 's|use fgets instead");|use fgets instead");\n#endif|' -i "${srcdir}/grub-${pkgver}/grub-core/gnulib/stdio.in.h" - ## copy the source for building the common/bios package cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_bios-${pkgver}" cd "${srcdir}/grub_bios-${pkgver}" - ## Apply Parabola specific fixes to enable grub-mkconfig detect Libre kernels and initramfs + ## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" echo @@ -76,7 +65,13 @@ _build_grub-common_and_bios() { ## Requires python2 # sed 's|python |python2 |g' -i "${srcdir}/grub_bios-${pkgver}/autogen.sh" - ## start the actual build process + # fix compiling with gcc48 + patch -Np1 -i ${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch + + #fix docs compiling + patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch + + ## start the actual build process cd "${srcdir}/grub_bios-${pkgver}" ./autogen.sh echo @@ -94,7 +89,7 @@ _build_grub-common_and_bios() { --enable-grub-mount \ --prefix="/usr" \ --bindir="/usr/bin" \ - --sbindir="/usr/sbin" \ + --sbindir="/usr/bin" \ --mandir="/usr/share/man" \ --infodir="/usr/share/info" \ --datarootdir="/usr/share" \ @@ -122,6 +117,12 @@ _build_grub-efi-i386() { bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ -C "${srcdir}/grub_efi-${pkgver}/grub-extras" + # fix compiling with gcc48 + patch -Np1 -i ${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch + + #fix docs compiling + patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch + cd "${srcdir}/grub_efi-${pkgver}" ./autogen.sh echo @@ -139,7 +140,7 @@ _build_grub-efi-i386() { --enable-grub-mount \ --prefix="/usr" \ --bindir="/usr/bin" \ - --sbindir="/usr/sbin" \ + --sbindir="/usr/bin" \ --mandir="/usr/share/man" \ --infodir="/usr/share/info" \ --datarootdir="/usr/share" \ @@ -252,3 +253,14 @@ package_grub-efi-i386() { rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true } +md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91' + '704ea9f250b6137f05fa0197fd07053a' + '77f7d5f8ce395663cd7fff4d37099957' + 'a80e2b1d3bab778c3b6117d5a698992f' + 'c776aaf2cc35488a7c531b59e697470d' + '52d374e0194e3f2e39ff7c92ecd58a6c' + '255eafb440b8c285b20431366c2d2d27' + '9b6358d3de5c4bb95a041ab7c44a21ec' + 'f343ed2340ebc86c427873641bb72419' + 'ab751d1d8cd3fd47e5ee24d71ecc31ed' + '342dd18472a24e5fd252458b24f39a29') diff --git a/libre/grub/grub-2.00-fix-docs.patch b/libre/grub/grub-2.00-fix-docs.patch new file mode 100644 index 000000000..0aa481154 --- /dev/null +++ b/libre/grub/grub-2.00-fix-docs.patch @@ -0,0 +1,21 @@ +From 40d6b00fa48ae9c1cecf143da5c6061f6ffcb719 Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com +Date: Tue, 12 Mar 2013 15:23:02 -0400 +Subject: [PATCH] Fix docs + +I think the doc generation tools got stricter, so fix up the .texi file +to work. + +diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi +--- a/docs/grub-dev.texi ++++ b/docs/grub-dev.texi +@@ -1394,8 +1394,8 @@ grub_video_blit_glyph (&glyph, color, 0, + + @node Bitmap API + @section Bitmap API +-@itemize + @subsection grub_video_bitmap_create ++@itemize + @item Prototype: + @example + grub_err_t grub_video_bitmap_create (struct grub_video_bitmap **bitmap, unsigned int width, unsigned int height, enum grub_video_blit_format blit_format) diff --git a/libre/grub/grub.cfg b/libre/grub/grub.cfg index 7f583e102..0d91ff6bc 100644 --- a/libre/grub/grub.cfg +++ b/libre/grub/grub.cfg @@ -78,7 +78,7 @@ set timeout=5 ### END /etc/grub.d/00_header ### ### BEGIN /etc/grub.d/10_linux ### -menuentry 'Parabola GNU/Linux-libre, with Linux-libre core repo kernel' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' { +menuentry 'Parabola GNU/Linux-libre, with Linux libre kernel' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' { load_video set gfxpayload=keep insmod gzio @@ -95,7 +95,7 @@ menuentry 'Parabola GNU/Linux-libre, with Linux-libre core repo kernel' --class echo 'Loading initial ramdisk ...' initrd /boot/initramfs-linux-libre.img } -menuentry 'Parabola GNU/Linux-libre, with Linux libre repo kernel (Fallback initramfs)' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' { +menuentry 'Parabola GNU/Linux-libre, with Linux libre kernel (Fallback initramfs)' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' { load_video set gfxpayload=keep insmod gzio diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD index bab6e70c5..a377c189c 100644 --- a/libre/hexchat-libre/PKGBUILD +++ b/libre/hexchat-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 91125 2013-05-19 21:58:09Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: TingPing <tingping@tingping.se> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,8 +6,8 @@ _pkgname=hexchat pkgname=hexchat-libre pkgver=2.9.5 -pkgrel=4 -pkgdesc="A popular and easy to use graphical IRC (chat) client, without non-free browser reference (Parabola rebranded)" +pkgrel=5 +pkgdesc="A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)" arch=('i686' 'x86_64' 'mips64el') url="http://www.hexchat.org/" license=('GPL') @@ -34,7 +34,7 @@ build() { # Rebrand to Parabola sed -i -e 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c -# Remove non-free browser references +# Remove nonfree browser references patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch" patch -p1 -i "${srcdir}/no-firefox.patch" diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index 7d5c1e691..d9c2c7481 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -14,7 +14,7 @@ pkgname=($(for lang in ${_langpacks[@]} pkgrel=1 pkgdesc="Language packs for Debian Icedove." arch=('any') -url="http://packages.debian.org/experimental/icedove" +url="http://packages.debian.org/sid/icedove" license=('MPL' 'GPL') depends=("icedove-libre>=$pkgver") makedepends=('unzip' 'zip') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index d76893934..8473cadd8 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer : Márcio Silva <coadde@lavabit.com> # Maintainer : André Silva <emulatorman@lavabit.com> -# We're getting this from Debian Experimental +# We're getting this from Debian Sid _debname=icedove _debver=17.0.5 _debrel=2 @@ -15,9 +15,9 @@ pkgrel=1 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') -url="http://packages.debian.org/experimental/${_pkgname}" +url="http://packages.debian.org/sid/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') +makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-virtualenv' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') optdepends=('libcanberra: for sound support') replaces=('thunderbird') conflicts=('thunderbird') @@ -88,6 +88,9 @@ prepare() { # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + + # Fix virtualenv path + sed -i 's|/usr/share/pyshared/virtualenv.py|/usr/lib/python2.7/site-packages/virtualenv.py|' mozilla/configure } build() { @@ -120,5 +123,5 @@ package() { ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins" # We don't want the development stuff - rm -r "${pkgdir}"/usr/{include,lib/$_pkgname-devel,share/idl} + rm -r "${pkgdir}"/usr/{include,lib/${_pkgname}-devel,share/idl} } diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 3eb6b36b4..3c3d957a4 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -37,7 +37,7 @@ do source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb") done -_path="/usr/lib/iceweasel/extensions" +_path="/usr/lib/iceweasel/browser/extensions/" build() { cd "${srcdir}" @@ -162,14 +162,4 @@ md5sums=('e88728730ecf9f0f145de5f70e362b15' '98c7ed17e8fbe4478032a31ad2c2aa07' 'a7c33685d88af8a90a14c874538fa53a' '9b43e2e557c82a20509f34a54cc42e0f' - '84e12ebfd749a04adc5b3ace348a06f1' - '7f11378288e629d63cb04649a234cf1c' - '1af944e12101d8a279bda6ebf665a767' - 'd3a7e1dd8186bfcefe973d77214ec9c0' - '7a12ccf5eee1144bfb61984f811faf66' - '67407c724be7d200a06912c83a3404d8' - 'f3c7e564aa585251d8c908e666ce9f64' - 'ace03ba25a56488ddbf38a656daf6c93' - '4612b54bc7712d99823515799abf41d9' - '3eb4be0b553933b0babc582444ecaa6c' - 'ad78e4e0757bc0d8d956b06b3bae8c17') + '84e12ebfd749a04adc5b3ace348a06f1') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 253572553..eebf10e57 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=3 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -50,16 +50,18 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" iceweasel-install-dir.patch vendor.js shared-libs.patch + replace-urls.txt Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) md5sums=('0a7c51bb494463c327af918bae6c4ee4' 'c17121a4ffd40f463e16d7828445d96e' 'e1e903ca91997f18b428c54ef604f27d' '383e8e2a97a8b13fe56d153adb6878b6' - '98a433139ffcbf6b3018f18dcaacdb4c' + '2930f3bffe0d7a6b9845f8c006821bc2' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '0c26941504d3f2abed759221e9bb5de1' '52e52f840a49eb1d14be1c0065b03a93' + 'a8fc4658d45b6bf9350023e5c3f34e56' '85e67561e0e491cd538ce018dfc2d948') prepare() { @@ -84,6 +86,17 @@ prepare() { patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname patch -Np1 -i "$srcdir/shared-libs.patch" + # Replace common URLs + sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do + if [[ -n $moz_url ]]; then + printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url" + grep -Erl "${moz_url}" \ + --exclude='*.'{patch,orig,rej} \ + --exclude-dir={.pc,test,tests,testing} \ + | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g" + fi + done + # Patch anything that's left patch -Np1 -i "$srcdir/libre.patch" diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 0588fa632..3bb39d215 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,41 +1,6 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js --- mozilla-release.orig/browser/app/profile/firefox.js 2013-05-11 16:19:20.000000000 -0300 +++ mozilla-release/browser/app/profile/firefox.js 2013-05-18 13:47:28.091097903 -0300 -@@ -37,11 +37,11 @@ - // Preferences for AMO integration - pref("extensions.getAddons.cache.enabled", true); - pref("extensions.getAddons.maxResults", 15); --pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%"); --pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); --pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox"); --pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%"); -+pref("extensions.getAddons.get.url", "https://trisquel.info/browser-plain"); -+pref("extensions.getAddons.getWithPerformance.url", "https://trisquel.info/browser-plain"); -+pref("extensions.getAddons.search.browseURL", "https://trisquel.info/browser-plain"); -+pref("extensions.getAddons.search.url", "https://trisquel.info/browser-plain"); -+pref("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain"); - - // Blocklist preferences - pref("extensions.blocklist.enabled", true); -@@ -64,7 +64,7 @@ - pref("extensions.autoDisableScopes", 3); - - // Dictionary download preference --pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); -+pref("browser.dictionaries.download.url", "https://trisquel.info/browser-plain"); - - // The minimum delay in seconds for the timer to fire. - // default=2 minutes -@@ -601,7 +601,7 @@ - pref("accessibility.typeaheadfind.flashBar", 1); - - // plugin finder service url --pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); -+pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%"); - - // by default we show an infobar message when pages require plugins the user has not installed, or are outdated - pref("plugins.hide_infobar_for_missing_plugin", false); @@ -1203,12 +1203,6 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); @@ -51,13 +16,13 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br pref("social.toast-notifications.enabled", true); diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js --- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-05-11 16:19:20.000000000 -0300 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-05-16 23:09:05.295723370 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-05-20 17:49:18.467307120 -0300 @@ -3,69 +3,41 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const SEARCH_ENGINES = { - "Google": { -+ "DuckDuckGo": { ++ "DuckDuckGo HTML": { image: "data:image/png;base64," + - "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" + - "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" + @@ -156,17 +121,15 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil } }; -@@ -75,8 +47,8 @@ +@@ -75,7 +47,7 @@ // * add an entry here in the proper ordering (based on spans) // The <a/> part of the snippet will be linked to the corresponding url. const DEFAULT_SNIPPETS_URLS = [ - "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" --, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2" + "http://packages.debian.org/experimental/iceweasel" -+, "https://trisquel.info/browser-plain" + , "https://www.gnu.org/software/gnuzilla/addons.html" ]; - const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. @@ -139,10 +111,6 @@ if (searchEngineInfo.image) { let logoElt = document.getElementById("searchEngineLogo"); diff --git a/libre/iceweasel-libre/replace-urls.txt b/libre/iceweasel-libre/replace-urls.txt index 5f8c88e9e..fc13e32fb 100644 --- a/libre/iceweasel-libre/replace-urls.txt +++ b/libre/iceweasel-libre/replace-urls.txt @@ -2,24 +2,24 @@ # These are whitespace-separated EREs, comments are lines starting with '#' https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)? https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell- -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://gnuzilla.gnu.org/plugins/ +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#themes +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://www.gnu.org/software/gnuzilla/addons.html" +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://www.gnu.org/software/gnuzilla/addons.html -https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://trisquel.info/browser-plain +https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html -https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/?(\?[^"']*)? https://trisquel.info/browser-plain +https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/ -https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE% +https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php https://gnuzilla.gnu.org/plugins/PluginFinderService.php #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php #https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php -"https?://addons\.mozilla\.org/" "https://trisquel.info/browser-plain" +"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html" # hack: these aren't URLs, per se -(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1trisquel.info/browser-plain +(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index 0538d1c76..8f08669c1 100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD @@ -1,18 +1,19 @@ -# $Id$ -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# $Id: PKGBUILD 91608 2013-05-25 11:33:59Z bpiotrowski $ +# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> +# Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com> pkgname=libquicktime-libre _pkgname=libquicktime pkgver=1.2.4 -pkgrel=2 -pkgdesc="A library for reading and writing quicktime files (no unfree faac support)." +pkgrel=6 +pkgdesc="A library for reading and writing quicktime files, without nonfree faac support" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://libquicktime.sourceforge.net/" -depends=('gtk2' 'ffmpeg' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2') +depends=('gtk2' 'ffmpeg' 'libxv' 'libxaw' 'faad2') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz) +source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz") sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368') provides=("$_pkgname=$pkgver") conflicts=($_pkgname) @@ -29,7 +30,6 @@ build() { } package() { - cd $srcdir/$_pkgname-$pkgver + cd "$srcdir/$_pkgname-$pkgver" make DESTDIR="$pkgdir" install } - diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 4dc37e942..461c0a3b2 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185190 2013-05-11 23:53:58Z eric $ +# $Id: PKGBUILD 186254 2013-05-23 00:44:27Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.13 +pkgver=1.8.14 pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('3fd2a441815fa7a18c95d4b863aa4222a95b9f61' +sha1sums=('980939a9f6483f4e9ca2353ffdba131cb9a88a6e' '0d68c567c3d37932a49709c58c37c3f138fd19cb') build() { diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 4c1daea62..ec385c23a 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.9.2 +_kernver=3.9.4 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=3 +pkgrel=5 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 6e2796cff..7c3e3ad47 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.78 +_kernver=3.0.80 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=2 +pkgrel=4 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index efd3cd3c8..baab66b5c 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185334 2013-05-13 12:44:58Z tpowa $ +# $Id: PKGBUILD 186439 2013-05-26 15:23:17Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=78 +_sublevel=80 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.78 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.80 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - 'd4c068f9b6fb431f606220ec8e707fa1' + '6dfc33fc2587b36e2bf61ff1b26584c2' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '85cd68841ef098249949638c1e8dd443') + '7a0757288e0f61cbd91f7fc6b2bafb7b') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index b4c66216e..3c8ebbdae 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.78-1-LIBRE-LTS +KERNEL_VERSION=3.0.80-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 444bacc4d..4e64f9872 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90492 2013-05-12 22:55:40Z seblu $ +# $Id: PKGBUILD 91131 2013-05-19 23:48:35Z seblu $ # Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -12,7 +12,7 @@ _basekernel=3.9 #_sublevel=6 _pkgver=$_basekernel.$_sublevel pkgver=$_basekernel -pkgrel=2 +pkgrel=3 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 465e17b00..8ba93e018 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185176 2013-05-11 19:40:40Z thomas $ +# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -_sublevel=2 +_sublevel=4 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('120df29f88622dabf7015a22c7cc8e25' - '1a5e653d2c281cccef9b44340a94a866' - '9684934c48eb2c7bb7179b7e5b2c245f' - 'd9ff747f6c2bd3a6e4a94a2abc4af9ca' + 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + 'b0bc969b9e8c1767b16cdc0504a7bad7' + '42dfd3a3702433b68c079d6b3fd13c3c' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '2cc468726d0b215d45cbd28be6dee198') + '846eb5948403dd0f2f02c50d3acb69c3') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index ed48ff54b..107968129 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.0 Kernel Configuration +# Linux/x86 3.9.3-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -87,7 +87,6 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1874,7 +1873,7 @@ CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y CONFIG_ATA_ACPI=y -CONFIG_SATA_ZPODD=y +CONFIG_SATA_ZPODD=y CONFIG_SATA_PMP=y # @@ -5048,6 +5047,9 @@ CONFIG_EDAC_I5100=m CONFIG_EDAC_I7300=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set # @@ -5164,7 +5166,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=y # @@ -5432,7 +5437,6 @@ CONFIG_CED1401=m CONFIG_DGRP=m CONFIG_FIREWIRE_SERIAL=m CONFIG_ZCACHE=y -CONFIG_RAMSTER=y CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5725,6 +5729,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y @@ -5738,6 +5743,7 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m CONFIG_SUNRPC_DEBUG=y CONFIG_CEPH_FS=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index faee36762..24d6be2bd 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.0-2 Kernel Configuration +# Linux/x86 3.9.4-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -89,7 +89,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -4862,6 +4861,9 @@ CONFIG_EDAC_I7300=m CONFIG_EDAC_SBRIDGE=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set # @@ -4976,7 +4978,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=m # @@ -5514,6 +5519,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y @@ -5527,8 +5533,9 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_SUNRPC_DEBUG=y +CONFIG_SUNRPC_DEBUG=y CONFIG_CEPH_FS=m CONFIG_CIFS=m CONFIG_CIFS_STATS=y diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index f849635c1..619ad6090 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.9.2-1-LIBRE +KERNEL_VERSION=3.9.4-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index cd55468eb..509275d5d 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184774 2013-05-08 10:43:50Z tpowa $ +# $Id: PKGBUILD 186447 2013-05-26 15:45:25Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=45 +pkgrel=46 epoch=1 _extramodules=extramodules-3.9-LIBRE arch=('i686' 'x86_64' 'mips64el') @@ -47,7 +47,7 @@ build() { PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \ --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \ - --with-transmitter + --sbindir=/usr/bin --with-transmitter # Remove drivers already in kernel sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \ @@ -108,7 +108,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086' '087a7d102e1c96bf1179f38db2b0b237' '9ee196bd03ea44af5a752fb0cc6ca96a' '3deb02604b37811d41816e9b4385fcc3' - 'dab8a73bcc5fd5479d8750493d8d97dc' - 'c2e20fe68b034df752dba2773db16ebe' + '1c7ceace42da44f41e5a42b4dd3b3d76' + '121283a6de274e52ed86522aecd0f6e5' '07131d117fcfe9dcd50c453c3a5e9531' 'febf25c154a7d36f01159e84f26c2d9a') diff --git a/libre/lirc-libre/lirc.service b/libre/lirc-libre/lirc.service index 953601fd3..2123348fd 100644 --- a/libre/lirc-libre/lirc.service +++ b/libre/lirc-libre/lirc.service @@ -3,7 +3,7 @@ Description=Linux Infrared Remote Control [Service] ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd -ExecStart=/usr/sbin/lircd --pidfile=/run/lirc/lircd.pid +ExecStart=/usr/bin/lircd --pidfile=/run/lirc/lircd.pid Type=forking PIDFile=/run/lirc/lircd.pid diff --git a/libre/lirc-libre/lircm.service b/libre/lirc-libre/lircm.service index 6b258e312..eedcf5d8f 100644 --- a/libre/lirc-libre/lircm.service +++ b/libre/lirc-libre/lircm.service @@ -4,7 +4,7 @@ After=lirc.service Wants=lirc.service [Service] -ExecStart=/usr/sbin/lircmd -u +ExecStart=/usr/bin/lircmd -u Type=forking [Install] diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD index 9b727361a..aba53582b 100644 --- a/libre/mcomix-libre/PKGBUILD +++ b/libre/mcomix-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 91436 2013-05-22 14:15:00Z schuay $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Ray Powell <ray_al@xphoniexx.net> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgname=mcomix pkgname=mcomix-libre pkgver=1.00 -pkgrel=1 +pkgrel=3 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, with unar recommendation" arch=('any') url="http://sourceforge.net/projects/mcomix/" diff --git a/libre/mcomix-libre/mcomix.install b/libre/mcomix-libre/mcomix.install index 2d3c6c3e3..c33c1d5a1 100644 --- a/libre/mcomix-libre/mcomix.install +++ b/libre/mcomix-libre/mcomix.install @@ -1,13 +1,12 @@ pkgname=mcomix post_install() { - if [ -f usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate - fi if [ -f usr/sbin/gconfpkg ]; then - usr/sbin/gconfpkg --install ${pkgname} + usr/sbin/gconfpkg --install ${pkgname} &> /dev/null fi + xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null } pre_upgrade() { @@ -20,13 +19,12 @@ post_upgrade() { pre_remove() { if [ -f usr/sbin/gconfpkg ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} + usr/sbin/gconfpkg --uninstall ${pkgname} &> /dev/null fi } post_remove() { - if [ -f usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate - fi + xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null } diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 73f1135e0..a49b889bd 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185551 2013-05-14 23:48:31Z foutrelis $ +# $Id: PKGBUILD 186432 2013-05-26 10:14:39Z foutrelis $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,32 +7,30 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') -pkgver=35920 -pkgrel=3 +pkgver=36285 +pkgrel=1 arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion') license=('GPL') url="http://www.mplayerhq.hu/" -options=(!buildflags !emptydirs) -source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch subreader-fix-srt-parsing.patch) -md5sums=('5f96e829d711e7d1ea65e324710dca50' +options=('!buildflags' '!emptydirs') +source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz + mplayer.desktop + cdio-includes.patch) +md5sums=('5e4f0d4d039b0219514cf52ae6da831d' 'c0d6ef795cf6de48e3b87ff7c23f0319' - '7b5be7191aafbea64218dc4916343bbc' - '7cb6019018a95dcc3d1231e1aaa8bbdb') + '7b5be7191aafbea64218dc4916343bbc') prepare() { - cd "$srcdir/$_pkgbase" + cd "$srcdir/$_pkgbase-$pkgver" patch -Np0 -i ../cdio-includes.patch - - # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 - patch -Np1 -i ../subreader-fix-srt-parsing.patch } build() { - cd "$srcdir/$_pkgbase" + cd "$srcdir/$_pkgbase-$pkgver" ./configure --prefix=/usr \ --enable-runtime-cpudetection \ @@ -68,7 +66,7 @@ package_mplayer-libre() { replaces=('mplayer') conflicts=('mplayer') - cd "$srcdir/$_pkgbase" + cd "$srcdir/$_pkgbase-$pkgver" make DESTDIR="$pkgdir" install-mplayer install-mplayer-man install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/" @@ -88,7 +86,7 @@ package_mencoder-libre() { replaces=('mencoder') conflicts=('mencoder') - cd "$srcdir/$_pkgbase" + cd "$srcdir/$_pkgbase-$pkgver" make DESTDIR="$pkgdir" install-mencoder install-mencoder-man - find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \; + find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} + } diff --git a/libre/mplayer-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-libre/subreader-fix-srt-parsing.patch deleted file mode 100644 index 84f2de4d9..000000000 --- a/libre/mplayer-libre/subreader-fix-srt-parsing.patch +++ /dev/null @@ -1,60 +0,0 @@ -From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001 -From: wm4 <wm4@nowhere> -Date: Tue, 30 Apr 2013 00:09:31 +0200 -Subject: [PATCH] subreader: fix out of bound write access when parsing .srt - -This broke .srt subtitles on gcc-4.8. The breakage was relatively -subtle: it set all hour components to 0, while everything else was -parsed successfully. - -But the problem is really that sscanf wrote 1 byte past the sep -variable (or more, for invalid/specially prepared input). The %[..] -format specifier is unbounded. Fix that by letting sscanf drop the -parsed contents with "*", and also make it skip only one input -character by adding "1" (=> "%*1[..."). - -The out of bound write could easily lead to security issues. - -Also, this change makes .srt subtitle parsing slightly more strict. -Strictly speaking this is an unrelated change, but do it anyway. It's -more correct. ---- - sub/subreader.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - - (foutrelis: adjusted variable names in first hunk to apply to mplayer) - -diff --git a/sub/subreader.c b/sub/subreader.c -index 23da4c7..0f1b6c9 100644 ---- a/sub/subreader.c -+++ b/sub/subreader.c -@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current, - int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; - - while (!current->text[0]) { -- char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep; -+ char line[LINE_LEN + 1], full_line[LINE_LEN + 1]; - int i; - - /* Parse SubRip header */ - if (!stream_read_line(st, line, LINE_LEN, utf16)) - return NULL; -- if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", -- &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10) -+ if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d", -+ &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8) - continue; - - current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10; -@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current, - return sub_ass_read_line_subviewer(st, current, args); - while (!current->text[0]) { - if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; -- if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) -+ if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) - continue; - current->start = a1*360000+a2*6000+a3*100+a4/10; - current->end = b1*360000+b2*6000+b3*100+b4/10; --- -1.8.1.6 - diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 023b703b4..311c469ca 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90856 2013-05-14 23:55:05Z foutrelis $ +# $Id: PKGBUILD 91641 2013-05-26 08:06:21Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -8,7 +8,7 @@ pkgname=mplayer-vaapi-libre pkgver=35107 -pkgrel=7 +pkgrel=8 pkgdesc="A movie player, compiled with vaapi, without nonfree faac support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" @@ -33,7 +33,7 @@ install=mplayer-vaapi.install sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56' '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720' '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b' - '69127a5576e4f1f62f688215bd2ec0e052ddcb36292c7a1766c146ff122cb092') + '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3') prepare() { @@ -43,7 +43,7 @@ prepare() { patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 - patch -Np1 -i "$srcdir/subreader-fix-srt-parsing.patch" + patch -Np0 -i "$srcdir/subreader-fix-srt-parsing.patch" } build() { diff --git a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch index 84f2de4d9..f1c087377 100644 --- a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch +++ b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch @@ -1,34 +1,8 @@ -From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001 -From: wm4 <wm4@nowhere> -Date: Tue, 30 Apr 2013 00:09:31 +0200 -Subject: [PATCH] subreader: fix out of bound write access when parsing .srt - -This broke .srt subtitles on gcc-4.8. The breakage was relatively -subtle: it set all hour components to 0, while everything else was -parsed successfully. - -But the problem is really that sscanf wrote 1 byte past the sep -variable (or more, for invalid/specially prepared input). The %[..] -format specifier is unbounded. Fix that by letting sscanf drop the -parsed contents with "*", and also make it skip only one input -character by adding "1" (=> "%*1[..."). - -The out of bound write could easily lead to security issues. - -Also, this change makes .srt subtitle parsing slightly more strict. -Strictly speaking this is an unrelated change, but do it anyway. It's -more correct. ---- - sub/subreader.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - - (foutrelis: adjusted variable names in first hunk to apply to mplayer) - -diff --git a/sub/subreader.c b/sub/subreader.c -index 23da4c7..0f1b6c9 100644 ---- a/sub/subreader.c -+++ b/sub/subreader.c -@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current, +Index: sub/subreader.c +=================================================================== +--- sub/subreader.c (revision 36284) ++++ sub/subreader.c (revision 36285) +@@ -378,14 +378,14 @@ int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; while (!current->text[0]) { @@ -41,20 +15,26 @@ index 23da4c7..0f1b6c9 100644 return NULL; - if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", - &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10) -+ if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d", ++ if (sscanf(line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", + &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8) continue; - current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10; -@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current, - return sub_ass_read_line_subviewer(st, current, args); + current->start = h1 * 360000 + m1 * 6000 + s1 * 100 + ms1 / 10; +@@ -442,7 +442,7 @@ + #endif while (!current->text[0]) { if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; - if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) -+ if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) ++ if ((len=sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) continue; current->start = a1*360000+a2*6000+a3*100+a4/10; current->end = b1*360000+b2*6000+b3*100+b4/10; --- -1.8.1.6 - +@@ -1123,7 +1123,7 @@ + {*uses_time=1;return SUB_MPL2;} + if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) + {*uses_time=1;return SUB_SUBRIP;} +- if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10) ++ if (sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) + {*uses_time=1;return SUB_SUBVIEWER;} + if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4) + {*uses_time=1;return SUB_SUBVIEWER2;} diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD index cef33ae90..05e7d8cbb 100644 --- a/libre/ogre-libre/PKGBUILD +++ b/libre/ogre-libre/PKGBUILD @@ -12,8 +12,8 @@ pkgflag=( -docs ) pkgver=1.8.1 -pkgrel=3 -pkgdesc='A scene-oriented, flexible 3D engine written in C++, without nonfree nvidia-cg-toolkit support, nonfree fonts and arts' +pkgrel=4 +pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree nvidia-cg-toolkit support, nonfree fonts and arts' arch=( i686 x86_64 diff --git a/libre/parabola-xdg-menu/PKGBUILD b/libre/parabola-xdg-menu/PKGBUILD index 68615937c..e601bcb41 100644 --- a/libre/parabola-xdg-menu/PKGBUILD +++ b/libre/parabola-xdg-menu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 91138 2013-05-20 09:52:33Z spupykin $ # Maintainer: Sergej Pupykin <sergej@aur.archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=parabola-xdg-menu -pkgver=0.7.5.5 +pkgver=0.7.6.1 pkgrel=1 pkgdesc="automatic generate WM menu from xdg files (Parabola rebranded)" arch=('any') @@ -18,9 +18,9 @@ source=("http://archlinux-stuff.googlecode.com/files/arch-xdg-menu-$pkgver.tar.g replaces=('archlinux-xdg-menu') conflicts=('archlinux-xdg-menu') provides=("archlinux-xdg-menu=$pkgver") -md5sums=('dd139571e537bbe0190eca53eabb8fd2') +md5sums=('faa2077140c3d5bacc1de974a9eb3384') -build() { +package() { cd $srcdir # Rebranding Archlinux to Parabola @@ -42,7 +42,7 @@ build() { install -D -m 0755 xdg_menu $pkgdir/usr/bin/xdg_menu install -D -m 0755 xdg_menu_su $pkgdir/usr/bin/xdg_menu_su - install -D -m 0755 update-menus $pkgdir/usr/sbin/update-menus + install -D -m 0755 update-menus $pkgdir/usr/bin/update-menus install -D -m 0644 update-menus.conf $pkgdir/etc/update-menus.conf mkdir -p $pkgdir/usr/share/desktop-directories/ cp parabola-desktop-directories/* $pkgdir/usr/share/desktop-directories/ diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD index e8a981a3d..1cb968c35 100644 --- a/libre/rp-pppoe-libre/PKGBUILD +++ b/libre/rp-pppoe-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182649 2013-04-12 07:08:42Z tpowa $ +# $Id: PKGBUILD 186154 2013-05-21 10:00:49Z tpowa $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: orelien <aurelien.foret@wanadoo.fr> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgname=rp-pppoe pkgname=rp-pppoe-libre pkgver=3.11 -pkgrel=3 +pkgrel=4 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation" arch=('i686' 'x86_64') url="http://www.roaringpenguin.com/pppoe/" @@ -36,7 +36,7 @@ prepare() { build() { cd "$srcdir/$_pkgname-$pkgver/src" - ./configure --prefix=/usr --enable-plugin + ./configure --prefix=/usr --sbindir=/usr/bin --enable-plugin make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so } @@ -49,6 +49,6 @@ package() { } md5sums=('13b5900c56bd602df6cc526e5e520722' 'SKIP' - 'af234125f956f3a356ab0d0fcaa9e8a2' + '45dc8fc3d0341a3930182a480859ad76' 'd38a903a247d689ff0323d7b6caa1c6b' '3c53d550ac408608abb0b6cd6b76b6c2') diff --git a/libre/rp-pppoe-libre/adsl.service b/libre/rp-pppoe-libre/adsl.service index 324164943..f9a2fdcc6 100644 --- a/libre/rp-pppoe-libre/adsl.service +++ b/libre/rp-pppoe-libre/adsl.service @@ -3,8 +3,8 @@ Description=ADSL Deamon [Service] Type=forking -ExecStart=/usr/sbin/pppoe-start -ExecStop=/usr/sbin/pppoe-stop +ExecStart=/usr/bin/pppoe-start +ExecStop=/usr/bin/pppoe-stop [Install] WantedBy=multi-user.target diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index e6c202136..442dc9d15 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183993 2013-04-30 14:22:00Z foutrelis $ +# $Id: PKGBUILD 185904 2013-05-19 18:27:14Z remy $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: francois <francois.archlinux.org> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,7 +6,7 @@ pkgname=texlive-bin-libre pkgver=2012.0 -pkgrel=11 +pkgrel=12 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)" license=('GPL') arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index a3d48d0f3..4dd77dda3 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90191 2013-05-08 10:50:10Z tpowa $ +# $Id: PKGBUILD 91724 2013-05-26 15:41:39Z tpowa $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: xduugu # Contributor: nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=21 +pkgrel=22 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD index 6aa9ae4fb..8fe6b165c 100755 --- a/libre/unar/PKGBUILD +++ b/libre/unar/PKGBUILD @@ -4,15 +4,15 @@ pkgname=unar pkgver=1.6 -pkgrel=1 +pkgrel=2 pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686' 'mips64el') url="http://unarchiver.c3.cx/" license=('LGPL2.1') -depends=('gnustep-base' 'openssl' 'bzip2' 'icu=51.1' 'gcc-libs' 'zlib') +depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib') makedepends=('gcc-objc') replaces=("unarchiver") -conflicts=("unarchiver") +conflicts=("unarchiver" 'icu<51') provides=("unarchiver") source=("http://theunarchiver.googlecode.com/files/${pkgname}${pkgver}_src.zip" "native_obj_exceptions.patch") diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 95f94c9b4..b1f8c6ffb 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90193 2013-05-08 10:51:01Z tpowa $ +# $Id: PKGBUILD 91726 2013-05-26 15:41:55Z tpowa $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.9-LIBRE -pkgrel=24 +pkgrel=25 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 9077a0ac4..a6c22c177 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90212 2013-05-09 00:26:24Z seblu $ +# $Id: PKGBUILD 91728 2013-05-26 15:42:12Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Maintainer (Parabola): Jorge López <jorginho@lavabit.com> @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.12 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install index 82bda9855..9a98c5752 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install @@ -1,4 +1,4 @@ -VERSION='' +VERSION='3.9.4-1-LIBRE' post_install() { cat << EOF diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install index 6c1a57d3a..f0ca024ed 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install @@ -1,4 +1,4 @@ -VERSION='' +VERSION='3.9.4-1-LIBRE' post_install() { cat << EOF diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index cf2a4e4d4..b7b1988f9 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -108,7 +108,7 @@ md5sums=('654e45054ae6589452508d37403dc800' 'c7951fe6888d939f3a7d0dafe477e82b' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' - 'a757fa81ccf64788952c69dc5e6e43ff' + '17fca4ba3a751c8a1db19b92b1820462' '50387fba578646a9d29de3f917a199d2') prepare() { diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index ec40c0692..75a5ed22f 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1,5 +1,5 @@ --- VirtualBox-4.2.12.orig/Config.kmk 2013-04-12 07:33:55.000000000 -0300 -+++ VirtualBox-4.2.12/Config.kmk 2013-05-10 15:03:20.817944799 -0300 ++++ VirtualBox-4.2.12/Config.kmk 2013-05-23 18:48:57.560690206 -0300 @@ -56,9 +56,6 @@ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES @@ -1001,8 +1001,9 @@ else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS # +diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp --- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-04-12 07:38:01.000000000 -0300 -+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-05-10 17:03:11.087825690 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-05-23 18:59:56.434051894 -0300 @@ -650,27 +650,6 @@ } }; @@ -1039,3 +1040,46 @@ #ifdef VBOX_WITH_DEBUGGER_GUI /* 'Debug' actions: */ +diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h +--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h 2013-04-12 07:38:01.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h 2013-05-24 11:26:13.789861574 -0300 +@@ -62,7 +62,6 @@ + UIActionIndexRuntime_Menu_SharedFolders, + UIActionIndexRuntime_Simple_SharedFoldersDialog, + UIActionIndexRuntime_Toggle_VRDEServer, +- UIActionIndexRuntime_Simple_InstallGuestTools, + + #ifdef VBOX_WITH_DEBUGGER_GUI + /* 'Debugger' menu actions: */ +diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp +--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-04-12 07:38:01.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-05-24 11:27:14.723176263 -0300 +@@ -651,7 +651,6 @@ + m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders)); + m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog)); + m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer)); +- m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools)); + } + + void UIMachineLogic::prepareActionConnections() +@@ -705,8 +704,6 @@ + this, SLOT(sltOpenSharedFoldersDialog())); + connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)), + this, SLOT(sltSwitchVrde(bool))); +- connect(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools), SIGNAL(triggered()), +- this, SLOT(sltInstallGuestAdditions())); + + #ifdef VBOX_WITH_DEBUGGER_GUI + /* "Debug" actions connections: */ +diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp +--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2013-04-12 07:38:01.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2013-05-24 11:28:03.193841501 -0300 +@@ -244,8 +244,6 @@ + pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog)); + pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog)); + pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer)); +- pMenu->addSeparator(); +- pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools)); + } + + #ifdef VBOX_WITH_DEBUGGER_GUI diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD index e7805a9b4..cc50fb44c 100644 --- a/libre/xchat-libre/PKGBUILD +++ b/libre/xchat-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176357 2013-01-30 21:29:22Z eric $ +# $Id: PKGBUILD 186065 2013-05-20 20:17:32Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,8 +6,8 @@ _pkgname=xchat pkgname=xchat-libre pkgver=2.8.8 -pkgrel=12 -pkgdesc="A GTK+ based IRC client without non-free browser reference" +pkgrel=13 +pkgdesc="A GTK+ based IRC client, without nonfree browser reference" arch=('i686' 'x86_64' 'mips64el') url="http://www.xchat.org/" provides=("xchat=$pkgver") @@ -35,14 +35,18 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532' 'e6a3b69ba333fc7ba0f70792d78d44fba7c4a911' '20aef0ae608af6b30e1b4249f9c53830f8f514f6') -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" +prepare() { + cd ${_pkgname}-${pkgver} sed -i 's/GDK_HAND1/GDK_HAND2/' src/fe-gtk/xtext.c patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch" patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch" patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch" patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch" patch -p1 -i "${srcdir}/no-firefox.patch" +} + +build() { + cd ${_pkgname}-${pkgver} autoconf autoheader @@ -52,7 +56,7 @@ build() { } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd ${_pkgname}-${pkgver} make DESTDIR="${pkgdir}" install for i in 24 32 48 64 128 256 ; do diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index 487adf4bc..96c0f3537 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -1,35 +1,37 @@ -# $Id$ +# $Id: PKGBUILD 177534 2013-02-07 02:39:51Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=xscreensaver pkgname=xscreensaver-libre -pkgver=5.15 -pkgrel=3.1 -pkgdesc="Screen saver and locker for the X Window System (without non-free asm files)" +pkgver=5.21 +pkgrel=1 +pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files" arch=('i686' 'x86_64' 'mips64el') url="http://www.jwz.org/xscreensaver/" license=('BSD') -depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' \ +depends=('libxxf86vm' 'libglade' 'glu' 'xorg-appres' 'libxmu' \ 'perl-libwww' 'perl-http-message') -makedepends=('bc' 'libxpm' 'gdm') +makedepends=('bc' 'libxpm' 'gdm' 'mesa') optdepends=('gdm: for login manager support') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") backup=('etc/pam.d/xscreensaver') source=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz \ - add-electricsheep.diff xscreensaver.pam LICENSE libre.patch) -sha1sums=('b5ce7caa19f4d57c3bac83377a36dddbe7095052' + add-electricsheep.diff xscreensaver.pam LICENSE) +sha1sums=('cc44ddc538ad5b59ff851f70e8a48633763ff077' '677496218b81a42d90bee400026e94dd87fb8ffb' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' - '4209ea586b204fd1d81c382a0522c654f9fd9134' - '327b839eb5d069827c1f25ef19fc8d4e83de7ab2') + '4209ea586b204fd1d81c382a0522c654f9fd9134') build() { cd "${srcdir}/${_pkgname}-${pkgver}" patch -p0 -i "${srcdir}/add-electricsheep.diff" - patch -Np1 -i "${srcdir}/libre.patch" # deleting dmsc.asm file due that doesn't has source code supplied + + # Deleting dmsc.asm file due that don't have source code supplied + rm -v hacks/images/m6502/dmsc.asm + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \ --with-pam --with-login-manager --with-gtk --with-gl \ diff --git a/libre/xscreensaver-libre/libre.patch b/libre/xscreensaver-libre/libre.patch deleted file mode 100644 index 569f8435c..000000000 --- a/libre/xscreensaver-libre/libre.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff -Naur xscreensaver-5.15/hacks/images/m6502/dmsc.asm /dev/null ---- xscreensaver-5.15/hacks/images/m6502/dmsc.asm 2008-03-02 03:34:37.000000000 -0200 -+++ /dev/null 2012-06-14 14:00:43.782877377 -0300 -@@ -1,108 +0,0 @@ --; By DMSC - daniel.serpell@gmail.com --; --; This demo was programmed in ACME: --; http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/acme/ --; --; If you want the source code, send me an email :-) --; -- -- dcb 76, 94, 11,133, 32,162, 8,160, 8,145, 16,136,208,251,165, 16 -- dcb 24,105, 32,133, 16,165, 17,105, 0,133, 17,165, 32,202,208,231 -- dcb 96,230, 48,165, 48, 41, 63,133, 48,170,189,106, 6,170,189, 8 -- dcb 3,105, 1, 41, 3,157, 8, 3,138, 73,231,170,189, 0, 2,105 -- dcb 1, 41, 3,157, 0, 2,165, 48, 73, 63,170,189,106, 6, 73,224 -- dcb 170,189, 8, 2,105, 1, 41, 3,157, 8, 2,138, 73,231,170,189 -- dcb 0, 3,105, 1, 41, 3,157, 0, 3, 96,224,192,160,128, 96,225 -- dcb 64,193,161,226,129, 32,194, 97,162,227,195,130,228, 65,163,196 -- dcb 98,229,131,164,197,230,231,132,165,198, 99, 66, 33, 0,199,166 -- dcb 133,100,167, 67,134,101,135, 34, 68,102,103, 69, 35, 70, 71, 36 -- dcb 1, 37, 38, 39, 2, 3, 4, 5, 6, 7,166, 48,189,198, 6,170 -- dcb 254, 24, 3, 73, 7,170,254, 16, 3, 73,231,170,254, 24, 2, 73 -- dcb 7,170,254, 16, 2, 96, 0, 32, 1, 33, 64, 2, 65, 34, 96, 66 -- dcb 3, 97, 35, 98, 67,128, 4,129, 36, 99,130, 68,160, 5,161,131 -- dcb 100, 37,162, 69,132,192,163,101, 6,193, 38,194, 70,164,133,195 -- dcb 102,224, 7,225, 39,165,226,196,134, 71,227,103,197,166,228,135 -- dcb 198,229,167,230,199,231,166, 49,189, 21, 7,170,189, 0,160,157 -- dcb 0, 5,230, 49, 96,195,227,194,162,228, 97,226,128,129,130,225 -- dcb 64,161,163,224, 96,160,193,196, 32, 98,192, 65, 0,131,229,164 -- dcb 33, 99,197, 66,132, 1,230, 34,165, 67,100,198, 2, 3, 68, 6 -- dcb 35,133,166, 5,101, 4,199, 7, 36,231, 69,134,167, 37, 38,102 -- dcb 135, 70,232, 71, 39,103,136,200,168, 8, 11, 10,169,233,104, 9 -- dcb 12,137,201, 13, 40, 44, 72, 43,170, 42, 45, 41,105, 73,202, 14 -- dcb 138,234, 74, 75,106,203, 76,171, 46, 77,235,107,139, 15,108,172 -- dcb 174,140,173,141,142,204,109,206,207,205, 78,175, 47,236,239,143 -- dcb 237,238,110,240,241,111,208, 16, 79,176,209,242, 48,144,243, 80 -- dcb 177,244,112,210, 17, 49,178,179, 52, 53,147, 18, 81,211,145, 19 -- dcb 146, 51, 85,180, 20, 54,113,148, 22, 50, 84,212, 21, 55,115,245 -- dcb 83,114,116, 23, 82, 86, 88, 89, 87,118,117,119,149,213, 56, 57 -- dcb 181,214, 90,121,122,150,151,182,183,215,246, 58,120,247, 24,153 -- dcb 184,152,216, 25, 26, 59, 91,248,123,185, 27, 60,217,154, 28, 92 -- dcb 249, 29,155,186, 61,218, 93,124,250,187, 30,251, 62,156, 94,125 -- dcb 219,188, 31,252,254,220,253, 63,126,255,157,221, 95,159,191,222 -- dcb 127,189,223,158,190,165, 66, 41,224,208, 72,165, 66, 24,105, 1 -- dcb 41, 31,133, 66,165, 67,240, 7,198, 67,169, 0, 76, 97, 8,198 -- dcb 69,240,247, 16, 37,166, 64,230, 64,189,177, 9, 16, 15, 41,127 -- dcb 133, 67, 73,127,208,228,169, 1,133, 70, 76, 42, 8,170,189,117 -- dcb 8,133, 69,234,234,189,181, 8,133, 65,166, 65,230, 65,189,245 -- dcb 8,133, 68,165, 66, 24,105,224,133, 66,166, 66,169, 1,102, 68 -- dcb 42,157, 0,160, 96, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2 -- dcb 3, 2, 3, 3, 3, 3, 3, 1, 2, 3, 1, 5, 3, 3, 3, 3 -- dcb 3, 2, 2, 3, 3, 5, 4, 3, 3, 5, 4, 4, 4, 3, 3, 4 -- dcb 4, 1, 3, 4, 3, 5, 5, 5, 4, 5, 4, 4, 3, 4, 4, 7 -- dcb 4, 4, 4, 2, 1, 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30 -- dcb 32, 35, 35, 38, 40, 43, 46, 49, 50, 52, 4, 55, 55, 60, 63, 65 -- dcb 68, 71, 73, 75, 78, 78, 33, 83, 86, 89, 94, 98,102,106,109,112 -- dcb 116, 94,120,123,127,130,134,139,144,148,153,157,161,164,167,171 -- dcb 178,171,182,186, 5, 56, 68, 56, 36,124, 4, 76, 84, 36, 68, 84 -- dcb 40, 24, 40,124,100, 84, 88, 56, 84, 72, 76, 80, 96, 40, 84, 40 -- dcb 36, 84, 56, 44, 28,124, 36, 24, 24, 36,124, 24, 52, 16, 60, 80 -- dcb 24, 37, 30,124, 32, 28,188, 1,190,124, 24, 36, 60, 32, 28, 32 -- dcb 28, 24, 36, 24, 63, 36, 24, 36, 63, 60, 16, 32, 52, 44,120, 36 -- dcb 56, 4, 60, 56, 4, 56, 4, 56, 57, 6, 56, 44, 52, 36, 12, 48 -- dcb 208, 48, 12,252,164,164, 88,120,132,132, 72,252,132,132,120,252 -- dcb 164,132,252,160,128,120,132,164, 56,252, 32, 32,252, 8, 4,248 -- dcb 252, 48, 80,140,252, 4, 4,252, 64, 60, 64,252, 64, 48, 8,252 -- dcb 120,132,132,132,120,252,144,144, 96,120,132,134,133,120,252,144 -- dcb 144,108, 68,164,164,152,128,252,128,248, 4, 4,248, 4, 8,240 -- dcb 224, 28, 16,224, 28, 16,224,204, 48, 48,204,140,148,164,196, 0 -- dcb 0,133, 41, 10, 28, 29, 63, 63, 63,136, 15, 10, 28, 29, 14, 27 -- dcb 63, 63, 63,132, 55, 17, 18, 28, 62, 18, 28, 62, 10,136, 27, 14 -- dcb 10, 21, 21, 34,143, 15, 10, 28, 29,142, 39, 40, 48, 50,149,145 -- dcb 10, 23, 13, 62, 23, 24, 32,136, 28, 24, 22, 14,136, 11, 14, 10 -- dcb 30, 29, 18, 15, 30, 21,128, 14, 15, 15, 14, 12, 29, 28, 63, 63 -- dcb 63,144,159,255, 55, 17, 18, 28, 62, 18, 28, 62, 10, 21, 21,129 -- dcb 15, 24, 27, 62, 23, 24, 32,136, 11, 34, 14, 63, 63, 63,141, 63 -- dcb 63, 63, 11, 34, 14,150,159,143, 11, 34, 62, 39, 48, 54, 38, 2 -- dcb 0, 0, 7, 63, 5, 63, 2, 9, 11, 34, 62, 39, 48, 54, 38, 2 -- dcb 0, 0, 7, 63, 5, 63, 2, 9, 11, 34, 62, 39, 48, 54, 38, 2 -- dcb 0, 0, 7, 63, 5, 63, 2, 9,143,159,255,169, 0,133, 42,169 -- dcb 1,133, 44,133, 45,169, 0,133, 32,169,160,133, 33,165, 42,133 -- dcb 43,162, 15,160, 15,145, 32, 24,101, 44,230, 44,136, 16,246,165 -- dcb 32, 24,105, 32,133, 32,165, 33,105, 0,133, 33,169, 1,133, 44 -- dcb 165, 43, 24,101, 45,133, 43,230, 45,202, 16,215,169, 0,133, 32 -- dcb 169,160,133, 33,169,224,133, 34,169, 3,133, 35,169, 0,133, 36 -- dcb 169, 4,133, 37,169,240,133, 38,169, 3,133, 39,169, 16,133, 40 -- dcb 169, 4,133, 41,169, 15,133, 46,160, 15,177, 32, 74, 74, 74, 74 -- dcb 170,189, 62, 11,209, 34,240, 18,145, 34,145, 36,170,152, 73, 15 -- dcb 168,138,145, 38,145, 40,152, 73, 15,168,136, 16,221,165, 32, 24 -- dcb 105, 32,133, 32,165, 33,105, 0,133, 33,165, 34, 24,105,224,133 -- dcb 34,165, 35,105,255,133, 35,165, 36, 24,105, 32,133, 36,165, 37 -- dcb 105, 0,133, 37,165, 38, 24,105,224,133, 38,165, 39,105,255,133 -- dcb 39,165, 40, 24,105, 32,133, 40,165, 41,105, 0,133, 41,198, 46 -- dcb 16,150,230, 42,165, 42, 41, 63,240, 3, 76, 95, 10, 96, 0, 11 -- dcb 12, 15, 1, 15, 12, 11, 0, 11, 12, 15, 1, 15, 12, 11, 0, 11 -- dcb 12, 15, 1, 15, 12, 11, 0, 11, 12, 15, 1, 15, 12, 11,169, 1 -- dcb 162,255,134, 16,162, 1,134, 17, 32, 3, 6,169, 2,162, 7,134 -- dcb 16,162, 2,134, 17, 32, 3, 6,169, 3,162, 7,134, 16,162, 3 -- dcb 134, 17, 32, 3, 6,169, 31,133, 66,169, 0,133, 70,133, 67,133 -- dcb 64,169, 1,141,109, 8,169, 0,141,114, 8,169,160,141,115, 8 -- dcb 169, 63,133, 48,169,128,133, 49,169, 3,141,109, 8,169, 0,170 -- dcb 157, 0,160,232,208,250, 32, 33, 6, 32,170, 6, 32, 6, 7, 32 -- dcb 21, 8,165, 66, 73, 31,208, 13,173,109, 8, 24,105, 2, 41, 3 -- dcb 105, 3,141,109, 8,165, 49,208,221,173, 17, 7, 73, 1,141, 17 -- dcb 7,165, 70,240,209, 32, 29, 12, 32, 91, 10,169, 31,133, 66,169 -- dcb 0,133, 70,133, 67,141,109, 8,169, 0,141,114, 8,169, 3,141 -- dcb 115, 8, 32, 29, 12, 32, 21, 8,165, 66, 73, 31,208,247,173,115 -- dcb 8, 73, 7,141,115, 8,165, 70,240,235, 76, 94, 11,169, 0,170 -- dcb 157, 0, 2,157, 0, 3,157, 0, 4,157, 0, 5,232,208,241, 96 -- diff --git a/pcr/amsynth/PKGBUILD b/pcr/amsynth/PKGBUILD index 58c097cf4..1cd3cccf6 100644 --- a/pcr/amsynth/PKGBUILD +++ b/pcr/amsynth/PKGBUILD @@ -1,26 +1,26 @@ -# Mantainer: Guest One <theguestone at gmail dot com> +# Maintainer : Guest One <theguestone at gmail dot com> pkgname=amsynth pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Analogue Modeling SYNTHesizer" -arch=('i686') +arch=('i686' 'x86_64') url="http://code.google.com/p/amsynth/" license=('GPL') -depends=('gtkmm' 'jack') -source=(http://amsynth.googlecode.com/files/amSynth-${pkgver}.tar.gz) +depends=('gtkmm' 'jack' 'liblo') +makedepends=('desktop-file-utils' 'dssi' 'libtool' 'ladspa') +install="$pkgname.install" +source=("http://amsynth.googlecode.com/files/amSynth-$pkgver.tar.gz") md5sums=('991329e433bb8c496f9ca5158faf0bca') build() { - cd ${srcdir}/amSynth-${pkgver} - - sed -i -e 's|/amSynth|/amsynth|' src/main.cc - - autoreconf --force --install + cd "$srcdir/amSynth-$pkgver" + libtoolize ./configure --prefix=/usr make +} - install -Dm755 src/amSynth ${pkgdir}/usr/bin/amSynth - mkdir -p ${pkgdir}/usr/share/${pkgname} - install -m644 skel/{Controllersrc,presets} ${pkgdir}/usr/share/${pkgname}/ +package() { + cd "$srcdir/amSynth-$pkgver" + make DESTDIR="$pkgdir/" install } diff --git a/community/emerald/emerald.install b/pcr/amsynth/amsynth.install index c2fa624ae..e111ef946 100644 --- a/community/emerald/emerald.install +++ b/pcr/amsynth/amsynth.install @@ -1,6 +1,4 @@ post_install() { - xdg-icon-resource forceupdate - update-mime-database usr/share/mime &> /dev/null update-desktop-database -q } diff --git a/pcr/babeld/PKGBUILD b/pcr/babeld/PKGBUILD index e1e3eb0c4..20d442fd6 100644 --- a/pcr/babeld/PKGBUILD +++ b/pcr/babeld/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer (AUR): Yann Lopez <arch at lonewulf dot net> # Maintainer (Parabola): fauno <fauno@parabola.nu> pkgname=babeld -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=1 pkgdesc="Loop-free distance-vector routing protocol" arch=(i686 x86_64 mips64el) @@ -28,5 +28,5 @@ package() { install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE } -md5sums=('4ad44bca59f594a629306ac5c9b89d57' +md5sums=('406bbd940e3a9019d832d20e277266f2' 'SKIP') diff --git a/pcr/bamf2/PKGBUILD b/pcr/bamf2/PKGBUILD new file mode 100644 index 000000000..681d3da7e --- /dev/null +++ b/pcr/bamf2/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer: Ivan de Jesús Pompa García <ivan.pompa@gmx.com> +# Contributors: niQo ??? + +pkgname=bamf2 +_dname=bamf +pkgver=0.2.126 +pkgrel=2 +pkgdesc="Removes the headache of applications matching into a simple DBus daemon and c wrapper library, 0.2 branch" +arch=('i686' 'x86_64') +url="https://launchpad.net/bamf" +license=('GPL') +depends=('dbus-glib' 'libwnck3' 'libgtop') +makedepends=('libwnck' 'vala') +optdepends=('gtk2: GTK+ 2 library') +options=(!libtool) +source=(http://launchpad.net/${_dname}/0.2/${pkgver}/+download/${_dname}-${pkgver}.tar.gz) +md5sums=('709735137e4b028bb94f9e106bb9ac6e') + +conflicts=('bamf') +provides=('bamf') + +build() { + cd "$srcdir/${_dname}-${pkgver}" + + # Disable building tests + sed -i '/tests/ d' Makefile.in + + sed -i -e 's/--c-include/--include/' lib/libbamf/Makefile.in + export CFLAGS="$CFLAGS -Wno-deprecated-declarations -Wno-unused-local-typedefs" + + [[ -d build-gtk3 ]] || mkdir build-gtk3 + pushd build-gtk3 + ../configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${_dname} \ + --disable-static + make + popd + + [[ -d build-gtk2 ]] || mkdir build-gtk2 + pushd build-gtk2 + ../configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${_dname} \ + --disable-static --with-gtk=2 + make -C lib/libbamf + popd +} + +package() { + cd "$srcdir/${_dname}-${pkgver}/build-gtk3" + make DESTDIR="${pkgdir}/" install + + cd "$srcdir/${_dname}-${pkgver}/build-gtk2" + make -C lib/libbamf DESTDIR="${pkgdir}" install +} diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD new file mode 100644 index 000000000..f23f88ef3 --- /dev/null +++ b/pcr/cluster-glue/PKGBUILD @@ -0,0 +1,189 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=cluster-glue +_pkgname1=${pkgname::7} +_pkgname2=${pkgname:8} +_pkgname=${_pkgname1^}_${_pkgname2^} +_grpname=linux-ha +pkgver=1.0.11 +pkgrel=9 +pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack' +arch=( + i686 + x86_64 + mips64el +) +url=http://$_grpname.org/wiki/$_pkgname +license=( + GPL2 + LGPL2.1 +) +group=$_grpname +depends=( + curl + dbus-glib + glib2 + libaio + libesmtp + libltdl + libnet + libxml2 + net-snmp + openhpi + openipmi + python + util-linux + #vacm +) +optdepends=( + net-tools + openssh +) +makedepends=( + help2man + libxslt + lynx + net-tools + openssh + valgrind + w3m +) +options=(!libtool) +provides=(ha-$_pkgname2) +conflicts=ha-$_pkgname2 +replaces=ha-$_pkgname2 +install=$pkgname.install +source=http://hg.$_grpname.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2 +sha512sums=35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413 + +prepare() { + export _CLUSTER_USER=hacluster + export _CLUSTER_GROUP=haclient + _DGID=666 + _DUID=666 + + #verify the cluster user and group + if ! getent group $_CLUSTER_GROUP >/dev/null;then + msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER GROUP, EXECUTE AS ROOT:' + echo -e "# groupadd -r -g $_DGID $_CLUSTER_GROUP\n" + _EXITCODE=1 + fi + if ! getent passwd $_CLUSTER_USER >/dev/null;then + msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER USER, EXECUTE AS ROOT:' + echo -e "# useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/$_CLUSTER_USER -s /sbin/nologin -c \"cluster user\" $_CLUSTER_USER\n" + _EXITCODE=1 + fi + if [[ $_EXITCODE -eq 1 ]] ;then + return 1 + fi + + cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + s| -O0||; + s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|; + s|${localstatedir}/lock ${localstatedir}/spool/lock ${localstatedir}/spool/locks ${localstatedir}/lock|/run/lock|; + s|/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin|/usr/bin|; + ' configure.ac + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' $(grep -rl INCLUDES . | grep Makefile.am) + + # fixing path + sed -i 's|bin/sh|usr/bin/bash|; + ' $(grep -rl bin/sh .) + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/bin .) + sed -i 's| /bin| /usr/bin|; + ' $(grep -rl ' /bin' .) + sed -i 's| /sbin| /usr/bin|; + ' $(grep -rl ' /sbin' .) + sed -i 's|/var/lock|/run/lock|; + ' $(grep -rl /var/lock .) + sed -i 's|var/run|run|; + ' $(grep -rl var/run) + + # remove Open Source term + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + ' $(grep -ril 'open source') + sed -i 's|OpenSource / ||; + s|opensource / ||; + s|OpenSource|FreeSoftware|; + s|opensource|freesoftware|; + ' $(grep -ril opensource) + + # remove Linux term + sed -i '/, Linux/ s|Linux|GNU/Linux|; + /And Linux/ s|Linux|GNU/Linux|; + /and Linux/ s|Linux|GNU/Linux|; + /For Linux/ s|Linux|GNU/Linux|; + /for Linux/ s|Linux|GNU/Linux|; + /Like Linux/ s|Linux|GNU/Linux|; + /like Linux/ s|Linux|GNU/Linux|; + /Linux,/ s|Linux|GNU/Linux|; + /Linux and/ s|Linux|GNU/Linux|; + /Linux distribution/ s|Linux|GNU/Linux|; + /Linux machine/ s|Linux|GNU/Linux|; + /Linux operating/ s|Linux|GNU/Linux|; + /Linux OS/ s|Linux|GNU/Linux|; + /Linux specific/ s|Linux|GNU/Linux|; + /Linux system/ s|Linux|GNU/Linux|; + /Under Linux/ s|Linux|GNU/Linux|; + /under Linux/ s|Linux|GNU/Linux|; + /On Linux/ s|Linux|GNU/Linux|; + /on Linux/ s|Linux|GNU/Linux|; + /(e.g. Linux)/ s|Linux|GNU/Linux|; + /High-Availability Linux/ s|Linux|GNU/Linux|; + /sysDescr.0 = STRING: Linux/ s|Linux|GNU/Linux|; + /This is what the Linux/ s|Linux|GNU/Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + ' $(grep -rl Linux) +} + +build() { + cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver + setarch $CARCH ./autogen.sh + setarch $CARCH ./configure --prefix=/usr\ + --disable-ansi\ + --disable-fatal-warnings\ + --disable-static\ + --enable-doc\ + --enable-libnet\ + --enable-upstart\ + --libdir=/usr/lib\ + --localstatedir=/var\ + --sbindir=/usr/bin\ + --sysconfdir=/etc\ + --with-daemon-group=haclient\ + --with-daemon-user=hacluster\ + --with-ocf-root=/usr/lib/ocf + setarch $CARCH make +} + +package() { + cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + rm $pkgdir/etc/rc.d/logd && rmdir $pkgdir/etc{/rc.d,} + + install -d $pkgdir/usr/lib/systemd/system + echo '[Unit]' > $pkgdir/usr/lib/systemd/system/ha_log.service + echo 'Description=Startup script logd service' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo 'Requires=network.target remote-fs.target' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo '' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo '[Service]' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo 'Type=forking' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo 'ExecStart=/usr/lib/heartbeat/ha_logd' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo '' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo '[Install]' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo 'WantedBy=multi-user.target' >> $pkgdir/usr/lib/systemd/system/ha_log.service + + msg 'AFTER COMPILE THIS SOFTWARE YOU MUST DELETE A CLUSTER USER AND A CLUSTER GROUP, EXECUTE AS ROOT:' + echo -e "# userdel $_CLUSTER_USER" + echo -e "# groupdel $_CLUSTER_GROUP" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/ha-glue/ha-glue.install b/pcr/cluster-glue/cluster-glue.install index abfedb7c4..05e2160d3 100644 --- a/pcr/ha-glue/ha-glue.install +++ b/pcr/cluster-glue/cluster-glue.install @@ -1,22 +1,17 @@ _CLUSTER_USER=hacluster _CLUSTER_GROUP=haclient -_PREFIX=/usr -_PREFIXETC=/etc -_PREFIXVAR=/var -_LCRSODIR=$PREFIX/libexec/lcrso _DGID=666 _DUID=666 + pre_install() { getent group $_CLUSTER_GROUP >/dev/null || groupadd -r -g $_DGID $_CLUSTER_GROUP - getent passwd $_CLUSTER_USER >/dev/null || useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/hacluster -s /sbin/nologin -c "cluster user" ${_CLUSTER_USER} + getent passwd $_CLUSTER_USER >/dev/null || useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/hacluster -s /sbin/nologin -c 'cluster user' $_CLUSTER_USER } post_install() { - echo -e "\nNow you must install ha-resourceagent, ha-heartbeat and ha-pacemaker\n" - + echo -e 'Now you must install ha-resourceagent, ha-heartbeat and ha-pacemaker' } post_remove() { - echo -e "\nDeleting user $_CLUSTER_USER and group $_CLUSTER_GROUP " - userdel $_CLUSTER_USER - groupdel $_CLUSTER_GROUP + echo -e "Deleting user $_CLUSTER_USER and group $_CLUSTER_GROUP" + userdel $_CLUSTER_USER && groupdel $_CLUSTER_GROUP } diff --git a/pcr/corosync/PKGBUILD b/pcr/corosync/PKGBUILD new file mode 100644 index 000000000..e176cb112 --- /dev/null +++ b/pcr/corosync/PKGBUILD @@ -0,0 +1,63 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=corosync +_pkgflag=lts +pkgver=2.3.0 +pkgrel=2 +pkgdesc='Cluster engine for nodal communication systems with additional features for implementing high availability within applications' +arch=( + i686 + x86_64 + mips64el +) +url=http://www.$pkgname.org +license=BSD +depends=( + libqb + libstatgrab + net-snmp + nss +) +makedepends=doxygen +conflicts=$pkgname-$_pkgflag +options=(!libtool) +source=http://$pkgname.org/download/$pkgname-$pkgver.tar.gz +sha512sums=cd2ff5182f0d4827a10d50a211aa073e3d544bf7b98f9b0c834243c0d2cd5446d7950021cb1a21fc16f4951c8b2acf4b75c0b0c72d815b7d67dcba71623d2e51 + +prepare() { + cd $srcdir/$pkgname-$pkgver +} + +build() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH ./configure --prefix=/usr\ + --datarootdir=/usr/share\ + --disable-coverage\ + --disable-fatal-warnings\ + --disable-rdma\ + --disable-static\ + --enable-augeas\ + --enable-dbus\ + --enable-monitoring\ + --enable-qdevices\ + --enable-secure-build\ + --enable-shared\ + --enable-snmp\ + --enable-systemd\ + --enable-testagents\ + --enable-watchdog\ + --enable-xmlconf\ + --libdir=/usr/lib\ + --localstatedir=/var\ + --sysconfdir=/etc\ + --with-initddir=/etc/rc.d\ + --with-systemddir=/usr/lib/systemd/system + setarch $CARCH make +} + +package () { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/frame/PKGBUILD b/pcr/frame/PKGBUILD new file mode 100644 index 000000000..b67d776ac --- /dev/null +++ b/pcr/frame/PKGBUILD @@ -0,0 +1,32 @@ +# Contributor: Nicolas Quiénot < niQo at aur > + +pkgname=frame +pkgver=2.5.0 +pkgrel=1 +pkgdesc="Frame handles the buildup and synchronization of a set of simultaneous touches." +arch=(i686 x86_64) +url="https://launchpad.net/frame" +license=(GPL) +depends=('libxi' 'gcc-libs') +makedepends=('xorg-server-devel' 'asciidoc') +provides=('utouch-frame') +conflicts=('utouch-frame') +replaces=('utouch-frame') +options=('!libtool') +source=(http://launchpad.net/$pkgname/trunk/v$pkgver/+download/$pkgname-$pkgver.tar.gz) + + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} + +md5sums=('02baa941091c5d198cd1623b3ad36e68') diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD new file mode 100644 index 000000000..3a2e54dd8 --- /dev/null +++ b/pcr/ganglia/PKGBUILD @@ -0,0 +1,81 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=ganglia +pkgver=3.6.0 +pkgrel=1 +pkgdesc='Scalable distributed monitoring system for high-performance computing systems such as clusters and Grids' +arch=( + i686 + x86_64 + mips64el +) +url=http://$pkgname.sourceforge.net/ +license=BSD +depends=( + apr + confuse + #php-embed + python2 + rrdtool +) +options=(!libtool) +optdepends="$pkgname-web: Web frontend" +backup=( + etc/gmond.conf + etc/gmetad.conf +) +source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz +sha512sums=2a05d37787f1440c0c4aa91cdf0f4f4cb39c840b3b0fdcd6fe58cfb5892a75f81d36f6191c83c17558c37154298268df74fa255d2c940a8b84a7bf3ddb102394 + +prepare() { + cd $srcdir/$pkgname-$pkgver + #sed -i 's|sapi/embed/php_embed.h|php/sapi/embed/php_embed.h|' configure + touch gm{on,eta}d/gm{on,eta}d.service.in + + echo '[Unit]' > gmetad/gmetad.service.in + echo 'Description=Ganglia Meta Daemon' >> gmetad/gmetad.service.in + echo 'After=network.target' >> gmetad/gmetad.service.in + echo '' >> gmetad/gmetad.service.in + echo '[Service]' >> gmetad/gmetad.service.in + echo 'Type=forking' >> gmetad/gmetad.service.in + echo 'PIDFile=/run/gmetad.pid' >> gmetad/gmetad.service.in + echo 'ExecStart=/usr/sbin/gmetad -p /run/gmetad.pid' >> gmetad/gmetad.service.in + echo '' >> gmetad/gmetad.service.in + echo '[Install]' >> gmetad/gmetad.service.in + echo 'WantedBy=multi-user.target' >> gmetad/gmetad.service.in + + echo '[Unit]' > gmond/gmond.service.in + echo 'Description=Ganglia Monitor Daemon' >> gmond/gmond.service.in + echo 'After=network.target' >> gmond/gmond.service.in + echo '' >> gmond/gmond.service.in + echo '[Service]' >> gmond/gmond.service.in + echo 'ExecStart=/usr/sbin/gmond -f -p /run/gmond.pid' >> gmond/gmond.service.in + echo '' >> gmond/gmond.service.in + echo '[Install]' >> gmond/gmond.service.in + echo 'WantedBy=multi-user.target' >> gmond/gmond.service.in +} + +build() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH ./configure --prefix=/usr\ + --enable-gexec\ + --enable-perl\ + --enable-status\ + --disable-static\ + --libdir=/usr/lib\ + --with-gmetad\ + --with-python=/usr/bin/python2\ + --sysconfdir=/etc +# --enable-php\ + setarch $CARCH make +} + +package() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + mkdir $pkgdir/usr/lib/$pkgname/python_modules + + msg2 'Generating default gmond.conf' + ./gmond/gmond --default_config > $pkgdir/etc/gmond.conf +} diff --git a/pcr/geis/PKGBUILD b/pcr/geis/PKGBUILD new file mode 100644 index 000000000..629cb9d12 --- /dev/null +++ b/pcr/geis/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Nicolas Quiénot <niQo @ AUR > +# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to> + +pkgname=geis +pkgver=2.2.15 +pkgrel=3 +pkgdesc="Implementation of the GEIS (Gesture Engine Interface and Support) interface." +arch=('i686' 'x86_64') +url="https://launchpad.net/geis" +license=('GPL' 'LGPL') +depends=('grail' 'dbus' 'python-gobject') +makedepends=('xorg-server-devel') +provides=('utouch-geis') +conflicts=('utouch-geis') +replaces=('utouch-geis') +options=('!emptydirs' '!libtool') +source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ## add -Wno-format in CFLAGS see FS#34658 + CFLAGS="$CFLAGS -Wno-format" ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="${pkgdir}/" install +} + +md5sums=('94c8a08497f5fc22061fb0573ca1e220') diff --git a/pcr/ginn/PKGBUILD b/pcr/ginn/PKGBUILD new file mode 100644 index 000000000..013fc8642 --- /dev/null +++ b/pcr/ginn/PKGBUILD @@ -0,0 +1,21 @@ +# Maintainer: Nicolas Quiénot <niQo @ aur> + +pkgname=ginn +pkgver=0.2.6 +pkgrel=2 +pkgdesc="A deamon with jinn-like wish-granting capabilities" +url="http://launchpad.net/ginn" +arch=('i686' 'x86_64') +license=('GPL') +depends=('geis' 'bamf2' 'libxtst' 'libwnck') +source=(http://launchpad.net/ginn/0.x/${pkgver}/+download/ginn-${pkgver}.tar.gz) + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr + make || return 1 + make DESTDIR=${pkgdir} install || return 1 +} + +md5sums=('008854147f0809877b3e7ccf5af5337f') diff --git a/pcr/grail/PKGBUILD b/pcr/grail/PKGBUILD new file mode 100644 index 000000000..c76d2214f --- /dev/null +++ b/pcr/grail/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Nicolas Quiénot <niQo @ aur> +# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to> +# Contributor: thn81 <root@scrat> + +pkgname=grail +pkgver=3.1.0 +pkgrel=1 +pkgdesc="Gesture Recognition And Instantiation Library" +arch=('i686' 'x86_64') +url="https://launchpad.net/grail" +license=('GPL') +depends=('frame>=2.5.0' 'libxi') +makedepends=('inputproto') +conflicts=('utouch-grail') +replaces=('utouch-grail') +options=('!libtool') +source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Static library needed for tests + ./configure --prefix=/usr # --disable-static + MAKEFLAGS="-j1" + make ${MAKEFLAGS} +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" install +} + +md5sums=('f0f8c56430ee3717778dec6452201c33') diff --git a/pcr/gtk-theme-numix/PKGBUILD b/pcr/gtk-theme-numix/PKGBUILD new file mode 100644 index 000000000..4c4c10b20 --- /dev/null +++ b/pcr/gtk-theme-numix/PKGBUILD @@ -0,0 +1,21 @@ +# Mantainer: Diego +# Contributor: Aleessio Sergi + +pkgname=gtk-theme-numix +_theme=Numix +pkgver=1.4 +pkgrel=1 +pkgdesc="A flat and light theme with a modern look" +arch=('any') +url="http://satya164.deviantart.com/art/Numix-GTK3-theme-360223962" +license=('GPL3') +depends=('gtk-engine-murrine') +source=(https://github.com/shimmerproject/${_theme}/archive/v${pkgver}.tar.gz) +md5sums=('323ce459ebf9ee30bf920d18fab3645a') + +package() { + install -d "$pkgdir/usr/share/themes/${_theme}" + cp -rv ${srcdir}/${_theme}-${pkgver}/* "$pkgdir/usr/share/themes/${_theme}/" +} + +md5sums=('323ce459ebf9ee30bf920d18fab3645a') diff --git a/pcr/ha-glue/PKGBUILD b/pcr/ha-glue/PKGBUILD deleted file mode 100644 index 06385e9cf..000000000 --- a/pcr/ha-glue/PKGBUILD +++ /dev/null @@ -1,106 +0,0 @@ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> - -pkgname=ha-glue -_pkgname=${pkgname:3} -pkgver=1.0.11 -pkgrel=5 -pkgdesc='A set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack' -arch=( - i686 - x86_64 - mips64el -) -url=http://linux-ha.org/wiki/Cluster_${_pkgname^} -license=( - GPL2 - LGPL2.1 -) -depends=( - curl - glib2 - libaio - libesmtp - libxml2 - net-snmp - python - util-linux -) -optdepends=( - #lynx - net-tools - openssh - #valgrind - #w3m -) -makedepends=( - help2man - libxslt - #lynx - net-tools - openssh - #valgrind - #w3m -) -options=!libtool -install=$pkgname.install -source=( - http://hg.linux-ha.org/$_pkgname/archive/$_pkgname-$pkgver.tar.bz2 - ha-log.service -) -sha512sums=( - 35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413 - 9252472a6d7a1bbad765c63becdec4064d882b1eb98abdf27833a6e06d8750f06663b2460d32a4c72d04f10a7480ef0a2093b8a18b4d1fc62a989cde54ee056a -) - -prepare() { - export _CLUSTER_USER=hacluster - export _CLUSTER_GROUP=haclient - _DGID=666 - _DUID=666 - - #verify the cluster user and group - if ! getent group $_CLUSTER_GROUP >/dev/null;then - msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER GROUP, EXECUTE AS ROOT:' - echo -e "# groupadd -r -g $_DGID $_CLUSTER_GROUP\n" - _EXITCODE=1 - fi - if ! getent passwd $_CLUSTER_USER >/dev/null;then - msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER USER, EXECUTE AS ROOT:' - echo -e "# useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/$_CLUSTER_USER -s /sbin/nologin -c \"cluster user\" $_CLUSTER_USER\n" - _EXITCODE=1 - fi - if [[ $_EXITCODE -eq 1 ]] ;then - return 1 - fi - - cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver - sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.ac -} - -build() { - cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver - setarch $CARCH ./autogen.sh - setarch $CARCH ./configure --prefix=/usr\ - --enable-fatal-warnings=no\ - --enable-static=no\ - --libdir=/usr/lib\ - --localstatedir=/var\ - --sysconfdir=/etc\ - --with-daemon-group=haclient\ - --with-daemon-user=hacluster - setarch $CARCH make -} - -package() { - cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver - setarch $CARCH make DESTDIR=$pkgdir install - - install -d $pkgdir/usr/lib/systemd/system - install -Dm644 $srcdir/ha-log.service $pkgdir/usr/lib/systemd/system - - msg 'AFTER COMPILE THIS SOFTWARE YOU MUST DELETE A CLUSTER USER AND A CLUSTER GROUP, EXECUTE AS ROOT:' - echo -e "# userdel $_CLUSTER_USER" - echo -e "# groupdel $_CLUSTER_GROUP" -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/ha-glue/ha-logd.service b/pcr/ha-glue/ha-logd.service deleted file mode 100644 index 1847d8cdd..000000000 --- a/pcr/ha-glue/ha-logd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Startup script logd service. -Requires=network.target remote-fs.target - -[Service] -Type=forking -ExecStart=/usr/lib/heartbeat/ha_logd - -[Install] -WantedBy=multi-user.target diff --git a/pcr/ha-heartbeat/PKGBUILD b/pcr/ha-heartbeat/PKGBUILD index 10ef5def3..f913344a0 100644 --- a/pcr/ha-heartbeat/PKGBUILD +++ b/pcr/ha-heartbeat/PKGBUILD @@ -4,7 +4,7 @@ pkgname=ha-heartbeat _pkgname=${pkgname:3} pkgver=3.0.5 _pkgver=${pkgver::1}_${pkgver:2:1} -pkgrel=2 +pkgrel=6 pkgdesc='Daemon that provides cluster infrastructure services to its clients' arch=( i686 @@ -12,17 +12,33 @@ arch=( mips64el ) url=http://linux-ha.org/wiki/${_pkgname^} -license=GPL -makedepends=docbook-xsl +license=( + GPL2 + lGPL2.1 +) depends=( gnutls ha-glue ) -options=( - '!emptydirs' - '!libtool' - strip +optdepends=( + lynx + net-tools + openssh + swig + valgrind + w3m +) +makedepends=( + docbook-xsl + libxslt + lynx + net-tools + openssh + swig + valgrind + w3m ) +options=!libtool source=( http://hg.linux-ha.org/$_pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2 $pkgname.service @@ -34,17 +50,25 @@ sha512sums=( prepare() { cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver - sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.in mv configure.{in,ac} + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + s|AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)|AM_INIT_AUTOMAKE|; + ' configure.ac + sed -i "s|AC_INIT(GNUmakefile)|AC_INIT(heartbeat, $pkgver)|; + " configure.ac + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' {contrib/{drbd-outdate-peer,ipfail,mlock},cts,heartbeat,lib/{apphb,hbclient,plugins/{HB{auth,comm,compress},quorum{,d},tiebreaker}},membership/{ccm,quorumd},replace,telecom/apphbd,tools}/Makefile.am } build() { cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver setarch $CARCH ./bootstrap setarch $CARCH ./configure --prefix=/usr\ - --enable-fatal-warnings=no\ + --disable-fatal-warnings\ --enable-static=no\ + --enable-valgrind\ --libdir=/usr/lib\ + --localstatedir=/var\ --sysconfdir=/etc setarch $CARCH make } @@ -53,14 +77,8 @@ package() { cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver setarch $CARCH make DESTDIR=$pkgdir install - for py in `grep -r -l "\#\!\/usr\/bin\/python" $pkgdir`;do - sed -i.bk 's:/usr/bin/python$:/usr/bin/python2:g' $py - done - for py in `grep -r -l "\#\!\/usr\/bin\/env python" $pkgdir`;do - sed -i.bk 's:/usr/bin/env python$:/usr/bin/env python2:g' $py - done - #end python path correction - install -d $pkgdir/usr/lib/systemd/system install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system } + +# vim:set ts=2 sw=2 et: diff --git a/pcr/ha-pacemaker/PKGBUILD b/pcr/ha-pacemaker/PKGBUILD new file mode 100644 index 000000000..2cd0be84c --- /dev/null +++ b/pcr/ha-pacemaker/PKGBUILD @@ -0,0 +1,83 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=ha-pacemaker +_pkgname=${pkgname:3} +pkgver=1.1.9 +pkgrel=3 +pkgdesc='Cluster resource manager' +arch=( + i686 + x86_64 + mips64el +) +url=http://linux-ha.org/wiki/${_pkgname^} +license=GPL2 +depends=( + corosync + ha-heartbeat + ha-resourceagent + libqb +) +optdepens=( + inkscape + lynx + openssh + valgrind + w3m +) +makedepends=( + help2man + inkscape + libxslt + lynx + openssh + valgrind + w3m +) +options=(!libtool) +source=https://github.com/ClusterLabs/$_pkgname/archive/${_pkgname^}-$pkgver.tar.gz +sha512sums=97d13cf722aea9cba1ce344afc3137d9edc15a978d2a7acc44179c4859ecb18f800312caf02c9574b0fab528cd6e2c3e4876a1ffde8a08c2500c0ba816cdf071 + +prepare() { + cd $srcdir/$_pkgname-${_pkgname^}-$pkgver + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|; + ' configure.ac + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' {cib,crmd,cts,lib/{cib,cluster,common,fencing,lrmd,pengine,services,transition},mcp,pengine,replace,tools}/Makefile.am +} + +build() { + cd $srcdir/$_pkgname-${_pkgname^}-$pkgver + setarch $CARCH ./autogen.sh + setarch $CARCH ./configure --prefix=/usr\ + --enable-fatal-warnings=yes\ + --disable-static\ + --enable-systemd\ + --enable-upstart\ + --libdir=/usr/lib\ + --libexecdir=/usr/lib\ + --localstatedir=/var\ + --sysconfdir=/etc\ + --with-acl\ + --with-ais\ + --with-cibsecrets\ + --with-cman\ + --with-corosync\ + --with-cs-quorum\ + --with-esmtp\ + --with-heartbeat\ + --with-lcrso-dir=/usr/lib/lcrso\ + --with-nagios\ + --with-profiling\ + --with-snmp\ + --without-gcov + setarch $CARCH make +} + +package() { + cd $srcdir/$_pkgname-${_pkgname^}-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + mv $pkgdir/usr/sbin/cibsecret{,-pacemaker} +} diff --git a/pcr/ha-resourceagent/PKGBUILD b/pcr/ha-resourceagent/PKGBUILD index a1588664b..15438769a 100644 --- a/pcr/ha-resourceagent/PKGBUILD +++ b/pcr/ha-resourceagent/PKGBUILD @@ -7,8 +7,8 @@ _yname=${_pkgname:8} _Name=${_xname^}_${_yname^} _name=${_xname}-${_yname}s pkgver=3.9.5 -pkgrel=1 -pkgdesc='A standardized interface for a cluster resource' +pkgrel=3 +pkgdesc='Standardized interface for a cluster resource' arch=( i686 x86_64 @@ -17,6 +17,16 @@ arch=( url=http://linux-ha.org/wiki/$_Name license=GPL depends=ha-glue +optdepends=( + net-tools + openssh +) +makedepends=( + #libxslt + libvirt + net-tools + openssh +) source=( https://github.com/ClusterLabs/$_name/archive/v$pkgver.tar.gz ha-ldirector.service @@ -28,16 +38,22 @@ sha512sums=( prepare() { cd $srcdir/$_name-$pkgver - sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.ac + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + ' configure.ac + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' {heartbeat,tools}/Makefile.am } build() { cd $srcdir/$_name-$pkgver - ./autogen.sh - ./configure --prefix=/usr\ + setarch $CARCH ./autogen.sh + setarch $CARCH ./configure --prefix=/usr\ + --enable-fatal-warnings\ + --enable-libnet\ --libdir=/usr/lib\ --localstatedir=/var\ - --sysconfdir=/etc + --sysconfdir=/etc\ + --with-ocf-root=/usr/lib/ocf setarch $CARCH make } @@ -45,15 +61,8 @@ package() { cd $srcdir/$_name-$pkgver setarch $CARCH make DESTDIR=$pkgdir install - #python path correction - for py in `grep -r -l "\#\!\/usr\/bin\/python" $pkgdir`;do - sed -i 's:/usr/bin/python$:/usr/bin/python2:g' $py - done - for py in `grep -r -l "\#\!\/usr\/bin\/env python" $pkgdir`;do - sed -i 's:/usr/bin/env python$:/usr/bin/env python2:g' $py - done - #end python path correction - install -d $pkgdir/usr/lib/systemd/system install -Dm644 $srcdir/ha-ldirector.service $pkgdir/usr/lib/systemd/system } + +# vim:set ts=2 sw=2 et: diff --git a/pcr/jalv/PKGBUILD b/pcr/jalv/PKGBUILD new file mode 100644 index 000000000..6100c5902 --- /dev/null +++ b/pcr/jalv/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=jalv +pkgver=1.4.0 +pkgrel=1 +pkgdesc="Run an LV2 plugin as a JACK application" +arch=('i686') +url="http://drobilla.net/software/$pkgname/" +license=('custom:ISC') +depends=('lilv' 'suil') +makedepends=('python2' 'qt4' 'gtk2' 'gtk3' 'gtkmm') +optdepends=('qt4: Qt 4.x frontend' + 'gtk2: Gtk+ 2.x frontend' + 'gtk3: Gtk+ 3.x frontend' + 'gtkmm: Gtk++ 2.x frontend') +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") +md5sums=('23297b15cb541e0b3c5c05a2fdd9bcca') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf configure --prefix=/usr + python2 waf +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + python2 waf install --destdir="$pkgdir" + + # license + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD index 788d4f435..87913af64 100644 --- a/pcr/jitsi/PKGBUILD +++ b/pcr/jitsi/PKGBUILD @@ -1,34 +1,78 @@ # Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be> # Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=jitsi -pkgver=2.0.4506.10553 -pkgrel=6 +pkgver=2.2.4603.9615 +pkgrel=2 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://jitsi.org" license=('LGPL') -depends=('java-runtime') -makedepends=('apache-ant' 'java-environment') +depends=('jre7-openjdk') +makedepends=('apache-ant' 'jdk7-openjdk') options=(!strip !emptydirs zipman !libtool docs) source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip" jitsi.desktop - jitsi.sh) -sha256sums=('939adbda52b5aa19592bcd5edf5c77e1bcbbcaa4d0fcdb59c6b5c9e4a10b1e7d' + jitsi.sh + drop-open-term-on-index-jn-html.patch) +sha256sums=('6ec46cc8f2306f5542c65fc637f70a7fe348b309ecc70a2483e05a745487ad41' '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d' - '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5') + '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5' + 'a862465431e9d272e00bb9aafe56edec0d5c4f3718062add53972685adb90631') + +prepare() { + cd $srcdir/$pkgname-src-$pkgver -build() -{ - cd "${srcdir}/${pkgname}" # append the build revision to the jitsi version - sed -i "s/0\.build\.by\.SVN/build.${pkgver}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java + sed -i "s|0.build.by.SVN|build.$pkgver|" src/net/java/sip/communicator/impl/version/NightlyBuildID.java + + # remove Open Source term + patch -Np0 -i ../drop-open-term-on-index-jn-html.patch + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + ' $(grep -ril 'open source') + sed -i 's|OpenSource / ||; + s|opensource / ||; + s|OpenSource|FreeSoftware|; + s|opensource|freesoftware|; + ' $(grep -ril opensource) + + # remove Linux term + sed -i '/, Linux/ s|Linux|GNU/Linux|; + /And Linux/ s|Linux|GNU/Linux|; + /and Linux/ s|Linux|GNU/Linux|; + /For Linux/ s|Linux|GNU/Linux|; + /for Linux/ s|Linux|GNU/Linux|; + /Linux,/ s|Linux|GNU/Linux|; + /Linux and/ s|Linux|GNU/Linux|; + /Linux distribution/ s|Linux|GNU/Linux|; + /Linux machine/ s|Linux|GNU/Linux|; + /Linux operating/ s|Linux|GNU/Linux|; + /Linux OS/ s|Linux|GNU/Linux|; + /Linux specific/ s|Linux|GNU/Linux|; + /Linux system/ s|Linux|GNU/Linux|; + /Under Linux/ s|Linux|GNU/Linux|; + /under Linux/ s|Linux|GNU/Linux|; + /On Linux/ s|Linux|GNU/Linux|; + /on Linux/ s|Linux|GNU/Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + ' $(grep -rl Linux) +} + +build() { + cd $srcdir/$pkgname-src-$pkgver . /etc/profile.d/apache-ant.sh ant rebuild } package() { - cd "${srcdir}/${pkgname}" + cd $srcdir/$pkgname-src-$pkgver find lib/ lib/bundle/ -maxdepth 1 -type f \ -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \; find lib/os-specific/linux/ -maxdepth 1 -type f \ diff --git a/pcr/jitsi/drop-open-term-on-index-jn-html.patch b/pcr/jitsi/drop-open-term-on-index-jn-html.patch new file mode 100644 index 000000000..8d4012a05 --- /dev/null +++ b/pcr/jitsi/drop-open-term-on-index-jn-html.patch @@ -0,0 +1,6 @@ +--- www/index-jn.html 2011-01-29 08:36:48.000000000 -0200 ++++ www/index-jn.html-new 2013-05-29 01:05:48.942716248 -0300 +@@ -1,2 +1,2 @@ + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +-<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <table width="100%" cellpadding="0" bordercolor="#111111" border="0" style="border-collapse: collapse" id="AutoNumber2"> <tbody><tr> <td valign="middle" style="width: 20%"> <p align="center"> <a href="http://sip-communicator.org"><img border="0" alt="sip-communicator.org" src="images/sip-communicator.logo.png" /></a><br /> SIP Communicator <br />Open Source VoIP & IM </p> <br /> </td> <td style="width: 90%"> <p align="justify"> SIP Communicator is an audio/video Internet phone and instant messenger that support some of the most popular instant messaging and telephony protocols such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC. </p> <p align="justify"> SIP Communicator is completely <a href="http://www.opensource.org/">Open Source</a> / <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, and is freely available under the terms of the <a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>. </p> <table width="100%" cellspacing="2" cellpadding="2" border="0" style="background-color: white"> <tbody><tr><td style="background-color: lightgray"> <p> RESOURCES: The SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Documentation/FAQ">FAQ</a> can usually answer most questions. You can also ask on the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists#users">users</a> mailing list, or at the <a class="urllink" rel="nofollow" href="http://www.sip-communicator.org/irc/irc.cgi">irc channel</a> #sip-communicator at irc.freenode.net. </p> </td></tr> </tbody></table> <p><em> <strong>Note:</strong> Right now SIP Communicator is still a work in progress and as such is still unstable. If you would like to help or follow project progress check the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/Roadmap">Project Roadmap</a> or join our <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists">Mailing Lists</a>. You can also have a look at the SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Main/Screenshots">screenshots</a> </em> </p> <p> <strong> Thanks for your patience and continuing support! <br /> <a href="https://sip-communicator.org/wiki/index.php/Development/TeamAndContributors"> The SIP Communicator team</a></strong></p> </td> </tr> </tbody></table> ++<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <table width="100%" cellpadding="0" bordercolor="#111111" border="0" style="border-collapse: collapse" id="AutoNumber2"> <tbody><tr> <td valign="middle" style="width: 20%"> <p align="center"> <a href="http://sip-communicator.org"><img border="0" alt="sip-communicator.org" src="images/sip-communicator.logo.png" /></a><br /> SIP Communicator <br />Free Software VoIP & IM </p> <br /> </td> <td style="width: 90%"> <p align="justify"> SIP Communicator is an audio/video Internet phone and instant messenger that support some of the most popular instant messaging and telephony protocols such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC. </p> <p align="justify"> SIP Communicator is completely <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, and is freely available under the terms of the <a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>. </p> <table width="100%" cellspacing="2" cellpadding="2" border="0" style="background-color: white"> <tbody><tr><td style="background-color: lightgray"> <p> RESOURCES: The SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Documentation/FAQ">FAQ</a> can usually answer most questions. You can also ask on the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists#users">users</a> mailing list, or at the <a class="urllink" rel="nofollow" href="http://www.sip-communicator.org/irc/irc.cgi">irc channel</a> #sip-communicator at irc.freenode.net. </p> </td></tr> </tbody></table> <p><em> <strong>Note:</strong> Right now SIP Communicator is still a work in progress and as such is still unstable. If you would like to help or follow project progress check the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/Roadmap">Project Roadmap</a> or join our <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists">Mailing Lists</a>. You can also have a look at the SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Main/Screenshots">screenshots</a> </em> </p> <p> <strong> Thanks for your patience and continuing support! <br /> <a href="https://sip-communicator.org/wiki/index.php/Development/TeamAndContributors"> The SIP Communicator team</a></strong></p> </td> </tr> </tbody></table> diff --git a/pcr/libqb/PKGBUILD b/pcr/libqb/PKGBUILD index eacdb6ea2..6b9d7d9d7 100644 --- a/pcr/libqb/PKGBUILD +++ b/pcr/libqb/PKGBUILD @@ -2,7 +2,7 @@ pkgname=libqb pkgver=0.14.4 -pkgrel=1 +pkgrel=2 pkgdesc='Library with the primary purpose of providing high performance client server reusable features' arch=( i686 @@ -14,6 +14,7 @@ makedepends=( splint ) license=LGPL2.1 +options=!libtool url=https://github.com/asalkeld/$pkgname/wiki source=https://github.com/asalkeld/$pkgname/archive/v$pkgver.tar.gz sha512sums=1377e38d5547eb516b255c0aa0972e858048053202692d7d5ef1c746d79dee2c78eddc29e797215376990f2c776b34261f765858606b59d77f9218fb0dac5977 @@ -22,6 +23,8 @@ build() { cd $srcdir/$pkgname-$pkgver setarch $CARCH ./autogen.sh setarch $CARCH ./configure --prefix=/usr\ + --disable-fatal-warnings\ + --disable-static\ --libdir=/usr/lib setarch $CARCH make } diff --git a/pcr/lua51-sql-mysql/PKGBUILD b/pcr/lua51-sql-mysql/PKGBUILD new file mode 100644 index 000000000..04ffee934 --- /dev/null +++ b/pcr/lua51-sql-mysql/PKGBUILD @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sébastien Luttringer <seblu@archlinux.org> +# Contributor: Anders Bergh <anders1@gmail.com> + +pkgname=lua51-sql-mysql +pkgdesc='MySQL module for Lua 5.1' +pkgver=2.2.0 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://www.keplerproject.org/luasql/' +license=('MIT') +depends=('lua51' 'libmariadbclient') +source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz") +md5sums=('59d72db444c6369c936d4f03694db6b7') + +build() { + cd luasql-$pkgver + sed -i '24s,$,/lua5.1,' config + msg2 'Building MySQL support' + make T=mysql PREFIX=/usr DRIVER_LIBS="$(mysql_config --libs)" \ + DRIVER_INCS="$(mysql_config --include) -fPIC" +} + +package() { + cd luasql-$pkgver + install -Dm644 src/mysql.so "$pkgdir/usr/lib/lua/5.1/luasql/mysql.so" + install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/mda-lv2/PKGBUILD b/pcr/mda-lv2/PKGBUILD new file mode 100644 index 000000000..500a656a5 --- /dev/null +++ b/pcr/mda-lv2/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=mda-lv2 +pkgver=1.0.0 +pkgrel=1 +pkgdesc="An LV2 port of the MDA plugins by Paul Kellett" +arch=('i686') +url="http://drobilla.net/2012/04/21/mda-lv2-1-0-0/" +license=('GPL3') +depends=('lv2') +makedepends=('python2') +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") +md5sums=('843ac4eade386034562917e95905e5d8') + +build() { + cd "$srcdir/$pkgname-$pkgver" + python2 ./waf configure --prefix=/usr + python2 ./waf +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + DESTDIR="$pkgdir" python2 ./waf install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/nekobee/PKGBUILD b/pcr/nekobee/PKGBUILD new file mode 100644 index 000000000..4e71ae93d --- /dev/null +++ b/pcr/nekobee/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=nekobee +pkgver=0.1.8 +pkgrel=2 +pkgdesc="A TB303-style synthesizer for DSSI" +url="https://github.com/gordonjcp/nekobee" +depends=('liblo' 'gtk2') +makedepends=('dssi' 'python' 'ladspa') +arch=('i686') +license=('GPL') +source=("https://github.com/gordonjcp/${pkgname}/archive/${pkgver}.tar.gz" + "nekobee.patch") +md5sums=('5954ac49043bc80588be72a9b9a9b28f' + '8dde87ad9b2a8500c51d773b25b7984f') + +build() { +cd $startdir/src/$pkgname-$pkgver +patch -p1 -i $srcdir/$pkgname.patch +./waf configure --prefix=/usr +./waf +} + +package() { +cd $startdir/src/$pkgname-$pkgver +DESTDIR=$pkgdir ./waf install +} diff --git a/pcr/nekobee/nekobee.patch b/pcr/nekobee/nekobee.patch new file mode 100644 index 000000000..dd995c357 --- /dev/null +++ b/pcr/nekobee/nekobee.patch @@ -0,0 +1,20 @@ +diff -aur nekobee-0.1.8/wscript nekobee-0.1.8.new/wscript +--- nekobee-0.1.8/wscript 2010-09-12 21:34:13.000000000 +0200 ++++ nekobee-0.1.8.new/wscript 2013-05-25 22:47:23.923441000 +0200 +@@ -31,7 +31,7 @@ + # DSSI plugin + plugin_dssi = bld.new_task_gen('cc', 'shlib') + plugin_dssi.env['shlib_PATTERN'] = '%s.so' +- plugin_dssi.env.append_value("LINKFLAGS", "-module -avoid-version -Wc,-nostartfiles") ++ plugin_dssi.env.append_value("LINKFLAGS", "-lm") + plugin_dssi.includes = ['.', 'src'] + plugin_dssi.defines = 'HAVE_CONFIG_H' + plugin_dssi.source = [ +@@ -49,6 +49,7 @@ + + # DSSI UI executable + gui_gtk = bld.new_task_gen('cc', 'program') ++ gui_gtk.env.append_value("LINKFLAGS", "-lm") + gui_gtk.includes = ['.', 'src'] + gui_gtk.defines = 'HAVE_CONFIG_H' + gui_gtk.source = [ diff --git a/pcr/networkmanager-openswan/PKGBUILD b/pcr/networkmanager-openswan/PKGBUILD new file mode 100644 index 000000000..16ff977b3 --- /dev/null +++ b/pcr/networkmanager-openswan/PKGBUILD @@ -0,0 +1,26 @@ +# Contributor: Marti Raudsepp <marti@juffo.org> + +pkgname=networkmanager-openswan +_pkgname=NetworkManager-openswan +pkgver=0.9.8.0 +pkgrel=1 +pkgdesc="NetworkManager plugin for IPSec VPN tunnels" +arch=('i686' 'x86_64') +url="http://ftp.acc.umu.se/pub/GNOME/sources/NetworkManager-openswan/" +license=('GPL') +depends=('openswan' 'gtk3' 'networkmanager' 'libgnome-keyring') +makedepends=('intltool') +source=(http://ftp.acc.umu.se/pub/GNOME/sources/$_pkgname/0.9/$_pkgname-$pkgver.tar.xz) +md5sums=('6a373868f85ac3b7c953f7fd6c76e637') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/networkmanager + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/pcr/networkmanager-strongswan/PKGBUILD b/pcr/networkmanager-strongswan/PKGBUILD new file mode 100644 index 000000000..31573dc82 --- /dev/null +++ b/pcr/networkmanager-strongswan/PKGBUILD @@ -0,0 +1,32 @@ +# Contributor: Michael Seiwald <michael@mseiwald.at> +# Maintainer: Dmitry Korzhevin <dkorzhevin at gmail dot com> +pkgname=networkmanager-strongswan +_pkgname=NetworkManager-strongswan +pkgver=1.3.0 +pkgrel=2 +pkgdesc="strongswan NetworkManager plugin" +arch=('i686' 'x86_64') +url="http://wiki.strongswan.org/projects/strongswan/wiki/NetworkManager" +license=('GPL') +depends=(networkmanager strongswan libgnomeui) +makedepends=(intltool) +source=(http://download.strongswan.org/NetworkManager/$_pkgname-$pkgver.tar.gz) +md5sums=('215f1d3b7b65be236b86bf30b6a4615b') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + ./configure --sysconfdir=/etc \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --with-charon=/usr/lib/strongswan/charon \ + CFLAGS="$CFLAGS -Wno-error=unused-local-typedefs" + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make DESTDIR="$pkgdir" install + #make install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/nicotine/PKGBUILD b/pcr/nicotine/PKGBUILD new file mode 100644 index 000000000..b0bd552b4 --- /dev/null +++ b/pcr/nicotine/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=nicotine +pkgver=1.2.16 +pkgrel=1 +pkgdesc="Soulseek music-sharing client, written in python" +arch=('i686') +url='http://sourceforge.net/projects/nicotine-plus/' +license=('GPL') +depends=('pygtk' 'mutagen' 'python2-sexy') +makedepends=('setconf') +optdepends=('python2-geoip: to enable Geographical blocker') +source=("http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2") +sha256sums=('71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d') + +prepare() { + cd "$srcdir/${pkgname}+-$pkgver" + + # Fix for FS#22476 + setconf files/nicotine.desktop Icon nicotine-plus-32px + + # Python fix + sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \ + -e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py +} + +build() { + cd "$srcdir/${pkgname}+-$pkgver/trayicon" + + python2 autogen.py + make +} + +package() { + cd "$srcdir/${pkgname}+-$pkgver" + + python2 setup.py install --root="$pkgdir" + cd trayicon + make DESTDIR="$pkgdir" install + ln -s nicotine.py "$pkgdir/usr/bin/nicotine" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/openhpi/PKGBUILD b/pcr/openhpi/PKGBUILD new file mode 100644 index 000000000..7da1cc055 --- /dev/null +++ b/pcr/openhpi/PKGBUILD @@ -0,0 +1,118 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=openhpi +pkgver=3.2.0 +pkgrel=3 +pkgdesc='Abstracted interface for managing computer hardware, typically chassis and rack based servers' +arch=( + i686 + x86_64 + mips64el +) +url=http://www.$pkgname.org/ +license=custom +depends=( + libxml2 + net-snmp +) +options=(!libtool) +source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz +sha512sums=5a54ccc2279b3a608e2842dd3b4f01d7d483182ecd33d1d33186247cea15b62f1e0aea4eea1294cd6c3959a25424dc322cca73e516f4c8fd9d3a41a949d087ab + +prepare() { + cd $srcdir/$pkgname-$pkgver + + # fixing path + sed -i 's|bin/sh|usr/bin/bash|; + ' $(grep -rl bin/sh) + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/bin) + sed -i 's| /bin| /usr/bin|; + ' $(grep -rl ' /bin') + sed -i 's| /sbin| /usr/bin|; + ' $(grep -rl ' /sbin') + sed -i 's|var/lock|run/lock|; + ' $(grep -rl var/lock) + sed -i 's|var/run|run|; + ' $(grep -rl var/run) + + # remove Open Source term + #sed -i 's|Open Source / ||; + # s|open source / ||; + # s|Open Source|Free Software|; + # s|open source|free software|; + # ' $(grep -ril 'open source') + #sed -i 's|OpenSource / ||; + # s|opensource / ||; + # s|OpenSource|FreeSoftware|; + # s|opensource|freesoftware|; + # ' $(grep -ril opensource) + + # remove Linux term + sed -i '/, Linux/ s|Linux|GNU/Linux|; + /And Linux/ s|Linux|GNU/Linux|; + /and Linux/ s|Linux|GNU/Linux|; + /For Linux/ s|Linux|GNU/Linux|; + /for Linux/ s|Linux|GNU/Linux|; + /Like Linux/ s|Linux|GNU/Linux|; + /like Linux/ s|Linux|GNU/Linux|; + /Linux,/ s|Linux|GNU/Linux|; + /Linux and/ s|Linux|GNU/Linux|; + /Linux distribution/ s|Linux|GNU/Linux|; + /Linux machine/ s|Linux|GNU/Linux|; + /Linux operating/ s|Linux|GNU/Linux|; + /Linux OS/ s|Linux|GNU/Linux|; + /Linux specific/ s|Linux|GNU/Linux|; + /Linux system/ s|Linux|GNU/Linux|; + /Under Linux/ s|Linux|GNU/Linux|; + /under Linux/ s|Linux|GNU/Linux|; + /On Linux/ s|Linux|GNU/Linux|; + /on Linux/ s|Linux|GNU/Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + ' $(grep -rl Linux) +} + +build() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH ./configure --prefix=/usr\ + --disable-static\ + --enable-clients\ + --enable-dynamic_simulator\ + --enable-ilo2_ribcl\ + --enable-ipmidirect\ + --enable-man\ + --enable-oa_soap\ + --enable-simulator\ + --enable-slave\ + --enable-snmp_bc\ + --enable-sysfs\ + --enable-test_agent\ + --enable-watchdog\ + --localstatedir=/var\ + --sbindir=/usr/bin\ + --sysconfdir=/etc + setarch $CARCH make +} + +package() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + rm $pkgdir/etc/init.d/openhpid && rmdir $pkgdir/etc/init.d + + install -d $pkgdir/usr/lib/systemd/system + echo '[Unit]' > $pkgdir/usr/lib/systemd/system/openhpi.service + echo 'Description=Enable OpenHPI service which is provided by openhpid' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo 'After=network.target remote-fs.target' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo '' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo '[Service]' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo 'Type=forking' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo 'ExecStart=/usr/bin/openhpid -c /etc/openhpi/openhpi.conf' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo '' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo '[Install]' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo 'WantedBy=multi-user.target' >> $pkgdir/usr/lib/systemd/system/openhpi.service +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/openipmi/PKGBUILD b/pcr/openipmi/PKGBUILD new file mode 100644 index 000000000..9c3c73ed8 --- /dev/null +++ b/pcr/openipmi/PKGBUILD @@ -0,0 +1,92 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> + +pkgname=openipmi +_pkgname1=${pkgname::4} +_pkgname2=${pkgname:4} +_pkgname=${_pkgname1^}${_pkgname2^^} +pkgver=2.0.19 +_pkgver=${pkgver::3} +pkgrel=2 +pkgdesc="Allow access to platform information using Intelligent Platform Management Interface (${_pkgname2^^})" +arch=( + i686 + x86_64 + mips64el +) +url=http://sourceforge.net/projects/$pkgname/ +depends=( + glib + net-snmp + #python2 + swig + tcl +) +makedepends=( + dia + ghostscript-libre + texlive-bibtexextra +) +options=(!libtool) +license=( + BSD-new + GPL2 + LGPL2.1 +) +source=http://downloads.sourceforge.net/project/$pkgname/$_pkgname' '$_pkgver' 'Library/$_pkgname-$pkgver.tar.gz +sha512sums=ee95eb64b7cde3f22c8444a5f8e3172808b0bb9a3a7034c1302c5f568c1cc0852a44ccc836924267b5f9901f7a8a3f4c66272cc0b663aa55689d7529841217cb + +prepare() { + cd $srcdir/$_pkgname-$pkgver + + # remove Open Source term + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + ' $(grep -ril 'open source') + #sed -i 's|OpenSource / ||; + # s|opensource / ||; + # s|OpenSource|FreeSoftware|; + # s|opensource|freesoftware|; + # ' $(grep -ril opensource) + + # remove Linux term + sed -i '/, Linux/ s|Linux|GNU/Linux|; + /And Linux/ s|Linux|GNU/Linux|; + /and Linux/ s|Linux|GNU/Linux|; + /For Linux/ s|Linux|GNU/Linux|; + /for Linux/ s|Linux|GNU/Linux|; + /Like Linux/ s|Linux|GNU/Linux|; + /like Linux/ s|Linux|GNU/Linux|; + /Linux,/ s|Linux|GNU/Linux|; + /Linux and/ s|Linux|GNU/Linux|; + /Linux distribution/ s|Linux|GNU/Linux|; + /Linux machine/ s|Linux|GNU/Linux|; + /Linux operating/ s|Linux|GNU/Linux|; + /Linux OS/ s|Linux|GNU/Linux|; + /Linux specific/ s|Linux|GNU/Linux|; + /Linux system/ s|Linux|GNU/Linux|; + /Under Linux/ s|Linux|GNU/Linux|; + /under Linux/ s|Linux|GNU/Linux|; + /On Linux/ s|Linux|GNU/Linux|; + /on Linux/ s|Linux|GNU/Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + ' $(grep -rl Linux) +} + +build() { + cd $srcdir/$_pkgname-$pkgver + setarch $CARCH ./configure --prefix=/usr\ + --disable-static + setarch $CARCH make +} + +package() { + cd $srcdir/$_pkgname-$pkgver + install -d $pkgdir/usr/bin + setarch $CARCH make DESTDIR=$pkgdir install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/openswan/PKGBUILD b/pcr/openswan/PKGBUILD index bae970025..97cea98e6 100644 --- a/pcr/openswan/PKGBUILD +++ b/pcr/openswan/PKGBUILD @@ -1,24 +1,23 @@ -# Contributor: Jan Fader <jan.fader@web.de> +# Contributor: xjpvictor Huang <ke [AT] xjpvictor [DOT] info> pkgname=openswan -pkgver=2.6.36 -pkgrel=2 +pkgver=2.6.38 +pkgrel=1 pkgdesc="Open Source implementation of IPsec for the Linux operating system" url="http://www.openswan.org" license=('GPL' 'custom') -arch=('i686' 'x86_64' 'mips64el') -depends=('iproute' 'gmp' 'perl') +arch=('i686' 'x86_64') +depends=('iproute2>=2.6.8' 'gmp' 'perl') +makedepends=('flex' 'bison') +conflicts=('ipsec-tools' 'openswan') +provides=('openswan') backup=(etc/ipsec.conf \ etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear}) -source=(http://www.openswan.org/download/openswan-$pkgver.tar.gz - openswan.rc.d - compile.patch) +source=(http://download.openswan.org/openswan/openswan-$pkgver.tar.gz + openswan + openswan.service) build() { - # Create /etc/rc.d for init script, and license directory - mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan} - cd $srcdir/openswan-$pkgver - patch -p1 -i $srcdir/compile.patch # Change install paths to Arch defaults sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|' Makefile.inc @@ -26,21 +25,27 @@ build() { make USE_XAUTH=true USE_OBJDIR=true programs } -package(){ +package() { cd $srcdir/openswan-$pkgver + + # Create /etc/rc.d for init script, and license directory + mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan} make DESTDIR=$pkgdir install # Change permissions in /var - chmod 755 $pkgdir/var/run/pluto - + chmod 700 $pkgdir/var/run/pluto + # Copy License cp LICENSE $pkgdir/usr/share/licenses/openswan - + # Install init script - install -Dm755 ../openswan.rc.d $pkgdir/etc/rc.d/openswan + install -Dm755 ../openswan $pkgdir/etc/rc.d/openswan + install -Dm644 ../openswan.service $pkgdir/usr/lib/systemd/system/openswan.service + mkdir $pkgdir/usr/lib/systemd/scripts/ + cp $pkgdir/etc/rc.d/ipsec $pkgdir/usr/lib/systemd/scripts/ipsec # fix manpages mv $pkgdir/usr/man $pkgdir/usr/share/ } -md5sums=('b3a1733493520bb18729633b62ef8247' +md5sums=('13073eb5314b83a31be88e4117e8bbcd' '543d84162761b9cc9ec319e938c4dd2a' - '5540437bb334873da646e21ac9caa963') + 'd8b465c10838c72e31329d65011002b6') diff --git a/pcr/openswan/openswan b/pcr/openswan/openswan new file mode 100755 index 000000000..30bd0d56e --- /dev/null +++ b/pcr/openswan/openswan @@ -0,0 +1,43 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting Openswan IPsec" + /etc/rc.d/ipsec --start + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + add_daemon openswan + fi + ;; + stop) + stat_busy "Stopping Openswan IPsec" + /etc/rc.d/ipsec --stop + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + rm_daemon openswan + fi + ;; + restart) + stat_busy "Restarting Openswan IPsec" + /etc/rc.d/ipsec --restart + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + add_daemon openswan + fi + ;; + status) + /etc/rc.d/ipsec --status + ;; + *) + echo "usage: $0 {start|stop|restart|status}" +esac + diff --git a/pcr/openswan/openswan.service b/pcr/openswan/openswan.service new file mode 100755 index 000000000..6d899705c --- /dev/null +++ b/pcr/openswan/openswan.service @@ -0,0 +1,13 @@ +[Unit] +Description=Openswan daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/lib/systemd/scripts/ipsec --start +ExecStop=/usr/lib/systemd/scripts/ipsec --stop +ExecReload=/usr/lib/systemd/scripts/ipsec --restart +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/pcr/prboom/PKGBUILD b/pcr/prboom/PKGBUILD new file mode 100644 index 000000000..03f53784e --- /dev/null +++ b/pcr/prboom/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 77655 2012-10-13 11:44:28Z allan $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Thayer Williams <thayer@archlinux.org> +# Contributor: dale <dale@archlinux.org> + +pkgname=prboom +pkgver=2.5.0 +pkgrel=7 +pkgdesc='A game engine which provides a program to play Doom levels.' +url='http://prboom.sourceforge.net/' +license=('GPL2') +arch=('i686' 'x86_64' 'mips64el') +depends=('libpng' 'sdl_mixer' 'sdl_net' 'glu') +makedepends=('mesa') +source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz" + 'libpng-1.4.patch') +md5sums=('a8a15f61fa2626ab98051ab2703378c4' + 'ba53474db8e747035ca2320a445e4ae0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 < ../libpng-1.4.patch + + ./configure --prefix=/usr --disable-i386-asm + sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + diff --git a/pcr/prboom/libpng-1.4.patch b/pcr/prboom/libpng-1.4.patch new file mode 100644 index 000000000..a2215e37b --- /dev/null +++ b/pcr/prboom/libpng-1.4.patch @@ -0,0 +1,21 @@ +diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c +--- prboom-2.5.0-orig/src/SDL/i_sshot.c 2010-01-24 23:26:03.000000000 -0500 ++++ prboom-2.5.0/src/SDL/i_sshot.c 2010-01-24 23:28:42.000000000 -0500 +@@ -231,7 +231,7 @@ + if (fp) + { + png_struct *png_ptr = png_create_write_struct( +- PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn); ++ PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn); + + if (png_ptr) + { +@@ -279,7 +279,7 @@ + break; + } + } +- png_destroy_write_struct(&png_ptr, png_infopp_NULL); ++ png_destroy_write_struct(&png_ptr, NULL); + } + fclose(fp); + } diff --git a/pcr/pybonjour/PKGBUILD b/pcr/pybonjour/PKGBUILD new file mode 100644 index 000000000..9f77354b2 --- /dev/null +++ b/pcr/pybonjour/PKGBUILD @@ -0,0 +1,19 @@ +# Contributor: Ruben Schuller <r.schuller@orgizm.net> + +pkgname=pybonjour +pkgver=1.1.1 +pkgrel=2 +pkgdesc="pybonjour provides a pure-Python interface to Apple Bonjour/Avahi" +arch=('any') +provides=('pybonjour') +license=('MIT') +url="http://code.google.com/p/pybonjour/" +depends=('python2') +makedepends=() +source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz) +md5sums=('30cbfd3e9e9721b39f6aa67df1c315a2') + +package() { + cd $srcdir/$pkgname-$pkgver + python2 setup.py install --root=$pkgdir + } diff --git a/~mtjm/python2-postfix-policyd-spf/PKGBUILD b/pcr/python2-postfix-policyd-spf/PKGBUILD index 237b6c9bd..f5b96f752 100644 --- a/~mtjm/python2-postfix-policyd-spf/PKGBUILD +++ b/pcr/python2-postfix-policyd-spf/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Samed Beyribey <ras0ir@eventualis.org> pkgname=python2-postfix-policyd-spf _pkgname=pypolicyd-spf -pkgver=0.8.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="Python2 Postfix Sender Policy Framework (SPF) filter" arch=('any') @@ -12,14 +12,17 @@ license=('GPL') depends=('postfix' 'python2-pyspf' 'python2') conflicts=('python-postfix-policyd-spf') options=(!emptydirs) -source=(http://launchpad.net/pypolicyd-spf/0.8/$pkgver/+download/$_pkgname-$pkgver.tar.gz) -md5sums=('a37c209e88e4dc419f62ae7c6b52f0e7') - +backup=(etc/python-policyd-spf/policyd-spf.conf) +source=(http://launchpad.net/pypolicyd-spf/1.1/$pkgver/+download/$_pkgname-$pkgver.tar.gz) +sha256sums=('f8999a9febc5ccb4a66f9961e4ec2d8f81b407bdc3ac1c84563cd5085429cdea') + build() { - cd "$srcdir/$_pkgname-$pkgver" - - python2 setup.py build || return 1 - python2 setup.py install --root=$pkgdir/ --optimize=1 || return 1 - install -m644 policyd-spf.conf.commented $pkgdir/etc/python-policyd-spf || return 1 + cd "$srcdir/$_pkgname-$pkgver" + python2 setup.py build } +package() { + cd "$srcdir/$_pkgname-$pkgver" + python2 setup.py install --root=$pkgdir/ --optimize=1 + install -m644 policyd-spf.conf.commented $pkgdir/etc/python-policyd-spf +} diff --git a/~mtjm/python2-pydns/PKGBUILD b/pcr/python2-pydns/PKGBUILD index cf5f4b388..cf5f4b388 100644 --- a/~mtjm/python2-pydns/PKGBUILD +++ b/pcr/python2-pydns/PKGBUILD diff --git a/~mtjm/python2-pyspf/PKGBUILD b/pcr/python2-pyspf/PKGBUILD index abb3bfa5f..abb3bfa5f 100644 --- a/~mtjm/python2-pyspf/PKGBUILD +++ b/pcr/python2-pyspf/PKGBUILD diff --git a/pcr/python2-sexy/PKGBUILD b/pcr/python2-sexy/PKGBUILD new file mode 100644 index 000000000..81c4e453e --- /dev/null +++ b/pcr/python2-sexy/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=python2-sexy +pkgver=0.1.9 +pkgrel=1 +pkgdesc="Python bindings for libsexy" +arch=('i686') +url='http://chipx86.com/wiki/Libsexy' +license=('LGPL') +depends=('libsexy' 'pygtk') +options=(!libtool) +source=(http://releases.chipx86.com/libsexy/sexy-python/sexy-python-$pkgver.tar.gz) +sha256sums=('2d8d257bbfa498a89792e0405ed8cf70396648b3df3c8e32cdc3dcc9bb666f15') +sha512sums=('e735f06efce302e10b89cfd3d6c641d523cd29517792ccaa4d022d7be6f6a350fff180f1c94d255ccbc82891cac7346520dfed2a88d828fbd7e891aa56396530') + +build() { + cd sexy-python-$pkgver/ + ./configure --prefix=/usr + make +} + +package() { + make -C sexy-python-$pkgver DESTDIR="$pkgdir" install +} diff --git a/pcr/python2-sfml2/PKGBUILD b/pcr/python2-sfml2/PKGBUILD index b612997f3..ed5249a25 100644 --- a/pcr/python2-sfml2/PKGBUILD +++ b/pcr/python2-sfml2/PKGBUILD @@ -1,15 +1,15 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> pkgname=python2-sfml2 -pkgver=1.2 +pkgver=master pkgrel=0 pkgdesc="Python 2 binding for SFML 2, written with Cython." arch=('i686' 'x86_64') -url="http://openhelbreath.net/python-sfml2" +url="http://python-sfml.org" license=('LGPL3') depends=('sfml' 'python2') makedepends=('sfml' 'cython2') conflicts=('python2-pysfml2' 'python2-pysfml2-git' 'python2-sfml2') -source=('https://github.com/Sonkun/python-sfml/archive/v1.2.zip') +source=('https://github.com/Sonkun/python-sfml/archive/master.zip') optdepends=('pyqt-common: To use pysfml with Qt') build() { @@ -37,4 +37,4 @@ package() { install -D -m644 "$srcdir/python-sfml-$pkgver/COPYING" $LICENSEFILE fi } -sha256sums=('24bf5c29eed525f4e81a43c1700ae37f6582e653fcb7f58ee41144b8cf46ce29') +sha256sums=('01bb4a07c3100807163cd2ddcb1208794b1dbac19706eabea430e23fbf00414b') diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD index e01f42ef0..8bc928115 100644 --- a/pcr/ryzom-hg/PKGBUILD +++ b/pcr/ryzom-hg/PKGBUILD @@ -1,29 +1,45 @@ # Maintainer:Bjoern Bidar <theodorstormgrade@gmail.com -# Maintainer:Jorge Araya Navarro <jorgean@lavabit.com> #_gui_toolkit=qt # qt or gtk _build_server=false # set true to build server (default:false) _build_client=true # set false to don't build client (default:true) _CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF'.) # cmake arguments for server and client _CMAKE_SERVER_ARGS=('-DWITH_RYZOM_SERVER=ON' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' ) # cmake args for building server _CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' ) # cmake args for building client - if [ $_build_client = true ] ; then true && pkgname=( 'ryzom-client-hg' ) fi if [ $_build_server = true ] ; then true && pkgname=( 'ryzom-client-hg' 'ryzom-server-hg') -fi +fi +pkgbase=ryzom-hg +pkgname=ryzom-hg +pkgver=20130331 +pkgrel=1 +pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server or launch a server" +arch=('i686' 'x86_64') +url="http://www.ryzom.com/" +license=('AGPL3') +depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql') +conflicts=('ryzom-client-latest-hg') +groups=('ryzom') +makedepends=('mercurial' 'cpptest' 'cmake' 'bison') +provides=('ryzom') +source=( 'ryzom.sh' 'ryzom.desktop' ) +md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f' + '71d5136d40ec4e76c2ac2b0c9e506aef') + + case $_gui_toolkit in qt) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_QT=ON' ) ;; gtk) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_GTK=ON' ) ;; -esac +esac _hg_root='https://bitbucket.org/ryzom/ryzomcore' -_hg_name='ryzomcore' +_hg_name='ryzomcore' prepare() { if [ -d "$_hg_name" ] ; then # fetch sources @@ -33,84 +49,52 @@ prepare() { else hg clone "$_hg_root" fi - + msg2 "hg clone done or server timeout" } build() { cd $_hg_name - - if [ $_build_client = true ] ; then - + + if [ $_build_client = true ] ; then mkdir -p "$srcdir/build-client" cd "$srcdir/build-client" msg "client is $_build_client, building client" cmake -b "$srcdir/$_hg_name/code" ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin msg "Starting make, to build client" make - + fi - + if [ $_build_server = true ] ; then mkdir -p "$srcdir/build-server" cd "$srcdir/build-server" msg "client is $_build_server, building server" cmake -b "$srcdir/$_hg_name/code" ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_SERVER_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - msg "Starting make, to build server" - make - + msg "Starting make, to build server" + make fi - } -if [ $_build_client = true ] ; then +if [ $_build_client = true ] ; then + package_ryzom-client-hg() { pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server" depends=( 'curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'cmake' 'libpng' 'libjpeg' 'rrdtool' 'bison' 'libwww' 'boost' 'cpptest' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql' 'ryzom-data' ) cd "$srcdir/build-client" make DESTDIR="$pkgdir/" install - install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications + install -Dm 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script - cp ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom - chmod +x ${pkgdir}/usr/bin/ryzom - mkdir -p ${pkgdir}/usr/bin - + install -Dm755 ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom } - fi if [ $_build_server = true ] ; then - + package_ryzom-server-hg() { pkgdesc="Ryzom is a Free to Play MMORPG . This is the version to run a server" cd "$srcdir/build-server" - make DESTDIR="$pkgdir/" install - # install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications - # sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script - # cp ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom - #chmod +x ${pkgdir}/usr/bin/ryzom - mkdir -p ${pkgdir}/usr/bin - + make DESTDIR="$pkgdir/" install } - fi - - - -pkgname=ryzom-hg -pkgbase=ryzom-hg -pkgver=20130331 -pkgrel=1 -pkgdesc="An awesome free software 3D MMORPG game" -arch=('i686' 'x86_64') -url="http://www.ryzom.com/" -license=('AGPL3') -depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51') #'lua51-sql-mysql') -conflicts=('ryzom-client-latest-hg' 'ryzom-client' 'ryzom-hg') -groups=('ryzom') -makedepends=('mercurial' 'cpptest' 'cmake' 'bison') -provides=('ryzom') -source=( 'ryzom.sh' 'ryzom.desktop' ) -md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f' - '71d5136d40ec4e76c2ac2b0c9e506aef') diff --git a/pcr/strongswan/CHANGELOG b/pcr/strongswan/CHANGELOG new file mode 100644 index 000000000..a798a08c4 --- /dev/null +++ b/pcr/strongswan/CHANGELOG @@ -0,0 +1,20 @@ +strongswan-5.0.4 +---------------- + +- Fixed a security vulnerability in the openssl plugin which was reported by + Kevin Wojtysiak. The vulnerability has been registered as CVE-2013-2944. + Before the fix, if the openssl plugin's ECDSA signature verification was used, + due to a misinterpretation of the error code returned by the OpenSSL + ECDSA_verify() function, an empty or zeroed signature was accepted as a + legitimate one. + +- The handling of a couple of other non-security relevant openssl return codes + was fixed as well. + +- The tnc_ifmap plugin now publishes virtual IPv4 and IPv6 addresses via its + TCG TNC IF-MAP 2.1 interface. + +- The charon.initiator_only option causes charon to ignore IKE initiation + requests. + +- The openssl plugin can now use the openssl-fips library. diff --git a/pcr/strongswan/PKGBUILD b/pcr/strongswan/PKGBUILD index ed603e5c2..975e7a21f 100644 --- a/pcr/strongswan/PKGBUILD +++ b/pcr/strongswan/PKGBUILD @@ -7,24 +7,27 @@ # Maintainer: dkorzhevin <dkorzhevin at gmail dot com> pkgname=strongswan -pkgver=5.0.1 -pkgrel=2 +pkgver=5.0.4 +pkgrel=5 pkgdesc="open source IPsec implementation" url='http://www.strongswan.org' license=("GPL") -arch=('i686' 'x86_64' 'mips64el') -depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite3') +arch=('i686' 'x86_64') +depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite') conflicts=('openswan') options=(!libtool) backup=(etc/ipsec.conf etc/strongswan.conf) source=(http://download.strongswan.org/${pkgname}-${pkgver}.tar.bz2 strongswan.rc::https://gist.github.com/raw/3106703/96d2ce9683f1e33ef14c679880ddc298e9673508/strongswan.rc) -md5sums=('58fdeb49f133139a58f4d8adafc69a16' +changelog='CHANGELOG' +md5sums=('0ab0397b44b197febfd0f89148344035' 'cf815adef48a1ffee34517380c731277') - build() { - cd ${srcdir}/${pkgname}-${pkgver} || return 1 + cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-ipsecdir=/usr/lib/strongswan \ + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --with-ipsecdir=/usr/lib/strongswan \ --enable-sqlite \ --enable-openssl --enable-curl \ --enable-sql --enable-attr-sql \ @@ -34,12 +37,15 @@ build() { --enable-eap-gtc --enable-eap-aka --enable-eap-aka-3gpp2 \ --enable-eap-mschapv2 --enable-eap-radius --enable-xauth-eap \ --enable-ha \ - --disable-mysql --disable-ldap || return 1 + --disable-mysql --disable-ldap - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + make +} - install -d ${pkgdir}/etc/rc.d || return 1 - ln -s /usr/sbin/ipsec ${pkgdir}/etc/rc.d/ipsec || return 1 - install -Dm755 ${srcdir}/strongswan.rc ${pkgdir}/etc/rc.d/strongswan || return 1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install + install -d ${pkgdir}/etc/rc.d + ln -s /usr/sbin/ipsec ${pkgdir}/etc/rc.d/ipsec + install -Dm755 ${srcdir}/strongswan.rc ${pkgdir}/etc/rc.d/strongswan } diff --git a/~mtjm/ttf-beteckna/PKGBUILD b/pcr/ttf-beteckna/PKGBUILD index ff338e0d4..3bbe41397 100644 --- a/~mtjm/ttf-beteckna/PKGBUILD +++ b/pcr/ttf-beteckna/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ttf-beteckna pkgver=0.4 -pkgrel=1 +pkgrel=1.1 pkgdesc="A geometric sans serif typeface inspired by the popular Futura" arch=('any') url="http://gnu.ethz.ch/linuks.mine.nu/beteckna/" diff --git a/~mtjm/ttf-beteckna/ttf.install b/pcr/ttf-beteckna/ttf.install index 33b7d6549..33b7d6549 100644 --- a/~mtjm/ttf-beteckna/ttf.install +++ b/pcr/ttf-beteckna/ttf.install diff --git a/pcr/xfce-theme-greybird/PKGBUILD b/pcr/xfce-theme-greybird/PKGBUILD index 0c5f9501d..74f21775e 100644 --- a/pcr/xfce-theme-greybird/PKGBUILD +++ b/pcr/xfce-theme-greybird/PKGBUILD @@ -1,32 +1,55 @@ -# Maintainer: flan_suse +# Maintainer: Limao Luo <luolimao+AUR@gmail.com> +# Contributor: flan_suse + +# This suite contains the following: +# * xfwm4 theme +# * xfwm4 compact theme +# * metacity theme +# * emerald theme +# * gtk2 theme +# * gtk2 theme (classic) +# * gtk3 theme +# * gtk3 theme (classic) +# * unity theme +# * xfce4-notify theme +# * lightdm theme +# * wallpaper (found in the shimmer-wallpapers package; optdepends) + +# There have been some drastic changes as of July 22nd, 2012! +# Please read through the AUR page comments if you wish to learn more. +# I have modified this PKGBUILD to compensate for the drastic changes. + pkgname=xfce-theme-greybird -pkgver=1.0.7 +_pkgname=Greybird +pkgver=1.1.1 +_pkgverclassic=0.8.2 pkgrel=1 -pkgdesc="A grey and blue Xfce theme, introduced in the release of Xubuntu 11.04 and updated for 12.04; includes the classic low saturation theme" -arch=('any') -url="http://shimmerproject.org/projects/greybird/" -license=('GPL2' 'CC-BY-SA-3.0') -groups=('xfce-themes-shimmer-collection') -depends=('gtk-engine-murrine') -optdepends=('shimmer-wallpapers: contains the Greybird wallpaper, among others' - 'gtk3: required for CSS/GTK3 theme' - 'elementary-xfce-icons: matching icon set; use the dark icon theme' - 'lightdm-gtk-greeter: required for the LightDM GTK theme' - 'lightdm-unity-greeter: required for the LightDM Unity theme' - 'gtk-engine-unico: required for gtk3 support for the classic theme; not required for the current theme') -source=($pkgname-$pkgver.tar.gz::https://github.com/shimmerproject/Greybird/tarball/v${pkgver}) +pkgdesc="A grey and blue Xfce theme, used by default in Xubuntu 12.04; includes the classic low saturation theme" +arch=(any) +url=http://shimmerproject.org/projects/greybird/ +license=(CCPL:by-sa-3.0 GPL) +groups=(xfce-themes-shimmer-collection) +depends=(gtk-engine-murrine) +optdepends=('elementary-xfce-icons: matching icon set; use the dark icon theme' + 'gtk-engine-unico: required for gtk3 support for the classic theme; not required for the current theme' + 'gtk3: required for CSS/GTK3 theme' + 'lightdm-gtk-greeter: required for the LightDM GTK theme' + 'lightdm-unity-greeter: required for the LightDM Unity theme' + 'shimmer-wallpapers: contains the Greybird wallpaper, among others') +conflicts=($pkgname-git) +source=($pkgname-$pkgver.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$pkgver.tar.gz + $pkgname-$_pkgverclassic.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$_pkgverclassic.tar.gz) +sha256sums=('374bc55d6af98ca6052cc5dd6c55db3b1ce9002fe81d3fde3e9b72febe697878' + 'b63da3527760c194bb7299c1cb45297268439740e52e2c5e1f39fc31dce6293a') +sha512sums=('1e4f7dea5e0206972d7d4a5bf42b353abf21e40d215fc1b0e7b546a4c95c7ce0604a37e9f2ad6c272fedf4720d0a5eee732a6b89d83c635c24082c24711c9e5e' + '09f19bbfe02a477de6635198736897d143a5eec8ed13e6d1863c80f5d78b341ecdf2b2cf48bffddead25082eeadde475d360fc7bee773307c5cc10fb3ff90034') package() { - cd "${srcdir}/shimmerproject-Greybird"* - - # Create installation directories - install -d -m755 "${pkgdir}/usr/share/themes/Greybird"{,\ Compact} - - # Install the current theme - cp -a * "${pkgdir}/usr/share/themes/Greybird/" + local _themedir="$pkgdir/usr/share/themes" + install -d "$_themedir/$_pkgname "{Classic,Compact} - # Make a symbolic link for the compact version of the xfwm4 theme - cd "${pkgdir}/usr/share/themes/Greybird Compact" - ln -s "../${_pkgname}/xfwm4_compact" "xfwm4" + cp -rf $_pkgname-$pkgver/ "$_themedir"/$_pkgname/ + rm "$_themedir"/$_pkgname/.gitignore + cp -rf $_pkgname-$_pkgverclassic/gtk-{2,3}.0 "$_themedir/$_pkgname Classic" + ln -s /usr/share/themes/$_pkgname/xfwm4_compact "$_themedir/$_pkgname Compact/xfwm4" } -md5sums=('d7c291408cd644e102cf811ee62e7a37') diff --git a/pcr/xsynth-dssi/PKGBUILD b/pcr/xsynth-dssi/PKGBUILD new file mode 100644 index 000000000..f353b9bfa --- /dev/null +++ b/pcr/xsynth-dssi/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=xsynth-dssi +pkgver=0.9.4 +pkgrel=1 +pkgdesc="An analog-style (VCOs-VCF-VCA) synth plugin for DSSI" +arch=('i686') +url="http://dssi.sourceforge.net/download.html#Xsynth-DSSI" +license=('GPL') +depends=('gtk2' 'liblo') +makedepends=('dssi' 'ladspa') +options=('!libtool') +source=(http://downloads.sourceforge.net/project/dssi/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz + xsynth-dssi) +md5sums=('3432ecdac06407a992f80eb1c1ecf7cd' + 'c346e6a944f202fccb2278b77a5e184b') +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install || return 1 + install -D -m755 ${srcdir}/xsynth-dssi ${pkgdir}/usr/bin/xsynth-dssi +} + diff --git a/pcr/xsynth-dssi/xsynth-dssi b/pcr/xsynth-dssi/xsynth-dssi new file mode 100644 index 000000000..5503b12ba --- /dev/null +++ b/pcr/xsynth-dssi/xsynth-dssi @@ -0,0 +1,4 @@ +#!/bin/bash + +export DSSI_PATH=/usr/lib/dssi +exec jack-dssi-host xsynth-dssi.so diff --git a/~mtjm/python-coverage/LICENSE b/~mtjm/python-coverage/LICENSE deleted file mode 100644 index 304031cb6..000000000 --- a/~mtjm/python-coverage/LICENSE +++ /dev/null @@ -1,29 +0,0 @@ -# COPYRIGHT AND LICENSE -# -# Copyright 2001 Gareth Rees. All rights reserved. -# Copyright 2004-2010 Ned Batchelder. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -# DAMAGE. diff --git a/~mtjm/python-coverage/PKGBUILD b/~mtjm/python-coverage/PKGBUILD deleted file mode 100644 index f9acc0d94..000000000 --- a/~mtjm/python-coverage/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer: Michał Masłowski <mtjm@mtjm.eu> - -pkgname=(python-coverage python2-coverage) -pkgver=3.5.1 -pkgrel=1 -pkgdesc="Code coverage measurement for Python" -arch=('i686' 'x86_64' 'mips64el') -url="http://nedbatchelder.com/code/coverage/" -license=('BSD') -makedepends=('python' 'python2' 'python-distribute' 'python2-distribute') -provides=() -conflicts=() -replaces=() -backup=() -options=(!emptydirs) -install= -source=("http://pypi.python.org/packages/source/c/coverage/coverage-${pkgver}.tar.gz" LICENSE) -md5sums=('410d4c8155a4dab222f2bc51212d4a24' - 'f86a7dcb9a1bc636cdbcc19a96d19b2c') - -# Tests are not run, since upstream removes them from release tarballs. - -build() { - cd $srcdir - cp -r coverage-$pkgver build-py2k - cp -r coverage-$pkgver build-py3k - cd build-py2k - python2 setup.py build - cd ../build-py3k - python setup.py build -} - -package_python-coverage() { - depends=('python' 'python-distribute') - cd "$srcdir/build-py3k" - python setup.py install --root="$pkgdir/" --optimize=1 - install -D -m644 $srcdir/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_python2-coverage() { - depends=('python2' 'python2-distribute') - cd "$srcdir/build-py2k" - python2 setup.py install --root="$pkgdir/" --optimize=1 - # Name the script differently. - mv $pkgdir/usr/bin/coverage $pkgdir/usr/bin/coverage2 - install -D -m644 $srcdir/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/~mtjm/python2-pyflakes/PKGBUILD b/~mtjm/python2-pyflakes/PKGBUILD deleted file mode 100644 index 397c487b7..000000000 --- a/~mtjm/python2-pyflakes/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 64234 2012-02-11 00:28:07Z arodseth $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: TDY <tdy@gmx.com> -# Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com> - -pkgname=python2-pyflakes -pkgver=0.5.0 -pkgrel=1 -pkgdesc='A lint-like tool for Python to identify common errors quickly without executing code' -arch=('any') -url='http://pypi.python.org/pypi/pyflakes' -license=('custom:MIT') -depends=('python2') -provides=('pyflakes') -conflicts=('pyflakes') -replaces=('pyflakes') -source=("http://pypi.python.org/packages/source/p/pyflakes/pyflakes-${pkgver}.tar.gz") -md5sums=('568dab27c42e5822787aa8a603898672') - -build() { - cd pyflakes-${pkgver} - - python2 setup.py build -} - -package() { - cd pyflakes-${pkgver} - - python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1 - - install -D -m644 LICENSE \ - ${pkgdir}/usr/share/licenses/pyflakes/LICENSE -} |