From 2f683af35de4700b21e19b28aebfa229da60e090 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 11 Feb 2013 00:05:44 -0800 Subject: Mon Feb 11 00:05:43 PST 2013 --- community/aiccu/01-no-init-script.patch | 17 ++++++++ community/aiccu/02-allow-tunnels.patch | 61 +++++++++++++++++++++++++++ community/aiccu/03-no-quiet-gcc.patch | 16 +++++++ community/aiccu/04-skip-strip.patch | 16 +++++++ community/aiccu/05-spelling-error.patch | 46 ++++++++++++++++++++ community/aiccu/06-setup-script.patch | 40 ++++++++++++++++++ community/aiccu/PKGBUILD | 24 ++++++++--- community/cgminer/PKGBUILD | 6 +-- core/btrfs-progs/PKGBUILD | 28 ++++++------- core/libevent/PKGBUILD | 8 ++-- extra/audiofile/PKGBUILD | 6 +-- extra/dcraw/PKGBUILD | 58 ++++++++++++------------- extra/gamin/18_gam_server_deadlocks.patch | 70 +++++++++++++++++++++++++++++++ extra/gamin/PKGBUILD | 11 +++-- extra/gnutls/PKGBUILD | 8 ++-- extra/gtk2/PKGBUILD | 6 +-- extra/lablgtk/PKGBUILD | 14 ++++--- extra/mysql-python/PKGBUILD | 12 +++--- extra/poppler/PKGBUILD | 7 ++-- extra/snd/PKGBUILD | 9 ++-- 20 files changed, 373 insertions(+), 90 deletions(-) create mode 100644 community/aiccu/01-no-init-script.patch create mode 100644 community/aiccu/02-allow-tunnels.patch create mode 100644 community/aiccu/03-no-quiet-gcc.patch create mode 100644 community/aiccu/04-skip-strip.patch create mode 100644 community/aiccu/05-spelling-error.patch create mode 100644 community/aiccu/06-setup-script.patch create mode 100644 extra/gamin/18_gam_server_deadlocks.patch diff --git a/community/aiccu/01-no-init-script.patch b/community/aiccu/01-no-init-script.patch new file mode 100644 index 000000000..930d5d21a --- /dev/null +++ b/community/aiccu/01-no-init-script.patch @@ -0,0 +1,17 @@ +Index: aiccu-20070115/Makefile +=================================================================== +--- aiccu-20070115.orig/Makefile 2009-10-25 22:25:45.000000000 +0100 ++++ aiccu-20070115/Makefile 2009-10-25 22:25:58.000000000 +0100 +@@ -84,9 +84,9 @@ + @cp doc/README ${DESTDIR}${dirdoc} + @cp doc/LICENSE ${DESTDIR}${dirdoc} + @cp doc/HOWTO ${DESTDIR}${dirdoc} +- @echo "Installing Debian-style init.d" +- @mkdir -p ${DESTDIR}${diretc}init.d +- @cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT} ++# @echo "Installing Debian-style init.d" ++# @mkdir -p ${DESTDIR}${diretc}init.d ++# @cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT} + else + @echo "Installing Redhat-style init.d" + @mkdir -p ${DESTDIR}${diretc}init.d diff --git a/community/aiccu/02-allow-tunnels.patch b/community/aiccu/02-allow-tunnels.patch new file mode 100644 index 000000000..ec1c1dade --- /dev/null +++ b/community/aiccu/02-allow-tunnels.patch @@ -0,0 +1,61 @@ +commit d7c4f7c0d34b80c188fa45228ca282fd8771a41d +Author: Norman Rasmussen +Date: Sun Jan 10 21:45:55 2010 +0000 + + Allow 'tunnels' mode when there's an already running instance. + +diff --git a/unix-console/main.c b/unix-console/main.c +index 8a4d9a9..388d988 100755 +--- a/unix-console/main.c ++++ b/unix-console/main.c +@@ -50,7 +50,7 @@ int sigrunning(int sig) + /* Close the file again */ + fclose(f); + +- /* If we can HUP it, it still runs */ ++ /* If we can signal it, it still runs */ + return (pid > 0 && kill(pid, sig) == 0 ? 1 : 0); + } + +@@ -302,20 +302,6 @@ int main(int argc, char *argv[]) + return -1; + } + +-#ifndef _WIN32 +- /* start or stop? */ +- if ( mode != A_TEST && +- mode != A_AUTOTEST) +- { +- /* Already running? */ +- if (sigrunning(mode == A_STOP ? SIGTERM : 0) == 1) +- { +- dolog(LOG_ERR, "Already running instance HUP'ed, exiting\n"); +- return 0; +- } +- } +-#endif +- + /* Verify required parameters */ + if (!g_aiccu->username || !g_aiccu->password) + { +@@ -331,6 +317,20 @@ int main(int argc, char *argv[]) + return ret == 0 ? -1 : 0; + } + ++#ifndef _WIN32 ++ /* start or stop? */ ++ if ( mode != A_TEST && ++ mode != A_AUTOTEST) ++ { ++ /* Already running? */ ++ if (sigrunning(mode == A_STOP ? SIGTERM : 0) == 1) ++ { ++ dolog(LOG_ERR, "Already running instance signaled, exiting\n"); ++ return 0; ++ } ++ } ++#endif ++ + /* Get our tunnel */ + hTunnel = get_tunnel(); + diff --git a/community/aiccu/03-no-quiet-gcc.patch b/community/aiccu/03-no-quiet-gcc.patch new file mode 100644 index 000000000..27d14addf --- /dev/null +++ b/community/aiccu/03-no-quiet-gcc.patch @@ -0,0 +1,16 @@ +It's better for us to see gcc output in the build log to ease debugging. +Quiet builds make that much harder. + +Index: aiccu-20070115/unix-console/Makefile +=================================================================== +--- aiccu-20070115.orig/unix-console/Makefile 2009-10-25 22:33:06.000000000 +0100 ++++ aiccu-20070115/unix-console/Makefile 2009-10-25 22:33:12.000000000 +0100 +@@ -26,7 +26,7 @@ + + #CFLAGS += $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0 + CFLAGS += $(CWARNS) -D_GNU_SOURCE +-CC = @gcc ++CC = gcc + RM = rm + + # Add -O3 when nothing is specified yet diff --git a/community/aiccu/04-skip-strip.patch b/community/aiccu/04-skip-strip.patch new file mode 100644 index 000000000..6249a0fe5 --- /dev/null +++ b/community/aiccu/04-skip-strip.patch @@ -0,0 +1,16 @@ +Index: aiccu-20070115/unix-console/Makefile +=================================================================== +--- aiccu-20070115.orig/unix-console/Makefile 2009-10-25 22:31:57.000000000 +0100 ++++ aiccu-20070115/unix-console/Makefile 2009-10-25 22:32:04.000000000 +0100 +@@ -145,11 +145,6 @@ + + aiccu: $(OBJS) ${SRCS} ${INCS} + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) +-ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0) +-ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1) +- strip $@ +-endif +-endif + + clean: + $(RM) -f $(OBJS) aiccu diff --git a/community/aiccu/05-spelling-error.patch b/community/aiccu/05-spelling-error.patch new file mode 100644 index 000000000..832dbf9ce --- /dev/null +++ b/community/aiccu/05-spelling-error.patch @@ -0,0 +1,46 @@ +Fix some spelling errors to satisfy lintian + +--- aiccu.orig/common/aiccu_test.c ++++ aiccu/common/aiccu_test.c +@@ -133,7 +133,7 @@ + printf("### This confirms the reachability of the other side of the tunnel\n"); + printf("### If it doesn't reply then check your interface and routing tables\n"); + printf("### Don't forget to check your firewall of course\n"); +- printf("### If the previous test was succesful then this could be both\n"); ++ printf("### If the previous test was successful then this could be both\n"); + printf("### a firewalling and a routing/interface problem\n"); + printf("\n"); + system_arg(PING6, PINGCOUNT, hTunnel->sIPv6_POP); +--- aiccu.orig/common/common.c ++++ aiccu/common/common.c +@@ -484,7 +484,7 @@ + return false; + } + +- dolog(LOG_DEBUG, "TLS Handshake completed succesfully\n"); ++ dolog(LOG_DEBUG, "TLS Handshake completed successfully\n"); + + sock->tls_active = true; + return true; +--- aiccu.orig/common/tic.c ++++ aiccu/common/tic.c +@@ -517,8 +517,8 @@ + struct in6_addr ipv6_ll, ipv6_local; + char ll[100]; + +- /* Log that the fetch was succesful */ +- dolog(LOG_INFO, "Succesfully retrieved tunnel information for %s\n", sId); ++ /* Log that the fetch was successful */ ++ dolog(LOG_INFO, "Successfully retrieved tunnel information for %s\n", sId); + + /* + * Some TUN/TAP devices don't have any +@@ -652,7 +652,7 @@ + /* All went okay? */ + if (buf[0] == '2' && buf[1] == '0' && buf[2] == '2') + { +- dolog(LOG_INFO, "Succesfully retrieved POP information for %s\n", sId); ++ dolog(LOG_INFO, "Successfully retrieved POP information for %s\n", sId); + return pop; + } + diff --git a/community/aiccu/06-setup-script.patch b/community/aiccu/06-setup-script.patch new file mode 100644 index 000000000..26010f809 --- /dev/null +++ b/community/aiccu/06-setup-script.patch @@ -0,0 +1,40 @@ +Author: Norman Rasmussen + + Make setupscript work and add teardownscript setting. + +--- aiccu.orig/common/aiccu.c ++++ aiccu/common/aiccu.c +@@ -212,9 +212,6 @@ + fprintf(f, "# Try to automatically login and setup the tunnel?\n"); + fprintf(f, "automatic %s\n", g_aiccu->automatic ? "true" : "false"); + fprintf(f, "\n"); +- fprintf(f, "# Script to run after setting up the interfaces (default: none)\n"); +- fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : ""); +- fprintf(f, "\n"); + fprintf(f, "# TLS Required?\n"); + fprintf(f, "requiretls %s\n", g_aiccu->requiretls ? "true" : "false"); + fprintf(f, "\n"); +@@ -231,6 +228,9 @@ + fprintf(f, "# PID File\n"); + fprintf(f, "pidfile %s\n", g_aiccu->pidfile); + fprintf(f, "\n"); ++ fprintf(f, "# Script to run after setting up the interfaces (default: none)\n"); ++ fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : ""); ++ fprintf(f, "\n"); + fprintf(f, "# Make heartbeats (default true)\n"); + fprintf(f, "# In general you don't want to turn this off\n"); + fprintf(f, "# Of course only applies to AYIYA and heartbeat tunnels not to static ones\n"); +--- aiccu.orig/unix-console/main.c ++++ aiccu/unix-console/main.c +@@ -471,6 +471,11 @@ + */ + if (aiccu_setup(hTunnel, true)) + { ++ if (g_aiccu->setupscript) ++ { ++ aiccu_exec("%s", g_aiccu->setupscript); ++ } ++ + /* We need to stay running when doing Heartbeat or AYIYA */ + if ( strcasecmp(hTunnel->sType, "6in4-heartbeat") == 0 || + strcasecmp(hTunnel->sType, "ayiya") == 0) diff --git a/community/aiccu/PKGBUILD b/community/aiccu/PKGBUILD index 062922dda..118210c38 100644 --- a/community/aiccu/PKGBUILD +++ b/community/aiccu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84051 2013-02-09 13:54:03Z seblu $ +# $Id: PKGBUILD 84114 2013-02-10 18:32:51Z seblu $ # Maintainer: Sébastien Luttringer pkgname=aiccu pkgver=20070115 -pkgrel=1 +pkgrel=2 pkgdesc='SixXS Automatic IPv6 Connectivity Client Utility' arch=('i686' 'x86_64') url='http://www.sixxs.net/tools/aiccu/' @@ -11,12 +11,27 @@ license=('custom') depends=('gnutls' 'iproute2') backup=('etc/aiccu.conf') source=("http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz" - 'aiccu.service') + 'aiccu.service' + '01-no-init-script.patch' + '02-allow-tunnels.patch' + '03-no-quiet-gcc.patch' + '04-skip-strip.patch' + '05-spelling-error.patch' + '06-setup-script.patch') md5sums=('c9bcc83644ed788e22a7c3f3d4021350' - 'e038c9d7882e6e603d87962bac7a0f2a') + 'e038c9d7882e6e603d87962bac7a0f2a' + '6de05338752bfb01772dee37b1dc0454' + 'b9b2c0e7186f3f96366caaa39252dccc' + 'b38db1d95760cd9687330b7db5f4ea1d' + '6dfa2df27bb4859c7511bfea91337925' + '21a37c376ebfcf787c0e7ee8552053ac' + '98e73756609f4e09c45c4e5139fd5aed') build() { cd $pkgname + for _p in "$srcdir"/*.patch; do + patch -p1 -i "$_p" + done [[ $LDFLAGS ]] && LDFLAGS="$LDFLAGS,--no-as-needed" make } @@ -34,7 +49,6 @@ package() { install -Dm644 doc/$pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1" # systemd install -Dm644 "$srcdir/aiccu.service" "$pkgdir/usr/lib/systemd/system/aiccu.service" - rm -r "$pkgdir/etc/init.d" } # vim:set ts=2 sw=2 et: diff --git a/community/cgminer/PKGBUILD b/community/cgminer/PKGBUILD index 76d7915bd..53b234b6a 100644 --- a/community/cgminer/PKGBUILD +++ b/community/cgminer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83058 2013-01-27 09:29:50Z andrea $ +# $Id: PKGBUILD 84079 2013-02-10 07:52:11Z fyan $ # Maintainer: Felix Yan # Contributor: monson # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: David Manouchehri pkgname=cgminer -pkgver=2.10.4 +pkgver=2.10.5 _build= pkgrel=1 pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer." @@ -51,7 +51,7 @@ package() { install -Dm644 $pkgname.conf "$pkgdir"/etc/$pkgname.conf } -md5sums=('f165e9060796d07b031aacc9468536f4' +md5sums=('80b00c77a3c38bcb457a47989dfa153c' 'fe4a243fabe24608f5c05e40f0f118f6' 'ee39698273671fee0e98d4af16014c36' 'bd76fc92fedce18c59ccea2aa79cc664') diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD index 190146fb5..6cef400a0 100644 --- a/core/btrfs-progs/PKGBUILD +++ b/core/btrfs-progs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172000 2012-11-26 02:40:48Z dreisner $ +# $Id: PKGBUILD 177869 2013-02-10 13:06:27Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Tobias Powalowski pkgname=btrfs-progs -pkgver=0.19.20121005 -pkgrel=4 +pkgver=0.20rc1.1 +pkgrel=1 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64) depends=('glibc' 'e2fsprogs') @@ -13,31 +13,31 @@ replaces=('btrfs-progs-unstable') conflicts=('btrfs-progs-unstable') provides=('btrfs-progs-unstable') license=('GPL2') -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-0.20-rc1.1.tar.xz initcpio-install-btrfs initcpio-hook-btrfs) install=btrfs-progs.install -md5sums=('7fb014324954ee073b039dc0066de960' - '7241ba3a4286d08da0d50b7176941112' - 'b09688a915a0ec8f40e2f5aacbabc9ad') build() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-0.20-rc1.1 make CFLAGS="$CFLAGS" - # install mkinitcpio hooks - install -Dm644 "$srcdir/initcpio-install-btrfs" \ - "$pkgdir/usr/lib/initcpio/install/btrfs" - install -Dm644 "$srcdir/initcpio-hook-btrfs" \ - "$pkgdir/usr/lib/initcpio/hooks/btrfs" } package() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-0.20-rc1.1 make prefix=$pkgdir/usr install # fix manpage mkdir -p $pkgdir/usr/share/ mv $pkgdir/usr/man $pkgdir/usr/share/man mkdir -p ${pkgdir}/sbin ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs + # install mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-btrfs" \ + "$pkgdir/usr/lib/initcpio/install/btrfs" + install -Dm644 "$srcdir/initcpio-hook-btrfs" \ + "$pkgdir/usr/lib/initcpio/hooks/btrfs" } +md5sums=('4046bebaae014db1fd50cec2da0e94c0' + '7241ba3a4286d08da0d50b7176941112' + 'b09688a915a0ec8f40e2f5aacbabc9ad') diff --git a/core/libevent/PKGBUILD b/core/libevent/PKGBUILD index 4c5214d07..47b5d516c 100644 --- a/core/libevent/PKGBUILD +++ b/core/libevent/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172139 2012-11-30 00:38:49Z tomegun $ +# $Id: PKGBUILD 177868 2013-02-10 13:06:19Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Judd pkgname=libevent pkgver=2.0.21 -pkgrel=1 +pkgrel=2 pkgdesc="An event notification library" arch=('i686' 'x86_64') url="http://www.monkey.org/~provos/libevent/" @@ -16,19 +16,19 @@ source=(https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-$pkgver-st build() { cd "${srcdir}/${pkgname}-${pkgver}-stable" - sed -i 's#python#python2#' event_rpcgen.py ./configure --prefix=/usr --sysconfdir=/etc make } check() { cd "${srcdir}/${pkgname}-${pkgver}-stable" - make check || true # this never worked, should be taken upstream + make check } package() { cd "${srcdir}/${pkgname}-${pkgver}-stable" make DESTDIR="${pkgdir}" install + install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/libevent/LICENSE } md5sums=('b2405cc9ebf264aa47ff615d9de527a2' '31ffa4efc611c452697bd120a3bf8f9e') diff --git a/extra/audiofile/PKGBUILD b/extra/audiofile/PKGBUILD index 2c92888db..f11fd95ec 100644 --- a/extra/audiofile/PKGBUILD +++ b/extra/audiofile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158087 2012-05-02 16:52:54Z schiv $ +# $Id: PKGBUILD 177900 2013-02-10 16:20:23Z schiv $ # Maintainer: Ray Rashif # Contributor: dorphell pkgname=audiofile -pkgver=0.3.4 +pkgver=0.3.5 pkgrel=1 pkgdesc="Silicon Graphics Audio File Library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('LGPL') depends=('gcc-libs' 'alsa-lib') options=('!libtool') source=("http://audiofile.68k.org/$pkgname-$pkgver.tar.gz") -md5sums=('2ed06d64ee552a2ce490f54351b86ccd') +md5sums=('795d7f5b323876c14c43d2b650b16abd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD index 1a28c41ce..b420cb566 100644 --- a/extra/dcraw/PKGBUILD +++ b/extra/dcraw/PKGBUILD @@ -1,47 +1,41 @@ -# $Id: PKGBUILD 167554 2012-10-02 18:35:41Z eric $ +# $Id: PKGBUILD 177853 2013-02-10 10:42:13Z bisson $ # Maintainer: tobias # Contributor: Tobias Kieslich pkgname=dcraw -pkgver=9.16 +pkgver=9.17 pkgrel=1 -pkgdesc="A command line based converter for digicams raw output" +pkgdesc='Decodes any raw image from any digital camera' +url='http://www.cybercom.net/~dcoffin/dcraw/' arch=('i686' 'x86_64') -url="http://www.cybercom.net/~dcoffin/dcraw/" license=('custom') depends=('lcms' 'jasper') -source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz) -sha1sums=('fb73ca3ccd703bd522a759e0366814f0a3411902') +source=("http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz") +sha1sums=('11a0b20b8f46950dd94e6c1ada313807049a6b27') build() { - cd "${srcdir}/${pkgname}" - gcc ${CFLAGS} -O3 -o dcraw dcraw.c \ - -Wall -Wno-unused-result -Wno-array-bounds \ - -lm -ljasper -ljpeg -llcms -DLOCALEDIR=\"/usr/share/locale/\" + cd "${srcdir}/${pkgname}" + gcc ${CFLAGS} ${LDFLAGS} \ + -o dcraw dcraw.c \ + -lm -ljasper -ljpeg -llcms \ + -DLOCALEDIR=\"/usr/share/locale/\" } package() { - cd "${srcdir}/${pkgname}" - install -Dm755 dcraw "${pkgdir}"/usr/bin/dcraw - install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1 - - for langchar in \ - fr.latin1 it.latin1 de.latin1 pt.latin1 es.latin1 nl.latin1 sv.latin1 \ - ca.latin1 da.latin1 cs.latin2 hu.latin2 pl.latin2 eo.latin3 ru.koi8-r \ - zh_TW.big5 zh_CN.gb2312 - do - lang=$(echo $langchar | cut -d. -f1) - char=$(echo $langchar | cut -d. -f2-) - if [ -f dcraw_${lang}.1 ]; then - mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang/man1 - iconv -f utf-8 -t $char dcraw_$lang.1 > "${pkgdir}"/usr/share/man/$lang/man1/dcraw.1 - mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1 - cp dcraw_$lang.1 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1/dcraw.1 - fi - mkdir -p -m 755 "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES - msgfmt -o "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES/dcraw.mo dcraw_$lang.po - done + cd "${srcdir}/${pkgname}" - install -d "${pkgdir}"/usr/share/licenses/${pkgname} - head -25 dcraw.c > "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt + install -Dm755 dcraw "${pkgdir}"/usr/bin/dcraw + install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1 + + for i in dcraw_*.1; do j=${i#dcraw_}; k=${j%.1} + install -Dm644 $i "${pkgdir}"/usr/share/man/$k/man1/dcraw.1 + done + + for i in dcraw_*.po; do j=${i#dcraw_}; k=${j%.po} + install -d "${pkgdir}"/usr/share/locale/$k/LC_MESSAGES + msgfmt -o "${pkgdir}"/usr/share/locale/$k/LC_MESSAGES/dcraw.mo $i + done + + install -d "${pkgdir}"/usr/share/licenses/${pkgname} + head -25 dcraw.c > "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt } diff --git a/extra/gamin/18_gam_server_deadlocks.patch b/extra/gamin/18_gam_server_deadlocks.patch new file mode 100644 index 000000000..ef7749675 --- /dev/null +++ b/extra/gamin/18_gam_server_deadlocks.patch @@ -0,0 +1,70 @@ +From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001 +From: Anssi Hannula +Date: Wed, 4 Jan 2012 00:23:55 +0200 +Subject: [PATCH] fix possible server deadlock in ih_sub_cancel + +ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked. +However, ih_sub_cancel() locks it again, and locking GMutex recursively +causes undefined behaviour. + +Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach() +is its only user. Also make the function static so that it won't +accidentally get used by other files without locking (inotify-helper.h +is an internal server header). + +This should fix the intermittent deadlocks I've been experiencing +causing KDE applications to no longer start, and probably also +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361 + +Origin: http://bugzilla-attachments.gnome.org/attachment.cgi?id=204537 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gamin/+bug/926862 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361 + +--- + server/inotify-helper.c | 7 ++----- + server/inotify-helper.h | 1 - + 2 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/server/inotify-helper.c b/server/inotify-helper.c +index d77203e..0789fa4 100644 +--- a/server/inotify-helper.c ++++ b/server/inotify-helper.c +@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub) + + /** + * Cancels a subscription which was being monitored. ++ * inotify_lock must be held when calling. + */ +-gboolean ++static gboolean + ih_sub_cancel (ih_sub_t * sub) + { +- G_LOCK(inotify_lock); +- +- + if (!sub->cancelled) + { + IH_W("cancelling %s\n", sub->pathname); +@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub) + sub_list = g_list_remove (sub_list, sub); + } + +- G_UNLOCK(inotify_lock); + return TRUE; + } + +diff --git a/server/inotify-helper.h b/server/inotify-helper.h +index 5d3b6d0..d36b5fd 100644 +--- a/server/inotify-helper.h ++++ b/server/inotify-helper.h +@@ -34,7 +34,6 @@ gboolean ih_startup (event_callback_t ecb, + found_callback_t fcb); + gboolean ih_running (void); + gboolean ih_sub_add (ih_sub_t *sub); +-gboolean ih_sub_cancel (ih_sub_t *sub); + + /* Return FALSE from 'f' if the subscription should be cancelled */ + void ih_sub_foreach (void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata)); +-- +1.7.7.2 + diff --git a/extra/gamin/PKGBUILD b/extra/gamin/PKGBUILD index aaad6ef5a..a039cbfef 100644 --- a/extra/gamin/PKGBUILD +++ b/extra/gamin/PKGBUILD @@ -5,7 +5,7 @@ pkgname=gamin pkgver=0.1.10 -pkgrel=6 +pkgrel=7 pkgdesc='File and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor)' url='http://www.gnome.org/~veillard/gamin' license=('GPL') @@ -17,13 +17,18 @@ optdepends=('python2: for the python module.') provides=('fam') conflicts=('fam') source=("http://www.gnome.org/~veillard/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz" - 'fix-deprecated-const.patch') + 'fix-deprecated-const.patch' + '18_gam_server_deadlocks.patch') md5sums=('b4ec549e57da470c04edd5ec2876a028' - 'f679aeb48fe9dd376c8828cc9b6941ab') + 'f679aeb48fe9dd376c8828cc9b6941ab' + '4784359a3206bfa3c0dce1c23468f87f') build() { cd "$srcdir/$pkgname-$pkgver" + # https://bugs.archlinux.org/task/33642 + patch -p1 -i "${srcdir}"/18_gam_server_deadlocks.patch + patch -p1 -i "${srcdir}"/fix-deprecated-const.patch # python 2 diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 0ec9d94df..9703e1d54 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177035 2013-02-04 17:30:30Z andyrtr $ +# $Id: PKGBUILD 177918 2013-02-10 18:54:41Z andyrtr $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke pkgname=gnutls -pkgver=3.1.7 +pkgver=3.1.8 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ options=('!libtool' '!zipman') depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12') makedepends=('valgrind' 'strace' 'datefudge') source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('95c96dfaba0e82e9e6bcb67eab5abf49' - 'ea9d8c24c1ac2654ae9fe87f69b45e17') +md5sums=('ffac9e22aba66057d5155ad0e3b62485' + 'f3f0f2b81fa62bbe878a181d87a9cabd') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 1906ba9ec..86ece58f5 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172917 2012-12-06 20:16:10Z heftig $ +# $Id: PKGBUILD 177873 2013-02-10 13:29:01Z heftig $ # Maintainer: Jan de Groot pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.14 +pkgver=2.24.15 pkgrel=1 arch=('i686' 'x86_64') 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=('8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac' +sha256sums=('d7e1c6d6ae6baa48c88441fe52b73b0fb6008763644867d59b049bafb0cf771b' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/lablgtk/PKGBUILD b/extra/lablgtk/PKGBUILD index 786cde45c..14a367a94 100644 --- a/extra/lablgtk/PKGBUILD +++ b/extra/lablgtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 149580 2012-02-08 15:00:33Z tpowa $ +# $Id: PKGBUILD 177911 2013-02-10 17:58:16Z eric $ #Maintainer: Tobias Powalowski pkgname=lablgtk @@ -15,11 +15,15 @@ source=(http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/$pkgname-$pkgver.tar. md5sums=('73a797e3a459190fdcaa8288935f6fb9') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir"/$pkgname-$pkgver make configure make make opt - make PREFIX=$pkgdir/usr LIBDIR=$pkgdir/usr/lib/ocaml BINDIR=$pkgdir/usr/bin \ - INSTALLDIR=$pkgdir/usr/lib/ocaml/lablgtk DLLDIR=$pkgdir/usr/lib/ocaml/stublibs install - rm -r $pkgdir/usr/bin +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make PREFIX="$pkgdir"/usr LIBDIR="$pkgdir"/usr/lib/ocaml BINDIR="$pkgdir"/usr/bin \ + INSTALLDIR="$pkgdir"/usr/lib/ocaml/lablgtk DLLDIR="$pkgdir"/usr/lib/ocaml/stublibs install + rm -r "$pkgdir"/usr/bin } diff --git a/extra/mysql-python/PKGBUILD b/extra/mysql-python/PKGBUILD index 4c1b04396..5f5cfc45b 100644 --- a/extra/mysql-python/PKGBUILD +++ b/extra/mysql-python/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 151041 2012-02-24 14:12:17Z pierre $ -# Maintainer: Angel 'angvp' Velasquez +# $Id: PKGBUILD 177920 2013-02-10 18:57:08Z angvp $ +# Maintainer: Angel Velasquez # Contributor: damir pkgname=mysql-python -pkgver=1.2.3 -pkgrel=3 +pkgver=1.2.4 +pkgrel=1 pkgdesc="MySQL support for Python" arch=("i686" "x86_64") url="http://mysql-python.sourceforge.net/" license=('GPL2') depends=('python2' 'libmysqlclient') makedepends=('mysql' 'python2-distribute') -source=("http://downloads.sourceforge.net/${pkgname}/MySQL-python-${pkgver}.tar.gz") -md5sums=('215eddb6d853f6f4be5b4afc4154292f') +source=("http://pypi.python.org/packages/source/M/MySQL-python/MySQL-python-${pkgver}.zip") +md5sums=('ddf2386daf10a97af115ffad2ed4a9a0') package() { cd ${srcdir}/MySQL-python-${pkgver} diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index a0a4c1dd8..67b9d5114 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175029 2013-01-12 08:15:09Z andyrtr $ +# $Id: PKGBUILD 177916 2013-02-10 18:36:01Z andyrtr $ # Maintainer: Jan de Groot pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.22.0 +pkgver=0.22.1 pkgrel=1 arch=(i686 x86_64) license=('GPL') @@ -13,12 +13,13 @@ 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=('c7038be37a7d446544e83a7df3c26196' +md5sums=('50c259fdda538c1ba94b62aa25f7ec87' '9dc64c254a31e570507bdd4ad4ba629a') build() { cd "${srcdir}/${pkgbase}-${pkgver}" sed -i -e '/AC_PATH_XTRA/d' configure.ac + sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac autoreconf -fi diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD index 97b7c82f7..7556b9fbe 100644 --- a/extra/snd/PKGBUILD +++ b/extra/snd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171550 2012-11-19 03:46:19Z schiv $ +# $Id: PKGBUILD 177901 2013-02-10 16:20:49Z schiv $ # Maintainer: Ray Rashif # Contributor: Juergen Hoetzel # Contributor: see .contrib pkgname=snd -pkgver=13.2 +pkgver=13.4 pkgrel=1 pkgdesc="An advanced sound editor" arch=('i686' 'x86_64') @@ -17,13 +17,12 @@ optdepends=('wavpack' 'flac' 'speex' 'mpg123' 'timidity++' 'vorbis-tools') install=$pkgname.install source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz") -md5sums=('303df8ac9e6d777e480e24b65a3bfaad') +md5sums=('cd19a0749f57baec94dbac2b4f98d9cb') build() { cd "$srcdir/$pkgname-$pkgver" - # execstack is probably due to gmp; this is here just for a reminder - #LDFLAGS+=" -Wl,-z,noexecstack" + LDFLAGS+=" -Wl,-z,noexecstack" ./configure --prefix=/usr \ --with-alsa \ -- cgit v1.2.3-54-g00ecf