diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-30 03:50:48 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-30 03:50:48 +0000 |
| commit | b1688d0edf774882b5231e199ac1431a9cc8d4ac (patch) | |
| tree | 5de89a1c0938fc9686cbdef5bfd5db19c823410b | |
| parent | 88f9886de50562f083fa45359821567b0a880ea0 (diff) | |
Wed Apr 30 03:41:39 UTC 2014
24 files changed, 1078 insertions, 198 deletions
diff --git a/community/ganv/PKGBUILD b/community/ganv/PKGBUILD new file mode 100644 index 000000000..b0878d808 --- /dev/null +++ b/community/ganv/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 110433 2014-04-29 14:48:41Z speps $ +# Maintainer: speps <speps at aur dot archlinux dot org> + +pkgname=ganv +pkgver=1.4.0 +pkgrel=1 +pkgdesc="An interactive Gtkmm canvas widget for graph-based interfaces" +arch=('i686' 'x86_64') +url="http://drobilla.net/software/$pkgname/" +license=('GPL3') +depends=('gtkmm' 'graphviz') +makedepends=('python2') +source=("http://download.drobilla.net/ganv-$pkgver.tar.bz2") +md5sums=('a72fdabc57959cc32065e66b48fea6aa') + +prepare() { + cd $pkgname-$pkgver + + # strip ldconfig + sed -i '/ldconfig/d' wscript +} + +build() { + cd $pkgname-$pkgver + python2 waf configure --prefix=/usr + python2 waf $MAKEFLAGS +} + +package() { + cd $pkgname-$pkgver + python2 waf install --destdir="$pkgdir" +} diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD index ec91fe41b..5a8276061 100644 --- a/community/gtkwave/PKGBUILD +++ b/community/gtkwave/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100853 2013-11-12 01:40:23Z kkeen $ +# $Id: PKGBUILD 110407 2014-04-29 09:42:25Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Jared Casper <jaredcasper@gmail.com> pkgname=gtkwave -pkgver=3.3.52 +pkgver=3.3.59 pkgrel=1 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2') makedepends=('gperf') install='gtkwave.install' source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz") -md5sums=('1a7b7fbfede6f1f91fe26845b3b36f48') +md5sums=('e23a5c5e287a5414173c715a92a104f5') build() { cd "${srcdir}/gtkwave-${pkgver}" @@ -33,7 +33,5 @@ package() { install -D -m644 "${srcdir}/gtkwave-${pkgver}/LICENSE.TXT" \ "${pkgdir}/usr/share/licenses/gtkwave/LICENSE.TXT" - install -D -m644 "${srcdir}/gtkwave-${pkgver}/MIT.TXT" \ - "${pkgdir}/usr/share/licenses/gtkwave/MIT.TXT" } diff --git a/community/gtkwave/gtkwave.install b/community/gtkwave/gtkwave.install index bc2e66b0d..8c6cae382 100644 --- a/community/gtkwave/gtkwave.install +++ b/community/gtkwave/gtkwave.install @@ -3,4 +3,8 @@ post_install() { echo 'your home directory (as .gtkwaverc) or to your VCD project directory.' echo 'It contains the prefs for a good configuration that most people find' echo 'ergonomic. It is not strictly necessary however.' + _desktop $1 } + +# desktop-file-utils breaks the build, so no update-desktop-database here + diff --git a/community/libxnvctrl/10_libxnvctrl_so_0.diff b/community/libxnvctrl/10_libxnvctrl_so_0.diff deleted file mode 100644 index 02673675a..000000000 --- a/community/libxnvctrl/10_libxnvctrl_so_0.diff +++ /dev/null @@ -1,55 +0,0 @@ -Author: Andreas Beckmann <debian@abeckmann.de> -Description: build a shared library for libXNVCtrl -Bug-Debian: http://bugs.debian.org/666909 - ---- a/src/Makefile -+++ b/src/Makefile -@@ -79,6 +79,9 @@ - - XNVCTRL_DIR ?= libXNVCtrl - XNVCTRL_ARCHIVE ?= $(XNVCTRL_DIR)/libXNVCtrl.a -+XNVCTRL_SHARED ?= $(XNVCTRL_DIR)/libXNVCtrl.so.0 -+#XNVCTRL_LIB ?= $(XNVCTRL_ARCHIVE) -+XNVCTRL_LIB ?= $(XNVCTRL_SHARED) - XCONFIG_PARSER_DIR ?= XF86Config-parser - COMMON_UTILS_DIR ?= common-utils - COMMON_UNIX_DIR ?= common-unix -@@ -179,9 +182,12 @@ - $(MKDIR) $(BINDIR) - $(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<) - --$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE) -+$(XNVCTRL_ARCHIVE) $(XNVCTRL_SHARED): -+ $(MAKE) -C $(XNVCTRL_DIR) -+ -+$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_LIB) - $(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) -o $@ $(OBJS) \ -- $(XNVCTRL_ARCHIVE) $(LIBS) -+ $(XNVCTRL_LIB) $(LIBS) - $(call quiet_cmd,STRIP_CMD) $@ - - # define the rule to build each object file ---- a/src/libXNVCtrl/Makefile -+++ b/src/libXNVCtrl/Makefile -@@ -22,12 +22,21 @@ - RANLIB ?= ranlib - CFLAGS += -fPIC - -+all: libXNVCtrl.a libXNVCtrl.so -+ - libXNVCtrl.a : libXNVCtrl.a(NVCtrl.o) - $(RANLIB) $@ - -+libXNVCtrl.so: NVCtrl.o -+ $(RM) $@ $@.* -+ $(CC) -shared -Wl,-soname=$@.0 -o $@.0.0.0 $(LDFLAGS) $^ -lXext -lX11 -+ ln -s $@.0.0.0 $@.0 -+ ln -s $@.0 $@ -+ - NVCtrl.o : NVCtrl.h nv_control.h NVCtrlLib.h - .INTERMEDIATE: NVCtrl.o - - clean :: - rm -f libXNVCtrl.a *.o -+ rm -f libXNVCtrl.so libXNVCtrl.so.* - .PHONY: clean diff --git a/community/libxnvctrl/PKGBUILD b/community/libxnvctrl/PKGBUILD index c78076a5a..f3ab2fa93 100644 --- a/community/libxnvctrl/PKGBUILD +++ b/community/libxnvctrl/PKGBUILD @@ -1,23 +1,17 @@ -# $Id: PKGBUILD 106469 2014-03-04 03:23:58Z svenstaro $ +# $Id: PKGBUILD 110422 2014-04-29 12:32:52Z flexiondotorg $ # Maintainer: Martin Wimpress <code@flexion.org> pkgname=libxnvctrl -pkgver=334.21 +pkgver=337.12 pkgrel=1 pkgdesc="NVIDIA X Ctrl library" arch=('i686' 'x86_64') url="http://www.nvidia.com/" license=('GPL2') -depends=('libxext') -source=("http://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${pkgver}.tar.bz2" - "10_libxnvctrl_so_0.diff") -sha1sums=('eb2ec2257a0401c3c6494f31160d0fa378f638d8' - '84146494a08d4b691e2cff84d1551210eee584dd') - -prepare() { - cd "nvidia-settings-$pkgver" - patch -Np1 -i "${srcdir}/10_libxnvctrl_so_0.diff" -} +makedepends=('libxext') +options=('staticlibs') +source=("http://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${pkgver}.tar.bz2") +sha1sums=('d416d8f629576a821f4829d592eda84304e4f743') build() { cd "nvidia-settings-$pkgver/src/libXNVCtrl" @@ -30,8 +24,5 @@ package() { # install libXNVCtrl and headers install -d -m 755 "$pkgdir"/usr/{include/NVCtrl,lib} install -m 644 nv_control.h NVCtrl{,Lib}.h "$pkgdir"/usr/include/NVCtrl/ - install -m 644 libXNVCtrl.so.0.0.0 "$pkgdir"/usr/lib/ - cd "$pkgdir"/usr/lib/ - ln -s libXNVCtrl.so.0.0.0 libXNVCtrl.so.0 - ln -s libXNVCtrl.so.0 libXNVCtrl.so + install -m 644 libXNVCtrl.a "$pkgdir"/usr/lib/libXNVCtrl.a } diff --git a/community/mate-sensors-applet/PKGBUILD b/community/mate-sensors-applet/PKGBUILD index 469c31289..81ac144eb 100644 --- a/community/mate-sensors-applet/PKGBUILD +++ b/community/mate-sensors-applet/PKGBUILD @@ -2,7 +2,7 @@ pkgname=mate-sensors-applet pkgver=1.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="A MATE Panel applet to display readings from hardware sensors, including CPU temperature, fan speeds and voltage readings." url="http://mate-desktop.org" arch=('i686' 'x86_64') @@ -10,7 +10,6 @@ license=('GPL') depends=('dbus' 'gtk2' 'libatasmart' 'libnotify' 'libxnvctrl' 'lm_sensors' 'mate-panel') makedepends=('docbook-xml' 'mate-common' 'perl-xml-parser' 'rarian' 'yelp-tools') optdepends=('yelp: for reading MATE help documents') -options=('!emptydirs') groups=('mate-extra') source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz") sha1sums=('0526400ad88b306fc74b2e219ce4aea34476577f') diff --git a/community/nsgenbind/PKGBUILD b/community/nsgenbind/PKGBUILD new file mode 100644 index 000000000..870ea6880 --- /dev/null +++ b/community/nsgenbind/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 110418 2014-04-29 12:09:34Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Marian Buschsieweke <mari.hahn@uni-muenster.de> + +pkgname=nsgenbind +pkgver=0.1.0 +pkgrel=1 +pkgdesc='NetSurf javascript binding generator' +arch=('x86_64' 'i686') +url='http://www.netsurf-browser.org/' +license=('GPL') +makedepends=('netsurf-buildsystem' 'git') +source=("git://git.netsurf-browser.org/nsgenbind.git#tag=release/$pkgver") +md5sums=('SKIP') + +build() { + make -C "$pkgname" PREFIX=/usr +} + +package() { + make -C "$pkgname" install PREFIX=/usr DESTDIR="$pkgdir" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/openocd/PKGBUILD b/community/openocd/PKGBUILD index 6e39f7404..3426a80fd 100644 --- a/community/openocd/PKGBUILD +++ b/community/openocd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110348 2014-04-28 09:59:02Z spupykin $ +# $Id: PKGBUILD 110413 2014-04-29 11:44:51Z spupykin $ # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Matthias Bauch <matthias.bauch@gmail.com> # Contributor: Laszlo Papp <djszapi2 at gmail com> @@ -6,7 +6,8 @@ pkgname=openocd pkgver=0.8.0 -pkgrel=1 +epoch=1 +pkgrel=2 pkgdesc='Debugging, in-system programming and boundary-scan testing for embedded target devices' arch=('i686' 'x86_64') url='http://openocd.berlios.de' diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index 12a8e9549..0354da8c7 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 107076 2014-03-12 10:55:52Z spupykin $ +# $Id: PKGBUILD 110409 2014-04-29 11:37:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=passenger -pkgver=4.0.38 +pkgver=4.0.41 pkgrel=1 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('apache') install=passenger.install options=('!emptydirs' 'staticlibs') source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz) -md5sums=('ec6cb96a8f3d444540a54a3007143e2e') +md5sums=('ce2b669c498457cf385d250eea43b055') prepare() { cd $srcdir/passenger-release-$pkgver diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index fb1a4db8a..6e60d2d76 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,24 +1,17 @@ -# $Id: PKGBUILD 108288 2014-03-26 08:08:00Z mtorromeo $ +# $Id: PKGBUILD 110430 2014-04-29 14:03:28Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> -pkgname=percona-server +pkgbase=percona-server +pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server') pkgver=5.6.16_64.2 -pkgrel=1 -pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" +_pkgver=${pkgver/_/-} +_myver=${pkgver/_rel*} +pkgrel=3 arch=('i686' 'x86_64') - -depends=('mariadb-clients' 'libaio' 'systemd-tools') -conflicts=('mysql') -provides=("mysql=${pkgver/_rel*}" "mariadb=${pkgver/_rel*}") -optdepends=('perl-dbi' 'perl-dbd-mysql') -makedepends=('cmake' 'openssl' 'zlib') - +makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'systemd-tools') license=('GPL') url="http://www.percona.com/software/percona-server/" -options=('emptydirs') -backup=('etc/mysql/my.cnf') -install=percona.install -source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_/-}/source/tarball/percona-server-${pkgver/_/-}.tar.gz" +source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz" 'mysqld-post.sh' 'mysqld.service' 'mysqld-tmpfile.conf' @@ -26,20 +19,19 @@ source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona- 'mysql56-bison3.patch') prepare() { - cd "$srcdir/percona-server-${pkgver/_/-}" - patch -p0 -i "$srcdir/mysql56-bufsize.patch" - patch -p1 -i "$srcdir/mysql56-bison3.patch" + cd $pkgbase-$_pkgver + patch -p0 -i ../mysql56-bufsize.patch + patch -p1 -i ../mysql56-bison3.patch rm -v sql/sql_yacc.{cc,h} } build() { - cd "${srcdir}" rm -rf build mkdir build cd build - cmake "${srcdir}/percona-server-${pkgver/_/-}" \ + cmake ../$pkgbase-$_pkgver \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ @@ -58,12 +50,11 @@ build() { -DINSTALL_MYSQLSHAREDIR=share/mysql \ -DINSTALL_DOCDIR=share/mysql/docs \ -DINSTALL_SHAREDIR=share/mysql \ - -DWITH_READLINE=ON \ -DWITH_ZLIB=system \ -DWITH_SSL=system \ -DWITH_LIBWRAP=OFF \ - -DWITH_LIBEDIT=OFF \ -DWITH_UNIT_TESTS=OFF \ + -DWITH_PAM=ON \ -DWITH_EXTRA_CHARSETS=complex \ -DWITH_EMBEDDED_SERVER=ON \ -DWITH_INNODB_MEMCACHED=ON \ @@ -81,28 +72,65 @@ build() { make } -package() { - cd "${srcdir}"/build - make DESTDIR=${pkgdir} install +package_libperconaserverclient() { + pkgdesc='Percona Server client libraries' + depends=('openssl') + + cd build/libmysql + make DESTDIR="$pkgdir" install +} + +package_percona-server-clients() { + pkgdesc='Percona Server client tools' + depends=('libperconaserverclient' 'zlib') + conflicts=('mysql-clients') + provides=("mysql-clients=$_myver" "mariadb-clients=$_myver") + + cd build + make -C client DESTDIR="$pkgdir" install + + # install man pages + install -d "$pkgdir"/usr/share/man/man1 + for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do + install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 + done + + # provided by percona-server + rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest,mysql_config_editor} +} + +package_percona-server() { + pkgdesc='A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation' + backup=('etc/mysql/my.cnf') + install=percona.install + depends=('percona-server-clients' 'libaio' 'systemd-tools' 'pam') + optdepends=('perl-dbd-mysql') + conflicts=('mysql') + provides=("mysql=$_myver" "mariadb=$_myver") + options=('emptydirs') + + cd build + make DESTDIR="$pkgdir" install - install -Dm644 "${pkgdir}"/usr/share/mysql/my-default.cnf "${pkgdir}"/etc/mysql/my.cnf - install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post - install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf - install -Dm644 "${srcdir}"/mysqld.service "${pkgdir}"/usr/lib/systemd/system/mysqld.service + install -Dm644 "$pkgdir"/usr/share/mysql/my-default.cnf "$pkgdir"/etc/mysql/my.cnf + install -Dm755 ../mysqld-post.sh "$pkgdir"/usr/bin/mysqld-post + install -Dm644 ../mysqld.service "$pkgdir"/usr/lib/systemd/system/mysqld.service + install -Dm644 ../mysqld-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysqld.conf - # provided by libmysqlclient - rm ${pkgdir}/usr/bin/mysql_config - rm ${pkgdir}/usr/lib/lib{mysql,perconaserver}* - rm -r ${pkgdir}/usr/include/ - rm ${pkgdir}/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 + # provided by libperconaserverclient + cd "$pkgdir" + rm usr/bin/mysql_config + rm usr/lib/lib{mysql,perconaserver}* + rm -r usr/include/ + rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 - # provided by mysql-clients - rm ${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} - rm ${pkgdir}/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 + # provided by percona-server-clients + rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} + rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 # not needed - rm -r ${pkgdir}/usr/{data,mysql-test,sql-bench} - rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 + rm -r usr/{data,mysql-test,sql-bench} + rm usr/share/man/man1/mysql-test-run.pl.1 } sha256sums=('841eb00ac9178c56f37ef621742ffe4ca43867637236f061321bafc7e64d8e8d' diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index 42d8fe7af..9aa4bc195 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101662 2013-11-29 20:55:41Z spupykin $ +# $Id: PKGBUILD 110411 2014-04-29 11:37:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=recoll -pkgver=1.19.11_p1 +pkgver=1.19.12 pkgrel=1 pkgdesc="Full text search tool based on Xapian backend" arch=('i686' 'x86_64') @@ -31,7 +31,7 @@ optdepends=('libxslt: for XML based formats (fb2,etc)' 'aspell-en: English stemming support') install=recoll.install source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-${pkgver/_/}.tar.gz") -md5sums=('5d77a74cddba4e21f7f3bb06ad20a7ac') +md5sums=('5f688d48a574c142bb7e9c6606b5c6f6') build() { cd "$srcdir/$pkgname-${pkgver/_/}" diff --git a/community/subsurface/PKGBUILD b/community/subsurface/PKGBUILD index 53fb2697e..1958aa039 100644 --- a/community/subsurface/PKGBUILD +++ b/community/subsurface/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 108147 2014-03-24 00:57:29Z bisson $ +# $Id: PKGBUILD 110440 2014-04-29 20:46:26Z bisson $ # Contributor: Francois Boulogne <fboulogne at april dot org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=subsurface _pkgname=Subsurface pkgver=4.0.3 -pkgrel=1 +pkgrel=2 pkgdesc='Divelog program' url='http://subsurface.hohndel.org/' license=('GPL2') diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index 71a22453a..81e6d9b4f 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 210417 2014-04-14 20:05:53Z jgc $ +# $Id: PKGBUILD 211907 2014-04-29 12:38:44Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=claws-mail pkgver=3.9.3 -pkgrel=3 +pkgrel=4 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64') license=('GPL3') @@ -34,13 +34,28 @@ replaces=('sylpheed-claws' 'claws-mail-extra-plugins') conflicts=('claws-mail-extra-plugins') provides=('claws') install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2{,.asc}) +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2{,.asc} + claws-ssl-1.patch + claws-ssl-2.patch + claws-ssl-3.patch) md5sums=('0158b5e6b6d6866f9a75fd288a4edf04' - 'SKIP') + 'SKIP' + '02e5fc5dba976208dfabf23d7666681d' + 'dd53ff284cf802ef639bf92fac996d12' + 'e8c2ce77c8df7a2c514a4547337304d8') -build() { +prepare() { cd ${pkgname}-${pkgver} + # fix ssl certificate verification with libetpan >= 1.4 + patch -Np1 < ${srcdir}/claws-ssl-1.patch + patch -Np1 < ${srcdir}/claws-ssl-2.patch + patch -Np1 < ${srcdir}/claws-ssl-3.patch + autoreconf -vfi +} +build() { + cd ${pkgname}-${pkgver} + # fixes for python2 export PYTHON="/usr/bin/python2" sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py diff --git a/extra/claws-mail/claws-ssl-1.patch b/extra/claws-mail/claws-ssl-1.patch new file mode 100644 index 000000000..941a66ac2 --- /dev/null +++ b/extra/claws-mail/claws-ssl-1.patch @@ -0,0 +1,494 @@ +From 35da14ea91d4d32527fbe3293d2ffd26cd642710 Mon Sep 17 00:00:00 2001 +From: Nepu User <nepu@localhost.localdomain> +Date: Sun, 27 Apr 2014 14:50:36 +0200 +Subject: [PATCH 1/3] upstream commit b0c17cd08e482dbda407dabdc952dfcf5d8fdb6e + +--- + src/etpan/Makefile.am | 6 ++- + src/etpan/etpan-ssl.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/etpan/etpan-ssl.h | 40 ++++++++++++++++ + src/etpan/imap-thread.c | 96 +++----------------------------------- + src/etpan/nntp-thread.c | 83 ++------------------------------- + 5 files changed, 175 insertions(+), 171 deletions(-) + create mode 100644 src/etpan/etpan-ssl.c + create mode 100644 src/etpan/etpan-ssl.h + +diff --git a/src/etpan/Makefile.am b/src/etpan/Makefile.am +index b4bfe62..eb343b2 100644 +--- a/src/etpan/Makefile.am ++++ b/src/etpan/Makefile.am +@@ -5,7 +5,8 @@ noinst_LTLIBRARIES = libclawsetpan.la + libclawsetpan_la_SOURCES = \ + etpan-thread-manager.c \ + imap-thread.c \ +- nntp-thread.c ++ nntp-thread.c \ ++ etpan-ssl.c + + clawsetpanincludedir = $(pkgincludedir)/etpan + clawsetpaninclude_HEADERS = \ +@@ -13,7 +14,8 @@ clawsetpaninclude_HEADERS = \ + etpan-thread-manager.h \ + etpan-errors.h \ + imap-thread.h \ +- nntp-thread.h ++ nntp-thread.h \ ++ etpan-ssl.h + + INCLUDES = \ + -I$(top_srcdir)/src \ +diff --git a/src/etpan/etpan-ssl.c b/src/etpan/etpan-ssl.c +new file mode 100644 +index 0000000..6642e40 +--- /dev/null ++++ b/src/etpan/etpan-ssl.c +@@ -0,0 +1,121 @@ ++/* ++ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client ++ * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> ++ * and the Claws Mail team ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ * ++ */ ++ ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#include "claws-features.h" ++#endif ++ ++#ifdef USE_GNUTLS ++#ifdef HAVE_LIBETPAN ++#include <libetpan/libetpan.h> ++#include <gnutls/gnutls.h> ++#include <gnutls/x509.h> ++#include <stdlib.h> ++#include <glib.h> ++#include <glib/gi18n.h> ++#include <errno.h> ++ ++#include "ssl_certificate.h" ++#include "utils.h" ++#include "log.h" ++#include "prefs_account.h" ++ ++gboolean etpan_certificate_check(mailstream *stream, const char *host, gint port) ++{ ++ unsigned char *cert_der = NULL; ++ int len; ++ gnutls_x509_crt_t cert = NULL; ++ gnutls_datum_t tmp; ++ ++ if (stream == NULL) ++ return FALSE; ++ ++ len = (int)mailstream_ssl_get_certificate(stream, &cert_der); ++ ++ if (cert_der == NULL || len < 0) { ++ g_warning("no cert presented.\n"); ++ return FALSE; ++ } ++ ++ tmp.data = malloc(len); ++ memcpy(tmp.data, cert_der, len); ++ tmp.size = len; ++ gnutls_x509_crt_init(&cert); ++ ++ free(cert_der); ++ ++ if (gnutls_x509_crt_import(cert, &tmp, GNUTLS_X509_FMT_DER) < 0) { ++ free(tmp.data); ++ g_warning("IMAP: can't get cert\n"); ++ return FALSE; ++ } else if (ssl_certificate_check(cert, (guint)-1, host, port) == TRUE) { ++ free(tmp.data); ++ gnutls_x509_crt_deinit(cert); ++ return TRUE; ++ } else { ++ free(tmp.data); ++ gnutls_x509_crt_deinit(cert); ++ return FALSE; ++ } ++} ++ ++void etpan_connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context, void * data) ++{ ++ PrefsAccount *account = (PrefsAccount *)data; ++ const gchar *cert_path = NULL; ++ const gchar *password = NULL; ++ gnutls_x509_crt_t x509 = NULL; ++ gnutls_x509_privkey_t pkey = NULL; ++ ++ if (account->in_ssl_client_cert_file && *account->in_ssl_client_cert_file) ++ cert_path = account->in_ssl_client_cert_file; ++ if (account->in_ssl_client_cert_pass && *account->in_ssl_client_cert_pass) ++ password = account->in_ssl_client_cert_pass; ++ ++ if (mailstream_ssl_set_client_certificate_data(ssl_context, NULL, 0) < 0 || ++ mailstream_ssl_set_client_private_key_data(ssl_context, NULL, 0) < 0) ++ debug_print("Impossible to set the client certificate.\n"); ++ x509 = ssl_certificate_get_x509_from_pem_file(cert_path); ++ pkey = ssl_certificate_get_pkey_from_pem_file(cert_path); ++ if (!(x509 && pkey)) { ++ /* try pkcs12 format */ ++ ssl_certificate_get_x509_and_pkey_from_p12_file(cert_path, password, &x509, &pkey); ++ } ++ if (x509 && pkey) { ++ unsigned char *x509_der = NULL, *pkey_der = NULL; ++ size_t x509_len, pkey_len; ++ ++ x509_len = (size_t)gnutls_i2d_X509(x509, &x509_der); ++ pkey_len = (size_t)gnutls_i2d_PrivateKey(pkey, &pkey_der); ++ if (x509_len > 0 && pkey_len > 0) { ++ if (mailstream_ssl_set_client_certificate_data(ssl_context, x509_der, x509_len) < 0 || ++ mailstream_ssl_set_client_private_key_data(ssl_context, pkey_der, pkey_len) < 0) ++ log_error(LOG_PROTOCOL, _("Impossible to set the client certificate.\n")); ++ g_free(x509_der); ++ g_free(pkey_der); ++ } ++ gnutls_x509_crt_deinit(x509); ++ gnutls_x509_privkey_deinit(pkey); ++ } ++} ++ ++#endif /* USE_GNUTLS */ ++#endif /* HAVE_LIBETPAN */ +diff --git a/src/etpan/etpan-ssl.h b/src/etpan/etpan-ssl.h +new file mode 100644 +index 0000000..5607d1a +--- /dev/null ++++ b/src/etpan/etpan-ssl.h +@@ -0,0 +1,40 @@ ++/* ++ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client ++ * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> ++ * and the Claws Mail team ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ * ++ */ ++ ++#ifndef __ETPAN_SSL_H__ ++#define __ETPAN_SSL_H__ ++ ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#include "claws-features.h" ++#endif ++ ++#ifdef USE_GNUTLS ++#ifdef HAVE_LIBETPAN ++ ++#include <libetpan/libetpan.h> ++ ++gboolean etpan_certificate_check(mailstream *imap_stream, const char *host, gint port); ++void etpan_connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context, void * data); ++ ++#endif /* USE_GNUTLS */ ++#endif /* HAVE_LIBETPAN */ ++ ++#endif /* __ETPAN_SSL_H__ */ +diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c +index b71e4d7..4332f59 100644 +--- a/src/etpan/imap-thread.c ++++ b/src/etpan/imap-thread.c +@@ -41,6 +41,7 @@ + #include <gtk/gtk.h> + #include <log.h> + #include "etpan-thread-manager.h" ++#include "etpan-ssl.h" + #include "utils.h" + #include "mainwindow.h" + #include "ssl.h" +@@ -519,79 +520,6 @@ int imap_threaded_connect(Folder * folder, const char * server, int port) + return result.error; + } + +-static int etpan_certificate_check(const unsigned char *certificate, int len, void *data) +-{ +-#ifdef USE_GNUTLS +- struct connect_param *param = (struct connect_param *)data; +- gnutls_x509_crt_t cert = NULL; +- gnutls_datum_t tmp; +- +- if (certificate == NULL || len < 0) { +- g_warning("no cert presented.\n"); +- return 0; +- } +- +- tmp.data = malloc(len); +- memcpy(tmp.data, certificate, len); +- tmp.size = len; +- gnutls_x509_crt_init(&cert); +- if (gnutls_x509_crt_import(cert, &tmp, GNUTLS_X509_FMT_DER) < 0) { +- g_warning("IMAP: can't get cert\n"); +- return 0; +- } else if (ssl_certificate_check(cert, (guint)-1, (gchar *)param->server, +- (gushort)param->port) == TRUE) { +- gnutls_x509_crt_deinit(cert); +- return 0; +- } else { +- gnutls_x509_crt_deinit(cert); +- return -1; +- } +-#endif +- return 0; +-} +- +-static void connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context, void * data) +-{ +-#ifdef USE_GNUTLS +- PrefsAccount *account = (PrefsAccount *)data; +- const gchar *cert_path = NULL; +- const gchar *password = NULL; +- gnutls_x509_crt_t x509 = NULL; +- gnutls_x509_privkey_t pkey = NULL; +- +- if (account->in_ssl_client_cert_file && *account->in_ssl_client_cert_file) +- cert_path = account->in_ssl_client_cert_file; +- if (account->in_ssl_client_cert_pass && *account->in_ssl_client_cert_pass) +- password = account->in_ssl_client_cert_pass; +- +- if (mailstream_ssl_set_client_certificate_data(ssl_context, NULL, 0) < 0 || +- mailstream_ssl_set_client_private_key_data(ssl_context, NULL, 0) < 0) +- debug_print("Impossible to set the client certificate.\n"); +- x509 = ssl_certificate_get_x509_from_pem_file(cert_path); +- pkey = ssl_certificate_get_pkey_from_pem_file(cert_path); +- if (!(x509 && pkey)) { +- /* try pkcs12 format */ +- ssl_certificate_get_x509_and_pkey_from_p12_file(cert_path, password, &x509, &pkey); +- } +- if (x509 && pkey) { +- unsigned char *x509_der = NULL, *pkey_der = NULL; +- size_t x509_len, pkey_len; +- +- x509_len = (size_t)gnutls_i2d_X509(x509, &x509_der); +- pkey_len = (size_t)gnutls_i2d_PrivateKey(pkey, &pkey_der); +- if (x509_len > 0 && pkey_len > 0) { +- if (mailstream_ssl_set_client_certificate_data(ssl_context, x509_der, x509_len) < 0 || +- mailstream_ssl_set_client_private_key_data(ssl_context, pkey_der, pkey_len) < 0) +- log_error(LOG_PROTOCOL, _("Impossible to set the client certificate.\n")); +- g_free(x509_der); +- g_free(pkey_der); +- } +- gnutls_x509_crt_deinit(x509); +- gnutls_x509_privkey_deinit(pkey); +- } +-#endif +-} +- + static void connect_ssl_run(struct etpan_thread_op * op) + { + int r; +@@ -605,7 +533,7 @@ static void connect_ssl_run(struct etpan_thread_op * op) + + r = mailimap_ssl_connect_with_callback(param->imap, + param->server, param->port, +- connect_ssl_context_cb, param->account); ++ etpan_connect_ssl_context_cb, param->account); + result->error = r; + } + +@@ -616,8 +544,6 @@ int imap_threaded_connect_ssl(Folder * folder, const char * server, int port) + chashdatum key; + chashdatum value; + mailimap * imap, * oldimap; +- unsigned char *certificate = NULL; +- int cert_len; + + oldimap = get_imap(folder); + +@@ -644,11 +570,8 @@ int imap_threaded_connect_ssl(Folder * folder, const char * server, int port) + + if ((result.error == MAILIMAP_NO_ERROR_AUTHENTICATED || + result.error == MAILIMAP_NO_ERROR_NON_AUTHENTICATED) && !etpan_skip_ssl_cert_check) { +- cert_len = (int)mailstream_ssl_get_certificate(imap->imap_stream, &certificate); +- if (etpan_certificate_check(certificate, cert_len, ¶m) < 0) +- return -1; +- if (certificate) +- free(certificate); ++ if (etpan_certificate_check(imap->imap_stream, server, port) < 0) ++ result.error = MAILIMAP_ERROR_SSL; + } + debug_print("connect %d with imap %p\n", result.error, imap); + +@@ -1156,7 +1079,7 @@ static void starttls_run(struct etpan_thread_op * op) + return; + } + +- tls_low = mailstream_low_tls_open_with_callback(fd, connect_ssl_context_cb, param->account); ++ tls_low = mailstream_low_tls_open_with_callback(fd, etpan_connect_ssl_context_cb, param->account); + if (tls_low == NULL) { + debug_print("imap starttls run - can't tls_open\n"); + result->error = MAILIMAP_ERROR_STREAM; +@@ -1171,8 +1094,6 @@ int imap_threaded_starttls(Folder * folder, const gchar *host, int port) + { + struct connect_param param; + struct starttls_result result; +- int cert_len; +- unsigned char *certificate = NULL; + + debug_print("imap starttls - begin\n"); + +@@ -1186,11 +1107,8 @@ int imap_threaded_starttls(Folder * folder, const gchar *host, int port) + debug_print("imap starttls - end\n"); + + if (result.error == 0 && param.imap && !etpan_skip_ssl_cert_check) { +- cert_len = (int)mailstream_ssl_get_certificate(param.imap->imap_stream, &certificate); +- if (etpan_certificate_check(certificate, cert_len, ¶m) < 0) +- result.error = MAILIMAP_ERROR_STREAM; +- if (certificate) +- free(certificate); ++ if (etpan_certificate_check(param.imap->imap_stream, host, port) < 0) ++ return MAILIMAP_ERROR_SSL; + } + return result.error; + } +diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c +index 6d76e7a..84a2f83 100644 +--- a/src/etpan/nntp-thread.c ++++ b/src/etpan/nntp-thread.c +@@ -41,6 +41,7 @@ + #include <gtk/gtk.h> + #include <log.h> + #include "etpan-thread-manager.h" ++#include "etpan-ssl.h" + #include "utils.h" + #include "mainwindow.h" + #include "ssl_certificate.h" +@@ -373,79 +374,6 @@ int nntp_threaded_connect(Folder * folder, const char * server, int port) + return result.error; + } + +-static int etpan_certificate_check(const unsigned char *certificate, int len, void *data) +-{ +-#ifdef USE_GNUTLS +- struct connect_param *param = (struct connect_param *)data; +- gnutls_x509_crt_t cert = NULL; +- gnutls_datum_t tmp; +- +- if (certificate == NULL || len < 0) { +- g_warning("no cert presented.\n"); +- return 0; +- } +- +- tmp.data = malloc(len); +- memcpy(tmp.data, certificate, len); +- tmp.size = len; +- gnutls_x509_crt_init(&cert); +- if (gnutls_x509_crt_import(cert, &tmp, GNUTLS_X509_FMT_DER) < 0) { +- g_warning("nntp: can't get cert\n"); +- return 0; +- } else if (ssl_certificate_check(cert, (guint)-1, +- (gchar *)param->server, (gushort)param->port) == TRUE) { +- gnutls_x509_crt_deinit(cert); +- return 0; +- } else { +- gnutls_x509_crt_deinit(cert); +- return -1; +- } +-#endif +- return 0; +-} +- +-static void connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context, void * data) +-{ +-#ifdef USE_GNUTLS +- PrefsAccount *account = (PrefsAccount *)data; +- const gchar *cert_path = NULL; +- const gchar *password = NULL; +- gnutls_x509_crt_t x509 = NULL; +- gnutls_x509_privkey_t pkey = NULL; +- +- if (account->in_ssl_client_cert_file && *account->in_ssl_client_cert_file) +- cert_path = account->in_ssl_client_cert_file; +- if (account->in_ssl_client_cert_pass && *account->in_ssl_client_cert_pass) +- password = account->in_ssl_client_cert_pass; +- +- if (mailstream_ssl_set_client_certificate_data(ssl_context, NULL, 0) < 0 || +- mailstream_ssl_set_client_private_key_data(ssl_context, NULL, 0) < 0) +- debug_print("Impossible to set the client certificate.\n"); +- x509 = ssl_certificate_get_x509_from_pem_file(cert_path); +- pkey = ssl_certificate_get_pkey_from_pem_file(cert_path); +- if (!(x509 && pkey)) { +- /* try pkcs12 format */ +- ssl_certificate_get_x509_and_pkey_from_p12_file(cert_path, password, &x509, &pkey); +- } +- if (x509 && pkey) { +- unsigned char *x509_der = NULL, *pkey_der = NULL; +- size_t x509_len, pkey_len; +- +- x509_len = (size_t)gnutls_i2d_X509(x509, &x509_der); +- pkey_len = (size_t)gnutls_i2d_PrivateKey(pkey, &pkey_der); +- if (x509_len > 0 && pkey_len > 0) { +- if (mailstream_ssl_set_client_certificate_data(ssl_context, x509_der, x509_len) < 0 || +- mailstream_ssl_set_client_private_key_data(ssl_context, pkey_der, pkey_len) < 0) +- log_error(LOG_PROTOCOL, _("Impossible to set the client certificate.\n")); +- g_free(x509_der); +- g_free(pkey_der); +- } +- gnutls_x509_crt_deinit(x509); +- gnutls_x509_privkey_deinit(pkey); +- } +-#endif +-} +- + static void connect_ssl_run(struct etpan_thread_op * op) + { + int r; +@@ -459,7 +387,7 @@ static void connect_ssl_run(struct etpan_thread_op * op) + + r = newsnntp_ssl_connect_with_callback(param->nntp, + param->server, param->port, +- connect_ssl_context_cb, param->account); ++ etpan_connect_ssl_context_cb, param->account); + result->error = r; + } + +@@ -470,8 +398,6 @@ int nntp_threaded_connect_ssl(Folder * folder, const char * server, int port) + chashdatum key; + chashdatum value; + newsnntp * nntp, * oldnntp; +- unsigned char *certificate = NULL; +- int cert_len; + + oldnntp = get_nntp(folder); + +@@ -497,11 +423,8 @@ int nntp_threaded_connect_ssl(Folder * folder, const char * server, int port) + threaded_run(folder, ¶m, &result, connect_ssl_run); + + if (result.error == NEWSNNTP_NO_ERROR && !etpan_skip_ssl_cert_check) { +- cert_len = (int)mailstream_ssl_get_certificate(nntp->nntp_stream, &certificate); +- if (etpan_certificate_check(certificate, cert_len, ¶m) < 0) ++ if (etpan_certificate_check(nntp->nntp_stream, server, port) < 0) + return -1; +- if (certificate) +- free(certificate); + } + debug_print("connect %d with nntp %p\n", result.error, nntp); + +-- +1.9.2 + diff --git a/extra/claws-mail/claws-ssl-2.patch b/extra/claws-mail/claws-ssl-2.patch new file mode 100644 index 000000000..77186d20b --- /dev/null +++ b/extra/claws-mail/claws-ssl-2.patch @@ -0,0 +1,139 @@ +From fe50206b4385404c38ad0421bdfb707bb6994d80 Mon Sep 17 00:00:00 2001 +From: Nepu User <nepu@localhost.localdomain> +Date: Sun, 27 Apr 2014 14:55:18 +0200 +Subject: [PATCH 2/3] upstream commit dda3675203030f329d527c697e14342c9c13a75c + +--- + src/common/ssl_certificate.c | 17 ++++++++++++++ + src/common/ssl_certificate.h | 1 + + src/etpan/etpan-ssl.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 71 insertions(+) + +diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c +index 84e017e..72f73ac 100644 +--- a/src/common/ssl_certificate.c ++++ b/src/common/ssl_certificate.c +@@ -647,6 +647,23 @@ gboolean ssl_certificate_check (gnutls_x509_crt_t x509_cert, guint status, const + return TRUE; + } + ++gboolean ssl_certificate_check_chain(gnutls_x509_crt_t *certs, gint chain_len, const gchar *host, gushort port) ++{ ++ gboolean result = FALSE; ++ gint status; ++ ++ gnutls_x509_crt_list_verify (certs, ++ chain_len, ++ NULL, 0, ++ NULL, 0, ++ GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT, ++ &status); ++ ++ result = ssl_certificate_check(certs[0], status, host, port); ++ ++ return result; ++} ++ + gnutls_x509_crt_t ssl_certificate_get_x509_from_pem_file(const gchar *file) + { + gnutls_x509_crt_t x509 = NULL; +diff --git a/src/common/ssl_certificate.h b/src/common/ssl_certificate.h +index 8bbe2ac..fd8822a 100644 +--- a/src/common/ssl_certificate.h ++++ b/src/common/ssl_certificate.h +@@ -58,6 +58,7 @@ struct _SSLCertHookData + + SSLCertificate *ssl_certificate_find (const gchar *host, gushort port, const gchar *fingerprint); + gboolean ssl_certificate_check (gnutls_x509_crt_t x509_cert, guint status, const gchar *host, gushort port); ++gboolean ssl_certificate_check_chain(gnutls_x509_crt_t *certs, gint chain_len, const gchar *host, gushort port); + void ssl_certificate_destroy(SSLCertificate *cert); + void ssl_certificate_delete_from_disk(SSLCertificate *cert); + char * readable_fingerprint(unsigned char *src, int len); +diff --git a/src/etpan/etpan-ssl.c b/src/etpan/etpan-ssl.c +index 6642e40..c9dc9d8 100644 +--- a/src/etpan/etpan-ssl.c ++++ b/src/etpan/etpan-ssl.c +@@ -26,6 +26,7 @@ + #ifdef USE_GNUTLS + #ifdef HAVE_LIBETPAN + #include <libetpan/libetpan.h> ++#include <libetpan/libetpan_version.h> + #include <gnutls/gnutls.h> + #include <gnutls/x509.h> + #include <stdlib.h> +@@ -33,6 +34,7 @@ + #include <glib/gi18n.h> + #include <errno.h> + ++#include "etpan-ssl.h" + #include "ssl_certificate.h" + #include "utils.h" + #include "log.h" +@@ -40,6 +42,7 @@ + + gboolean etpan_certificate_check(mailstream *stream, const char *host, gint port) + { ++#if (!defined LIBETPAN_API_CURRENT || LIBETPAN_API_CURRENT < 18) + unsigned char *cert_der = NULL; + int len; + gnutls_x509_crt_t cert = NULL; +@@ -75,6 +78,56 @@ gboolean etpan_certificate_check(mailstream *stream, const char *host, gint port + gnutls_x509_crt_deinit(cert); + return FALSE; + } ++#else ++ carray *certs_der = NULL; ++ gint chain_len = 0, i; ++ gnutls_x509_crt_t *certs = NULL; ++ gboolean result; ++ ++ if (stream == NULL) ++ return FALSE; ++ ++ certs_der = mailstream_get_certificate_chain(stream); ++ if (!certs_der) { ++ g_warning("could not get certs"); ++ return FALSE; ++ } ++ chain_len = carray_count(certs_der); ++ ++ certs = malloc(sizeof(gnutls_x509_crt_t) * chain_len); ++ if (certs == NULL) { ++ g_warning("could not allocate certs"); ++ return FALSE; ++ } ++ ++ result = TRUE; ++ for (i = 0; i < chain_len; i++) { ++ MMAPString *cert_str = carray_get(certs_der, i); ++ gnutls_datum_t tmp; ++ ++ tmp.data = malloc(cert_str->len); ++ memcpy(tmp.data, cert_str->str, cert_str->len); ++ tmp.size = cert_str->len; ++ ++ mmap_string_free(cert_str); ++ ++ gnutls_x509_crt_init(&certs[i]); ++ if (gnutls_x509_crt_import(certs[i], &tmp, GNUTLS_X509_FMT_DER) < 0) ++ result = FALSE; ++ ++ free(tmp.data); ++ } ++ ++ carray_free(certs_der); ++ ++ if (result == TRUE) ++ result = ssl_certificate_check_chain(certs, chain_len, host, port); ++ ++ for (i = 0; i < chain_len; i++) ++ gnutls_x509_crt_deinit(certs[i]); ++ ++ return result; ++#endif + } + + void etpan_connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context, void * data) +-- +1.9.2 + diff --git a/extra/claws-mail/claws-ssl-3.patch b/extra/claws-mail/claws-ssl-3.patch new file mode 100644 index 000000000..cf3306337 --- /dev/null +++ b/extra/claws-mail/claws-ssl-3.patch @@ -0,0 +1,241 @@ +From a74e15a5c7185b941a24b0b61bc134397c8d5737 Mon Sep 17 00:00:00 2001 +From: Nepu User <nepu@localhost.localdomain> +Date: Sun, 27 Apr 2014 14:56:01 +0200 +Subject: [PATCH 3/3] upstream commit 4d0f2b9b14819b26fbaa72ad129ec0c03e41400f + +--- + src/common/ssl_certificate.c | 114 +++++++++++++++++++++++++++++-------------- + src/etpan/etpan-ssl.c | 1 + + src/etpan/imap-thread.c | 4 +- + src/etpan/nntp-thread.c | 2 +- + 4 files changed, 82 insertions(+), 39 deletions(-) + +diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c +index 72f73ac..48e55c9 100644 +--- a/src/common/ssl_certificate.c ++++ b/src/common/ssl_certificate.c +@@ -207,33 +207,73 @@ size_t gnutls_i2d_PrivateKey(gnutls_x509_privkey_t pkey, unsigned char **output) + return key_size; + } + +-static gnutls_x509_crt_t gnutls_d2i_X509_fp(FILE *fp, int format) ++static int gnutls_d2i_X509_list_fp(FILE *fp, int format, gnutls_x509_crt_t **cert_list, gint *num_certs) + { +- gnutls_x509_crt_t cert = NULL; ++ gnutls_x509_crt_t *crt_list; ++ unsigned int max = 512; ++ unsigned int flags = 0; + gnutls_datum_t tmp; + struct stat s; + int r; ++ ++ *cert_list = NULL; ++ *num_certs = 0; ++ ++ if (fp == NULL) ++ return -ENOENT; ++ + if (fstat(fileno(fp), &s) < 0) { + perror("fstat"); +- return NULL; ++ return -errno; + } ++ ++ crt_list=(gnutls_x509_crt_t*)malloc(max*sizeof(gnutls_x509_crt_t)); + tmp.data = malloc(s.st_size); + memset(tmp.data, 0, s.st_size); + tmp.size = s.st_size; + if (fread (tmp.data, 1, s.st_size, fp) < s.st_size) { + perror("fread"); + free(tmp.data); +- return NULL; ++ free(crt_list); ++ return -EIO; + } + +- gnutls_x509_crt_init(&cert); +- if ((r = gnutls_x509_crt_import(cert, &tmp, (format == 0)?GNUTLS_X509_FMT_DER:GNUTLS_X509_FMT_PEM)) < 0) { ++ if ((r = gnutls_x509_crt_list_import(crt_list, &max, ++ &tmp, format, flags)) < 0) { + debug_print("cert import failed: %s\n", gnutls_strerror(r)); +- gnutls_x509_crt_deinit(cert); +- cert = NULL; ++ free(tmp.data); ++ free(crt_list); ++ return r; + } + free(tmp.data); +- debug_print("got cert! %p\n", cert); ++ debug_print("got %d certs in crt_list! %p\n", max, &crt_list); ++ ++ *cert_list = crt_list; ++ *num_certs = max; ++ ++ return r; ++} ++ ++/* return one certificate, read from file */ ++static gnutls_x509_crt_t gnutls_d2i_X509_fp(FILE *fp, int format) ++{ ++ gnutls_x509_crt_t *certs = NULL; ++ gnutls_x509_crt_t cert = NULL; ++ int i, ncerts, r; ++ ++ if ((r = gnutls_d2i_X509_list_fp(fp, format, &certs, &ncerts)) < 0) { ++ return NULL; ++ } ++ ++ if (ncerts == 0) ++ return NULL; ++ ++ for (i = 1; i < ncerts; i++) ++ gnutls_x509_crt_deinit(certs[i]); ++ ++ cert = certs[0]; ++ free(certs); ++ + return cert; + } + +@@ -474,8 +514,6 @@ static guint check_cert(gnutls_x509_crt_t cert) + gnutls_x509_crt_t *ca_list; + unsigned int max = 512; + unsigned int flags = 0; +- gnutls_datum_t tmp; +- struct stat s; + int r, i; + unsigned int status; + FILE *fp; +@@ -485,34 +523,12 @@ static guint check_cert(gnutls_x509_crt_t cert) + else + return (guint)-1; + +- if (fstat(fileno(fp), &s) < 0) { +- perror("fstat"); +- fclose(fp); +- return (guint)-1; +- } +- +- ca_list=(gnutls_x509_crt_t*)malloc(max*sizeof(gnutls_x509_crt_t)); +- tmp.data = malloc(s.st_size); +- memset(tmp.data, 0, s.st_size); +- tmp.size = s.st_size; +- if (fread (tmp.data, 1, s.st_size, fp) < s.st_size) { +- perror("fread"); +- free(tmp.data); +- free(ca_list); +- fclose(fp); +- return (guint)-1; +- } +- +- if ((r = gnutls_x509_crt_list_import(ca_list, &max, +- &tmp, GNUTLS_X509_FMT_PEM, flags)) < 0) { ++ if ((r = gnutls_d2i_X509_list_fp(fp, GNUTLS_X509_FMT_PEM, &ca_list, &max)) < 0) { + debug_print("cert import failed: %s\n", gnutls_strerror(r)); +- free(tmp.data); +- free(ca_list); + fclose(fp); + return (guint)-1; + } +- free(tmp.data); +- debug_print("got %d certs in ca_list! %p\n", max, &ca_list); ++ + r = gnutls_x509_crt_verify(cert, ca_list, max, flags, &status); + fclose(fp); + +@@ -649,18 +665,44 @@ gboolean ssl_certificate_check (gnutls_x509_crt_t x509_cert, guint status, const + + gboolean ssl_certificate_check_chain(gnutls_x509_crt_t *certs, gint chain_len, const gchar *host, gushort port) + { ++ int ncas = 0, ncrls = 0; ++ gnutls_x509_crt_t *cas = NULL; ++ gnutls_x509_crl_t *crls = NULL; + gboolean result = FALSE; ++ int i; + gint status; + ++ if (claws_ssl_get_cert_file()) { ++ FILE *fp = g_fopen(claws_ssl_get_cert_file(), "rb"); ++ int r = -errno; ++ ++ if (fp) { ++ r = gnutls_d2i_X509_list_fp(fp, GNUTLS_X509_FMT_PEM, &cas, &ncas); ++ fclose(fp); ++ } ++ ++ if (r < 0) ++ g_warning("Can't read SSL_CERT_FILE %s: %s\n", ++ claws_ssl_get_cert_file(), ++ gnutls_strerror(r)); ++ } else { ++ debug_print("Can't find SSL ca-certificates file\n"); ++ } ++ ++ + gnutls_x509_crt_list_verify (certs, + chain_len, +- NULL, 0, ++ cas, ncas, + NULL, 0, + GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT, + &status); + + result = ssl_certificate_check(certs[0], status, host, port); + ++ for (i = 0; i < ncas; i++) ++ gnutls_x509_crt_deinit(cas[i]); ++ free(cas); ++ + return result; + } + +diff --git a/src/etpan/etpan-ssl.c b/src/etpan/etpan-ssl.c +index c9dc9d8..f99955b 100644 +--- a/src/etpan/etpan-ssl.c ++++ b/src/etpan/etpan-ssl.c +@@ -125,6 +125,7 @@ gboolean etpan_certificate_check(mailstream *stream, const char *host, gint port + + for (i = 0; i < chain_len; i++) + gnutls_x509_crt_deinit(certs[i]); ++ free(certs); + + return result; + #endif +diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c +index 4332f59..f0b504e 100644 +--- a/src/etpan/imap-thread.c ++++ b/src/etpan/imap-thread.c +@@ -570,7 +570,7 @@ int imap_threaded_connect_ssl(Folder * folder, const char * server, int port) + + if ((result.error == MAILIMAP_NO_ERROR_AUTHENTICATED || + result.error == MAILIMAP_NO_ERROR_NON_AUTHENTICATED) && !etpan_skip_ssl_cert_check) { +- if (etpan_certificate_check(imap->imap_stream, server, port) < 0) ++ if (etpan_certificate_check(imap->imap_stream, server, port) != TRUE) + result.error = MAILIMAP_ERROR_SSL; + } + debug_print("connect %d with imap %p\n", result.error, imap); +@@ -1107,7 +1107,7 @@ int imap_threaded_starttls(Folder * folder, const gchar *host, int port) + debug_print("imap starttls - end\n"); + + if (result.error == 0 && param.imap && !etpan_skip_ssl_cert_check) { +- if (etpan_certificate_check(param.imap->imap_stream, host, port) < 0) ++ if (etpan_certificate_check(param.imap->imap_stream, host, port) != TRUE) + return MAILIMAP_ERROR_SSL; + } + return result.error; +diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c +index 84a2f83..7708d31 100644 +--- a/src/etpan/nntp-thread.c ++++ b/src/etpan/nntp-thread.c +@@ -423,7 +423,7 @@ int nntp_threaded_connect_ssl(Folder * folder, const char * server, int port) + threaded_run(folder, ¶m, &result, connect_ssl_run); + + if (result.error == NEWSNNTP_NO_ERROR && !etpan_skip_ssl_cert_check) { +- if (etpan_certificate_check(nntp->nntp_stream, server, port) < 0) ++ if (etpan_certificate_check(nntp->nntp_stream, server, port) != TRUE) + return -1; + } + debug_print("connect %d with nntp %p\n", result.error, nntp); +-- +1.9.2 + diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index b7c225624..014bec439 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 211501 2014-04-18 18:10:46Z andrea $ +# $Id: PKGBUILD 211914 2014-04-29 17:37:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.11.8 -_pkgver=4.12.4 -pkgrel=2 +pkgver=4.11.9 +_pkgver=4.12.5 +pkgrel=1 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kde-workspace' license=('GPL' 'LGPL' 'FDL') -groups=('kde') +groups=('kde' 'kdebase') # note on libxdamage: # not detected by namcap because libgl depends on it # but nvidia providing libgl does not depend on libxdamage @@ -30,7 +30,7 @@ source=("http://download.kde.org/stable/${_pkgver}/src/${_pkgname}-${pkgver}.tar 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate' 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' 'khotkeys-qt4.patch') -sha1sums=('e44b73ea1e2446258882d10694ca2896e1cc6b17' +sha1sums=('ea4f3b3401b7304613adcc21acb92b5c3d11c9c1' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD index ee2903698..84e4ee86d 100644 --- a/extra/libass/PKGBUILD +++ b/extra/libass/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 206128 2014-02-19 17:11:36Z giovanni $ +# $Id: PKGBUILD 211910 2014-04-29 15:53:17Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> pkgname=libass -pkgver=0.11.1 +pkgver=0.11.2 pkgrel=1 pkgdesc="A portable library for SSA/ASS subtitles rendering" arch=('i686' 'x86_64') -url="http://code.google.com/p/libass/" +url="https://github.com/libass/libass/releases" license=('BSD') depends=('fribidi' 'fontconfig' 'enca' 'harfbuzz') makedepends=('pkg-config' 'yasm') source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('4c67e4450d4aad65e344de3f5cf28751') +md5sums=('701b761934de0eff7d45f58d7d13eaf6') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD index 3c4e298ce..68837699c 100644 --- a/extra/libetpan/PKGBUILD +++ b/extra/libetpan/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 205522 2014-02-06 16:23:03Z andyrtr $ +# $Id: PKGBUILD 211908 2014-04-29 12:38:45Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libetpan -pkgver=1.2 +pkgver=1.4.1 pkgrel=1 pkgdesc="A portable middleware for email access" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url="http://www.etpan.org/libetpan.html" license=("custom:etpan") depends=('libsasl' 'curl' 'expat') source=(https://github.com/dinhviethoa/${pkgname}/archive/${pkgver}.tar.gz) -md5sums=('c15905ebc2ec620afb8bcca7b9d9c232') +md5sums=('430a530a38d3bc6028b973a75d219891') build() { cd ${pkgname}-${pkgver} @@ -29,6 +29,13 @@ build() { make } +check() { + cd ${pkgname}-${pkgver} + make check + cd tests + make imap-sample +} + package() { cd ${pkgname}-${pkgver} make DESTDIR=${pkgdir} install diff --git a/extra/screen/PKGBUILD b/extra/screen/PKGBUILD index f03f31969..21efb635f 100644 --- a/extra/screen/PKGBUILD +++ b/extra/screen/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 211563 2014-04-20 06:11:13Z bisson $ +# $Id: PKGBUILD 211915 2014-04-29 18:49:14Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Committer: dorphell <dorphell@gmx.net> pkgname=screen -pkgver=4.2.0 -pkgrel=1 +pkgver=4.2.1 +pkgrel=2 _ptygroup=5 #the UID of our PTY/TTY group pkgdesc='Full-screen window manager that multiplexes a physical terminal' url='http://www.gnu.org/software/screen/' @@ -13,23 +13,14 @@ arch=('i686' 'x86_64') license=('GPL') depends=('ncurses' 'pam') backup=('etc/screenrc' 'etc/pam.d/screen') -#source=("http://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz" -source=("http://download.savannah.gnu.org/releases/screen/screen-${pkgver}.tar.gz" - 'long-term.patch' +source=("http://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz"{,.sig} 'pam.d') -sha1sums=('85a206e1e474fd608f17e88bfe5f90a55f21c51a' - '4ca8408ec03e97777e37f45a99cf8ab503592734' +sha1sums=('21eadf5f1d64120649f3390346253c6bc8a5103c' 'SKIP' '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f') options=('!makeflags') install=install -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../long-term.patch - ./autogen.sh -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/screen/install b/extra/screen/install index e1429f787..3be83d014 100644 --- a/extra/screen/install +++ b/extra/screen/install @@ -1,11 +1,8 @@ infodir=usr/share/info -filelist=(screen.info screen.info-1 screen.info-2 screen.info-3 screen.info-4 screen.info-5) post_install() { [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done + install-info $infodir/screen.info.gz $infodir/dir 2>/dev/null } post_upgrade() { @@ -19,7 +16,5 @@ post_upgrade() { pre_remove() { [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done + install-info --delete $infodir/screen.info.gz $infodir/dir 2>/dev/null } diff --git a/extra/screen/long-term.patch b/extra/screen/long-term.patch deleted file mode 100644 index b4d6ff1f2..000000000 --- a/extra/screen/long-term.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -aur old/display.h new/display.h ---- old/display.h 2014-04-16 11:38:41.000000000 -1000 -+++ new/display.h 2014-04-17 16:20:36.992994397 -1000 -@@ -73,7 +73,7 @@ - struct win *d_other; /* pointer to other window */ - int d_nonblock; /* -1 don't block if obufmax reached */ - /* >0: block after nonblock secs */ -- char d_termname[20 + 1]; /* $TERM */ -+ char d_termname[40 + 1]; /* $TERM */ - char *d_tentry; /* buffer for tgetstr */ - char d_tcinited; /* termcap inited flag */ - int d_width, d_height; /* width/height of the screen */ -diff -aur old/screen.h new/screen.h ---- old/screen.h 2014-04-16 11:38:41.000000000 -1000 -+++ new/screen.h 2014-04-17 16:20:36.992994397 -1000 -@@ -214,7 +214,7 @@ - char preselect[20]; - int esc; /* his new escape character unless -1 */ - int meta_esc; /* his new meta esc character unless -1 */ -- char envterm[20 + 1]; /* terminal type */ -+ char envterm[40 + 1]; /* terminal type */ - int encoding; /* encoding of display */ - int detachfirst; /* whether to detach remote sessions first */ - } diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD index b83c28e72..4d3a72be3 100644 --- a/extra/xf86-input-evdev/PKGBUILD +++ b/extra/xf86-input-evdev/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 203652 2014-01-13 17:16:20Z andyrtr $ +# $Id: PKGBUILD 211904 2014-04-29 12:32:50Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <Alexander@archlinux.org pkgname=xf86-input-evdev -pkgver=2.8.2 -pkgrel=2 +pkgver=2.8.3 +pkgrel=1 pkgdesc="X.org evdev input driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') -depends=('glibc' 'systemd-tools' 'mtdev') +depends=('glibc' 'systemd' 'mtdev') makedepends=('xorg-server-devel' 'resourceproto' 'scrnsaverproto') conflicts=('xorg-server<1.15.0' 'X-ABI-XINPUT_VERSION<20' 'X-ABI-XINPUT_VERSION>=21') options=('!makeflags') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('750461749a83bdee7771592aa5c0db5e267b18d847078a4b8622f55b04797eb3') +sha256sums=('02ec7fd68635bd67be10275ba23f6c301a9109d72cac9c8646e28842003c06b0') build() { cd ${pkgname}-${pkgver} diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD index 77b73d837..64e83b4d4 100644 --- a/extra/xf86-input-synaptics/PKGBUILD +++ b/extra/xf86-input-synaptics/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 207603 2014-03-12 18:12:33Z andyrtr $ +# $Id: PKGBUILD 211906 2014-04-29 12:35:13Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-input-synaptics -pkgver=1.7.4 +pkgver=1.7.5 pkgrel=1 pkgdesc="Synaptics driver for notebook touchpads" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ groups=('xorg-drivers' 'xorg') backup=('etc/X11/xorg.conf.d/50-synaptics.conf') source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 add_tapbuttons.diff) -sha256sums=('56a2d2df7bd39e29f56102c62f153e023f3e9b2f5e255309d33fab8e81945af7' +sha256sums=('1f8423521ff747efa9d84ef33126ad4bbe27d5904731115aa70247bc388c91c7' '5298d3e871db3768b34cf8516d3f53f9291202e2ea5de3300256e1cd9119a1ec') build() { |