diff options
Diffstat (limited to 'extra')
31 files changed, 681 insertions, 122 deletions
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 946e2a51f..086a8e942 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 165171 2012-08-12 04:07:04Z bisson $ +# $Id: PKGBUILD 166973 2012-09-23 22:56:56Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=3.3.1 +pkgver=3.3.2 pkgrel=1 pkgdesc='Lightweight, advanced audio player focused on audio quality' url='http://audacious-media-player.org/' -license=('GPL3') +license=('custom:BSD') arch=('i686' 'x86_64' 'mips64el') depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'desktop-file-utils') optdepends=('unzip-libre: zipped skins support') source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('6ccd6856df853d939ea41402be4bfc76a5423a8f') +sha1sums=('bab3bcb267b8b333570c85cae9590470fe509eb9') provides=('audacious-player') replaces=('audacious-player') @@ -29,4 +29,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 9b85d9dfe..469e1175f 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166615 2012-09-13 08:59:14Z andrea $ +# $Id: PKGBUILD 166927 2012-09-22 09:45:48Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -31,10 +31,16 @@ makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw' 'openjpeg' 'kdegraphics-okular' 'pstoedit') groups=('calligra') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('b4f1532d802a6c97fbcfa6a0467b7216') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" + 'lcms24.patch') +md5sums=('b4f1532d802a6c97fbcfa6a0467b7216' + '42065ccf5617fc340b29d6bfbe9fa32f') build() { + cd ${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/lcms24.patch + cd .. + mkdir build cd build cmake ../${pkgbase}-${pkgver} \ diff --git a/extra/calligra/lcms24.patch b/extra/calligra/lcms24.patch new file mode 100644 index 000000000..b2427aff1 --- /dev/null +++ b/extra/calligra/lcms24.patch @@ -0,0 +1,12 @@ +--- a/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h ++++ b/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h +@@ -22,6 +22,8 @@ + + #include <LcmsColorSpace.h> + #include <KoColorSpaceTraits.h> ++ ++#define TYPE_XYZA_FLT (FLOAT_SH(1)|COLORSPACE_SH(PT_XYZ)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4)) + + #include <KoColorModelStandardIds.h> + + diff --git a/extra/gperftools/PKGBUILD b/extra/gperftools/PKGBUILD new file mode 100644 index 000000000..c8ad827ae --- /dev/null +++ b/extra/gperftools/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 166940 2012-09-22 20:23:08Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Thomas Jost <schnouki@schnouki.net> +# Contributor: JaDa <jada@archlinux.us> +# Contributor: Joaquim Pedro <osmano807@gmail.com> +# Contributor: Jan Rüegg <rggjan@gmail.com> + +pkgname=gperftools +pkgver=2.0 +pkgrel=4 +pkgdesc="Fast, multi-threaded malloc() and nifty performance analysis tools" +arch=('i686' 'x86_64') +url="http://code.google.com/p/gperftools/" +license=('BSD') +depends=('perl') +optdepends=('graphviz: pprof graph generation' + 'gv: pprof postscript generation') +options=('!libtool') +source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz") +sha256sums=('7de3dd91f018825b1e7d332af1edace15c6211f430186febede1835069861080') + +build() { + cd "$pkgname-$pkgver" + + # fix for glibc 2.16 + sed -i 's:siginfo_t:siginfo:' src/base/linuxthreads.cc + + ./configure --prefix=/usr --enable-frame-pointers + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 6e9bbb1e1..99b7cfe98 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166579 2012-09-12 17:20:44Z jgc $ +# $Id: PKGBUILD 166992 2012-09-24 15:54:53Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.12 +pkgver=2.24.13 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz xid-collision-debug.patch) -sha256sums=('c5eba3b9259e4bf7554e9dc9db5d72038aa8b1bdd40fa0364b3705c226d11808' +sha256sums=('35e1a01e46b02970b02ee9f299390d0aa57c1215ad2667bcd584b72f4ea6513d' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD new file mode 100644 index 000000000..23b59b1da --- /dev/null +++ b/extra/leveldb/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 166942 2012-09-22 20:23:58Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: feydaykyn <feydaykyn@yahoo.fr> + +pkgname=leveldb +pkgver=1.5.0 +pkgrel=4 +pkgdesc="A fast and lightweight key/value database library" +arch=('i686' 'x86_64') +url="https://code.google.com/p/leveldb/" +license=('BSD') +depends=('gperftools' 'snappy') +source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz") +sha1sums=('b5b45ff74065f242c37f465b13dafb925972ca43') + +build() { + # buildsys doesn't play nicely with -Wl,--as-needed + LDFLAGS=-Wl,-O1,--sort-common,-z,relro + + make -C "$pkgname-$pkgver" +} + +check() { + make -C "$pkgname-$pkgver" check +} + +package() { + cd "$pkgname-$pkgver" + + install -dm755 \ + "$pkgdir"/usr/{include/leveldb,lib} \ + "$pkgdir"/usr/share/doc/"$pkgname" + + # libraries + install -m755 -t "$pkgdir/usr/lib" libleveldb.so.1.5 libleveldb.a + cp -P libleveldb.so{,.1} "$pkgdir/usr/lib" + + # headers + install -m644 -t "$pkgdir/usr/include/leveldb" include/leveldb/* + + # documentation + cp -r doc/* "$pkgdir/usr/share/doc/$pkgname" + + # license + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/extra/libffado/PKGBUILD b/extra/libffado/PKGBUILD index c2e1dd7cb..e9f9b4d35 100644 --- a/extra/libffado/PKGBUILD +++ b/extra/libffado/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166872 2012-09-20 10:13:42Z schiv $ +# $Id: PKGBUILD 166955 2012-09-23 09:44:31Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: galiyosha@gmail.com # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> pkgname=libffado pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Driver for FireWire audio devices" arch=('i686' 'x86_64' 'mips64el') url="http://www.ffado.org/" @@ -26,6 +26,7 @@ _scons-conf() { PREFIX=/usr \ MANDIR=/usr/share/man \ UDEVDIR=/usr/lib/udev/rules.d \ + ENABLE_SETBUFFERSIZE_API_VER=false \ COMPILE_FLAGS="$CFLAGS" $@ } diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index c78d08cbf..550ced111 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165552 2012-08-23 17:48:12Z tomegun $ +# $Id: PKGBUILD 166960 2012-09-23 11:44:00Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: damir <damir@archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=libmtp -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=1 pkgdesc="Library implementation of the Media Transfer Protocol" arch=("i686" "x86_64" "mips64el") @@ -24,4 +24,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('27d9bcbc925c1ef84869eb27fdda54e8') +md5sums=('f80e45c0e6e5798c434bb1c26a7b602d') diff --git a/extra/libsigc++/PKGBUILD b/extra/libsigc++/PKGBUILD index 1827712aa..59a9b4a03 100644 --- a/extra/libsigc++/PKGBUILD +++ b/extra/libsigc++/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 151408 2012-02-26 10:35:06Z pierre $ +# $Id: PKGBUILD 166999 2012-09-24 17:45:03Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=libsigc++ pkgname=('libsigc++' 'libsigc++-docs') -pkgver=2.2.10 -pkgrel=2 +pkgver=2.2.11 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://libsigc.sourceforge.net/" makedepends=('gcc-libs') options=('!libtool' '!emptydirs') -source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.bz2") -sha256sums=('d3d810c2ad469edfb2d4db29643bef189b7613019eadbd4a72823af3c73c959c') +source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.xz") +sha256sums=('9834045f74f56752c2c6b3cdc195c30ab8314ad22dc8e626d6f67f940f1e4957') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/mutt/1a4c43138685.patch b/extra/mutt/1a4c43138685.patch new file mode 100644 index 000000000..ec1bc198a --- /dev/null +++ b/extra/mutt/1a4c43138685.patch @@ -0,0 +1,12 @@ +Index: muttlib.c
+===================================================================
+--- muttlib.c (revision 6128:eff500f87889)
++++ muttlib.c (revision 6161:1a4c43138685)
+@@ -1961,5 +1961,6 @@
+ char *p = safe_strdup (src);
+ int rc = mutt_convert_string (&p, Charset, "utf-8", 0);
+- strfcpy (dest, rc == 0 ? p : src, dlen);
++ /* `src' may be NULL, such as when called from the pop3 driver. */
++ strfcpy (dest, (rc == 0) ? NONULL(p) : NONULL(src), dlen);
+ FREE (&p);
+ }
diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD index 572e4d753..486fbde00 100644 --- a/extra/mutt/PKGBUILD +++ b/extra/mutt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143812 2011-11-29 13:33:33Z stephane $ +# $Id: PKGBUILD 166981 2012-09-24 06:32:03Z bisson $ # Contributor: tobias [tobias [at] archlinux.org] # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=mutt pkgver=1.5.21 -pkgrel=6 +pkgrel=7 pkgdesc='Small but very powerful text-based mail client' url='http://www.mutt.org/' license=('GPL') @@ -12,13 +12,16 @@ backup=('etc/Muttrc') arch=('i686' 'x86_64' 'mips64el') optdepends=('smtp-forwarder: to send mail') depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5') -source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz") -sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9') +source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz" + '1a4c43138685.patch') +sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9' + '32dbcafe05e4a919fd00c6a1064c6ecd205e6eb1') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -i ../1a4c43138685.patch # FS#31536 ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD index 39de08afd..fa5bc6408 100644 --- a/extra/nx/PKGBUILD +++ b/extra/nx/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162757 2012-06-29 15:32:58Z andyrtr $ +# $Id: PKGBUILD 166924 2012-09-22 09:16:46Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=nx pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers') -pkgver=3.5.0.14 +pkgver=3.5.0.15 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://wiki.x2go.org/" @@ -14,11 +14,11 @@ makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from ) source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz nx-x11.ld.so.conf.d) -md5sums=('f20f5a12e15849bae8a1f2d7b44830ab' +md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0' 'f2ec60c7e2d81bef2f7292d2b33681a6') build() { - cd "${srcdir}/nx-libs_$pkgver" + cd "${srcdir}/nx-libs-$pkgver" make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include" # fake install mkdir $srcdir/fakeinstall @@ -47,7 +47,7 @@ package_nxproxy() { ln -sv /usr/lib/nx/bin/nxproxy . # the wrapper - cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin + cp -a ${srcdir}/nx-libs-$pkgver/bin/nxproxy ${pkgdir}/usr/bin chmod +x ${pkgdir}/usr/bin/nxproxy cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1 } @@ -79,7 +79,7 @@ package_nx-x11() { ln -sv /usr/lib/nx/bin/nxauth . # the wrapper - cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin + cp -a ${srcdir}/nx-libs-$pkgver/bin/nxauth ${pkgdir}/usr/bin chmod +x ${pkgdir}/usr/bin/nxauth install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf" @@ -96,10 +96,10 @@ package_nxagent() { ln -sv /usr/lib/nx/bin/nxagent . # the wrapper - cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin + cp -a ${srcdir}/nx-libs-$pkgver/bin/nxagent ${pkgdir}/usr/bin chmod +x ${pkgdir}/usr/bin/nxagent # required nxcompshad libs - cp -a ${srcdir}/nx-libs_$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx + cp -a ${srcdir}/nx-libs-$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx cd ${pkgdir}/usr/lib/nx ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3 ln -sv libXcompshad.so.3.5.0 libXcompshad.so diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index d5681db66..dee5a706b 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,34 +1,44 @@ -# $Id: PKGBUILD 165415 2012-08-18 15:08:12Z dan $ +# $Id: PKGBUILD 166985 2012-09-24 14:37:09Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=postgresql-old-upgrade -pkgver=9.0.9 +pkgver=9.1.6 _majorver=${pkgver%.*} pkgrel=1 -pkgdesc="Minimal PostgreSQL build for migrating between major versions with pg_upgrade" +pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" license=('custom:PostgreSQL') depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0') +makedepends=('krb5' 'python2' 'perl' 'tcl') source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2) build() { cd "${srcdir}/postgresql-${pkgver}" ./configure --prefix=/opt/pgsql-${_majorver} \ - --with-libxml --with-openssl --without-perl \ - --without-python --with-pam --without-readline \ - --with-system-tzdata=/usr/share/zoneinfo --disable-nls \ + --with-krb5 \ + --with-libxml \ + --with-openssl \ + --with-perl \ + --with-python PYTHON=/usr/bin/python2 \ + --with-tcl \ + --with-pam \ + --without-readline \ + --with-system-tzdata=/usr/share/zoneinfo \ + --disable-nls \ --enable-thread-safety make -C src all + make -C contrib all } package() { cd "${srcdir}/postgresql-${pkgver}" # install - make DESTDIR="${pkgdir}" -C src install + make -C src DESTDIR="${pkgdir}" install + make -C contrib DESTDIR="${pkgdir}" install # install license install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" @@ -37,5 +47,5 @@ package() { rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/" } -md5sums=('284303098b161240fd13df7c251822a5') -sha256sums=('87417d181a0f534fa96ba1d315a62b721f5bc22b7bb70af3f674bc1a68a5da8a') +md5sums=('000755f66c0de58bbd4cd2b89b45b8e2') +sha256sums=('6e396aca621a95b9f5f7292a79ebe6ce892e36c7f7021814e1bd94bcfc6c31e7') diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index 0fe507e95..ca3fbcdcb 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,17 +1,32 @@ -# $Id: PKGBUILD 160730 2012-06-04 17:58:05Z dan $ +# $Id: PKGBUILD 166983 2012-09-24 14:35:11Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.1.4 +pkgver=9.2.1 _majorver=${pkgver%.*} pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" license=('custom:PostgreSQL') makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0') -source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 - postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate) +source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 + postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate + postgresql.service postgresql-check-db-dir) +md5sums=('c0b4799ea9850eae3ead14f0a60e9418' + '1ddd1df8010549f237e7983bb326025e' + 'a54d09a20ab1672adf08f037df188d53' + '96f82c38f3f540b53f3e5144900acf17' + 'd28e443f9f65a5712c52018b84e27137' + '89b48774b0dae7c37fbb0e907c3c1db8' + '505e0e4abfc746cae9558584d471a03c') +sha256sums=('db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461' + '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45' + '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81' + '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' + '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' + 'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68' + '3a3279d290f556bf7a362670e32b491794f47ed218f6b8c6acef366a3291f669') build() { cd "${srcdir}/postgresql-${pkgver}" @@ -122,6 +137,10 @@ package_postgresql() { # install launch script install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql" + install -D -m644 "${srcdir}/postgresql.service" \ + "${pkgdir}/usr/lib/systemd/system/postgresql.service" + install -D -m755 "${srcdir}/postgresql-check-db-dir" \ + "${pkgdir}/usr/bin/postgresql-check-db-dir" # install conf file install -D -m644 ${srcdir}/postgresql.confd \ @@ -133,14 +152,3 @@ package_postgresql() { install -D -m644 ${srcdir}/postgresql.logrotate \ "${pkgdir}/etc/logrotate.d/postgresql" } - -md5sums=('a8035688dba988b782725ac1aec60186' - '1ddd1df8010549f237e7983bb326025e' - 'a54d09a20ab1672adf08f037df188d53' - '96f82c38f3f540b53f3e5144900acf17' - 'd28e443f9f65a5712c52018b84e27137') -sha256sums=('a0795a8eb3ae2d1a2914b63bf143d20182835d90699915ff43567c041d3c9712' - '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45' - '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81' - '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' - '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e') diff --git a/extra/postgresql/postgresql-check-db-dir b/extra/postgresql/postgresql-check-db-dir new file mode 100755 index 000000000..542c82209 --- /dev/null +++ b/extra/postgresql/postgresql-check-db-dir @@ -0,0 +1,49 @@ +#!/bin/sh + +# This script verifies that the postgresql data directory has been correctly +# initialized. We do not want to automatically initdb it, because that has +# a risk of catastrophic failure (ie, overwriting a valuable database) in +# corner cases, such as a remotely mounted database on a volume that's a +# bit slow to mount. But we can at least emit a message advising newbies +# what to do. + +PGDATA="$1" + +if [ -z "$PGDATA" ] +then + echo "Usage: $0 database-path" + exit 1 +fi + +# PGMAJORVERSION is major version +PGMAJORVERSION=9.2 +# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades +PREVMAJORVERSION=9.1 + +# Check for the PGDATA structure +if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ] +then + # Check version of existing PGDATA + if [ x`cat "$PGDATA/PG_VERSION"` = x"$PGMAJORVERSION" ] + then + : A-OK + elif [ x`cat "$PGDATA/PG_VERSION"` = x"$PREVMAJORVERSION" ] + then + echo $"An old version of the database format was found." + echo $"See https://wiki.archlinux.org/index.php/PostgreSQL#Upgrading_PostgreSQL" + exit 1 + else + echo $"An old version of the database format was found." + echo $"You need to dump and reload before using PostgreSQL $PGMAJORVERSION." + echo $"See http://www.postgresql.org/docs/9.2/static/upgrading.html" + exit 1 + fi +else + # No existing PGDATA! Warn the user to initdb it. + echo $"\"$PGDATA\" is missing or empty. Use a command like" + echo $" su - postgres -c \"initdb --locale en_US.UTF-8 -D '$PGDATA'\"" + echo $"with relevant options, to initialize the database cluster." + exit 1 +fi + +exit 0 diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install index c52432271..7b73f6fa9 100644 --- a/extra/postgresql/postgresql.install +++ b/extra/postgresql/postgresql.install @@ -2,9 +2,13 @@ post_install() { if [ ! -d '/var/lib/postgres' ]; then mkdir -p '/var/lib/postgres' fi - getent group postgres >/dev/null || groupadd -g 88 postgres - getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres - passwd -l postgres >/dev/null + if ! getent group postgres >/dev/null; then + groupadd -g 88 postgres + fi + if ! getent passwd postgres >/dev/null; then + useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres + passwd -l postgres >/dev/null + fi } post_upgrade() { diff --git a/extra/postgresql/postgresql.service b/extra/postgresql/postgresql.service new file mode 100644 index 000000000..294b66e8f --- /dev/null +++ b/extra/postgresql/postgresql.service @@ -0,0 +1,26 @@ +[Unit] +Description=PostgreSQL database server +After=network.target + +[Service] +Type=forking +TimeoutSec=120 +User=postgres +Group=postgres + +Environment=PGROOT=/var/lib/postgres + +SyslogIdentifier=postgres +PIDFile=/var/lib/postgres/data/postmaster.pid + +ExecStartPre=/usr/bin/postgresql-check-db-dir ${PGROOT}/data +ExecStart= /usr/bin/pg_ctl -s -D ${PGROOT}/data start -w -t 120 +ExecReload=/usr/bin/pg_ctl -s -D ${PGROOT}/data reload +ExecStop= /usr/bin/pg_ctl -s -D ${PGROOT}/data stop -m fast + +# Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in +# killing Postgres, so adjust it downward +OOMScoreAdjust=-200 + +[Install] +WantedBy=multi-user.target diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index f3646cf9a..680247643 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166901 2012-09-21 13:44:23Z andrea $ +# $Id: PKGBUILD 166954 2012-09-23 09:22:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.3 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -20,14 +20,16 @@ source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' 'improve-cups-support.patch' - 'fix-crash-in-assistant.patch') + 'fix-crash-in-assistant.patch' + 'undo-fix-jit-crash-on-x86_64.patch') md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' 'c439c7731c25387352d8453ca7574971' - '57590084078b6379f0501f7728b02ae2') + '57590084078b6379f0501f7728b02ae2' + '094e5a4e30e52423c77daa4a9c782df5') build() { cd "${srcdir}"/${_pkgfqn} @@ -38,8 +40,11 @@ build() { # (FS#28381) (KDEBUG#180051) patch -p1 -i "${srcdir}"/improve-cups-support.patch - # (FS#) + # (FS#29469) patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch + + # (FS#31654) + patch -Rp1 -i "${srcdir}"/undo-fix-jit-crash-on-x86_64.patch export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} diff --git a/extra/qt/undo-fix-jit-crash-on-x86_64.patch b/extra/qt/undo-fix-jit-crash-on-x86_64.patch new file mode 100644 index 000000000..ac86a846b --- /dev/null +++ b/extra/qt/undo-fix-jit-crash-on-x86_64.patch @@ -0,0 +1,280 @@ +Description: Fix JIT crash on x86-64 (avoid 32-bit branch offset overflow) + . + Cherry-picked from webkit commit + a5b3261a8c4386b4e14ce40a34c7fc933a5f7001 +Origin: commit ada98493bbfbd9af0d0b593017e29d39bcd3495e +Author: Kent Hansen <kent.hansen@nokia.com> +Forwarded: not-needed +Applied-Upstream: yes +Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> +Reviewed-by: Kent Hansen <kent.hansen@nokia.com> +--- + .../javascriptcore/JavaScriptCore/ChangeLog | 27 +++++++++++++++++ + .../JavaScriptCore/JavaScriptCore.pri | 1 + + .../JavaScriptCore/jit/ExecutableAllocator.cpp | 21 +++++++++++++ + .../jit/ExecutableAllocatorFixedVMPool.cpp | 31 +++++++++++++------- + .../jit/ExecutableAllocatorPosix.cpp | 29 ++---------------- + .../jit/ExecutableAllocatorSymbian.cpp | 2 +- + .../JavaScriptCore/jit/ExecutableAllocatorWin.cpp | 2 +- + .../javascriptcore/JavaScriptCore/wtf/Platform.h | 10 +++++++ + 8 files changed, 84 insertions(+), 39 deletions(-) + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog +index 9cbf0c1..5ab23e6 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog +@@ -1,3 +1,30 @@ ++2010-07-08 Gavin Barraclough <barraclough@apple.com> ++ ++ Reviewed by Sam Weinig. ++ ++ https://bugs.webkit.org/show_bug.cgi?id=41641 ++ ++ Update compile flags to allow use of ExecutableAllocatorFixedVMPool on platforms ++ other than x86-64 (this may be useful on 32-bit platforms, too). ++ ++ Simplify ifdefs by dividing into thwo broad allocation strategies ++ (ENABLE_EXECUTABLE_ALLOCATOR_FIXED & ENABLE_EXECUTABLE_ALLOCATOR_DEMAND). ++ ++ Rename constant used in the code to have names descriptive of their purpose, ++ rather than their specific value on a given platform. ++ ++ * jit/ExecutableAllocator.cpp: ++ (JSC::ExecutableAllocator::reprotectRegion): ++ (JSC::ExecutableAllocator::cacheFlush): ++ * jit/ExecutableAllocatorFixedVMPool.cpp: ++ (JSC::FixedVMPoolAllocator::FixedVMPoolAllocator): ++ (JSC::FixedVMPoolAllocator::free): ++ (JSC::ExecutablePool::systemAlloc): ++ * jit/ExecutableAllocatorPosix.cpp: ++ * jit/ExecutableAllocatorSymbian.cpp: ++ * jit/ExecutableAllocatorWin.cpp: ++ * wtf/Platform.h: ++ + 2010-08-24 Oliver Hunt <oliver@apple.com> + + Reviewed by Geoff Garen. +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +index b061321..847f69c 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +@@ -100,6 +100,7 @@ SOURCES += \ + interpreter/CallFrame.cpp \ + interpreter/Interpreter.cpp \ + interpreter/RegisterFile.cpp \ ++ jit/ExecutableAllocatorFixedVMPool.cpp \ + jit/ExecutableAllocatorPosix.cpp \ + jit/ExecutableAllocatorSymbian.cpp \ + jit/ExecutableAllocatorWin.cpp \ +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp +index f6b27ec..f0ebbab 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp +@@ -33,6 +33,27 @@ namespace JSC { + + size_t ExecutableAllocator::pageSize = 0; + ++#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) ++void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting) ++{ ++ if (!pageSize) ++ intializePageSize(); ++ ++ // Calculate the start of the page containing this region, ++ // and account for this extra memory within size. ++ intptr_t startPtr = reinterpret_cast<intptr_t>(start); ++ intptr_t pageStartPtr = startPtr & ~(pageSize - 1); ++ void* pageStart = reinterpret_cast<void*>(pageStartPtr); ++ size += (startPtr - pageStartPtr); ++ ++ // Round size up ++ size += (pageSize - 1); ++ size &= ~(pageSize - 1); ++ ++ mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX); ++} ++#endif ++ + } + + #endif // HAVE(ASSEMBLER) +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp +index dd1db4e..16d0fb1 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp +@@ -27,25 +27,33 @@ + + #include "ExecutableAllocator.h" + +-#include <errno.h> ++#if ENABLE(EXECUTABLE_ALLOCATOR_FIXED) + +-#if ENABLE(ASSEMBLER) && OS(DARWIN) && CPU(X86_64) ++#include <errno.h> + + #include "TCSpinLock.h" +-#include <mach/mach_init.h> +-#include <mach/vm_map.h> + #include <sys/mman.h> + #include <unistd.h> + #include <wtf/AVLTree.h> + #include <wtf/VMTags.h> + ++#if CPU(X86_64) ++ // These limits suitable on 64-bit platforms (particularly x86-64, where we require all jumps to have a 2Gb max range). ++ #define VM_POOL_SIZE (2u * 1024u * 1024u * 1024u) // 2Gb ++ #define COALESCE_LIMIT (16u * 1024u * 1024u) // 16Mb ++#else ++ // These limits are hopefully sensible on embedded platforms. ++ #define VM_POOL_SIZE (32u * 1024u * 1024u) // 32Mb ++ #define COALESCE_LIMIT (4u * 1024u * 1024u) // 4Mb ++#endif ++ ++// ASLR currently only works on darwin (due to arc4random) & 64-bit (due to address space size). ++#define VM_POOL_ASLR (OS(DARWIN) && CPU(X86_64)) ++ + using namespace WTF; + + namespace JSC { + +-#define TWO_GB (2u * 1024u * 1024u * 1024u) +-#define SIXTEEN_MB (16u * 1024u * 1024u) +- + // FreeListEntry describes a free chunk of memory, stored in the freeList. + struct FreeListEntry { + FreeListEntry(void* pointer, size_t size) +@@ -291,9 +299,12 @@ public: + // for now instead of 2^26 bits of ASLR lets stick with 25 bits of randomization plus + // 2^24, which should put up somewhere in the middle of usespace (in the address range + // 0x200000000000 .. 0x5fffffffffff). +- intptr_t randomLocation = arc4random() & ((1 << 25) - 1); ++ intptr_t randomLocation = 0; ++#if VM_POOL_ASLR ++ randomLocation = arc4random() & ((1 << 25) - 1); + randomLocation += (1 << 24); + randomLocation <<= 21; ++#endif + m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0); + if (!m_base) + CRASH(); +@@ -387,7 +398,7 @@ public: + // 16MB of allocations have been freed, sweep m_freeList + // coalescing any neighboring fragments. + m_countFreedSinceLastCoalesce += size; +- if (m_countFreedSinceLastCoalesce >= SIXTEEN_MB) { ++ if (m_countFreedSinceLastCoalesce >= COALESCE_LIMIT) { + m_countFreedSinceLastCoalesce = 0; + coalesceFreeSpace(); + } +@@ -429,7 +440,7 @@ ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t size) + SpinLockHolder lock_holder(&spinlock); + + if (!allocator) +- allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, TWO_GB); ++ allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, VM_POOL_SIZE); + ExecutablePool::Allocation alloc = {reinterpret_cast<char*>(allocator->alloc(size)), size}; + return alloc; + } +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp +index 2eb0c87..b04049c 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp +@@ -27,7 +27,7 @@ + + #include "ExecutableAllocator.h" + +-#if ENABLE(ASSEMBLER) && OS(UNIX) && !OS(SYMBIAN) ++#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && !OS(WINDOWS) && !OS(SYMBIAN) + + #include <sys/mman.h> + #include <unistd.h> +@@ -35,8 +35,6 @@ + + namespace JSC { + +-#if !(OS(DARWIN) && !PLATFORM(QT) && CPU(X86_64)) +- + void ExecutableAllocator::intializePageSize() + { + ExecutableAllocator::pageSize = getpagesize(); +@@ -57,29 +55,6 @@ void ExecutablePool::systemRelease(const ExecutablePool::Allocation& alloc) + ASSERT_UNUSED(result, !result); + } + +-#endif // !(OS(DARWIN) && !PLATFORM(QT) && CPU(X86_64)) +- +-#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) +-void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting) +-{ +- if (!pageSize) +- intializePageSize(); +- +- // Calculate the start of the page containing this region, +- // and account for this extra memory within size. +- intptr_t startPtr = reinterpret_cast<intptr_t>(start); +- intptr_t pageStartPtr = startPtr & ~(pageSize - 1); +- void* pageStart = reinterpret_cast<void*>(pageStartPtr); +- size += (startPtr - pageStartPtr); +- +- // Round size up +- size += (pageSize - 1); +- size &= ~(pageSize - 1); +- +- mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX); +-} +-#endif +- + } + +-#endif // HAVE(ASSEMBLER) ++#endif +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp +index e82975c..9028f50 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp +@@ -22,7 +22,7 @@ + + #include "ExecutableAllocator.h" + +-#if ENABLE(ASSEMBLER) && OS(SYMBIAN) ++#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(SYMBIAN) + + #include <e32hal.h> + #include <e32std.h> +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp +index e38323c..72a1d5f 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp +@@ -27,7 +27,7 @@ + + #include "ExecutableAllocator.h" + +-#if ENABLE(ASSEMBLER) && OS(WINDOWS) ++#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(WINDOWS) + + #include "windows.h" + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +index 700977e..d930ed7 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +@@ -1016,6 +1016,16 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ + #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0 + #endif + ++/* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in. ++ On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */ ++#if ENABLE(ASSEMBLER) ++#if CPU(X86_64) ++#define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1 ++#else ++#define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1 ++#endif ++#endif ++ + #if !defined(ENABLE_PAN_SCROLLING) && OS(WINDOWS) + #define ENABLE_PAN_SCROLLING 1 + #endif +-- +1.7.10.4 + diff --git a/extra/scim-uim/PKGBUILD b/extra/scim-uim/PKGBUILD index 297d43ef5..0a5f38545 100644 --- a/extra/scim-uim/PKGBUILD +++ b/extra/scim-uim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149050 2012-02-05 15:34:14Z bisson $ +# $Id: PKGBUILD 166977 2012-09-24 04:57:10Z bisson $ # Contributor: damir <damir@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org pkgname=scim-uim pkgver=0.2.0 -pkgrel=5 +pkgrel=6 pkgdesc='UIM bridging input engine for SCIM' url='http://www.scim-im.org/' license=('GPL') @@ -12,7 +12,7 @@ options=('!libtool') depends=('scim' 'uim') arch=('i686' 'x86_64' 'mips64el') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz" - 'scim-uim-0.2.0-fix-gcc43-build.patch' + 'fix-gcc43-build.patch' 'uim-1.5.5-header.patch') sha1sums=('456621d5969b6552c3c33c83cf295aa4134fff0a' 'a9d67946f956d0572c73065e2b4b268bfdf149e3' @@ -20,7 +20,7 @@ sha1sums=('456621d5969b6552c3c33c83cf295aa4134fff0a' build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../scim-uim-0.2.0-fix-gcc43-build.patch + patch -p1 -i ../fix-gcc43-build.patch patch -p1 -i ../uim-1.5.5-header.patch ./configure --prefix=/usr --sysconfdir=/etc --disable-static make diff --git a/extra/scim-uim/fix-gcc43-build.patch b/extra/scim-uim/fix-gcc43-build.patch new file mode 100644 index 000000000..d142fd7b7 --- /dev/null +++ b/extra/scim-uim/fix-gcc43-build.patch @@ -0,0 +1,10 @@ +--- scim-uim-0.2.0/src/scim_uim_imengine.cpp 2007-04-10 07:43:59.000000000 +0200 ++++ scim-uim-0.2.0/src/scim_uim_imengine.cpp.gcc43buildfixed 2008-03-23 10:53:23.000000000 +0100 +@@ -32,6 +32,7 @@ + #include <config.h> + #endif + ++#include <string.h> + #include <scim.h> + #include "scim_uim_imengine.h" + #include <uim/uim-compat-scm.h> diff --git a/extra/snappy/PKGBUILD b/extra/snappy/PKGBUILD new file mode 100644 index 000000000..fbd7a1ac5 --- /dev/null +++ b/extra/snappy/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 166939 2012-09-22 20:17:43Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Antony Male <antony dot male at geemail dot com>> + +pkgname=snappy +pkgver=1.0.5 +pkgrel=2 +pkgdesc='A fast compressor/decompressor library' +arch=('i686' 'x86_64') +url="http://code.google.com/p/snappy/" +license=('BSD') +depends=('glibc' 'gcc-libs') +checkdepends=('zlib') +options=('!libtool') +source=("http://snappy.googlecode.com/files/$pkgname-$pkgver.tar.gz") +md5sums=('4c0af044e654f5983f4acbf00d1ac236') + +build() { + cd "$pkgname-$pkgver" + + # compile without assertions + CXXFLAGS+=\ -DNDEBUG + + ./configure --prefix=/usr + make +} + +check() { + # compile without assertions + CXXFLAGS+=\ -DNDEBUG + + make -C "$pkgname-$pkgver" check +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -m644 -D COPYING "$pkgdir/usr/share/licenses/snappy/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/taglib/PKGBUILD b/extra/taglib/PKGBUILD index aed74cccf..f5a71aae8 100644 --- a/extra/taglib/PKGBUILD +++ b/extra/taglib/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 163967 2012-07-23 03:03:00Z allan $ +# $Id: PKGBUILD 166944 2012-09-22 20:46:26Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Ike Devolder <ike.devolder@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=taglib -pkgver=1.7.2 -pkgrel=2 +pkgver=1.8 +pkgrel=1 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats" arch=('i686' 'x86_64' 'mips64el') url="http://developer.kde.org/~wheeler/taglib.html" @@ -13,12 +14,11 @@ license=('LGPL' 'MPL') depends=('sh' 'zlib' 'gcc-libs') makedepends=('cmake' 'pkg-config') options=('!libtool') -source=("http://developer.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz" - 'ape-idev2.patch') +source=("https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('dcb8bd1b756f2843e18b1fdf3aaeee15') build() { cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/ape-idev2.patch cd "${srcdir}" mkdir build @@ -35,5 +35,3 @@ package() { cd "${srcdir}"/build make DESTDIR="${pkgdir}" install } -md5sums=('b0a9e797d3833fb933c7c3176de3d720' - 'c7c165d99acf01456351ba39ff7056cb') diff --git a/extra/tftp-hpa/PKGBUILD b/extra/tftp-hpa/PKGBUILD index 64bba79c6..439ac4a14 100644 --- a/extra/tftp-hpa/PKGBUILD +++ b/extra/tftp-hpa/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 151760 2012-03-02 09:20:56Z tpowa $ +# $Id: PKGBUILD 166932 2012-09-22 13:11:31Z thomas $ # Maintainer: dorphell <dorphell@archlinux.org> # Contributor: Jose Javier <jojapa@terra.es> pkgname=tftp-hpa pkgver=5.2 -pkgrel=2 +pkgrel=3 pkgdesc="Official tftp server" arch=('i686' 'x86_64' 'mips64el') -url="http://www.kernel.org/pub/software/network/tftp/" +url="http://www.kernel.org/pub/software/network/tftp/tftp-hpa/" license=('BSD') depends=('readline>=6.0.00') conflicts=('netkit-tftp') @@ -15,7 +15,16 @@ source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgve tftpd.rc tftpd.conf LICENSE + tftpd.service + tftpd.socket tftp-hpa-0.49-fortify-strcpy-crash.patch) +md5sums=('3de3038e7c2bf6fc5d496825893ac8e7' + '83fbb6f52205d95951a3c059e5351ca2' + 'f41f484f94e91175e9183e872a2bff3b' + '6ce21e27b6fdc1a1adf85c81e42aeecf' + '165b98f814f74568635a720e674d7f18' + 'a23369ea33be8b4a5427ec2cfc5373dd' + '22e8629ef19bc276a102c5d4d284c1bd') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -29,14 +38,12 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make INSTALLROOT="${pkgdir}" install install -d "${pkgdir}/etc/rc.d" - install -d "${pkgdir}/var/tftpboot" + install -d "${pkgdir}/srv/tftp" install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd" install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd" - rm "${pkgdir}/usr/share/man/man8/tftpd.8" + install -D -m655 "${srcdir}/tftpd.service" "${pkgdir}/usr/lib/systemd/system/tftpd.service" + install -D -m655 "${srcdir}/tftpd.socket" "${pkgdir}/usr/lib/systemd/system/tftpd.socket" install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + # Remove conflict with iputils + rm "${pkgdir}/usr/share/man/man8/tftpd.8" } -md5sums=('3de3038e7c2bf6fc5d496825893ac8e7' - '83fbb6f52205d95951a3c059e5351ca2' - '414a79dc891bced056d99a9bb790fc9e' - '6ce21e27b6fdc1a1adf85c81e42aeecf' - '22e8629ef19bc276a102c5d4d284c1bd') diff --git a/extra/tftp-hpa/tftpd.conf b/extra/tftp-hpa/tftpd.conf index 4705cc3a9..a4329f608 100644 --- a/extra/tftp-hpa/tftpd.conf +++ b/extra/tftp-hpa/tftpd.conf @@ -1,4 +1,4 @@ # # Parameters to be passed to TFTPD # -TFTPD_ARGS="-l -s /var/tftpboot" +TFTPD_ARGS="-l -s /srv/tftp/" diff --git a/extra/tftp-hpa/tftpd.service b/extra/tftp-hpa/tftpd.service new file mode 100644 index 000000000..62562343d --- /dev/null +++ b/extra/tftp-hpa/tftpd.service @@ -0,0 +1,8 @@ +[Unit] +Description=hpa's original TFTP daemon + +[Service] +ExecStart=/usr/sbin/in.tftpd -s /srv/tftp/ +StandardInput=socket +StandardOutput=inherit +StandardError=journal diff --git a/extra/tftp-hpa/tftpd.socket b/extra/tftp-hpa/tftpd.socket new file mode 100644 index 000000000..0315ed608 --- /dev/null +++ b/extra/tftp-hpa/tftpd.socket @@ -0,0 +1,5 @@ +[Socket] +ListenDatagram=69 + +[Install] +WantedBy=sockets.target diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 2cfd6a06b..a4ad2997d 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165472 2012-08-20 13:29:51Z tomegun $ +# $Id: PKGBUILD 166956 2012-09-23 09:55:03Z tomegun $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') pkgver=2.61 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') diff --git a/extra/transmission/transmission-cli.install b/extra/transmission/transmission-cli.install index 68df89498..8ab275e61 100644 --- a/extra/transmission/transmission-cli.install +++ b/extra/transmission/transmission-cli.install @@ -3,14 +3,15 @@ post_install() { If you want to run the Transmission daemon at boot, add transmissiond to the DAEMONS array in /etc/rc.conf. - _EOF + +post_upgrade +passwd -l transmission &>/dev/null } post_upgrade() { # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files getent group transmission >/dev/null || groupadd -g 169 transmission getent passwd transmission >/dev/null || useradd -c 'Transmission BitTorrent Client' -u 169 -g transmission -b '/var/lib' -m -s /bin/false transmission - passwd -l transmission &>/dev/null systemd-tmpfiles --create transmission.conf } diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index fa4d21b40..66a42fcf6 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164051 2012-07-25 06:08:06Z giovanni $ +# $Id: PKGBUILD 166946 2012-09-23 04:27:14Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=whois -pkgver=5.0.18 +pkgver=5.0.19 pkgrel=1 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('libidn') makedepends=('perl') source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz") -md5sums=('15d777273d44a5b9a0814c1ea0d22b1a') +md5sums=('16b0a0e5e3757287462bbeb01b66b191') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xdelta3/PKGBUILD b/extra/xdelta3/PKGBUILD index 65dbad1d2..658251df1 100644 --- a/extra/xdelta3/PKGBUILD +++ b/extra/xdelta3/PKGBUILD @@ -1,46 +1,31 @@ -# $Id: PKGBUILD 145279 2011-12-21 02:07:07Z allan $ +# $Id: PKGBUILD 167057 2012-09-25 00:09:23Z eric $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com> # Contributor: Henning Garus <henning.garus@gmail.com> pkgname=xdelta3 -pkgver=3.0.0 -pkgrel=2 +pkgver=3.0.4 +pkgrel=1 pkgdesc="A diff utility which works with binary files" arch=('i686' 'x86_64' 'mips64el') url="http://xdelta.org/" license=('GPL') -makedepends=('python2') -optdepends=('python2: for python modules') -source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz - xdelta3-makefile.patch) -md5sums=('5fe038be3a266d2a7913e10d1cec6d88' - 'fa5973870faf7523043c4858ab7c3bdb') +depends=('xz') +source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz) +md5sums=('c04f7fd9da45741a0095438cfe527b89') build() { - cd $srcdir/xdelta$pkgver - - patch -Np1 -i $srcdir/xdelta3-makefile.patch - sed -i "/PYVER = /s/2.6/2.7/" Makefile - - make xdelta3 - make xdelta3module.so - - # for testsuite - make xdelta3-debug + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make } check() { - cd $srcdir/xdelta$pkgver - - make test + cd "$srcdir/$pkgname-$pkgver" + ./xdelta3 test } package() { - cd $srcdir/xdelta$pkgver - - install -D xdelta3 $pkgdir/usr/bin/xdelta3 - python2 ./setup.py install --root ${pkgdir} - install -m644 {xdelta3.py,xdelta3module.so} ${pkgdir}/usr/lib/python2.7/site-packages + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install } - |