diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/libdrm/PKGBUILD | 17 | ||||
-rw-r--r-- | extra/libdrm/git_fixes.diff | 30 | ||||
-rw-r--r-- | extra/libdvdnav/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/libgsf/PKGBUILD | 5 | ||||
-rw-r--r-- | extra/nss/PKGBUILD | 30 | ||||
-rw-r--r-- | extra/nss/add_spi+cacert_ca_certs.patch | 593 | ||||
-rw-r--r-- | extra/poppler/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/poppler/git-fixes.patch | 187 | ||||
-rw-r--r-- | extra/skanlite/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/smartmontools/PKGBUILD | 9 | ||||
-rw-r--r-- | extra/xorg-xinit/PKGBUILD | 9 | ||||
-rw-r--r-- | extra/xorg-xinit/fs25361.patch | 16 | ||||
-rw-r--r-- | extra/xterm/PKGBUILD | 6 |
13 files changed, 178 insertions, 748 deletions
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 6904b9ca3..94c51c177 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 144919 2011-12-10 10:45:30Z andyrtr $ +# $Id: PKGBUILD 145190 2011-12-19 12:35:11Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.28 +pkgver=2.4.29 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) @@ -14,23 +14,18 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch COPYING - git_fixes.diff - #missing files from http://cgit.freedesktop.org/mesa/drm/snapshot/drm-902ee661f1864aaf8325621085f6a1b5a6a3673a.tar.bz2 - https://bugs.freedesktop.org/show_bug.cgi?id=43538 - rbo.h list.h) -md5sums=('6488f64119c6439fa4038e9cd7b30b67' + git_fixes.diff) +md5sums=('96d5e3e9edd55f4b016fe3b5dd0a1953' 'c722c8406507b7e3a8da7a3030d1d9cf' 'ba65e71c481b94ef0fb6c23c7f21ffa1' - '671b87f9670e709e54a19cd292c6330d' - '073846ea43fb4d6130062c1897d92e40' - 'ce867d3331862c2b87d1a37461b42dbe') + 'aebd5336568090b8ec084fabcfb08071') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" - # add a missing file in the release tarball + # git fixes - currently none patch -Np1 -i ${srcdir}/git_fixes.diff - cp ${srcdir}/{rbo,list}.h "${srcdir}/${pkgname}-${pkgver}"/tests/radeon/ #libtoolize --force autoreconf --force --install diff --git a/extra/libdrm/git_fixes.diff b/extra/libdrm/git_fixes.diff index 5ebcb606a..dc80155f2 100644 --- a/extra/libdrm/git_fixes.diff +++ b/extra/libdrm/git_fixes.diff @@ -1,19 +1,13 @@ -From 902ee661f1864aaf8325621085f6a1b5a6a3673a Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Mon, 05 Dec 2011 21:24:48 +0000 -Subject: test/radeon: add missing files for dist - ---- -diff --git a/tests/radeon/Makefile.am b/tests/radeon/Makefile.am -index 021ca72..1775669 100644 ---- a/tests/radeon/Makefile.am -+++ b/tests/radeon/Makefile.am -@@ -9,4 +9,6 @@ noinst_PROGRAMS = \ +diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c +index 19441f3..eb9dd32 100644 +--- a/intel/intel_bufmgr_gem.c ++++ b/intel/intel_bufmgr_gem.c +@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem) + bufmgr_gem->vma_cache.next, + vma_list); + assert(bo_gem->map_count == 0); +- DRMLISTDEL(&bo_gem->vma_list); ++ DRMLISTDELINIT(&bo_gem->vma_list); - radeon_ttm_SOURCES = \ - rbo.c \ -+ rbo.h \ -+ list.h \ - radeon_ttm.c --- -cgit v0.9.0.2-2-gbebe + if (bo_gem->mem_virtual) { + munmap(bo_gem->mem_virtual, bo_gem->bo.size); diff --git a/extra/libdvdnav/PKGBUILD b/extra/libdvdnav/PKGBUILD index 694f6bd6c..21fafd52b 100644 --- a/extra/libdvdnav/PKGBUILD +++ b/extra/libdvdnav/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 144385 2011-12-05 13:01:06Z jgc $ +# $Id: PKGBUILD 145184 2011-12-19 11:48:47Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan <arjan@archlinux.org> # contributor Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libdvdnav pkgver=4.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="The library for xine-dvdnav plugin." arch=('i686' 'x86_64') license=('GPL') -url="http://http://dvdnav.mplayerhq.hu/" +url="http://dvdnav.mplayerhq.hu/" depends=('libdvdread') options=(!libtool) source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD index b7be49cc1..87a0928a8 100644 --- a/extra/libgsf/PKGBUILD +++ b/extra/libgsf/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 145141 2011-12-17 20:36:05Z ibiru $ +# $Id: PKGBUILD 145205 2011-12-19 17:59:06Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libgsf pkgver=1.14.22 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats" url="http://www.gnome.org/" license=('GPL' 'LGPL') options=('!libtool') depends=('libxml2' 'gdk-pixbuf2' 'bzip2') +conflicts=("libgsf-gnome<$pkgver") makedepends=('intltool' 'pygtk') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz) sha256sums=('a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f') diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index e02510821..77d538605 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138102 2011-09-16 12:01:21Z ibiru $ +# $Id: PKGBUILD 145236 2011-12-19 19:17:54Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.12.11 -pkgrel=3 +pkgver=3.13.1 +pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64) url="http://www.mozilla.org/projects/security/pki/nss/" @@ -13,26 +13,22 @@ depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh') makedepends=('perl') replaces=('nss-nspr') options=('!strip') -source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz +source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_WITH_CKBI_1_88_RTM/src/${pkgname}-${pkgver}.with.ckbi.1.88.tar.gz nss-no-rpath.patch nss.pc.in nss-config.in - distrust-diginotar.patch add_spi+cacert_ca_certs.patch ssl-renegotiate-transitional.patch) -md5sums=('ca0ca058380be200cf247ea2496b5352' - 'e5c97db0c884d5f4cfda21e562dc9bba' - 'c547b030c57fe1ed8b77c73bf52b3ded' - '46bee81908f1e5b26d6a7a2e14c64d9f' - 'bbd7d8a8e2f6ffc8b3e5f6614e5f3ccf' - 'ba2357c5b9881bfd7d54b037954ba0ff' - 'd83c7b61abb7e9f8f7bcd157183d1ade') +sha1sums=('ebc0258c8d1a3c2fe80941bd991b766552464fc6' + 'c8fcdb153af9d39689243119adb475905a657284' + 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' + 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' + '11e4980911a1fe7142264e9b783b89abdc750c5d' + '8a964a744ba098711b80c0d279a2993524e8eb92') build() { cd "${srcdir}/${pkgname}-${pkgver}/mozilla" - # Distrust DigiNotar root CA - backported from CVS (https://bugzilla.mozilla.org/show_bug.cgi?id=682927) - patch -Np0 -i "${srcdir}/distrust-diginotar.patch" - # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian + # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch" # Adds transitional SSL renegotiate support - patch from Debian patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch" @@ -43,6 +39,10 @@ build() { sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \ -i security/coreconf/rules.mk + # Generate certdata.c from certdata.txt + cd security/nss/lib/ckfw/builtins + make generate + cd "${srcdir}/${pkgname}-${pkgver}" export BUILD_OPT=1 export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 diff --git a/extra/nss/add_spi+cacert_ca_certs.patch b/extra/nss/add_spi+cacert_ca_certs.patch index 0af0deab7..7126a1281 100644 --- a/extra/nss/add_spi+cacert_ca_certs.patch +++ b/extra/nss/add_spi+cacert_ca_certs.patch @@ -3,597 +3,14 @@ ## All lines beginning with `## DP:' are a description of the patch. ## DP: Adds the SPI Inc. and CAcert.org CA certificates -Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.c -=================================================================== ---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.c 2011-08-12 12:29:13.000000000 +0200 -+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.c 2011-08-12 12:29:29.056420467 +0200 -@@ -1045,6 +1045,24 @@ - static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = { - CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED - }; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_328 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_329 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_330 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_331 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_332 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_333 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED -+}; - #ifdef DEBUG - static const NSSItem nss_builtins_items_0 [] = { - { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -@@ -21910,6 +21928,531 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; -+static const NSSItem nss_builtins_items_328 [] = { -+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 }, -+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, -+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" -+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" -+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" -+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" -+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" -+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" -+"\100\143\141\143\145\162\164\056\157\162\147" -+, (PRUint32)123 }, -+ { (void *)"0", (PRUint32)2 }, -+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" -+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" -+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" -+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" -+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" -+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" -+"\100\143\141\143\145\162\164\056\157\162\147" -+, (PRUint32)123 }, -+ { (void *)"\002\001\000" -+, (PRUint32)3 }, -+ { (void *)"\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000" -+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" -+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164" -+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164" -+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056" -+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101" -+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165" -+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110" -+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100" -+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063" -+"\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060" -+"\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016" -+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036" -+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057" -+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042" -+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164" -+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151" -+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011" -+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162" -+"\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110" -+"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002" -+"\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007" -+"\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002" -+"\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011" -+"\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315" -+"\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230" -+"\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272" -+"\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016" -+"\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052" -+"\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262" -+"\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140" -+"\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150" -+"\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273" -+"\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022" -+"\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234" -+"\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334" -+"\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070" -+"\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232" -+"\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044" -+"\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355" -+"\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252" -+"\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352" -+"\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276" -+"\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306" -+"\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320" -+"\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167" -+"\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335" -+"\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324" -+"\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246" -+"\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106" -+"\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272" -+"\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334" -+"\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304" -+"\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060" -+"\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265" -+"\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071" -+"\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230" -+"\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260" -+"\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016" -+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036" -+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057" -+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042" -+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164" -+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151" -+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011" -+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162" -+"\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001" -+"\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037" -+"\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160" -+"\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157" -+"\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006" -+"\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164" -+"\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060" -+"\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045" -+"\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162" -+"\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077" -+"\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102" -+"\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165" -+"\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164" -+"\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040" -+"\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167" -+"\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006" -+"\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001" -+"\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201" -+"\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275" -+"\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234" -+"\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323" -+"\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073" -+"\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140" -+"\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353" -+"\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160" -+"\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334" -+"\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231" -+"\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116" -+"\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145" -+"\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031" -+"\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363" -+"\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330" -+"\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367" -+"\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260" -+"\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223" -+"\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335" -+"\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026" -+"\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005" -+"\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361" -+"\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371" -+"\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246" -+"\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206" -+"\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153" -+"\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344" -+"\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143" -+"\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362" -+"\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226" -+"\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175" -+"\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305" -+"\103" -+, (PRUint32)1857 } -+}; -+static const NSSItem nss_builtins_items_329 [] = { -+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 }, -+ { (void *)"\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106" -+"\166\316\217\063" -+, (PRUint32)20 }, -+ { (void *)"\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153" -+, (PRUint32)16 }, -+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" -+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" -+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" -+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" -+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" -+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" -+"\100\143\141\143\145\162\164\056\157\162\147" -+, (PRUint32)123 }, -+ { (void *)"\002\001\000" -+, (PRUint32)3 }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } -+}; -+static const NSSItem nss_builtins_items_330 [] = { -+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 }, -+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, -+ { (void *)"\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143" -+"\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004" -+"\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101" -+"\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004" -+"\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040" -+"\063\040\122\157\157\164" -+, (PRUint32)86 }, -+ { (void *)"0", (PRUint32)2 }, -+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" -+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" -+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" -+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" -+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" -+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" -+"\100\143\141\143\145\162\164\056\157\162\147" -+, (PRUint32)123 }, -+ { (void *)"\002\001\001" -+, (PRUint32)3 }, -+ { (void *)"\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001" -+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" -+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164" -+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164" -+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056" -+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101" -+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165" -+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110" -+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100" -+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065" -+"\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060" -+"\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022" -+"\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156" -+"\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164" -+"\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157" -+"\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143" -+"\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164" -+"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001" -+"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001" -+"\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335" -+"\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175" -+"\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163" -+"\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144" -+"\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001" -+"\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171" -+"\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313" -+"\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011" -+"\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353" -+"\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277" -+"\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331" -+"\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205" -+"\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073" -+"\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161" -+"\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371" -+"\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047" -+"\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252" -+"\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102" -+"\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064" -+"\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133" -+"\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242" -+"\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137" -+"\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325" -+"\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150" -+"\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230" -+"\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140" -+"\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347" -+"\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321" -+"\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206" -+"\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257" -+"\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164" -+"\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373" -+"\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003" -+"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006" -+"\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006" -+"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072" -+"\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162" -+"\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034" -+"\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162" -+"\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003" -+"\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001" -+"\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002" -+"\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101" -+"\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160" -+"\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206" -+"\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241" -+"\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072" -+"\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135" -+"\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253" -+"\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364" -+"\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172" -+"\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302" -+"\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214" -+"\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074" -+"\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154" -+"\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025" -+"\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352" -+"\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231" -+"\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213" -+"\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325" -+"\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242" -+"\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214" -+"\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027" -+"\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057" -+"\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224" -+"\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134" -+"\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356" -+"\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005" -+"\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355" -+"\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143" -+"\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123" -+"\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243" -+"\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005" -+"\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156" -+"\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317" -+"\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360" -+"\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101" -+"\322\156\245\033\231\047\200\347\013\251\250\000" -+, (PRUint32)1548 } -+}; -+static const NSSItem nss_builtins_items_331 [] = { -+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 }, -+ { (void *)"\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304" -+"\030\116\052\055" -+, (PRUint32)20 }, -+ { (void *)"\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266" -+, (PRUint32)16 }, -+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" -+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" -+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" -+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" -+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" -+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" -+"\100\143\141\143\145\162\164\056\157\162\147" -+, (PRUint32)123 }, -+ { (void *)"\002\001\001" -+, (PRUint32)3 }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } -+}; -+static const NSSItem nss_builtins_items_332 [] = { -+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 }, -+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, -+ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123" -+"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141" -+"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144" -+"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125" -+"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040" -+"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162" -+"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157" -+"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004" -+"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101" -+"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206" -+"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163" -+"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147" -+, (PRUint32)191 }, -+ { (void *)"0", (PRUint32)2 }, -+ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123" -+"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141" -+"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144" -+"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125" -+"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040" -+"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162" -+"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157" -+"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004" -+"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101" -+"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206" -+"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163" -+"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147" -+, (PRUint32)191 }, -+ { (void *)"\002\011\000\350\216\266\311\370\052\024\050" -+, (PRUint32)11 }, -+ { (void *)"\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000" -+"\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206" -+"\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003" -+"\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010" -+"\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125" -+"\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163" -+"\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167" -+"\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151" -+"\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003" -+"\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061" -+"\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146" -+"\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061" -+"\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026" -+"\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151" -+"\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063" -+"\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060" -+"\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125" -+"\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023" -+"\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004" -+"\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061" -+"\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141" -+"\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143" -+"\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125" -+"\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036" -+"\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151" -+"\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045" -+"\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150" -+"\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156" -+"\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110" -+"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002" -+"\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051" -+"\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074" -+"\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271" -+"\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240" -+"\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321" -+"\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265" -+"\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175" -+"\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375" -+"\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161" -+"\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342" -+"\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172" -+"\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056" -+"\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247" -+"\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310" -+"\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361" -+"\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356" -+"\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110" -+"\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151" -+"\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316" -+"\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307" -+"\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320" -+"\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205" -+"\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123" -+"\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154" -+"\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275" -+"\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356" -+"\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250" -+"\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204" -+"\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147" -+"\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305" -+"\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057" -+"\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124" -+"\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060" -+"\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161" -+"\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122" -+"\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346" -+"\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102" -+"\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061" -+"\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016" -+"\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025" -+"\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141" -+"\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037" -+"\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040" -+"\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061" -+"\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141" -+"\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103" -+"\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157" -+"\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015" -+"\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100" -+"\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216" -+"\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377" -+"\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206" -+"\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035" -+"\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102" -+"\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151" -+"\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164" -+"\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102" -+"\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141" -+"\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055" -+"\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206" -+"\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057" -+"\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143" -+"\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125" -+"\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164" -+"\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016" -+"\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015" -+"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002" -+"\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162" -+"\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030" -+"\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255" -+"\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065" -+"\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014" -+"\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306" -+"\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051" -+"\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017" -+"\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302" -+"\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213" -+"\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017" -+"\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162" -+"\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152" -+"\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357" -+"\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266" -+"\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104" -+"\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177" -+"\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253" -+"\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206" -+"\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217" -+"\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265" -+"\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225" -+"\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140" -+"\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207" -+"\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252" -+"\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340" -+"\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254" -+"\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275" -+"\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132" -+"\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151" -+"\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005" -+"\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004" -+"\243\140" -+, (PRUint32)2066 } -+}; -+static const NSSItem nss_builtins_items_333 [] = { -+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 }, -+ { (void *)"\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044" -+"\251\220\103\034" -+, (PRUint32)20 }, -+ { (void *)"\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170" -+, (PRUint32)16 }, -+ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123" -+"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141" -+"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144" -+"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125" -+"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040" -+"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162" -+"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157" -+"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004" -+"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101" -+"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206" -+"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163" -+"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147" -+, (PRUint32)191 }, -+ { (void *)"\002\011\000\350\216\266\311\370\052\024\050" -+, (PRUint32)11 }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } -+}; - - builtinsInternalObject - nss_builtins_data[] = { -@@ -22244,11 +22787,17 @@ - { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} }, - { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} }, - { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} }, -- { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} } -+ { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }, -+ { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} }, -+ { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} }, -+ { 11, nss_builtins_types_330, nss_builtins_items_330, {NULL} }, -+ { 13, nss_builtins_types_331, nss_builtins_items_331, {NULL} }, -+ { 11, nss_builtins_types_332, nss_builtins_items_332, {NULL} }, -+ { 13, nss_builtins_types_333, nss_builtins_items_333, {NULL} } - }; - const PRUint32 - #ifdef DEBUG -- nss_builtins_nObjects = 327+1; -+ nss_builtins_nObjects = 333+1; - #else -- nss_builtins_nObjects = 327; -+ nss_builtins_nObjects = 333; - #endif /* DEBUG */ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt =================================================================== ---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-08-12 12:25:29.000000000 +0200 -+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-08-12 12:29:25.460425941 +0200 -@@ -22589,3 +22589,558 @@ - CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +--- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-11-05 17:03:08.370363036 +0100 ++++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-11-05 17:03:28.082392262 +0100 +@@ -23580,3 +23580,557 @@ + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ + +# +# Certificate "CAcert.org Class 1 Root CA" +# diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 1a3a0aafa..bb1327fdd 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142670 2011-11-12 17:46:43Z ibiru $ +# $Id: PKGBUILD 145182 2011-12-19 11:45:17Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.18.1 +pkgver=0.18.2 pkgrel=1 arch=(i686 x86_64) license=('GPL') @@ -14,9 +14,9 @@ _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2 git-fixes.patch) -md5sums=('d30e883a27423c936ef338ce1d967e2d' +md5sums=('38616927823ef01937aab26872e957e4' '9dc64c254a31e570507bdd4ad4ba629a' - 'a73ba6515aa73cb20c480692da52c79e') + 'af56b7b1b24a08f7498a0c7f5e862b93') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -39,7 +39,7 @@ check() { cd "${srcdir}" ln -sf test-${_testtag} test cd ${pkgbase}-${pkgver} - make check + LANG=en_US.UTF8 make check } package_poppler() { diff --git a/extra/poppler/git-fixes.patch b/extra/poppler/git-fixes.patch index a18a31aec..24a66b84f 100644 --- a/extra/poppler/git-fixes.patch +++ b/extra/poppler/git-fixes.patch @@ -1,107 +1,110 @@ -From e4a2adb02969e872e37e408ced4c39131c6751ea Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos <carlosgc@gnome.org> -Date: Sun, 30 Oct 2011 15:02:19 +0000 -Subject: pdftocairo: Make sure beginDocument() is always called +From 74f4299e8f9e2d204979479f6579dd784db678a4 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Sun, 04 Dec 2011 16:29:45 +0000 +Subject: Do not fail if we are trying to save a file with Encrypt but that we have not modified at all -This fixes a crash when rendering only odd/even pages in a printing -format. +Fixes KDE bug #288045 +(cherry picked from commit 63c942a45227ef28fb94ef4765171d9812fffafa) --- -diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc -index e458ee5..1b67c90 100644 ---- a/utils/pdftocairo.cc -+++ b/utils/pdftocairo.cc -@@ -903,6 +903,10 @@ int main(int argc, char *argv[]) { - lastPage = firstPage; - } +diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc +index 01d2759..2758206 100644 +--- a/poppler/PDFDoc.cc ++++ b/poppler/PDFDoc.cc +@@ -707,35 +707,44 @@ int PDFDoc::saveAs(GooString *name, PDFWriteMode mode) { + + int PDFDoc::saveAs(OutStream *outStr, PDFWriteMode mode) { -+ // Make sure firstPage is always used so that beginDocument() is called -+ if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1)) -+ firstPage++; +- // we don't support files with Encrypt at the moment ++ // find if we have updated objects ++ GBool updated = gFalse; ++ for(int i=0; i<xref->getNumObjects(); i++) { ++ if (xref->getEntry(i)->updated) { ++ updated = gTrue; ++ break; ++ } ++ } + - cairoOut = new CairoOutputDev(); - cairoOut->startDoc(doc->getXRef(), doc->getCatalog()); - if (sz != 0) --- -cgit v0.9.0.2-2-gbebe -From 61b1556d1c62bf090b2eadf93e4e7d0aff7b8015 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos <carlosgc@gnome.org> -Date: Sun, 30 Oct 2011 15:08:46 +0000 -Subject: pdftocairo: Use fisrtPage instead of uninitialized pg variable - -This fixes an error in my previous commit. ---- -diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc -index 1b67c90..d0d1ec6 100644 ---- a/utils/pdftocairo.cc -+++ b/utils/pdftocairo.cc -@@ -904,7 +904,7 @@ int main(int argc, char *argv[]) { ++ // we don't support rewriting files with Encrypt at the moment + Object obj; + xref->getTrailerDict()->getDict()->lookupNF("Encrypt", &obj); + if (!obj.isNull()) + { + obj.free(); +- return errEncrypted; ++ if (!updated && mode == writeStandard) { ++ // simply copy the original file ++ saveWithoutChangesAs (outStr); ++ } else { ++ return errEncrypted; ++ } } +- obj.free(); ++ else ++ { ++ obj.free(); - // Make sure firstPage is always used so that beginDocument() is called -- if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1)) -+ if ((printOnlyEven && firstPage % 2 == 0) || (printOnlyOdd && firstPage % 2 == 1)) - firstPage++; +- if (mode == writeForceRewrite) { +- saveCompleteRewrite(outStr); +- } else if (mode == writeForceIncremental) { +- saveIncrementalUpdate(outStr); +- } else { // let poppler decide +- // find if we have updated objects +- GBool updated = gFalse; +- for(int i=0; i<xref->getNumObjects(); i++) { +- if (xref->getEntry(i)->updated) { +- updated = gTrue; +- break; ++ if (mode == writeForceRewrite) { ++ saveCompleteRewrite(outStr); ++ } else if (mode == writeForceIncremental) { ++ saveIncrementalUpdate(outStr); ++ } else { // let poppler decide ++ if(updated) { ++ saveIncrementalUpdate(outStr); ++ } else { ++ // simply copy the original file ++ saveWithoutChangesAs (outStr); + } + } +- if(updated) { +- saveIncrementalUpdate(outStr); +- } else { +- // simply copy the original file +- saveWithoutChangesAs (outStr); +- } + } - cairoOut = new CairoOutputDev(); + return errNone; -- cgit v0.9.0.2-2-gbebe -From ebf7fbc74da10d1bc423d33b26e30166870642e4 Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@math.unl.edu> -Date: Tue, 01 Nov 2011 08:40:53 +0000 -Subject: Fix pkg-config files +From 03544e2f602319f0b381f5f357e14cc2cc77d2c1 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Tue, 06 Dec 2011 22:21:15 +0000 +Subject: include strings.h as we use memcpy -We were using $FOO_REQUIRED instead of @FOO_REQUIRED@ +Fixes bug 43558 +(cherry picked from commit 388d72ac27ae98fe3a1ebd21760f2b0fa0249a9b) --- -diff --git a/configure.ac b/configure.ac -index 3a120ca..c4f5b92 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; then - POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="" - - GLIB_REQUIRED=2.18 -+ AC_SUBST(GLIB_REQUIRED) - AC_ARG_ENABLE(poppler-glib, - AC_HELP_STRING([--disable-poppler-glib], - [Don't compile poppler glib wrapper.]), -diff --git a/poppler-glib-uninstalled.pc.in b/poppler-glib-uninstalled.pc.in -index 55a2278..5fcb6f2 100644 ---- a/poppler-glib-uninstalled.pc.in -+++ b/poppler-glib-uninstalled.pc.in -@@ -1,7 +1,7 @@ - Name: poppler-glib - Description: GLib wrapper for poppler - uninstalled - Version: @VERSION@ --Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION -+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ - - Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la - Cflags: -I${pc_top_builddir}/${pcfiledir}/glib -diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake -index 3264ed6..e15e669 100644 ---- a/poppler-glib.pc.cmake -+++ b/poppler-glib.pc.cmake -@@ -6,7 +6,7 @@ includedir=${prefix}/include - Name: poppler-glib - Description: GLib wrapper for poppler - Version: @POPPLER_VERSION@ --Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION -+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ - @PC_REQUIRES_PRIVATE@ +diff --git a/goo/PNGWriter.cc b/goo/PNGWriter.cc +index f88c3a7..1fb8cab 100644 +--- a/goo/PNGWriter.cc ++++ b/goo/PNGWriter.cc +@@ -6,7 +6,7 @@ + // + // Copyright (C) 2009 Warren Toomey <wkt@tuhs.org> + // Copyright (C) 2009 Shen Liang <shenzhuxi@gmail.com> +-// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org> ++// Copyright (C) 2009, 2011 Albert Astals Cid <aacid@kde.org> + // Copyright (C) 2009 Stefan Thomas <thomas@eload24.com> + // Copyright (C) 2010, 2011 Adrian Johnson <ajohnson@redneon.com> + // Copyright (C) 2011 Thomas Klausner <wiz@danbala.tuwien.ac.at> +@@ -19,6 +19,7 @@ - Libs: -L${libdir} -lpoppler-glib -diff --git a/poppler-glib.pc.in b/poppler-glib.pc.in -index 04d9bb9..9ba8978 100644 ---- a/poppler-glib.pc.in -+++ b/poppler-glib.pc.in -@@ -6,7 +6,7 @@ includedir=@includedir@ - Name: poppler-glib - Description: GLib wrapper for poppler - Version: @VERSION@ --Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION -+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ - @PC_REQUIRES_PRIVATE@ + #include <zlib.h> + #include <stdlib.h> ++#include <string.h> - Libs: -L${libdir} -lpoppler-glib + #include "poppler/Error.h" + #include "goo/gmem.h" -- cgit v0.9.0.2-2-gbebe diff --git a/extra/skanlite/PKGBUILD b/extra/skanlite/PKGBUILD index 0014d99c7..269f9b724 100644 --- a/extra/skanlite/PKGBUILD +++ b/extra/skanlite/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 133044 2011-07-27 07:39:38Z andrea $ +# $Id: PKGBUILD 145180 2011-12-19 08:38:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=skanlite -pkgver=0.7 -pkgrel=2 +pkgver=0.8 +pkgrel=1 pkgdesc="Image Scanning Application for KDE" arch=('i686' 'x86_64') url='http://kde-apps.org/content/show.php?content=109803' @@ -12,7 +12,7 @@ license=('GPL') depends=('kdebase-runtime' 'libksane') makedepends=('pkgconfig' 'cmake' 'automoc4') source=("http://downloads.sourceforge.net/sanewidget/${pkgname}-${pkgver}.tar.bz2") -md5sums=('cb256c392210c43d51e317c6a5ba9ad2') +md5sums=('baa43dbc78be696e121969b0a3d88929') build() { cd "${srcdir}" diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD index eefec18e4..158ee6bd1 100644 --- a/extra/smartmontools/PKGBUILD +++ b/extra/smartmontools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143965 2011-11-30 23:00:34Z giovanni $ +# $Id: PKGBUILD 145192 2011-12-19 12:38:49Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Jani Talikka <jani.talikka@gmail.com> @@ -6,12 +6,12 @@ pkgname=smartmontools pkgver=5.42 -pkgrel=2 +pkgrel=3 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives" url="http://smartmontools.sourceforge.net" license=('GPL') arch=('i686' 'x86_64') -depends=('gcc-libs') +depends=('gcc-libs' 'libcap-ng') backup=('etc/smartd.conf' 'etc/conf.d/smartd') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" @@ -26,7 +26,8 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ - --enable-drivedb + --enable-drivedb \ + --with-libcap-ng=yes make } diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD index a65ace85e..edb93716e 100644 --- a/extra/xorg-xinit/PKGBUILD +++ b/extra/xorg-xinit/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 140273 2011-10-11 21:27:57Z jgc $ +# $Id: PKGBUILD 145242 2011-12-19 22:24:21Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xorg-xinit pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org initialisation program " arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" -depends=('libx11' 'xorg-xauth') +depends=('libx11' 'xorg-xauth' 'inetutils') makedepends=('xorg-util-macros') optdepends=('xorg-twm' 'xterm') backup=('etc/skel/.xinitrc' @@ -18,12 +18,14 @@ backup=('etc/skel/.xinitrc' 'etc/X11/xinit/xinitrc') source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2 06_move_serverauthfile_into_tmp.diff + fs25361.patch xinitrc xsession xserverrc) options=(!emptydirs) md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4' 'abd072ec435ce084cf4e89c58f83d45c' + '73a597d3fb7f5b9487318ac8cfd4bedf' 'c7b406c3c5c1e8011b3ac7d6b29c1a2c' '7873d97db30d6c279ed37e3559e7c59d' 'c5baef10fdb7239594daee72a94ddab3') @@ -31,6 +33,7 @@ md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4' build() { cd "${srcdir}/xinit-${pkgver}" patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff" + patch -Np1 -i "${srcdir}/fs25361.patch" sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit make diff --git a/extra/xorg-xinit/fs25361.patch b/extra/xorg-xinit/fs25361.patch new file mode 100644 index 000000000..4596122de --- /dev/null +++ b/extra/xorg-xinit/fs25361.patch @@ -0,0 +1,16 @@ +Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx +diff -u xinit.orig/startx.cpp xinit/startx.cpp +--- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400 ++++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400 +@@ -290,9 +290,9 @@ + XCOMM now add the same credentials to the client authority file + XCOMM if '$displayname' already exists do not overwrite it as another + XCOMM server man need it. Add them to the '$xserverauthfile' instead. +- for displayname in $authdisplay $hostname$authdisplay; do ++ for displayname in $authdisplay $hostname/unix$authdisplay; do + authcookie=`XAUTH list "$displayname" @@ +- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; ++ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; + if [ "z${authcookie}" = "z" ] ; then + XAUTH -q << EOF + add $displayname . $mcookie diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 594d9715b..77c59507d 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139849 2011-10-05 10:55:56Z jgc $ +# $Id: PKGBUILD 145186 2011-12-19 11:53:19Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=275 +pkgver=276 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('bbbe6a4566c04656ec21863351570ac8' +md5sums=('50ca8ee40e8a0992019f8f35042c9abb' '10ecc3f8ee91e3189863a172f68282d2') build() { |