diff options
50 files changed, 743 insertions, 988 deletions
diff --git a/community/bmp-musepack/PKGBUILD b/community/bmp-musepack/PKGBUILD deleted file mode 100644 index 5d339287e..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 -pkgdesc="A BMP plugin for playing sounds in Musepack (MPC) format" -arch=('i686' 'x86_64') -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 7817ceb44..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 -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') -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}" = "x86_64" ]; 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/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index 337b32525..c4f7bbe21 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 91432 2013-05-22 10:39:51Z 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=3 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686') url="http://www.ejabberd.im/" @@ -35,7 +35,7 @@ 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" + chmod a+rx "$pkgdir/usr/sbin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh" rm -rf "$pkgdir/var/lock" install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service } diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index 521be2cb7..e40de4723 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') diff --git a/community/tnftp/PKGBUILD b/community/tnftp/PKGBUILD index 6ca660613..25fcc9256 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') 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/core/crda/PKGBUILD b/core/crda/PKGBUILD index f31fa50a6..3470d882a 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) 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/kbd/PKGBUILD b/core/kbd/PKGBUILD index 1ee33254c..af4c52d16 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') 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 9872d3d5b..a813c14aa 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') 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/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 e9546663e..3a71fe769 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') 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') 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() { @@ -100,9 +105,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/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index 99a6ba213..c3995f60b 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') 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 f48a7dbd4..da828c0e1 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 186218 2013-05-22 06:35:50Z 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=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') url="http://www.alsa-project.org" @@ -13,21 +13,9 @@ 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 \ @@ -44,8 +32,5 @@ package() { # 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/capi4hylafax/PKGBUILD b/extra/capi4hylafax/PKGBUILD index ab46c237b..23396fe7b 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) 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/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 420dc3a0e..9364a1f45 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') 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/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD index a1641db1c..ef6e457d2 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) 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/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 19bb8e718..5de8d1a22 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') 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/libkgapi/PKGBUILD b/extra/libkgapi/PKGBUILD index 66dc724ad..5b2339402 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') 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/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index 65b5ecf6f..1c9f1fcc1 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186194 2013-05-21 22:02:40Z andrea $ +# $Id: PKGBUILD 186213 2013-05-22 06:19:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> @@ -13,7 +13,7 @@ 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") +source=("http://download.kde.org/stable/kde-telepathy/0.6.2/src/${_pkgname}-${pkgver}.tar.bz2") sha1sums=('71951b929ad3caa6a0f46e338bd669c7e542ac15') build() { diff --git a/extra/telepathy-logger-qt/PKGBUILD b/extra/telepathy-logger-qt/PKGBUILD index 39382479e..afe4ebc98 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') @@ -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/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD index 4fe7b534b..4a459ffdc 100644 --- a/libre-testing/libretools/PKGBUILD +++ b/libre-testing/libretools/PKGBUILD @@ -8,8 +8,8 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20130514 -_libretools_commit=b261c8585cf6aa9e7bf5b960b2a0a047d769dbae +pkgver=20130522 +_libretools_commit=379ff751c59d528bd4f1a8e7a24fc039e8e408ba _devtools_commit=89d15e7697da2169493142f78a90b57a784d8f22 _packages_url=https://projects.parabolagnulinux.org/packages @@ -40,7 +40,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 +57,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('ce2a406d66033b48cacfb580997c1250' +md5sums=('1fac1e8166cc5b686ed3fe6d99588c21' '21d77c519a7496185c40399d1cfa26bf') 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/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 250dff2e8..3ac0fdb5d 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') @@ -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/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/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 9077a0ac4..9646cb1f7 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.12 -pkgrel=5 +pkgrel=5.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/pcr/corosync/PKGBUILD b/pcr/corosync/PKGBUILD index e7c019a66..e176cb112 100644 --- a/pcr/corosync/PKGBUILD +++ b/pcr/corosync/PKGBUILD @@ -1,38 +1,63 @@ -# Maintainer: Eric Renfro <erenfro@gmail.com> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=corosync -pkgver=2.1.0 -pkgrel=4 -pkgdesc="Cluster engine for nodal communication systems with additional features for implementing high availability within applications." -arch=('i686' 'x86_64') -url="http://www.corosync.org/" -license=('BSD') -makedepends=('nss' 'libstatgrab' 'net-snmp' 'libqb') -depends=('nss' 'libstatgrab' 'net-snmp' 'libqb') -provides=('corosync=2.1.0') -conflicts=('corosync1') -#source=(ftp://ftp:downloads@ftp.corosync.org/downloads/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz) -source=("https://github.com/downloads/corosync/corosync/corosync-${pkgver}.tar.gz" - "corosync.init" - "corosync.service") -md5sums=('dc5152e6dfdb4638ab544e587884483a' - 'fdc3b648f020e165eaa7c3283ce5b9ac' - 'abc267226faafc7dc8246634277705ea') - +_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}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-systemd \ - --enable-monitoring \ - --enable-snmp \ - --enable-dbus \ - --with-systemddir=/usr/lib/systemd/system - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - ## Updated and fixed up systemd service unit and associated start/stop script: - cp ${srcdir}/corosync.service ${pkgdir}/usr/lib/systemd/system/corosync.service || return 1 - cp ${srcdir}/corosync.init ${pkgdir}/usr/share/corosync/corosync || return 1 + 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/corosync/corosync.init b/pcr/corosync/corosync.init deleted file mode 100755 index b97186dee..000000000 --- a/pcr/corosync/corosync.init +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/bash - -# Authors: -# Eric Renfro <erenfro@gmail.com> - -desc="Corosync Cluster Engine" -prog="corosync" - -# set secure PATH -PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/sbin" - -status() -{ - pid=$(pidof $prog 2>/dev/null) - return $? -} - -if [ -d /etc/default ]; then - [ -f /etc/default/$prog ] && . /etc/default/$prog - [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/$prog" -fi - -cluster_disabled_at_boot() -{ - if grep -q nocluster /proc/cmdline && \ - [ "$(tty)" = "/dev/console" ]; then - return 1 - fi - return 0 -} - -wait_for_ipc() -{ - local try=0 - while [ "$try" -le "20" ]; do - if corosync-cfgtool -s > /dev/null 2>&1; then - return 0 - fi - sleep 0.5 - let try++ - done - - return 1 -} - -start() -{ - echo -n "Starting $desc ($prog): " - - ! cluster_disabled_at_boot && return - - # most recent distributions use tmpfs for /var/run - # to avoid to clean it up on every boot. - # they also assume that init scripts will create - # required subdirectories for proper operations - mkdir -p /var/run - - if status $prog > /dev/null 2>&1; then - rtrn=0 - else - $prog > /dev/null 2>&1 - - if ! wait_for_ipc; then - echo "FAILED" - rtrn=1 - fi - touch $LOCK_FILE - rtrn=0 - fi - echo "OK" -} - -stop() -{ - ! status $prog > /dev/null 2>&1 && return - - echo -n "Signaling $desc ($prog) to terminate: " - kill -TERM $(pidof $prog) > /dev/null 2>&1 - echo "OK" - - echo -n "Waiting for $prog services to unload:" - while status $prog > /dev/null 2>&1; do - sleep 1 - echo -n "." - done - - rm -f $LOCK_FILE - echo " OK" - rtrn=0 -} - -restart() -{ - stop - start -} - -rtrn=0 - -case "$1" in -start) - start - ;; -restart|reload|force-reload) - restart - ;; -condrestart|try-restart) - if status $prog > /dev/null 2>&1; then - restart - fi - ;; -status) - status $prog - rtrn=$? - ;; -stop) - stop - ;; -*) - echo "usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|status}" - rtrn=2 - ;; -esac - -exit $rtrn - diff --git a/pcr/corosync/corosync.service b/pcr/corosync/corosync.service deleted file mode 100644 index e601181ee..000000000 --- a/pcr/corosync/corosync.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Corosync Cluster Engine -ConditionKernelCommandLine=!nocluster -Requires=network.target -After=network.target - -[Service] -ExecStart=/usr/share/corosync/corosync start -ExecStop=/usr/share/corosync/corosync stop -Type=forking - -[Install] -WantedBy=multi-user.target diff --git a/pcr/ha-glue/PKGBUILD b/pcr/ha-glue/PKGBUILD index ed46bc66d..ab23a80d2 100644 --- a/pcr/ha-glue/PKGBUILD +++ b/pcr/ha-glue/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ha-glue _pkgname=${pkgname:3} pkgver=1.0.11 -pkgrel=6 +pkgrel=7 pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack' arch=( i686 diff --git a/pcr/ha-glue/ha-glue.install b/pcr/ha-glue/ha-glue.install index abfedb7c4..05e2160d3 100644 --- a/pcr/ha-glue/ha-glue.install +++ b/pcr/ha-glue/ha-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/ha-pacemaker/PKGBUILD b/pcr/ha-pacemaker/PKGBUILD new file mode 100644 index 000000000..64132b521 --- /dev/null +++ b/pcr/ha-pacemaker/PKGBUILD @@ -0,0 +1,81 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=ha-pacemaker +_pkgname=${pkgname:3} +pkgver=1.1.9 +pkgrel=2 +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 +} 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: |