From dbffe56f58d40a9a456baeba5d488c9f968a352a Mon Sep 17 00:00:00 2001 From: root Date: Fri, 23 Aug 2013 02:07:26 -0700 Subject: Fri Aug 23 02:06:53 PDT 2013 --- community/lightdm/PKGBUILD | 23 ++++--- community/perl-xml-libxml/PKGBUILD | 12 ++-- community/postgis/PKGBUILD | 24 +++---- community/postgis/postgis.changelog | 4 ++ community/qstardict/PKGBUILD | 34 +++++++--- community/rbutil/PKGBUILD | 33 +++++----- community/redis/PKGBUILD | 10 +-- community/tilda/PKGBUILD | 31 ++++++--- community/tilda/tab-count-fix.patch | 11 ++++ community/tilda/tilda.changelog | 28 ++++---- core/gnupg/PKGBUILD | 8 +-- core/isl/PKGBUILD | 12 ++-- extra/libtiff/PKGBUILD | 15 +++-- extra/libtiff/tiff-4.0.3-CVE-2013-4231.patch | 18 ++++++ extra/libtiff/tiff-4.0.3-CVE-2013-4232.patch | 15 +++++ extra/pyqt4/PKGBUILD | 10 +-- extra/refind-efi/PKGBUILD | 4 +- extra/sip/PKGBUILD | 8 +-- extra/telepathy-kde-auth-handler/PKGBUILD | 6 +- libre/calibre-libre/PKGBUILD | 4 +- libre/icedove-libre/Icedove-branding.patch | 37 ----------- libre/icedove-libre/PKGBUILD | 30 +++++---- libre/icedove-libre/branding.patch | 19 ------ libre/icedove-libre/libre.patch | 49 -------------- libre/icedove-libre/makefile.patch | 46 -------------- pcr/asterisk/PKGBUILD | 95 ++++++++++++++++++++++++++++ pcr/asterisk/asterisk.install | 15 +++++ pcr/asterisk/asterisk.logrotated | 10 +++ pcr/asterisk/asterisk.service | 20 ++++++ pcr/asterisk/asterisk.tmpfile | 1 + pcr/youtube-dl-current/PKGBUILD | 4 +- social/asterisk/PKGBUILD | 41 ------------ social/asterisk/asterisk | 38 ----------- social/asterisk/asterisk.install | 38 ----------- social/asterisk/asterisk.logrotated | 10 --- 35 files changed, 358 insertions(+), 405 deletions(-) create mode 100755 community/tilda/tab-count-fix.patch create mode 100644 extra/libtiff/tiff-4.0.3-CVE-2013-4231.patch create mode 100644 extra/libtiff/tiff-4.0.3-CVE-2013-4232.patch delete mode 100644 libre/icedove-libre/Icedove-branding.patch delete mode 100644 libre/icedove-libre/branding.patch delete mode 100644 libre/icedove-libre/libre.patch delete mode 100644 libre/icedove-libre/makefile.patch create mode 100644 pcr/asterisk/PKGBUILD create mode 100644 pcr/asterisk/asterisk.install create mode 100644 pcr/asterisk/asterisk.logrotated create mode 100644 pcr/asterisk/asterisk.service create mode 100644 pcr/asterisk/asterisk.tmpfile delete mode 100644 social/asterisk/PKGBUILD delete mode 100644 social/asterisk/asterisk delete mode 100644 social/asterisk/asterisk.install delete mode 100644 social/asterisk/asterisk.logrotated diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index e86a8fccd..d9d9fcb36 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 92709 2013-06-13 08:52:31Z alucryd $ +# $Id: PKGBUILD 96242 2013-08-22 13:15:04Z alucryd $ # Maintainer: Maxime Gauduin # Contributor: Morfeo pkgbase=lightdm pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') pkgver=1.6.0 -pkgrel=5 +pkgrel=6 epoch=1 pkgdesc="A lightweight display manager" arch=('i686' 'x86_64') url="https://launchpad.net/lightdm" license=('GPL3' 'LGPL3') -groups=('lightdm') -makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'qt4' 'qt5-base' 'yelp-tools') +makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base' 'yelp-tools') options=('!emptydirs' '!libtool') source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz" 'lightdm.service' @@ -36,7 +35,7 @@ sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419' '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4') prepare() { - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} patch -Np1 -i ../lightdm-default-config.patch patch -Np1 -i ../lightdm-lock-screen-before-switch.patch @@ -45,14 +44,14 @@ prepare() { } build() { - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} - ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${pkgbase} --with-greeter-user=lightdm --with-greeter-session=lightdm-gtk-greeter --disable-{static,tests} + ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc' --localstatedir='/var' --libexecdir="/usr/lib/${pkgbase}" --with-greeter-user='lightdm' --with-greeter-session='lightdm-gtk-greeter' --disable-{static,tests} make } package_lightdm() { -depends=('libxklavier' 'systemd') +depends=('libxklavier' 'polkit' 'systemd') optdepends=('xorg-server-xephyr: LightDM test mode' 'accountsservice: limit visible accounts') backup=('etc/apparmor.d/lightdm-guest-session' @@ -61,7 +60,7 @@ backup=('etc/apparmor.d/lightdm-guest-session' 'etc/lightdm/users.conf') install=${pkgbase}.install - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall @@ -81,7 +80,7 @@ install=${pkgbase}.install install -m 644 ../lightdm-autologin.pam "${pkgdir}"/etc/pam.d/lightdm-autologin # PolicyKit - install -dm 700 "${pkgdir}"/usr/share/polkit-1/rules.d + install -dm 700 -o polkitd "${pkgdir}"/usr/share/polkit-1/rules.d install -m 644 ../lightdm.rules "${pkgdir}"/usr/share/polkit-1/rules.d/lightdm.rules # Systemd @@ -94,7 +93,7 @@ package_liblightdm-qt4() { pkgdesc=('LightDM Qt client library') depends=('lightdm' 'qt4') - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" -C liblightdm-gobject install make DESTDIR="${pkgdir}" -C liblightdm-qt install @@ -108,7 +107,7 @@ package_liblightdm-qt5() { pkgdesc=('LightDM Qt client library') depends=('lightdm' 'qt5-base') - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" -C liblightdm-gobject install make DESTDIR="${pkgdir}" -C liblightdm-qt install diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD index aed8b510f..a4fa8d923 100644 --- a/community/perl-xml-libxml/PKGBUILD +++ b/community/perl-xml-libxml/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 95837 2013-08-17 14:25:58Z jsteel $ +# $Id: PKGBUILD 96253 2013-08-22 17:25:25Z jsteel $ # Maintainer: Jonathan Steel # Contributor: Justin "juster" Davis # Contributor: François Charette pkgname=perl-xml-libxml -pkgver=2.0101 +pkgver=2.0103 pkgrel=1 pkgdesc="Interface to the libxml library" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/XML-LibXML" license=('GPL') -depends=('libxml2' 'perl-xml-sax>=0.11' 'perl-xml-namespacesupport>=1.07') +depends=('libxml2' 'perl-xml-sax' 'perl-xml-namespacesupport') provides=('perl-libxml' 'perl-xml-libxml-common') replaces=('perl-libxml' 'perl-xml-libxml-common') conflicts=('perl-libxml' 'perl-xml-libxml-common') options=('!emptydirs') -install=perl-xml-libxml.install +install=$pkgname.install source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz) -md5sums=('5f60ca19b651628eb80341da99a56598') +md5sums=('77184192598ea59389b76dfea2a23b7c') build() { cd XML-LibXML-$pkgver @@ -32,5 +32,5 @@ check() { package() { cd XML-LibXML-$pkgver - make pure_install doc_install DESTDIR="$pkgdir" + make pure_install doc_install DESTDIR="$pkgdir"/ } diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD index 192425090..823dc920b 100644 --- a/community/postgis/PKGBUILD +++ b/community/postgis/PKGBUILD @@ -1,36 +1,32 @@ -# $Id: PKGBUILD 92821 2013-06-15 13:40:37Z jlichtblau $ +# $Id: PKGBUILD 96248 2013-08-22 17:02:31Z alucryd $ # Maintainer: Jaroslav Lichtblau # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea pkgname=postgis -pkgver=2.0.3 +pkgver=2.1.0 pkgrel=1 pkgdesc="Adds support for geographic objects to PostgreSQL" arch=('i686' 'x86_64') url="http://postgis.net/" license=('GPL') -depends=('postgresql>=9.2' 'postgresql<9.3' 'proj' 'geos' 'gdal' 'json-c' 'libxml2') +depends=('postgresql' 'gdal' 'json-c') changelog=$pkgname.changelog options=('!libtool') source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz) -sha256sums=('7f865a6fdf19afed7d2f3e7178cd504f7254a9e96f2ce6a07d0ea19edc1668a0') +sha256sums=('fc00481aec904661f3eb11da4305b1666f2040c28b0651de7eac6c22f217b26c') build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure --prefix=/usr - make + cd ${pkgname}-${pkgver} - # Build utils (FS#25836) - cd utils + ./configure --prefix=/usr make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd ${pkgname}-${pkgver} - cd utils - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } + +# vim: ts=2 sw=2 et: diff --git a/community/postgis/postgis.changelog b/community/postgis/postgis.changelog index 1e53db33a..ce4c3b267 100644 --- a/community/postgis/postgis.changelog +++ b/community/postgis/postgis.changelog @@ -1,3 +1,7 @@ +2013-08-22 Maxime Gauduin + * postgis-2.1.0-1 + * Fixes FS#35816 + 2013-06-15 Jaroslav Lichtblau * postgis-2.0.3-1 diff --git a/community/qstardict/PKGBUILD b/community/qstardict/PKGBUILD index c395cd17a..79fce59b2 100644 --- a/community/qstardict/PKGBUILD +++ b/community/qstardict/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 85395 2013-03-01 10:38:40Z andrea $ +# $Id: PKGBUILD 96239 2013-08-22 12:10:16Z jelle $ # Maintainer: Jaroslav Lichtblau # Contributor: Alois Nespor -pkgname=qstardict +#pkgbase=qstardict +pkgname=('qstardict' 'kdeplasma-applets-qstardict') pkgver=1.0.1 -pkgrel=2 -pkgdesc="Qt4 clone of StarDict with full support of StarDict dictionaries" +pkgrel=3 +depends=('qt4') +makedepends=('cmake' 'automoc4' 'kdelibs') arch=('i686' 'x86_64') url="http://qstardict.ylsoftware.com/index.php" license=('GPL2') -depends=('qt4') -provides=('stardict') changelog=$pkgname.changelog source=(http://qstardict.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) sha256sums=('b778ace65a22e5b9724d687ad90c77ec98feb2671774f73cd51725ec7b59e62f') @@ -19,12 +19,30 @@ build() { cd "${srcdir}/$pkgname-$pkgver" sed -i -e 's|glib/gmem.h|glib.h|' -e 's|glib/gstrfuncs.h|glib.h|' plugins/stardict/stardict.cpp - qmake ENABLED_PLUGINS="stardict web swac" + qmake-qt4 ENABLED_PLUGINS="stardict web swac" + make + + + cd "${srcdir}/$pkgname-$pkgver/kdeplasma" + mkdir build + cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr make } -package() { +package_qstardict() { +pkgdesc="Qt4 clone of StarDict with full support of StarDict dictionaries" +provides=('stardict') cd "${srcdir}/$pkgname-$pkgver" make INSTALL_ROOT="${pkgdir}" install } + +package_kdeplasma-applets-qstardict(){ +pkgdesc="Qt4 clone of StarDict with full support of StarDict dictionaries" +depends=('kdelibs' 'qt4' 'qstardict') + cd "${srcdir}/qstardict-$pkgver/kdeplasma/build" + + make DESTDIR=${pkgdir} install +} + diff --git a/community/rbutil/PKGBUILD b/community/rbutil/PKGBUILD index 8bccc4a23..a3a793537 100755 --- a/community/rbutil/PKGBUILD +++ b/community/rbutil/PKGBUILD @@ -1,41 +1,40 @@ -# $Id: PKGBUILD 85455 2013-03-01 19:10:50Z andrea $ +# $Id: PKGBUILD 96229 2013-08-22 00:02:57Z alucryd $ # Maintainer: Maxime Gauduin # Contributor: said # Contributor: clinx pkgname=rbutil pkgver=1.3.1 -pkgrel=3 +pkgrel=4 pkgdesc="Rockbox Utility" arch=('i686' 'x86_64') url="http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility" license=("GPL") -depends=('qt4' 'libusb') +depends=('qt4' 'libusbx') +makedepends=('gendesk') optdepends=('speex: voice files support') -source=("http://download.rockbox.org/${pkgname}/source/RockboxUtility-v${pkgver}-src.tar.bz2" "${pkgname}.desktop") -sha256sums=('6c04b5c7eaad1762577908dedb9e40f5b0cee675150ae5ba844ea2c9bea294ca' - '539285237af16fbc60a7501963e8c2f584e58a31f2613481e6b42d21337b7a25') +source=("http://download.rockbox.org/${pkgname}/source/RockboxUtility-v${pkgver}-src.tar.bz2") +sha256sums=('6c04b5c7eaad1762577908dedb9e40f5b0cee675150ae5ba844ea2c9bea294ca') + +prepare() { + gendesk -n --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name="Rockbox Utility" --exec="RockboxUtility" --categories="Application;Utility;" --comment="Rockbox automated installer" +} build() { - cd "${srcdir}"/RockboxUtility-v${pkgver}/${pkgname}/rbutilqt + cd RockboxUtility-v${pkgver}/${pkgname}/rbutilqt -# Build lrelease-qt4 rbutilqt.pro qmake-qt4 make } package(){ - cd "${srcdir}"/RockboxUtility-v${pkgver}/${pkgname}/rbutilqt - -# Install - install -dm 755 "${pkgdir}"/usr/{bin,share/pixmaps} - install -m 644 icons/rockbox-64.png "${pkgdir}"/usr/share/pixmaps/rbutil.png - install -m 755 RockboxUtility "${pkgdir}"/usr/bin/rbutil + cd RockboxUtility-v${pkgver}/${pkgname}/rbutilqt -# Desktop file - install -dm 755 "${pkgdir}"/usr/share/applications - install -m 644 "${srcdir}"/rbutil.desktop "${pkgdir}"/usr/share/applications/rbutil.desktop + install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,pixmaps}} + install -m 755 {,"${pkgdir}"/usr/bin/}RockboxUtility + install -m 644 icons/rockbox-256.png "${pkgdir}"/usr/share/pixmaps/rbutil.png + install -m 644 {"${srcdir}","${pkgdir}"/usr/share/applications}/rbutil.desktop } #vim: ts=2 sw=2 et: diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 34b769bce..a529996b7 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 95069 2013-08-05 10:49:57Z spupykin $ +# $Id: PKGBUILD 96235 2013-08-22 08:59:22Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jan-Erik Rediger # Contributor: nofxx .com> pkgname=redis -pkgver=2.6.14 -pkgrel=2 +pkgver=2.6.15 +pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') url="http://redis.io/" @@ -15,11 +15,11 @@ makedepends=('gcc>=3.1' 'make' 'pkgconfig') backup=("etc/redis.conf" "etc/logrotate.d/redis") install=redis.install -source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" +source=("http://download.redis.io/releases/redis-$pkgver.tar.gz" "redis.service" "redis.logrotate" "redis.tmpfiles.d") -md5sums=('02e0c06e953413017ff64862953e2756' +md5sums=('cff9cce74f29f70694ec21b1c4f134a6' '5320aa6d0f31aadc1d6202ca40425aea' '9e2d75b7a9dc421122d673fe520ef17f' 'dd9ab8022b4d963b2e5899170dfff490') diff --git a/community/tilda/PKGBUILD b/community/tilda/PKGBUILD index 787e5f40d..a5b425ed8 100644 --- a/community/tilda/PKGBUILD +++ b/community/tilda/PKGBUILD @@ -1,21 +1,34 @@ -# $Id: PKGBUILD 95282 2013-08-08 19:28:31Z jlichtblau $ +# $Id: PKGBUILD 96249 2013-08-22 17:19:28Z alucryd $ # Maintainer: Jaroslav Lichtblau # Contributor: Douglas Soares de Andrade # Contributor: William Rea pkgname=tilda pkgver=1.1.7 -pkgrel=1 +pkgrel=3 pkgdesc="A Gtk based drop down terminal for Linux and Unix" arch=('i686' 'x86_64') url="https://github.com/lanoxx/tilda" license=('GPL') -depends=('vte3' 'confuse' 'gtk3') -source=(https://github.com/lanoxx/$pkgname/archive/$pkgname-$pkgver.tar.gz) -sha256sums=('ed96ae2cf0ceb2a5b2f4a62948c5c0d28d1d54f89ade5153b2e67515cf4dc5e7') +depends=('vte3' 'confuse') +source=(https://github.com/lanoxx/$pkgname/archive/$pkgname-$pkgver.tar.gz + start-hidden-fix.patch + tab-count-fix.patch) +sha256sums=('ed96ae2cf0ceb2a5b2f4a62948c5c0d28d1d54f89ade5153b2e67515cf4dc5e7' + 'e6d6075bb923c2dcae57706fe0555c28f9094f5115f1a3c60b8f85b8ff267b96' + '5d80a76f904a2094cd7b156654ea6d1860c319fc6c18927f2fb342c0f477c110') + +prepare() { + cd $pkgname-$pkgname-$pkgver + + patch -Np1 -i ../start-hidden-fix.patch + patch -Np1 -i ../tab-count-fix.patch + sed 's/Exec=.*/Exec=tilda/; s/Icon=.*/Icon=tilda/' -i tilda.desktop.in + +} build() { - cd $srcdir/$pkgname-$pkgname-$pkgver + cd $pkgname-$pkgname-$pkgver ./autogen.sh ./configure --prefix=/usr @@ -23,7 +36,9 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgname-$pkgver + cd $pkgname-$pkgname-$pkgver - make DESTDIR=${pkgdir} install + make DESTDIR="$pkgdir" install } + +# vim: ts=2 sw=2 et: diff --git a/community/tilda/tab-count-fix.patch b/community/tilda/tab-count-fix.patch new file mode 100755 index 000000000..b0e1522a1 --- /dev/null +++ b/community/tilda/tab-count-fix.patch @@ -0,0 +1,11 @@ +--- a/src/tilda_window.c ++++ b/src/tilda_window.c +@@ -378,7 +378,7 @@ static gboolean goto_tab_generic (tilda_window *tw, guint tab_number) + + if (g_list_length (tw->terms) > (tab_number-1)) + { +- goto_tab (tw, g_list_length (tw->terms) - tab_number); ++ goto_tab (tw, tab_number - 1); + return TRUE; + } + diff --git a/community/tilda/tilda.changelog b/community/tilda/tilda.changelog index f5a9e46d9..9885de98e 100644 --- a/community/tilda/tilda.changelog +++ b/community/tilda/tilda.changelog @@ -1,18 +1,22 @@ -2013-08-08 Jaroslav Lichtblau - * tilda 1.1.7-1 +2013-08-22 Maxime Gauduin + * tilda 1.1.7-3 + * Fixes FS#36542, FS#36516 and FS#36543 -2012-06-02 Jaroslav Lichtblau - * FS#29754 fixed +2013-08-08 Jaroslav Lichtblau + * tilda 1.1.7-1 -2011-08-28 Jaroslav Lichtblau - * FS#25762 fixed +2012-06-02 Jaroslav Lichtblau + * FS#29754 fixed -2008-04-29 Mateusz Herych - * Updated for x86_64 - 0.9.6 +2011-08-28 Jaroslav Lichtblau + * FS#25762 fixed -2008-04-28 Douglas Soares de Andrade - * Updated for i686 - 0.9.6 +2008-04-29 Mateusz Herych + * Updated for x86_64 - 0.9.6 -2007-12-30 Douglas Soares de Andrade - * Updated to newer version - 0.9.5 +2008-04-28 Douglas Soares de Andrade + * Updated for i686 - 0.9.6 + +2007-12-30 Douglas Soares de Andrade + * Updated to newer version - 0.9.5 diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index 7c751926a..7f84851d2 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 185721 2013-05-17 17:22:08Z bisson $ +# $Id: PKGBUILD 193522 2013-08-21 22:25:01Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Tobias Powalowski # Contributor: Andreas Radke # Contributor: Judd Vinet pkgname=gnupg -pkgver=2.0.20 -pkgrel=2 +pkgver=2.0.21 +pkgrel=1 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' license=('GPL') @@ -18,7 +18,7 @@ makedepends=('curl' 'libldap' 'libusb-compat') depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr') source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} 'protect-tool-env.patch') -sha1sums=('7ddfefa37ee9da89a8aaa8f9059d251b4cd02562' 'SKIP' +sha1sums=('5ba8cce72eb4fd1a3ac1a282d25d7c7b90d3bf26' 'SKIP' '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db') install=install diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD index 5044ad60c..aff063a69 100644 --- a/core/isl/PKGBUILD +++ b/core/isl/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 188940 2013-06-26 05:31:47Z allan $ +# $Id: PKGBUILD 193525 2013-08-22 05:37:20Z allan $ # Maintainer: Allan McRae pkgname=isl -pkgver=0.12 +pkgver=0.12.1 pkgrel=1 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" arch=('i686' 'x86_64') -url="http://www.kotnet.org/~skimo/isl/" +url="http://freecode.com/projects/isl" depends=('gmp') license=('MIT') options=('!libtool') -source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) -md5sums=('eaa1968dda763f12dc84e45a892cd428') +source=(ftp://ftp.linux.student.kuleuven.be/pub/people/skimo/isl/$pkgname-$pkgver.tar.bz2) +md5sums=('27d381085ff1b5733c3e8a9b6ad24a4d') build() { cd "$srcdir/$pkgname-$pkgver" @@ -29,7 +29,7 @@ package() { make -j1 DESTDIR="$pkgdir/" install install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/ - mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.2.0-gdb.py + mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.2.1-gdb.py install -Dm644 LICENSE $pkgdir/usr/share/licenses/isl/LICENSE } diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD index fc3a2745d..2a76d717c 100644 --- a/extra/libtiff/PKGBUILD +++ b/extra/libtiff/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186503 2013-05-28 01:47:37Z eric $ +# $Id: PKGBUILD 193540 2013-08-22 21:13:54Z eric $ # Maintainer: Eric Bélanger pkgname=libtiff pkgver=4.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Library for manipulation of TIFF images" arch=('i686' 'x86_64') url="http://www.remotesensing.org/libtiff/" @@ -18,14 +18,18 @@ source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz tiff-4.0.3-CVE-2013-1960.patch tiff-4.0.3-CVE-2013-1961.patch tiff-4.0.3-libjpeg-turbo.patch - tiff-4.0.3-tiff2pdf-colors.patch) + tiff-4.0.3-tiff2pdf-colors.patch + tiff-4.0.3-CVE-2013-4231.patch + tiff-4.0.3-CVE-2013-4232.patch) sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0' '41be661638282dae0d07bd2788414cb6650f8981' '6cb3d480908132335c05c769b5a51f951413725d' '5903355afdd0bb27ea3746339e2196720f9fac9d' '29a91870cca5d4cd9ca1c464f8074088eddc3fb8' '02d57835df50d3f84587571ec52b36f5af838de2' - '23443ad0bc130d70860b6cc6d19b69584ae7a6cc') + '23443ad0bc130d70860b6cc6d19b69584ae7a6cc' + '969f588e9da5991e7f17dddf69ae59424b05fa16' + '2a23c55d081bed74ac8dd99541a93d312cc72b64') prepare() { cd tiff-${pkgver} @@ -35,6 +39,9 @@ prepare() { patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1960.patch" patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1961.patch" patch -p1 -i "${srcdir}/tiff-4.0.3-libjpeg-turbo.patch" + cd tools + patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4231.patch" + patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4232.patch" } build() { diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-4231.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-4231.patch new file mode 100644 index 000000000..3c2171829 --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-CVE-2013-4231.patch @@ -0,0 +1,18 @@ +Index: gif2tiff.c +=================================================================== +RCS file: /cvs/maptools/cvsroot/libtiff/tools/gif2tiff.c,v +retrieving revision 1.12 +diff -u -r1.12 gif2tiff.c +--- gif2tiff.c 15 Dec 2010 00:22:44 -0000 1.12 ++++ gif2tiff.c 13 Aug 2013 08:25:38 -0000 +@@ -333,6 +333,10 @@ + int status = 1; + + datasize = getc(infile); ++ ++ if (datasize > 12) ++ return 0; ++ + clear = 1 << datasize; + eoi = clear + 1; + avail = clear + 2; diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-4232.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-4232.patch new file mode 100644 index 000000000..87673d91b --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-CVE-2013-4232.patch @@ -0,0 +1,15 @@ +Index: tiff2pdf.c +=================================================================== +RCS file: /cvs/maptools/cvsroot/libtiff/tools/tiff2pdf.c,v +retrieving revision 1.71 +diff -u -r1.71 tiff2pdf.c +--- tiff2pdf.c 2 May 2013 14:54:08 -0000 1.71 ++++ tiff2pdf.c 13 Aug 2013 04:45:40 -0000 +@@ -2462,6 +2462,7 @@ + TIFFFileName(input)); + t2p->t2p_error = T2P_ERR_ERROR; + _TIFFfree(buffer); ++ return(0); + } else { + buffer=samplebuffer; + t2p->tiff_datasize *= t2p->tiff_samplesperpixel; diff --git a/extra/pyqt4/PKGBUILD b/extra/pyqt4/PKGBUILD index 1bdd0f4a8..440015b85 100644 --- a/extra/pyqt4/PKGBUILD +++ b/extra/pyqt4/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 188683 2013-06-17 19:05:53Z andrea $ +# $Id: PKGBUILD 193533 2013-08-22 14:50:14Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Douglas Soares de Andrade # Contributor: riai Ben pkgbase=pyqt4 pkgname=('pyqt4-common' 'python-pyqt4' 'python2-pyqt4') -pkgver=4.10.2 -pkgrel=2 +pkgver=4.10.3 +pkgrel=1 arch=('i686' 'x86_64') -url="http://riverbankcomputing.co.uk/software/pyqt/intro" +url='http://www.riverbankcomputing.com/software/pyqt/intro' license=('GPL') makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa' 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') source=("http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('9257e12fec9b1b21e5a0d76d455d1691') +md5sums=('8b13d2ab64e4d2fd0037b81b7e78c15c') build() { cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD index 1954b0992..1b919070b 100644 --- a/extra/refind-efi/PKGBUILD +++ b/extra/refind-efi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 192314 2013-08-10 05:37:22Z tpowa $ +# $Id: PKGBUILD 193534 2013-08-22 15:56:50Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -17,7 +17,7 @@ _COMPILER="GCC46" pkgname="refind-efi" pkgver="0.7.3" -pkgrel="1" +pkgrel="2" pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs" url="http://www.rodsbooks.com/refind/index.html" arch=('x86_64' 'i686') diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 69b7828ca..312a32bcc 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 188678 2013-06-17 18:06:55Z andrea $ +# $Id: PKGBUILD 193531 2013-08-22 14:49:14Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Douglas Soares de Andrade # Contributor: riai , Ben pkgbase=sip pkgname=('sip' 'python-sip' 'python2-sip') -pkgver=4.14.7 +pkgver=4.15 pkgrel=1 arch=('i686' 'x86_64') -url="http://www.riverbankcomputing.com/software/sip/" +url='http://www.riverbankcomputing.com/software/sip/intro' license=('custom:"sip"') makedepends=('python' 'python2') source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz") -md5sums=('f5c8001f16ecffd711708de0e07d542f') +md5sums=('8c1133c96c9ddec92c0ab429dec96fe6') build() { cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index bac348dc8..eb0810d88 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 192368 2013-08-10 11:00:07Z andrea $ +# $Id: PKGBUILD 193542 2013-08-22 21:22:10Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-auth-handler _pkgname=ktp-auth-handler pkgver=0.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect" arch=('i686' 'x86_64') url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('telepathy-kde-common-internals' 'qjson') +depends=('telepathy-kde-common-internals' 'qjson' 'qca-ossl') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 1a0bff6b6..03be621ec 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95754 2013-08-16 10:44:14Z jelle $ +# $Id: PKGBUILD 96243 2013-08-22 15:33:49Z andrea $ # Maintainer: jelle van der Waa # Maintainer: Daniel Wallace # Contributor: Giovanni Scafora @@ -10,7 +10,7 @@ _pkgname=calibre pkgname=calibre-libre pkgver=0.9.44 -pkgrel=1 +pkgrel=2 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" diff --git a/libre/icedove-libre/Icedove-branding.patch b/libre/icedove-libre/Icedove-branding.patch deleted file mode 100644 index 751305147..000000000 --- a/libre/icedove-libre/Icedove-branding.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: =?UTF-8?q?Guido=20G=C3=BCnther?= -Date: Sat, 24 Nov 2012 11:36:16 +0100 -Subject: Icedove branding - ---- - mail/app/application.ini | 2 +- - mail/confvars.sh | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mail/app/application.ini b/mail/app/application.ini -index 8380eb7..12902c2 100644 ---- a/mail/app/application.ini -+++ b/mail/app/application.ini -@@ -4,7 +4,7 @@ - - #filter substitution - [App] --Name=Thunderbird -+Name=Icedove - Version=@APP_VERSION@ - BuildID=@GRE_BUILDID@ - #ifdef MOZ_SOURCE_REPO -diff --git a/mail/confvars.sh b/mail/confvars.sh -index 5c34d70..395bb87 100755 ---- a/mail/confvars.sh -+++ b/mail/confvars.sh -@@ -3,8 +3,8 @@ - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - --MOZ_APP_BASENAME=Thunderbird --MOZ_APP_NAME=thunderbird -+MOZ_APP_BASENAME=Icedove -+MOZ_APP_NAME=icedove - MOZ_UPDATER=1 - MOZ_THUNDERBIRD=1 - MOZ_CHROME_FILE_FORMAT=omni diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index e793f5924..d0820b8e5 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -28,20 +28,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" mozconfig replace-urls.txt vendor.js - makefile.patch - branding.patch - ${_pkgname}.desktop - Icedove-branding.patch) + ${_pkgname}.desktop) options=(!emptydirs) md5sums=('37a706e6b2c17049ab70739600ef47b0' '0524d248bd0e83fa62c261700640ac0d' '5cf95ea94f69cdd36604890cfbf7b954' 'a8fc4658d45b6bf9350023e5c3f34e56' '4eecc4fc5aafaf0da651a09eadc90bee' - 'c4ed43e85945e180a89cce03e45ec62c' - '126b1446212396c33220936c01d9592d' - 'e785e0c267f4435ae1a9aa0b03bcacfb' - 'ea5f7a06967f561d47d7e5c35b23de6f') + 'e785e0c267f4435ae1a9aa0b03bcacfb') prepare() { export DEBIAN_BUILD="comm-esr17" @@ -63,14 +57,24 @@ prepare() { install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png" done - # This patch has a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh. - rm -v debian/patches/debian-hacks/Icedove-branding.patch || true + # Fix orthographic issue ("Icdove" to "Icedove") in MOZ_APP_BASENAME line for confvars.sh. + sed -i 's|Icdove|Icedove|' debian/patches/debian-hacks/Icedove-branding.patch quilt push -av - patch -Np1 -i "${srcdir}/makefile.patch" # small fix - patch -Np1 -i "${srcdir}/branding.patch" # fixing branding - patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version + # Fix paths on makefile + sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/|topsrcdir = @top_srcdir@|; + s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; + s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; + ' mail/branding/icedove/Makefile.in + + sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/[.][.]|topsrcdir = @top_srcdir@|; + s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; + s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; + ' mail/branding/icedove/locales/Makefile.in + + # Fix branding + sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties} # Replace common URLs sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do diff --git a/libre/icedove-libre/branding.patch b/libre/icedove-libre/branding.patch deleted file mode 100644 index d84b8075a..000000000 --- a/libre/icedove-libre/branding.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd comm-release/mail/branding/icedove/locales/en-US/brand.dtd ---- comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd 2012-10-30 16:41:16.000000000 -0200 -+++ comm-release/mail/branding/icedove/locales/en-US/brand.dtd 2012-10-31 22:35:04.203666114 -0200 -@@ -1,4 +1,4 @@ - -- -- -+ -+ - -diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties comm-release/mail/branding/icedove/locales/en-US/brand.properties ---- comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties 2012-10-30 10:13:50.000000000 -0200 -+++ comm-release/mail/branding/icedove/locales/en-US/brand.properties 2012-10-31 22:35:14.786423732 -0200 -@@ -1,3 +1,3 @@ - brandShortName=Icedove --brandFullName=Icedove Mail/News --vendorShortName=Icedove -+brandFullName=Icedove -+vendorShortName=Mozilla diff --git a/libre/icedove-libre/libre.patch b/libre/icedove-libre/libre.patch deleted file mode 100644 index a6f23bdcd..000000000 --- a/libre/icedove-libre/libre.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Nur comm-esr17.orig/mail/app/profile/all-thunderbird.js comm-esr17/mail/app/profile/all-thunderbird.js ---- comm-esr17.orig/mail/app/profile/all-thunderbird.js 2013-05-18 18:46:27.290732014 -0300 -+++ comm-esr17/mail/app/profile/all-thunderbird.js 2013-05-18 18:10:57.239376924 -0300 -@@ -160,11 +160,11 @@ - // Preferences for AMO integration - pref("extensions.getAddons.cache.enabled", true); - pref("extensions.getAddons.maxResults", 15); --pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%"); --pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); --pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); --pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%"); -+pref("extensions.getAddons.get.url", "https://trisquel.info/browser-plain"); -+pref("extensions.getAddons.getWithPerformance.url", "https://trisquel.info/browser-plain"); -+pref("extensions.getAddons.search.browseURL", "https://trisquel.info/browser-plain"); -+pref("extensions.getAddons.search.url", "https://trisquel.info/browser-plain"); -+pref("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain"); - - // Blocklist preferences - pref("extensions.blocklist.enabled", true); -@@ -189,7 +189,7 @@ - pref("extensions.update.interval", 86400); // Check for updates to Extensions and - // Themes every day - --pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/"); -+pref("extensions.getMoreThemesURL", "https://trisquel.info/browser-plain"); - pref("extensions.dss.enabled", false); // Dynamic Skin Switching - pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next - -@@ -390,7 +390,7 @@ - - pref("spellchecker.dictionary", ""); - // Dictionary download preference --pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.com/%LOCALE%/thunderbird/dictionaries/"); -+pref("spellchecker.dictionaries.download.url", "https://trisquel.info/browser-plain"); - - // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular - // mail application without any user intervention. Possible values are: -@@ -747,9 +747,7 @@ - #endif - - // plugin finder service url --pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService. --php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS= --%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); -+pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%"); - - // By default we show an infobar message when pages require plugins the user has - // not installed, or are outdated. diff --git a/libre/icedove-libre/makefile.patch b/libre/icedove-libre/makefile.patch deleted file mode 100644 index 8f8137bec..000000000 --- a/libre/icedove-libre/makefile.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Nur comm-release.orig/mail/branding/icedove/Makefile.in comm-release/mail/branding/icedove/Makefile.in ---- comm-release.orig/mail/branding/icedove/Makefile.in 2012-04-18 15:42:15.000000000 -0300 -+++ comm-release/mail/branding/icedove/Makefile.in 2012-05-08 04:03:25.680643202 -0300 -@@ -38,11 +38,11 @@ - # Branding Makefile for Icedove branding - - DEPTH = ../../.. --topsrcdir = ../../../ -+topsrcdir = @top_srcdir@ - srcdir = @srcdir@ - VPATH = @srcdir@ - --include $(topsrcdir)/config/autoconf.mk -+include $(DEPTH)/config/autoconf.mk - - DIRS = \ - locales \ -@@ -50,7 +50,7 @@ - - PREF_JS_EXPORTS += $(srcdir)/thunderbird-branding.js - --include $(DEPTH)/config/rules.mk -+include $(topsrcdir)/config/rules.mk - - export:: - $(NSINSTALL) -D $(DIST)/branding -diff -Nur comm-release.orig/mail/branding/icedove/locales/Makefile.in comm-release/mail/branding/icedove/locales/Makefile.in ---- comm-release.orig/mail/branding/icedove/locales/Makefile.in 2012-04-18 15:42:15.000000000 -0300 -+++ comm-release/mail/branding/icedove/locales/Makefile.in 2012-05-08 05:32:57.481620942 -0300 -@@ -36,13 +36,13 @@ - # ***** END LICENSE BLOCK ***** - - DEPTH = ../../../.. --topsrcdir = ../../../.. -+topsrcdir = @top_srcdir@ - srcdir = @srcdir@ - VPATH = @srcdir@ - relativesrcdir = mail/branding/icedove/locales - --include $(topsrcdir)/config/autoconf.mk -+include $(DEPTH)/config/autoconf.mk - - DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID) - --include $(DEPTH)/config/rules.mk -+include $(topsrcdir)/config/rules.mk diff --git a/pcr/asterisk/PKGBUILD b/pcr/asterisk/PKGBUILD new file mode 100644 index 000000000..01bc1ae6e --- /dev/null +++ b/pcr/asterisk/PKGBUILD @@ -0,0 +1,95 @@ +# Maintainer : Xavier Devlamynck +# Contributor: Alessio Biancalana +# Contributor: Maik Broemme + +pkgname=asterisk +pkgver=11.5.0 +pkgrel=2 +pkgdesc="A complete PBX solution" +arch=('i686' 'x86_64') +backup=('etc/asterisk/acl.conf' 'etc/asterisk/adsi.conf' +'etc/asterisk/agents.conf' 'etc/asterisk/alarmreceiver.conf' +'etc/asterisk/alsa.conf' 'etc/asterisk/amd.conf' +'etc/asterisk/app_mysql.conf' 'etc/asterisk/app_skel.conf' +'etc/asterisk/asterisk.conf' 'etc/asterisk/calendar.conf' +'etc/asterisk/ccss.conf' 'etc/asterisk/cdr.conf' +'etc/asterisk/cdr_adaptive_odbc.conf' 'etc/asterisk/cdr_custom.conf' +'etc/asterisk/cdr_manager.conf' 'etc/asterisk/cdr_mysql.conf' +'etc/asterisk/cdr_odbc.conf' 'etc/asterisk/cdr_pgsql.conf' +'etc/asterisk/cdr_sqlite3_custom.conf' 'etc/asterisk/cdr_syslog.conf' +'etc/asterisk/cdr_tds.conf' 'etc/asterisk/cel.conf' +'etc/asterisk/cel_custom.conf' 'etc/asterisk/cel_odbc.conf' +'etc/asterisk/cel_pgsql.conf' 'etc/asterisk/cel_sqlite3_custom.conf' +'etc/asterisk/cel_tds.conf' 'etc/asterisk/chan_dahdi.conf' +'etc/asterisk/chan_mobile.conf' 'etc/asterisk/cli.conf' +'etc/asterisk/cli_aliases.conf' 'etc/asterisk/cli_permissions.conf' +'etc/asterisk/codecs.conf' 'etc/asterisk/confbridge.conf' +'etc/asterisk/config_test.conf' 'etc/asterisk/console.conf' +'etc/asterisk/dbsep.conf' 'etc/asterisk/dnsmgr.conf' +'etc/asterisk/dsp.conf' 'etc/asterisk/dundi.conf' +'etc/asterisk/enum.conf' 'etc/asterisk/extconfig.conf' +'etc/asterisk/extensions.conf' 'etc/asterisk/extensions_minivm.conf' +'etc/asterisk/features.conf' 'etc/asterisk/festival.conf' +'etc/asterisk/followme.conf' 'etc/asterisk/func_odbc.conf' +'etc/asterisk/gtalk.conf' 'etc/asterisk/h323.conf' +'etc/asterisk/http.conf' 'etc/asterisk/iax.conf' +'etc/asterisk/iaxprov.conf' 'etc/asterisk/indications.conf' +'etc/asterisk/jabber.conf' 'etc/asterisk/jingle.conf' +'etc/asterisk/logger.conf' 'etc/asterisk/manager.conf' +'etc/asterisk/meetme.conf' 'etc/asterisk/mgcp.conf' +'etc/asterisk/minivm.conf' 'etc/asterisk/misdn.conf' +'etc/asterisk/modules.conf' 'etc/asterisk/motif.conf' +'etc/asterisk/musiconhold.conf' 'etc/asterisk/muted.conf' +'etc/asterisk/ooh323.conf' 'etc/asterisk/osp.conf' +'etc/asterisk/oss.conf' 'etc/asterisk/phone.conf' +'etc/asterisk/phoneprov.conf' 'etc/asterisk/queuerules.conf' +'etc/asterisk/queues.conf' 'etc/asterisk/res_config_mysql.conf' +'etc/asterisk/res_config_sqlite.conf' +'etc/asterisk/res_config_sqlite3.conf' 'etc/asterisk/res_corosync.conf' +'etc/asterisk/res_curl.conf' 'etc/asterisk/res_fax.conf' +'etc/asterisk/res_ldap.conf' 'etc/asterisk/res_odbc.conf' +'etc/asterisk/res_pgsql.conf' 'etc/asterisk/res_pktccops.conf' +'etc/asterisk/res_snmp.conf' 'etc/asterisk/res_stun_monitor.conf' +'etc/asterisk/rtp.conf' 'etc/asterisk/say.conf' 'etc/asterisk/sip.conf' +'etc/asterisk/sip_notify.conf' 'etc/asterisk/skinny.conf' +'etc/asterisk/sla.conf' 'etc/asterisk/smdi.conf' +'etc/asterisk/udptl.conf' 'etc/asterisk/unistim.conf' +'etc/asterisk/users.conf' 'etc/asterisk/voicemail.conf' +'etc/asterisk/vpb.conf' 'etc/asterisk/xmpp.conf') +url="http://www.asterisk.org" +license=('GPL') +depends=('alsa-lib' 'speex' 'popt' 'libvorbis' 'curl') +makedepends=('postgresql' 'unixodbc' 'sqlite3') +optdepends=('libpri' 'libss7' 'openr2' 'iksemel' 'radiusclient-ng' 'dahdi') +source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-${pkgver}.tar.gz \ + ${pkgname}.service \ + ${pkgname}.logrotated \ + ${pkgname}.tmpfile) +install=${pkgname}.install +sha256sums=('a82c1ddd9fb1d98f0dab6e0255a127fb7c7eaa687b3d515182458244062b4194' + '74e0b278d553499f0c648a6e3d55c0dbb11b0c6dc93a85b020a21eafadb83783' + 'caa24cfec5c6b4f8cea385269e39557362acad7e2a552994c3bc24080e3bdd4e' + '673c0c55bce8068c297f9cdd389402c2d5d5a25e2cf84732cb071198bd6fa78a') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin + make +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} samples + + sed -i -e "s/\/var\/run/\/run/" ${pkgdir}/etc/asterisk/asterisk.conf + + mkdir -p ${pkgdir}/usr/share/doc/asterisk/examples + for i in ${pkgdir}/etc/asterisk/*; do install -D -m 644 $i ${pkgdir}/usr/share/doc/asterisk/examples/; done + + mv ${pkgdir}/var/run ${pkgdir} + + install -D -m 644 ${srcdir}/asterisk.logrotated ${pkgdir}/etc/logrotate.d/asterisk + install -D -m 644 ${srcdir}/asterisk.service ${pkgdir}/usr/lib/systemd/system/asterisk.service + install -D -m 644 ${srcdir}/asterisk.tmpfile ${pkgdir}/usr/lib/tmpfiles.d/asterisk.conf + } diff --git a/pcr/asterisk/asterisk.install b/pcr/asterisk/asterisk.install new file mode 100644 index 000000000..b7c1a71f7 --- /dev/null +++ b/pcr/asterisk/asterisk.install @@ -0,0 +1,15 @@ +post_install() { + groupadd -r asterisk + useradd -MNr -s /bin/false -d /run/asterisk -g asterisk asterisk && passwd -l asterisk &>/dev/null + + chown -R asterisk:asterisk /etc/asterisk + chown -R asterisk:asterisk /var/lib/asterisk + chown -R asterisk:asterisk /var/log/asterisk + chown -R asterisk:asterisk /run/asterisk + chown -R asterisk:asterisk /var/spool/asterisk +} + +post_remove() { + userdel asterisk &>/dev/null + groupdel asterisk &>/dev/null +} diff --git a/pcr/asterisk/asterisk.logrotated b/pcr/asterisk/asterisk.logrotated new file mode 100644 index 000000000..f03d0acd3 --- /dev/null +++ b/pcr/asterisk/asterisk.logrotated @@ -0,0 +1,10 @@ +/var/log/asterisk/*_log /var/log/asterisk/messages { + create 640 asterisk asterisk + compress + missingok + notifempty + postrotate + /usr/sbin/asterisk -rx "logger reload" 1>/dev/null || true + endscript +} + diff --git a/pcr/asterisk/asterisk.service b/pcr/asterisk/asterisk.service new file mode 100644 index 000000000..789a1adda --- /dev/null +++ b/pcr/asterisk/asterisk.service @@ -0,0 +1,20 @@ +[Unit] +Description=Asterisk PBX and telephony daemon +Documentation=man:asterisk(8) +Wants=network.target +After=network.target + +[Service] +Type=simple +User=asterisk +Group=asterisk +ExecStart=/usr/bin/asterisk -f -C /etc/asterisk/asterisk.conf +ExecStop=/usr/bin/asterisk -rx 'core stop now' +ExecReload=/usr/bin/asterisk -rx 'core reload' + +# safe_asterisk emulation +Restart=always +RestartSec=10 + +[Install] +WantedBy=multi-user.target diff --git a/pcr/asterisk/asterisk.tmpfile b/pcr/asterisk/asterisk.tmpfile new file mode 100644 index 000000000..6f1042e8a --- /dev/null +++ b/pcr/asterisk/asterisk.tmpfile @@ -0,0 +1 @@ +d /run/asterisk 0755 asterisk asterisk - diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index ac73b6637..b3ce5f4f4 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.08.17 +pkgver=2013.08.22 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -14,7 +14,7 @@ license=('custom') depends=('python') makedepends=('python-distribute') source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('3fd78626b19ac128f15f1bbfee578011' +md5sums=('ec5a15c938496f7654a25a6b181d0b89' 'SKIP') prepare() { diff --git a/social/asterisk/PKGBUILD b/social/asterisk/PKGBUILD deleted file mode 100644 index fe8204d0a..000000000 --- a/social/asterisk/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Contributor: Alessio Biancalana - -pkgname=asterisk -pkgver=11.0.1 -pkgrel=1 -pkgdesc="A complete PBX solution" -arch=('i686' 'x86_64') -url="http://www.asterisk.org" -license=('GPL') -depends=('alsa-lib' 'speex' 'popt' 'libvorbis' 'curl') -makedepends=('postgresql' 'unixodbc' 'sqlite3') -optdepends=('libpri' 'libss7' 'openr2' 'iksemel') -backup=(etc/asterisk/asterisk.conf) -source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$pkgver.tar.gz \ - asterisk \ - asterisk.logrotated) -install=$pkgname.install -md5sums=('3e80a5cef7b0f8808578efcc84c39fd7' - '59146273738605f1e011d8e7bed3561a' - '486e07a0a1405ea25ec5b1736034653e') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make || return 1 -} - -package(){ - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - make DESTDIR=${pkgdir} samples || return 1 - - (cd ${pkgdir}/etc/asterisk -# for i in `ls`; do [ $i = "asterisk.conf" ] || mv $i $i.default; done -ls -I asterisk.conf | xargs -I '{}' mv '{}' '{}.default') -# cp ${srcdir}/modules.conf modules.conf - sed -i -e "s/\/var\/run/\/var\/run\/asterisk/" $startdir/pkg/etc/asterisk/asterisk.conf - - install -D -m 755 ${srcdir}/asterisk ${pkgdir}/etc/rc.d/asterisk - install -D -m 644 ${srcdir}/asterisk.logrotated ${pkgdir}/etc/logrotate.d/asterisk - } diff --git a/social/asterisk/asterisk b/social/asterisk/asterisk deleted file mode 100644 index f823caefc..000000000 --- a/social/asterisk/asterisk +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/asterisk` -case "$1" in - start) - stat_busy "Starting Asterisk" - [ -z "$PID" ] && cd /var/lib/asterisk && /usr/sbin/asterisk -G asterisk -U asterisk - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon asterisk - stat_done - fi - ;; - stop) - stat_busy "Stopping Asterisk" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/asterisk/asterisk.pid &>/dev/null - rm_daemon asterisk - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/social/asterisk/asterisk.install b/social/asterisk/asterisk.install deleted file mode 100644 index 1a3b998b7..000000000 --- a/social/asterisk/asterisk.install +++ /dev/null @@ -1,38 +0,0 @@ -post_install() { - echo -n "adding asterisk system group... " - groupadd -g 5060 asterisk && echo "done." - echo -n "adding asterisk system user... " - useradd -c "Asterisk daemon" -u 5060 -d /var/lib/asterisk -g asterisk -s /bin/false asterisk \ - && echo "done." - passwd -l asterisk &>/dev/null - chown -R asterisk:asterisk /var/run/asterisk - chown -R asterisk:asterisk /var/log/asterisk - chown -R asterisk:asterisk /var/spool/asterisk - chown -R asterisk:asterisk /var/lib/asterisk - -cat << EOF ->>> ->>> To get Music on Hold working do pacman -S mpg123 ->>> To get the postgresql, unixodbc or sqlite2 modules working ->>> download the respective package and modify modules.conf to reflect ->>> your changes. ->>> -EOF - -} - -post_upgrade() { - if grep asterisk /etc/passwd &>/dev/null; then - /bin/true - else - post_install $1 - fi -} - -post_remove() { - echo -n -e "\nremoving asterisk system user... " - userdel asterisk && echo "done." -} -op=$1 -shift -$op $* diff --git a/social/asterisk/asterisk.logrotated b/social/asterisk/asterisk.logrotated deleted file mode 100644 index f03d0acd3..000000000 --- a/social/asterisk/asterisk.logrotated +++ /dev/null @@ -1,10 +0,0 @@ -/var/log/asterisk/*_log /var/log/asterisk/messages { - create 640 asterisk asterisk - compress - missingok - notifempty - postrotate - /usr/sbin/asterisk -rx "logger reload" 1>/dev/null || true - endscript -} - -- cgit v1.2.3-54-g00ecf