summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-04-23 16:40:40 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-04-23 16:41:32 -0300
commitce11fd60dd39d4288dedededaf47cf4e8a7e7dce (patch)
treee0c37c8d4df843d4590137a042632ad4d4c40e07
parente8422fe1669fa89d03034f9935f388145710ffaa (diff)
downloadabslibre-ce11fd60dd39d4288dedededaf47cf4e8a7e7dce.tar.gz
abslibre-ce11fd60dd39d4288dedededaf47cf4e8a7e7dce.tar.bz2
abslibre-ce11fd60dd39d4288dedededaf47cf4e8a7e7dce.zip
remove unused static packages
-rw-r--r--libre/alsa-lib-static/PKGBUILD30
-rw-r--r--libre/cracklib-static/PKGBUILD35
-rw-r--r--libre/db-static/PKGBUILD32
-rw-r--r--libre/gdbm-static/PKGBUILD51
-rw-r--r--libre/gdbm-static/gdbm-1.10-zeroheaders.patch33
-rw-r--r--libre/gnutls-static/PKGBUILD50
-rw-r--r--libre/keyutils-static/PKGBUILD29
-rw-r--r--libre/libgcrypt-static/PKGBUILD45
-rw-r--r--libre/libgpg-error-static/PKGBUILD40
-rw-r--r--libre/libidn-static/PKGBUILD30
-rw-r--r--libre/libjpeg-turbo-static/PKGBUILD44
-rw-r--r--libre/libnl-static/PKGBUILD34
-rw-r--r--libre/libpng-static/PKGBUILD51
-rw-r--r--libre/libtasn1-static/PKGBUILD40
-rw-r--r--libre/nettle-static/PKGBUILD40
-rw-r--r--libre/nss-static/PKGBUILD64
-rw-r--r--libre/nss-static/legacy-certs.patch1089
-rw-r--r--libre/openssl-static/PKGBUILD78
-rw-r--r--libre/openssl-static/ca-dir.patch33
-rw-r--r--libre/openssl-static/no-rpath.patch11
-rw-r--r--libre/openssl-static/ssl3-test-failure.patch26
-rw-r--r--libre/p11-kit-static/PKGBUILD60
-rw-r--r--libre/p11-kit-static/libnssckbi-compat.patch57
-rw-r--r--libre/perl-static/CVE-2016-2381_duplicate_env.diff104
-rw-r--r--libre/perl-static/PKGBUILD60
-rw-r--r--libre/sqlite-static/PKGBUILD57
-rw-r--r--libre/texinfo-static/PKGBUILD42
-rw-r--r--libre/texinfo-static/texinfo-6.0-disable-failing-info-test.patch11
28 files changed, 0 insertions, 2276 deletions
diff --git a/libre/alsa-lib-static/PKGBUILD b/libre/alsa-lib-static/PKGBUILD
deleted file mode 100644
index 5939e653a..000000000
--- a/libre/alsa-lib-static/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of alsa-lib
-
-_pkgname=alsa-lib
-pkgname=alsa-lib-static
-pkgver=1.1.1
-pkgrel=1.1
-pkgdesc="An alternative implementation of Linux sound support (static libraries only)"
-arch=('i686' 'x86_64' 'armv7h')
-url="http://www.alsa-project.org"
-depends=('alsa-lib')
-makedepends=('python2')
-license=('GPL')
-options=('staticlibs')
-source=(ftp://ftp.alsa-project.org/pub/lib/$_pkgname-$pkgver.tar.bz2)
-sha1sums=('09f7e9b2d88287e04a4bb0d56e0cbc9018e524ec')
-
-build() {
- cd "$srcdir/$_pkgname-$pkgver"
- ./configure --prefix=/usr --with-pythonlibs="-lpthread -lm -ldl -lpython2.7" --with-pythonincludes=-I/usr/include/python2.7 --enable-static --disable-shared
- make
-}
-
-package() {
- cd "$srcdir/$_pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,include,lib/pkgconfig,share}
-}
diff --git a/libre/cracklib-static/PKGBUILD b/libre/cracklib-static/PKGBUILD
deleted file mode 100644
index 5ed00b892..000000000
--- a/libre/cracklib-static/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of cracklib
-
-_pkgname=cracklib
-pkgname=cracklib-static
-pkgver=2.9.6
-pkgrel=1
-pkgdesc="Password Checking Library (static libraries only)"
-arch=('i686' 'x86_64' 'armv7h')
-license=('GPL')
-url="https://github.com/cracklib/cracklib"
-depends=('cracklib')
-options=('staticlibs')
-source=(https://github.com/cracklib/cracklib/releases/download/$_pkgname-$pkgver/$_pkgname-$pkgver.tar.gz)
-md5sums=('c52f463585d85924b28cdc1e373ae06d')
-
-build() {
- cd $srcdir/$_pkgname-$pkgver
- ./configure --prefix=/usr --without-python
- make
-}
-
-check() {
- cd $srcdir/$_pkgname-$pkgver
- make check
-}
-
-package() {
- cd $srcdir/$_pkgname-$pkgver
- make DESTDIR=$pkgdir install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{include,sbin,share}
- rm -v ${pkgdir}/usr/lib/lib*.so*
-}
diff --git a/libre/db-static/PKGBUILD b/libre/db-static/PKGBUILD
deleted file mode 100644
index 43ef256cb..000000000
--- a/libre/db-static/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of db
-
-_pkgname=db
-pkgname=db-static
-pkgver=5.3.28
-pkgrel=3
-pkgdesc="The Berkeley DB embedded database system (static libraries only)"
-arch=('i686' 'x86_64' 'armv7h')
-url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
-license=('custom')
-depends=('db')
-options=('staticlibs')
-source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz)
-sha1sums=('fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9')
-
-build() {
- cd "${srcdir}"/$_pkgname-${pkgver}/build_unix
- ../dist/configure --prefix=/usr --enable-compat185 \
- --disable-shared --enable-static --enable-cxx --enable-dbm \
- --enable-stl
- make LIBSO_LIBS=-lpthread
-}
-
-package() {
- cd "${srcdir}"/$_pkgname-${pkgver}/build_unix
- make DESTDIR="${pkgdir}" install
- rm -r "${pkgdir}"/usr/docs
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,include}
-}
diff --git a/libre/gdbm-static/PKGBUILD b/libre/gdbm-static/PKGBUILD
deleted file mode 100644
index 7f6e3d0f0..000000000
--- a/libre/gdbm-static/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of gdbm
-
-_pkgname=gdbm
-pkgname=gdbm-static
-pkgver=1.11
-pkgrel=1
-pkgdesc="GNU database library (static libraries only)"
-url="http://www.gnu.org/software/gdbm/gdbm.html"
-license=('GPL3')
-arch=('i686' 'x86_64' 'armv7h')
-depends=('gdbm')
-options=('!makeflags' 'staticlibs')
-source=(ftp://ftp.gnu.org/gnu/gdbm/${_pkgname}-${pkgver}.tar.gz{,.sig}
- gdbm-1.10-zeroheaders.patch)
-validpgpkeys=('325F650C4C2B6AD58807327A3602B07F55D0C732')
-md5sums=('72c832680cf0999caedbe5b265c8c1bd'
- 'SKIP'
- 'ac255b10452005237836cd2d3a470733')
-
-prepare() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
-
- # Prevent gdbm from storing uninitialized memory content
- # to database files. This patch improves security, as the
- # uninitialized memory might contain sensitive informations
- # from other applications.
- # https://bugzilla.redhat.com/show_bug.cgi?id=4457
- # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=208927
- patch -Np1 -i ../gdbm-1.10-zeroheaders.patch
-}
-
-build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- ./configure --prefix=/usr --enable-libgdbm-compat
- make
-}
-
-check() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- make check
-}
-
-package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,include,share}
- rm -v ${pkgdir}/usr/lib/lib*.so*
-}
diff --git a/libre/gdbm-static/gdbm-1.10-zeroheaders.patch b/libre/gdbm-static/gdbm-1.10-zeroheaders.patch
deleted file mode 100644
index a268f6bdf..000000000
--- a/libre/gdbm-static/gdbm-1.10-zeroheaders.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up gdbm-1.10/src/falloc.c.zeroheaders gdbm-1.10/src/falloc.c
---- gdbm-1.10/src/falloc.c.zeroheaders 2011-11-11 11:59:11.000000000 +0100
-+++ gdbm-1.10/src/falloc.c 2011-11-14 17:34:32.487604027 +0100
-@@ -255,7 +255,7 @@ push_avail_block (GDBM_FILE dbf)
-
-
- /* Split the header block. */
-- temp = (avail_block *) malloc (av_size);
-+ temp = (avail_block *) calloc (1, av_size);
- if (temp == NULL) _gdbm_fatal (dbf, _("malloc error"));
- /* Set the size to be correct AFTER the pop_avail_block. */
- temp->size = dbf->header->avail.size;
-diff -up gdbm-1.10/src/gdbmopen.c.zeroheaders gdbm-1.10/src/gdbmopen.c
---- gdbm-1.10/src/gdbmopen.c.zeroheaders 2011-11-11 19:39:42.000000000 +0100
-+++ gdbm-1.10/src/gdbmopen.c 2011-11-14 17:33:24.867608650 +0100
-@@ -264,7 +264,7 @@ gdbm_open (const char *file, int block_s
- (dbf->header->block_size - sizeof (hash_bucket))
- / sizeof (bucket_element) + 1;
- dbf->header->bucket_size = dbf->header->block_size;
-- dbf->bucket = (hash_bucket *) malloc (dbf->header->bucket_size);
-+ dbf->bucket = (hash_bucket *) calloc (1, dbf->header->bucket_size);
- if (dbf->bucket == NULL)
- {
- gdbm_close (dbf);
-@@ -456,7 +456,7 @@ _gdbm_init_cache(GDBM_FILE dbf, size_t s
- for(index = 0; index < size; index++)
- {
- (dbf->bucket_cache[index]).ca_bucket
-- = (hash_bucket *) malloc (dbf->header->bucket_size);
-+ = (hash_bucket *) calloc (1, dbf->header->bucket_size);
- if ((dbf->bucket_cache[index]).ca_bucket == NULL)
- {
- gdbm_errno = GDBM_MALLOC_ERROR;
diff --git a/libre/gnutls-static/PKGBUILD b/libre/gnutls-static/PKGBUILD
deleted file mode 100644
index d381417fc..000000000
--- a/libre/gnutls-static/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of gnutls
-
-_pkgname=gnutls
-pkgname=gnutls-static
-pkgver=3.4.11
-pkgrel=1
-pkgdesc="A library which provides a secure layer over a reliable transport layer (static libraries only)"
-arch=('i686' 'x86_64' 'armv7h')
-license=('GPL3' 'LGPL2.1')
-url="http://www.gnutls.org/"
-options=('staticlibs')
-depends=('gcc-libs-static' 'libtasn1-static' 'readline-static' 'nettle-static' 'p11-kit-static' 'gnutls')
-source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/${_pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('4da148b5a0048aaac4961e2d9ba95798'
- 'SKIP')
-validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F'
- '1F42418905D8206AA754CCDC29EE58B996865171')
- # "Simon Josefsson <simon@josefsson.org>"
- # "Nikos Mavrogiannopoulos <nmav@gnutls.org>
-
-build() {
- cd ${_pkgname}-${pkgver}
-
- # disable libidn for security reasons:
- # http://lists.gnupg.org/pipermail/gnutls-devel/2015-May/007582.html
-
- ./configure --prefix=/usr \
- --with-zlib \
- --enable-static \
- --without-idn \
- --enable-guile --with-guile-site-dir=no \
- --with-default-trust-store-pkcs11="pkcs11:model=p11-kit-trust;manufacturer=PKCS%2311%20Kit"
- make
-}
-
-check() {
- cd ${_pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd ${_pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,include,lib/pkgconfig,share}
- rm -v ${pkgdir}/usr/lib/guile/*/*.so*
- rm -v ${pkgdir}/usr/lib/lib*.so*
-}
diff --git a/libre/keyutils-static/PKGBUILD b/libre/keyutils-static/PKGBUILD
deleted file mode 100644
index 9a34d5a43..000000000
--- a/libre/keyutils-static/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of keyutils
-
-_pkgname=keyutils
-pkgname=keyutils-static
-pkgver=1.5.9
-pkgrel=1
-pkgdesc="Linux Key Management Utilities (static libraries only)"
-arch=('i686' 'x86_64' 'armv7h')
-url="http://www.kernel.org"
-license=('GPL2' 'LGPL2.1')
-depends=('keyutils')
-options=('staticlibs')
-source=(http://people.redhat.com/~dhowells/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2)
-md5sums=('7f8ac985c45086b5fbcd12cecd23cf07')
-
-build() {
- cd ${_pkgname}-${pkgver}
- make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-package() {
- cd ${_pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" LIBDIR='/usr/lib' USRLIBDIR='/usr/lib' install
-
- # remove conflicting files
- rm -vr ${pkgdir}/{{,s}bin,etc,usr/{include,share}}
- rm -v ${pkgdir}/usr/lib/lib*.so*
-}
diff --git a/libre/libgcrypt-static/PKGBUILD b/libre/libgcrypt-static/PKGBUILD
deleted file mode 100644
index 85656d6af..000000000
--- a/libre/libgcrypt-static/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of libgcrypt
-
-_pkgname=libgcrypt
-pkgname=libgcrypt-static
-pkgver=1.7.0
-pkgrel=1
-pkgdesc="General purpose cryptographic library based on the code from GnuPG (static libraries only)"
-arch=(i686 x86_64 armv7h)
-url="http://www.gnupg.org"
-license=('LGPL')
-depends=('libgpg-error-static' 'libgcrypt')
-options=('!emptydirs' 'staticlibs')
-# https://www.gnupg.org/download/integrity_check.html
-source=(ftp://ftp.gnupg.org/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('f840b737faafded451a084ae143285ad68bbfb01'
- 'SKIP')
-validpgpkeys=('031EC2536E580D8EA286A9F22071B08A33BD3F06' # "NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>"
- 'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6') # Werner Koch
-
-#prepare() {
-# cd ${_pkgname}-${pkgver}
-#}
-
-build() {
- cd ${_pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --enable-static \
- --disable-padlock-support
- make
-}
-
-check() {
- cd ${_pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd ${_pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,include,share}
- rm -v ${pkgdir}/usr/lib/lib*.so*
-}
diff --git a/libre/libgpg-error-static/PKGBUILD b/libre/libgpg-error-static/PKGBUILD
deleted file mode 100644
index 88de0714f..000000000
--- a/libre/libgpg-error-static/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of libgpg-error
-
-_pkgname=libgpg-error
-pkgname=libgpg-error-static
-pkgver=1.21
-pkgrel=1
-pkgdesc="Support library for libgcrypt (static libraries only)"
-arch=(i686 x86_64 armv7h)
-url="http://www.gnupg.org"
-license=('LGPL')
-depends=('libgpg-error')
-options=('staticlibs')
-source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/${_pkgname}-${pkgver}.tar.bz2{,.sig})
- #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgpg-error/${_pkgname}-${pkgver}.tar.bz2)
-options=('staticlibs')
-# https://www.gnupg.org/download/integrity_check.html
-sha1sums=('ef1dfb2f8761f019091180596e9e638d8cc37513'
- 'SKIP')
-validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6') # Werner Koch
-
-build() {
- cd ${_pkgname}-${pkgver}
- ./configure --prefix=/usr --enable-static
- make
-}
-
-check() {
- cd ${_pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd ${_pkgname}-${pkgver}
- make DESTDIR="${pkgdir}/" install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,include,share}
- rm -v ${pkgdir}/usr/lib/lib*.so*
-}
diff --git a/libre/libidn-static/PKGBUILD b/libre/libidn-static/PKGBUILD
deleted file mode 100644
index 4fb62f56d..000000000
--- a/libre/libidn-static/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of libidn
-
-_pkgname=libidn
-pkgname=libidn-static
-pkgver=1.32
-pkgrel=1
-pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications (static libraries only)"
-url="http://www.gnu.org/software/libidn/"
-arch=('i686' 'x86_64' 'armv7h')
-license=('GPL3' 'LGPL')
-depends=('texinfo-static' 'libidn')
-options=('staticlibs')
-source=(http://ftp.gnu.org/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
-sha1sums=('ddd018611b98af7c67d434aa42d15d39f45129f5')
-
-build() {
- cd ${srcdir}/${_pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${srcdir}/${_pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,include,lib/pkgconfig,share}
- rm -v ${pkgdir}/usr/lib/lib*.so*
-}
diff --git a/libre/libjpeg-turbo-static/PKGBUILD b/libre/libjpeg-turbo-static/PKGBUILD
deleted file mode 100644
index 5b21c880a..000000000
--- a/libre/libjpeg-turbo-static/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of libjpeg-turbo
-
-_pkgname=libjpeg-turbo
-pkgname=libjpeg-turbo-static
-pkgver=1.4.2
-pkgrel=2
-pkgdesc='JPEG image codec with accelerated baseline compression and decompression (static libraries only)'
-url='http://libjpeg-turbo.virtualgl.org/'
-arch=('i686' 'x86_64' 'armv7h')
-license=('custom')
-makedepends=('nasm' 'jdk8-openjdk')
-depends=('libjpeg-turbo')
-source=("http://downloads.sourceforge.net/project/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.gz")
-sha1sums=('2666158ccd5318513f875867bbc4af52f6eb9f0b')
-
-options=('!makeflags' 'staticlibs')
-
-build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- export JNI_CFLAGS='-I/usr/lib/jvm/default/include -I/usr/lib/jvm/default/include/linux'
- ./configure \
- --prefix=/usr \
- --with-jpeg8 \
- --with-java \
-
- make
-}
-
-check() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- make test
-}
-
-package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- make \
- DESTDIR="${pkgdir}" \
- install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,include,share}
- rm -v ${pkgdir}/usr/lib/lib*.so*
-}
diff --git a/libre/libnl-static/PKGBUILD b/libre/libnl-static/PKGBUILD
deleted file mode 100644
index 9b708731d..000000000
--- a/libre/libnl-static/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of libnl
-
-_pkgname=libnl
-pkgname=libnl-static
-pkgver=3.2.27
-pkgrel=1
-pkgdesc="Library for applications dealing with netlink sockets (static libraries only)"
-arch=(i686 x86_64 armv7h)
-url="http://www.infradead.org/~tgr/libnl/"
-license=(GPL)
-depends=(libnl)
-options=('staticlibs')
-source=(https://github.com/thom311/libnl/releases/download/libnl${pkgver//./_}/${_pkgname}-${pkgver}.tar.gz{,.sig})
-sha256sums=('4bbbf92b3c78a90f423cf96260bf419a28b75db8cced47051217a56795f58ec6'
- 'SKIP')
-validpgpkeys=('49EA7C670E0850E7419514F629C2366E4DFC5728') # Thomas Haller
-
-build() {
- cd "$srcdir"/$_pkgname-$pkgver
- ./configure \
- --prefix=/usr \
- --enable-static
- make
-}
-
-package() {
- cd "$srcdir"/$_pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,etc,include,lib/pkgconfig,share}
- rm -v ${pkgdir}/usr/lib/{,$_pkgname/cli/{cls,qdisc}/}*.so*
-}
diff --git a/libre/libpng-static/PKGBUILD b/libre/libpng-static/PKGBUILD
deleted file mode 100644
index 63f73c5a4..000000000
--- a/libre/libpng-static/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of libpng
-
-_pkgname=libpng
-pkgname=libpng-static
-pkgver=1.6.21
-_apngver=1.6.21
-pkgrel=1
-pkgdesc="A collection of routines used to create PNG format graphics files (static libraries only)"
-arch=('i686' 'x86_64' 'armv7h')
-url="http://www.libpng.org/pub/png/libpng.html"
-license=('custom')
-depends=('libpng')
-source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.xz{,.asc}
- http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz)
-md5sums=('3bacb4728f6694a64ad9052769d6a4ce'
- 'SKIP'
- '360346394543ec0a880f61830541608f')
-validpgpkeys=('8048643BA2C840F4F92A195FF54984BFA16C640F')
-
-prepare() {
- cd $_pkgname-$pkgver
-
- # Add animated PNG (apng) support. Required by Iceweasel
- # see http://sourceforge.net/projects/libpng-apng/
- patch -Np1 -i ../libpng-$_apngver-apng.patch
-}
-
-build() {
- cd $_pkgname-$pkgver
-
- ./configure --prefix=/usr --enable-static
- make
-}
-
-check() {
- cd $_pkgname-$pkgver
- make check
-}
-
-package() {
- cd $_pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- cd contrib/pngminus
- make PNGLIB="-L$pkgdir/usr/lib -lpng" -f makefile.std png2pnm pnm2png
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,include,lib/pkgconfig,share}
- rm -v ${pkgdir}/usr/lib/lib*.so*
-}
diff --git a/libre/libtasn1-static/PKGBUILD b/libre/libtasn1-static/PKGBUILD
deleted file mode 100644
index 24a2ebb48..000000000
--- a/libre/libtasn1-static/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of libtasn1
-
-_pkgname=libtasn1
-pkgname=libtasn1-static
-pkgver=4.8
-pkgrel=1
-pkgdesc="The ASN.1 library used in GNUTLS (static libraries only)"
-arch=('i686' 'x86_64' 'armv7h')
-license=('GPL3' 'LGPL')
-url="http://www.gnu.org/software/libtasn1/"
-depends=('texinfo-static' 'libtasn1')
-options=('staticlibs')
-source=(http://ftp.gnu.org/gnu/libtasn1/${_pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('9a6767705725544f2b86670dcfb34107'
- 'SKIP')
-validpgpkeys=('1F42418905D8206AA754CCDC29EE58B996865171') #Nikos Mavrogiannopoulos <nmav@gnutls.org>
-
-build() {
- cd ${_pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --with-packager=Parabola \
- --with-packager-bug-reports="http://labs.parabola.nu/" \
- --with-packager-version=${pkgver}-${pkgrel}
- make
-}
-
-check() {
- cd ${_pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd ${_pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,include,lib/pkgconfig,share}
- rm -v ${pkgdir}/usr/lib/lib*.so*
-}
diff --git a/libre/nettle-static/PKGBUILD b/libre/nettle-static/PKGBUILD
deleted file mode 100644
index 8ab831635..000000000
--- a/libre/nettle-static/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of nettle
-
-_pkgname=nettle
-pkgname=nettle-static
-pkgver=3.2
-pkgrel=1
-pkgdesc="A low-level cryptographic library (static libraries only)"
-arch=('i686' 'x86_64' 'armv7h')
-url="http://www.lysator.liu.se/~nisse/nettle/"
-license=('GPL2')
-depends=('gmp-static')
-checkdepends=('valgrind')
-options=('staticlibs')
-source=(https://ftp.gnu.org/gnu/$_pkgname/$_pkgname-$pkgver.tar.gz{,.sig})
-md5sums=('afb15b4764ebf1b4e6d06c62bd4d29e4'
- 'SKIP')
-validpgpkeys=('343C2FF0FBEE5EC2EDBEF399F3599FF828C67298') # Niels Möller <nisse@lysator.liu.se>
-
-
-build() {
- cd $_pkgname-$pkgver
- ./configure --prefix=/usr \
- --enable-static
- make
-}
-
-check() {
- cd $_pkgname-$pkgver
- make -k check
-}
-
-package() {
- cd $_pkgname-$pkgver
- make DESTDIR="$pkgdir/" install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,include,lib/pkgconfig,share}
- rm -v ${pkgdir}/usr/lib/lib*.so*
-}
diff --git a/libre/nss-static/PKGBUILD b/libre/nss-static/PKGBUILD
deleted file mode 100644
index 4887f4f34..000000000
--- a/libre/nss-static/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of nss
-
-pkgbase=nss
-pkgname=nss-static
-pkgver=3.23
-pkgrel=3
-pkgdesc="Mozilla Network Security Services (static libraries only)"
-arch=(i686 x86_64 armv7h)
-url="http://www.mozilla.org/projects/security/pki/nss/"
-license=('MPL' 'GPL')
-_nsprver=4.12
-depends=('nspr-static' 'sqlite-static' 'p11-kit-static' 'nss')
-makedepends=('perl' 'python2')
-options=('!strip' '!makeflags' 'staticlibs')
-source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz"
- legacy-certs.patch)
-sha256sums=('94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf'
- '5f793af9c8558324e4188163862e0e70a5b069a44ad9e7817e0767093739f2a0')
-
-prepare() {
- mkdir certs
-
- cd nss-$pkgver
-
- # Still needed - Evolution (Camel) and Telepathy-Gabble (Wocky) use
- # their own validation which doesn't work with trusted intermediates
- patch nss/lib/ckfw/builtins/certdata.txt ../legacy-certs.patch
-
- # Respect LDFLAGS
- sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \
- -i nss/coreconf/rules.mk
-
- ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
- ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
-}
-
-
-build() {
- cd nss-$pkgver/nss
- export BUILD_OPT=1
- export NSS_USE_SYSTEM_SQLITE=1
- export NSS_ENABLE_ECC=1
- export NSPR_INCLUDE_DIR="`nspr-config --includedir`"
- export NSPR_LIB_DIR="`nspr-config --libdir`"
- export XCFLAGS="${CFLAGS}"
-
- [ "$CARCH" = "x86_64" ] && export USE_64=1
-
- make -C coreconf
- make -C lib/dbm
- make
-}
-
-package() {
- cd nss-$pkgver
- install -d "$pkgdir"/usr/lib
- cd dist/*.OBJ/lib
- install -t "$pkgdir/usr/lib" lib{freebl,gtest,nss,nssdbm,nsssysinit,nssutil,smime,softokn,ssl}.a
- # list of static libraries are build:
- # certdb certhi crmf cryptohi dbm freebl gtest jar nss nssb nssckfw nssdbm nssdev nsspki nsssysinit nssutil
- # pk11wrap pkcs12 pkcs7 pkixcertsel pkixchecker pkixcrlsel pkixmodule pkixparams pkixpki pkixresults
- # pkixstore pkixsystem pkixtop pkixutil sectool smime softokn ssl
-}
diff --git a/libre/nss-static/legacy-certs.patch b/libre/nss-static/legacy-certs.patch
deleted file mode 100644
index f3ab67dc7..000000000
--- a/libre/nss-static/legacy-certs.patch
+++ /dev/null
@@ -1,1089 +0,0 @@
---- certdata.txt 2016-02-26 22:21:17.016942918 +0100
-+++ certdata-legacy.txt 2016-03-21 10:47:41.022763306 +0100
-@@ -70,6 +70,421 @@
- CKA_LABEL UTF8 "Mozilla Builtin Roots"
-
- #
-+# Certificate "GTE CyberTrust Global Root"
-+#
-+# Issuer: CN=GTE CyberTrust Global Root,OU="GTE CyberTrust Solutions, Inc.",O=GTE Corporation,C=US
-+# Serial Number: 421 (0x1a5)
-+# Subject: CN=GTE CyberTrust Global Root,OU="GTE CyberTrust Solutions, Inc.",O=GTE Corporation,C=US
-+# Not Valid Before: Thu Aug 13 00:29:00 1998
-+# Not Valid After : Mon Aug 13 23:59:00 2018
-+# Fingerprint (MD5): CA:3D:D3:68:F1:03:5C:D0:32:FA:B8:2B:59:E8:5A:DB
-+# Fingerprint (SHA1): 97:81:79:50:D8:1C:96:70:CC:34:D8:09:CF:79:44:31:36:7E:F4:74
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "GTE CyberTrust Global Root"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-+\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157
-+\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125
-+\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165
-+\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156
-+\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105
-+\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142
-+\141\154\040\122\157\157\164
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-+\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157
-+\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125
-+\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165
-+\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156
-+\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105
-+\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142
-+\141\154\040\122\157\157\164
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\002\001\245
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\002\132\060\202\001\303\002\002\001\245\060\015\006\011
-+\052\206\110\206\367\015\001\001\004\005\000\060\165\061\013\060
-+\011\006\003\125\004\006\023\002\125\123\061\030\060\026\006\003
-+\125\004\012\023\017\107\124\105\040\103\157\162\160\157\162\141
-+\164\151\157\156\061\047\060\045\006\003\125\004\013\023\036\107
-+\124\105\040\103\171\142\145\162\124\162\165\163\164\040\123\157
-+\154\165\164\151\157\156\163\054\040\111\156\143\056\061\043\060
-+\041\006\003\125\004\003\023\032\107\124\105\040\103\171\142\145
-+\162\124\162\165\163\164\040\107\154\157\142\141\154\040\122\157
-+\157\164\060\036\027\015\071\070\060\070\061\063\060\060\062\071
-+\060\060\132\027\015\061\070\060\070\061\063\062\063\065\071\060
-+\060\132\060\165\061\013\060\011\006\003\125\004\006\023\002\125
-+\123\061\030\060\026\006\003\125\004\012\023\017\107\124\105\040
-+\103\157\162\160\157\162\141\164\151\157\156\061\047\060\045\006
-+\003\125\004\013\023\036\107\124\105\040\103\171\142\145\162\124
-+\162\165\163\164\040\123\157\154\165\164\151\157\156\163\054\040
-+\111\156\143\056\061\043\060\041\006\003\125\004\003\023\032\107
-+\124\105\040\103\171\142\145\162\124\162\165\163\164\040\107\154
-+\157\142\141\154\040\122\157\157\164\060\201\237\060\015\006\011
-+\052\206\110\206\367\015\001\001\001\005\000\003\201\215\000\060
-+\201\211\002\201\201\000\225\017\240\266\360\120\234\350\172\307
-+\210\315\335\027\016\056\260\224\320\033\075\016\366\224\300\212
-+\224\307\006\310\220\227\310\270\144\032\172\176\154\074\123\341
-+\067\050\163\140\177\262\227\123\007\237\123\371\155\130\224\322
-+\257\215\155\210\147\200\346\355\262\225\317\162\061\312\245\034
-+\162\272\134\002\347\144\102\347\371\251\054\326\072\015\254\215
-+\102\252\044\001\071\346\234\077\001\205\127\015\130\207\105\370
-+\323\205\252\223\151\046\205\160\110\200\077\022\025\307\171\264
-+\037\005\057\073\142\231\002\003\001\000\001\060\015\006\011\052
-+\206\110\206\367\015\001\001\004\005\000\003\201\201\000\155\353
-+\033\011\351\136\331\121\333\147\042\141\244\052\074\110\167\343
-+\240\174\246\336\163\242\024\003\205\075\373\253\016\060\305\203
-+\026\063\201\023\010\236\173\064\116\337\100\310\164\327\271\175
-+\334\364\166\125\175\233\143\124\030\351\360\352\363\134\261\331
-+\213\102\036\271\300\225\116\272\372\325\342\174\365\150\141\277
-+\216\354\005\227\137\133\260\327\243\205\064\304\044\247\015\017
-+\225\223\357\313\224\330\236\037\235\134\205\155\307\252\256\117
-+\037\042\265\315\225\255\272\247\314\371\253\013\172\177
-+END
-+
-+# Trust for Certificate "GTE CyberTrust Global Root"
-+# Issuer: CN=GTE CyberTrust Global Root,OU="GTE CyberTrust Solutions, Inc.",O=GTE Corporation,C=US
-+# Serial Number: 421 (0x1a5)
-+# Subject: CN=GTE CyberTrust Global Root,OU="GTE CyberTrust Solutions, Inc.",O=GTE Corporation,C=US
-+# Not Valid Before: Thu Aug 13 00:29:00 1998
-+# Not Valid After : Mon Aug 13 23:59:00 2018
-+# Fingerprint (MD5): CA:3D:D3:68:F1:03:5C:D0:32:FA:B8:2B:59:E8:5A:DB
-+# Fingerprint (SHA1): 97:81:79:50:D8:1C:96:70:CC:34:D8:09:CF:79:44:31:36:7E:F4:74
-+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "GTE CyberTrust Global Root"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\227\201\171\120\330\034\226\160\314\064\330\011\317\171\104\061
-+\066\176\364\164
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\312\075\323\150\361\003\134\320\062\372\270\053\131\350\132\333
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-+\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157
-+\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125
-+\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165
-+\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156
-+\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105
-+\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142
-+\141\154\040\122\157\157\164
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\002\001\245
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "Thawte Server CA"
-+#
-+# Issuer: E=server-certs@thawte.com,CN=Thawte Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-+# Serial Number: 1 (0x1)
-+# Subject: E=server-certs@thawte.com,CN=Thawte Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-+# Not Valid Before: Thu Aug 01 00:00:00 1996
-+# Not Valid After : Thu Dec 31 23:59:59 2020
-+# Fingerprint (MD5): C5:70:C4:A2:ED:53:78:0C:C8:10:53:81:64:CB:D0:1D
-+# Fingerprint (SHA1): 23:E5:94:94:51:95:F2:41:48:03:B4:D5:64:D2:A3:A3:F5:D8:8B:8C
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Thawte Server CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\201\304\061\013\060\011\006\003\125\004\006\023\002\132\101
-+\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-+\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-+\023\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006
-+\003\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156
-+\163\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003
-+\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-+\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-+\163\151\157\156\061\031\060\027\006\003\125\004\003\023\020\124
-+\150\141\167\164\145\040\123\145\162\166\145\162\040\103\101\061
-+\046\060\044\006\011\052\206\110\206\367\015\001\011\001\026\027
-+\163\145\162\166\145\162\055\143\145\162\164\163\100\164\150\141
-+\167\164\145\056\143\157\155
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\304\061\013\060\011\006\003\125\004\006\023\002\132\101
-+\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-+\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-+\023\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006
-+\003\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156
-+\163\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003
-+\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-+\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-+\163\151\157\156\061\031\060\027\006\003\125\004\003\023\020\124
-+\150\141\167\164\145\040\123\145\162\166\145\162\040\103\101\061
-+\046\060\044\006\011\052\206\110\206\367\015\001\011\001\026\027
-+\163\145\162\166\145\162\055\143\145\162\164\163\100\164\150\141
-+\167\164\145\056\143\157\155
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\003\023\060\202\002\174\240\003\002\001\002\002\001\001
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\201\304\061\013\060\011\006\003\125\004\006\023\002\132\101\061
-+\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162
-+\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007\023
-+\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006\003
-+\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156\163
-+\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003\125
-+\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151\157
-+\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151\163
-+\151\157\156\061\031\060\027\006\003\125\004\003\023\020\124\150
-+\141\167\164\145\040\123\145\162\166\145\162\040\103\101\061\046
-+\060\044\006\011\052\206\110\206\367\015\001\011\001\026\027\163
-+\145\162\166\145\162\055\143\145\162\164\163\100\164\150\141\167
-+\164\145\056\143\157\155\060\036\027\015\071\066\060\070\060\061
-+\060\060\060\060\060\060\132\027\015\062\060\061\062\063\061\062
-+\063\065\071\065\071\132\060\201\304\061\013\060\011\006\003\125
-+\004\006\023\002\132\101\061\025\060\023\006\003\125\004\010\023
-+\014\127\145\163\164\145\162\156\040\103\141\160\145\061\022\060
-+\020\006\003\125\004\007\023\011\103\141\160\145\040\124\157\167
-+\156\061\035\060\033\006\003\125\004\012\023\024\124\150\141\167
-+\164\145\040\103\157\156\163\165\154\164\151\156\147\040\143\143
-+\061\050\060\046\006\003\125\004\013\023\037\103\145\162\164\151
-+\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143\145
-+\163\040\104\151\166\151\163\151\157\156\061\031\060\027\006\003
-+\125\004\003\023\020\124\150\141\167\164\145\040\123\145\162\166
-+\145\162\040\103\101\061\046\060\044\006\011\052\206\110\206\367
-+\015\001\011\001\026\027\163\145\162\166\145\162\055\143\145\162
-+\164\163\100\164\150\141\167\164\145\056\143\157\155\060\201\237
-+\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003
-+\201\215\000\060\201\211\002\201\201\000\323\244\120\156\310\377
-+\126\153\346\317\135\266\352\014\150\165\107\242\252\302\332\204
-+\045\374\250\364\107\121\332\205\265\040\164\224\206\036\017\165
-+\311\351\010\141\365\006\155\060\156\025\031\002\351\122\300\142
-+\333\115\231\236\342\152\014\104\070\315\376\276\343\144\011\160
-+\305\376\261\153\051\266\057\111\310\073\324\047\004\045\020\227
-+\057\347\220\155\300\050\102\231\327\114\103\336\303\365\041\155
-+\124\237\135\303\130\341\300\344\331\133\260\270\334\264\173\337
-+\066\072\302\265\146\042\022\326\207\015\002\003\001\000\001\243
-+\023\060\021\060\017\006\003\125\035\023\001\001\377\004\005\060
-+\003\001\001\377\060\015\006\011\052\206\110\206\367\015\001\001
-+\004\005\000\003\201\201\000\007\372\114\151\134\373\225\314\106
-+\356\205\203\115\041\060\216\312\331\250\157\111\032\346\332\121
-+\343\140\160\154\204\141\021\241\032\310\110\076\131\103\175\117
-+\225\075\241\213\267\013\142\230\172\165\212\335\210\116\116\236
-+\100\333\250\314\062\164\271\157\015\306\343\263\104\013\331\212
-+\157\232\051\233\231\030\050\073\321\343\100\050\232\132\074\325
-+\265\347\040\033\213\312\244\253\215\351\121\331\342\114\054\131
-+\251\332\271\262\165\033\366\102\362\357\307\362\030\371\211\274
-+\243\377\212\043\056\160\107
-+END
-+
-+# Trust for Certificate "Thawte Server CA"
-+# Issuer: E=server-certs@thawte.com,CN=Thawte Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-+# Serial Number: 1 (0x1)
-+# Subject: E=server-certs@thawte.com,CN=Thawte Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-+# Not Valid Before: Thu Aug 01 00:00:00 1996
-+# Not Valid After : Thu Dec 31 23:59:59 2020
-+# Fingerprint (MD5): C5:70:C4:A2:ED:53:78:0C:C8:10:53:81:64:CB:D0:1D
-+# Fingerprint (SHA1): 23:E5:94:94:51:95:F2:41:48:03:B4:D5:64:D2:A3:A3:F5:D8:8B:8C
-+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Thawte Server CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\043\345\224\224\121\225\362\101\110\003\264\325\144\322\243\243
-+\365\330\213\214
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\305\160\304\242\355\123\170\014\310\020\123\201\144\313\320\035
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\304\061\013\060\011\006\003\125\004\006\023\002\132\101
-+\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-+\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-+\023\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006
-+\003\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156
-+\163\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003
-+\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-+\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-+\163\151\157\156\061\031\060\027\006\003\125\004\003\023\020\124
-+\150\141\167\164\145\040\123\145\162\166\145\162\040\103\101\061
-+\046\060\044\006\011\052\206\110\206\367\015\001\011\001\026\027
-+\163\145\162\166\145\162\055\143\145\162\164\163\100\164\150\141
-+\167\164\145\056\143\157\155
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "Thawte Premium Server CA"
-+#
-+# Issuer: E=premium-server@thawte.com,CN=Thawte Premium Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-+# Serial Number: 1 (0x1)
-+# Subject: E=premium-server@thawte.com,CN=Thawte Premium Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-+# Not Valid Before: Thu Aug 01 00:00:00 1996
-+# Not Valid After : Thu Dec 31 23:59:59 2020
-+# Fingerprint (MD5): 06:9F:69:79:16:66:90:02:1B:8C:8C:A2:C3:07:6F:3A
-+# Fingerprint (SHA1): 62:7F:8D:78:27:65:63:99:D2:7D:7F:90:44:C9:FE:B3:F3:3E:FA:9A
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Thawte Premium Server CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\201\316\061\013\060\011\006\003\125\004\006\023\002\132\101
-+\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-+\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-+\023\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006
-+\003\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156
-+\163\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003
-+\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-+\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-+\163\151\157\156\061\041\060\037\006\003\125\004\003\023\030\124
-+\150\141\167\164\145\040\120\162\145\155\151\165\155\040\123\145
-+\162\166\145\162\040\103\101\061\050\060\046\006\011\052\206\110
-+\206\367\015\001\011\001\026\031\160\162\145\155\151\165\155\055
-+\163\145\162\166\145\162\100\164\150\141\167\164\145\056\143\157
-+\155
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\316\061\013\060\011\006\003\125\004\006\023\002\132\101
-+\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-+\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-+\023\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006
-+\003\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156
-+\163\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003
-+\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-+\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-+\163\151\157\156\061\041\060\037\006\003\125\004\003\023\030\124
-+\150\141\167\164\145\040\120\162\145\155\151\165\155\040\123\145
-+\162\166\145\162\040\103\101\061\050\060\046\006\011\052\206\110
-+\206\367\015\001\011\001\026\031\160\162\145\155\151\165\155\055
-+\163\145\162\166\145\162\100\164\150\141\167\164\145\056\143\157
-+\155
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\003\047\060\202\002\220\240\003\002\001\002\002\001\001
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\201\316\061\013\060\011\006\003\125\004\006\023\002\132\101\061
-+\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162
-+\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007\023
-+\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006\003
-+\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156\163
-+\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003\125
-+\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151\157
-+\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151\163
-+\151\157\156\061\041\060\037\006\003\125\004\003\023\030\124\150
-+\141\167\164\145\040\120\162\145\155\151\165\155\040\123\145\162
-+\166\145\162\040\103\101\061\050\060\046\006\011\052\206\110\206
-+\367\015\001\011\001\026\031\160\162\145\155\151\165\155\055\163
-+\145\162\166\145\162\100\164\150\141\167\164\145\056\143\157\155
-+\060\036\027\015\071\066\060\070\060\061\060\060\060\060\060\060
-+\132\027\015\062\060\061\062\063\061\062\063\065\071\065\071\132
-+\060\201\316\061\013\060\011\006\003\125\004\006\023\002\132\101
-+\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-+\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-+\023\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006
-+\003\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156
-+\163\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003
-+\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-+\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-+\163\151\157\156\061\041\060\037\006\003\125\004\003\023\030\124
-+\150\141\167\164\145\040\120\162\145\155\151\165\155\040\123\145
-+\162\166\145\162\040\103\101\061\050\060\046\006\011\052\206\110
-+\206\367\015\001\011\001\026\031\160\162\145\155\151\165\155\055
-+\163\145\162\166\145\162\100\164\150\141\167\164\145\056\143\157
-+\155\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001
-+\001\005\000\003\201\215\000\060\201\211\002\201\201\000\322\066
-+\066\152\213\327\302\133\236\332\201\101\142\217\070\356\111\004
-+\125\326\320\357\034\033\225\026\107\357\030\110\065\072\122\364
-+\053\152\006\217\073\057\352\126\343\257\206\215\236\027\367\236
-+\264\145\165\002\115\357\313\011\242\041\121\330\233\320\147\320
-+\272\015\222\006\024\163\324\223\313\227\052\000\234\134\116\014
-+\274\372\025\122\374\362\104\156\332\021\112\156\010\237\057\055
-+\343\371\252\072\206\163\266\106\123\130\310\211\005\275\203\021
-+\270\163\077\252\007\215\364\102\115\347\100\235\034\067\002\003
-+\001\000\001\243\023\060\021\060\017\006\003\125\035\023\001\001
-+\377\004\005\060\003\001\001\377\060\015\006\011\052\206\110\206
-+\367\015\001\001\004\005\000\003\201\201\000\046\110\054\026\302
-+\130\372\350\026\164\014\252\252\137\124\077\362\327\311\170\140
-+\136\136\156\067\143\042\167\066\176\262\027\304\064\271\365\010
-+\205\374\311\001\070\377\115\276\362\026\102\103\347\273\132\106
-+\373\301\306\021\037\361\112\260\050\106\311\303\304\102\175\274
-+\372\253\131\156\325\267\121\210\021\343\244\205\031\153\202\114
-+\244\014\022\255\351\244\256\077\361\303\111\145\232\214\305\310
-+\076\045\267\224\231\273\222\062\161\007\360\206\136\355\120\047
-+\246\015\246\043\371\273\313\246\007\024\102
-+END
-+
-+# Trust for Certificate "Thawte Premium Server CA"
-+# Issuer: E=premium-server@thawte.com,CN=Thawte Premium Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-+# Serial Number: 1 (0x1)
-+# Subject: E=premium-server@thawte.com,CN=Thawte Premium Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-+# Not Valid Before: Thu Aug 01 00:00:00 1996
-+# Not Valid After : Thu Dec 31 23:59:59 2020
-+# Fingerprint (MD5): 06:9F:69:79:16:66:90:02:1B:8C:8C:A2:C3:07:6F:3A
-+# Fingerprint (SHA1): 62:7F:8D:78:27:65:63:99:D2:7D:7F:90:44:C9:FE:B3:F3:3E:FA:9A
-+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Thawte Premium Server CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\142\177\215\170\047\145\143\231\322\175\177\220\104\311\376\263
-+\363\076\372\232
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\006\237\151\171\026\146\220\002\033\214\214\242\303\007\157\072
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\316\061\013\060\011\006\003\125\004\006\023\002\132\101
-+\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-+\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-+\023\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006
-+\003\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156
-+\163\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003
-+\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-+\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-+\163\151\157\156\061\041\060\037\006\003\125\004\003\023\030\124
-+\150\141\167\164\145\040\120\162\145\155\151\165\155\040\123\145
-+\162\166\145\162\040\103\101\061\050\060\046\006\011\052\206\110
-+\206\367\015\001\011\001\026\031\160\162\145\155\151\165\155\055
-+\163\145\162\166\145\162\100\164\150\141\167\164\145\056\143\157
-+\155
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
- # Certificate "Equifax Secure CA"
- #
- # Issuer: OU=Equifax Secure Certificate Authority,O=Equifax,C=US
-@@ -187,9 +602,9 @@
- CKA_SERIAL_NUMBER MULTILINE_OCTAL
- \002\004\065\336\364\317
- END
--CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
--CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
- # Distrust "Distrust a pb.com certificate that does not comply with the baseline requirements."
-@@ -331,9 +746,9 @@
- \002\020\160\272\344\035\020\331\051\064\266\070\312\173\003\314
- \272\277
- END
--CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
--CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
- #
-@@ -480,7 +895,7 @@
- END
- CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
--CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
- #
-@@ -747,6 +1162,426 @@
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
- #
-+# Certificate "ValiCert Class 1 VA"
-+#
-+# Issuer: E=info@valicert.com,CN=http://www.valicert.com/,OU=ValiCert Class 1 Policy Validation Authority,O="ValiCert, Inc.",L=ValiCert Validation Network
-+# Serial Number: 1 (0x1)
-+# Subject: E=info@valicert.com,CN=http://www.valicert.com/,OU=ValiCert Class 1 Policy Validation Authority,O="ValiCert, Inc.",L=ValiCert Validation Network
-+# Not Valid Before: Fri Jun 25 22:23:48 1999
-+# Not Valid After : Tue Jun 25 22:23:48 2019
-+# Fingerprint (MD5): 65:58:AB:15:AD:57:6C:1E:A8:A7:B5:69:AC:BF:FF:EB
-+# Fingerprint (SHA1): E5:DF:74:3C:B6:01:C4:9B:98:43:DC:AB:8C:E8:6A:81:10:9F:E4:8E
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "ValiCert Class 1 VA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\201\273\061\044\060\042\006\003\125\004\007\023\033\126\141
-+\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157
-+\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125
-+\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156
-+\143\056\061\065\060\063\006\003\125\004\013\023\054\126\141\154
-+\151\103\145\162\164\040\103\154\141\163\163\040\061\040\120\157
-+\154\151\143\171\040\126\141\154\151\144\141\164\151\157\156\040
-+\101\165\164\150\157\162\151\164\171\061\041\060\037\006\003\125
-+\004\003\023\030\150\164\164\160\072\057\057\167\167\167\056\166
-+\141\154\151\143\145\162\164\056\143\157\155\057\061\040\060\036
-+\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146
-+\157\100\166\141\154\151\143\145\162\164\056\143\157\155
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\273\061\044\060\042\006\003\125\004\007\023\033\126\141
-+\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157
-+\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125
-+\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156
-+\143\056\061\065\060\063\006\003\125\004\013\023\054\126\141\154
-+\151\103\145\162\164\040\103\154\141\163\163\040\061\040\120\157
-+\154\151\143\171\040\126\141\154\151\144\141\164\151\157\156\040
-+\101\165\164\150\157\162\151\164\171\061\041\060\037\006\003\125
-+\004\003\023\030\150\164\164\160\072\057\057\167\167\167\056\166
-+\141\154\151\143\145\162\164\056\143\157\155\057\061\040\060\036
-+\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146
-+\157\100\166\141\154\151\143\145\162\164\056\143\157\155
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052
-+\206\110\206\367\015\001\001\005\005\000\060\201\273\061\044\060
-+\042\006\003\125\004\007\023\033\126\141\154\151\103\145\162\164
-+\040\126\141\154\151\144\141\164\151\157\156\040\116\145\164\167
-+\157\162\153\061\027\060\025\006\003\125\004\012\023\016\126\141
-+\154\151\103\145\162\164\054\040\111\156\143\056\061\065\060\063
-+\006\003\125\004\013\023\054\126\141\154\151\103\145\162\164\040
-+\103\154\141\163\163\040\061\040\120\157\154\151\143\171\040\126
-+\141\154\151\144\141\164\151\157\156\040\101\165\164\150\157\162
-+\151\164\171\061\041\060\037\006\003\125\004\003\023\030\150\164
-+\164\160\072\057\057\167\167\167\056\166\141\154\151\143\145\162
-+\164\056\143\157\155\057\061\040\060\036\006\011\052\206\110\206
-+\367\015\001\011\001\026\021\151\156\146\157\100\166\141\154\151
-+\143\145\162\164\056\143\157\155\060\036\027\015\071\071\060\066
-+\062\065\062\062\062\063\064\070\132\027\015\061\071\060\066\062
-+\065\062\062\062\063\064\070\132\060\201\273\061\044\060\042\006
-+\003\125\004\007\023\033\126\141\154\151\103\145\162\164\040\126
-+\141\154\151\144\141\164\151\157\156\040\116\145\164\167\157\162
-+\153\061\027\060\025\006\003\125\004\012\023\016\126\141\154\151
-+\103\145\162\164\054\040\111\156\143\056\061\065\060\063\006\003
-+\125\004\013\023\054\126\141\154\151\103\145\162\164\040\103\154
-+\141\163\163\040\061\040\120\157\154\151\143\171\040\126\141\154
-+\151\144\141\164\151\157\156\040\101\165\164\150\157\162\151\164
-+\171\061\041\060\037\006\003\125\004\003\023\030\150\164\164\160
-+\072\057\057\167\167\167\056\166\141\154\151\143\145\162\164\056
-+\143\157\155\057\061\040\060\036\006\011\052\206\110\206\367\015
-+\001\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145
-+\162\164\056\143\157\155\060\201\237\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\201\215\000\060\201\211\002
-+\201\201\000\330\131\202\172\211\270\226\272\246\057\150\157\130
-+\056\247\124\034\006\156\364\352\215\110\274\061\224\027\360\363
-+\116\274\262\270\065\222\166\260\320\245\245\001\327\000\003\022
-+\042\031\010\370\377\021\043\233\316\007\365\277\151\032\046\376
-+\116\351\321\177\235\054\100\035\131\150\156\246\370\130\260\235
-+\032\217\323\077\361\334\031\006\201\250\016\340\072\335\310\123
-+\105\011\006\346\017\160\303\372\100\246\016\342\126\005\017\030
-+\115\374\040\202\321\163\125\164\215\166\162\240\035\235\035\300
-+\335\077\161\002\003\001\000\001\060\015\006\011\052\206\110\206
-+\367\015\001\001\005\005\000\003\201\201\000\120\150\075\111\364
-+\054\034\006\224\337\225\140\177\226\173\027\376\117\161\255\144
-+\310\335\167\322\357\131\125\350\077\350\216\005\052\041\362\007
-+\322\265\247\122\376\234\261\266\342\133\167\027\100\352\162\326
-+\043\313\050\201\062\303\000\171\030\354\131\027\211\311\306\152
-+\036\161\311\375\267\164\245\045\105\151\305\110\253\031\341\105
-+\212\045\153\031\356\345\273\022\365\177\367\246\215\121\303\360
-+\235\164\267\251\076\240\245\377\266\111\003\023\332\042\314\355
-+\161\202\053\231\317\072\267\365\055\162\310
-+END
-+
-+# Trust for Certificate "ValiCert Class 1 VA"
-+# Issuer: E=info@valicert.com,CN=http://www.valicert.com/,OU=ValiCert Class 1 Policy Validation Authority,O="ValiCert, Inc.",L=ValiCert Validation Network
-+# Serial Number: 1 (0x1)
-+# Subject: E=info@valicert.com,CN=http://www.valicert.com/,OU=ValiCert Class 1 Policy Validation Authority,O="ValiCert, Inc.",L=ValiCert Validation Network
-+# Not Valid Before: Fri Jun 25 22:23:48 1999
-+# Not Valid After : Tue Jun 25 22:23:48 2019
-+# Fingerprint (MD5): 65:58:AB:15:AD:57:6C:1E:A8:A7:B5:69:AC:BF:FF:EB
-+# Fingerprint (SHA1): E5:DF:74:3C:B6:01:C4:9B:98:43:DC:AB:8C:E8:6A:81:10:9F:E4:8E
-+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "ValiCert Class 1 VA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\345\337\164\074\266\001\304\233\230\103\334\253\214\350\152\201
-+\020\237\344\216
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\145\130\253\025\255\127\154\036\250\247\265\151\254\277\377\353
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\273\061\044\060\042\006\003\125\004\007\023\033\126\141
-+\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157
-+\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125
-+\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156
-+\143\056\061\065\060\063\006\003\125\004\013\023\054\126\141\154
-+\151\103\145\162\164\040\103\154\141\163\163\040\061\040\120\157
-+\154\151\143\171\040\126\141\154\151\144\141\164\151\157\156\040
-+\101\165\164\150\157\162\151\164\171\061\041\060\037\006\003\125
-+\004\003\023\030\150\164\164\160\072\057\057\167\167\167\056\166
-+\141\154\151\143\145\162\164\056\143\157\155\057\061\040\060\036
-+\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146
-+\157\100\166\141\154\151\143\145\162\164\056\143\157\155
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "ValiCert Class 2 VA"
-+#
-+# Issuer: E=info@valicert.com,CN=http://www.valicert.com/,OU=ValiCert Class 2 Policy Validation Authority,O="ValiCert, Inc.",L=ValiCert Validation Network
-+# Serial Number: 1 (0x1)
-+# Subject: E=info@valicert.com,CN=http://www.valicert.com/,OU=ValiCert Class 2 Policy Validation Authority,O="ValiCert, Inc.",L=ValiCert Validation Network
-+# Not Valid Before: Sat Jun 26 00:19:54 1999
-+# Not Valid After : Wed Jun 26 00:19:54 2019
-+# Fingerprint (MD5): A9:23:75:9B:BA:49:36:6E:31:C2:DB:F2:E7:66:BA:87
-+# Fingerprint (SHA1): 31:7A:2A:D0:7F:2B:33:5E:F5:A1:C3:4E:4B:57:E8:B7:D8:F1:FC:A6
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "ValiCert Class 2 VA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\201\273\061\044\060\042\006\003\125\004\007\023\033\126\141
-+\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157
-+\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125
-+\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156
-+\143\056\061\065\060\063\006\003\125\004\013\023\054\126\141\154
-+\151\103\145\162\164\040\103\154\141\163\163\040\062\040\120\157
-+\154\151\143\171\040\126\141\154\151\144\141\164\151\157\156\040
-+\101\165\164\150\157\162\151\164\171\061\041\060\037\006\003\125
-+\004\003\023\030\150\164\164\160\072\057\057\167\167\167\056\166
-+\141\154\151\143\145\162\164\056\143\157\155\057\061\040\060\036
-+\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146
-+\157\100\166\141\154\151\143\145\162\164\056\143\157\155
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\273\061\044\060\042\006\003\125\004\007\023\033\126\141
-+\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157
-+\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125
-+\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156
-+\143\056\061\065\060\063\006\003\125\004\013\023\054\126\141\154
-+\151\103\145\162\164\040\103\154\141\163\163\040\062\040\120\157
-+\154\151\143\171\040\126\141\154\151\144\141\164\151\157\156\040
-+\101\165\164\150\157\162\151\164\171\061\041\060\037\006\003\125
-+\004\003\023\030\150\164\164\160\072\057\057\167\167\167\056\166
-+\141\154\151\143\145\162\164\056\143\157\155\057\061\040\060\036
-+\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146
-+\157\100\166\141\154\151\143\145\162\164\056\143\157\155
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052
-+\206\110\206\367\015\001\001\005\005\000\060\201\273\061\044\060
-+\042\006\003\125\004\007\023\033\126\141\154\151\103\145\162\164
-+\040\126\141\154\151\144\141\164\151\157\156\040\116\145\164\167
-+\157\162\153\061\027\060\025\006\003\125\004\012\023\016\126\141
-+\154\151\103\145\162\164\054\040\111\156\143\056\061\065\060\063
-+\006\003\125\004\013\023\054\126\141\154\151\103\145\162\164\040
-+\103\154\141\163\163\040\062\040\120\157\154\151\143\171\040\126
-+\141\154\151\144\141\164\151\157\156\040\101\165\164\150\157\162
-+\151\164\171\061\041\060\037\006\003\125\004\003\023\030\150\164
-+\164\160\072\057\057\167\167\167\056\166\141\154\151\143\145\162
-+\164\056\143\157\155\057\061\040\060\036\006\011\052\206\110\206
-+\367\015\001\011\001\026\021\151\156\146\157\100\166\141\154\151
-+\143\145\162\164\056\143\157\155\060\036\027\015\071\071\060\066
-+\062\066\060\060\061\071\065\064\132\027\015\061\071\060\066\062
-+\066\060\060\061\071\065\064\132\060\201\273\061\044\060\042\006
-+\003\125\004\007\023\033\126\141\154\151\103\145\162\164\040\126
-+\141\154\151\144\141\164\151\157\156\040\116\145\164\167\157\162
-+\153\061\027\060\025\006\003\125\004\012\023\016\126\141\154\151
-+\103\145\162\164\054\040\111\156\143\056\061\065\060\063\006\003
-+\125\004\013\023\054\126\141\154\151\103\145\162\164\040\103\154
-+\141\163\163\040\062\040\120\157\154\151\143\171\040\126\141\154
-+\151\144\141\164\151\157\156\040\101\165\164\150\157\162\151\164
-+\171\061\041\060\037\006\003\125\004\003\023\030\150\164\164\160
-+\072\057\057\167\167\167\056\166\141\154\151\143\145\162\164\056
-+\143\157\155\057\061\040\060\036\006\011\052\206\110\206\367\015
-+\001\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145
-+\162\164\056\143\157\155\060\201\237\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\201\215\000\060\201\211\002
-+\201\201\000\316\072\161\312\345\253\310\131\222\125\327\253\330
-+\164\016\371\356\331\366\125\107\131\145\107\016\005\125\334\353
-+\230\066\074\134\123\135\323\060\317\070\354\275\101\211\355\045
-+\102\011\044\153\012\136\263\174\335\122\055\114\346\324\326\175
-+\132\131\251\145\324\111\023\055\044\115\034\120\157\265\301\205
-+\124\073\376\161\344\323\134\102\371\200\340\221\032\012\133\071
-+\066\147\363\077\125\174\033\077\264\137\144\163\064\343\264\022
-+\277\207\144\370\332\022\377\067\047\301\263\103\273\357\173\156
-+\056\151\367\002\003\001\000\001\060\015\006\011\052\206\110\206
-+\367\015\001\001\005\005\000\003\201\201\000\073\177\120\157\157
-+\120\224\231\111\142\070\070\037\113\370\245\310\076\247\202\201
-+\366\053\307\350\305\316\350\072\020\202\313\030\000\216\115\275
-+\250\130\177\241\171\000\265\273\351\215\257\101\331\017\064\356
-+\041\201\031\240\062\111\050\364\304\216\126\325\122\063\375\120
-+\325\176\231\154\003\344\311\114\374\313\154\253\146\263\112\041
-+\214\345\265\014\062\076\020\262\314\154\241\334\232\230\114\002
-+\133\363\316\271\236\245\162\016\112\267\077\074\346\026\150\370
-+\276\355\164\114\274\133\325\142\037\103\335
-+END
-+
-+# Trust for Certificate "ValiCert Class 2 VA"
-+# Issuer: E=info@valicert.com,CN=http://www.valicert.com/,OU=ValiCert Class 2 Policy Validation Authority,O="ValiCert, Inc.",L=ValiCert Validation Network
-+# Serial Number: 1 (0x1)
-+# Subject: E=info@valicert.com,CN=http://www.valicert.com/,OU=ValiCert Class 2 Policy Validation Authority,O="ValiCert, Inc.",L=ValiCert Validation Network
-+# Not Valid Before: Sat Jun 26 00:19:54 1999
-+# Not Valid After : Wed Jun 26 00:19:54 2019
-+# Fingerprint (MD5): A9:23:75:9B:BA:49:36:6E:31:C2:DB:F2:E7:66:BA:87
-+# Fingerprint (SHA1): 31:7A:2A:D0:7F:2B:33:5E:F5:A1:C3:4E:4B:57:E8:B7:D8:F1:FC:A6
-+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "ValiCert Class 2 VA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\061\172\052\320\177\053\063\136\365\241\303\116\113\127\350\267
-+\330\361\374\246
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\251\043\165\233\272\111\066\156\061\302\333\362\347\146\272\207
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\273\061\044\060\042\006\003\125\004\007\023\033\126\141
-+\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157
-+\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125
-+\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156
-+\143\056\061\065\060\063\006\003\125\004\013\023\054\126\141\154
-+\151\103\145\162\164\040\103\154\141\163\163\040\062\040\120\157
-+\154\151\143\171\040\126\141\154\151\144\141\164\151\157\156\040
-+\101\165\164\150\157\162\151\164\171\061\041\060\037\006\003\125
-+\004\003\023\030\150\164\164\160\072\057\057\167\167\167\056\166
-+\141\154\151\143\145\162\164\056\143\157\155\057\061\040\060\036
-+\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146
-+\157\100\166\141\154\151\143\145\162\164\056\143\157\155
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "RSA Root Certificate 1"
-+#
-+# Issuer: E=info@valicert.com,CN=http://www.valicert.com/,OU=ValiCert Class 3 Policy Validation Authority,O="ValiCert, Inc.",L=ValiCert Validation Network
-+# Serial Number: 1 (0x1)
-+# Subject: E=info@valicert.com,CN=http://www.valicert.com/,OU=ValiCert Class 3 Policy Validation Authority,O="ValiCert, Inc.",L=ValiCert Validation Network
-+# Not Valid Before: Sat Jun 26 00:22:33 1999
-+# Not Valid After : Wed Jun 26 00:22:33 2019
-+# Fingerprint (MD5): A2:6F:53:B7:EE:40:DB:4A:68:E7:FA:18:D9:10:4B:72
-+# Fingerprint (SHA1): 69:BD:8C:F4:9C:D3:00:FB:59:2E:17:93:CA:55:6A:F3:EC:AA:35:FB
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "RSA Root Certificate 1"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\201\273\061\044\060\042\006\003\125\004\007\023\033\126\141
-+\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157
-+\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125
-+\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156
-+\143\056\061\065\060\063\006\003\125\004\013\023\054\126\141\154
-+\151\103\145\162\164\040\103\154\141\163\163\040\063\040\120\157
-+\154\151\143\171\040\126\141\154\151\144\141\164\151\157\156\040
-+\101\165\164\150\157\162\151\164\171\061\041\060\037\006\003\125
-+\004\003\023\030\150\164\164\160\072\057\057\167\167\167\056\166
-+\141\154\151\143\145\162\164\056\143\157\155\057\061\040\060\036
-+\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146
-+\157\100\166\141\154\151\143\145\162\164\056\143\157\155
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\273\061\044\060\042\006\003\125\004\007\023\033\126\141
-+\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157
-+\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125
-+\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156
-+\143\056\061\065\060\063\006\003\125\004\013\023\054\126\141\154
-+\151\103\145\162\164\040\103\154\141\163\163\040\063\040\120\157
-+\154\151\143\171\040\126\141\154\151\144\141\164\151\157\156\040
-+\101\165\164\150\157\162\151\164\171\061\041\060\037\006\003\125
-+\004\003\023\030\150\164\164\160\072\057\057\167\167\167\056\166
-+\141\154\151\143\145\162\164\056\143\157\155\057\061\040\060\036
-+\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146
-+\157\100\166\141\154\151\143\145\162\164\056\143\157\155
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052
-+\206\110\206\367\015\001\001\005\005\000\060\201\273\061\044\060
-+\042\006\003\125\004\007\023\033\126\141\154\151\103\145\162\164
-+\040\126\141\154\151\144\141\164\151\157\156\040\116\145\164\167
-+\157\162\153\061\027\060\025\006\003\125\004\012\023\016\126\141
-+\154\151\103\145\162\164\054\040\111\156\143\056\061\065\060\063
-+\006\003\125\004\013\023\054\126\141\154\151\103\145\162\164\040
-+\103\154\141\163\163\040\063\040\120\157\154\151\143\171\040\126
-+\141\154\151\144\141\164\151\157\156\040\101\165\164\150\157\162
-+\151\164\171\061\041\060\037\006\003\125\004\003\023\030\150\164
-+\164\160\072\057\057\167\167\167\056\166\141\154\151\143\145\162
-+\164\056\143\157\155\057\061\040\060\036\006\011\052\206\110\206
-+\367\015\001\011\001\026\021\151\156\146\157\100\166\141\154\151
-+\143\145\162\164\056\143\157\155\060\036\027\015\071\071\060\066
-+\062\066\060\060\062\062\063\063\132\027\015\061\071\060\066\062
-+\066\060\060\062\062\063\063\132\060\201\273\061\044\060\042\006
-+\003\125\004\007\023\033\126\141\154\151\103\145\162\164\040\126
-+\141\154\151\144\141\164\151\157\156\040\116\145\164\167\157\162
-+\153\061\027\060\025\006\003\125\004\012\023\016\126\141\154\151
-+\103\145\162\164\054\040\111\156\143\056\061\065\060\063\006\003
-+\125\004\013\023\054\126\141\154\151\103\145\162\164\040\103\154
-+\141\163\163\040\063\040\120\157\154\151\143\171\040\126\141\154
-+\151\144\141\164\151\157\156\040\101\165\164\150\157\162\151\164
-+\171\061\041\060\037\006\003\125\004\003\023\030\150\164\164\160
-+\072\057\057\167\167\167\056\166\141\154\151\143\145\162\164\056
-+\143\157\155\057\061\040\060\036\006\011\052\206\110\206\367\015
-+\001\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145
-+\162\164\056\143\157\155\060\201\237\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\201\215\000\060\201\211\002
-+\201\201\000\343\230\121\226\034\350\325\261\006\201\152\127\303
-+\162\165\223\253\317\236\246\374\363\026\122\326\055\115\237\065
-+\104\250\056\004\115\007\111\212\070\051\365\167\067\347\267\253
-+\135\337\066\161\024\231\217\334\302\222\361\347\140\222\227\354
-+\330\110\334\277\301\002\040\306\044\244\050\114\060\132\166\155
-+\261\134\363\335\336\236\020\161\241\210\307\133\233\101\155\312
-+\260\270\216\025\356\255\063\053\317\107\004\134\165\161\012\230
-+\044\230\051\247\111\131\245\335\370\267\103\142\141\363\323\342
-+\320\125\077\002\003\001\000\001\060\015\006\011\052\206\110\206
-+\367\015\001\001\005\005\000\003\201\201\000\126\273\002\130\204
-+\147\010\054\337\037\333\173\111\063\365\323\147\235\364\264\012
-+\020\263\311\305\054\342\222\152\161\170\047\362\160\203\102\323
-+\076\317\251\124\364\361\330\222\026\214\321\004\313\113\253\311
-+\237\105\256\074\212\251\260\161\063\135\310\305\127\337\257\250
-+\065\263\177\211\207\351\350\045\222\270\177\205\172\256\326\274
-+\036\067\130\052\147\311\221\317\052\201\076\355\306\071\337\300
-+\076\031\234\031\314\023\115\202\101\265\214\336\340\075\140\010
-+\040\017\105\176\153\242\177\243\214\025\356
-+END
-+
-+# Trust for Certificate "RSA Root Certificate 1"
-+# Issuer: E=info@valicert.com,CN=http://www.valicert.com/,OU=ValiCert Class 3 Policy Validation Authority,O="ValiCert, Inc.",L=ValiCert Validation Network
-+# Serial Number: 1 (0x1)
-+# Subject: E=info@valicert.com,CN=http://www.valicert.com/,OU=ValiCert Class 3 Policy Validation Authority,O="ValiCert, Inc.",L=ValiCert Validation Network
-+# Not Valid Before: Sat Jun 26 00:22:33 1999
-+# Not Valid After : Wed Jun 26 00:22:33 2019
-+# Fingerprint (MD5): A2:6F:53:B7:EE:40:DB:4A:68:E7:FA:18:D9:10:4B:72
-+# Fingerprint (SHA1): 69:BD:8C:F4:9C:D3:00:FB:59:2E:17:93:CA:55:6A:F3:EC:AA:35:FB
-+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "RSA Root Certificate 1"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\151\275\214\364\234\323\000\373\131\056\027\223\312\125\152\363
-+\354\252\065\373
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\242\157\123\267\356\100\333\112\150\347\372\030\331\020\113\162
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\273\061\044\060\042\006\003\125\004\007\023\033\126\141
-+\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157
-+\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125
-+\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156
-+\143\056\061\065\060\063\006\003\125\004\013\023\054\126\141\154
-+\151\103\145\162\164\040\103\154\141\163\163\040\063\040\120\157
-+\154\151\143\171\040\126\141\154\151\144\141\164\151\157\156\040
-+\101\165\164\150\157\162\151\164\171\061\041\060\037\006\003\125
-+\004\003\023\030\150\164\164\160\072\057\057\167\167\167\056\166
-+\141\154\151\143\145\162\164\056\143\157\155\057\061\040\060\036
-+\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146
-+\157\100\166\141\154\151\143\145\162\164\056\143\157\155
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
- # Certificate "Verisign Class 1 Public Primary Certification Authority - G3"
- #
- # Issuer: CN=VeriSign Class 1 Public Primary Certification Authority - G3,OU="(c) 1999 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
-@@ -1351,6 +2186,180 @@
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
- #
-+# Certificate "Entrust.net Secure Server CA"
-+#
-+# Issuer: CN=Entrust.net Secure Server Certification Authority,OU=(c) 1999 Entrust.net Limited,OU=www.entrust.net/CPS incorp. by ref. (limits liab.),O=Entrust.net,C=US
-+# Serial Number: 927650371 (0x374ad243)
-+# Subject: CN=Entrust.net Secure Server Certification Authority,OU=(c) 1999 Entrust.net Limited,OU=www.entrust.net/CPS incorp. by ref. (limits liab.),O=Entrust.net,C=US
-+# Not Valid Before: Tue May 25 16:09:40 1999
-+# Not Valid After : Sat May 25 16:39:40 2019
-+# Fingerprint (MD5): DF:F2:80:73:CC:F1:E6:61:73:FC:F5:42:E9:C5:7C:EE
-+# Fingerprint (SHA1): 99:A6:9B:E6:1A:FE:88:6B:4D:2B:82:00:7C:B8:54:FC:31:7E:15:39
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Entrust.net Secure Server CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\201\303\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165
-+\163\164\056\156\145\164\061\073\060\071\006\003\125\004\013\023
-+\062\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164
-+\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040
-+\162\145\146\056\040\050\154\151\155\151\164\163\040\154\151\141
-+\142\056\051\061\045\060\043\006\003\125\004\013\023\034\050\143
-+\051\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156
-+\145\164\040\114\151\155\151\164\145\144\061\072\060\070\006\003
-+\125\004\003\023\061\105\156\164\162\165\163\164\056\156\145\164
-+\040\123\145\143\165\162\145\040\123\145\162\166\145\162\040\103
-+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-+\150\157\162\151\164\171
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\303\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165
-+\163\164\056\156\145\164\061\073\060\071\006\003\125\004\013\023
-+\062\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164
-+\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040
-+\162\145\146\056\040\050\154\151\155\151\164\163\040\154\151\141
-+\142\056\051\061\045\060\043\006\003\125\004\013\023\034\050\143
-+\051\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156
-+\145\164\040\114\151\155\151\164\145\144\061\072\060\070\006\003
-+\125\004\003\023\061\105\156\164\162\165\163\164\056\156\145\164
-+\040\123\145\143\165\162\145\040\123\145\162\166\145\162\040\103
-+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-+\150\157\162\151\164\171
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\004\067\112\322\103
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\004\330\060\202\004\101\240\003\002\001\002\002\004\067
-+\112\322\103\060\015\006\011\052\206\110\206\367\015\001\001\005
-+\005\000\060\201\303\061\013\060\011\006\003\125\004\006\023\002
-+\125\123\061\024\060\022\006\003\125\004\012\023\013\105\156\164
-+\162\165\163\164\056\156\145\164\061\073\060\071\006\003\125\004
-+\013\023\062\167\167\167\056\145\156\164\162\165\163\164\056\156
-+\145\164\057\103\120\123\040\151\156\143\157\162\160\056\040\142
-+\171\040\162\145\146\056\040\050\154\151\155\151\164\163\040\154
-+\151\141\142\056\051\061\045\060\043\006\003\125\004\013\023\034
-+\050\143\051\040\061\071\071\071\040\105\156\164\162\165\163\164
-+\056\156\145\164\040\114\151\155\151\164\145\144\061\072\060\070
-+\006\003\125\004\003\023\061\105\156\164\162\165\163\164\056\156
-+\145\164\040\123\145\143\165\162\145\040\123\145\162\166\145\162
-+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-+\165\164\150\157\162\151\164\171\060\036\027\015\071\071\060\065
-+\062\065\061\066\060\071\064\060\132\027\015\061\071\060\065\062
-+\065\061\066\063\071\064\060\132\060\201\303\061\013\060\011\006
-+\003\125\004\006\023\002\125\123\061\024\060\022\006\003\125\004
-+\012\023\013\105\156\164\162\165\163\164\056\156\145\164\061\073
-+\060\071\006\003\125\004\013\023\062\167\167\167\056\145\156\164
-+\162\165\163\164\056\156\145\164\057\103\120\123\040\151\156\143
-+\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
-+\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
-+\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105
-+\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
-+\145\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164
-+\162\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040
-+\123\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141
-+\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\201
-+\235\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000
-+\003\201\213\000\060\201\207\002\201\201\000\315\050\203\064\124
-+\033\211\363\017\257\067\221\061\377\257\061\140\311\250\350\262
-+\020\150\355\237\347\223\066\361\012\144\273\107\365\004\027\077
-+\043\107\115\305\047\031\201\046\014\124\162\015\210\055\331\037
-+\232\022\237\274\263\161\323\200\031\077\107\146\173\214\065\050
-+\322\271\012\337\044\332\234\326\120\171\201\172\132\323\067\367
-+\302\112\330\051\222\046\144\321\344\230\154\072\000\212\365\064
-+\233\145\370\355\343\020\377\375\270\111\130\334\240\336\202\071
-+\153\201\261\026\031\141\271\124\266\346\103\002\001\003\243\202
-+\001\327\060\202\001\323\060\021\006\011\140\206\110\001\206\370
-+\102\001\001\004\004\003\002\000\007\060\202\001\031\006\003\125
-+\035\037\004\202\001\020\060\202\001\014\060\201\336\240\201\333
-+\240\201\330\244\201\325\060\201\322\061\013\060\011\006\003\125
-+\004\006\023\002\125\123\061\024\060\022\006\003\125\004\012\023
-+\013\105\156\164\162\165\163\164\056\156\145\164\061\073\060\071
-+\006\003\125\004\013\023\062\167\167\167\056\145\156\164\162\165
-+\163\164\056\156\145\164\057\103\120\123\040\151\156\143\157\162
-+\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155\151
-+\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003\125
-+\004\013\023\034\050\143\051\040\061\071\071\071\040\105\156\164
-+\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145\144
-+\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162\165
-+\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123\145
-+\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164\151
-+\157\156\040\101\165\164\150\157\162\151\164\171\061\015\060\013
-+\006\003\125\004\003\023\004\103\122\114\061\060\051\240\047\240
-+\045\206\043\150\164\164\160\072\057\057\167\167\167\056\145\156
-+\164\162\165\163\164\056\156\145\164\057\103\122\114\057\156\145
-+\164\061\056\143\162\154\060\053\006\003\125\035\020\004\044\060
-+\042\200\017\061\071\071\071\060\065\062\065\061\066\060\071\064
-+\060\132\201\017\062\060\061\071\060\065\062\065\061\066\060\071
-+\064\060\132\060\013\006\003\125\035\017\004\004\003\002\001\006
-+\060\037\006\003\125\035\043\004\030\060\026\200\024\360\027\142
-+\023\125\075\263\377\012\000\153\373\120\204\227\363\355\142\320
-+\032\060\035\006\003\125\035\016\004\026\004\024\360\027\142\023
-+\125\075\263\377\012\000\153\373\120\204\227\363\355\142\320\032
-+\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060\031
-+\006\011\052\206\110\206\366\175\007\101\000\004\014\060\012\033
-+\004\126\064\056\060\003\002\004\220\060\015\006\011\052\206\110
-+\206\367\015\001\001\005\005\000\003\201\201\000\220\334\060\002
-+\372\144\164\302\247\012\245\174\041\215\064\027\250\373\107\016
-+\377\045\174\215\023\012\373\344\230\265\357\214\370\305\020\015
-+\367\222\276\361\303\325\325\225\152\004\273\054\316\046\066\145
-+\310\061\306\347\356\077\343\127\165\204\172\021\357\106\117\030
-+\364\323\230\273\250\207\062\272\162\366\074\342\075\237\327\035
-+\331\303\140\103\214\130\016\042\226\057\142\243\054\037\272\255
-+\005\357\253\062\170\207\240\124\163\031\265\134\005\371\122\076
-+\155\055\105\013\367\012\223\352\355\006\371\262
-+END
-+
-+# Trust for Certificate "Entrust.net Secure Server CA"
-+# Issuer: CN=Entrust.net Secure Server Certification Authority,OU=(c) 1999 Entrust.net Limited,OU=www.entrust.net/CPS incorp. by ref. (limits liab.),O=Entrust.net,C=US
-+# Serial Number: 927650371 (0x374ad243)
-+# Subject: CN=Entrust.net Secure Server Certification Authority,OU=(c) 1999 Entrust.net Limited,OU=www.entrust.net/CPS incorp. by ref. (limits liab.),O=Entrust.net,C=US
-+# Not Valid Before: Tue May 25 16:09:40 1999
-+# Not Valid After : Sat May 25 16:39:40 2019
-+# Fingerprint (MD5): DF:F2:80:73:CC:F1:E6:61:73:FC:F5:42:E9:C5:7C:EE
-+# Fingerprint (SHA1): 99:A6:9B:E6:1A:FE:88:6B:4D:2B:82:00:7C:B8:54:FC:31:7E:15:39
-+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Entrust.net Secure Server CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\231\246\233\346\032\376\210\153\115\053\202\000\174\270\124\374
-+\061\176\025\071
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\337\362\200\163\314\361\346\141\163\374\365\102\351\305\174\356
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\303\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165
-+\163\164\056\156\145\164\061\073\060\071\006\003\125\004\013\023
-+\062\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164
-+\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040
-+\162\145\146\056\040\050\154\151\155\151\164\163\040\154\151\141
-+\142\056\051\061\045\060\043\006\003\125\004\013\023\034\050\143
-+\051\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156
-+\145\164\040\114\151\155\151\164\145\144\061\072\060\070\006\003
-+\125\004\003\023\061\105\156\164\162\165\163\164\056\156\145\164
-+\040\123\145\143\165\162\145\040\123\145\162\166\145\162\040\103
-+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-+\150\157\162\151\164\171
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\004\067\112\322\103
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
- # Certificate "Entrust.net Premium 2048 Secure Server CA"
- #
- # Issuer: CN=Entrust.net Certification Authority (2048),OU=(c) 1999 Entrust.net Limited,OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.),O=Entrust.net
-@@ -1753,9 +2762,9 @@
- CKA_SERIAL_NUMBER MULTILINE_OCTAL
- \002\001\001
- END
--CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
--CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
- #
-@@ -1869,9 +2878,9 @@
- CKA_SERIAL_NUMBER MULTILINE_OCTAL
- \002\001\004
- END
--CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
--CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
- #
diff --git a/libre/openssl-static/PKGBUILD b/libre/openssl-static/PKGBUILD
deleted file mode 100644
index d4b15641e..000000000
--- a/libre/openssl-static/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of openssl
-
-_pkgname=openssl
-pkgname=openssl-static
-_ver=1.0.2g
-# use a pacman compatible version scheme
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-#pkgver=$_ver
-pkgrel=3
-pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (static libraries only)'
-arch=('i686' 'x86_64' 'armv7h')
-url='https://www.openssl.org'
-license=('custom:BSD')
-depends=('perl-static' 'openssl')
-options=('!makeflags' 'staticlibs')
-source=("https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz"
- "https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz.asc"
- 'no-rpath.patch'
- 'ssl3-test-failure.patch'
- 'ca-dir.patch')
-md5sums=('f3c710c045cdee5fd114feb69feba7aa'
- 'SKIP'
- 'dc78d3d06baffc16217519242ce92478'
- '62fc492252edd3283871632bb77fadbe'
- '3bf51be3a1bbd262be46dc619f92aa90')
-validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
-
-prepare() {
- cd $srcdir/$_pkgname-$_ver
-
- # remove rpath: http://bugs.archlinux.org/task/14367
- patch -p0 -i $srcdir/no-rpath.patch
-
- # disable a test that fails when ssl3 is disabled
- patch -p1 -i $srcdir/ssl3-test-failure.patch
-
- # set ca dir to /etc/ssl by default
- patch -p0 -i $srcdir/ca-dir.patch
-}
-
-build() {
- cd $srcdir/$_pkgname-$_ver
-
- if [ "${CARCH}" == 'x86_64' ]; then
- openssltarget='linux-x86_64'
- optflags='enable-ec_nistp_64_gcc_128'
- elif [ "${CARCH}" == 'i686' ]; then
- openssltarget='linux-elf'
- optflags=''
- fi
-
- # mark stack as non-executable: http://bugs.archlinux.org/task/12434
- ./Configure --prefix=/usr --libdir=lib \
- no-ssl3-method ${optflags} \
- "${openssltarget}" \
- "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
-
- make depend
- make
-}
-
-check() {
- cd $srcdir/$_pkgname-$_ver
- # the test fails due to missing write permissions in /etc/ssl
- # revert this patch for make test
- patch -p0 -R -i $srcdir/ca-dir.patch
- make test
- patch -p0 -i $srcdir/ca-dir.patch
-}
-
-package() {
- cd $srcdir/$_pkgname-$_ver
- make INSTALL_PREFIX=$pkgdir install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,include,lib/pkgconfig,ssl}
-}
diff --git a/libre/openssl-static/ca-dir.patch b/libre/openssl-static/ca-dir.patch
deleted file mode 100644
index 41d1386d3..000000000
--- a/libre/openssl-static/ca-dir.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- apps/CA.pl.in 2006-04-28 02:30:49.000000000 +0200
-+++ apps/CA.pl.in 2010-04-01 00:35:02.600553509 +0200
-@@ -53,7 +53,7 @@
- $X509="$openssl x509";
- $PKCS12="$openssl pkcs12";
-
--$CATOP="./demoCA";
-+$CATOP="/etc/ssl";
- $CAKEY="cakey.pem";
- $CAREQ="careq.pem";
- $CACERT="cacert.pem";
---- apps/CA.sh 2009-10-15 19:27:47.000000000 +0200
-+++ apps/CA.sh 2010-04-01 00:35:02.600553509 +0200
-@@ -68,7 +68,7 @@
- X509="$OPENSSL x509"
- PKCS12="openssl pkcs12"
-
--if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi
-+if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi
- CAKEY=./cakey.pem
- CAREQ=./careq.pem
- CACERT=./cacert.pem
---- apps/openssl.cnf 2009-04-04 20:09:43.000000000 +0200
-+++ apps/openssl.cnf 2010-04-01 00:35:02.607220681 +0200
-@@ -39,7 +39,7 @@
- ####################################################################
- [ CA_default ]
-
--dir = ./demoCA # Where everything is kept
-+dir = /etc/ssl # Where everything is kept
- certs = $dir/certs # Where the issued certs are kept
- crl_dir = $dir/crl # Where the issued crl are kept
- database = $dir/index.txt # database index file.
diff --git a/libre/openssl-static/no-rpath.patch b/libre/openssl-static/no-rpath.patch
deleted file mode 100644
index ebd95e23d..000000000
--- a/libre/openssl-static/no-rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200
-+++ Makefile.shared 2005-11-16 22:35:37.000000000 +0100
-@@ -153,7 +153,7 @@
- NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
-
- #This is rather special. It's a special target with which one can link
- #applications without bothering with any features that have anything to
diff --git a/libre/openssl-static/ssl3-test-failure.patch b/libre/openssl-static/ssl3-test-failure.patch
deleted file mode 100644
index d161c3d4a..000000000
--- a/libre/openssl-static/ssl3-test-failure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Kurt Roeckx <kurt@roeckx.be>
-Date: Sun, 6 Sep 2015 16:04:11 +0200
-Subject: Disable SSLv3 test in test suite
-
-When testing SSLv3 the test program returns 0 for skip. The test for weak DH
-expects a failure, but gets success.
-
-It should probably be changed to return something other than 0 for a skipped
-test.
----
- test/testssl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/testssl b/test/testssl
-index 747e4ba..1e4370b 100644
---- a/test/testssl
-+++ b/test/testssl
-@@ -160,7 +160,7 @@ test_cipher() {
- }
-
- echo "Testing ciphersuites"
--for protocol in TLSv1.2 SSLv3; do
-+for protocol in TLSv1.2; do
- echo "Testing ciphersuites for $protocol"
- for cipher in `../util/shlib_wrap.sh ../apps/openssl ciphers "RSA+$protocol" | tr ':' ' '`; do
- test_cipher $cipher $protocol
diff --git a/libre/p11-kit-static/PKGBUILD b/libre/p11-kit-static/PKGBUILD
deleted file mode 100644
index 171146594..000000000
--- a/libre/p11-kit-static/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of p11-kit
-
-_pkgname=p11-kit
-pkgname=p11-kit-static
-pkgver=0.23.2
-pkgrel=1
-pkgdesc="Library to work with PKCS#11 modules (static libraries only)"
-arch=(i686 x86_64 armv7h)
-url="http://p11-glue.freedesktop.org"
-license=('BSD')
-depends=('libtasn1-static' 'libffi-static' 'p11-kit')
-options=('staticlibs')
-source=($url/releases/$_pkgname-$pkgver.tar.gz{,.sig}
- libnssckbi-compat.patch)
-sha256sums=('ba726ea8303c97467a33fca50ee79b7b35212964be808ecf9b145e9042fdfaf0'
- 'SKIP'
- '8f763cdbc6c0ca6c5a7898f9fd6f3018b7ac5b1aca36f67c6c813343c2962962')
-validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF')
-
-prepare() {
- cd $_pkgname-$pkgver
-
- # Build and install an additional library (libnssckbi-p11-kit.so) which
- # is a copy of p11-kit-trust.so but uses the same label for root certs as
- # libnssckbi.so ("Builtin Object Token" instead of "Default Trust")
- # https://bugs.freedesktop.org/show_bug.cgi?id=66161
- patch -Np1 -i ../libnssckbi-compat.patch
-
- autoreconf -vi
-
- sed -i '\|^if[ ]test[ ]["][$]enable_static["][ ][=][ ]["]yes["][;][ ]then$|,+3 d
- ' configure
-}
-
-build() {
- cd $_pkgname-$pkgver
-
- ./configure \
- --prefix=/usr --enable-static \
- --with-module-path=/usr/lib/pkcs11 \
- --with-trust-paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source
- make
-}
-
-check() {
- cd $_pkgname-$pkgver
- make check
-}
-
-package() {
- cd $_pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,etc,include,lib/{pkgconfig,$_pkgname},share}
- rm -v ${pkgdir}/usr/lib/{,pkcs11/}*.so*
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/p11-kit-static/libnssckbi-compat.patch b/libre/p11-kit-static/libnssckbi-compat.patch
deleted file mode 100644
index d1b70a3bb..000000000
--- a/libre/p11-kit-static/libnssckbi-compat.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -upr p11-kit-0.23.1.orig/trust/Makefile.am p11-kit-0.23.1/trust/Makefile.am
---- p11-kit-0.23.1.orig/trust/Makefile.am 2014-11-12 12:58:50.000000000 +0200
-+++ p11-kit-0.23.1/trust/Makefile.am 2015-03-30 16:43:35.275993032 +0300
-@@ -61,6 +61,20 @@ p11_kit_trust_la_LDFLAGS = \
-
- p11_kit_trust_la_SOURCES = $(TRUST_SRCS)
-
-+libnssckbi_compatdir = $(libdir)
-+libnssckbi_compat_LTLIBRARIES = \
-+ libnssckbi-p11-kit.la
-+
-+libnssckbi_p11_kit_la_CFLAGS = \
-+ -DLIBNSSCKBI_COMPAT \
-+ $(p11_kit_trust_la_CFLAGS)
-+
-+libnssckbi_p11_kit_la_LIBADD = $(p11_kit_trust_la_LIBADD)
-+
-+libnssckbi_p11_kit_la_LDFLAGS = $(p11_kit_trust_la_LDFLAGS)
-+
-+libnssckbi_p11_kit_la_SOURCES = $(p11_kit_trust_la_SOURCES)
-+
- libtrust_testable_la_LDFLAGS = \
- -no-undefined
-
-diff -upr p11-kit-0.23.1.orig/trust/module.c p11-kit-0.23.1/trust/module.c
---- p11-kit-0.23.1.orig/trust/module.c 2014-12-16 12:24:01.000000000 +0200
-+++ p11-kit-0.23.1/trust/module.c 2015-03-30 16:48:41.370360130 +0300
-@@ -196,7 +196,11 @@ create_tokens_inlock (p11_array *tokens,
- const char *label;
- } labels[] = {
- { "~/", "User Trust" },
-+#ifdef LIBNSSCKBI_COMPAT
-+ { DATA_DIR, "Builtin Object Token" },
-+#else
- { DATA_DIR, "Default Trust" },
-+#endif
- { SYSCONFDIR, "System Trust" },
- { NULL },
- };
-@@ -521,9 +525,15 @@ sys_C_GetSlotInfo (CK_SLOT_ID id,
- info->flags = CKF_TOKEN_PRESENT;
- strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32);
-
-- /* If too long, copy the first 64 characters into buffer */
-- path = p11_token_get_path (token);
-+#ifdef LIBNSSCKBI_COMPAT
-+ /* Change description to match libnssckbi so HPKP works in Chromium */
-+ if (strcmp (p11_token_get_label (token), "Builtin Object Token" ) == 0)
-+ path = "NSS Builtin Objects";
-+ else
-+#endif
-+ path = p11_token_get_path (token);
- length = strlen (path);
-+ /* If too long, copy the first 64 characters into buffer */
- if (length > sizeof (info->slotDescription))
- length = sizeof (info->slotDescription);
- memset (info->slotDescription, ' ', sizeof (info->slotDescription));
diff --git a/libre/perl-static/CVE-2016-2381_duplicate_env.diff b/libre/perl-static/CVE-2016-2381_duplicate_env.diff
deleted file mode 100644
index 80adf62d2..000000000
--- a/libre/perl-static/CVE-2016-2381_duplicate_env.diff
+++ /dev/null
@@ -1,104 +0,0 @@
-From 83e7ebed7afa79a2f50eca6b6330eae7c3a02d36 Mon Sep 17 00:00:00 2001
-From: Tony Cook <tony@develop-help.com>
-Date: Wed, 27 Jan 2016 11:52:15 +1100
-Subject: remove duplicate environment variables from environ
-
-If we see duplicate environment variables while iterating over
-environ[]:
-
-a) make sure we use the same value in %ENV that getenv() returns.
-
-Previously on a duplicate, %ENV would have the last entry for the name
-from environ[], but a typical getenv() would return the first entry.
-
-Rather than assuming all getenv() implementations return the first entry
-explicitly call getenv() to ensure they agree.
-
-b) remove duplicate entries from environ
-
-Previously if there was a duplicate definition for a name in environ[]
-setting that name in %ENV could result in an unsafe value being passed
-to a child process, so ensure environ[] has no duplicates.
-
-Patch-Name: fixes/CVE-2016-2381_duplicate_env.diff
----
- perl.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 49 insertions(+), 2 deletions(-)
-
-diff --git a/perl.c b/perl.c
-index 80a76c2..ed25429 100644
---- a/perl.c
-+++ b/perl.c
-@@ -4303,23 +4303,70 @@ S_init_postdump_symbols(pTHX_ int argc, char **argv, char **env)
- }
- if (env) {
- char *s, *old_var;
-+ STRLEN nlen;
- SV *sv;
-+ HV *dups = newHV();
-+
- for (; *env; env++) {
- old_var = *env;
-
- if (!(s = strchr(old_var,'=')) || s == old_var)
- continue;
-+ nlen = s - old_var;
-
- #if defined(MSDOS) && !defined(DJGPP)
- *s = '\0';
- (void)strupr(old_var);
- *s = '=';
- #endif
-- sv = newSVpv(s+1, 0);
-- (void)hv_store(hv, old_var, s - old_var, sv, 0);
-+ if (hv_exists(hv, old_var, nlen)) {
-+ const char *name = savepvn(old_var, nlen);
-+
-+ /* make sure we use the same value as getenv(), otherwise code that
-+ uses getenv() (like setlocale()) might see a different value to %ENV
-+ */
-+ sv = newSVpv(PerlEnv_getenv(name), 0);
-+
-+ /* keep a count of the dups of this name so we can de-dup environ later */
-+ if (hv_exists(dups, name, nlen))
-+ ++SvIVX(*hv_fetch(dups, name, nlen, 0));
-+ else
-+ (void)hv_store(dups, name, nlen, newSViv(1), 0);
-+
-+ Safefree(name);
-+ }
-+ else {
-+ sv = newSVpv(s+1, 0);
-+ }
-+ (void)hv_store(hv, old_var, nlen, sv, 0);
- if (env_is_not_environ)
- mg_set(sv);
- }
-+ if (HvKEYS(dups)) {
-+ /* environ has some duplicate definitions, remove them */
-+ HE *entry;
-+ hv_iterinit(dups);
-+ while ((entry = hv_iternext_flags(dups, 0))) {
-+ STRLEN nlen;
-+ const char *name = HePV(entry, nlen);
-+ IV count = SvIV(HeVAL(entry));
-+ IV i;
-+ SV **valp = hv_fetch(hv, name, nlen, 0);
-+
-+ assert(valp);
-+
-+ /* try to remove any duplicate names, depending on the
-+ * implementation used in my_setenv() the iteration might
-+ * not be necessary, but let's be safe.
-+ */
-+ for (i = 0; i < count; ++i)
-+ my_setenv(name, 0);
-+
-+ /* and set it back to the value we set $ENV{name} to */
-+ my_setenv(name, SvPV_nolen(*valp));
-+ }
-+ }
-+ SvREFCNT_dec_NN(dups);
- }
- #endif /* USE_ENVIRON_ARRAY */
- #endif /* !PERL_MICRO */
diff --git a/libre/perl-static/PKGBUILD b/libre/perl-static/PKGBUILD
deleted file mode 100644
index 297adbbe9..000000000
--- a/libre/perl-static/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of perl
-
-_pkgname=perl
-pkgname=perl-static
-pkgver=5.22.1
-pkgrel=2.1
-pkgdesc="A highly capable, feature-rich programming language (static libraries only)"
-arch=(i686 x86_64 armv7h)
-license=('GPL' 'PerlArtistic')
-url="http://www.perl.org"
-depends=('gdbm-static' 'db-static' 'perl')
-source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2
- CVE-2016-2381_duplicate_env.diff)
-options=('makeflags' '!purge' 'emptydirs' 'staticlibs')
-md5sums=('67242b9bd642b458bec884ed2a040910'
- 'a108f258b9ba1504b6051d123ccaa623')
-
-prepare() {
- cd ${srcdir}/${_pkgname}-${pkgver}
-
- patch -p1 -i "$srcdir/CVE-2016-2381_duplicate_env.diff"
-}
-
-build() {
- cd ${srcdir}/${_pkgname}-${pkgver}
-
- if [ "${CARCH}" = "x86_64" ]; then
- # for x86_64
- arch_opts="-Dcccdlflags='-fPIC'"
- else
- # for i686
- arch_opts=""
- fi
-
- ./Configure -des -Dusethreads -Duseshrplib=false -Doptimize="${CFLAGS}" \
- -Dprefix=/usr \
- -Darchlib=/usr/lib/perl5/core_perl \
- -Dinc_version_list=none \
- ${arch_opts} \
- -Dlddlflags="-static -nostartfiles ${LDFLAGS}" -Dldflags="${LDFLAGS}" \
- -Ddynamic_ext=none -Dso=none
- make
-}
-
-check() {
- cd ${srcdir}/${_pkgname}-${pkgver}
-# TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness
-## make test
-}
-
-package() {
- cd ${srcdir}/${_pkgname}-${pkgver}
- make DESTDIR="$pkgdir" install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,lib/perl5/{5,s}*,share}
- rm -vr ${pkgdir}/usr/lib/perl5/core_perl/{B,Compress,Data,Devel,Digest,Encode,File,Filter,Hash,I18N,IO,IPC,List,Math,MIME,PerlIO,Scalar,Sub,Sys,Tie,Time,Unicode,threads}
- rm -v ${pkgdir}/usr/lib/perl5/core_perl/{.packlist,*.{pl,pm,pod},CORE/*.h}
-}
diff --git a/libre/sqlite-static/PKGBUILD b/libre/sqlite-static/PKGBUILD
deleted file mode 100644
index 4623a7811..000000000
--- a/libre/sqlite-static/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of sqlite
-
-pkgbase="sqlite"
-pkgname=sqlite-static
-_srcver=3120100
-pkgver=3.12.1
-pkgrel=1
-pkgdesc="A C library that implements an SQL database engine (static libraries only)"
-arch=('i686' 'x86_64' 'armv7h')
-license=('custom:Public Domain')
-url="http://www.sqlite.org/"
-makedepends=('tcl' 'readline')
-source=(http://www.sqlite.org/2016/sqlite-src-${_srcver}.zip)
-options=('!emptydirs' '!makeflags' 'staticlibs') # json extensions breaks parallel build
-sha1sums=('f3f76c0f07a37e085eb504460a5663bcff53b6ad')
-
-prepare() {
- cd sqlite-src-$_srcver
-# autoreconf -vfi
-}
-
-build() {
- export CPPFLAGS="$CPPFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \
- -DSQLITE_ENABLE_UNLOCK_NOTIFY \
- -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
- -DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
- -DSQLITE_SECURE_DELETE"
-
- # build sqlite
- cd sqlite-src-$_srcver
- ./configure --prefix=/usr \
- --enable-static \
- --disable-amalgamation \
- --enable-fts3 \
- --enable-fts4 \
- --enable-fts5 \
- --enable-rtree \
- --enable-json1 \
- TCLLIBDIR=/usr/lib/sqlite$pkgver
- make
- # build additional tools
- make showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
-}
-
-package() {
-
- pkgdesc="A C library that implements an SQL database engine (static libraries only)"
- depends=('sqlite')
-
- cd sqlite-src-$_srcver
- make DESTDIR=${pkgdir} install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,include,lib/{pkgconfig,sqlite*}}
- rm -v ${pkgdir}/usr/lib/lib*.so*
-}
diff --git a/libre/texinfo-static/PKGBUILD b/libre/texinfo-static/PKGBUILD
deleted file mode 100644
index 2f57d4ce9..000000000
--- a/libre/texinfo-static/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of texinfo
-
-_pkgname=texinfo
-pkgname=texinfo-static
-pkgver=6.1
-pkgrel=1
-pkgdesc='GNU documentation system for on-line information and printed output (static libraries only)'
-arch=('i686' 'x86_64' 'armv7h')
-url='http://www.gnu.org/software/texinfo/'
-license=('GPL3')
-depends=('ncurses-static' 'perl-static' 'texinfo')
-options=('staticlibs')
-source=(ftp://ftp.gnu.org/pub/gnu/$_pkgname/$_pkgname-$pkgver.tar.xz{,.sig}
- texinfo-6.0-disable-failing-info-test.patch)
-md5sums=('1d7ec1888fae00730693597852b00cde'
- 'SKIP'
- '8bfaa21315a8a6184811de8478005d22')
-validpgpkeys=('EAF669B31E31E1DECBD11513DDBC579DAB37FBA9') # Gavin Smith
-
-prepare() {
- cd $_pkgname-$pkgver
- patch -p1 -i ../texinfo-6.0-disable-failing-info-test.patch
-}
-
-build() {
- cd $_pkgname-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-check() {
- make -C $_pkgname-$pkgver check
-}
-
-package() {
- make -C $_pkgname-$pkgver DESTDIR="$pkgdir" install
-
- # remove conflicting files
- rm -vr ${pkgdir}/usr/{bin,share}
- rm -v ${pkgdir}/usr/lib/$_pkgname/*.so
-}
diff --git a/libre/texinfo-static/texinfo-6.0-disable-failing-info-test.patch b/libre/texinfo-static/texinfo-6.0-disable-failing-info-test.patch
deleted file mode 100644
index 436354f41..000000000
--- a/libre/texinfo-static/texinfo-6.0-disable-failing-info-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up texinfo-6.0/info/Makefile.in.orig texinfo-6.0/info/Makefile.in
---- texinfo-6.0/info/Makefile.in.orig 2015-07-14 13:17:44.298882856 +0200
-+++ texinfo-6.0/info/Makefile.in 2015-07-14 13:18:13.082004108 +0200
-@@ -1695,7 +1695,6 @@ TESTS = \
- t/end-of-line.sh \
- t/goal-column.sh \
- t/star-note-non-whitespace.sh \
-- t/c-u-m-x-scroll-forward.sh \
- t/last-no-history.sh \
- t/split-footnotes.sh \
- t/window-split-dir.sh \