diff options
| author | root <root@rshg054.dnsready.net> | 2013-09-07 02:08:54 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-09-07 02:08:54 -0700 |
| commit | b764a223c0b6b4a0001839d8b0fd83b604fbb219 (patch) | |
| tree | 92e9945b5910d1b8a83fbde05f301b4471de2c97 | |
| parent | 670cfaf55e53f7380ca8ee7b4acb2bf0248685c4 (diff) | |
Sat Sep 7 02:08:44 PDT 2013
25 files changed, 750 insertions, 180 deletions
diff --git a/community/aircrack-ng/PKGBUILD b/community/aircrack-ng/PKGBUILD index 6e2021027..93bc2fe7b 100644 --- a/community/aircrack-ng/PKGBUILD +++ b/community/aircrack-ng/PKGBUILD @@ -1,91 +1,30 @@ -# $Id: PKGBUILD 92023 2013-05-30 23:34:33Z seblu $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# $Id: PKGBUILD 96850 2013-09-06 16:26:13Z bgyorgy $ +# Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: ice-man <icemanf@gmail.com> -pkgbase=aircrack-ng -pkgname=(aircrack-ng aircrack-ng-scripts) +pkgname=aircrack-ng pkgver=1.1 -pkgrel=9 +pkgrel=10 +pkgdesc="A key cracker for the 802.11 WEP and WPA-PSK protocols" arch=('i686' 'x86_64') url="http://www.aircrack-ng.org" license=('GPL2') -source=("http://download.aircrack-ng.org/${pkgname}-${pkgver}.tar.gz") +depends=('openssl' 'sqlite' 'iw' 'net-tools' 'wireless_tools') +conflicts=('aircrack-ng-scripts') +replaces=('aircrack-ng-scripts') +provides=('aircrack-ng-scripts') +source=("http://download.aircrack-ng.org/$pkgname-$pkgver.tar.gz") md5sums=('f7a24ed8fad122c4187d06bfd6f998b4') -depends=('openssl' 'sqlite' 'iw' 'net-tools') build() { - cd ${srcdir}/${pkgbase}-${pkgver} - make SQLITE=true unstable=true + cd "$srcdir/$pkgname-$pkgver" + make SQLITE=true UNSTABLE=true } -package_aircrack-ng() { - pkgdesc="A key cracker for the 802.11 WEP and WPA-PSK protocols" - - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} SQLITE=true unstable=true bindir=/usr/bin \ - mandir=/usr/share/man/man1 sbindir=/usr/bin install - - ### Remove installed scripts/corresponding man pages (installed in aircrack-ng-scripts) ### - # Scripts - rm ${pkgdir}/usr/bin/airdriver-ng - rm ${pkgdir}/usr/bin/airodump-ng-oui-update - # Man pages - mkdir -p ${srcdir}/tmp/ - mv ${pkgdir}/usr/share/man/man1/airdriver-ng.1 ${srcdir}/tmp/ -} - -package_aircrack-ng-scripts() { - pkgdesc="Included scripts for a key cracker for the 802.11 WEP and WPA-PSK protocols" - depends=('python2' 'graphviz' 'python2-pylorcon') - - cd ${srcdir}/aircrack-ng-${pkgver}/scripts - mkdir -p ${pkgdir}/usr/share/man/man1/ \ - ${pkgdir}/usr/bin - - ### AIRDRIVER-NG ### - # Script - install -Dm644 airdriver-ng ${pkgdir}/usr/bin/ - # Libs - mkdir -p ${pkgdir}/usr/lib/airdrop-ng/ - install -Dm644 airdrop-ng/lib/{colorize.py,libDumpParse.py,libOuiParse.py} \ - ${pkgdir}/usr/lib/airdrop-ng/ - # Man page - mv ${srcdir}/tmp/airdriver-ng.1 ${pkgdir}/usr/share/man/man1/ - - ### AIRDROP-NG ### - # Man page - install -Dm644 airdrop-ng/docs/airdrop-ng.1 ${pkgdir}/usr/share/man/man1/ - # Script - sed s/python/python2/ -i airdrop-ng/airdrop-ng.py - install -Dm644 airdrop-ng/airdrop-ng.py ${pkgdir}/usr/bin/airdrop-ng - chmod +x ${pkgdir}/usr/bin/airdrop-ng - - ### AIRGRAPH-NG ### - # Libs - mkdir -p ${pkgdir}/usr/lib/airgraph-ng/ - install -Dm644 airgraph-ng/lib/lib_Airgraphviz.py \ - ${pkgdir}/usr/lib/airgraph-ng/ - # Man page - install -Dm644 airgraph-ng/man/airgraph-ng.1 ${pkgdir}/usr/share/man/man1/ - # Script - sed s/python/python2/ -i airgraph-ng/airgraph-ng.py - sed s_/usr/local/bin/lib_/usr/lib_ -i airgraph-ng/airgraph-ng.py - install -Dm644 airgraph-ng/airgraph-ng.py ${pkgdir}/usr/bin/airgraph-ng - chmod +x ${pkgdir}/usr/bin/airgraph-ng - - ### DUMP-JOIN.PY ### - # Man page - install -Dm644 airgraph-ng/man/dump-join.1 ${pkgdir}/usr/share/man/man1/ - # Script - sed s/python/python2/ -i airgraph-ng/dump-join.py - install -Dm644 airgraph-ng/dump-join.py ${pkgdir}/usr/bin/dump-join.py - chmod +x ${pkgdir}/usr/bin/dump-join.py - - ### AIRODUMP-NG-OUI-UPDATE ### - # Script - install -Dm644 airodump-ng-oui-update ${pkgdir}/usr/bin/ - chmod +x ${pkgdir}/usr/bin/airodump-ng-oui-update - +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" SQLITE=true UNSTABLE=true \ + bindir=/usr/bin sbindir=/usr/bin mandir=/usr/share/man/man1 install } diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 6ecba36c1..13cd9b3d2 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91902 2013-05-29 10:03:34Z spupykin $ +# $Id: PKGBUILD 96844 2013-09-06 12:39:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.2.0 -pkgrel=8 +pkgrel=9 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" diff --git a/community/freeradius/freeradius.install b/community/freeradius/freeradius.install index cb7590e77..8ec764b81 100644 --- a/community/freeradius/freeradius.install +++ b/community/freeradius/freeradius.install @@ -5,13 +5,17 @@ post_install() { touch var/log/radius/radius.log chown -R radiusd:radiusd var/log/radius/radius.log - [ -d etc/raddb ] || cp -a etc/raddb.default etc/raddb + [ -d etc/raddb ] || { + cp -a etc/raddb.default etc/raddb + chown -R radiusd:radiusd etc/raddb + } - true + systemd-tmpfiles --create freeradius.conf } post_remove() { userdel radiusd - groupdel radiusd - true + grep "^radiusd:" etc/group >/dev/null && groupdel radiusd + systemd-tmpfiles --create freeradius.conf + echo "-- You may want to remove /var/lib/radiusd and /etc/raddb" } diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD index cee1881d0..c8e766304 100644 --- a/community/mtpaint/PKGBUILD +++ b/community/mtpaint/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 96739 2013-09-03 19:46:20Z arodseth $ +# $Id: PKGBUILD 96840 2013-09-06 11:15:47Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: yosh64 <yosh64.at.gmail.dot.com> pkgname=mtpaint pkgver=3.40 -pkgrel=12 +pkgrel=13 pkgdesc='Simple paint program for creating icons and pixel based artwork' arch=('x86_64' 'i686') url='http://mtpaint.sourceforge.net/' license=('GPL3') depends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'desktop-file-utils' 'lcms2' - 'jasper' 'libtiff' 'libpng' 'freetype2') -makedepends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'jasper' 'libtiff' - 'libpng' 'freetype2') + 'libtiff' 'libpng' 'freetype2') +makedepends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'libtiff' 'libpng' + 'freetype2') install='mtpaint.install' source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890') @@ -21,6 +21,10 @@ sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890') prepare() { cd "$pkgname-$pkgver" + # Recommended by Mark Tyler himself + sed -i 's:$LIBS $LDFLAGS:$LDFLAGS $LIBS:' configure + + # Needed for giflib 5. Not needed for mtpaint>3.40. sed -i 's:EGifOpenFileName(file_name, FALSE):EGifOpenFileName(file_name, FALSE, NULL):' src/png.c sed -i 's:DGifOpenFileName(file_name):DGifOpenFileName(file_name, NULL):g' src/png.c sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index b7f7e46ae..b3653f3ca 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96533 2013-08-31 09:24:59Z bpiotrowski $ +# $Id: PKGBUILD 96830 2013-09-06 06:55:21Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -7,7 +7,7 @@ pkgname=mupdf pkgver=1.3 -pkgrel=4 +pkgrel=5 pkgdesc='Lightweight PDF and XPS viewer' arch=('i686' 'x86_64') url='http://mupdf.com' @@ -44,6 +44,7 @@ package() { sed -i -e 's/mupdf.xpm/mupdf/' \ -e 's/application\/x-pdf/application\/x-pdf/' \ -e 's/mupdf-select-file/mupdf/' \ + -e 's/^$/NoDisplay=true/' \ mupdf.desktop install -Dm644 mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop install -Dm644 mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm diff --git a/community/pam_pwcheck/PKGBUILD b/community/pam_pwcheck/PKGBUILD deleted file mode 100644 index 5fd677e1e..000000000 --- a/community/pam_pwcheck/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 90578 2013-05-13 09:54:52Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=pam_pwcheck -pkgver=3.12.1 -pkgrel=1 -pkgdesc="A password strength checking module for PAM-aware password changing programs" -arch=(i686 x86_64) -url="http://www.thkukuk.de/pam/pam_pwcheck/" -depends=('pam') -license=('GPL') -source=(ftp://ftp.suse.com/pub/people/kukuk/pam/pam_pwcheck/pam_pwcheck-$pkgver.tar.bz2) -md5sums=('85cd0d48500c160abcb0b9902e5594ce') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index d03574675..d2ed9985c 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96198 2013-08-21 15:11:15Z arodseth $ +# $Id: PKGBUILD 96836 2013-09-06 09:47:36Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Jelle van der Waa <jelle@vdwaa.nl> pkgbase=python-pymongo pkgname=('python-pymongo' 'python2-pymongo') -pkgver=2.6 +pkgver=2.6.1 pkgrel=1 pkgdesc='Python driver for MongoDB' arch=('x86_64' 'i686') @@ -13,7 +13,7 @@ license=('APACHE') url='http://pypi.python.org/pypi/pymongo/' makedepends=('python-setuptools' 'python2-setuptools') source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") -sha256sums=('0397584348e5b9efa678878ef686ea3bb77f9b83e634480033ce67467d43675a') +sha256sums=('1ed87e7b297f4dfbf9a40176ffeb7faf1ac0b0952d290380f7e632a8fb93694c') build() { cd "$srcdir" diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index 45e62a019..cf17e1398 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 96151 2013-08-20 11:37:41Z spupykin $ +# $Id: PKGBUILD 96852 2013-09-06 18:23:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Giovanni Scafora <linuxmania@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=qcad -pkgver=3.2.0.0 -pkgrel=2 +pkgver=3.2.2.2 +pkgrel=1 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64') url="http://www.ribbonsoft.com/qcad.html" @@ -16,7 +16,7 @@ makedepends=('glu') options=(libtool) source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz QCad.desktop) -md5sums=('6dd9c47742a0193a739d390e81ca67d0' +md5sums=('49c05861b309c48f04ed7910b496e48c' '35100eaedbdf6625f6e6a09b177854cd') prepare() { diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD index cd1d72b87..ba0fa4e79 100644 --- a/community/the_silver_searcher/PKGBUILD +++ b/community/the_silver_searcher/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94746 2013-07-29 21:17:53Z arodseth $ +# $Id: PKGBUILD 96848 2013-09-06 14:29:02Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jeff Horelick <jdhore1@gmail.com> # Contributor: skydrome <skydrome@i2pmail.org> pkgname=the_silver_searcher -pkgver=0.15 +pkgver=0.16 pkgrel=1 pkgdesc='Code searching tool similar to Ack, but faster' url='https://github.com/ggreer/the_silver_searcher' @@ -12,17 +12,22 @@ license=('Apache') depends=('pcre' 'zlib' 'xz') arch=('x86_64' 'i686') source=("$pkgname-$pkgver.tar.gz::https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz") -sha256sums=('bb05e329148315a9791cfa5cc1f7db4681e44476729971b4b3b7c2845a635748') +sha256sums=('2be261b18a74adf4354515544a7e7bfdb970005ce1f0fc78f56a6801e629ada7') + +prepare() { + cd "$pkgname-$pkgver" + + sed -i 's:configure:configure --prefix=/usr:' build.sh +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" - sed -i 's:configure:configure --prefix=/usr:' build.sh ./build.sh } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index cfd092a19..44f7ee06a 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 94529 2013-07-26 11:27:17Z jelle $ +# $Id: PKGBUILD 96822 2013-09-06 02:46:41Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: orbisvicis <gmail.com> pkgname=xmonad-contrib pkgver=0.11.2 -pkgrel=1 +pkgrel=2 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.6.3-1' 'xmonad=0.11-6' 'sh' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' 'haskell-random=1.0.1.1-5') +depends=('ghc=7.6.3-1' 'xmonad=0.11-7' 'sh' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' 'haskell-random=1.0.1.1-5') install='xmonad-contrib.install' source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) md5sums=('415a7ed9449198b0e93d49ab0a4a0f72') diff --git a/extra/lcms/PKGBUILD b/extra/lcms/PKGBUILD index a8706fe41..7271ad881 100644 --- a/extra/lcms/PKGBUILD +++ b/extra/lcms/PKGBUILD @@ -1,18 +1,25 @@ -# $Id: PKGBUILD 148810 2012-02-05 11:51:27Z ibiru $ +# $Id: PKGBUILD 193922 2013-09-06 07:11:54Z bpiotrowski $ # Maintainer: Tobias Kieslich <neri@archlinux.org> # Contributor: Ben <contrasutra@myrealbox.com> pkgname=lcms pkgver=1.19 -pkgrel=2 +pkgrel=4 pkgdesc="Lightweight color management development library/engine" arch=('i686' 'x86_64') license=('custom') depends=('libtiff') url="http://www.littlecms.com" options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('8af94611baf20d9646c7c2c285859818') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz + cve-2013-4276.patch) +md5sums=('8af94611baf20d9646c7c2c285859818' + 'fa1db4861cfa05f4c4a2c826e1c35502') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../cve-2013-4276.patch +} build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/lcms/cve-2013-4276.patch b/extra/lcms/cve-2013-4276.patch new file mode 100644 index 000000000..8f2f32297 --- /dev/null +++ b/extra/lcms/cve-2013-4276.patch @@ -0,0 +1,62 @@ +diff -ur lcms-1.19.dfsg/samples/icctrans.c lcms-1.19.dfsg-patched/samples/icctrans.c +--- lcms-1.19.dfsg/samples/icctrans.c 2009-10-30 15:57:45.000000000 +0000 ++++ lcms-1.19.dfsg-patched/samples/icctrans.c 2013-08-06 11:53:14.385266647 +0100 +@@ -86,6 +86,8 @@ + static LPcmsNAMEDCOLORLIST InputColorant = NULL; + static LPcmsNAMEDCOLORLIST OutputColorant = NULL; + ++unsigned int Buffer_size = 4096; ++ + + // isatty replacement + +@@ -500,7 +502,7 @@ + + Prefix[0] = 0; + if (!lTerse) +- sprintf(Prefix, "%s=", C); ++ snprintf(Prefix, 20, "%s=", C); + + if (InHexa) + { +@@ -648,7 +650,9 @@ + static + void GetLine(char* Buffer) + { +- scanf("%s", Buffer); ++ char User_buffer[Buffer_size]; ++ fgets(User_buffer, (Buffer_size - 1), stdin); ++ sscanf(User_buffer,"%s", Buffer); + + if (toupper(Buffer[0]) == 'Q') { // Quit? + +@@ -668,7 +672,7 @@ + static + double GetAnswer(const char* Prompt, double Range) + { +- char Buffer[4096]; ++ char Buffer[Buffer_size]; + double val = 0.0; + + if (Range == 0.0) { // Range 0 means double value +@@ -738,7 +742,7 @@ + static + WORD GetIndex(void) + { +- char Buffer[4096], Name[40], Prefix[40], Suffix[40]; ++ char Buffer[Buffer_size], Name[40], Prefix[40], Suffix[40]; + int index, max; + + max = cmsNamedColorCount(hTrans)-1; +diff -ur lcms-1.19.dfsg/tifficc/tiffdiff.c lcms-1.19.dfsg-patched/tifficc/tiffdiff.c +--- lcms-1.19.dfsg/tifficc/tiffdiff.c 2009-10-30 15:57:46.000000000 +0000 ++++ lcms-1.19.dfsg-patched/tifficc/tiffdiff.c 2013-08-06 11:49:06.698951157 +0100 +@@ -633,7 +633,7 @@ + cmsIT8SetSheetType(hIT8, "TIFFDIFF"); + + +- sprintf(Buffer, "Differences between %s and %s", TiffName1, TiffName2); ++ snprintf(Buffer, 256, "Differences between %s and %s", TiffName1, TiffName2); + + cmsIT8SetComment(hIT8, Buffer); + diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 311b0a0bb..4e042d879 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188891 2013-06-23 23:24:25Z bisson $ +# $Id: PKGBUILD 193923 2013-09-06 07:17:49Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix -pkgver=2.10.1 +pkgver=2.10.2 pkgrel=1 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' @@ -16,9 +16,9 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig} 'aliases.patch' 'service') -sha1sums=('3e236cf95a7439750e92d9ef5cd510c00e603eb2' 'SKIP' +sha1sums=('4721024784d071c3e663d610db17f8bd99821f3d' 'SKIP' '5fc3de6c7df1e5851a0a379e825148868808318b' - '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6') + 'dd12885d367bebaf0fc9d2e9823a7f82086b6ee9') provides=('smtp-server' 'smtp-forwarder') conflicts=('smtp-server' 'smtp-forwarder') diff --git a/extra/postfix/service b/extra/postfix/service index e7d4cd20c..a7cdc5379 100644 --- a/extra/postfix/service +++ b/extra/postfix/service @@ -5,9 +5,9 @@ After=network.target [Service] Type=forking PIDFile=/var/spool/postfix/pid/master.pid -ExecStart=/usr/sbin/postfix start -ExecStop=/usr/sbin/postfix stop -ExecReload=/usr/sbin/postfix reload +ExecStart=/usr/bin/postfix start +ExecStop=/usr/bin/postfix stop +ExecReload=/usr/bin/postfix reload Restart=always [Install] diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index d295893d5..b9031834f 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,28 +1,30 @@ -# $Id: PKGBUILD 186286 2013-05-23 20:40:14Z stephane $ +# $Id: PKGBUILD 193927 2013-09-06 07:53:42Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python pkgver=3.3.2 -pkgrel=1 +pkgrel=2 _pybasever=3.3 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64') license=('custom') url="http://www.python.org/" depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') -makedepends=('tk>=8.6.0' 'sqlite' 'valgrind' 'bluez') +makedepends=('tk>=8.6.0' 'sqlite' 'valgrind' 'bluez-libs') optdepends=('tk: for tkinter' 'sqlite') provides=('python3') replaces=('python3') options=('!makeflags') source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz - python-3.3.2-CVE-2013-2099.patch) + python-3.3.2-CVE-2013-2099.patch + python-3.3.2-CVE-2013-4238.patch) sha1sums=('87009d0c156c6e1354dfec5c98c328cae93950ad' - 'b7a386b2e2f0811b344898500860ec31ba81ed4d') + 'bfe07759daacd4ffa0e682e65f0c9fb84f715c73' + 'c30297201ef5cd803b685085ca6defb7ca66d2cd') -build() { +prepare() { cd "${srcdir}/Python-${pkgver}" # FS#23997 @@ -35,6 +37,11 @@ build() { rm -r Modules/_ctypes/{darwin,libffi}* patch -Np1 -i ../python-3.3.2-CVE-2013-2099.patch + patch -Np1 -i ../python-3.3.2-CVE-2013-4238.patch +} + +build() { + cd "${srcdir}/Python-${pkgver}" ./configure --prefix=/usr \ --enable-shared \ @@ -60,11 +67,12 @@ package() { make DESTDIR="${pkgdir}" install maninstall # Why are these not done by default... - ln -sf python3 "${pkgdir}/usr/bin/python" - ln -sf python3-config "${pkgdir}/usr/bin/python-config" - ln -sf idle3 "${pkgdir}/usr/bin/idle" - ln -sf pydoc3 "${pkgdir}/usr/bin/pydoc" - ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1" + ln -sf python3 "${pkgdir}"/usr/bin/python + ln -sf python3-config "${pkgdir}"/usr/bin/python-config + ln -sf idle3 "${pkgdir}"/usr/bin/idle + ln -sf pydoc3 "${pkgdir}"/usr/bin/pydoc + ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python3.1 + ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1 # Fix FS#22552 ln -sf ../../libpython${_pybasever}m.so \ diff --git a/extra/python/python-3.3.2-CVE-2013-2099.patch b/extra/python/python-3.3.2-CVE-2013-2099.patch index 8162d8e54..888b43b00 100644 --- a/extra/python/python-3.3.2-CVE-2013-2099.patch +++ b/extra/python/python-3.3.2-CVE-2013-2099.patch @@ -1,4 +1,3 @@ - # HG changeset patch # User Antoine Pitrou <solipsis@pitrou.net> # Date 1368892602 -7200 diff --git a/extra/python/python-3.3.2-CVE-2013-4238.patch b/extra/python/python-3.3.2-CVE-2013-4238.patch new file mode 100644 index 000000000..2de2ed47f --- /dev/null +++ b/extra/python/python-3.3.2-CVE-2013-4238.patch @@ -0,0 +1,255 @@ + +# HG changeset patch +# User Christian Heimes <christian@cheimes.de> +# Date 1376693687 -7200 +# Node ID c9f073e593b037e8a29e386326859537691bcf62 +# Parent 3105b78d34346ea36c52a3b7e635954f4b444120 +Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes +inside subjectAltName correctly. Formerly the module has used OpenSSL's +GENERAL_NAME_print() function to get the string represention of ASN.1 +strings for rfc822Name (email), dNSName (DNS) and +uniformResourceIdentifier (URI). + +diff --git a/Lib/test/nullbytecert.pem b/Lib/test/nullbytecert.pem +new file mode 100644 +--- /dev/null ++++ b/Lib/test/nullbytecert.pem +@@ -0,0 +1,90 @@ ++Certificate: ++ Data: ++ Version: 3 (0x2) ++ Serial Number: 0 (0x0) ++ Signature Algorithm: sha1WithRSAEncryption ++ Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org ++ Validity ++ Not Before: Aug 7 13:11:52 2013 GMT ++ Not After : Aug 7 13:12:52 2013 GMT ++ Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org ++ Subject Public Key Info: ++ Public Key Algorithm: rsaEncryption ++ Public-Key: (2048 bit) ++ Modulus: ++ 00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3: ++ 03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97: ++ 16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2: ++ 88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1: ++ 32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4: ++ 56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8: ++ a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02: ++ 45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75: ++ ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91: ++ 90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d: ++ 7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30: ++ 68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7: ++ f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12: ++ f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5: ++ ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb: ++ d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f: ++ 9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da: ++ 2f:85 ++ Exponent: 65537 (0x10001) ++ X509v3 extensions: ++ X509v3 Basic Constraints: critical ++ CA:FALSE ++ X509v3 Subject Key Identifier: ++ 88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C ++ X509v3 Key Usage: ++ Digital Signature, Non Repudiation, Key Encipherment ++ X509v3 Subject Alternative Name: ++ ************************************************************* ++ WARNING: The values for DNS, email and URI are WRONG. OpenSSL ++ doesn't print the text after a NULL byte. ++ ************************************************************* ++ DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1 ++ Signature Algorithm: sha1WithRSAEncryption ++ ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5: ++ a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44: ++ 3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37: ++ 86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3: ++ 56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86: ++ de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac: ++ 3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4: ++ 60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60: ++ d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5: ++ 25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60: ++ 1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6: ++ 4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d: ++ 0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e: ++ 5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6: ++ c1:ca:a9:94 ++-----BEGIN CERTIFICATE----- ++MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx ++DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ ++eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg ++RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y ++ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw ++NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI ++DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv ++ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt ++ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq ++hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB ++BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j ++pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P ++vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv ++KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA ++oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL ++08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV ++HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E ++BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu ++Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251 ++bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA ++AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9 ++i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j ++HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk ++kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx ++VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW ++RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ= ++-----END CERTIFICATE----- +diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py +--- a/Lib/test/test_ssl.py ++++ b/Lib/test/test_ssl.py +@@ -55,6 +55,7 @@ BADCERT = data_file("badcert.pem") + WRONGCERT = data_file("XXXnonexisting.pem") + BADKEY = data_file("badkey.pem") + NOKIACERT = data_file("nokia.pem") ++NULLBYTECERT = data_file("nullbytecert.pem") + + DHFILE = data_file("dh512.pem") + BYTES_DHFILE = os.fsencode(DHFILE) +@@ -162,6 +163,27 @@ class BasicSocketTests(unittest.TestCase + ('DNS', 'projects.forum.nokia.com')) + ) + ++ def test_parse_cert_CVE_2013_4238(self): ++ p = ssl._ssl._test_decode_cert(NULLBYTECERT) ++ if support.verbose: ++ sys.stdout.write("\n" + pprint.pformat(p) + "\n") ++ subject = ((('countryName', 'US'),), ++ (('stateOrProvinceName', 'Oregon'),), ++ (('localityName', 'Beaverton'),), ++ (('organizationName', 'Python Software Foundation'),), ++ (('organizationalUnitName', 'Python Core Development'),), ++ (('commonName', 'null.python.org\x00example.org'),), ++ (('emailAddress', 'python-dev@python.org'),)) ++ self.assertEqual(p['subject'], subject) ++ self.assertEqual(p['issuer'], subject) ++ self.assertEqual(p['subjectAltName'], ++ (('DNS', 'altnull.python.org\x00example.com'), ++ ('email', 'null@python.org\x00user@example.org'), ++ ('URI', 'http://null.python.org\x00http://example.org'), ++ ('IP Address', '192.0.2.1'), ++ ('IP Address', '2001:DB8:0:0:0:0:0:1\n')) ++ ) ++ + def test_DER_to_PEM(self): + with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f: + pem = f.read() +@@ -294,6 +316,13 @@ class BasicSocketTests(unittest.TestCase + fail(cert, 'foo.a.com') + fail(cert, 'bar.foo.com') + ++ # NULL bytes are bad, CVE-2013-4073 ++ cert = {'subject': ((('commonName', ++ 'null.python.org\x00example.org'),),)} ++ ok(cert, 'null.python.org\x00example.org') # or raise an error? ++ fail(cert, 'example.org') ++ fail(cert, 'null.python.org') ++ + # Slightly fake real-world example + cert = {'notAfter': 'Jun 26 21:41:46 2011 GMT', + 'subject': ((('commonName', 'linuxfrz.org'),),), +diff --git a/Modules/_ssl.c b/Modules/_ssl.c +--- a/Modules/_ssl.c ++++ b/Modules/_ssl.c +@@ -771,12 +771,14 @@ static PyObject * + ext->value->length)); + + for(j = 0; j < sk_GENERAL_NAME_num(names); j++) { +- + /* get a rendering of each name in the set of names */ ++ int gntype; ++ ASN1_STRING *as = NULL; + + name = sk_GENERAL_NAME_value(names, j); +- if (name->type == GEN_DIRNAME) { +- ++ gntype = name-> type; ++ switch (gntype) { ++ case GEN_DIRNAME: + /* we special-case DirName as a tuple of + tuples of attributes */ + +@@ -798,11 +800,62 @@ static PyObject * + goto fail; + } + PyTuple_SET_ITEM(t, 1, v); ++ break; + +- } else { ++ case GEN_EMAIL: ++ case GEN_DNS: ++ case GEN_URI: ++ /* GENERAL_NAME_print() doesn't handle NULL bytes in ASN1_string ++ correctly, CVE-2013-4238 */ ++ t = PyTuple_New(2); ++ if (t == NULL) ++ goto fail; ++ switch (gntype) { ++ case GEN_EMAIL: ++ v = PyUnicode_FromString("email"); ++ as = name->d.rfc822Name; ++ break; ++ case GEN_DNS: ++ v = PyUnicode_FromString("DNS"); ++ as = name->d.dNSName; ++ break; ++ case GEN_URI: ++ v = PyUnicode_FromString("URI"); ++ as = name->d.uniformResourceIdentifier; ++ break; ++ } ++ if (v == NULL) { ++ Py_DECREF(t); ++ goto fail; ++ } ++ PyTuple_SET_ITEM(t, 0, v); ++ v = PyUnicode_FromStringAndSize((char *)ASN1_STRING_data(as), ++ ASN1_STRING_length(as)); ++ if (v == NULL) { ++ Py_DECREF(t); ++ goto fail; ++ } ++ PyTuple_SET_ITEM(t, 1, v); ++ break; + ++ default: + /* for everything else, we use the OpenSSL print form */ +- ++ switch (gntype) { ++ /* check for new general name type */ ++ case GEN_OTHERNAME: ++ case GEN_X400: ++ case GEN_EDIPARTY: ++ case GEN_IPADD: ++ case GEN_RID: ++ break; ++ default: ++ if (PyErr_WarnFormat(PyExc_RuntimeWarning, 1, ++ "Unknown general name type %d", ++ gntype) == -1) { ++ goto fail; ++ } ++ break; ++ } + (void) BIO_reset(biobuf); + GENERAL_NAME_print(biobuf, name); + len = BIO_gets(biobuf, buf, sizeof(buf)-1); +@@ -829,6 +882,7 @@ static PyObject * + goto fail; + } + PyTuple_SET_ITEM(t, 1, v); ++ break; + } + + /* and add that rendering to the list */ + diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index f76242d3b..3d66fb8fe 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,27 +1,32 @@ -# $Id: PKGBUILD 185697 2013-05-17 11:13:51Z stephane $ +# $Id: PKGBUILD 193929 2013-09-06 08:06:17Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 pkgver=2.7.5 -pkgrel=1 +pkgrel=2 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64') license=('PSF') url="http://www.python.org/" depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi') -makedepends=('tk>=8.6.0' 'bluez') +makedepends=('tk>=8.6.0' 'bluez-libs') optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) -sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf') +source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz + python-2.7.5-CVE-2013-4238.patch) +sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf' + 'fb1f95ca21d9c00eaaea5a58236d1d97300482d7') -build() { +prepare() { cd "${srcdir}/Python-${pkgver}" + # http://bugs.python.org/issue18709 + patch -Np1 -i ../python-2.7.5-CVE-2013-4238.patch + # Temporary workaround for FS#22322 # See http://bugs.python.org/issue10835 for upstream report sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c @@ -40,6 +45,10 @@ build() { rm -r Modules/expat rm -r Modules/zlib rm -r Modules/_ctypes/{darwin,libffi}* +} + +build() { + cd "${srcdir}/Python-${pkgver}" export OPT="${CFLAGS}" ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \ diff --git a/extra/python2/python-2.7.5-CVE-2013-4238.patch b/extra/python2/python-2.7.5-CVE-2013-4238.patch new file mode 100644 index 000000000..c37190182 --- /dev/null +++ b/extra/python2/python-2.7.5-CVE-2013-4238.patch @@ -0,0 +1,267 @@ + +# HG changeset patch +# User Christian Heimes <christian@cheimes.de> +# Date 1376693687 -7200 +# Node ID bd2360476bdbb1477b81b0e18b8d86b3452ba77b +# Parent 87fcc13ade91874971ad577efaa2254c744a2b07 +Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes +inside subjectAltName correctly. Formerly the module has used OpenSSL's +GENERAL_NAME_print() function to get the string represention of ASN.1 +strings for rfc822Name (email), dNSName (DNS) and +uniformResourceIdentifier (URI). + +diff --git a/Lib/test/nullbytecert.pem b/Lib/test/nullbytecert.pem +new file mode 100644 +--- /dev/null ++++ b/Lib/test/nullbytecert.pem +@@ -0,0 +1,90 @@ ++Certificate: ++ Data: ++ Version: 3 (0x2) ++ Serial Number: 0 (0x0) ++ Signature Algorithm: sha1WithRSAEncryption ++ Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org ++ Validity ++ Not Before: Aug 7 13:11:52 2013 GMT ++ Not After : Aug 7 13:12:52 2013 GMT ++ Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org ++ Subject Public Key Info: ++ Public Key Algorithm: rsaEncryption ++ Public-Key: (2048 bit) ++ Modulus: ++ 00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3: ++ 03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97: ++ 16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2: ++ 88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1: ++ 32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4: ++ 56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8: ++ a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02: ++ 45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75: ++ ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91: ++ 90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d: ++ 7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30: ++ 68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7: ++ f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12: ++ f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5: ++ ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb: ++ d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f: ++ 9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da: ++ 2f:85 ++ Exponent: 65537 (0x10001) ++ X509v3 extensions: ++ X509v3 Basic Constraints: critical ++ CA:FALSE ++ X509v3 Subject Key Identifier: ++ 88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C ++ X509v3 Key Usage: ++ Digital Signature, Non Repudiation, Key Encipherment ++ X509v3 Subject Alternative Name: ++ ************************************************************* ++ WARNING: The values for DNS, email and URI are WRONG. OpenSSL ++ doesn't print the text after a NULL byte. ++ ************************************************************* ++ DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1 ++ Signature Algorithm: sha1WithRSAEncryption ++ ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5: ++ a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44: ++ 3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37: ++ 86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3: ++ 56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86: ++ de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac: ++ 3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4: ++ 60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60: ++ d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5: ++ 25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60: ++ 1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6: ++ 4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d: ++ 0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e: ++ 5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6: ++ c1:ca:a9:94 ++-----BEGIN CERTIFICATE----- ++MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx ++DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ ++eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg ++RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y ++ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw ++NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI ++DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv ++ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt ++ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq ++hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB ++BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j ++pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P ++vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv ++KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA ++oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL ++08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV ++HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E ++BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu ++Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251 ++bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA ++AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9 ++i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j ++HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk ++kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx ++VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW ++RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ= ++-----END CERTIFICATE----- +diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py +--- a/Lib/test/test_ssl.py ++++ b/Lib/test/test_ssl.py +@@ -25,6 +25,7 @@ ssl = test_support.import_module("ssl") + HOST = test_support.HOST + CERTFILE = None + SVN_PYTHON_ORG_ROOT_CERT = None ++NULLBYTECERT = None + + def handle_error(prefix): + exc_format = ' '.join(traceback.format_exception(*sys.exc_info())) +@@ -123,6 +124,27 @@ class BasicSocketTests(unittest.TestCase + ('DNS', 'projects.forum.nokia.com')) + ) + ++ def test_parse_cert_CVE_2013_4238(self): ++ p = ssl._ssl._test_decode_cert(NULLBYTECERT) ++ if test_support.verbose: ++ sys.stdout.write("\n" + pprint.pformat(p) + "\n") ++ subject = ((('countryName', 'US'),), ++ (('stateOrProvinceName', 'Oregon'),), ++ (('localityName', 'Beaverton'),), ++ (('organizationName', 'Python Software Foundation'),), ++ (('organizationalUnitName', 'Python Core Development'),), ++ (('commonName', 'null.python.org\x00example.org'),), ++ (('emailAddress', 'python-dev@python.org'),)) ++ self.assertEqual(p['subject'], subject) ++ self.assertEqual(p['issuer'], subject) ++ self.assertEqual(p['subjectAltName'], ++ (('DNS', 'altnull.python.org\x00example.com'), ++ ('email', 'null@python.org\x00user@example.org'), ++ ('URI', 'http://null.python.org\x00http://example.org'), ++ ('IP Address', '192.0.2.1'), ++ ('IP Address', '2001:DB8:0:0:0:0:0:1\n')) ++ ) ++ + def test_DER_to_PEM(self): + with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f: + pem = f.read() +@@ -1360,7 +1382,7 @@ else: + + + def test_main(verbose=False): +- global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT ++ global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT, NULLBYTECERT + CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, + "keycert.pem") + SVN_PYTHON_ORG_ROOT_CERT = os.path.join( +@@ -1368,10 +1390,13 @@ def test_main(verbose=False): + "https_svn_python_org_root.pem") + NOKIACERT = os.path.join(os.path.dirname(__file__) or os.curdir, + "nokia.pem") ++ NULLBYTECERT = os.path.join(os.path.dirname(__file__) or os.curdir, ++ "nullbytecert.pem") + + if (not os.path.exists(CERTFILE) or + not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT) or +- not os.path.exists(NOKIACERT)): ++ not os.path.exists(NOKIACERT) or ++ not os.path.exists(NULLBYTECERT)): + raise test_support.TestFailed("Can't read certificate files!") + + tests = [BasicTests, BasicSocketTests] +diff --git a/Modules/_ssl.c b/Modules/_ssl.c +--- a/Modules/_ssl.c ++++ b/Modules/_ssl.c +@@ -738,13 +738,16 @@ static PyObject * + ext->value->length)); + + for(j = 0; j < sk_GENERAL_NAME_num(names); j++) { +- + /* get a rendering of each name in the set of names */ ++ int gntype; ++ ASN1_STRING *as = NULL; + + name = sk_GENERAL_NAME_value(names, j); +- if (name->type == GEN_DIRNAME) { +- +- /* we special-case DirName as a tuple of tuples of attributes */ ++ gntype = name-> type; ++ switch (gntype) { ++ case GEN_DIRNAME: ++ /* we special-case DirName as a tuple of ++ tuples of attributes */ + + t = PyTuple_New(2); + if (t == NULL) { +@@ -764,11 +767,61 @@ static PyObject * + goto fail; + } + PyTuple_SET_ITEM(t, 1, v); ++ break; + +- } else { ++ case GEN_EMAIL: ++ case GEN_DNS: ++ case GEN_URI: ++ /* GENERAL_NAME_print() doesn't handle NULL bytes in ASN1_string ++ correctly, CVE-2013-4238 */ ++ t = PyTuple_New(2); ++ if (t == NULL) ++ goto fail; ++ switch (gntype) { ++ case GEN_EMAIL: ++ v = PyString_FromString("email"); ++ as = name->d.rfc822Name; ++ break; ++ case GEN_DNS: ++ v = PyString_FromString("DNS"); ++ as = name->d.dNSName; ++ break; ++ case GEN_URI: ++ v = PyString_FromString("URI"); ++ as = name->d.uniformResourceIdentifier; ++ break; ++ } ++ if (v == NULL) { ++ Py_DECREF(t); ++ goto fail; ++ } ++ PyTuple_SET_ITEM(t, 0, v); ++ v = PyString_FromStringAndSize((char *)ASN1_STRING_data(as), ++ ASN1_STRING_length(as)); ++ if (v == NULL) { ++ Py_DECREF(t); ++ goto fail; ++ } ++ PyTuple_SET_ITEM(t, 1, v); ++ break; + ++ default: + /* for everything else, we use the OpenSSL print form */ +- ++ switch (gntype) { ++ /* check for new general name type */ ++ case GEN_OTHERNAME: ++ case GEN_X400: ++ case GEN_EDIPARTY: ++ case GEN_IPADD: ++ case GEN_RID: ++ break; ++ default: ++ if (PyErr_Warn(PyExc_RuntimeWarning, ++ "Unknown general name type") == -1) { ++ goto fail; ++ } ++ break; ++ } + (void) BIO_reset(biobuf); + GENERAL_NAME_print(biobuf, name); + len = BIO_gets(biobuf, buf, sizeof(buf)-1); +@@ -794,6 +847,7 @@ static PyObject * + goto fail; + } + PyTuple_SET_ITEM(t, 1, v); ++ break; + } + + /* and add that rendering to the list */ + diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index a24893a6f..8ff51b16d 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191729 2013-07-29 18:51:12Z eric $ +# $Id: PKGBUILD 193917 2013-09-06 04:31:29Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=liferea pkgname=liferea-libre -pkgver=1.10.1.a +pkgver=1.10.2 pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64') @@ -24,19 +24,20 @@ optdepends=('gnome-keyring: for keyring plugin support' 'gst-plugins-bad-libre: for media player plugin support') options=('!libtool' '!emptydirs') install=liferea.install -source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver%*.*}a.tar.bz2 +source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('c0c8508adb6ccfda46453b6a213c15ab78ad5d2c' +sha1sums=('24d533af7dcd985d3cc8b2589fc3443c17b5acd7' '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1') build() { - cd liferea-${pkgver%*.*}a + cd liferea-${pkgver} + # remove nonfree suggestions patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-compile make } package() { - cd liferea-${pkgver%*.*}a + cd liferea-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/libre/parabolaiso-data/PKGBUILD b/libre/parabolaiso-data/PKGBUILD new file mode 100644 index 000000000..22c1b98f6 --- /dev/null +++ b/libre/parabolaiso-data/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Esteban Carnevale <alfplayer@mailoo.org> + +pkgname=parabolaiso-data +pkgver=1 +pkgrel=1 +pkgdesc="Data files of parabolaiso, the tool to create ISO images" +arch=('any') +url="https://projects.parabolagnulinux.org/parabolaiso.git" +license=('GPL') +_basesource1='https://projects.parabolagnulinux.org/~old/parabolaiso.git/plain' +_basesource2='https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2' +source=("${_basesource1}/configs/releng/syslinux/splash.png" + "${_basesource2}/ShellBinPkg/UefiShell/X64/Shell.efi" + "${_basesource2}/EdkShellBinPkg/FullShell/X64/Shell_Full.efi") +md5sums=('befd0e7c38a03442b791f2a530b4dd2d' + '01a8ee2759fa2170c065414489d9b823' + '92d78841d0c44118064b59e95164b2ee') + +package() { + cd $srcdir + + datadir="usr/share/parabolaiso/data" + + install -d $pkgdir/$datadir + + install -D -m644 splash.png $pkgdir/$datadir/splash.png + install -D -m644 Shell.efi $pkgdir/$datadir/Shell.efi + install -D -m644 Shell_Full.efi $pkgdir/$datadir/Shell_Full.efi +} diff --git a/libre/parabola-archiso/PKGBUILD b/libre/parabolaiso/PKGBUILD index 336892373..833a6f56b 100755..100644 --- a/libre/parabola-archiso/PKGBUILD +++ b/libre/parabolaiso/PKGBUILD @@ -1,20 +1,21 @@ +# Maintainer: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> # Maintainer: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org> -pkgname=parabola-archiso -pkgver=2012.10.17 -pkgrel=1 +pkgname=parabolaiso +pkgver=2013.09.01 +pkgrel=2 pkgdesc='Tools for creating Parabola GNU/Linux-libre live and install iso images' arch=('any') -url='https://parabolagnulinux.org' +url='https://projects.parabolagnulinux.org/parabolaiso.git/' license=('GPL') -depends=('make' 'squashfs-tools' 'libisoburn' 'dosfstools' 'patch' 'lynx' 'wget') +depends=('make' 'squashfs-tools' 'libisoburn' 'dosfstools' 'parabolaiso-data') provides=('archiso') conflicts=('archiso') source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz" "https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig") -md5sums=('b8a5d4a6ee2547a502cbecea0e238e61' - '9425cc4353b5654d7478e9e2b0bf848d') +md5sums=('e94c1f49f32e02480c14ee3162e8ee1b' + 'SKIP') package() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/pcr/ocsync/PKGBUILD b/pcr/ocsync/PKGBUILD index 97bc26754..cde26af30 100644 --- a/pcr/ocsync/PKGBUILD +++ b/pcr/ocsync/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com> # https://github.com/zizzfizzix/pkgbuilds -# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> +# Maintainer: Jorge Araya Navarro <shackra@riseup.net> # ############################################################## #### The section below can be adjusted to suit your needs #### @@ -15,8 +15,8 @@ _buildtype="Release" ############################################################## pkgname=ocsync -pkgver=0.80.0 -pkgrel=3 +pkgver=0.90.0 +pkgrel=1 pkgdesc="A file synchronizer especially designed for you, the normal user. Dependency of owncloud-client." arch=("i686" "x86_64") url="http://www.csync.org" @@ -52,3 +52,4 @@ package() { cd ${srcdir}/${pkgname}-${pkgver}-build make DESTDIR=${pkgdir} install } +md5sums=('6f1cfe47d6a7741c6e8df8642de52c0f') diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD index a4e86099b..44c8fcaa9 100644 --- a/pcr/owncloud-client/PKGBUILD +++ b/pcr/owncloud-client/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com> # https://github.com/zizzfizzix/pkgbuilds -# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> +# Maintainer: Jorge Araya Navarro <shackra@riseup.net> # ############################################################## #### The section below can be adjusted to suit your needs #### @@ -16,8 +16,8 @@ _buildtype="Release" _name=mirall pkgname=owncloud-client -pkgver=1.3.0 -pkgrel=2 +pkgver=1.4.0 +pkgrel=1 pkgdesc="ownCloud client based on mirall" arch=('i686' 'x86_64') url="http://owncloud.org/" @@ -58,3 +58,4 @@ package() { cd ${srcdir}/${_name}-${pkgver}-build make DESTDIR=${pkgdir} install } +md5sums=('05a69082b4e940b4282c2b05344c143a') diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 33fafddfa..4fa04466e 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.09.05 +pkgver=2013.09.06.1 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -28,5 +28,6 @@ package() { install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } -md5sums=('111dce261a41edc032f386777e90e8e1' + +md5sums=('3ec268b42605d985b1957fab1f13b8ee' 'SKIP') |